refactor(server): move filename option from create config to api

lib/utils/createConfig.js

@@ -72,10 +72,6 @@ function createConfig(config, argv, { port }) {
     }
   }
 
-  if (!options.filename && firstWpOpt.output && firstWpOpt.output.filename) {
-    options.filename = firstWpOpt.output && firstWpOpt.output.filename;
-  }
-
   if (!options.watchOptions && firstWpOpt.watchOptions) {
     options.watchOptions = firstWpOpt.watchOptions;
   }

lib/utils/setFilename.js

@@ -0,0 +1,13 @@
+'use strict';
+
+function setFilename(compiler, options) {
+  const firstWpOpt = compiler.compilers
+    ? compiler.compilers[0].options
+    : compiler.options;
+
+  if (!options.filename && firstWpOpt.output && firstWpOpt.output.filename) {
+    options.filename = firstWpOpt.output.filename;
+  }
+}
+
+module.exports = setFilename;

lib/utils/updateCompiler.js

@@ -7,8 +7,11 @@
 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) {

test/server/utils/__snapshots__/createConfig.test.js.snap

@@ -283,51 +283,6 @@ Object {
 }
 `;
 
-exports[`createConfig filename option (in devServer config) 1`] = `
-Object {
-  "filename": "[name]-dev-server-bundle.js",
-  "hot": true,
-  "hotOnly": false,
-  "noInfo": true,
-  "port": 8080,
-  "publicPath": "/",
-  "stats": Object {
-    "cached": false,
-    "cachedAssets": false,
-  },
-}
-`;
-
-exports[`createConfig filename option (in output config) 1`] = `
-Object {
-  "filename": "[name]-output-bundle.js",
-  "hot": true,
-  "hotOnly": false,
-  "noInfo": true,
-  "port": 8080,
-  "publicPath": "/",
-  "stats": Object {
-    "cached": false,
-    "cachedAssets": false,
-  },
-}
-`;
-
-exports[`createConfig filename option (in webpack config) 1`] = `
-Object {
-  "filename": "[name]-bundle.js",
-  "hot": true,
-  "hotOnly": false,
-  "noInfo": true,
-  "port": 8080,
-  "publicPath": "/",
-  "stats": Object {
-    "cached": false,
-    "cachedAssets": false,
-  },
-}
-`;
-
 exports[`createConfig historyApiFallback option (in devServer config) 1`] = `
 Object {
   "historyApiFallback": true,

test/server/utils/__snapshots__/setFilename.test.js.snap

@@ -0,0 +1,49 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`setFilename existing devServer.filename, existing compiler filename should set correct options.filename 1`] = `
+Object {
+  "filename": "devserver-bundle.js",
+}
+`;
+
+exports[`setFilename existing devServer.filename, no compiler filename should set correct options.filename 1`] = `
+Object {
+  "filename": "devserver-bundle.js",
+}
+`;
+
+exports[`setFilename multi compiler, existing devServer.filename, existing compiler filename should set correct options.filename 1`] = `
+Object {
+  "filename": "devserver-bundle.js",
+}
+`;
+
+exports[`setFilename multi compiler, existing devServer.filename, no compiler filename should set correct options.filename 1`] = `
+Object {
+  "filename": "devserver-bundle.js",
+}
+`;
+
+exports[`setFilename multi compiler, no devServer.filename, existing compiler filename should set correct options.filename 1`] = `
+Object {
+  "filename": "mybundle.js",
+}
+`;
+
+exports[`setFilename multi compiler, no devServer.filename, no compiler filename should set correct options.filename 1`] = `
+Object {
+  "filename": "[name].js",
+}
+`;
+
+exports[`setFilename no devServer.filename, existing compiler filename should set correct options.filename 1`] = `
+Object {
+  "filename": "mybundle.js",
+}
+`;
+
+exports[`setFilename no devServer.filename, no compiler filename should set correct options.filename 1`] = `
+Object {
+  "filename": "[name].js",
+}
+`;

test/server/utils/createConfig.test.js

@@ -276,42 +276,6 @@ describe('createConfig', () => {
     expect(config).toMatchSnapshot();
   });
 
-  it('filename option (in webpack config)', () => {
-    const config = createConfig(
-      Object.assign({}, webpackConfig, {
-        output: { filename: '[name]-bundle.js' },
-      }),
-      argv,
-      { port: 8080 }
-    );
-
-    expect(config).toMatchSnapshot();
-  });
-
-  it('filename option (in output config)', () => {
-    const config = createConfig(
-      Object.assign({}, webpackConfig, {
-        output: { filename: '[name]-output-bundle.js' },
-      }),
-      argv,
-      { port: 8080 }
-    );
-
-    expect(config).toMatchSnapshot();
-  });
-
-  it('filename option (in devServer config)', () => {
-    const config = createConfig(
-      Object.assign({}, webpackConfig, {
-        devServer: { filename: '[name]-dev-server-bundle.js' },
-      }),
-      argv,
-      { port: 8080 }
-    );
-
-    expect(config).toMatchSnapshot();
-  });
-
   it('watchOptions option (in output config)', () => {
     const config = createConfig(
       Object.assign({}, webpackConfig, {

test/server/utils/setFilename.test.js

@@ -0,0 +1,97 @@
+'use strict';
+
+const webpack = require('webpack');
+const setFilename = require('../../../lib/utils/setFilename');
+
+describe('setFilename', () => {
+  const cases = [
+    {
+      title: 'no devServer.filename, no compiler filename',
+      webpackFilename: null,
+      multiCompiler: false,
+      options: {},
+    },
+    {
+      title: 'no devServer.filename, existing compiler filename',
+      webpackFilename: 'mybundle.js',
+      multiCompiler: false,
+      options: {},
+    },
+    {
+      title: 'existing devServer.filename, no compiler filename',
+      webpackFilename: null,
+      multiCompiler: false,
+      options: {
+        filename: 'devserver-bundle.js',
+      },
+    },
+    {
+      title: 'existing devServer.filename, existing compiler filename',
+      webpackFilename: 'mybundle.js',
+      multiCompiler: false,
+      options: {
+        filename: 'devserver-bundle.js',
+      },
+    },
+    {
+      title: 'multi compiler, no devServer.filename, no compiler filename',
+      webpackFilename: null,
+      multiCompiler: true,
+      options: {},
+    },
+    {
+      title:
+        'multi compiler, no devServer.filename, existing compiler filename',
+      webpackFilename: 'mybundle.js',
+      multiCompiler: true,
+      options: {},
+    },
+    {
+      title:
+        'multi compiler, existing devServer.filename, no compiler filename',
+      webpackFilename: null,
+      multiCompiler: true,
+      options: {
+        filename: 'devserver-bundle.js',
+      },
+    },
+    {
+      title:
+        'multi compiler, existing devServer.filename, existing compiler filename',
+      webpackFilename: 'mybundle.js',
+      multiCompiler: true,
+      options: {
+        filename: 'devserver-bundle.js',
+      },
+    },
+  ];
+
+  cases.forEach((data) => {
+    describe(data.title, () => {
+      let compiler;
+      beforeAll(() => {
+        let webpackConfig;
+        if (data.multiCompiler) {
+          // eslint-disable-next-line global-require
+          webpackConfig = require('../../fixtures/multi-compiler-config/webpack.config');
+          if (data.webpackFilename) {
+            webpackConfig[0].output.filename = data.webpackFilename;
+          }
+        } else {
+          // eslint-disable-next-line global-require
+          webpackConfig = require('../../fixtures/simple-config/webpack.config');
+          if (data.webpackFilename) {
+            webpackConfig.output.filename = data.webpackFilename;
+          }
+        }
+
+        compiler = webpack(webpackConfig);
+      });
+
+      it('should set correct options.filename', () => {
+        setFilename(compiler, data.options);
+        expect(data.options).toMatchSnapshot();
+      });
+    });
+  });
+});