Merge branch 'master' into chore/update

Author: snitin315

.github/workflows/nodejs.yml

@@ -78,22 +78,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:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: ~/.npm
-          key: ${{ runner.OS }}-${{ matrix.node-version }}-${{ matrix.webpack-version }}-${{ hashFiles('**/package-lock.json') }}
+          path: ${{ steps.npm-cache-dir.outputs.dir }}
+          key: ${{ runner.os }}-${{ matrix.webpack-version }}-node-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
-            ${{ runner.OS }}-${{ matrix.node-version }}-${{ matrix.webpack-version }}-
-            ${{ runner.OS }}-
+            ${{ runner.os }}-${{ matrix.webpack-version }}-node-
 
       - name: Install dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
         run: npm ci
 
       - name: Install webpack ${{ matrix.webpack-version }}
+        if: matrix.webpack-version == '4'
         run: npm i webpack@${{ matrix.webpack-version }}
 
       - name: Link webpack-dev-server

bin/cli-flags.js

@@ -68,7 +68,7 @@ module.exports = {
     {
       name: 'stdin',
       type: Boolean,
-      description: 'close when stdin ends',
+      description: 'Close when stdin ends',
     },
     {
       name: 'open',

lib/utils/normalizeOptions.js

@@ -15,7 +15,7 @@ function normalizeOptions(compiler, options) {
     : {};
 
   const defaultOptionsForStatic = {
-    directory: path.join(process.cwd(), 'static'),
+    directory: path.join(process.cwd(), 'public'),
     staticOptions: {},
     publicPath: ['/'],
     serveIndex: { icons: true },

package-lock.json

@@ -66,10 +66,10 @@
     "ws": "^7.4.3"
   },
   "devDependencies": {
-    "@babel/cli": "^7.12.13",
-    "@babel/core": "^7.12.13",
+    "@babel/cli": "^7.12.16",
+    "@babel/core": "^7.12.16",
     "@babel/plugin-transform-runtime": "^7.12.15",
-    "@babel/preset-env": "^7.12.13",
+    "@babel/preset-env": "^7.12.16",
     "@babel/runtime": "^7.12.13",
     "@commitlint/cli": "^11.0.0",
     "@commitlint/config-conventional": "^11.0.0",
@@ -92,7 +92,7 @@
     "less": "^3.12.2",
     "less-loader": "^7.1.0",
     "lint-staged": "^10.5.4",
-    "marked": "^1.2.9",
+    "marked": "^2.0.0",
     "memfs": "^3.2.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.2.1",

package.json

@@ -2,7 +2,7 @@
 
 exports[`CLI --hot webpack 5 1`] = `
 "<i> [webpack-dev-server] Project is running at http://localhost:8080/
-<i> [webpack-dev-server] Content not from webpack x.x.x served from 'Xdir/static' directory
+<i> [webpack-dev-server] Content not from webpack x.x.x served from 'Xdir/public' directory
 <i> [webpack-dev-middleware] asset main.js X KiB [emitted] (name: main)
 <i> runtime modules X KiB 10 modules
 <i> cacheable modules X KiB
@@ -21,7 +21,7 @@ exports[`CLI --hot webpack 5 1`] = `
 
 exports[`CLI --no-hot webpack 5 1`] = `
 "<i> [webpack-dev-server] Project is running at http://localhost:8080/
-<i> [webpack-dev-server] Content not from webpack x.x.x served from 'Xdir/static' directory
+<i> [webpack-dev-server] Content not from webpack x.x.x served from 'Xdir/public' directory
 <i> [webpack-dev-middleware] asset main.js X KiB [emitted] (name: main)
 <i> runtime modules X bytes 3 modules
 <i> cacheable modules X KiB

test/cli/__snapshots__/cli.test.js.snap

@@ -37,7 +37,7 @@ runCLITest('CLI', () => {
       .replace(/webpack [^ )]+/g, 'webpack x.x.x')
       .replace(new RegExp(quotemeta(basePath.replace(/\\/g, '/')), 'g'), 'Xdir')
       .replace(new RegExp(quotemeta(basePath), 'g'), 'Xdir')
-      .replace(/[\\/]static/, '/static')
+      .replace(/[\\/]public/, '/public')
       .replace(/(Hash:) [a-z0-9]+/g, '$1 X')
       .replace(/ dependencies:Xms/g, '')
       .replace(/, additional resolving: X ms/g, '');

test/cli/cli.test.js

@@ -449,7 +449,7 @@ describe('normalizeOptions', () => {
 
           if (data.options.static) {
             data.options.static.forEach((staticOpts) => {
-              if (staticOpts.directory === path.join(process.cwd(), 'static')) {
+              if (staticOpts.directory === path.join(process.cwd(), 'public')) {
                 // give an indication in the snapshot that this is the
                 // current working directory
                 staticOpts.directory = 'CWD';