Merge branch 'master' into issue/3575-Error_overlay_html_encodes_the_ansi_html_formatting_the_error_output

Author: alexander-akait

.github/workflows/nodejs.yml

@@ -35,6 +35,7 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node-version }}
+          cache: "npm"
 
       - name: Use latest NPM
         run: sudo npm i -g npm
@@ -49,7 +50,7 @@ jobs:
         run: npm audit --production
 
       - name: Check commit message
-        uses: wagoid/commitlint-github-action@v1
+        uses: wagoid/commitlint-github-action@v4
 
   test:
     name: Test - ${{ matrix.os }} - Node v${{ matrix.node-version }}, Webpack ${{ matrix.webpack-version }}
@@ -69,6 +70,7 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node-version }}
+          cache: "npm"
 
       - name: Use latest NPM on ubuntu/macos
         if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
@@ -78,36 +80,25 @@ jobs:
         if: matrix.os == 'windows-latest'
         run: npm i -g npm
 
-      - name: Get npm cache directory
-        id: npm-cache-dir
-        run: |
-          echo "::set-output name=dir::$(npm config get cache)"
-
-      - name: Cache Node.js modules
-        id: cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.npm-cache-dir.outputs.dir }}
-          key: ${{ runner.os }}-${{ matrix.webpack-version }}-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ matrix.webpack-version }}-node-
-
       - name: Install dependencies
         run: npm ci
 
       - name: Install webpack ${{ matrix.webpack-version }}
         if: matrix.webpack-version == '4'
-        run: npm i webpack@${{ matrix.webpack-version }}
+        run: npm i webpack@${{ matrix.webpack-version }} --save-dev --ignore-scripts
 
       - name: Link webpack-dev-server
         run: |
-          npm link --ignore-scripts # do not build the client again
-          npm link webpack-dev-server
+          cp -R client tmp-client
+          npm link --ignore-scripts
+          npm link webpack-dev-server --ignore-scripts
+          rm -r client
+          cp -R tmp-client client
 
       - name: Run tests for webpack version ${{ matrix.webpack-version }}
         run: npm run test:coverage -- --ci
 
       - name: Submit coverage data to codecov
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v2
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

lib/Server.js

@@ -3,6 +3,7 @@
 const os = require("os");
 const path = require("path");
 const url = require("url");
+const util = require("util");
 const fs = require("graceful-fs");
 const ipaddr = require("ipaddr.js");
 const internalIp = require("internal-ip");
@@ -18,7 +19,16 @@ if (!process.env.WEBPACK_SERVE) {
 class Server {
   constructor(options = {}, compiler) {
     // TODO: remove this after plugin support is published
+
     if (options.hooks) {
+      const showDeprecationWarning = util.deprecate(
+        () => {},
+        "Using 'compiler' as the first argument is deprecated. Please use 'options' as the first argument and 'compiler' as the second argument.",
+        "DEP_WEBPACK_DEV_SERVER_API"
+      );
+
+      showDeprecationWarning();
+
       [options, compiler] = [compiler, options];
     }
 

migration-v4.md

@@ -443,6 +443,51 @@ module.exports = {
 - Many CLI options were renamed in favor of the above change, please use `webpack serve --help` to get a list of them.
 - The `stdin` option was removed in favor of `--watch-options-stdin`.
 - `injectClient` and `injectHot` were removed in favor of manual setup entries.
+
+  - `injectClient: false` was replaced with `client: false`:
+
+  v3:
+
+  ```js
+  module.exports = {
+    devServer: {
+      injectClient: false,
+    },
+  };
+  ```
+
+  v4:
+
+  ```js
+  module.exports = {
+    devServer: {
+      client: false,
+    },
+  };
+  ```
+
+  - `injectHot: false` is now assumed when `hot: false` is used:
+
+  v3:
+
+  ```js
+  module.exports = {
+    devServer: {
+      injectHot: false,
+    },
+  };
+  ```
+
+  v4:
+
+  ```js
+  module.exports = {
+    devServer: {
+      hot: false,
+    },
+  };
+  ```
+
 - The `sockWrite` public method was renamed to `sendMessage`.
 - The `profile` option was removed in favor [`ProfilingPlugin`](https://webpack.js.org/plugins/profiling-plugin/).
 
@@ -500,3 +545,21 @@ There are a lot of other bug fixes.
   ```
 
   IE8 is not supported, sorry
+
+- Change in **Node.js API**:
+
+  - If you're using dev-server through the Node.js API, the options in devServer will be ignored. Pass the options as a first parameter instead:
+
+  v3:
+
+  ```js
+  new WebpackDevServer(compiler, {...})
+  ```
+
+  v4:
+
+  ```js
+  new WebpackDevServer({...}, compiler)
+  ```
+
+  - [See here](https://github.com/webpack/webpack-dev-server/tree/master/examples/api/simple) for an example of how to use `webpack-dev-server` through the Node.js API.