weboptimizer 2.0.1422 → 2.0.1424

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "2.0.1422",
+  "version": "2.0.1424",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -539,6 +539,7 @@
       "contextType": "main",
       "debug": false,
       "development": {
+        "includeClient": null,
         "server": {
           "client": false,
           "compress": {
@@ -909,7 +910,7 @@
                 "..."
               ],
               "urlFilter": {
-                "__evaluate__": "(attributeName, reference) => !reference.endsWith('.js')"
+                "__evaluate__": "(attributeName, reference) => !/[^?]+\\.js(\\?.*)?/.test(reference)"
               }
             }
           }
@@ -1539,7 +1540,21 @@
         },
         "offline": null
       },
-      "webpack": {}
+      "webpack": {
+        "watchOptions": {
+          "ignored": [
+            "./*.js",
+            "**/node_modules",
+            "**/package.json",
+            {
+              "__evaluate__": "path.resolve(self.path.target.base, '*.js')"
+            },
+            {
+              "__evaluate__": "path.resolve(self.path.target.base, '**/*.js')"
+            }
+          ]
+        }
+      }
     },
     "debug": {
       "debug": true,
@@ -1733,21 +1748,6 @@
             "testBundle": "./test"
           }
         }
-      },
-      "webpack": {
-        "watchOptions": {
-          "ignored": [
-            "./*.js",
-            "**/node_modules",
-            "**/package.json",
-            {
-              "__evaluate__": "path.resolve(self.path.target.base, '*.js')"
-            },
-            {
-              "__evaluate__": "path.resolve(self.path.target.base, '**/*.js')"
-            }
-          ]
-        }
       }
     }
   },

package/type.d.ts

@@ -265,6 +265,7 @@ export interface ResolvedConfiguration {
     contextType: string;
     debug: boolean;
     development: {
+        includeClient?: boolean | null;
         server: (WebpackOptionsNormalized['devServer'] & {
             hot: boolean;
             host: string;

package/webpackConfigurator.js

@@ -943,7 +943,7 @@ if (configuration.files.compose.cascadingStyleSheet && plugins.MiniCSSExtract) {
     last module which would shadow main module (e.g. index).
     So we inject live reload and hot module replacement manually.
 */
-if (htmlAvailable && configuration.debug && configuration.development.server.liveReload && !configuration.injection.entry.normalized.developmentHandler && ['serve', 'test:browser'].includes(configuration.givenCommandLineArguments[2])) {
+if (htmlAvailable && configuration.debug && configuration.development.server.liveReload && !configuration.injection.entry.normalized.developmentHandler && (configuration.development.includeClient || typeof configuration.development.includeClient !== 'boolean' && ['serve', 'test:browser'].includes(configuration.givenCommandLineArguments[2]))) {
   configuration.injection.entry.normalized.developmentHandler = ['webpack-dev-server/client/index.js?' + 'live-reload=' + (configuration.development.server.liveReload ? 'true' : 'false') + "&hot=".concat(configuration.development.server.hot ? 'true' : 'false') + "&http".concat(configuration.development.server.https ? 's' : '', "://") + "".concat(configuration.development.server.host, ":") + "".concat(configuration.development.server.port)];
   if (configuration.development.server.hot) {
     configuration.injection.entry.normalized.developmentHandler.push('webpack/hot/dev-server.js');