diff --git a/lib/Server.js b/lib/Server.js index ff8e0ea5e1..65be89fde6 100644 --- a/lib/Server.js +++ b/lib/Server.js @@ -949,6 +949,24 @@ class Server { options.open = [...getOpenItemsFromObject(options.open)]; } + if (options.onAfterSetupMiddleware) { + // TODO: remove in the next major release + util.deprecate( + () => {}, + "'onAfterSetupMiddleware' option is deprecated. Please use the 'setupMiddlewares' option.", + `DEP_WEBPACK_DEV_SERVER_ON_AFTER_SETUP_MIDDLEWARE` + )(); + } + + if (options.onBeforeSetupMiddleware) { + // TODO: remove in the next major release + util.deprecate( + () => {}, + "'onBeforeSetupMiddleware' option is deprecated. Please use the 'setupMiddlewares' option.", + `DEP_WEBPACK_DEV_SERVER_ON_BEFORE_SETUP_MIDDLEWARE` + )(); + } + if (typeof options.port === "string" && options.port !== "auto") { options.port = Number(options.port); } diff --git a/test/e2e/on-after-setup-middleware.test.js b/test/e2e/on-after-setup-middleware.test.js index e24ddcefbb..f7534b8db2 100644 --- a/test/e2e/on-after-setup-middleware.test.js +++ b/test/e2e/on-after-setup-middleware.test.js @@ -1,5 +1,6 @@ "use strict"; +const util = require("util"); const webpack = require("webpack"); const Server = require("../../lib/Server"); const config = require("../fixtures/client-config/webpack.config"); @@ -13,9 +14,13 @@ describe("onAfterSetupMiddleware option", () => { let browser; let pageErrors; let consoleMessages; + let utilSpy; beforeEach(async () => { compiler = webpack(config); + + utilSpy = jest.spyOn(util, "deprecate"); + server = new Server( { onAfterSetupMiddleware: (devServer) => { @@ -58,6 +63,10 @@ describe("onAfterSetupMiddleware option", () => { pageErrors.push(error); }); + expect(utilSpy.mock.calls[0][1]).toBe( + "'onAfterSetupMiddleware' option is deprecated. Please use the 'setupMiddlewares' option." + ); + const response = await page.goto( `http://127.0.0.1:${port}/after/some/path`, { @@ -94,6 +103,10 @@ describe("onAfterSetupMiddleware option", () => { interceptedRequest.continue({ method: "POST" }); }); + expect(utilSpy.mock.calls[0][1]).toBe( + "'onAfterSetupMiddleware' option is deprecated. Please use the 'setupMiddlewares' option." + ); + const response = await page.goto( `http://127.0.0.1:${port}/after/some/path`, { diff --git a/test/e2e/on-before-setup-middleware.test.js b/test/e2e/on-before-setup-middleware.test.js index 7d8efc446f..579c882ea1 100644 --- a/test/e2e/on-before-setup-middleware.test.js +++ b/test/e2e/on-before-setup-middleware.test.js @@ -1,5 +1,6 @@ "use strict"; +const util = require("util"); const webpack = require("webpack"); const Server = require("../../lib/Server"); const config = require("../fixtures/client-config/webpack.config"); @@ -13,9 +14,13 @@ describe("onBeforeSetupMiddleware option", () => { let browser; let pageErrors; let consoleMessages; + let utilSpy; beforeEach(async () => { compiler = webpack(config); + + utilSpy = jest.spyOn(util, "deprecate"); + server = new Server( { onBeforeSetupMiddleware: (devServer) => { @@ -58,6 +63,10 @@ describe("onBeforeSetupMiddleware option", () => { pageErrors.push(error); }); + expect(utilSpy.mock.calls[0][1]).toBe( + "'onBeforeSetupMiddleware' option is deprecated. Please use the 'setupMiddlewares' option." + ); + const response = await page.goto( `http://127.0.0.1:${port}/before/some/path`, { @@ -94,6 +103,10 @@ describe("onBeforeSetupMiddleware option", () => { interceptedRequest.continue({ method: "POST" }); }); + expect(utilSpy.mock.calls[0][1]).toBe( + "'onBeforeSetupMiddleware' option is deprecated. Please use the 'setupMiddlewares' option." + ); + const response = await page.goto( `http://127.0.0.1:${port}/before/some/path`, {