Commit eac14598 by Oleg Gaidarenko Committed by GitHub

Build: watch and dev mode webpack improvements (#18153)

* Ignore `node_modules` in watch mode

* Simplify development setup
parent bc0da1bb
......@@ -128,7 +128,7 @@
"zone.js": "0.7.8"
},
"scripts": {
"dev": "webpack --progress --colors --mode development --config scripts/webpack/webpack.dev.js",
"dev": "webpack --progress --colors --config scripts/webpack/webpack.dev.js",
"start": "grafana-toolkit core:start --watchTheme",
"start:hot": "grafana-toolkit core:start --hot --watchTheme",
"start:ignoreTheme": "grafana-toolkit core:start --hot",
......
......@@ -15,11 +15,11 @@ const startTaskRunner: TaskRunner<StartTaskOptions> = async ({ watchThemes, hot
},
hot
? {
command: 'webpack-dev-server --progress --colors --mode development --config scripts/webpack/webpack.hot.js',
command: 'webpack-dev-server --progress --colors --config scripts/webpack/webpack.hot.js',
name: 'Dev server',
}
: {
command: 'webpack --progress --colors --watch --mode development --config scripts/webpack/webpack.dev.js',
command: 'webpack --progress --colors --watch --config scripts/webpack/webpack.dev.js',
name: 'Webpack',
},
];
......
......@@ -19,6 +19,11 @@ module.exports = merge(common, {
light: './public/sass/grafana.light.scss',
},
// If we enabled watch option via CLI
watchOptions: {
ignored: /node_modules/
},
module: {
rules: [
{
......
......@@ -10,6 +10,7 @@ const CleanWebpackPlugin = require('clean-webpack-plugin');
const IgnoreNotFoundExportPlugin = require("./IgnoreNotFoundExportPlugin.js");
module.exports = merge(common, {
mode: 'development',
entry: {
app: ['webpack-dev-server/client?http://localhost:3333', './public/app/dev.ts'],
},
......@@ -34,6 +35,9 @@ module.exports = merge(common, {
proxy: {
'!/public/build': 'http://localhost:3000',
},
watchOptions: {
ignored: /node_modules/
}
},
optimization: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment