Apply watchOptions to webpack config too, not only the dev server

Author: Kocal

index.js

@@ -589,12 +589,12 @@ class Encore {
     }
 
     /**
-     * Configure the devServer.watchOptions configuration, only when the dev server is running.
+     * Configure the watchOptions and devServer.watchOptions configuration.
      *
-     * https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
      * https://webpack.js.org/configuration/watch/
+     * https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
      *
-     * Encore.configureDevServerWatchOptions(function(watchOptions) {
+     * Encore.configureWatchOptions(function(watchOptions) {
      *      // change the configuration
      *
      *      watchOptions.poll = 250; // useful when running inside a Virtual Machine
@@ -603,8 +603,8 @@ class Encore {
      * @param {function} callback
      * @returns {Encore}
      */
-    configureDevServerWatchOptions(callback) {
-        webpackConfig.configureDevServerWatchOptions(callback);
+    configureWatchOptions(callback) {
+        webpackConfig.configureWatchOptions(callback);
 
         return this;
     }

lib/WebpackConfig.js

@@ -94,7 +94,7 @@ class WebpackConfig {
         this.shouldUseSingleRuntimeChunk = null;
         this.shouldSplitEntryChunks = false;
         this.splitChunksConfigurationCallback = () => {};
-        this.devServerWatchOptionsConfigurationCallback = () => {};
+        this.watchOptionsConfigurationCallback = () => {};
         this.vueLoaderOptionsCallback = () => {};
         this.eslintLoaderOptionsCallback = () => {};
         this.tsConfigurationCallback = () => {};
@@ -396,12 +396,12 @@ class WebpackConfig {
         this.splitChunksConfigurationCallback = callback;
     }
 
-    configureDevServerWatchOptions(callback) {
+    configureWatchOptions(callback) {
         if (typeof callback !== 'function') {
-            throw new Error('Argument 1 to configureDevServerWatchOptions() must be a callback function.');
+            throw new Error('Argument 1 to configureWatchOptions() must be a callback function.');
         }
 
-        this.devServerWatchOptionsConfigurationCallback = callback;
+        this.watchOptionsConfigurationCallback = callback;
     }
 
     createSharedEntry(name, file) {

lib/config-generator.js

@@ -69,7 +69,8 @@ class ConfigGenerator {
                 rules: this.buildRulesConfig(),
             },
             plugins: this.buildPluginsConfig(),
-            optimization: this.buildOptimizationConfig()
+            optimization: this.buildOptimizationConfig(),
+            watchOptions: this.buildWatchOptionsConfig()
         };
 
         if (this.webpackConfig.useSourceMaps) {
@@ -525,13 +526,18 @@ class ConfigGenerator {
         return stats;
     }
 
-    buildDevServerConfig() {
-        const contentBase = pathUtil.getContentBase(this.webpackConfig);
+    buildWatchOptionsConfig() {
         const watchOptions = {
             ignored: /node_modules/
         };
 
-        this.webpackConfig.devServerWatchOptionsConfigurationCallback(watchOptions);
+        this.webpackConfig.watchOptionsConfigurationCallback(watchOptions);
+
+        return watchOptions;
+    }
+
+    buildDevServerConfig() {
+        const contentBase = pathUtil.getContentBase(this.webpackConfig);
 
         return {
             contentBase: contentBase,
@@ -544,7 +550,7 @@ class ConfigGenerator {
             quiet: true,
             compress: true,
             historyApiFallback: true,
-            watchOptions: watchOptions,
+            watchOptions: this.buildWatchOptionsConfig(),
             https: this.webpackConfig.useDevServerInHttps()
         };
     }

test/WebpackConfig.js

@@ -1066,28 +1066,28 @@ describe('WebpackConfig object', () => {
         });
     });
 
-    describe('configureDevServerWatchOptions()', () => {
+    describe('configureWatchOptions()', () => {
         it('Pass config', () => {
             const config = createConfig();
             const callback = (watchOptions) => {
                 watchOptions.poll = 250;
             };
 
-            config.configureDevServerWatchOptions(callback);
+            config.configureWatchOptions(callback);
 
-            expect(config.devServerWatchOptionsConfigurationCallback).to.equal(callback);
+            expect(config.watchOptionsConfigurationCallback).to.equal(callback);
         });
 
         it('Call method without a valid callback', () => {
             const config = createConfig();
 
             expect(() => {
-                config.configureDevServerWatchOptions();
-            }).to.throw('Argument 1 to configureDevServerWatchOptions() must be a callback function.');
+                config.configureWatchOptions();
+            }).to.throw('Argument 1 to configureWatchOptions() must be a callback function.');
 
             expect(() => {
-                config.configureDevServerWatchOptions({});
-            }).to.throw('Argument 1 to configureDevServerWatchOptions() must be a callback function.');
+                config.configureWatchOptions({});
+            }).to.throw('Argument 1 to configureWatchOptions() must be a callback function.');
         });
     });
 });

test/config-generator.js

@@ -583,11 +583,15 @@ describe('The config-generator function', () => {
             config.setPublicPath('/');
             config.addEntry('main', './main');
 
-            config.configureDevServerWatchOptions(watchOptions => {
+            config.configureWatchOptions(watchOptions => {
                 watchOptions.poll = 250;
             });
 
             const actualConfig = configGenerator(config);
+            expect(actualConfig.watchOptions).to.deep.equals({
+                'ignored': /node_modules/,
+                'poll': 250,
+            });
             expect(actualConfig.devServer.watchOptions).to.deep.equals({
                 'ignored': /node_modules/,
                 'poll': 250,
@@ -954,4 +958,21 @@ describe('The config-generator function', () => {
             expect(JSON.stringify(logger.getMessages().deprecation)).to.contain('the recommended setting is Encore.enableSingleRuntimeChunk()');
         });
     });
+
+    describe('Test buildWatchOptionsConfig()', () => {
+        it('Set webpack watch options', () => {
+            const config = createConfig();
+            config.outputPath = '/tmp/public/build';
+            config.setPublicPath('/build/');
+            config.configureWatchOptions(watchOptions => {
+                watchOptions.poll = 250;
+            });
+
+            const actualConfig = configGenerator(config);
+            expect(actualConfig.watchOptions).to.deep.equals({
+                ignored: /node_modules/,
+                poll: 250,
+            });
+        });
+    });
 });