diff --git a/lib/Server.js b/lib/Server.js index 8f4a54930d..0058ebfd47 100644 --- a/lib/Server.js +++ b/lib/Server.js @@ -24,7 +24,7 @@ const webpack = require('webpack'); const webpackDevMiddleware = require('webpack-dev-middleware'); const validateOptions = require('schema-utils'); const isAbsoluteUrl = require('is-absolute-url'); -const updateOptions = require('./utils/updateOptions'); +const normalizeOptions = require('./utils/normalizeOptions'); const updateCompiler = require('./utils/updateCompiler'); const createLogger = require('./utils/createLogger'); const getCertificate = require('./utils/getCertificate'); @@ -73,7 +73,7 @@ class Server { ); } - updateOptions(this.compiler, this.options); + normalizeOptions(this.compiler, this.options); updateCompiler(this.compiler, this.options); diff --git a/lib/utils/updateOptions.js b/lib/utils/normalizeOptions.js similarity index 85% rename from lib/utils/updateOptions.js rename to lib/utils/normalizeOptions.js index 36cb770cf4..443d2df94a 100644 --- a/lib/utils/updateOptions.js +++ b/lib/utils/normalizeOptions.js @@ -4,7 +4,7 @@ no-undefined */ -function updateOptions(compiler, options) { +function normalizeOptions(compiler, options) { // Setup default value options.contentBase = options.contentBase !== undefined ? options.contentBase : process.cwd(); @@ -24,4 +24,4 @@ function updateOptions(compiler, options) { } } -module.exports = updateOptions; +module.exports = normalizeOptions; diff --git a/test/server/utils/__snapshots__/updateOptions.test.js.snap b/test/server/utils/__snapshots__/normalizeOptions.test.js.snap similarity index 64% rename from test/server/utils/__snapshots__/updateOptions.test.js.snap rename to test/server/utils/__snapshots__/normalizeOptions.test.js.snap index 0e8ad30035..0658e08b4b 100644 --- a/test/server/utils/__snapshots__/updateOptions.test.js.snap +++ b/test/server/utils/__snapshots__/normalizeOptions.test.js.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`updateOptions contentBase array should set correct options 1`] = ` +exports[`normalizeOptions contentBase array should set correct options 1`] = ` Object { "clientMode": "sockjs", "contentBase": Array [ @@ -12,7 +12,7 @@ Object { } `; -exports[`updateOptions contentBase string should set correct options 1`] = ` +exports[`normalizeOptions contentBase string should set correct options 1`] = ` Object { "clientMode": "sockjs", "contentBase": "/path/to/dist", @@ -21,7 +21,7 @@ Object { } `; -exports[`updateOptions no options should set correct options 1`] = ` +exports[`normalizeOptions no options should set correct options 1`] = ` Object { "clientMode": "sockjs", "serverMode": "sockjs", @@ -29,7 +29,7 @@ Object { } `; -exports[`updateOptions watchOptions should set correct options 1`] = ` +exports[`normalizeOptions watchOptions should set correct options 1`] = ` Object { "clientMode": "sockjs", "serverMode": "sockjs", diff --git a/test/server/utils/updateOptions.test.js b/test/server/utils/normalizeOptions.test.js similarity index 91% rename from test/server/utils/updateOptions.test.js rename to test/server/utils/normalizeOptions.test.js index e1c5d63b96..c1f66f4939 100644 --- a/test/server/utils/updateOptions.test.js +++ b/test/server/utils/normalizeOptions.test.js @@ -1,9 +1,9 @@ 'use strict'; const webpack = require('webpack'); -const updateOptions = require('../../../lib/utils/updateOptions'); +const normalizeOptions = require('../../../lib/utils/normalizeOptions'); -describe('updateOptions', () => { +describe('normalizeOptions', () => { const cases = [ { title: 'no options', @@ -55,7 +55,7 @@ describe('updateOptions', () => { it('should set correct options', () => { const originalContentBase = data.options.contentBase; - updateOptions(compiler, data.options); + normalizeOptions(compiler, data.options); if (data.optionsResults) { expect(data.options).toEqual(data.optionsResults); } else {