refactor(server): switched to normalize options

webpack · Jul 23, 2019 · 7e37db5 · 7e37db5
1 parent 93d6ca3
commit 7e37db5
Show file tree

Hide file tree

Showing 6 changed files with 191 additions and 65 deletions.
diff --git a/lib/utils/normalizeOptions.js b/lib/utils/normalizeOptions.js
@@ -5,6 +5,10 @@
 */
 
 function normalizeOptions(compiler, options) {
+  const firstWpOpt = compiler.compilers
+    ? compiler.compilers[0].options
+    : compiler.options;
+
   // Setup default value
   options.contentBase =
     options.contentBase !== undefined ? options.contentBase : process.cwd();
@@ -22,6 +26,10 @@ function normalizeOptions(compiler, options) {
   if (!options.watchOptions) {
     options.watchOptions = {};
   }
+
+  if (!options.filename && firstWpOpt.output && firstWpOpt.output.filename) {
+    options.filename = firstWpOpt.output.filename;
+  }
 }
 
 module.exports = normalizeOptions;
diff --git a/lib/utils/setFilename.js b/lib/utils/setFilename.js
diff --git a/lib/utils/updateCompiler.js b/lib/utils/updateCompiler.js
@@ -7,11 +7,8 @@
 const webpack = require('webpack');
 const addEntries = require('./addEntries');
 const getSocketClientPath = require('./getSocketClientPath');
-const setFilename = require('./setFilename');
 
 function updateCompiler(compiler, options) {
-  setFilename(compiler, options);
-
   if (options.inline !== false) {
     const findHMRPlugin = (config) => {
       if (!config.plugins) {

diff --git a/test/server/utils/__snapshots__/normalizeOptions.test.js.snap b/test/server/utils/__snapshots__/normalizeOptions.test.js.snap
@@ -7,6 +7,7 @@ Object {
     "/path/to/dist1",
     "/path/to/dist2",
   ],
+  "filename": "[name].js",
   "serverMode": "sockjs",
   "watchOptions": Object {},
 }
@@ -16,6 +17,79 @@ exports[`normalizeOptions contentBase string should set correct options 1`] = `
 Object {
   "clientMode": "sockjs",
   "contentBase": "/path/to/dist",
+  "filename": "[name].js",
+  "serverMode": "sockjs",
+  "watchOptions": Object {},
+}
+`;
+
+exports[`normalizeOptions existing devServer.filename, existing compiler filename should set correct options 1`] = `
+Object {
+  "clientMode": "sockjs",
+  "filename": "devserver-bundle.js",
+  "serverMode": "sockjs",
+  "watchOptions": Object {},
+}
+`;
+
+exports[`normalizeOptions existing devServer.filename, no compiler filename should set correct options 1`] = `
+Object {
+  "clientMode": "sockjs",
+  "filename": "devserver-bundle.js",
+  "serverMode": "sockjs",
+  "watchOptions": Object {},
+}
+`;
+
+exports[`normalizeOptions multi compiler, existing devServer.filename, existing compiler filename should set correct options 1`] = `
+Object {
+  "clientMode": "sockjs",
+  "filename": "devserver-bundle.js",
+  "serverMode": "sockjs",
+  "watchOptions": Object {},
+}
+`;
+
+exports[`normalizeOptions multi compiler, existing devServer.filename, no compiler filename should set correct options 1`] = `
+Object {
+  "clientMode": "sockjs",
+  "filename": "devserver-bundle.js",
+  "serverMode": "sockjs",
+  "watchOptions": Object {},
+}
+`;
+
+exports[`normalizeOptions multi compiler, no devServer.filename, existing compiler filename should set correct options 1`] = `
+Object {
+  "clientMode": "sockjs",
+  "filename": "mybundle.js",
+  "serverMode": "sockjs",
+  "watchOptions": Object {},
+}
+`;
+
+exports[`normalizeOptions multi compiler, no devServer.filename, no compiler filename should set correct options 1`] = `
+Object {
+  "clientMode": "sockjs",
+  "filename": "[name].js",
+  "serverMode": "sockjs",
+  "watchOptions": Object {},
+}
+`;
+
+exports[`normalizeOptions no devServer.filename, existing compiler filename should set correct options 1`] = `
+Object {
+  "clientMode": "sockjs",
+  "filename": "mybundle.js",
+  "serverMode": "sockjs",
+  "watchOptions": Object {},
+}
+`;
+
+exports[`normalizeOptions no devServer.filename, no compiler filename should set correct options 1`] = `
+Object {
+  "clientMode": "sockjs",
+  "filename": "[name].js",
   "serverMode": "sockjs",
   "watchOptions": Object {},
 }
@@ -24,6 +98,7 @@ Object {
 exports[`normalizeOptions no options should set correct options 1`] = `
 Object {
   "clientMode": "sockjs",
+  "filename": "[name].js",
   "serverMode": "sockjs",
   "watchOptions": Object {},
 }
@@ -32,6 +107,7 @@ Object {
 exports[`normalizeOptions watchOptions should set correct options 1`] = `
 Object {
   "clientMode": "sockjs",
+  "filename": "[name].js",
   "serverMode": "sockjs",
   "watchOptions": Object {
     "poll": true,

diff --git a/test/server/utils/__snapshots__/setFilename.test.js.snap b/test/server/utils/__snapshots__/setFilename.test.js.snap
diff --git a/test/server/utils/normalizeOptions.test.js b/test/server/utils/normalizeOptions.test.js
@@ -37,19 +37,126 @@ describe('normalizeOptions', () => {
       },
       optionsResults: null,
     },
+    {
+      title: 'no devServer.filename, no compiler filename',
+      webpackConfig: null,
+      multiCompiler: false,
+      options: {},
+      optionsResults: null,
+    },
+    {
+      title: 'no devServer.filename, existing compiler filename',
+      webpackConfig: {
+        output: {
+          filename: 'mybundle.js',
+        },
+      },
+      multiCompiler: false,
+      options: {},
+      optionsResults: null,
+    },
+    {
+      title: 'existing devServer.filename, no compiler filename',
+      webpackConfig: null,
+      multiCompiler: false,
+      options: {
+        filename: 'devserver-bundle.js',
+      },
+      optionsResults: null,
+    },
+    {
+      title: 'existing devServer.filename, existing compiler filename',
+      webpackConfig: {
+        output: {
+          filename: 'mybundle.js',
+        },
+      },
+      multiCompiler: false,
+      options: {
+        filename: 'devserver-bundle.js',
+      },
+      optionsResults: null,
+    },
+    {
+      title: 'multi compiler, no devServer.filename, no compiler filename',
+      webpackConfig: null,
+      multiCompiler: true,
+      options: {},
+      optionsResults: null,
+    },
+    {
+      title:
+        'multi compiler, no devServer.filename, existing compiler filename',
+      webpackConfig: {
+        output: {
+          filename: 'mybundle.js',
+        },
+      },
+      multiCompiler: true,
+      options: {},
+      optionsResults: null,
+    },
+    {
+      title:
+        'multi compiler, existing devServer.filename, no compiler filename',
+      webpackConfig: null,
+      multiCompiler: true,
+      options: {
+        filename: 'devserver-bundle.js',
+      },
+      optionsResults: null,
+    },
+    {
+      title:
+        'multi compiler, existing devServer.filename, existing compiler filename',
+      webpackConfig: {
+        output: {
+          filename: 'mybundle.js',
+        },
+      },
+      multiCompiler: true,
+      options: {
+        filename: 'devserver-bundle.js',
+      },
+      optionsResults: null,
+    },
   ];
 
   cases.forEach((data) => {
     describe(data.title, () => {
       let compiler;
       beforeAll(() => {
+        // this will merge webpack configs through a depth of one layer of objects,
+        // specifically so that the webpack config output object can be merged
+        const mergeConfigs = (baseConfig, config) => {
+          Object.keys(config).forEach((key1) => {
+            if (typeof config[key1] === 'object') {
+              Object.keys(config[key1]).forEach((key2) => {
+                if (!baseConfig[key1]) {
+                  baseConfig[key1] = {};
+                }
+                baseConfig[key1][key2] = config[key1][key2];
+              });
+            } else {
+              baseConfig[key1] = config[key1];
+            }
+          });
+        };
+
         let webpackConfig;
         if (data.multiCompiler) {
           webpackConfig = require('../../fixtures/multi-compiler-config/webpack.config');
         } else {
           webpackConfig = require('../../fixtures/simple-config/webpack.config');
         }
 
+        if (data.webpackConfig) {
+          mergeConfigs(
+            data.multiCompiler ? webpackConfig[0] : webpackConfig,
+            data.webpackConfig
+          );
+        }
+
         compiler = webpack(webpackConfig);
       });