Skip to content

Commit b4fd742

Browse files
committed
refactor(server): switch update options to normalize options
1 parent d19861d commit b4fd742

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

lib/Server.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const webpack = require('webpack');
2424
const webpackDevMiddleware = require('webpack-dev-middleware');
2525
const validateOptions = require('schema-utils');
2626
const isAbsoluteUrl = require('is-absolute-url');
27-
const updateOptions = require('./utils/updateOptions');
27+
const normalizeOptions = require('./utils/normalizeOptions');
2828
const updateCompiler = require('./utils/updateCompiler');
2929
const createLogger = require('./utils/createLogger');
3030
const getCertificate = require('./utils/getCertificate');
@@ -73,7 +73,7 @@ class Server {
7373
);
7474
}
7575

76-
updateOptions(this.compiler, this.options);
76+
normalizeOptions(this.compiler, this.options);
7777

7878
updateCompiler(this.compiler, this.options);
7979

lib/utils/updateOptions.js renamed to lib/utils/normalizeOptions.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
no-undefined
55
*/
66

7-
function updateOptions(compiler, options) {
7+
function normalizeOptions(compiler, options) {
88
// Setup default value
99
options.contentBase =
1010
options.contentBase !== undefined ? options.contentBase : process.cwd();
@@ -24,4 +24,4 @@ function updateOptions(compiler, options) {
2424
}
2525
}
2626

27-
module.exports = updateOptions;
27+
module.exports = normalizeOptions;

test/server/utils/__snapshots__/updateOptions.test.js.snap renamed to test/server/utils/__snapshots__/normalizeOptions.test.js.snap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

3-
exports[`updateOptions contentBase array should set correct options 1`] = `
3+
exports[`normalizeOptions contentBase array should set correct options 1`] = `
44
Object {
55
"clientMode": "sockjs",
66
"contentBase": Array [
@@ -12,7 +12,7 @@ Object {
1212
}
1313
`;
1414

15-
exports[`updateOptions contentBase string should set correct options 1`] = `
15+
exports[`normalizeOptions contentBase string should set correct options 1`] = `
1616
Object {
1717
"clientMode": "sockjs",
1818
"contentBase": "/path/to/dist",
@@ -21,15 +21,15 @@ Object {
2121
}
2222
`;
2323

24-
exports[`updateOptions no options should set correct options 1`] = `
24+
exports[`normalizeOptions no options should set correct options 1`] = `
2525
Object {
2626
"clientMode": "sockjs",
2727
"serverMode": "sockjs",
2828
"watchOptions": Object {},
2929
}
3030
`;
3131

32-
exports[`updateOptions watchOptions should set correct options 1`] = `
32+
exports[`normalizeOptions watchOptions should set correct options 1`] = `
3333
Object {
3434
"clientMode": "sockjs",
3535
"serverMode": "sockjs",

test/server/utils/updateOptions.test.js renamed to test/server/utils/normalizeOptions.test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
'use strict';
22

33
const webpack = require('webpack');
4-
const updateOptions = require('../../../lib/utils/updateOptions');
4+
const normalizeOptions = require('../../../lib/utils/normalizeOptions');
55

6-
describe('updateOptions', () => {
6+
describe('normalizeOptions', () => {
77
const cases = [
88
{
99
title: 'no options',
@@ -55,7 +55,7 @@ describe('updateOptions', () => {
5555

5656
it('should set correct options', () => {
5757
const originalContentBase = data.options.contentBase;
58-
updateOptions(compiler, data.options);
58+
normalizeOptions(compiler, data.options);
5959
if (data.optionsResults) {
6060
expect(data.options).toEqual(data.optionsResults);
6161
} else {

0 commit comments

Comments
 (0)