diff --git a/ui/package.json b/ui/package.json index 6203f40def..70fd9499d1 100644 --- a/ui/package.json +++ b/ui/package.json @@ -9,18 +9,17 @@ "url": "github:influxdata/chronograf" }, "scripts": { - "build": "yarn run clean:prod && webpack --config ./webpack/prodConfig.js", + "build": "yarn run clean && webpack --config ./webpack/prodConfig.js", "build:dev": "webpack --config ./webpack/devConfig.js", - "start": "yarn run clean && webpack --watch --config ./webpack/devConfig.js", - "start:vendor": "yarn run vendor && yarn start", + "build:vendor": "webpack --config webpack/vendor.config.js", + "start": "yarn run clean && yarn run build:vendor && webpack --watch --config ./webpack/devConfig.js", + "start:assets": "webpack --watch --config ./webpack/devConfig.js", "start:hmr": "webpack-dev-server --open --config ./webpack/devConfig.js", "lint": "esw src/", "test": "karma start --single-run", "test:lint": "yarn run lint; yarn run test", "test:dev": "karma start --auto-watch", - "clean": "find ./build -type f -maxdepth 1 -exec rm -fv {} \\;", - "clean:prod": "rm -rf ./build/*", - "vendor": "webpack --config webpack/vendor.config.js", + "clean": "rm -rf ./build/*", "prettier": "prettier --single-quote --trailing-comma es5 --bracket-spacing false --semi false --write \"{src,spec}/**/*.js\"; eslint src --fix", "eslint-check": "eslint --print-config .eslintrc | eslint-config-prettier-check" }, diff --git a/ui/webpack/devConfig.js b/ui/webpack/devConfig.js index 63ce68db81..b5c6c9f946 100644 --- a/ui/webpack/devConfig.js +++ b/ui/webpack/devConfig.js @@ -124,7 +124,7 @@ module.exports = { plugins: [ new webpack.DllReferencePlugin({ context: process.cwd(), - manifest: require('../build/vendor/vendor.dll.json'), + manifest: require('../build/vendor.dll.json'), }), new ForkTsCheckerWebpackPlugin({ checkSyntacticErrors: true, diff --git a/ui/webpack/vendor.config.js b/ui/webpack/vendor.config.js index ef78496cc5..395c93912a 100644 --- a/ui/webpack/vendor.config.js +++ b/ui/webpack/vendor.config.js @@ -18,13 +18,13 @@ module.exports = { }, output: { filename: '[name].dll.js', - path: path.resolve(__dirname, '../build/vendor'), + path: path.resolve(__dirname, '../build'), library: '[name]', }, plugins: [ new webpack.DllPlugin({ name: '[name]', - path: './build/vendor/[name].dll.json', + path: './build/[name].dll.json', }), ], }