diff --git a/.gitignore b/.gitignore index 3dc68b566afb4ddfac6f93f226cf762f08541626..a1e31bbf194301025cd46b48624bb1ed1ca604e1 100644 --- a/.gitignore +++ b/.gitignore @@ -109,3 +109,6 @@ miniconda/ miniconda.cached/ conda/recipe_append.yaml conda-bld/ + +# built JS files +beat/editor/js diff --git a/conda/js/package.json b/conda/js/package.json index d70c7cd29b2e0533a544c6c70591dd1d9c8df83f..db871a67febd881916da5e88bebd1bc22dabdafa 100644 --- a/conda/js/package.json +++ b/conda/js/package.json @@ -5,7 +5,7 @@ "main": "index.js", "scripts": { "start": "cross-env NODE_ENV=debug webpack-dev-server --hot", - "prebuild": "rimraf dist", + "prebuild": "rimraf ../../beat/editor/js", "build": "cross-env NODE_ENV=production webpack", "test-start": "cross-env BABEL_ENV=test NODE_ENV=test karma start --no-single-run", "test": "cross-env BABEL_ENV=test NODE_ENV=test karma start", diff --git a/conda/js/webpack.config.js b/conda/js/webpack.config.js index 9dd4f3fcca2aa195d8aad33d20e433793fefd4c3..d7d26749660290a77dc91a531c992907dac2a524 100644 --- a/conda/js/webpack.config.js +++ b/conda/js/webpack.config.js @@ -5,7 +5,7 @@ const VisualizerPlugin = require('webpack-visualizer-plugin'); const HtmlWebpackPlugin = require('html-webpack-plugin'); const UglifyJsPlugin = require('uglifyjs-webpack-plugin') -const dist = resolve(__dirname, 'dist'); +const dist = resolve(__dirname, '../../beat/editor/js'); const isExternal = (module) => module.context && module.context.indexOf('node_modules') === -1;