diff --git a/README.md b/README.md index 5c76743d61..8a5f273f6b 100644 --- a/README.md +++ b/README.md @@ -109,7 +109,7 @@ Options: --client-web-socket-url-protocol Tells clients connected to devServer to use the provided protocol. --client-web-socket-url-username Tells clients connected to devServer to use the provided username to authenticate. --client-web-socket-url-password Tells clients connected to devServer to use the provided password to authenticate. - --web-socket-server Deprecated: please use 'webSocketServer.type'/'--web-socket-server-type' option. Allows to set web socket server and options (by default 'ws'). + --web-socket-server Deprecated: please use '--web-socket-server-type' option. Allows to set web socket server and options (by default 'ws'). --no-web-socket-server Negative 'web-socket-server' option. --web-socket-server-type Allows to set web socket server and options (by default 'ws'). --compress Enables gzip compression for everything served. diff --git a/bin/cli-flags.js b/bin/cli-flags.js index a956878103..2b991c55b6 100644 --- a/bin/cli-flags.js +++ b/bin/cli-flags.js @@ -319,7 +319,7 @@ module.exports = { configs: [ { description: - "Deprecated: please use 'webSocketServer.type'/'--web-socket-server-type' option.", + "Deprecated: please use '--web-socket-server-type' option.", multiple: false, path: "webSocketServer", type: "enum", @@ -327,7 +327,7 @@ module.exports = { }, { description: - "Deprecated: please use 'webSocketServer.type'/'--web-socket-server-type' option.", + "Deprecated: please use '--web-socket-server-type' option.", multiple: false, path: "webSocketServer", type: "enum", @@ -343,7 +343,7 @@ module.exports = { ], description: - "Deprecated: please use 'webSocketServer.type'/'--web-socket-server-type' option. Allows to set web socket server and options (by default 'ws').", + "Deprecated: please use '--web-socket-server-type' option. Allows to set web socket server and options (by default 'ws').", simpleType: "string", multiple: false, }, diff --git a/lib/options.json b/lib/options.json index 4d1649a10f..1746006455 100644 --- a/lib/options.json +++ b/lib/options.json @@ -1031,7 +1031,7 @@ "$ref": "#/definitions/WebSocketServerType" } ], - "description": "Deprecated: please use 'webSocketServer.type'/'--web-socket-server-type' option." + "description": "Deprecated: please use '--web-socket-server-type' option." }, "WebSocketServerFunction": { "instanceof": "Function" diff --git a/test/__snapshots__/validate-options.test.js.snap.webpack4 b/test/__snapshots__/validate-options.test.js.snap.webpack4 index aec94bace2..90222720fa 100644 --- a/test/__snapshots__/validate-options.test.js.snap.webpack4 +++ b/test/__snapshots__/validate-options.test.js.snap.webpack4 @@ -908,7 +908,7 @@ exports[`options validate should throw an error on the "webSocketServer" option Details: * options.webSocketServer should be one of these: false | \\"sockjs\\" | \\"ws\\" - -> Deprecated: please use 'webSocketServer.type'/'--web-socket-server-type' option. + -> Deprecated: please use '--web-socket-server-type' option. Details: * options.webSocketServer should be false. * options.webSocketServer should be one of these: @@ -928,7 +928,7 @@ exports[`options validate should throw an error on the "webSocketServer" option Details: * options.webSocketServer should be one of these: false | \\"sockjs\\" | \\"ws\\" - -> Deprecated: please use 'webSocketServer.type'/'--web-socket-server-type' option. + -> Deprecated: please use '--web-socket-server-type' option. Details: * options.webSocketServer should be false. * options.webSocketServer should be one of these: diff --git a/test/__snapshots__/validate-options.test.js.snap.webpack5 b/test/__snapshots__/validate-options.test.js.snap.webpack5 index aec94bace2..90222720fa 100644 --- a/test/__snapshots__/validate-options.test.js.snap.webpack5 +++ b/test/__snapshots__/validate-options.test.js.snap.webpack5 @@ -908,7 +908,7 @@ exports[`options validate should throw an error on the "webSocketServer" option Details: * options.webSocketServer should be one of these: false | \\"sockjs\\" | \\"ws\\" - -> Deprecated: please use 'webSocketServer.type'/'--web-socket-server-type' option. + -> Deprecated: please use '--web-socket-server-type' option. Details: * options.webSocketServer should be false. * options.webSocketServer should be one of these: @@ -928,7 +928,7 @@ exports[`options validate should throw an error on the "webSocketServer" option Details: * options.webSocketServer should be one of these: false | \\"sockjs\\" | \\"ws\\" - -> Deprecated: please use 'webSocketServer.type'/'--web-socket-server-type' option. + -> Deprecated: please use '--web-socket-server-type' option. Details: * options.webSocketServer should be false. * options.webSocketServer should be one of these: diff --git a/test/cli/__snapshots__/basic.test.js.snap.webpack4 b/test/cli/__snapshots__/basic.test.js.snap.webpack4 index 7e6703c814..e46e5f66f5 100644 --- a/test/cli/__snapshots__/basic.test.js.snap.webpack4 +++ b/test/cli/__snapshots__/basic.test.js.snap.webpack4 @@ -78,7 +78,7 @@ Options: --client-web-socket-url-protocol Tells clients connected to devServer to use the provided protocol. --client-web-socket-url-username Tells clients connected to devServer to use the provided username to authenticate. --client-web-socket-url-password Tells clients connected to devServer to use the provided password to authenticate. - --web-socket-server Deprecated: please use 'webSocketServer.type'/'--web-socket-server-type' option. Allows to set web socket server and options (by default 'ws'). + --web-socket-server Deprecated: please use '--web-socket-server-type' option. Allows to set web socket server and options (by default 'ws'). --no-web-socket-server Negative 'web-socket-server' option. --web-socket-server-type Allows to set web socket server and options (by default 'ws'). --compress Enables gzip compression for everything served. diff --git a/test/cli/__snapshots__/basic.test.js.snap.webpack5 b/test/cli/__snapshots__/basic.test.js.snap.webpack5 index 973c40fa6e..17de303235 100644 --- a/test/cli/__snapshots__/basic.test.js.snap.webpack5 +++ b/test/cli/__snapshots__/basic.test.js.snap.webpack5 @@ -147,7 +147,7 @@ Options: --static-public-path-reset Clear all items provided in 'static.publicPath' configuration. The static files will be available in the browser under this public path. --watch-files Allows to configure list of globs/directories/files to watch for file changes. --watch-files-reset Clear all items provided in 'watchFiles' configuration. Allows to configure list of globs/directories/files to watch for file changes. - --web-socket-server Deprecated: please use 'webSocketServer.type'/'--web-socket-server-type' option. Allows to set web socket server and options (by default 'ws'). + --web-socket-server Deprecated: please use '--web-socket-server-type' option. Allows to set web socket server and options (by default 'ws'). --no-web-socket-server Negative 'web-socket-server' option. --web-socket-server-type Allows to set web socket server and options (by default 'ws').