Merge branch 'master' into master

Author: paztis

.github/workflows/nodejs.yml

@@ -78,7 +78,16 @@ jobs:
         if: matrix.os == 'windows-latest'
         run: npm i -g npm
 
+      - 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 }}-${{ hashFiles('**/package-lock.json') }}
+
       - name: Install dependencies
+        if: steps.cache.outputs.cache-hit != 'true'
         run: npm ci
 
       - name: Install webpack ${{ matrix.webpack-version }}

bin/cli-flags.js

@@ -1,31 +1,21 @@
 'use strict';
 
-const ADVANCED_GROUP = 'Advanced options:';
-const DISPLAY_GROUP = 'Stats options:';
-const SSL_GROUP = 'SSL options:';
-const CONNECTION_GROUP = 'Connection options:';
-const RESPONSE_GROUP = 'Response options:';
-const BASIC_GROUP = 'Basic options:';
-
 module.exports = {
   devServer: [
     {
       name: 'host',
       type: String,
       description: 'The hostname/ip address the server will bind to',
-      group: CONNECTION_GROUP,
     },
     {
       name: 'port',
       type: Number,
       description: 'The port',
-      group: CONNECTION_GROUP,
     },
     {
       name: 'static',
       type: [String, Boolean],
       description: 'A directory to serve static content from.',
-      group: RESPONSE_GROUP,
       multiple: true,
       negative: true,
     },
@@ -38,13 +28,11 @@ module.exports = {
     {
       name: 'https',
       type: Boolean,
-      group: SSL_GROUP,
       description: 'HTTPS',
     },
     {
       name: 'http2',
       type: Boolean,
-      group: SSL_GROUP,
       description: 'HTTP/2, must be used with HTTPS',
     },
     {
@@ -56,7 +44,6 @@ module.exports = {
       name: 'client-progress',
       type: Boolean,
       description: 'Print compilation progress in percentage in the browser',
-      group: BASIC_GROUP,
       processor(opts) {
         opts.client = opts.client || {};
         opts.client.progress = opts.clientProgress;
@@ -67,7 +54,6 @@ module.exports = {
       name: 'hot-only',
       type: Boolean,
       description: 'Do not refresh page if HMR fails',
-      group: ADVANCED_GROUP,
       processor(opts) {
         opts.hot = 'only';
         delete opts.hotOnly;
@@ -77,7 +63,6 @@ module.exports = {
       name: 'setup-exit-signals',
       type: Boolean,
       description: 'Close and exit the process on SIGINT and SIGTERM',
-      group: ADVANCED_GROUP,
       negative: true,
     },
     {
@@ -105,7 +90,6 @@ module.exports = {
     {
       name: 'client-logging',
       type: String,
-      group: DISPLAY_GROUP,
       description:
         'Log level in the browser (none, error, warn, info, log, verbose)',
       processor(opts) {
@@ -118,26 +102,22 @@ module.exports = {
       name: 'history-api-fallback',
       type: Boolean,
       description: 'Fallback to /index.html for Single Page Applications.',
-      group: RESPONSE_GROUP,
     },
     {
       name: 'compress',
       type: Boolean,
       description: 'Enable gzip compression',
-      group: RESPONSE_GROUP,
     },
     {
       name: 'public',
       type: String,
       description: 'The public hostname/ip address of the server',
-      group: CONNECTION_GROUP,
     },
     {
       name: 'firewall',
       type: String,
       description:
         'Enable/disable firewall, or set hosts that are allowed to access the dev server',
-      group: CONNECTION_GROUP,
       multiple: true,
     },
   ],

package-lock.json

@@ -43,7 +43,7 @@
     "del": "^6.0.0",
     "express": "^4.17.1",
     "find-cache-dir": "^3.3.1",
-    "graceful-fs": "^4.2.4",
+    "graceful-fs": "^4.2.5",
     "html-entities": "^1.3.3",
     "http-proxy-middleware": "^1.0.6",
     "internal-ip": "^6.2.0",
@@ -63,7 +63,7 @@
     "url": "^0.11.0",
     "util": "^0.12.3",
     "webpack-dev-middleware": "^4.0.2",
-    "ws": "^7.4.2"
+    "ws": "^7.4.3"
   },
   "devDependencies": {
     "@babel/cli": "^7.12.10",
@@ -74,7 +74,7 @@
     "@commitlint/cli": "^11.0.0",
     "@commitlint/config-conventional": "^11.0.0",
     "@jest/test-sequencer": "^26.6.3",
-    "acorn": "^8.0.4",
+    "acorn": "^8.0.5",
     "babel-jest": "^26.6.3",
     "babel-loader": "^8.2.2",
     "body-parser": "^1.19.0",
@@ -91,8 +91,8 @@
     "jest-circus": "^26.6.3",
     "less": "^3.12.2",
     "less-loader": "^7.1.0",
-    "lint-staged": "^10.5.3",
-    "marked": "^1.2.7",
+    "lint-staged": "^10.5.4",
+    "marked": "^1.2.9",
     "memfs": "^3.2.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.2.1",