diff --git a/.cspell.json b/.cspell.json
index ee2bee7f736..0e1a2be1f25 100644
--- a/.cspell.json
+++ b/.cspell.json
@@ -17,6 +17,7 @@
     "configjs",
     "configtest",
     "CRLs",
+    "dbaeumer",
     "deserialization",
     "discoveryjs",
     "dotfolder",
@@ -24,6 +25,8 @@
     "entrypoints",
     "envinfo",
     "Eren",
+    "esbenp",
+    "eslintcache",
     "execa",
     "Fira",
     "gitter",
@@ -31,8 +34,8 @@
     "Hisoka",
     "Hoshiumi",
     "Ichigo",
-    "IIFE's",
     "iife",
+    "IIFE's",
     "Itadori",
     "Iwaizumi",
     "Jotaro",
@@ -45,13 +48,19 @@
     "loglevel",
     "Luffy",
     "mergeable",
+    "mfirst",
     "Miyuki",
     "Mizuhara",
+    "msecond",
+    "msuccessfully",
     "multicompiler",
     "multipleq",
+    "myvar",
+    "myval",
     "Naruto",
     "Neue",
     "Nishinoya",
+    "Nitin",
     "nwjs",
     "Oikawa",
     "pathinfo",
@@ -67,9 +76,11 @@
     "Satoru",
     "Segoe",
     "Shoyo",
+    "smoketest",
     "smoketests",
     "sockjs",
     "somefile",
+    "sourcemaps",
     "SPDY",
     "splitted",
     "Statsv",
@@ -82,23 +93,14 @@
     "Tobio",
     "tsbuildinfo",
     "typeahead",
+    "wagoid",
     "webassembly",
     "webpackfile",
     "Yukihira",
     "Yukii",
     "Yuuji",
     "Zangetsu",
-    "Zenitsu",
-    "eslintcache",
-    "wagoid",
-    "Nitin",
-    "smoketest",
-    "dbaeumer",
-    "esbenp",
-    "msuccessfully",
-    "mfirst",
-    "msecond",
-    "sourcemaps"
+    "Zenitsu"
   ],
   "dictionaries": ["npm", "software-terms"],
   "ignorePaths": [
diff --git a/.gitattributes b/.gitattributes
index 1632a73dd4c..07764a78d98 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1 @@
-*.js text eol=lf
-*.ts text eol=lf
+* text eol=lf
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 3ce9cf3263f..b584e11e98b 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,7 +1,6 @@
 <!--
   👉🏽 Need support, advice, or help? Don't open an issue!
-  Head to StackOverflow or https://gitter.im/webpack/webpack.
-
+  Head to StackOverflow or https://github.com/webpack/webpack/discussions
   Hey there!
 
   You arrived at this template because you felt none of the other options
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index f22c2a1747c..07b5c3bc21c 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -66,7 +66,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        node-version: [14.x, 16.x, 18.x, 19.x]
+        node-version: [14.x, 16.x, 18.x, 20.x]
         shard: ["1/4", "2/4", "3/4", "4/4"]
         webpack-version: [latest]
         dev-server-version: [latest]
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3197c97a712..350f0ba6e30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## [5.1.1](https://github.com/webpack/webpack-cli/compare/webpack-cli@5.1.0...webpack-cli@5.1.1) (2023-05-09)
+
+### Bug Fixes
+
+- false positive warning when `--watch` used ([#3783](https://github.com/webpack/webpack-cli/issues/3783)) ([c0436ba](https://github.com/webpack/webpack-cli/commit/c0436baca2da7a8ce9e53bbbe960dd1951fe6404))
+
+# [5.1.0](https://github.com/webpack/webpack-cli/compare/webpack-cli@5.0.2...webpack-cli@5.1.0) (2023-05-07)
+
+### Features
+
+- shareable webpack configs using `extends` ([#3738](https://github.com/webpack/webpack-cli/issues/3738)) ([d04d0b9](https://github.com/webpack/webpack-cli/commit/d04d0b98b69948966c8de5dacf771ac324ba5658))
+
+### Performance Improvements
+
+- simplify logic, reduce extra loops and perf ([#3767](https://github.com/webpack/webpack-cli/issues/3767)) ([6afe1d3](https://github.com/webpack/webpack-cli/commit/6afe1d3be41e191aa7c4865919d092d952e98605))
+
 ## [5.0.2](https://github.com/webpack/webpack-cli/compare/webpack-cli@5.0.1...webpack-cli@5.0.2) (2023-04-21)
 
 ### Bug Fixes
diff --git a/OPTIONS.md b/OPTIONS.md
index ef31666326f..a638429def9 100644
--- a/OPTIONS.md
+++ b/OPTIONS.md
@@ -5,16 +5,16 @@ Alternative usage to run commands: webpack [command] [options]
 The build tool for modern web applications.
 
 Options:
-  -c, --config <value...>                                                            Provide path to a webpack configuration file e.g. ./webpack.config.js.
-  --config-name <value...>                                                           Name of the configuration to use.
+  -c, --config <pathToConfigFile...>                                                 Provide path to one or more webpack configuration files to process, e.g. "./webpack.config.js".
+  --config-name <name...>                                                            Name(s) of particular configuration(s) to use if configuration file exports an array of multiple configurations.
   -m, --merge                                                                        Merge two or more configurations using 'webpack-merge'.
   --disable-interpret                                                                Disable interpret for loading the config file.
-  --env <value...>                                                                   Environment passed to the configuration when it is a function.
+  --env <value...>                                                                   Environment variables passed to the configuration when it is a function, e.g. "myvar" or "myvar=myval".
   --node-env <value>                                                                 Sets process.env.NODE_ENV to the specified value.
   --define-process-env-node-env <value>                                              Sets process.env.NODE_ENV to the specified value. (Currently an alias for `--node-env`).
   --analyze                                                                          It invokes webpack-bundle-analyzer plugin to get bundle information.
   --progress [value]                                                                 Print compilation progress during build.
-  -j, --json [value]                                                                 Prints result as JSON or store it in a file.
+  -j, --json [pathToJsonFile]                                                        Prints result as JSON or store it in a file.
   --fail-on-warnings                                                                 Stop webpack-cli process with non-zero exit code on warnings from webpack.
   -e, --extends <value...>                                                           Path to the configuration to be extended (only works when using webpack-cli).
   --no-amd                                                                           Negative 'amd' option.
@@ -1015,7 +1015,7 @@ Commands:
   init|create|new|c|n [generation-path] [options]                                    Initialize a new webpack project.
   loader|l [output-path] [options]                                                   Scaffold a loader.
   plugin|p [output-path] [options]                                                   Scaffold a plugin.
-  serve|server|s [entries...] [options]                                              Run the webpack dev server.
+  serve|server|s [entries...] [options]                                              Run the webpack dev server and watch for source file changes while serving.
   version|v [options]                                                                Output the version number of 'webpack', 'webpack-cli' and 'webpack-dev-server' and commands.
   watch|w [entries...] [options]                                                     Run webpack and watch for files changes.
 
diff --git a/README.md b/README.md
index 6dd5876c151..247b78469e6 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
 [![Build Status][build-status]][build-status-url]
 [![codecov][codecov-badge]][codecov-url]
 [![Install Size][size]][size-url]
-[![Chat on gitter][chat]][chat-url]
+[![GitHub Discussions][discussion]][discussion-url]
 
 ## Table of Contents
 
@@ -109,8 +109,8 @@ If you like **webpack**, please consider donating through [Open Collective](http
 [codecov-url]: https://codecov.io/gh/webpack/webpack-cli
 [size]: https://packagephobia.com/badge?p=webpack-cli
 [size-url]: https://packagephobia.com/result?p=webpack-cli
-[chat]: https://badges.gitter.im/webpack/webpack.svg
-[chat-url]: https://gitter.im/webpack/webpack
+[discussion]: https://img.shields.io/github/discussions/webpack/webpack
+[discussion-url]: https://github.com/webpack/webpack/discussions
 
 ## Code of Conduct
 
diff --git a/SERVE-OPTIONS-v4.md b/SERVE-OPTIONS-v4.md
index 609b1ae0090..100364c7451 100644
--- a/SERVE-OPTIONS-v4.md
+++ b/SERVE-OPTIONS-v4.md
@@ -1,18 +1,18 @@
 ```
 Usage: webpack serve|server|s [entries...] [options]
 
-Run the webpack dev server.
+Run the webpack dev server and watch for source file changes while serving.
 
 Options:
-  -c, --config <value...>                             Provide path to a webpack configuration file e.g. ./webpack.config.js.
-  --config-name <value...>                            Name of the configuration to use.
+  -c, --config <pathToConfigFile...>                  Provide path to one or more webpack configuration files to process, e.g. "./webpack.config.js".
+  --config-name <name...>                             Name(s) of particular configuration(s) to use if configuration file exports an array of multiple configurations.
   -m, --merge                                         Merge two or more configurations using 'webpack-merge'.
   --disable-interpret                                 Disable interpret for loading the config file.
-  --env <value...>                                    Environment passed to the configuration when it is a function.
+  --env <value...>                                    Environment variables passed to the configuration when it is a function, e.g. "myvar" or "myvar=myval".
   --node-env <value>                                  Sets process.env.NODE_ENV to the specified value.
   --analyze                                           It invokes webpack-bundle-analyzer plugin to get bundle information.
   --progress [value]                                  Print compilation progress during build.
-  -j, --json [value]                                  Prints result as JSON or store it in a file.
+  -j, --json [pathToJsonFile]                         Prints result as JSON or store it in a file.
   --fail-on-warnings                                  Stop webpack-cli process with non-zero exit code on warnings from webpack.
   -e, --extends <value...>                            Path to the configuration to be extended (only works when using webpack-cli).
   -d, --devtool <value>                               A developer tool to enhance debugging (false | eval | [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
@@ -26,6 +26,8 @@ Options:
   --no-stats                                          Negative 'stats' option.
   -t, --target <value...>                             Environment to build for. Environment to build for. An array of environments to build for all of them when possible.
   --no-target                                         Negative 'target' option.
+  -w, --watch                                         Enter watch mode, which rebuilds on file change.
+  --no-watch                                          Negative 'watch' option.
   --watch-options-stdin                               Stop watching when stdin stream has ended.
   --no-watch-options-stdin                            Negative 'watch-options-stdin' option.
   --allowed-hosts <value...>                          Allows to enumerate the hosts from which access to the dev server are allowed (useful when you are proxying dev server, by default is 'auto').
diff --git a/package.json b/package.json
index 578dd8c72cb..0fc93b7663b 100644
--- a/package.json
+++ b/package.json
@@ -88,8 +88,8 @@
     "style-loader": "^3.3.1",
     "ts-jest": "^29.0.1",
     "ts-loader": "^9.3.1",
-    "ts-node": "^10.8.0",
-    "typescript": "^4.9.3",
+    "ts-node": "^10.9.1",
+    "typescript": "^5.0.4",
     "webpack": "^5.72.0",
     "webpack-bundle-analyzer": "^4.5.0",
     "webpack-dev-server": "^4.8.1"
diff --git a/packages/configtest/CHANGELOG.md b/packages/configtest/CHANGELOG.md
index 24aff92747d..66532000907 100644
--- a/packages/configtest/CHANGELOG.md
+++ b/packages/configtest/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.1.1](https://github.com/webpack/webpack-cli/compare/@webpack-cli/configtest@2.1.0...@webpack-cli/configtest@2.1.1) (2023-06-04)
+
+**Note:** Version bump only for package @webpack-cli/configtest
+
 # [2.1.0](https://github.com/webpack/webpack-cli/compare/@webpack-cli/configtest@2.0.1...@webpack-cli/configtest@2.1.0) (2023-05-07)
 
 ### Features
diff --git a/packages/configtest/package.json b/packages/configtest/package.json
index f66f2e9404e..e65cfe1d735 100644
--- a/packages/configtest/package.json
+++ b/packages/configtest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@webpack-cli/configtest",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Validate a webpack configuration.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/packages/configtest/src/index.ts b/packages/configtest/src/index.ts
index 7fa6297bd2e..a0d6189a2b2 100644
--- a/packages/configtest/src/index.ts
+++ b/packages/configtest/src/index.ts
@@ -1,4 +1,4 @@
-import { IWebpackCLI } from "webpack-cli";
+import { type IWebpackCLI } from "webpack-cli";
 
 const WEBPACK_PACKAGE = process.env.WEBPACK_PACKAGE || "webpack";
 
diff --git a/packages/generators/CHANGELOG.md b/packages/generators/CHANGELOG.md
index b5aef954f37..f900d0a5995 100644
--- a/packages/generators/CHANGELOG.md
+++ b/packages/generators/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.0.5](https://github.com/webpack/webpack-cli/compare/@webpack-cli/generators@3.0.4...@webpack-cli/generators@3.0.5) (2023-06-04)
+
+**Note:** Version bump only for package @webpack-cli/generators
+
+## [3.0.4](https://github.com/webpack/webpack-cli/compare/@webpack-cli/generators@3.0.3...@webpack-cli/generators@3.0.4) (2023-05-09)
+
+**Note:** Version bump only for package @webpack-cli/generators
+
 ## [3.0.3](https://github.com/webpack/webpack-cli/compare/@webpack-cli/generators@3.0.2...@webpack-cli/generators@3.0.3) (2023-05-07)
 
 **Note:** Version bump only for package @webpack-cli/generators
diff --git a/packages/generators/package.json b/packages/generators/package.json
index c0c52719b7c..0423b73be19 100644
--- a/packages/generators/package.json
+++ b/packages/generators/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@webpack-cli/generators",
-  "version": "3.0.3",
+  "version": "3.0.5",
   "description": "Webpack-CLI generators",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -25,7 +25,7 @@
     "plugin-template"
   ],
   "dependencies": {
-    "webpack-cli": "^5.1.0",
+    "webpack-cli": "^5.1.2",
     "yeoman-environment": "^3.9.1",
     "yeoman-generator": "^5.7.0"
   },
diff --git a/packages/generators/src/addon-generator.ts b/packages/generators/src/addon-generator.ts
index 496069099c3..cc39c3e16e4 100644
--- a/packages/generators/src/addon-generator.ts
+++ b/packages/generators/src/addon-generator.ts
@@ -2,7 +2,7 @@ import fs from "fs";
 import path from "path";
 import Generator from "yeoman-generator";
 
-import { CustomGenerator } from "./types";
+import { CustomGenerator } from "./custom-generator";
 import type { CustomGeneratorOptions, BaseCustomGeneratorOptions } from "./types";
 import { getInstaller, getTemplate } from "./utils/helpers";
 
diff --git a/packages/generators/src/custom-generator.ts b/packages/generators/src/custom-generator.ts
new file mode 100644
index 00000000000..51fa45d480b
--- /dev/null
+++ b/packages/generators/src/custom-generator.ts
@@ -0,0 +1,33 @@
+import Generator from "yeoman-generator";
+import { type IWebpackCLI } from "webpack-cli";
+import path from "path";
+import { BaseCustomGeneratorOptions, CustomGeneratorOptions } from "./types";
+
+export class CustomGenerator<
+  T extends BaseCustomGeneratorOptions = BaseCustomGeneratorOptions,
+  Z extends CustomGeneratorOptions<T> = CustomGeneratorOptions<T>,
+> extends Generator<Z> {
+  public cli: IWebpackCLI;
+  public template: string;
+  public dependencies: string[];
+  public force: boolean;
+  public answers: Record<string, unknown>;
+  public generationPath: string;
+  public supportedTemplates: string[];
+  public packageManager: string | undefined;
+
+  public constructor(args: string | string[], opts: Z) {
+    super(args, opts);
+
+    this.cli = opts.cli;
+    this.dependencies = [];
+    this.answers = {};
+    this.supportedTemplates = [];
+
+    const { options } = opts;
+
+    this.template = options.template;
+    this.force = typeof options.force !== "undefined" ? options.force : false;
+    this.generationPath = path.resolve(process.cwd(), options.generationPath);
+  }
+}
diff --git a/packages/generators/src/handlers/default.ts b/packages/generators/src/handlers/default.ts
index 477902c0079..00aaf11f548 100644
--- a/packages/generators/src/handlers/default.ts
+++ b/packages/generators/src/handlers/default.ts
@@ -1,6 +1,6 @@
 import path from "path";
-import { CustomGenerator } from "../types";
-import * as QuestionAPI from "../utils/scaffold-utils";
+import type { CustomGenerator } from "../custom-generator";
+import type * as QuestionAPI from "../utils/scaffold-utils";
 
 const templatePath = path.resolve(__dirname, "../../init-template/default");
 const resolveFile = (file: string): string => {
diff --git a/packages/generators/src/handlers/react.ts b/packages/generators/src/handlers/react.ts
index 5a6153e3fee..6dab1cfe4ab 100644
--- a/packages/generators/src/handlers/react.ts
+++ b/packages/generators/src/handlers/react.ts
@@ -1,7 +1,7 @@
 import path from "path";
-import { CustomGenerator } from "../types";
 import { questions as defaultQuestions } from "./default";
-import * as QuestionAPI from "../utils/scaffold-utils";
+import type { CustomGenerator } from "../custom-generator";
+import type * as QuestionAPI from "../utils/scaffold-utils";
 
 const templatePath = path.resolve(__dirname, "../../init-template/react");
 const resolveFile = (file: string): string => {
diff --git a/packages/generators/src/index.ts b/packages/generators/src/index.ts
index 3ac437b250e..3b2ccd75b71 100644
--- a/packages/generators/src/index.ts
+++ b/packages/generators/src/index.ts
@@ -4,7 +4,7 @@ import pluginGenerator from "./plugin-generator";
 import addonGenerator from "./addon-generator";
 import initGenerator from "./init-generator";
 import type { InitOptions, LoaderOptions, PluginOptions } from "./types";
-import { IWebpackCLI } from "webpack-cli";
+import type { IWebpackCLI } from "webpack-cli";
 
 class GeneratorsCommand {
   async apply(cli: IWebpackCLI): Promise<void> {
diff --git a/packages/generators/src/init-generator.ts b/packages/generators/src/init-generator.ts
index e2739fe7b5c..fc8027f5812 100644
--- a/packages/generators/src/init-generator.ts
+++ b/packages/generators/src/init-generator.ts
@@ -1,10 +1,12 @@
 import { readFileSync, writeFileSync } from "fs";
 
-import { CustomGenerator, InitGeneratorOptions, CustomGeneratorOptions } from "./types";
+import { CustomGenerator } from "./custom-generator";
 import { getInstaller, getTemplate } from "./utils/helpers";
 import * as Question from "./utils/scaffold-utils";
 import handlers from "./handlers";
 
+import { type InitGeneratorOptions, type CustomGeneratorOptions } from "./types";
+
 export default class InitGenerator<
   T extends InitGeneratorOptions = InitGeneratorOptions,
   Z extends CustomGeneratorOptions<T> = CustomGeneratorOptions<T>,
diff --git a/packages/generators/src/loader-generator.ts b/packages/generators/src/loader-generator.ts
index a0d798ebac6..8e522bef1ab 100644
--- a/packages/generators/src/loader-generator.ts
+++ b/packages/generators/src/loader-generator.ts
@@ -1,8 +1,9 @@
 import path from "path";
 import addonGenerator from "./addon-generator";
 import { toKebabCase } from "./utils/helpers";
+
 import type { LoaderGeneratorOptions } from "./types";
-import Generator from "yeoman-generator";
+import type Generator from "yeoman-generator";
 
 /**
  * Formats a string into webpack loader format
diff --git a/packages/generators/src/plugin-generator.ts b/packages/generators/src/plugin-generator.ts
index 463e710ffe1..e7d4180d262 100644
--- a/packages/generators/src/plugin-generator.ts
+++ b/packages/generators/src/plugin-generator.ts
@@ -2,7 +2,7 @@ import path from "path";
 import addonGenerator from "./addon-generator";
 import { toKebabCase, toUpperCamelCase } from "./utils/helpers";
 import type { PluginGeneratorOptions } from "./types";
-import Generator from "yeoman-generator";
+import type Generator from "yeoman-generator";
 
 export const PluginGenerator = addonGenerator<PluginGeneratorOptions>(
   [
diff --git a/packages/generators/src/types/index.ts b/packages/generators/src/types/index.ts
index a27d7758cb3..abbd8118c59 100644
--- a/packages/generators/src/types/index.ts
+++ b/packages/generators/src/types/index.ts
@@ -1,6 +1,5 @@
-import Generator from "yeoman-generator";
-import path from "path";
-import { IWebpackCLI } from "webpack-cli";
+import type Generator from "yeoman-generator";
+import { type IWebpackCLI } from "webpack-cli";
 
 export type InitOptions = { template: string; force?: boolean };
 export type LoaderOptions = { template: string };
@@ -20,32 +19,3 @@ export type CustomGeneratorOptions<T extends BaseCustomGeneratorOptions> =
     cli: IWebpackCLI;
     options: T;
   };
-
-export class CustomGenerator<
-  T extends BaseCustomGeneratorOptions = BaseCustomGeneratorOptions,
-  Z extends CustomGeneratorOptions<T> = CustomGeneratorOptions<T>,
-> extends Generator<Z> {
-  public cli: IWebpackCLI;
-  public template: string;
-  public dependencies: string[];
-  public force: boolean;
-  public answers: Record<string, unknown>;
-  public generationPath: string;
-  public supportedTemplates: string[];
-  public packageManager: string | undefined;
-
-  public constructor(args: string | string[], opts: Z) {
-    super(args, opts);
-
-    this.cli = opts.cli;
-    this.dependencies = [];
-    this.answers = {};
-    this.supportedTemplates = [];
-
-    const { options } = opts;
-
-    this.template = options.template;
-    this.force = typeof options.force !== "undefined" ? options.force : false;
-    this.generationPath = path.resolve(process.cwd(), options.generationPath);
-  }
-}
diff --git a/packages/generators/src/utils/helpers.ts b/packages/generators/src/utils/helpers.ts
index fe152bc46c0..99e08bff55c 100644
--- a/packages/generators/src/utils/helpers.ts
+++ b/packages/generators/src/utils/helpers.ts
@@ -1,4 +1,4 @@
-import { CustomGenerator } from "../types";
+import type { CustomGenerator } from "../custom-generator";
 import { List } from "./scaffold-utils";
 
 const regex = /[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[0-9]+/g;
diff --git a/packages/generators/src/utils/scaffold-utils.ts b/packages/generators/src/utils/scaffold-utils.ts
index 08fbfeeaf8f..4e58ffd2ba5 100644
--- a/packages/generators/src/utils/scaffold-utils.ts
+++ b/packages/generators/src/utils/scaffold-utils.ts
@@ -1,4 +1,4 @@
-import Generator from "yeoman-generator";
+import type Generator from "yeoman-generator";
 
 type CustomGeneratorStringPrompt = { [x: string]: string } | Promise<{ [x: string]: string }>;
 type CustomGeneratorBoolPrompt = { [x: string]: boolean } | Promise<{ [x: string]: boolean }>;
diff --git a/packages/info/CHANGELOG.md b/packages/info/CHANGELOG.md
index f52d7ac8fe5..42ad1a29acf 100644
--- a/packages/info/CHANGELOG.md
+++ b/packages/info/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.2](https://github.com/webpack/webpack-cli/compare/@webpack-cli/info@2.0.1...@webpack-cli/info@2.0.2) (2023-06-04)
+
+**Note:** Version bump only for package @webpack-cli/info
+
 ## [2.0.1](https://github.com/webpack/webpack-cli/compare/@webpack-cli/info@2.0.0...@webpack-cli/info@2.0.1) (2022-12-05)
 
 **Note:** Version bump only for package @webpack-cli/info
diff --git a/packages/info/package.json b/packages/info/package.json
index 617bf872e1f..698a6f966bf 100644
--- a/packages/info/package.json
+++ b/packages/info/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@webpack-cli/info",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Outputs info about system and webpack config",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/packages/info/src/index.ts b/packages/info/src/index.ts
index fb8c9f54e18..cb9c09509ec 100644
--- a/packages/info/src/index.ts
+++ b/packages/info/src/index.ts
@@ -1,4 +1,4 @@
-import { IWebpackCLI } from "webpack-cli";
+import { type IWebpackCLI } from "webpack-cli";
 
 class InfoCommand {
   async apply(cli: IWebpackCLI): Promise<void> {
diff --git a/packages/serve/CHANGELOG.md b/packages/serve/CHANGELOG.md
index 50c1128920c..c75f054e05f 100644
--- a/packages/serve/CHANGELOG.md
+++ b/packages/serve/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.5](https://github.com/webpack/webpack-cli/compare/@webpack-cli/serve@2.0.4...@webpack-cli/serve@2.0.5) (2023-06-04)
+
+### Bug Fixes
+
+- improve help for some flags ([f468614](https://github.com/webpack/webpack-cli/commit/f4686141681cfcbc74d57e69a732e176decff225))
+
+## [2.0.4](https://github.com/webpack/webpack-cli/compare/@webpack-cli/serve@2.0.3...@webpack-cli/serve@2.0.4) (2023-05-09)
+
+### Bug Fixes
+
+- false positive warning when `--watch` used ([#3783](https://github.com/webpack/webpack-cli/issues/3783)) ([c0436ba](https://github.com/webpack/webpack-cli/commit/c0436baca2da7a8ce9e53bbbe960dd1951fe6404))
+
 ## [2.0.3](https://github.com/webpack/webpack-cli/compare/@webpack-cli/serve@2.0.2...@webpack-cli/serve@2.0.3) (2023-05-07)
 
 ### Performance Improvements
diff --git a/packages/serve/package.json b/packages/serve/package.json
index deef045193a..fb04301a0a6 100644
--- a/packages/serve/package.json
+++ b/packages/serve/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@webpack-cli/serve",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/packages/serve/src/index.ts b/packages/serve/src/index.ts
index 28374fa9194..b6bef8847bf 100644
--- a/packages/serve/src/index.ts
+++ b/packages/serve/src/index.ts
@@ -1,5 +1,5 @@
-import type { Compiler, cli } from "webpack";
-import { IWebpackCLI, WebpackDevServerOptions } from "webpack-cli";
+import { type Compiler, type cli } from "webpack";
+import { type IWebpackCLI, type WebpackDevServerOptions } from "webpack-cli";
 
 const WEBPACK_PACKAGE = process.env.WEBPACK_PACKAGE || "webpack";
 const WEBPACK_DEV_SERVER_PACKAGE = process.env.WEBPACK_DEV_SERVER_PACKAGE || "webpack-dev-server";
@@ -28,7 +28,7 @@ class ServeCommand {
       {
         name: "serve [entries...]",
         alias: ["server", "s"],
-        description: "Run the webpack dev server.",
+        description: "Run the webpack dev server and watch for source file changes while serving.",
         usage: "[entries...] [options]",
         pkg: "@webpack-cli/serve",
         dependencies: [WEBPACK_PACKAGE, WEBPACK_DEV_SERVER_PACKAGE],
@@ -47,10 +47,7 @@ class ServeCommand {
           process.exit(2);
         }
 
-        const builtInOptions = cli.getBuiltInOptions().filter(
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          (option: any) => option.name !== "watch",
-        );
+        const builtInOptions = cli.getBuiltInOptions();
 
         return [...builtInOptions, ...devServerFlags];
       },
@@ -110,6 +107,8 @@ class ServeCommand {
           env: { WEBPACK_SERVE: true, ...options.env },
         };
 
+        webpackCLIOptions.isWatchingLikeCommand = true;
+
         const compiler = await cli.createCompiler(webpackCLIOptions);
 
         if (!compiler) {
diff --git a/packages/webpack-cli/CHANGELOG.md b/packages/webpack-cli/CHANGELOG.md
index 51ebf70f6c3..4fe3cd1a27e 100644
--- a/packages/webpack-cli/CHANGELOG.md
+++ b/packages/webpack-cli/CHANGELOG.md
@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.1.2](https://github.com/webpack/webpack-cli/compare/webpack-cli@5.1.1...webpack-cli@5.1.2) (2023-06-04)
+
+### Bug Fixes
+
+- improve check for custom webpack and webpack-dev-server package existance ([0931ab6](https://github.com/webpack/webpack-cli/commit/0931ab6dfd8d9f511036bcb7c1a4ea8dde1ff1cb))
+- improve help for some flags ([f468614](https://github.com/webpack/webpack-cli/commit/f4686141681cfcbc74d57e69a732e176decff225))
+- improved support for `.cts` and `.mts` extensions ([a77daf2](https://github.com/webpack/webpack-cli/commit/a77daf28f8a8ad96410a39d565f011f6bb14f6bb))
+
+## [5.1.1](https://github.com/webpack/webpack-cli/compare/webpack-cli@5.1.0...webpack-cli@5.1.1) (2023-05-09)
+
+### Bug Fixes
+
+- false positive warning when `--watch` used ([#3783](https://github.com/webpack/webpack-cli/issues/3783)) ([c0436ba](https://github.com/webpack/webpack-cli/commit/c0436baca2da7a8ce9e53bbbe960dd1951fe6404))
+
 # [5.1.0](https://github.com/webpack/webpack-cli/compare/webpack-cli@5.0.2...webpack-cli@5.1.0) (2023-05-07)
 
 ### Features
diff --git a/packages/webpack-cli/package.json b/packages/webpack-cli/package.json
index a273745954f..e958efe28f5 100644
--- a/packages/webpack-cli/package.json
+++ b/packages/webpack-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webpack-cli",
-  "version": "5.1.0",
+  "version": "5.1.2",
   "description": "CLI for webpack & friends",
   "license": "MIT",
   "repository": {
@@ -35,9 +35,9 @@
   ],
   "dependencies": {
     "@discoveryjs/json-ext": "^0.5.0",
-    "@webpack-cli/configtest": "^2.1.0",
-    "@webpack-cli/info": "^2.0.1",
-    "@webpack-cli/serve": "^2.0.3",
+    "@webpack-cli/configtest": "^2.1.1",
+    "@webpack-cli/info": "^2.0.2",
+    "@webpack-cli/serve": "^2.0.5",
     "colorette": "^2.0.14",
     "commander": "^10.0.1",
     "cross-spawn": "^7.0.3",
diff --git a/packages/webpack-cli/src/bootstrap.ts b/packages/webpack-cli/src/bootstrap.ts
index 347c65e250c..90789d2cfe3 100644
--- a/packages/webpack-cli/src/bootstrap.ts
+++ b/packages/webpack-cli/src/bootstrap.ts
@@ -1,4 +1,4 @@
-import { IWebpackCLI } from "./types";
+import { type IWebpackCLI } from "./types";
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const WebpackCLI = require("./webpack-cli");
diff --git a/packages/webpack-cli/src/index.ts b/packages/webpack-cli/src/index.ts
index ff4f75a23e8..3f1af57ca09 100644
--- a/packages/webpack-cli/src/index.ts
+++ b/packages/webpack-cli/src/index.ts
@@ -1,5 +1,5 @@
-import { IWebpackCLI } from "./types";
-export * from "./types";
+import { type IWebpackCLI } from "./types";
+export type * from "./types";
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const CLI: IWebpackCLI = require("./webpack-cli");
diff --git a/packages/webpack-cli/src/plugins/cli-plugin.ts b/packages/webpack-cli/src/plugins/cli-plugin.ts
index a9d819c3c62..76f36357e49 100644
--- a/packages/webpack-cli/src/plugins/cli-plugin.ts
+++ b/packages/webpack-cli/src/plugins/cli-plugin.ts
@@ -1,5 +1,5 @@
-import { Compiler } from "webpack";
-import { CLIPluginOptions } from "../types";
+import { type Compiler } from "webpack";
+import { type CLIPluginOptions } from "../types";
 
 export class CLIPlugin {
   logger!: ReturnType<Compiler["getInfrastructureLogger"]>;
diff --git a/packages/webpack-cli/src/types.ts b/packages/webpack-cli/src/types.ts
index 67b65c32074..5334daecc32 100644
--- a/packages/webpack-cli/src/types.ts
+++ b/packages/webpack-cli/src/types.ts
@@ -1,4 +1,4 @@
-import webpack, {
+import type {
   EntryOptions,
   Stats,
   Configuration,
@@ -12,16 +12,17 @@ import webpack, {
   AssetEmittedInfo,
   FileCacheOptions,
 } from "webpack";
+import type webpack from "webpack";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore extraneous import is intended
 // eslint-disable-next-line node/no-extraneous-import
-import { ClientConfiguration, Configuration as DevServerConfig } from "webpack-dev-server";
+import type { ClientConfiguration, Configuration as DevServerConfig } from "webpack-dev-server";
 
-import { Colorette } from "colorette";
-import { Command, CommandOptions, Option, ParseOptions } from "commander";
-import { prepare } from "rechoir";
-import { stringifyStream } from "@discoveryjs/json-ext";
+import { type Colorette } from "colorette";
+import { type Command, type CommandOptions, type Option, type ParseOptions } from "commander";
+import { type prepare } from "rechoir";
+import { type stringifyStream } from "@discoveryjs/json-ext";
 
 /**
  * Webpack CLI
@@ -109,7 +110,7 @@ interface WebpackCLIStats extends Stats {
 
 type WebpackCLIMainOption = Pick<
   WebpackCLIBuiltInOption,
-  "description" | "defaultValue" | "multiple"
+  "valueName" | "description" | "defaultValue" | "multiple"
 > & {
   flags: string;
   type: Set<BooleanConstructor | StringConstructor | NumberConstructor>;
@@ -139,6 +140,7 @@ interface WebpackCLIBuiltInFlag {
   configs?: Partial<FlagConfig>[];
   negative?: boolean;
   multiple?: boolean;
+  valueName?: string;
   description: string;
   describe?: string;
   negatedDescription?: string;
@@ -212,6 +214,7 @@ interface WebpackRunOptions extends WebpackOptionsNormalized {
   argv?: Argv;
   env: Env;
   failOnWarnings?: boolean;
+  isWatchingLikeCommand?: boolean;
 }
 
 /**
diff --git a/packages/webpack-cli/src/utils/dynamic-import-loader.ts b/packages/webpack-cli/src/utils/dynamic-import-loader.ts
index 8e9eabaca84..11fc7525e94 100644
--- a/packages/webpack-cli/src/utils/dynamic-import-loader.ts
+++ b/packages/webpack-cli/src/utils/dynamic-import-loader.ts
@@ -1,4 +1,4 @@
-import { DynamicImport } from "../types";
+import { type DynamicImport } from "../types";
 
 function dynamicImportLoader<T>(): DynamicImport<T> | null {
   let importESM;
diff --git a/packages/webpack-cli/src/webpack-cli.ts b/packages/webpack-cli/src/webpack-cli.ts
index 7c57942e0e9..3b629e3aee7 100644
--- a/packages/webpack-cli/src/webpack-cli.ts
+++ b/packages/webpack-cli/src/webpack-cli.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
-import {
+import type {
   IWebpackCLI,
   WebpackCLICommandOption,
   WebpackCLIBuiltInOption,
@@ -43,13 +43,13 @@ import {
   Problem,
 } from "./types";
 
-import webpackMerge from "webpack-merge";
-import webpack from "webpack";
-import { Compiler, MultiCompiler, WebpackError, StatsOptions } from "webpack";
-import { stringifyStream } from "@discoveryjs/json-ext";
-import { Help, ParseOptions } from "commander";
+import type webpackMerge from "webpack-merge";
+import type webpack from "webpack";
+import { type Compiler, type MultiCompiler, type WebpackError, type StatsOptions } from "webpack";
+import { type stringifyStream } from "@discoveryjs/json-ext";
+import { type Help, type ParseOptions } from "commander";
 
-import { CLIPlugin as CLIPluginClass } from "./plugins/cli-plugin";
+import { type CLIPlugin as CLIPluginClass } from "./plugins/cli-plugin";
 
 const fs = require("fs");
 const path = require("path");
@@ -57,8 +57,14 @@ const { pathToFileURL } = require("url");
 const util = require("util");
 const { program, Option } = require("commander");
 
-const WEBPACK_PACKAGE = process.env.WEBPACK_PACKAGE || "webpack";
-const WEBPACK_DEV_SERVER_PACKAGE = process.env.WEBPACK_DEV_SERVER_PACKAGE || "webpack-dev-server";
+const WEBPACK_PACKAGE_IS_CUSTOM = !!process.env.WEBPACK_PACKAGE;
+const WEBPACK_PACKAGE = WEBPACK_PACKAGE_IS_CUSTOM
+  ? (process.env.WEBPACK_PACKAGE as string)
+  : "webpack";
+const WEBPACK_DEV_SERVER_PACKAGE_IS_CUSTOM = !!process.env.WEBPACK_DEV_SERVER_PACKAGE;
+const WEBPACK_DEV_SERVER_PACKAGE = WEBPACK_DEV_SERVER_PACKAGE_IS_CUSTOM
+  ? (process.env.WEBPACK_DEV_SERVER_PACKAGE as string)
+  : "webpack-dev-server";
 
 interface Information {
   Binaries?: string[];
@@ -322,37 +328,83 @@ class WebpackCLI implements IWebpackCLI {
     process.exit(2);
   }
 
-  async tryRequireThenImport<T>(module: ModuleName, handleError = true): Promise<T> {
+  async tryRequireThenImport<T>(
+    module: ModuleName,
+    handleError = true,
+    moduleType: "unknown" | "commonjs" | "esm" = "unknown",
+  ): Promise<T> {
     let result;
 
-    try {
-      result = require(module);
-    } catch (error) {
-      const dynamicImportLoader: null | DynamicImport<T> =
-        require("./utils/dynamic-import-loader")();
-      if (
-        ((error as ImportLoaderError).code === "ERR_REQUIRE_ESM" ||
-          process.env.WEBPACK_CLI_FORCE_LOAD_ESM_CONFIG) &&
-        pathToFileURL &&
-        dynamicImportLoader
-      ) {
-        const urlForConfig = pathToFileURL(module);
-
-        result = await dynamicImportLoader(urlForConfig);
-        result = result.default;
+    switch (moduleType) {
+      case "unknown": {
+        try {
+          result = require(module);
+        } catch (error) {
+          const dynamicImportLoader: null | DynamicImport<T> =
+            require("./utils/dynamic-import-loader")();
+          if (
+            ((error as ImportLoaderError).code === "ERR_REQUIRE_ESM" ||
+              process.env.WEBPACK_CLI_FORCE_LOAD_ESM_CONFIG) &&
+            pathToFileURL &&
+            dynamicImportLoader
+          ) {
+            const urlForConfig = pathToFileURL(module);
+
+            result = await dynamicImportLoader(urlForConfig);
+            result = result.default;
+
+            return result;
+          }
 
-        return result;
+          if (handleError) {
+            this.logger.error(error);
+            process.exit(2);
+          } else {
+            throw error;
+          }
+        }
+        break;
+      }
+      case "commonjs": {
+        try {
+          result = require(module);
+        } catch (error) {
+          if (handleError) {
+            this.logger.error(error);
+            process.exit(2);
+          } else {
+            throw error;
+          }
+        }
+        break;
       }
+      case "esm": {
+        try {
+          const dynamicImportLoader: null | DynamicImport<T> =
+            require("./utils/dynamic-import-loader")();
 
-      if (handleError) {
-        this.logger.error(error);
-        process.exit(2);
-      } else {
-        throw error;
+          if (pathToFileURL && dynamicImportLoader) {
+            const urlForConfig = pathToFileURL(module);
+
+            result = await dynamicImportLoader(urlForConfig);
+            result = result.default;
+
+            return result;
+          }
+        } catch (error) {
+          if (handleError) {
+            this.logger.error(error);
+            process.exit(2);
+          } else {
+            throw error;
+          }
+        }
+
+        break;
       }
     }
 
-    // For babel/typescript
+    // For babel and other, only commonjs
     if (result && typeof result === "object" && "default" in result) {
       result = result.default || {};
     }
@@ -520,12 +572,12 @@ class WebpackCLI implements IWebpackCLI {
         let skipInstallation = false;
 
         // Allow to use `./path/to/webpack.js` outside `node_modules`
-        if (dependency === WEBPACK_PACKAGE && fs.existsSync(WEBPACK_PACKAGE)) {
+        if (dependency === WEBPACK_PACKAGE && WEBPACK_PACKAGE_IS_CUSTOM) {
           skipInstallation = true;
         }
 
         // Allow to use `./path/to/webpack-dev-server.js` outside `node_modules`
-        if (dependency === WEBPACK_DEV_SERVER_PACKAGE && fs.existsSync(WEBPACK_PACKAGE)) {
+        if (dependency === WEBPACK_DEV_SERVER_PACKAGE && WEBPACK_DEV_SERVER_PACKAGE_IS_CUSTOM) {
           skipInstallation = true;
         }
 
@@ -638,6 +690,7 @@ class WebpackCLI implements IWebpackCLI {
 
       mainOption = {
         flags: option.alias ? `-${option.alias}, --${option.name}` : `--${option.name}`,
+        valueName: option.valueName || "value",
         description: option.description || "",
         type: mainOptionType,
         multiple: option.multiple,
@@ -654,6 +707,7 @@ class WebpackCLI implements IWebpackCLI {
     } else {
       mainOption = {
         flags: option.alias ? `-${option.alias}, --${option.name}` : `--${option.name}`,
+        valueName: option.valueName || "value",
         description: option.description || "",
         type: option.type
           ? new Set(Array.isArray(option.type) ? option.type : [option.type])
@@ -673,9 +727,13 @@ class WebpackCLI implements IWebpackCLI {
     }
 
     if (mainOption.type.size > 1 && mainOption.type.has(Boolean)) {
-      mainOption.flags = `${mainOption.flags} [value${mainOption.multiple ? "..." : ""}]`;
+      mainOption.flags = `${mainOption.flags} [${mainOption.valueName || "value"}${
+        mainOption.multiple ? "..." : ""
+      }]`;
     } else if (mainOption.type.size > 0 && !mainOption.type.has(Boolean)) {
-      mainOption.flags = `${mainOption.flags} <value${mainOption.multiple ? "..." : ""}>`;
+      mainOption.flags = `${mainOption.flags} <${mainOption.valueName || "value"}${
+        mainOption.multiple ? "..." : ""
+      }>`;
     }
 
     if (mainOption.type.size === 1) {
@@ -808,7 +866,9 @@ class WebpackCLI implements IWebpackCLI {
           },
         ],
         multiple: true,
-        description: "Provide path to a webpack configuration file e.g. ./webpack.config.js.",
+        valueName: "pathToConfigFile",
+        description:
+          'Provide path to one or more webpack configuration files to process, e.g. "./webpack.config.js".',
         helpLevel: "minimum",
       },
       {
@@ -819,7 +879,9 @@ class WebpackCLI implements IWebpackCLI {
           },
         ],
         multiple: true,
-        description: "Name of the configuration to use.",
+        valueName: "name",
+        description:
+          "Name(s) of particular configuration(s) to use if configuration file exports an array of multiple configurations.",
         helpLevel: "minimum",
       },
       {
@@ -890,7 +952,8 @@ class WebpackCLI implements IWebpackCLI {
           return previous;
         },
         multiple: true,
-        description: "Environment passed to the configuration when it is a function.",
+        description:
+          'Environment variables passed to the configuration when it is a function, e.g. "myvar" or "myvar=myval".',
         helpLevel: "minimum",
       },
       {
@@ -958,6 +1021,7 @@ class WebpackCLI implements IWebpackCLI {
           },
         ],
         alias: "j",
+        valueName: "pathToJsonFile",
         description: "Prints result as JSON or store it in a file.",
         helpLevel: "minimum",
       },
@@ -1737,8 +1801,15 @@ class WebpackCLI implements IWebpackCLI {
 
     const interpret = require("interpret");
     const loadConfigByPath = async (configPath: string, argv: Argv = {}) => {
-      const ext = path.extname(configPath);
-      const interpreted = Object.keys(interpret.jsVariants).find((variant) => variant === ext);
+      const ext = path.extname(configPath).toLowerCase();
+      let interpreted = interpret.jsVariants[ext];
+
+      // Fallback `.cts` to `.ts`
+      // TODO implement good `.mts` support after https://github.com/gulpjs/rechoir/issues/43
+      // For ESM and `.mts` you need to use: 'NODE_OPTIONS="--loader ts-node/esm" webpack-cli --config ./webpack.config.mts'
+      if (!interpreted && /\.cts$/.test(ext)) {
+        interpreted = interpret.jsVariants[".ts"];
+      }
 
       if (interpreted && !disableInterpret) {
         const rechoir: Rechoir = require("rechoir");
@@ -1765,10 +1836,24 @@ class WebpackCLI implements IWebpackCLI {
 
       type LoadConfigOption = PotentialPromise<WebpackConfiguration>;
 
+      let moduleType: "unknown" | "commonjs" | "esm" = "unknown";
+
+      switch (ext) {
+        case ".cjs":
+        case ".cts":
+          moduleType = "commonjs";
+          break;
+        case ".mjs":
+        case ".mts":
+          moduleType = "esm";
+          break;
+      }
+
       try {
         options = await this.tryRequireThenImport<LoadConfigOption | LoadConfigOption[]>(
           configPath,
           false,
+          moduleType,
         );
         // @ts-expect-error error type assertion
       } catch (error: Error) {
@@ -1885,14 +1970,15 @@ class WebpackCLI implements IWebpackCLI {
         ".cjs",
         ".ts",
         ".cts",
+        ".mts",
         ...Object.keys(interpret.extensions),
       ];
       // Order defines the priority, in decreasing order
-      const defaultConfigFiles = [
-        "webpack.config",
-        ".webpack/webpack.config",
-        ".webpack/webpackfile",
-      ].flatMap((filename) => extensions.map((ext) => path.resolve(filename + ext)));
+      const defaultConfigFiles = new Set(
+        ["webpack.config", ".webpack/webpack.config", ".webpack/webpackfile"].flatMap((filename) =>
+          extensions.map((ext) => path.resolve(filename + ext)),
+        ),
+      );
 
       let foundDefaultConfigFile;
 
@@ -2163,11 +2249,10 @@ class WebpackCLI implements IWebpackCLI {
 
       // Output warnings
       if (
-        (typeof originalWatchValue !== "undefined" ||
-          (options.argv && typeof options.argv.watch !== "undefined")) &&
+        options.isWatchingLikeCommand &&
         options.argv &&
         options.argv.env &&
-        (options.argv.env["WEBPACK_WATCH"] || options.argv.env["WEBPACK_SERVE"])
+        (typeof originalWatchValue !== "undefined" || typeof options.argv.watch !== "undefined")
       ) {
         this.logger.warn(
           `No need to use the '${
@@ -2418,6 +2503,7 @@ class WebpackCLI implements IWebpackCLI {
 
     if (isWatchCommand) {
       options.watch = true;
+      options.isWatchingLikeCommand = true;
     }
 
     compiler = await this.createCompiler(options as WebpackDevServerOptions, callback);
diff --git a/test/build/config-format/coffee/webpack.config.coffee b/test/build/config-format/coffee/webpack.config.coffee
index 15e1934891b..10cf2b84b46 100644
--- a/test/build/config-format/coffee/webpack.config.coffee
+++ b/test/build/config-format/coffee/webpack.config.coffee
@@ -1,7 +1,7 @@
 path = require 'path'
 
 config =
-    mode: 'production'
+    mode: 'development'
     entry: './main.js'
     output:
         path: path.resolve(__dirname, 'dist')
diff --git a/test/build/config-format/commonjs-default/webpack.config.cjs b/test/build/config-format/commonjs-default/webpack.config.cjs
index 5ac5037995f..ce5f79fd2b6 100644
--- a/test/build/config-format/commonjs-default/webpack.config.cjs
+++ b/test/build/config-format/commonjs-default/webpack.config.cjs
@@ -1,7 +1,7 @@
 const path = require("path");
 
 const config = {
-  mode: "production",
+  mode: "development",
   entry: "./main.js",
   output: {
     path: path.resolve(__dirname, "dist"),
diff --git a/test/build/config-format/commonjs/webpack.config.cjs b/test/build/config-format/commonjs/webpack.config.cjs
index 931c439e129..434d0ea68b3 100644
--- a/test/build/config-format/commonjs/webpack.config.cjs
+++ b/test/build/config-format/commonjs/webpack.config.cjs
@@ -1,7 +1,7 @@
 const path = require("path");
 
 const config = {
-  mode: "production",
+  mode: "development",
   entry: "./main.js",
   output: {
     path: path.resolve(__dirname, "dist"),
diff --git a/test/build/config-format/disable-interpret/webpack.config.ts b/test/build/config-format/disable-interpret/webpack.config.ts
index c20e6fb7f63..5a6487b6f7d 100644
--- a/test/build/config-format/disable-interpret/webpack.config.ts
+++ b/test/build/config-format/disable-interpret/webpack.config.ts
@@ -2,7 +2,7 @@
 import * as path from "path";
 
 const config = {
-  mode: "production",
+  mode: "development",
   entry: "./main.ts",
   output: {
     path: path.resolve(__dirname, "dist"),
diff --git a/test/build/config-format/mjs/main.js b/test/build/config-format/esm/main.js
similarity index 100%
rename from test/build/config-format/mjs/main.js
rename to test/build/config-format/esm/main.js
diff --git a/test/build/config-format/esm/mjs.test.js b/test/build/config-format/esm/mjs.test.js
new file mode 100644
index 00000000000..f33ac10011b
--- /dev/null
+++ b/test/build/config-format/esm/mjs.test.js
@@ -0,0 +1,11 @@
+const { run } = require("../../../utils/test-utils");
+
+describe("webpack cli", () => {
+  it("should support mjs config format", async () => {
+    const { exitCode, stderr, stdout } = await run(__dirname, ["-c", "webpack.config.mjs"]);
+
+    expect(exitCode).toBe(0);
+    expect(stderr).toBeFalsy();
+    expect(stdout).toBeTruthy();
+  });
+});
diff --git a/test/build/config-format/mjs/webpack.config.mjs b/test/build/config-format/esm/webpack.config.mjs
similarity index 90%
rename from test/build/config-format/mjs/webpack.config.mjs
rename to test/build/config-format/esm/webpack.config.mjs
index b32e7d7be42..224ee8485a4 100644
--- a/test/build/config-format/mjs/webpack.config.mjs
+++ b/test/build/config-format/esm/webpack.config.mjs
@@ -2,7 +2,7 @@ import { fileURLToPath } from "url";
 import path from "path";
 
 export default {
-  mode: "production",
+  mode: "development",
   entry: "./main.js",
   output: {
     path: path.resolve(path.dirname(fileURLToPath(import.meta.url)), "dist"),
diff --git a/test/build/config-format/failure/webpack.config.iced b/test/build/config-format/failure/webpack.config.iced
index 15e1934891b..10cf2b84b46 100644
--- a/test/build/config-format/failure/webpack.config.iced
+++ b/test/build/config-format/failure/webpack.config.iced
@@ -1,7 +1,7 @@
 path = require 'path'
 
 config =
-    mode: 'production'
+    mode: 'development'
     entry: './main.js'
     output:
         path: path.resolve(__dirname, 'dist')
diff --git a/test/build/config-format/mjs/mjs.test.js b/test/build/config-format/mjs/mjs.test.js
deleted file mode 100644
index 590e8212847..00000000000
--- a/test/build/config-format/mjs/mjs.test.js
+++ /dev/null
@@ -1,18 +0,0 @@
-const { run } = require("../../../utils/test-utils");
-
-describe("webpack cli", () => {
-  it("should support mjs config format", async () => {
-    const { exitCode, stderr, stdout } = await run(__dirname, ["-c", "webpack.config.mjs"], {
-      env: { WEBPACK_CLI_FORCE_LOAD_ESM_CONFIG: true },
-    });
-
-    if (/Error: Not supported/.test(stderr)) {
-      expect(exitCode).toBe(2);
-      expect(stdout).toBeFalsy();
-    } else {
-      expect(exitCode).toBe(0);
-      expect(stderr).toBeFalsy();
-      expect(stdout).toBeTruthy();
-    }
-  });
-});
diff --git a/test/build/config-format/typescript-commonjs/main.ts b/test/build/config-format/typescript-commonjs/main.ts
new file mode 100644
index 00000000000..41d13d1a9a1
--- /dev/null
+++ b/test/build/config-format/typescript-commonjs/main.ts
@@ -0,0 +1 @@
+console.log("Main typescript file");
diff --git a/test/build/config-format/typescript-commonjs/tsconfig.json b/test/build/config-format/typescript-commonjs/tsconfig.json
new file mode 100644
index 00000000000..391488ab17f
--- /dev/null
+++ b/test/build/config-format/typescript-commonjs/tsconfig.json
@@ -0,0 +1,5 @@
+{
+  "compilerOptions": {
+    "module": "commonjs"
+  }
+}
diff --git a/test/build/config-format/typescript-commonjs/typescript.test.js b/test/build/config-format/typescript-commonjs/typescript.test.js
new file mode 100644
index 00000000000..5d00725cef8
--- /dev/null
+++ b/test/build/config-format/typescript-commonjs/typescript.test.js
@@ -0,0 +1,14 @@
+const { run } = require("../../../utils/test-utils");
+const { existsSync } = require("fs");
+const { resolve } = require("path");
+
+describe("webpack cli", () => {
+  it("should support typescript file", async () => {
+    const { exitCode, stderr, stdout } = await run(__dirname, ["-c", "./webpack.config.cts"]);
+
+    expect(stderr).toBeFalsy();
+    expect(stdout).toBeTruthy();
+    expect(exitCode).toBe(0);
+    expect(existsSync(resolve(__dirname, "dist/foo.bundle.js"))).toBeTruthy();
+  });
+});
diff --git a/test/build/config-format/typescript-commonjs/webpack.config.cts b/test/build/config-format/typescript-commonjs/webpack.config.cts
new file mode 100644
index 00000000000..2bdd9c19605
--- /dev/null
+++ b/test/build/config-format/typescript-commonjs/webpack.config.cts
@@ -0,0 +1,16 @@
+/* eslint-disable node/no-unsupported-features/es-syntax */
+/** eslint-disable **/
+import * as path from "path";
+
+// cspell:ignore elopment
+const mode: string = "dev" + "elopment";
+const config = {
+  mode,
+  entry: "./main.ts",
+  output: {
+    path: path.resolve(__dirname, "dist"),
+    filename: "foo.bundle.js",
+  },
+};
+
+export = config;
diff --git a/test/build/config-format/typescript-esnext-mjs/main.ts b/test/build/config-format/typescript-esnext-mjs/main.ts
new file mode 100644
index 00000000000..dc6a7ea6788
--- /dev/null
+++ b/test/build/config-format/typescript-esnext-mjs/main.ts
@@ -0,0 +1 @@
+console.log("Rimuru Tempest");
diff --git a/test/build/config-format/typescript-esnext-mjs/package.json b/test/build/config-format/typescript-esnext-mjs/package.json
new file mode 100644
index 00000000000..aa65b114f15
--- /dev/null
+++ b/test/build/config-format/typescript-esnext-mjs/package.json
@@ -0,0 +1,6 @@
+{
+  "type": "module",
+  "engines": {
+    "node": ">=14.15.0"
+  }
+}
diff --git a/test/build/config-format/typescript-esnext-mjs/tsconfig.json b/test/build/config-format/typescript-esnext-mjs/tsconfig.json
new file mode 100644
index 00000000000..e0ba2dc7a46
--- /dev/null
+++ b/test/build/config-format/typescript-esnext-mjs/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "compilerOptions": {
+    "module": "esnext",
+    "allowSyntheticDefaultImports": true
+  }
+}
diff --git a/test/build/config-format/typescript-esnext-mjs/typescript.test.js b/test/build/config-format/typescript-esnext-mjs/typescript.test.js
new file mode 100644
index 00000000000..287a11f2862
--- /dev/null
+++ b/test/build/config-format/typescript-esnext-mjs/typescript.test.js
@@ -0,0 +1,20 @@
+// eslint-disable-next-line node/no-unpublished-require
+const { run } = require("../../../utils/test-utils");
+const { existsSync } = require("fs");
+const { resolve } = require("path");
+
+describe("webpack cli", () => {
+  it("should support typescript esnext file", async () => {
+    const env = { ...process.env };
+
+    const { exitCode, stderr, stdout } = await run(__dirname, ["-c", "./webpack.config.mts"], {
+      nodeOptions: ["--experimental-loader=ts-node/esm"],
+      env,
+    });
+
+    expect(stderr).not.toBeFalsy(); // Deprecation warning logs on stderr
+    expect(stdout).toBeTruthy();
+    expect(exitCode).toBe(0);
+    expect(existsSync(resolve(__dirname, "dist/foo.bundle.js"))).toBeTruthy();
+  });
+});
diff --git a/test/build/config-format/typescript-esnext-mjs/webpack.config.mts b/test/build/config-format/typescript-esnext-mjs/webpack.config.mts
new file mode 100644
index 00000000000..8788aa61995
--- /dev/null
+++ b/test/build/config-format/typescript-esnext-mjs/webpack.config.mts
@@ -0,0 +1,15 @@
+/* eslint-disable node/no-unsupported-features/es-syntax */
+import * as path from "path";
+
+// cspell:ignore elopment
+const mode: string = "dev" + "elopment";
+const config = {
+  mode,
+  entry: "./main.ts",
+  output: {
+    path: path.resolve("dist"),
+    filename: "foo.bundle.js",
+  },
+};
+
+export default config;
diff --git a/test/build/config-format/typescript-esnext/package.json b/test/build/config-format/typescript-esnext/package.json
index 3dbc1ca591c..aa65b114f15 100644
--- a/test/build/config-format/typescript-esnext/package.json
+++ b/test/build/config-format/typescript-esnext/package.json
@@ -1,3 +1,6 @@
 {
-  "type": "module"
+  "type": "module",
+  "engines": {
+    "node": ">=14.15.0"
+  }
 }
diff --git a/test/build/config-format/typescript-esnext/typescript.test.js b/test/build/config-format/typescript-esnext/typescript.test.js
index 675f44a4442..4a5bd0edef5 100644
--- a/test/build/config-format/typescript-esnext/typescript.test.js
+++ b/test/build/config-format/typescript-esnext/typescript.test.js
@@ -6,16 +6,18 @@ const { resolve } = require("path");
 describe("webpack cli", () => {
   it("should support typescript esnext file", async () => {
     const majorNodeVersion = process.version.slice(1, 3);
+    const env = { ...process.env };
 
-    if (majorNodeVersion < 14) {
-      expect(true).toBe(true);
-
-      return;
+    if (majorNodeVersion >= 20) {
+      // Node.js 20+ change logic, so we need to force esm config loading for test purposes
+      env.WEBPACK_CLI_FORCE_LOAD_ESM_CONFIG = true;
     }
 
     const { exitCode, stderr, stdout } = await run(__dirname, ["-c", "./webpack.config.ts"], {
-      nodeOptions: ["--loader=ts-node/esm"],
+      nodeOptions: ["--experimental-loader=ts-node/esm"],
+      env,
     });
+
     expect(stderr).not.toBeFalsy(); // Deprecation warning logs on stderr
     expect(stdout).toBeTruthy();
     expect(exitCode).toBe(0);
diff --git a/test/build/config-format/typescript-esnext/webpack.config.ts b/test/build/config-format/typescript-esnext/webpack.config.ts
index 4dcffcff3be..8788aa61995 100644
--- a/test/build/config-format/typescript-esnext/webpack.config.ts
+++ b/test/build/config-format/typescript-esnext/webpack.config.ts
@@ -1,8 +1,10 @@
 /* eslint-disable node/no-unsupported-features/es-syntax */
 import * as path from "path";
 
+// cspell:ignore elopment
+const mode: string = "dev" + "elopment";
 const config = {
-  mode: "production",
+  mode,
   entry: "./main.ts",
   output: {
     path: path.resolve("dist"),
diff --git a/test/build/config-format/typescript/typescript.test.js b/test/build/config-format/typescript/typescript.test.js
index 40ecd1cb094..6bb1ea5a8b0 100644
--- a/test/build/config-format/typescript/typescript.test.js
+++ b/test/build/config-format/typescript/typescript.test.js
@@ -5,6 +5,7 @@ const { resolve } = require("path");
 describe("webpack cli", () => {
   it("should support typescript file", async () => {
     const { exitCode, stderr, stdout } = await run(__dirname, ["-c", "./webpack.config.ts"], {
+      // For `nyc`, remove it when we drop `nyc` usage
       nodeOptions: ["--require=ts-node/register"],
     });
 
diff --git a/test/build/config-format/typescript/webpack.config.ts b/test/build/config-format/typescript/webpack.config.ts
index 22f8d9130fe..2bdd9c19605 100644
--- a/test/build/config-format/typescript/webpack.config.ts
+++ b/test/build/config-format/typescript/webpack.config.ts
@@ -2,8 +2,10 @@
 /** eslint-disable **/
 import * as path from "path";
 
+// cspell:ignore elopment
+const mode: string = "dev" + "elopment";
 const config = {
-  mode: "production",
+  mode,
   entry: "./main.ts",
   output: {
     path: path.resolve(__dirname, "dist"),
diff --git a/test/help/__snapshots__/help.test.js.snap.devServer4.webpack5 b/test/help/__snapshots__/help.test.js.snap.devServer4.webpack5
index ab8413515a6..af6dbd3a74c 100644
--- a/test/help/__snapshots__/help.test.js.snap.devServer4.webpack5
+++ b/test/help/__snapshots__/help.test.js.snap.devServer4.webpack5
@@ -94,15 +94,15 @@ Alternative usage to run commands: webpack [command] [options]
 The build tool for modern web applications.
 
 Options:
-  -c, --config <value...>                          Provide path to a webpack configuration file e.g. ./webpack.config.js.
-  --config-name <value...>                         Name of the configuration to use.
+  -c, --config <pathToConfigFile...>               Provide path to one or more webpack configuration files to process, e.g. "./webpack.config.js".
+  --config-name <name...>                          Name(s) of particular configuration(s) to use if configuration file exports an array of multiple configurations.
   -m, --merge                                      Merge two or more configurations using 'webpack-merge'.
   --disable-interpret                              Disable interpret for loading the config file.
-  --env <value...>                                 Environment passed to the configuration when it is a function.
+  --env <value...>                                 Environment variables passed to the configuration when it is a function, e.g. "myvar" or "myvar=myval".
   --node-env <value>                               Sets process.env.NODE_ENV to the specified value.
   --analyze                                        It invokes webpack-bundle-analyzer plugin to get bundle information.
   --progress [value]                               Print compilation progress during build.
-  -j, --json [value]                               Prints result as JSON or store it in a file.
+  -j, --json [pathToJsonFile]                      Prints result as JSON or store it in a file.
   --fail-on-warnings                               Stop webpack-cli process with non-zero exit code on warnings from webpack.
   -e, --extends <value...>                         Path to the configuration to be extended (only works when using webpack-cli).
   -d, --devtool <value>                            A developer tool to enhance debugging (false | eval | [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
@@ -135,7 +135,7 @@ Commands:
   init|create|new|c|n [generation-path] [options]  Initialize a new webpack project.
   loader|l [output-path] [options]                 Scaffold a loader.
   plugin|p [output-path] [options]                 Scaffold a plugin.
-  serve|server|s [entries...] [options]            Run the webpack dev server.
+  serve|server|s [entries...] [options]            Run the webpack dev server and watch for source file changes while serving.
   version|v [options]                              Output the version number of 'webpack', 'webpack-cli' and 'webpack-dev-server' and commands.
   watch|w [entries...] [options]                   Run webpack and watch for files changes.
 
@@ -155,15 +155,15 @@ Alternative usage to run commands: webpack [command] [options]
 The build tool for modern web applications.
 
 Options:
-  -c, --config <value...>                          Provide path to a webpack configuration file e.g. ./webpack.config.js.
-  --config-name <value...>                         Name of the configuration to use.
+  -c, --config <pathToConfigFile...>               Provide path to one or more webpack configuration files to process, e.g. "./webpack.config.js".
+  --config-name <name...>                          Name(s) of particular configuration(s) to use if configuration file exports an array of multiple configurations.
   -m, --merge                                      Merge two or more configurations using 'webpack-merge'.
   --disable-interpret                              Disable interpret for loading the config file.
-  --env <value...>                                 Environment passed to the configuration when it is a function.
+  --env <value...>                                 Environment variables passed to the configuration when it is a function, e.g. "myvar" or "myvar=myval".
   --node-env <value>                               Sets process.env.NODE_ENV to the specified value.
   --analyze                                        It invokes webpack-bundle-analyzer plugin to get bundle information.
   --progress [value]                               Print compilation progress during build.
-  -j, --json [value]                               Prints result as JSON or store it in a file.
+  -j, --json [pathToJsonFile]                      Prints result as JSON or store it in a file.
   --fail-on-warnings                               Stop webpack-cli process with non-zero exit code on warnings from webpack.
   -e, --extends <value...>                         Path to the configuration to be extended (only works when using webpack-cli).
   -d, --devtool <value>                            A developer tool to enhance debugging (false | eval | [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
@@ -196,7 +196,7 @@ Commands:
   init|create|new|c|n [generation-path] [options]  Initialize a new webpack project.
   loader|l [output-path] [options]                 Scaffold a loader.
   plugin|p [output-path] [options]                 Scaffold a plugin.
-  serve|server|s [entries...] [options]            Run the webpack dev server.
+  serve|server|s [entries...] [options]            Run the webpack dev server and watch for source file changes while serving.
   version|v [options]                              Output the version number of 'webpack', 'webpack-cli' and 'webpack-dev-server' and commands.
   watch|w [entries...] [options]                   Run webpack and watch for files changes.
 
@@ -216,15 +216,15 @@ Alternative usage to run commands: webpack [command] [options]
 The build tool for modern web applications.
 
 Options:
-  -c, --config <value...>                          Provide path to a webpack configuration file e.g. ./webpack.config.js.
-  --config-name <value...>                         Name of the configuration to use.
+  -c, --config <pathToConfigFile...>               Provide path to one or more webpack configuration files to process, e.g. "./webpack.config.js".
+  --config-name <name...>                          Name(s) of particular configuration(s) to use if configuration file exports an array of multiple configurations.
   -m, --merge                                      Merge two or more configurations using 'webpack-merge'.
   --disable-interpret                              Disable interpret for loading the config file.
-  --env <value...>                                 Environment passed to the configuration when it is a function.
+  --env <value...>                                 Environment variables passed to the configuration when it is a function, e.g. "myvar" or "myvar=myval".
   --node-env <value>                               Sets process.env.NODE_ENV to the specified value.
   --analyze                                        It invokes webpack-bundle-analyzer plugin to get bundle information.
   --progress [value]                               Print compilation progress during build.
-  -j, --json [value]                               Prints result as JSON or store it in a file.
+  -j, --json [pathToJsonFile]                      Prints result as JSON or store it in a file.
   --fail-on-warnings                               Stop webpack-cli process with non-zero exit code on warnings from webpack.
   -e, --extends <value...>                         Path to the configuration to be extended (only works when using webpack-cli).
   -d, --devtool <value>                            A developer tool to enhance debugging (false | eval | [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
@@ -257,7 +257,7 @@ Commands:
   init|create|new|c|n [generation-path] [options]  Initialize a new webpack project.
   loader|l [output-path] [options]                 Scaffold a loader.
   plugin|p [output-path] [options]                 Scaffold a plugin.
-  serve|server|s [entries...] [options]            Run the webpack dev server.
+  serve|server|s [entries...] [options]            Run the webpack dev server and watch for source file changes while serving.
   version|v [options]                              Output the version number of 'webpack', 'webpack-cli' and 'webpack-dev-server' and commands.
   watch|w [entries...] [options]                   Run webpack and watch for files changes.
 
@@ -276,38 +276,38 @@ exports[`help should show help information for 'b' command using command syntax:
 Run webpack (default command, can be omitted).
 
 Options:
-  -c, --config <value...>    Provide path to a webpack configuration file e.g. ./webpack.config.js.
-  --config-name <value...>   Name of the configuration to use.
-  -m, --merge                Merge two or more configurations using 'webpack-merge'.
-  --disable-interpret        Disable interpret for loading the config file.
-  --env <value...>           Environment passed to the configuration when it is a function.
-  --node-env <value>         Sets process.env.NODE_ENV to the specified value.
-  --analyze                  It invokes webpack-bundle-analyzer plugin to get bundle information.
-  --progress [value]         Print compilation progress during build.
-  -j, --json [value]         Prints result as JSON or store it in a file.
-  --fail-on-warnings         Stop webpack-cli process with non-zero exit code on warnings from webpack.
-  -e, --extends <value...>   Path to the configuration to be extended (only works when using webpack-cli).
-  -d, --devtool <value>      A developer tool to enhance debugging (false | eval | [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
-  --no-devtool               Negative 'devtool' option.
-  --entry <value...>         A module that is loaded upon startup. Only the last one is exported.
-  --extends <value...>       Path to the configuration to be extended (only works when using webpack-cli).
-  --mode <value>             Enable production optimizations or development hints.
-  --name <value>             Name of the configuration. Used when loading multiple configurations.
-  -o, --output-path <value>  The output directory as **absolute path** (required).
-  --stats [value]            Stats options object or preset name.
-  --no-stats                 Negative 'stats' option.
-  -t, --target <value...>    Environment to build for. Environment to build for. An array of environments to build for all of them when possible.
-  --no-target                Negative 'target' option.
-  -w, --watch                Enter watch mode, which rebuilds on file change.
-  --no-watch                 Negative 'watch' option.
-  --watch-options-stdin      Stop watching when stdin stream has ended.
-  --no-watch-options-stdin   Negative 'watch-options-stdin' option.
+  -c, --config <pathToConfigFile...>  Provide path to one or more webpack configuration files to process, e.g. "./webpack.config.js".
+  --config-name <name...>             Name(s) of particular configuration(s) to use if configuration file exports an array of multiple configurations.
+  -m, --merge                         Merge two or more configurations using 'webpack-merge'.
+  --disable-interpret                 Disable interpret for loading the config file.
+  --env <value...>                    Environment variables passed to the configuration when it is a function, e.g. "myvar" or "myvar=myval".
+  --node-env <value>                  Sets process.env.NODE_ENV to the specified value.
+  --analyze                           It invokes webpack-bundle-analyzer plugin to get bundle information.
+  --progress [value]                  Print compilation progress during build.
+  -j, --json [pathToJsonFile]         Prints result as JSON or store it in a file.
+  --fail-on-warnings                  Stop webpack-cli process with non-zero exit code on warnings from webpack.
+  -e, --extends <value...>            Path to the configuration to be extended (only works when using webpack-cli).
+  -d, --devtool <value>               A developer tool to enhance debugging (false | eval | [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
+  --no-devtool                        Negative 'devtool' option.
+  --entry <value...>                  A module that is loaded upon startup. Only the last one is exported.
+  --extends <value...>                Path to the configuration to be extended (only works when using webpack-cli).
+  --mode <value>                      Enable production optimizations or development hints.
+  --name <value>                      Name of the configuration. Used when loading multiple configurations.
+  -o, --output-path <value>           The output directory as **absolute path** (required).
+  --stats [value]                     Stats options object or preset name.
+  --no-stats                          Negative 'stats' option.
+  -t, --target <value...>             Environment to build for. Environment to build for. An array of environments to build for all of them when possible.
+  --no-target                         Negative 'target' option.
+  -w, --watch                         Enter watch mode, which rebuilds on file change.
+  --no-watch                          Negative 'watch' option.
+  --watch-options-stdin               Stop watching when stdin stream has ended.
+  --no-watch-options-stdin            Negative 'watch-options-stdin' option.
 
 Global options:
-  --color                    Enable colors on console.
-  --no-color                 Disable colors on console.
-  -v, --version              Output the version number of 'webpack', 'webpack-cli' and 'webpack-dev-server' and commands.
-  -h, --help [verbose]       Display help for commands and options.
+  --color                             Enable colors on console.
+  --no-color                          Disable colors on console.
+  -v, --version                       Output the version number of 'webpack', 'webpack-cli' and 'webpack-dev-server' and commands.
+  -h, --help [verbose]                Display help for commands and options.
 
 To see list of all supported commands and options run 'webpack --help=verbose'.
 
@@ -324,38 +324,38 @@ exports[`help should show help information for 'b' command using the "--help" op
 Run webpack (default command, can be omitted).
 
 Options:
-  -c, --config <value...>    Provide path to a webpack configuration file e.g. ./webpack.config.js.
-  --config-name <value...>   Name of the configuration to use.
-  -m, --merge                Merge two or more configurations using 'webpack-merge'.
-  --disable-interpret        Disable interpret for loading the config file.
-  --env <value...>           Environment passed to the configuration when it is a function.
-  --node-env <value>         Sets process.env.NODE_ENV to the specified value.
-  --analyze                  It invokes webpack-bundle-analyzer plugin to get bundle information.
-  --progress [value]         Print compilation progress during build.
-  -j, --json [value]         Prints result as JSON or store it in a file.
-  --fail-on-warnings         Stop webpack-cli process with non-zero exit code on warnings from webpack.
-  -e, --extends <value...>   Path to the configuration to be extended (only works when using webpack-cli).
-  -d, --devtool <value>      A developer tool to enhance debugging (false | eval | [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
-  --no-devtool               Negative 'devtool' option.
-  --entry <value...>         A module that is loaded upon startup. Only the last one is exported.
-  --extends <value...>       Path to the configuration to be extended (only works when using webpack-cli).
-  --mode <value>             Enable production optimizations or development hints.
-  --name <value>             Name of the configuration. Used when loading multiple configurations.
-  -o, --output-path <value>  The output directory as **absolute path** (required).
-  --stats [value]            Stats options object or preset name.
-  --no-stats                 Negative 'stats' option.
-  -t, --target <value...>    Environment to build for. Environment to build for. An array of environments to build for all of them when possible.
-  --no-target                Negative 'target' option.
-  -w, --watch                Enter watch mode, which rebuilds on file change.
-  --no-watch                 Negative 'watch' option.
-  --watch-options-stdin      Stop watching when stdin stream has ended.
-  --no-watch-options-stdin   Negative 'watch-options-stdin' option.
+  -c, --config <pathToConfigFile...>  Provide path to one or more webpack configuration files to process, e.g. "./webpack.config.js".
+  --config-name <name...>             Name(s) of particular configuration(s) to use if configuration file exports an array of multiple configurations.
+  -m, --merge                         Merge two or more configurations using 'webpack-merge'.
+  --disable-interpret                 Disable interpret for loading the config file.
+  --env <value...>                    Environment variables passed to the configuration when it is a function, e.g. "myvar" or "myvar=myval".
+  --node-env <value>                  Sets process.env.NODE_ENV to the specified value.
+  --analyze                           It invokes webpack-bundle-analyzer plugin to get bundle information.
+  --progress [value]                  Print compilation progress during build.
+  -j, --json [pathToJsonFile]         Prints result as JSON or store it in a file.
+  --fail-on-warnings                  Stop webpack-cli process with non-zero exit code on warnings from webpack.
+  -e, --extends <value...>            Path to the configuration to be extended (only works when using webpack-cli).
+  -d, --devtool <value>               A developer tool to enhance debugging (false | eval | [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
+  --no-devtool                        Negative 'devtool' option.
+  --entry <value...>                  A module that is loaded upon startup. Only the last one is exported.
+  --extends <value...>                Path to the configuration to be extended (only works when using webpack-cli).
+  --mode <value>                      Enable production optimizations or development hints.
+  --name <value>                      Name of the configuration. Used when loading multiple configurations.
+  -o, --output-path <value>           The output directory as **absolute path** (required).
+  --stats [value]                     Stats options object or preset name.
+  --no-stats                          Negative 'stats' option.
+  -t, --target <value...>             Environment to build for. Environment to build for. An array of environments to build for all of them when possible.
+  --no-target                         Negative 'target' option.
+  -w, --watch                         Enter watch mode, which rebuilds on file change.
+  --no-watch                          Negative 'watch' option.
+  --watch-options-stdin               Stop watching when stdin stream has ended.
+  --no-watch-options-stdin            Negative 'watch-options-stdin' option.
 
 Global options:
-  --color                    Enable colors on console.
-  --no-color                 Disable colors on console.
-  -v, --version              Output the version number of 'webpack', 'webpack-cli' and 'webpack-dev-server' and commands.
-  -h, --help [verbose]       Display help for commands and options.
+  --color                             Enable colors on console.
+  --no-color                          Disable colors on console.
+  -v, --version                       Output the version number of 'webpack', 'webpack-cli' and 'webpack-dev-server' and commands.
+  -h, --help [verbose]                Display help for commands and options.
 
 To see list of all supported commands and options run 'webpack --help=verbose'.
 
@@ -372,55 +372,64 @@ exports[`help should show help information for 'build' and respect the "--color"
 Run webpack (default command, can be omitted).
 
 Options:
-  -c, --config <value...>    Provide path to a webpack configuration file e.g.
-                             ./webpack.config.js.
-  --config-name <value...>   Name of the configuration to use.
-  -m, --merge                Merge two or more configurations using
-                             'webpack-merge'.
-  --disable-interpret        Disable interpret for loading the config file.
-  --env <value...>           Environment passed to the configuration when it is
-                             a function.
-  --node-env <value>         Sets process.env.NODE_ENV to the specified value.
-  --analyze                  It invokes webpack-bundle-analyzer plugin to get
-                             bundle information.
-  --progress [value]         Print compilation progress during build.
-  -j, --json [value]         Prints result as JSON or store it in a file.
-  --fail-on-warnings         Stop webpack-cli process with non-zero exit code
-                             on warnings from webpack.
-  -e, --extends <value...>   Path to the configuration to be extended (only
-                             works when using webpack-cli).
-  -d, --devtool <value>      A developer tool to enhance debugging (false |
-                             eval |
-                             [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
-  --no-devtool               Negative 'devtool' option.
-  --entry <value...>         A module that is loaded upon startup. Only the
-                             last one is exported.
-  --extends <value...>       Path to the configuration to be extended (only
-                             works when using webpack-cli).
-  --mode <value>             Enable production optimizations or development
-                             hints.
-  --name <value>             Name of the configuration. Used when loading
-                             multiple configurations.
-  -o, --output-path <value>  The output directory as **absolute path**
-                             (required).
-  --stats [value]            Stats options object or preset name.
-  --no-stats                 Negative 'stats' option.
-  -t, --target <value...>    Environment to build for. Environment to build
-                             for. An array of environments to build for all of
-                             them when possible.
-  --no-target                Negative 'target' option.
-  -w, --watch                Enter watch mode, which rebuilds on file change.
-  --no-watch                 Negative 'watch' option.
-  --watch-options-stdin      Stop watching when stdin stream has ended.
-  --no-watch-options-stdin   Negative 'watch-options-stdin' option.
+  -c, --config <pathToConfigFile...>  Provide path to one or more webpack
+                                      configuration files to process, e.g.
+                                      "./webpack.config.js".
+  --config-name <name...>             Name(s) of particular configuration(s) to
+                                      use if configuration file exports an
+                                      array of multiple configurations.
+  -m, --merge                         Merge two or more configurations using
+                                      'webpack-merge'.
+  --disable-interpret                 Disable interpret for loading the config
+                                      file.
+  --env <value...>                    Environment variables passed to the
+                                      configuration when it is a function, e.g.
+                                      "myvar" or "myvar=myval".
+  --node-env <value>                  Sets process.env.NODE_ENV to the
+                                      specified value.
+  --analyze                           It invokes webpack-bundle-analyzer plugin
+                                      to get bundle information.
+  --progress [value]                  Print compilation progress during build.
+  -j, --json [pathToJsonFile]         Prints result as JSON or store it in a
+                                      file.
+  --fail-on-warnings                  Stop webpack-cli process with non-zero
+                                      exit code on warnings from webpack.
+  -e, --extends <value...>            Path to the configuration to be extended
+                                      (only works when using webpack-cli).
+  -d, --devtool <value>               A developer tool to enhance debugging
+                                      (false | eval |
+                                      [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
+  --no-devtool                        Negative 'devtool' option.
+  --entry <value...>                  A module that is loaded upon startup.
+                                      Only the last one is exported.
+  --extends <value...>                Path to the configuration to be extended
+                                      (only works when using webpack-cli).
+  --mode <value>                      Enable production optimizations or
+                                      development hints.
+  --name <value>                      Name of the configuration. Used when
+                                      loading multiple configurations.
+  -o, --output-path <value>           The output directory as **absolute path**
+                                      (required).
+  --stats [value]                     Stats options object or preset name.
+  --no-stats                          Negative 'stats' option.
+  -t, --target <value...>             Environment to build for. Environment to
+                                      build for. An array of environments to
+                                      build for all of them when possible.
+  --no-target                         Negative 'target' option.
+  -w, --watch                         Enter watch mode, which rebuilds on file
+                                      change.
+  --no-watch                          Negative 'watch' option.
+  --watch-options-stdin               Stop watching when stdin stream has
+                                      ended.
+  --no-watch-options-stdin            Negative 'watch-options-stdin' option.
 
 Global options:
-  --color                    Enable colors on console.
-  --no-color                 Disable colors on console.
-  -v, --version              Output the version number of 'webpack',
-                             'webpack-cli' and 'webpack-dev-server' and
-                             commands.
-  -h, --help [verbose]       Display help for commands and options.
+  --color                             Enable colors on console.
+  --no-color                          Disable colors on console.
+  -v, --version                       Output the version number of 'webpack',
+                                      'webpack-cli' and 'webpack-dev-server'
+                                      and commands.
+  -h, --help [verbose]                Display help for commands and options.
 
 To see list of all supported commands and options run 'webpack --help=verbose'.
 
@@ -437,55 +446,64 @@ exports[`help should show help information for 'build' and respect the "--no-col
 Run webpack (default command, can be omitted).
 
 Options:
-  -c, --config <value...>    Provide path to a webpack configuration file e.g.
-                             ./webpack.config.js.
-  --config-name <value...>   Name of the configuration to use.
-  -m, --merge                Merge two or more configurations using
-                             'webpack-merge'.
-  --disable-interpret        Disable interpret for loading the config file.
-  --env <value...>           Environment passed to the configuration when it is
-                             a function.
-  --node-env <value>         Sets process.env.NODE_ENV to the specified value.
-  --analyze                  It invokes webpack-bundle-analyzer plugin to get
-                             bundle information.
-  --progress [value]         Print compilation progress during build.
-  -j, --json [value]         Prints result as JSON or store it in a file.
-  --fail-on-warnings         Stop webpack-cli process with non-zero exit code
-                             on warnings from webpack.
-  -e, --extends <value...>   Path to the configuration to be extended (only
-                             works when using webpack-cli).
-  -d, --devtool <value>      A developer tool to enhance debugging (false |
-                             eval |
-                             [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
-  --no-devtool               Negative 'devtool' option.
-  --entry <value...>         A module that is loaded upon startup. Only the
-                             last one is exported.
-  --extends <value...>       Path to the configuration to be extended (only
-                             works when using webpack-cli).
-  --mode <value>             Enable production optimizations or development
-                             hints.
-  --name <value>             Name of the configuration. Used when loading
-                             multiple configurations.
-  -o, --output-path <value>  The output directory as **absolute path**
-                             (required).
-  --stats [value]            Stats options object or preset name.
-  --no-stats                 Negative 'stats' option.
-  -t, --target <value...>    Environment to build for. Environment to build
-                             for. An array of environments to build for all of
-                             them when possible.
-  --no-target                Negative 'target' option.
-  -w, --watch                Enter watch mode, which rebuilds on file change.
-  --no-watch                 Negative 'watch' option.
-  --watch-options-stdin      Stop watching when stdin stream has ended.
-  --no-watch-options-stdin   Negative 'watch-options-stdin' option.
+  -c, --config <pathToConfigFile...>  Provide path to one or more webpack
+                                      configuration files to process, e.g.
+                                      "./webpack.config.js".
+  --config-name <name...>             Name(s) of particular configuration(s) to
+                                      use if configuration file exports an
+                                      array of multiple configurations.
+  -m, --merge                         Merge two or more configurations using
+                                      'webpack-merge'.
+  --disable-interpret                 Disable interpret for loading the config
+                                      file.
+  --env <value...>                    Environment variables passed to the
+                                      configuration when it is a function, e.g.
+                                      "myvar" or "myvar=myval".
+  --node-env <value>                  Sets process.env.NODE_ENV to the
+                                      specified value.
+  --analyze                           It invokes webpack-bundle-analyzer plugin
+                                      to get bundle information.
+  --progress [value]                  Print compilation progress during build.
+  -j, --json [pathToJsonFile]         Prints result as JSON or store it in a
+                                      file.
+  --fail-on-warnings                  Stop webpack-cli process with non-zero
+                                      exit code on warnings from webpack.
+  -e, --extends <value...>            Path to the configuration to be extended
+                                      (only works when using webpack-cli).
+  -d, --devtool <value>               A developer tool to enhance debugging
+                                      (false | eval |
+                                      [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
+  --no-devtool                        Negative 'devtool' option.
+  --entry <value...>                  A module that is loaded upon startup.
+                                      Only the last one is exported.
+  --extends <value...>                Path to the configuration to be extended
+                                      (only works when using webpack-cli).
+  --mode <value>                      Enable production optimizations or
+                                      development hints.
+  --name <value>                      Name of the configuration. Used when
+                                      loading multiple configurations.
+  -o, --output-path <value>           The output directory as **absolute path**
+                                      (required).
+  --stats [value]                     Stats options object or preset name.
+  --no-stats                          Negative 'stats' option.
+  -t, --target <value...>             Environment to build for. Environment to
+                                      build for. An array of environments to
+                                      build for all of them when possible.
+  --no-target                         Negative 'target' option.
+  -w, --watch                         Enter watch mode, which rebuilds on file
+                                      change.
+  --no-watch                          Negative 'watch' option.
+  --watch-options-stdin               Stop watching when stdin stream has
+                                      ended.
+  --no-watch-options-stdin            Negative 'watch-options-stdin' option.
 
 Global options:
-  --color                    Enable colors on console.
-  --no-color                 Disable colors on console.
-  -v, --version              Output the version number of 'webpack',
-                             'webpack-cli' and 'webpack-dev-server' and
-                             commands.
-  -h, --help [verbose]       Display help for commands and options.
+  --color                             Enable colors on console.
+  --no-color                          Disable colors on console.
+  -v, --version                       Output the version number of 'webpack',
+                                      'webpack-cli' and 'webpack-dev-server'
+                                      and commands.
+  -h, --help [verbose]                Display help for commands and options.
 
 To see list of all supported commands and options run 'webpack --help=verbose'.
 
@@ -502,38 +520,38 @@ exports[`help should show help information for 'build' command using command syn
 Run webpack (default command, can be omitted).
 
 Options:
-  -c, --config <value...>    Provide path to a webpack configuration file e.g. ./webpack.config.js.
-  --config-name <value...>   Name of the configuration to use.
-  -m, --merge                Merge two or more configurations using 'webpack-merge'.
-  --disable-interpret        Disable interpret for loading the config file.
-  --env <value...>           Environment passed to the configuration when it is a function.
-  --node-env <value>         Sets process.env.NODE_ENV to the specified value.
-  --analyze                  It invokes webpack-bundle-analyzer plugin to get bundle information.
-  --progress [value]         Print compilation progress during build.
-  -j, --json [value]         Prints result as JSON or store it in a file.
-  --fail-on-warnings         Stop webpack-cli process with non-zero exit code on warnings from webpack.
-  -e, --extends <value...>   Path to the configuration to be extended (only works when using webpack-cli).
-  -d, --devtool <value>      A developer tool to enhance debugging (false | eval | [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
-  --no-devtool               Negative 'devtool' option.
-  --entry <value...>         A module that is loaded upon startup. Only the last one is exported.
-  --extends <value...>       Path to the configuration to be extended (only works when using webpack-cli).
-  --mode <value>             Enable production optimizations or development hints.
-  --name <value>             Name of the configuration. Used when loading multiple configurations.
-  -o, --output-path <value>  The output directory as **absolute path** (required).
-  --stats [value]            Stats options object or preset name.
-  --no-stats                 Negative 'stats' option.
-  -t, --target <value...>    Environment to build for. Environment to build for. An array of environments to build for all of them when possible.
-  --no-target                Negative 'target' option.
-  -w, --watch                Enter watch mode, which rebuilds on file change.
-  --no-watch                 Negative 'watch' option.
-  --watch-options-stdin      Stop watching when stdin stream has ended.
-  --no-watch-options-stdin   Negative 'watch-options-stdin' option.
+  -c, --config <pathToConfigFile...>  Provide path to one or more webpack configuration files to process, e.g. "./webpack.config.js".
+  --config-name <name...>             Name(s) of particular configuration(s) to use if configuration file exports an array of multiple configurations.
+  -m, --merge                         Merge two or more configurations using 'webpack-merge'.
+  --disable-interpret                 Disable interpret for loading the config file.
+  --env <value...>                    Environment variables passed to the configuration when it is a function, e.g. "myvar" or "myvar=myval".
+  --node-env <value>                  Sets process.env.NODE_ENV to the specified value.
+  --analyze                           It invokes webpack-bundle-analyzer plugin to get bundle information.
+  --progress [value]                  Print compilation progress during build.
+  -j, --json [pathToJsonFile]         Prints result as JSON or store it in a file.
+  --fail-on-warnings                  Stop webpack-cli process with non-zero exit code on warnings from webpack.
+  -e, --extends <value...>            Path to the configuration to be extended (only works when using webpack-cli).
+  -d, --devtool <value>               A developer tool to enhance debugging (false | eval | [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
+  --no-devtool                        Negative 'devtool' option.
+  --entry <value...>                  A module that is loaded upon startup. Only the last one is exported.
+  --extends <value...>                Path to the configuration to be extended (only works when using webpack-cli).
+  --mode <value>                      Enable production optimizations or development hints.
+  --name <value>                      Name of the configuration. Used when loading multiple configurations.
+  -o, --output-path <value>           The output directory as **absolute path** (required).
+  --stats [value]                     Stats options object or preset name.
+  --no-stats                          Negative 'stats' option.
+  -t, --target <value...>             Environment to build for. Environment to build for. An array of environments to build for all of them when possible.
+  --no-target                         Negative 'target' option.
+  -w, --watch                         Enter watch mode, which rebuilds on file change.
+  --no-watch                          Negative 'watch' option.
+  --watch-options-stdin               Stop watching when stdin stream has ended.
+  --no-watch-options-stdin            Negative 'watch-options-stdin' option.
 
 Global options:
-  --color                    Enable colors on console.
-  --no-color                 Disable colors on console.
-  -v, --version              Output the version number of 'webpack', 'webpack-cli' and 'webpack-dev-server' and commands.
-  -h, --help [verbose]       Display help for commands and options.
+  --color                             Enable colors on console.
+  --no-color                          Disable colors on console.
+  -v, --version                       Output the version number of 'webpack', 'webpack-cli' and 'webpack-dev-server' and commands.
+  -h, --help [verbose]                Display help for commands and options.
 
 To see list of all supported commands and options run 'webpack --help=verbose'.
 
@@ -550,38 +568,38 @@ exports[`help should show help information for 'build' command using the "--help
 Run webpack (default command, can be omitted).
 
 Options:
-  -c, --config <value...>    Provide path to a webpack configuration file e.g. ./webpack.config.js.
-  --config-name <value...>   Name of the configuration to use.
-  -m, --merge                Merge two or more configurations using 'webpack-merge'.
-  --disable-interpret        Disable interpret for loading the config file.
-  --env <value...>           Environment passed to the configuration when it is a function.
-  --node-env <value>         Sets process.env.NODE_ENV to the specified value.
-  --analyze                  It invokes webpack-bundle-analyzer plugin to get bundle information.
-  --progress [value]         Print compilation progress during build.
-  -j, --json [value]         Prints result as JSON or store it in a file.
-  --fail-on-warnings         Stop webpack-cli process with non-zero exit code on warnings from webpack.
-  -e, --extends <value...>   Path to the configuration to be extended (only works when using webpack-cli).
-  -d, --devtool <value>      A developer tool to enhance debugging (false | eval | [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
-  --no-devtool               Negative 'devtool' option.
-  --entry <value...>         A module that is loaded upon startup. Only the last one is exported.
-  --extends <value...>       Path to the configuration to be extended (only works when using webpack-cli).
-  --mode <value>             Enable production optimizations or development hints.
-  --name <value>             Name of the configuration. Used when loading multiple configurations.
-  -o, --output-path <value>  The output directory as **absolute path** (required).
-  --stats [value]            Stats options object or preset name.
-  --no-stats                 Negative 'stats' option.
-  -t, --target <value...>    Environment to build for. Environment to build for. An array of environments to build for all of them when possible.
-  --no-target                Negative 'target' option.
-  -w, --watch                Enter watch mode, which rebuilds on file change.
-  --no-watch                 Negative 'watch' option.
-  --watch-options-stdin      Stop watching when stdin stream has ended.
-  --no-watch-options-stdin   Negative 'watch-options-stdin' option.
+  -c, --config <pathToConfigFile...>  Provide path to one or more webpack configuration files to process, e.g. "./webpack.config.js".
+  --config-name <name...>             Name(s) of particular configuration(s) to use if configuration file exports an array of multiple configurations.
+  -m, --merge                         Merge two or more configurations using 'webpack-merge'.
+  --disable-interpret                 Disable interpret for loading the config file.
+  --env <value...>                    Environment variables passed to the configuration when it is a function, e.g. "myvar" or "myvar=myval".
+  --node-env <value>                  Sets process.env.NODE_ENV to the specified value.
+  --analyze                           It invokes webpack-bundle-analyzer plugin to get bundle information.
+  --progress [value]                  Print compilation progress during build.
+  -j, --json [pathToJsonFile]         Prints result as JSON or store it in a file.
+  --fail-on-warnings                  Stop webpack-cli process with non-zero exit code on warnings from webpack.
+  -e, --extends <value...>            Path to the configuration to be extended (only works when using webpack-cli).
+  -d, --devtool <value>               A developer tool to enhance debugging (false | eval | [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
+  --no-devtool                        Negative 'devtool' option.
+  --entry <value...>                  A module that is loaded upon startup. Only the last one is exported.
+  --extends <value...>                Path to the configuration to be extended (only works when using webpack-cli).
+  --mode <value>                      Enable production optimizations or development hints.
+  --name <value>                      Name of the configuration. Used when loading multiple configurations.
+  -o, --output-path <value>           The output directory as **absolute path** (required).
+  --stats [value]                     Stats options object or preset name.
+  --no-stats                          Negative 'stats' option.
+  -t, --target <value...>             Environment to build for. Environment to build for. An array of environments to build for all of them when possible.
+  --no-target                         Negative 'target' option.
+  -w, --watch                         Enter watch mode, which rebuilds on file change.
+  --no-watch                          Negative 'watch' option.
+  --watch-options-stdin               Stop watching when stdin stream has ended.
+  --no-watch-options-stdin            Negative 'watch-options-stdin' option.
 
 Global options:
-  --color                    Enable colors on console.
-  --no-color                 Disable colors on console.
-  -v, --version              Output the version number of 'webpack', 'webpack-cli' and 'webpack-dev-server' and commands.
-  -h, --help [verbose]       Display help for commands and options.
+  --color                             Enable colors on console.
+  --no-color                          Disable colors on console.
+  -v, --version                       Output the version number of 'webpack', 'webpack-cli' and 'webpack-dev-server' and commands.
+  -h, --help [verbose]                Display help for commands and options.
 
 To see list of all supported commands and options run 'webpack --help=verbose'.
 
@@ -1532,36 +1550,36 @@ exports[`help should show help information for 'w' command using command syntax:
 Run webpack and watch for files changes.
 
 Options:
-  -c, --config <value...>    Provide path to a webpack configuration file e.g. ./webpack.config.js.
-  --config-name <value...>   Name of the configuration to use.
-  -m, --merge                Merge two or more configurations using 'webpack-merge'.
-  --disable-interpret        Disable interpret for loading the config file.
-  --env <value...>           Environment passed to the configuration when it is a function.
-  --node-env <value>         Sets process.env.NODE_ENV to the specified value.
-  --analyze                  It invokes webpack-bundle-analyzer plugin to get bundle information.
-  --progress [value]         Print compilation progress during build.
-  -j, --json [value]         Prints result as JSON or store it in a file.
-  --fail-on-warnings         Stop webpack-cli process with non-zero exit code on warnings from webpack.
-  -e, --extends <value...>   Path to the configuration to be extended (only works when using webpack-cli).
-  -d, --devtool <value>      A developer tool to enhance debugging (false | eval | [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
-  --no-devtool               Negative 'devtool' option.
-  --entry <value...>         A module that is loaded upon startup. Only the last one is exported.
-  --extends <value...>       Path to the configuration to be extended (only works when using webpack-cli).
-  --mode <value>             Enable production optimizations or development hints.
-  --name <value>             Name of the configuration. Used when loading multiple configurations.
-  -o, --output-path <value>  The output directory as **absolute path** (required).
-  --stats [value]            Stats options object or preset name.
-  --no-stats                 Negative 'stats' option.
-  -t, --target <value...>    Environment to build for. Environment to build for. An array of environments to build for all of them when possible.
-  --no-target                Negative 'target' option.
-  --watch-options-stdin      Stop watching when stdin stream has ended.
-  --no-watch-options-stdin   Negative 'watch-options-stdin' option.
+  -c, --config <pathToConfigFile...>  Provide path to one or more webpack configuration files to process, e.g. "./webpack.config.js".
+  --config-name <name...>             Name(s) of particular configuration(s) to use if configuration file exports an array of multiple configurations.
+  -m, --merge                         Merge two or more configurations using 'webpack-merge'.
+  --disable-interpret                 Disable interpret for loading the config file.
+  --env <value...>                    Environment variables passed to the configuration when it is a function, e.g. "myvar" or "myvar=myval".
+  --node-env <value>                  Sets process.env.NODE_ENV to the specified value.
+  --analyze                           It invokes webpack-bundle-analyzer plugin to get bundle information.
+  --progress [value]                  Print compilation progress during build.
+  -j, --json [pathToJsonFile]         Prints result as JSON or store it in a file.
+  --fail-on-warnings                  Stop webpack-cli process with non-zero exit code on warnings from webpack.
+  -e, --extends <value...>            Path to the configuration to be extended (only works when using webpack-cli).
+  -d, --devtool <value>               A developer tool to enhance debugging (false | eval | [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
+  --no-devtool                        Negative 'devtool' option.
+  --entry <value...>                  A module that is loaded upon startup. Only the last one is exported.
+  --extends <value...>                Path to the configuration to be extended (only works when using webpack-cli).
+  --mode <value>                      Enable production optimizations or development hints.
+  --name <value>                      Name of the configuration. Used when loading multiple configurations.
+  -o, --output-path <value>           The output directory as **absolute path** (required).
+  --stats [value]                     Stats options object or preset name.
+  --no-stats                          Negative 'stats' option.
+  -t, --target <value...>             Environment to build for. Environment to build for. An array of environments to build for all of them when possible.
+  --no-target                         Negative 'target' option.
+  --watch-options-stdin               Stop watching when stdin stream has ended.
+  --no-watch-options-stdin            Negative 'watch-options-stdin' option.
 
 Global options:
-  --color                    Enable colors on console.
-  --no-color                 Disable colors on console.
-  -v, --version              Output the version number of 'webpack', 'webpack-cli' and 'webpack-dev-server' and commands.
-  -h, --help [verbose]       Display help for commands and options.
+  --color                             Enable colors on console.
+  --no-color                          Disable colors on console.
+  -v, --version                       Output the version number of 'webpack', 'webpack-cli' and 'webpack-dev-server' and commands.
+  -h, --help [verbose]                Display help for commands and options.
 
 To see list of all supported commands and options run 'webpack --help=verbose'.
 
@@ -1578,36 +1596,36 @@ exports[`help should show help information for 'w' command using the "--help" op
 Run webpack and watch for files changes.
 
 Options:
-  -c, --config <value...>    Provide path to a webpack configuration file e.g. ./webpack.config.js.
-  --config-name <value...>   Name of the configuration to use.
-  -m, --merge                Merge two or more configurations using 'webpack-merge'.
-  --disable-interpret        Disable interpret for loading the config file.
-  --env <value...>           Environment passed to the configuration when it is a function.
-  --node-env <value>         Sets process.env.NODE_ENV to the specified value.
-  --analyze                  It invokes webpack-bundle-analyzer plugin to get bundle information.
-  --progress [value]         Print compilation progress during build.
-  -j, --json [value]         Prints result as JSON or store it in a file.
-  --fail-on-warnings         Stop webpack-cli process with non-zero exit code on warnings from webpack.
-  -e, --extends <value...>   Path to the configuration to be extended (only works when using webpack-cli).
-  -d, --devtool <value>      A developer tool to enhance debugging (false | eval | [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
-  --no-devtool               Negative 'devtool' option.
-  --entry <value...>         A module that is loaded upon startup. Only the last one is exported.
-  --extends <value...>       Path to the configuration to be extended (only works when using webpack-cli).
-  --mode <value>             Enable production optimizations or development hints.
-  --name <value>             Name of the configuration. Used when loading multiple configurations.
-  -o, --output-path <value>  The output directory as **absolute path** (required).
-  --stats [value]            Stats options object or preset name.
-  --no-stats                 Negative 'stats' option.
-  -t, --target <value...>    Environment to build for. Environment to build for. An array of environments to build for all of them when possible.
-  --no-target                Negative 'target' option.
-  --watch-options-stdin      Stop watching when stdin stream has ended.
-  --no-watch-options-stdin   Negative 'watch-options-stdin' option.
+  -c, --config <pathToConfigFile...>  Provide path to one or more webpack configuration files to process, e.g. "./webpack.config.js".
+  --config-name <name...>             Name(s) of particular configuration(s) to use if configuration file exports an array of multiple configurations.
+  -m, --merge                         Merge two or more configurations using 'webpack-merge'.
+  --disable-interpret                 Disable interpret for loading the config file.
+  --env <value...>                    Environment variables passed to the configuration when it is a function, e.g. "myvar" or "myvar=myval".
+  --node-env <value>                  Sets process.env.NODE_ENV to the specified value.
+  --analyze                           It invokes webpack-bundle-analyzer plugin to get bundle information.
+  --progress [value]                  Print compilation progress during build.
+  -j, --json [pathToJsonFile]         Prints result as JSON or store it in a file.
+  --fail-on-warnings                  Stop webpack-cli process with non-zero exit code on warnings from webpack.
+  -e, --extends <value...>            Path to the configuration to be extended (only works when using webpack-cli).
+  -d, --devtool <value>               A developer tool to enhance debugging (false | eval | [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
+  --no-devtool                        Negative 'devtool' option.
+  --entry <value...>                  A module that is loaded upon startup. Only the last one is exported.
+  --extends <value...>                Path to the configuration to be extended (only works when using webpack-cli).
+  --mode <value>                      Enable production optimizations or development hints.
+  --name <value>                      Name of the configuration. Used when loading multiple configurations.
+  -o, --output-path <value>           The output directory as **absolute path** (required).
+  --stats [value]                     Stats options object or preset name.
+  --no-stats                          Negative 'stats' option.
+  -t, --target <value...>             Environment to build for. Environment to build for. An array of environments to build for all of them when possible.
+  --no-target                         Negative 'target' option.
+  --watch-options-stdin               Stop watching when stdin stream has ended.
+  --no-watch-options-stdin            Negative 'watch-options-stdin' option.
 
 Global options:
-  --color                    Enable colors on console.
-  --no-color                 Disable colors on console.
-  -v, --version              Output the version number of 'webpack', 'webpack-cli' and 'webpack-dev-server' and commands.
-  -h, --help [verbose]       Display help for commands and options.
+  --color                             Enable colors on console.
+  --no-color                          Disable colors on console.
+  -v, --version                       Output the version number of 'webpack', 'webpack-cli' and 'webpack-dev-server' and commands.
+  -h, --help [verbose]                Display help for commands and options.
 
 To see list of all supported commands and options run 'webpack --help=verbose'.
 
@@ -1624,53 +1642,61 @@ exports[`help should show help information for 'watch' and respect the "--color"
 Run webpack and watch for files changes.
 
 Options:
-  -c, --config <value...>    Provide path to a webpack configuration file e.g.
-                             ./webpack.config.js.
-  --config-name <value...>   Name of the configuration to use.
-  -m, --merge                Merge two or more configurations using
-                             'webpack-merge'.
-  --disable-interpret        Disable interpret for loading the config file.
-  --env <value...>           Environment passed to the configuration when it is
-                             a function.
-  --node-env <value>         Sets process.env.NODE_ENV to the specified value.
-  --analyze                  It invokes webpack-bundle-analyzer plugin to get
-                             bundle information.
-  --progress [value]         Print compilation progress during build.
-  -j, --json [value]         Prints result as JSON or store it in a file.
-  --fail-on-warnings         Stop webpack-cli process with non-zero exit code
-                             on warnings from webpack.
-  -e, --extends <value...>   Path to the configuration to be extended (only
-                             works when using webpack-cli).
-  -d, --devtool <value>      A developer tool to enhance debugging (false |
-                             eval |
-                             [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
-  --no-devtool               Negative 'devtool' option.
-  --entry <value...>         A module that is loaded upon startup. Only the
-                             last one is exported.
-  --extends <value...>       Path to the configuration to be extended (only
-                             works when using webpack-cli).
-  --mode <value>             Enable production optimizations or development
-                             hints.
-  --name <value>             Name of the configuration. Used when loading
-                             multiple configurations.
-  -o, --output-path <value>  The output directory as **absolute path**
-                             (required).
-  --stats [value]            Stats options object or preset name.
-  --no-stats                 Negative 'stats' option.
-  -t, --target <value...>    Environment to build for. Environment to build
-                             for. An array of environments to build for all of
-                             them when possible.
-  --no-target                Negative 'target' option.
-  --watch-options-stdin      Stop watching when stdin stream has ended.
-  --no-watch-options-stdin   Negative 'watch-options-stdin' option.
+  -c, --config <pathToConfigFile...>  Provide path to one or more webpack
+                                      configuration files to process, e.g.
+                                      "./webpack.config.js".
+  --config-name <name...>             Name(s) of particular configuration(s) to
+                                      use if configuration file exports an
+                                      array of multiple configurations.
+  -m, --merge                         Merge two or more configurations using
+                                      'webpack-merge'.
+  --disable-interpret                 Disable interpret for loading the config
+                                      file.
+  --env <value...>                    Environment variables passed to the
+                                      configuration when it is a function, e.g.
+                                      "myvar" or "myvar=myval".
+  --node-env <value>                  Sets process.env.NODE_ENV to the
+                                      specified value.
+  --analyze                           It invokes webpack-bundle-analyzer plugin
+                                      to get bundle information.
+  --progress [value]                  Print compilation progress during build.
+  -j, --json [pathToJsonFile]         Prints result as JSON or store it in a
+                                      file.
+  --fail-on-warnings                  Stop webpack-cli process with non-zero
+                                      exit code on warnings from webpack.
+  -e, --extends <value...>            Path to the configuration to be extended
+                                      (only works when using webpack-cli).
+  -d, --devtool <value>               A developer tool to enhance debugging
+                                      (false | eval |
+                                      [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
+  --no-devtool                        Negative 'devtool' option.
+  --entry <value...>                  A module that is loaded upon startup.
+                                      Only the last one is exported.
+  --extends <value...>                Path to the configuration to be extended
+                                      (only works when using webpack-cli).
+  --mode <value>                      Enable production optimizations or
+                                      development hints.
+  --name <value>                      Name of the configuration. Used when
+                                      loading multiple configurations.
+  -o, --output-path <value>           The output directory as **absolute path**
+                                      (required).
+  --stats [value]                     Stats options object or preset name.
+  --no-stats                          Negative 'stats' option.
+  -t, --target <value...>             Environment to build for. Environment to
+                                      build for. An array of environments to
+                                      build for all of them when possible.
+  --no-target                         Negative 'target' option.
+  --watch-options-stdin               Stop watching when stdin stream has
+                                      ended.
+  --no-watch-options-stdin            Negative 'watch-options-stdin' option.
 
 Global options:
-  --color                    Enable colors on console.
-  --no-color                 Disable colors on console.
-  -v, --version              Output the version number of 'webpack',
-                             'webpack-cli' and 'webpack-dev-server' and
-                             commands.
-  -h, --help [verbose]       Display help for commands and options.
+  --color                             Enable colors on console.
+  --no-color                          Disable colors on console.
+  -v, --version                       Output the version number of 'webpack',
+                                      'webpack-cli' and 'webpack-dev-server'
+                                      and commands.
+  -h, --help [verbose]                Display help for commands and options.
 
 To see list of all supported commands and options run 'webpack --help=verbose'.
 
@@ -1687,53 +1713,61 @@ exports[`help should show help information for 'watch' and respect the "--no-col
 Run webpack and watch for files changes.
 
 Options:
-  -c, --config <value...>    Provide path to a webpack configuration file e.g.
-                             ./webpack.config.js.
-  --config-name <value...>   Name of the configuration to use.
-  -m, --merge                Merge two or more configurations using
-                             'webpack-merge'.
-  --disable-interpret        Disable interpret for loading the config file.
-  --env <value...>           Environment passed to the configuration when it is
-                             a function.
-  --node-env <value>         Sets process.env.NODE_ENV to the specified value.
-  --analyze                  It invokes webpack-bundle-analyzer plugin to get
-                             bundle information.
-  --progress [value]         Print compilation progress during build.
-  -j, --json [value]         Prints result as JSON or store it in a file.
-  --fail-on-warnings         Stop webpack-cli process with non-zero exit code
-                             on warnings from webpack.
-  -e, --extends <value...>   Path to the configuration to be extended (only
-                             works when using webpack-cli).
-  -d, --devtool <value>      A developer tool to enhance debugging (false |
-                             eval |
-                             [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
-  --no-devtool               Negative 'devtool' option.
-  --entry <value...>         A module that is loaded upon startup. Only the
-                             last one is exported.
-  --extends <value...>       Path to the configuration to be extended (only
-                             works when using webpack-cli).
-  --mode <value>             Enable production optimizations or development
-                             hints.
-  --name <value>             Name of the configuration. Used when loading
-                             multiple configurations.
-  -o, --output-path <value>  The output directory as **absolute path**
-                             (required).
-  --stats [value]            Stats options object or preset name.
-  --no-stats                 Negative 'stats' option.
-  -t, --target <value...>    Environment to build for. Environment to build
-                             for. An array of environments to build for all of
-                             them when possible.
-  --no-target                Negative 'target' option.
-  --watch-options-stdin      Stop watching when stdin stream has ended.
-  --no-watch-options-stdin   Negative 'watch-options-stdin' option.
+  -c, --config <pathToConfigFile...>  Provide path to one or more webpack
+                                      configuration files to process, e.g.
+                                      "./webpack.config.js".
+  --config-name <name...>             Name(s) of particular configuration(s) to
+                                      use if configuration file exports an
+                                      array of multiple configurations.
+  -m, --merge                         Merge two or more configurations using
+                                      'webpack-merge'.
+  --disable-interpret                 Disable interpret for loading the config
+                                      file.
+  --env <value...>                    Environment variables passed to the
+                                      configuration when it is a function, e.g.
+                                      "myvar" or "myvar=myval".
+  --node-env <value>                  Sets process.env.NODE_ENV to the
+                                      specified value.
+  --analyze                           It invokes webpack-bundle-analyzer plugin
+                                      to get bundle information.
+  --progress [value]                  Print compilation progress during build.
+  -j, --json [pathToJsonFile]         Prints result as JSON or store it in a
+                                      file.
+  --fail-on-warnings                  Stop webpack-cli process with non-zero
+                                      exit code on warnings from webpack.
+  -e, --extends <value...>            Path to the configuration to be extended
+                                      (only works when using webpack-cli).
+  -d, --devtool <value>               A developer tool to enhance debugging
+                                      (false | eval |
+                                      [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
+  --no-devtool                        Negative 'devtool' option.
+  --entry <value...>                  A module that is loaded upon startup.
+                                      Only the last one is exported.
+  --extends <value...>                Path to the configuration to be extended
+                                      (only works when using webpack-cli).
+  --mode <value>                      Enable production optimizations or
+                                      development hints.
+  --name <value>                      Name of the configuration. Used when
+                                      loading multiple configurations.
+  -o, --output-path <value>           The output directory as **absolute path**
+                                      (required).
+  --stats [value]                     Stats options object or preset name.
+  --no-stats                          Negative 'stats' option.
+  -t, --target <value...>             Environment to build for. Environment to
+                                      build for. An array of environments to
+                                      build for all of them when possible.
+  --no-target                         Negative 'target' option.
+  --watch-options-stdin               Stop watching when stdin stream has
+                                      ended.
+  --no-watch-options-stdin            Negative 'watch-options-stdin' option.
 
 Global options:
-  --color                    Enable colors on console.
-  --no-color                 Disable colors on console.
-  -v, --version              Output the version number of 'webpack',
-                             'webpack-cli' and 'webpack-dev-server' and
-                             commands.
-  -h, --help [verbose]       Display help for commands and options.
+  --color                             Enable colors on console.
+  --no-color                          Disable colors on console.
+  -v, --version                       Output the version number of 'webpack',
+                                      'webpack-cli' and 'webpack-dev-server'
+                                      and commands.
+  -h, --help [verbose]                Display help for commands and options.
 
 To see list of all supported commands and options run 'webpack --help=verbose'.
 
@@ -1750,36 +1784,36 @@ exports[`help should show help information for 'watch' command using command syn
 Run webpack and watch for files changes.
 
 Options:
-  -c, --config <value...>    Provide path to a webpack configuration file e.g. ./webpack.config.js.
-  --config-name <value...>   Name of the configuration to use.
-  -m, --merge                Merge two or more configurations using 'webpack-merge'.
-  --disable-interpret        Disable interpret for loading the config file.
-  --env <value...>           Environment passed to the configuration when it is a function.
-  --node-env <value>         Sets process.env.NODE_ENV to the specified value.
-  --analyze                  It invokes webpack-bundle-analyzer plugin to get bundle information.
-  --progress [value]         Print compilation progress during build.
-  -j, --json [value]         Prints result as JSON or store it in a file.
-  --fail-on-warnings         Stop webpack-cli process with non-zero exit code on warnings from webpack.
-  -e, --extends <value...>   Path to the configuration to be extended (only works when using webpack-cli).
-  -d, --devtool <value>      A developer tool to enhance debugging (false | eval | [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
-  --no-devtool               Negative 'devtool' option.
-  --entry <value...>         A module that is loaded upon startup. Only the last one is exported.
-  --extends <value...>       Path to the configuration to be extended (only works when using webpack-cli).
-  --mode <value>             Enable production optimizations or development hints.
-  --name <value>             Name of the configuration. Used when loading multiple configurations.
-  -o, --output-path <value>  The output directory as **absolute path** (required).
-  --stats [value]            Stats options object or preset name.
-  --no-stats                 Negative 'stats' option.
-  -t, --target <value...>    Environment to build for. Environment to build for. An array of environments to build for all of them when possible.
-  --no-target                Negative 'target' option.
-  --watch-options-stdin      Stop watching when stdin stream has ended.
-  --no-watch-options-stdin   Negative 'watch-options-stdin' option.
+  -c, --config <pathToConfigFile...>  Provide path to one or more webpack configuration files to process, e.g. "./webpack.config.js".
+  --config-name <name...>             Name(s) of particular configuration(s) to use if configuration file exports an array of multiple configurations.
+  -m, --merge                         Merge two or more configurations using 'webpack-merge'.
+  --disable-interpret                 Disable interpret for loading the config file.
+  --env <value...>                    Environment variables passed to the configuration when it is a function, e.g. "myvar" or "myvar=myval".
+  --node-env <value>                  Sets process.env.NODE_ENV to the specified value.
+  --analyze                           It invokes webpack-bundle-analyzer plugin to get bundle information.
+  --progress [value]                  Print compilation progress during build.
+  -j, --json [pathToJsonFile]         Prints result as JSON or store it in a file.
+  --fail-on-warnings                  Stop webpack-cli process with non-zero exit code on warnings from webpack.
+  -e, --extends <value...>            Path to the configuration to be extended (only works when using webpack-cli).
+  -d, --devtool <value>               A developer tool to enhance debugging (false | eval | [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
+  --no-devtool                        Negative 'devtool' option.
+  --entry <value...>                  A module that is loaded upon startup. Only the last one is exported.
+  --extends <value...>                Path to the configuration to be extended (only works when using webpack-cli).
+  --mode <value>                      Enable production optimizations or development hints.
+  --name <value>                      Name of the configuration. Used when loading multiple configurations.
+  -o, --output-path <value>           The output directory as **absolute path** (required).
+  --stats [value]                     Stats options object or preset name.
+  --no-stats                          Negative 'stats' option.
+  -t, --target <value...>             Environment to build for. Environment to build for. An array of environments to build for all of them when possible.
+  --no-target                         Negative 'target' option.
+  --watch-options-stdin               Stop watching when stdin stream has ended.
+  --no-watch-options-stdin            Negative 'watch-options-stdin' option.
 
 Global options:
-  --color                    Enable colors on console.
-  --no-color                 Disable colors on console.
-  -v, --version              Output the version number of 'webpack', 'webpack-cli' and 'webpack-dev-server' and commands.
-  -h, --help [verbose]       Display help for commands and options.
+  --color                             Enable colors on console.
+  --no-color                          Disable colors on console.
+  -v, --version                       Output the version number of 'webpack', 'webpack-cli' and 'webpack-dev-server' and commands.
+  -h, --help [verbose]                Display help for commands and options.
 
 To see list of all supported commands and options run 'webpack --help=verbose'.
 
@@ -1796,36 +1830,36 @@ exports[`help should show help information for 'watch' command using the "--help
 Run webpack and watch for files changes.
 
 Options:
-  -c, --config <value...>    Provide path to a webpack configuration file e.g. ./webpack.config.js.
-  --config-name <value...>   Name of the configuration to use.
-  -m, --merge                Merge two or more configurations using 'webpack-merge'.
-  --disable-interpret        Disable interpret for loading the config file.
-  --env <value...>           Environment passed to the configuration when it is a function.
-  --node-env <value>         Sets process.env.NODE_ENV to the specified value.
-  --analyze                  It invokes webpack-bundle-analyzer plugin to get bundle information.
-  --progress [value]         Print compilation progress during build.
-  -j, --json [value]         Prints result as JSON or store it in a file.
-  --fail-on-warnings         Stop webpack-cli process with non-zero exit code on warnings from webpack.
-  -e, --extends <value...>   Path to the configuration to be extended (only works when using webpack-cli).
-  -d, --devtool <value>      A developer tool to enhance debugging (false | eval | [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
-  --no-devtool               Negative 'devtool' option.
-  --entry <value...>         A module that is loaded upon startup. Only the last one is exported.
-  --extends <value...>       Path to the configuration to be extended (only works when using webpack-cli).
-  --mode <value>             Enable production optimizations or development hints.
-  --name <value>             Name of the configuration. Used when loading multiple configurations.
-  -o, --output-path <value>  The output directory as **absolute path** (required).
-  --stats [value]            Stats options object or preset name.
-  --no-stats                 Negative 'stats' option.
-  -t, --target <value...>    Environment to build for. Environment to build for. An array of environments to build for all of them when possible.
-  --no-target                Negative 'target' option.
-  --watch-options-stdin      Stop watching when stdin stream has ended.
-  --no-watch-options-stdin   Negative 'watch-options-stdin' option.
+  -c, --config <pathToConfigFile...>  Provide path to one or more webpack configuration files to process, e.g. "./webpack.config.js".
+  --config-name <name...>             Name(s) of particular configuration(s) to use if configuration file exports an array of multiple configurations.
+  -m, --merge                         Merge two or more configurations using 'webpack-merge'.
+  --disable-interpret                 Disable interpret for loading the config file.
+  --env <value...>                    Environment variables passed to the configuration when it is a function, e.g. "myvar" or "myvar=myval".
+  --node-env <value>                  Sets process.env.NODE_ENV to the specified value.
+  --analyze                           It invokes webpack-bundle-analyzer plugin to get bundle information.
+  --progress [value]                  Print compilation progress during build.
+  -j, --json [pathToJsonFile]         Prints result as JSON or store it in a file.
+  --fail-on-warnings                  Stop webpack-cli process with non-zero exit code on warnings from webpack.
+  -e, --extends <value...>            Path to the configuration to be extended (only works when using webpack-cli).
+  -d, --devtool <value>               A developer tool to enhance debugging (false | eval | [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
+  --no-devtool                        Negative 'devtool' option.
+  --entry <value...>                  A module that is loaded upon startup. Only the last one is exported.
+  --extends <value...>                Path to the configuration to be extended (only works when using webpack-cli).
+  --mode <value>                      Enable production optimizations or development hints.
+  --name <value>                      Name of the configuration. Used when loading multiple configurations.
+  -o, --output-path <value>           The output directory as **absolute path** (required).
+  --stats [value]                     Stats options object or preset name.
+  --no-stats                          Negative 'stats' option.
+  -t, --target <value...>             Environment to build for. Environment to build for. An array of environments to build for all of them when possible.
+  --no-target                         Negative 'target' option.
+  --watch-options-stdin               Stop watching when stdin stream has ended.
+  --no-watch-options-stdin            Negative 'watch-options-stdin' option.
 
 Global options:
-  --color                    Enable colors on console.
-  --no-color                 Disable colors on console.
-  -v, --version              Output the version number of 'webpack', 'webpack-cli' and 'webpack-dev-server' and commands.
-  -h, --help [verbose]       Display help for commands and options.
+  --color                             Enable colors on console.
+  --no-color                          Disable colors on console.
+  -v, --version                       Output the version number of 'webpack', 'webpack-cli' and 'webpack-dev-server' and commands.
+  -h, --help [verbose]                Display help for commands and options.
 
 To see list of all supported commands and options run 'webpack --help=verbose'.
 
@@ -1843,15 +1877,15 @@ Alternative usage to run commands: webpack [command] [options]
 The build tool for modern web applications.
 
 Options:
-  -c, --config <value...>                          Provide path to a webpack configuration file e.g. ./webpack.config.js.
-  --config-name <value...>                         Name of the configuration to use.
+  -c, --config <pathToConfigFile...>               Provide path to one or more webpack configuration files to process, e.g. "./webpack.config.js".
+  --config-name <name...>                          Name(s) of particular configuration(s) to use if configuration file exports an array of multiple configurations.
   -m, --merge                                      Merge two or more configurations using 'webpack-merge'.
   --disable-interpret                              Disable interpret for loading the config file.
-  --env <value...>                                 Environment passed to the configuration when it is a function.
+  --env <value...>                                 Environment variables passed to the configuration when it is a function, e.g. "myvar" or "myvar=myval".
   --node-env <value>                               Sets process.env.NODE_ENV to the specified value.
   --analyze                                        It invokes webpack-bundle-analyzer plugin to get bundle information.
   --progress [value]                               Print compilation progress during build.
-  -j, --json [value]                               Prints result as JSON or store it in a file.
+  -j, --json [pathToJsonFile]                      Prints result as JSON or store it in a file.
   --fail-on-warnings                               Stop webpack-cli process with non-zero exit code on warnings from webpack.
   -e, --extends <value...>                         Path to the configuration to be extended (only works when using webpack-cli).
   -d, --devtool <value>                            A developer tool to enhance debugging (false | eval | [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
@@ -1884,7 +1918,7 @@ Commands:
   init|create|new|c|n [generation-path] [options]  Initialize a new webpack project.
   loader|l [output-path] [options]                 Scaffold a loader.
   plugin|p [output-path] [options]                 Scaffold a plugin.
-  serve|server|s [entries...] [options]            Run the webpack dev server.
+  serve|server|s [entries...] [options]            Run the webpack dev server and watch for source file changes while serving.
   version|v [options]                              Output the version number of 'webpack', 'webpack-cli' and 'webpack-dev-server' and commands.
   watch|w [entries...] [options]                   Run webpack and watch for files changes.
 
@@ -1904,15 +1938,15 @@ Alternative usage to run commands: webpack [command] [options]
 The build tool for modern web applications.
 
 Options:
-  -c, --config <value...>                          Provide path to a webpack configuration file e.g. ./webpack.config.js.
-  --config-name <value...>                         Name of the configuration to use.
+  -c, --config <pathToConfigFile...>               Provide path to one or more webpack configuration files to process, e.g. "./webpack.config.js".
+  --config-name <name...>                          Name(s) of particular configuration(s) to use if configuration file exports an array of multiple configurations.
   -m, --merge                                      Merge two or more configurations using 'webpack-merge'.
   --disable-interpret                              Disable interpret for loading the config file.
-  --env <value...>                                 Environment passed to the configuration when it is a function.
+  --env <value...>                                 Environment variables passed to the configuration when it is a function, e.g. "myvar" or "myvar=myval".
   --node-env <value>                               Sets process.env.NODE_ENV to the specified value.
   --analyze                                        It invokes webpack-bundle-analyzer plugin to get bundle information.
   --progress [value]                               Print compilation progress during build.
-  -j, --json [value]                               Prints result as JSON or store it in a file.
+  -j, --json [pathToJsonFile]                      Prints result as JSON or store it in a file.
   --fail-on-warnings                               Stop webpack-cli process with non-zero exit code on warnings from webpack.
   -e, --extends <value...>                         Path to the configuration to be extended (only works when using webpack-cli).
   -d, --devtool <value>                            A developer tool to enhance debugging (false | eval | [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
@@ -1945,7 +1979,7 @@ Commands:
   init|create|new|c|n [generation-path] [options]  Initialize a new webpack project.
   loader|l [output-path] [options]                 Scaffold a loader.
   plugin|p [output-path] [options]                 Scaffold a plugin.
-  serve|server|s [entries...] [options]            Run the webpack dev server.
+  serve|server|s [entries...] [options]            Run the webpack dev server and watch for source file changes while serving.
   version|v [options]                              Output the version number of 'webpack', 'webpack-cli' and 'webpack-dev-server' and commands.
   watch|w [entries...] [options]                   Run webpack and watch for files changes.
 
@@ -2155,15 +2189,15 @@ Alternative usage to run commands: webpack [command] [options]
 The build tool for modern web applications.
 
 Options:
-  -c, --config <value...>                          Provide path to a webpack configuration file e.g. ./webpack.config.js.
-  --config-name <value...>                         Name of the configuration to use.
+  -c, --config <pathToConfigFile...>               Provide path to one or more webpack configuration files to process, e.g. "./webpack.config.js".
+  --config-name <name...>                          Name(s) of particular configuration(s) to use if configuration file exports an array of multiple configurations.
   -m, --merge                                      Merge two or more configurations using 'webpack-merge'.
   --disable-interpret                              Disable interpret for loading the config file.
-  --env <value...>                                 Environment passed to the configuration when it is a function.
+  --env <value...>                                 Environment variables passed to the configuration when it is a function, e.g. "myvar" or "myvar=myval".
   --node-env <value>                               Sets process.env.NODE_ENV to the specified value.
   --analyze                                        It invokes webpack-bundle-analyzer plugin to get bundle information.
   --progress [value]                               Print compilation progress during build.
-  -j, --json [value]                               Prints result as JSON or store it in a file.
+  -j, --json [pathToJsonFile]                      Prints result as JSON or store it in a file.
   --fail-on-warnings                               Stop webpack-cli process with non-zero exit code on warnings from webpack.
   -e, --extends <value...>                         Path to the configuration to be extended (only works when using webpack-cli).
   -d, --devtool <value>                            A developer tool to enhance debugging (false | eval | [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
@@ -2196,7 +2230,7 @@ Commands:
   init|create|new|c|n [generation-path] [options]  Initialize a new webpack project.
   loader|l [output-path] [options]                 Scaffold a loader.
   plugin|p [output-path] [options]                 Scaffold a plugin.
-  serve|server|s [entries...] [options]            Run the webpack dev server.
+  serve|server|s [entries...] [options]            Run the webpack dev server and watch for source file changes while serving.
   version|v [options]                              Output the version number of 'webpack', 'webpack-cli' and 'webpack-dev-server' and commands.
   watch|w [entries...] [options]                   Run webpack and watch for files changes.
 
@@ -2214,15 +2248,15 @@ Alternative usage to run commands: webpack [command] [options]
 The build tool for modern web applications.
 
 Options:
-  -c, --config <value...>                          Provide path to a webpack configuration file e.g. ./webpack.config.js.
-  --config-name <value...>                         Name of the configuration to use.
+  -c, --config <pathToConfigFile...>               Provide path to one or more webpack configuration files to process, e.g. "./webpack.config.js".
+  --config-name <name...>                          Name(s) of particular configuration(s) to use if configuration file exports an array of multiple configurations.
   -m, --merge                                      Merge two or more configurations using 'webpack-merge'.
   --disable-interpret                              Disable interpret for loading the config file.
-  --env <value...>                                 Environment passed to the configuration when it is a function.
+  --env <value...>                                 Environment variables passed to the configuration when it is a function, e.g. "myvar" or "myvar=myval".
   --node-env <value>                               Sets process.env.NODE_ENV to the specified value.
   --analyze                                        It invokes webpack-bundle-analyzer plugin to get bundle information.
   --progress [value]                               Print compilation progress during build.
-  -j, --json [value]                               Prints result as JSON or store it in a file.
+  -j, --json [pathToJsonFile]                      Prints result as JSON or store it in a file.
   --fail-on-warnings                               Stop webpack-cli process with non-zero exit code on warnings from webpack.
   -e, --extends <value...>                         Path to the configuration to be extended (only works when using webpack-cli).
   -d, --devtool <value>                            A developer tool to enhance debugging (false | eval | [inline-|hidden-|eval-][nosources-][cheap-[module-]]source-map).
@@ -2255,7 +2289,7 @@ Commands:
   init|create|new|c|n [generation-path] [options]  Initialize a new webpack project.
   loader|l [output-path] [options]                 Scaffold a loader.
   plugin|p [output-path] [options]                 Scaffold a plugin.
-  serve|server|s [entries...] [options]            Run the webpack dev server.
+  serve|server|s [entries...] [options]            Run the webpack dev server and watch for source file changes while serving.
   version|v [options]                              Output the version number of 'webpack', 'webpack-cli' and 'webpack-dev-server' and commands.
   watch|w [entries...] [options]                   Run webpack and watch for files changes.
 
diff --git a/test/serve/basic/__snapshots__/serve-basic.test.js.snap.devServer4.webpack5 b/test/serve/basic/__snapshots__/serve-basic.test.js.snap.devServer4.webpack5
index 4112d980d0b..033e3a08e78 100644
--- a/test/serve/basic/__snapshots__/serve-basic.test.js.snap.devServer4.webpack5
+++ b/test/serve/basic/__snapshots__/serve-basic.test.js.snap.devServer4.webpack5
@@ -8,19 +8,14 @@ exports[`basic serve usage should log an error on unknown flag: stderr 1`] = `
 exports[`basic serve usage should log an error on unknown flag: stdout 1`] = `""`;
 
 exports[`basic serve usage should log error on using '--watch' flag with serve: stderr 1`] = `
-"[webpack-cli] Error: Unknown option '--watch'
-[webpack-cli] Run 'webpack --help' to see available commands and options"
-`;
-
-exports[`basic serve usage should log error on using '--watch' flag with serve: stdout 1`] = `""`;
-
-exports[`basic serve usage should log error on using '-w' alias with serve: stderr 1`] = `
-"[webpack-cli] Error: Unknown option '-w'
-[webpack-cli] Run 'webpack --help' to see available commands and options"
+"[webpack-cli] No need to use the 'serve' command together with '{ watch: true | false }' or '--watch'/'--no-watch' configuration, it does not make sense.
+<i> [webpack-dev-server] Project is running at:
+<i> [webpack-dev-server] Loopback: http://localhost:<port>/
+<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
+<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
+<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/test/serve/basic/public' directory"
 `;
 
-exports[`basic serve usage should log error on using '-w' alias with serve: stdout 1`] = `""`;
-
 exports[`basic serve usage should log used supplied config with serve: stderr 1`] = `
 "    [webpack-cli] Compiler starting... 
     [webpack-cli] Compiler is using config: '<cwd>/test/serve/basic/log.config.js'
@@ -34,6 +29,15 @@ exports[`basic serve usage should log used supplied config with serve: stderr 1`
     [webpack-cli] Compiler is watching files for updates..."
 `;
 
+exports[`basic serve usage should log warning on using '-w' alias with serve: stderr 1`] = `
+"[webpack-cli] No need to use the 'serve' command together with '{ watch: true | false }' or '--watch'/'--no-watch' configuration, it does not make sense.
+<i> [webpack-dev-server] Project is running at:
+<i> [webpack-dev-server] Loopback: http://localhost:<port>/
+<i> [webpack-dev-server] On Your Network (IPv4): http://<network-ip-v4>:<port>/
+<i> [webpack-dev-server] On Your Network (IPv6): http://[<network-ip-v6>]:<port>/
+<i> [webpack-dev-server] Content not from webpack is served from '<cwd>/test/serve/basic/public' directory"
+`;
+
 exports[`basic serve usage should respect the "publicPath" option from configuration (from the "devServer" options): stderr 1`] = `
 "<i> [webpack-dev-server] Project is running at:
 <i> [webpack-dev-server] Loopback: http://localhost:<port>/
@@ -78,7 +82,7 @@ exports[`basic serve usage should throw error when same ports in multicompiler:
 
 exports[`basic serve usage should throw error when same ports in multicompiler: stdout 1`] = `""`;
 
-exports[`basic serve usage should work and log warning on the \`watch option in a configuration: stderr 1`] = `
+exports[`basic serve usage should work and log warning on the 'watch' option in a configuration: stderr 1`] = `
 "[webpack-cli] No need to use the 'serve' command together with '{ watch: true | false }' or '--watch'/'--no-watch' configuration, it does not make sense.
 <i> [webpack-dev-server] Project is running at:
 <i> [webpack-dev-server] Loopback: http://localhost:<port>/
diff --git a/test/serve/basic/serve-basic.test.js b/test/serve/basic/serve-basic.test.js
index 863bc8c6ee4..ec3d59daffa 100644
--- a/test/serve/basic/serve-basic.test.js
+++ b/test/serve/basic/serve-basic.test.js
@@ -356,7 +356,7 @@ describe("basic serve usage", () => {
     expect(stdout).toContain("development");
   });
 
-  it("should work and log warning on the `watch option in a configuration", async () => {
+  it("should work and log warning on the 'watch' option in a configuration", async () => {
     const { stderr, stdout } = await runWatch(__dirname, [
       "serve",
       "--config",
@@ -371,19 +371,19 @@ describe("basic serve usage", () => {
   });
 
   it("should log error on using '--watch' flag with serve", async () => {
-    const { exitCode, stdout, stderr } = await runWatch(testPath, ["serve", "--watch"]);
+    const { stdout, stderr } = await runWatch(__dirname, ["serve", "--watch", "--port", port]);
 
-    expect(exitCode).toBe(2);
     expect(normalizeStderr(stderr)).toMatchSnapshot("stderr");
-    expect(normalizeStdout(stdout)).toMatchSnapshot("stdout");
+    expect(stdout).toContain("HotModuleReplacementPlugin");
+    expect(stdout).toContain("main.js");
   });
 
-  it("should log error on using '-w' alias with serve", async () => {
-    const { exitCode, stdout, stderr } = await runWatch(testPath, ["serve", "-w"]);
+  it("should log warning on using '-w' alias with serve", async () => {
+    const { stdout, stderr } = await runWatch(__dirname, ["serve", "-w", "--port", port]);
 
-    expect(exitCode).toBe(2);
     expect(normalizeStderr(stderr)).toMatchSnapshot("stderr");
-    expect(normalizeStdout(stdout)).toMatchSnapshot("stdout");
+    expect(stdout).toContain("HotModuleReplacementPlugin");
+    expect(stdout).toContain("main.js");
   });
 
   it("should log an error on unknown flag", async () => {
diff --git a/test/watch/basic/basic.config.js b/test/watch/basic/basic.config.js
new file mode 100644
index 00000000000..f053ebf7976
--- /dev/null
+++ b/test/watch/basic/basic.config.js
@@ -0,0 +1 @@
+module.exports = {};
diff --git a/test/watch/basic/basic.test.js b/test/watch/basic/basic.test.js
index 56752a2a608..852ed265a97 100644
--- a/test/watch/basic/basic.test.js
+++ b/test/watch/basic/basic.test.js
@@ -47,6 +47,14 @@ describe("basic", () => {
         }
       }
     });
+
+    proc.stderr.on("data", (chunk) => {
+      const data = chunk.toString();
+
+      expect(data).not.toContain(
+        " No need to use the 'watch' command together with '{ watch: true | false }' or '--watch'/'--no-watch' configuration, it does not make sense.",
+      );
+    });
   });
 
   it("should recompile upon file change using the `watch` command", (done) => {
@@ -77,6 +85,14 @@ describe("basic", () => {
         }
       }
     });
+
+    proc.stderr.on("data", (chunk) => {
+      const data = chunk.toString();
+
+      expect(data).not.toContain(
+        " No need to use the 'watch' command together with '{ watch: true | false }' or '--watch'/'--no-watch' configuration, it does not make sense.",
+      );
+    });
   });
 
   it("should recompile upon file change using the `watch` command and entries syntax", (done) => {
diff --git a/yarn.lock b/yarn.lock
index ff59bfe5036..fdf223d9ac4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -300,12 +300,12 @@
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
 "@commitlint/cli@^17.1.2":
-  version "17.6.3"
-  resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-17.6.3.tgz#a02194a2bb6efe4e681eda2addd072a8d02c9497"
-  integrity sha512-ItSz2fd4F+CujgIbQOfNNerDF1eFlsBGEfp9QcCb1kxTYMuKTYZzA6Nu1YRRrIaaWwe2E7awUGpIMrPoZkOG3A==
+  version "17.6.5"
+  resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-17.6.5.tgz#3a8abd6499f9d4aeafe3bf9201338ccb868a14b9"
+  integrity sha512-3PQrWr/uo6lzF5k7n5QuosCYnzaxP9qGBp3jhWP0Vmsa7XA6wrl9ccPqfQyXpSbQE3zBROVO3TDqgPKe4tfmLQ==
   dependencies:
     "@commitlint/format" "^17.4.4"
-    "@commitlint/lint" "^17.6.3"
+    "@commitlint/lint" "^17.6.5"
     "@commitlint/load" "^17.5.0"
     "@commitlint/read" "^17.5.1"
     "@commitlint/types" "^17.4.4"
@@ -316,9 +316,9 @@
     yargs "^17.0.0"
 
 "@commitlint/config-conventional@^17.1.0":
-  version "17.6.3"
-  resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-17.6.3.tgz#21f5835235493e386effeaa98b898124230b1000"
-  integrity sha512-bLyHEjjRWqlLQWIgYFHmUPbEFMOOLXeF3QbUinDIJev/u9e769tkoTH9YPknEywiuIrAgZaVo+OfzAIsJP0fsw==
+  version "17.6.5"
+  resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-17.6.5.tgz#a8ec286e634a071329fe45dc4955032c2176aeb5"
+  integrity sha512-Xl9H9KLl86NZm5CYNTNF9dcz1xelE/EbvhWIWcYxG/rn3UWYWdWmmnX2q6ZduNdLFSGbOxzUpIx61j5zxbeXxg==
   dependencies:
     conventional-changelog-conventionalcommits "^5.0.0"
 
@@ -355,22 +355,22 @@
     "@commitlint/types" "^17.4.4"
     chalk "^4.1.0"
 
-"@commitlint/is-ignored@^17.6.3":
-  version "17.6.3"
-  resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-17.6.3.tgz#8e21046558a0339fbf2a33ef0ad7d5a9ae7ff6bc"
-  integrity sha512-LQbNdnPbxrpbcrVKR5yf51SvquqktpyZJwqXx3lUMF6+nT9PHB8xn3wLy8pi2EQv5Zwba484JnUwDE1ygVYNQA==
+"@commitlint/is-ignored@^17.6.5":
+  version "17.6.5"
+  resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-17.6.5.tgz#cea24cd2031fe7d242590b91fab3352750887194"
+  integrity sha512-CQvAPt9gX7cuUbMrIaIMKczfWJqqr6m8IlJs0F2zYwyyMTQ87QMHIj5jJ5HhOaOkaj6dvTMVGx8Dd1I4xgUuoQ==
   dependencies:
     "@commitlint/types" "^17.4.4"
     semver "7.5.0"
 
-"@commitlint/lint@^17.6.3":
-  version "17.6.3"
-  resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-17.6.3.tgz#2d9a88b73c44be8b97508c980198a6f289251655"
-  integrity sha512-fBlXwt6SHJFgm3Tz+luuo3DkydAx9HNC5y4eBqcKuDuMVqHd2ugMNr+bQtx6riv9mXFiPoKp7nE4Xn/ls3iVDA==
+"@commitlint/lint@^17.6.5":
+  version "17.6.5"
+  resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-17.6.5.tgz#dfa437f14430c9874d6b1a3ba8a2d44b79780c02"
+  integrity sha512-BSJMwkE4LWXrOsiP9KoHG+/heSDfvOL/Nd16+ojTS/DX8HZr8dNl8l3TfVr/d/9maWD8fSegRGtBtsyGuugFrw==
   dependencies:
-    "@commitlint/is-ignored" "^17.6.3"
-    "@commitlint/parse" "^17.4.4"
-    "@commitlint/rules" "^17.6.1"
+    "@commitlint/is-ignored" "^17.6.5"
+    "@commitlint/parse" "^17.6.5"
+    "@commitlint/rules" "^17.6.5"
     "@commitlint/types" "^17.4.4"
 
 "@commitlint/load@^17.5.0":
@@ -398,10 +398,10 @@
   resolved "https://registry.yarnpkg.com/@commitlint/message/-/message-17.4.2.tgz#f4753a79701ad6db6db21f69076e34de6580e22c"
   integrity sha512-3XMNbzB+3bhKA1hSAWPCQA3lNxR4zaeQAQcHj0Hx5sVdO6ryXtgUBGGv+1ZCLMgAPRixuc6en+iNAzZ4NzAa8Q==
 
-"@commitlint/parse@^17.4.4":
-  version "17.4.4"
-  resolved "https://registry.yarnpkg.com/@commitlint/parse/-/parse-17.4.4.tgz#8311b12f2b730de6ea0679ae2a37b386bcc5b04b"
-  integrity sha512-EKzz4f49d3/OU0Fplog7nwz/lAfXMaDxtriidyGF9PtR+SRbgv4FhsfF310tKxs6EPj8Y+aWWuX3beN5s+yqGg==
+"@commitlint/parse@^17.6.5":
+  version "17.6.5"
+  resolved "https://registry.yarnpkg.com/@commitlint/parse/-/parse-17.6.5.tgz#7b84b328a6a94ca08ab7c98c491d9d3dab68f09d"
+  integrity sha512-0zle3bcn1Hevw5Jqpz/FzEWNo2KIzUbc1XyGg6WrWEoa6GH3A1pbqNF6MvE6rjuy6OY23c8stWnb4ETRZyN+Yw==
   dependencies:
     "@commitlint/types" "^17.4.4"
     conventional-changelog-angular "^5.0.11"
@@ -430,10 +430,10 @@
     resolve-from "^5.0.0"
     resolve-global "^1.0.0"
 
-"@commitlint/rules@^17.6.1":
-  version "17.6.1"
-  resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-17.6.1.tgz#dff529b8d1e0455808fe7e3e1fa70617e4eb2759"
-  integrity sha512-lUdHw6lYQ1RywExXDdLOKxhpp6857/4c95Dc/1BikrHgdysVUXz26yV0vp1GL7Gv+avx9WqZWTIVB7pNouxlfw==
+"@commitlint/rules@^17.6.5":
+  version "17.6.5"
+  resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-17.6.5.tgz#fabcacdde923e26ac5ef90d4b3f8fc05526bbaa1"
+  integrity sha512-uTB3zSmnPyW2qQQH+Dbq2rekjlWRtyrjDo4aLFe63uteandgkI+cc0NhhbBAzcXShzVk0qqp8SlkQMu0mgHg/A==
   dependencies:
     "@commitlint/ensure" "^17.4.4"
     "@commitlint/message" "^17.4.2"
@@ -793,14 +793,14 @@
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.1.tgz#cdd35dce4fa1a89a4fd42b1599eb35b3af408884"
   integrity sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==
 
-"@eslint/eslintrc@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.2.tgz#01575e38707add677cf73ca1589abba8da899a02"
-  integrity sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==
+"@eslint/eslintrc@^2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.3.tgz#4910db5505f4d503f27774bf356e3704818a0331"
+  integrity sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.5.1"
+    espree "^9.5.2"
     globals "^13.19.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
@@ -808,10 +808,10 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.39.0":
-  version "8.39.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.39.0.tgz#58b536bcc843f4cd1e02a7e6171da5c040f4d44b"
-  integrity sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==
+"@eslint/js@8.41.0":
+  version "8.41.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.41.0.tgz#080321c3b68253522f7646b55b577dd99d2950b3"
+  integrity sha512-LxcyMGxwmTh2lY9FwHPGWOHmYFCZvbrFCBZL4FzSSsxsRPuhrYUg/49/0KDfW8tnIEaEHtfmn6+NPN+1DqaNmA==
 
 "@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3":
   version "1.1.3"
@@ -2095,9 +2095,9 @@
     "@types/istanbul-lib-report" "*"
 
 "@types/jest@^29.4.0":
-  version "29.5.1"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.1.tgz#83c818aa9a87da27d6da85d3378e5a34d2f31a47"
-  integrity sha512-tEuVcHrpaixS36w7hpsfLBLpjtMRJUE09/MHXn923LOVojDwyC14cWcfc0rDs0VEfUyYmt/+iX1kxxp+gZMcaQ==
+  version "29.5.2"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.2.tgz#86b4afc86e3a8f3005b297ed8a72494f89e6395b"
+  integrity sha512-mSoZVJF5YzGVCk+FsDxzDuH7s+SCkzrgKZzf0Z0T2WudhBUPoF6ktoTPC4R0ZoCPCV5xUvuU6ias5NvxcBcMMg==
   dependencies:
     expect "^29.0.0"
     pretty-format "^29.0.0"
@@ -2153,9 +2153,9 @@
   integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
 
 "@types/node@*", "@types/node@^18.11.9":
-  version "18.16.3"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.16.3.tgz#6bda7819aae6ea0b386ebc5b24bdf602f1b42b01"
-  integrity sha512-OPs5WnnT1xkCBiuQrZA4+YAV4HEJejmHneyraIaxsbev5yCEr6KMwINNFP9wQeFIw8FWcoTqF3vQsa5CDaI+8Q==
+  version "18.16.16"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.16.16.tgz#3b64862856c7874ccf7439e6bab872d245c86d8e"
+  integrity sha512-NpaM49IGQQAUlBhHMF82QH80J08os4ZmyF9MkpCzWAGuOHqE4gTEbhzd7L3l5LmWuZ6E0OiC1FweQ4tsiW35+g==
 
 "@types/node@^15.6.2":
   version "15.14.9"
@@ -2307,14 +2307,14 @@
     rxjs "^6.4.0"
 
 "@typescript-eslint/eslint-plugin@^5.49.0":
-  version "5.59.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.2.tgz#684a2ce7182f3b4dac342eef7caa1c2bae476abd"
-  integrity sha512-yVrXupeHjRxLDcPKL10sGQ/QlVrA8J5IYOEWVqk0lJaSZP7X5DfnP7Ns3cc74/blmbipQ1htFNVGsHX6wsYm0A==
+  version "5.59.8"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.8.tgz#1e7a3e5318ece22251dfbc5c9c6feeb4793cc509"
+  integrity sha512-JDMOmhXteJ4WVKOiHXGCoB96ADWg9q7efPWHRViT/f09bA8XOMLAVHHju3l0MkZnG1izaWXYmgvQcUjTRcpShQ==
   dependencies:
     "@eslint-community/regexpp" "^4.4.0"
-    "@typescript-eslint/scope-manager" "5.59.2"
-    "@typescript-eslint/type-utils" "5.59.2"
-    "@typescript-eslint/utils" "5.59.2"
+    "@typescript-eslint/scope-manager" "5.59.8"
+    "@typescript-eslint/type-utils" "5.59.8"
+    "@typescript-eslint/utils" "5.59.8"
     debug "^4.3.4"
     grapheme-splitter "^1.0.4"
     ignore "^5.2.0"
@@ -2323,71 +2323,71 @@
     tsutils "^3.21.0"
 
 "@typescript-eslint/parser@^5.49.0":
-  version "5.59.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.59.2.tgz#c2c443247901d95865b9f77332d9eee7c55655e8"
-  integrity sha512-uq0sKyw6ao1iFOZZGk9F8Nro/8+gfB5ezl1cA06SrqbgJAt0SRoFhb9pXaHvkrxUpZaoLxt8KlovHNk8Gp6/HQ==
+  version "5.59.8"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.59.8.tgz#60cbb00671d86cf746044ab797900b1448188567"
+  integrity sha512-AnR19RjJcpjoeGojmwZtCwBX/RidqDZtzcbG3xHrmz0aHHoOcbWnpDllenRDmDvsV0RQ6+tbb09/kyc+UT9Orw==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.59.2"
-    "@typescript-eslint/types" "5.59.2"
-    "@typescript-eslint/typescript-estree" "5.59.2"
+    "@typescript-eslint/scope-manager" "5.59.8"
+    "@typescript-eslint/types" "5.59.8"
+    "@typescript-eslint/typescript-estree" "5.59.8"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.59.2":
-  version "5.59.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.2.tgz#f699fe936ee4e2c996d14f0fdd3a7da5ba7b9a4c"
-  integrity sha512-dB1v7ROySwQWKqQ8rEWcdbTsFjh2G0vn8KUyvTXdPoyzSL6lLGkiXEV5CvpJsEe9xIdKV+8Zqb7wif2issoOFA==
+"@typescript-eslint/scope-manager@5.59.8":
+  version "5.59.8"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.8.tgz#ff4ad4fec6433647b817c4a7d4b4165d18ea2fa8"
+  integrity sha512-/w08ndCYI8gxGf+9zKf1vtx/16y8MHrZs5/tnjHhMLNSixuNcJavSX4wAiPf4aS5x41Es9YPCn44MIe4cxIlig==
   dependencies:
-    "@typescript-eslint/types" "5.59.2"
-    "@typescript-eslint/visitor-keys" "5.59.2"
+    "@typescript-eslint/types" "5.59.8"
+    "@typescript-eslint/visitor-keys" "5.59.8"
 
-"@typescript-eslint/type-utils@5.59.2":
-  version "5.59.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.59.2.tgz#0729c237503604cd9a7084b5af04c496c9a4cdcf"
-  integrity sha512-b1LS2phBOsEy/T381bxkkywfQXkV1dWda/z0PhnIy3bC5+rQWQDS7fk9CSpcXBccPY27Z6vBEuaPBCKCgYezyQ==
+"@typescript-eslint/type-utils@5.59.8":
+  version "5.59.8"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.59.8.tgz#aa6c029a9d7706d26bbd25eb4666398781df6ea2"
+  integrity sha512-+5M518uEIHFBy3FnyqZUF3BMP+AXnYn4oyH8RF012+e7/msMY98FhGL5SrN29NQ9xDgvqCgYnsOiKp1VjZ/fpA==
   dependencies:
-    "@typescript-eslint/typescript-estree" "5.59.2"
-    "@typescript-eslint/utils" "5.59.2"
+    "@typescript-eslint/typescript-estree" "5.59.8"
+    "@typescript-eslint/utils" "5.59.8"
     debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.59.2":
-  version "5.59.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.2.tgz#b511d2b9847fe277c5cb002a2318bd329ef4f655"
-  integrity sha512-LbJ/HqoVs2XTGq5shkiKaNTuVv5tTejdHgfdjqRUGdYhjW1crm/M7og2jhVskMt8/4wS3T1+PfFvL1K3wqYj4w==
+"@typescript-eslint/types@5.59.8":
+  version "5.59.8"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.8.tgz#212e54414733618f5d0fd50b2da2717f630aebf8"
+  integrity sha512-+uWuOhBTj/L6awoWIg0BlWy0u9TyFpCHrAuQ5bNfxDaZ1Ppb3mx6tUigc74LHcbHpOHuOTOJrBoAnhdHdaea1w==
 
-"@typescript-eslint/typescript-estree@5.59.2":
-  version "5.59.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.2.tgz#6e2fabd3ba01db5d69df44e0b654c0b051fe9936"
-  integrity sha512-+j4SmbwVmZsQ9jEyBMgpuBD0rKwi9RxRpjX71Brr73RsYnEr3Lt5QZ624Bxphp8HUkSKfqGnPJp1kA5nl0Sh7Q==
+"@typescript-eslint/typescript-estree@5.59.8":
+  version "5.59.8"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.8.tgz#801a7b1766481629481b3b0878148bd7a1f345d7"
+  integrity sha512-Jy/lPSDJGNow14vYu6IrW790p7HIf/SOV1Bb6lZ7NUkLc2iB2Z9elESmsaUtLw8kVqogSbtLH9tut5GCX1RLDg==
   dependencies:
-    "@typescript-eslint/types" "5.59.2"
-    "@typescript-eslint/visitor-keys" "5.59.2"
+    "@typescript-eslint/types" "5.59.8"
+    "@typescript-eslint/visitor-keys" "5.59.8"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.59.2":
-  version "5.59.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.2.tgz#0c45178124d10cc986115885688db6abc37939f4"
-  integrity sha512-kSuF6/77TZzyGPhGO4uVp+f0SBoYxCDf+lW3GKhtKru/L8k/Hd7NFQxyWUeY7Z/KGB2C6Fe3yf2vVi4V9TsCSQ==
+"@typescript-eslint/utils@5.59.8":
+  version "5.59.8"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.8.tgz#34d129f35a2134c67fdaf024941e8f96050dca2b"
+  integrity sha512-Tr65630KysnNn9f9G7ROF3w1b5/7f6QVCJ+WK9nhIocWmx9F+TmCAcglF26Vm7z8KCTwoKcNEBZrhlklla3CKg==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@types/json-schema" "^7.0.9"
     "@types/semver" "^7.3.12"
-    "@typescript-eslint/scope-manager" "5.59.2"
-    "@typescript-eslint/types" "5.59.2"
-    "@typescript-eslint/typescript-estree" "5.59.2"
+    "@typescript-eslint/scope-manager" "5.59.8"
+    "@typescript-eslint/types" "5.59.8"
+    "@typescript-eslint/typescript-estree" "5.59.8"
     eslint-scope "^5.1.1"
     semver "^7.3.7"
 
-"@typescript-eslint/visitor-keys@5.59.2":
-  version "5.59.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.2.tgz#37a419dc2723a3eacbf722512b86d6caf7d3b750"
-  integrity sha512-EEpsO8m3RASrKAHI9jpavNv9NlEUebV4qmF1OWxSTtKSFBpC1NCmWazDQHFivRf0O1DV11BA645yrLEVQ0/Lig==
+"@typescript-eslint/visitor-keys@5.59.8":
+  version "5.59.8"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.8.tgz#aa6a7ef862add919401470c09e1609392ef3cc40"
+  integrity sha512-pJhi2ms0x0xgloT7xYabil3SGGlojNNKjK/q6dB3Ey0uJLMjK2UDGJvHieiyJVW/7C3KI+Z4Q3pEHkm4ejA+xQ==
   dependencies:
-    "@typescript-eslint/types" "5.59.2"
+    "@typescript-eslint/types" "5.59.8"
     eslint-visitor-keys "^3.3.0"
 
 "@webassemblyjs/ast@1.11.5", "@webassemblyjs/ast@^1.11.5":
@@ -2574,10 +2574,10 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
     mime-types "~2.1.34"
     negotiator "0.6.3"
 
-acorn-import-assertions@^1.7.6:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
-  integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
+acorn-import-assertions@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
+  integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
 
 acorn-jsx@^5.3.2:
   version "5.3.2"
@@ -3941,14 +3941,14 @@ cspell@^6.12.0:
     vscode-uri "^3.0.7"
 
 css-loader@^6.7.1:
-  version "6.7.3"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.3.tgz#1e8799f3ccc5874fdd55461af51137fcc5befbcd"
-  integrity sha512-qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ==
+  version "6.8.1"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.8.1.tgz#0f8f52699f60f5e679eab4ec0fcd68b8e8a50a88"
+  integrity sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==
   dependencies:
     icss-utils "^5.1.0"
-    postcss "^8.4.19"
+    postcss "^8.4.21"
     postcss-modules-extract-imports "^3.0.0"
-    postcss-modules-local-by-default "^4.0.0"
+    postcss-modules-local-by-default "^4.0.3"
     postcss-modules-scope "^3.0.0"
     postcss-modules-values "^4.0.0"
     postcss-value-parser "^4.2.0"
@@ -4267,10 +4267,10 @@ end-of-stream@^1.4.1:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^5.0.0, enhanced-resolve@^5.13.0:
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.13.0.tgz#26d1ecc448c02de997133217b5c1053f34a0a275"
-  integrity sha512-eyV8f0y1+bzyfh8xAwW/WTSZpLbjhqc4ne9eGSH4Zo2ejdyiNG9pU6mf9DG8a7+Auk6MFTlNOT4Y2y/9k8GKVg==
+enhanced-resolve@^5.0.0, enhanced-resolve@^5.14.1:
+  version "5.14.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.14.1.tgz#de684b6803724477a4af5d74ccae5de52c25f6b3"
+  integrity sha512-Vklwq2vDKtl0y/vtwjSesgJ5MYS7Etuk5txS8VdKL4AOS1aUlD96zqIfsOSLQsdv3xgMRbtkWM8eG9XDfKUPow==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -4402,20 +4402,20 @@ eslint-visitor-keys@^1.1.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz#c7f0f956124ce677047ddbc192a68f999454dedc"
-  integrity sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994"
+  integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
 
 eslint@^8.33.0:
-  version "8.39.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.39.0.tgz#7fd20a295ef92d43809e914b70c39fd5a23cf3f1"
-  integrity sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==
+  version "8.41.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.41.0.tgz#3062ca73363b4714b16dbc1e60f035e6134b6f1c"
+  integrity sha512-WQDQpzGBOP5IrXPo4Hc0814r4/v2rrIsB0rhT7jtunIalgg6gYXWhRMOejVO8yH21T/FGaxjmFjBMNqcIlmH1Q==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.4.0"
-    "@eslint/eslintrc" "^2.0.2"
-    "@eslint/js" "8.39.0"
+    "@eslint/eslintrc" "^2.0.3"
+    "@eslint/js" "8.41.0"
     "@humanwhocodes/config-array" "^0.11.8"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
@@ -4426,8 +4426,8 @@ eslint@^8.33.0:
     doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
     eslint-scope "^7.2.0"
-    eslint-visitor-keys "^3.4.0"
-    espree "^9.5.1"
+    eslint-visitor-keys "^3.4.1"
+    espree "^9.5.2"
     esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
@@ -4435,13 +4435,12 @@ eslint@^8.33.0:
     find-up "^5.0.0"
     glob-parent "^6.0.2"
     globals "^13.19.0"
-    grapheme-splitter "^1.0.4"
+    graphemer "^1.4.0"
     ignore "^5.2.0"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
     is-path-inside "^3.0.3"
-    js-sdsl "^4.1.4"
     js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
@@ -4453,14 +4452,14 @@ eslint@^8.33.0:
     strip-json-comments "^3.1.0"
     text-table "^0.2.0"
 
-espree@^9.5.1:
-  version "9.5.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.1.tgz#4f26a4d5f18905bf4f2e0bd99002aab807e96dd4"
-  integrity sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==
+espree@^9.5.2:
+  version "9.5.2"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.2.tgz#e994e7dc33a082a7a82dceaf12883a829353215b"
+  integrity sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==
   dependencies:
     acorn "^8.8.0"
     acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.4.0"
+    eslint-visitor-keys "^3.4.1"
 
 esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
@@ -5195,6 +5194,11 @@ grapheme-splitter@^1.0.4:
   resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
   integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
 
+graphemer@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
+
 grouped-queue@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/grouped-queue/-/grouped-queue-2.0.0.tgz#a2c6713f2171e45db2c300a3a9d7c119d694dac8"
@@ -6333,11 +6337,6 @@ jest@^29.4.1:
     import-local "^3.0.2"
     jest-cli "^29.5.0"
 
-js-sdsl@^4.1.4:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.4.0.tgz#8b437dbe642daa95760400b602378ed8ffea8430"
-  integrity sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg==
-
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -7037,9 +7036,9 @@ min-indent@^1.0.0, min-indent@^1.0.1:
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
 mini-css-extract-plugin@^2.6.1:
-  version "2.7.5"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.5.tgz#afbb344977659ec0f1f6e050c7aea456b121cfc5"
-  integrity sha512-9HaR++0mlgom81s95vvNjxkg52n2b5s//3ZTI1EtzFb98awsLSivs2LMsVqnQ3ay0PVhqWcGNyDaTE961FOcjQ==
+  version "2.7.6"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.6.tgz#282a3d38863fddcd2e0c220aaed5b90bc156564d"
+  integrity sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==
   dependencies:
     schema-utils "^4.0.0"
 
@@ -8035,10 +8034,10 @@ pacote@^12.0.0, pacote@^12.0.2:
     ssri "^8.0.1"
     tar "^6.1.0"
 
-pacote@^15.0.0, pacote@^15.0.8:
-  version "15.1.3"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-15.1.3.tgz#4c0e7fb5e7ab3b27fb3f86514b451ad4c4f64e9d"
-  integrity sha512-aRts8cZqxiJVDitmAh+3z+FxuO3tLNWEmwDRPEpDDiZJaRz06clP4XX112ynMT5uF0QNoMPajBBHnaStUEPJXA==
+pacote@^15.0.0, pacote@^15.0.8, pacote@^15.2.0:
+  version "15.2.0"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-15.2.0.tgz#0f0dfcc3e60c7b39121b2ac612bf8596e95344d3"
+  integrity sha512-rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA==
   dependencies:
     "@npmcli/git" "^4.0.0"
     "@npmcli/installed-package-contents" "^2.0.1"
@@ -8235,10 +8234,10 @@ postcss-modules-extract-imports@^3.0.0:
   resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
   integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
 
-postcss-modules-local-by-default@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"
-  integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==
+postcss-modules-local-by-default@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz#b08eb4f083050708998ba2c6061b50c2870ca524"
+  integrity sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==
   dependencies:
     icss-utils "^5.0.0"
     postcss-selector-parser "^6.0.2"
@@ -8271,7 +8270,7 @@ postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@^8.4.19:
+postcss@^8.4.21:
   version "8.4.23"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.23.tgz#df0aee9ac7c5e53e1075c24a3613496f9e6552ab"
   integrity sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA==
@@ -8625,10 +8624,10 @@ readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.3.5, readable
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-4.3.0.tgz#0914d0c72db03b316c9733bb3461d64a3cc50cba"
-  integrity sha512-MuEnA0lbSi7JS8XM+WNJlWZkHAAdm7gETHdFK//Q/mChGyj2akEFtdLZh32jSdkWGbRwCW9pn6g3LWDdDeZnBQ==
+readable-stream@^4.1.0, readable-stream@^4.3.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-4.4.0.tgz#55ce132d60a988c460d75c631e9ccf6a7229b468"
+  integrity sha512-kDMOq0qLtxV9f/SQv522h8cxZBqNZXuXNyjyezmfAAuribMyVXziljpQ/uQhfE1XLg2/TLTW2DsnoE4VAi/krg==
   dependencies:
     abort-controller "^3.0.0"
     buffer "^6.0.3"
@@ -8851,9 +8850,9 @@ safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@~5.2.0:
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
 sass-loader@^13.0.2:
-  version "13.2.2"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.2.2.tgz#f97e803993b24012c10d7ba9676548bf7a6b18b9"
-  integrity sha512-nrIdVAAte3B9icfBiGWvmMhT/D+eCDwnk+yA7VE/76dp/WkHX+i44Q/pfo71NYbwj0Ap+PGsn0ekOuU1WFJ2AA==
+  version "13.3.1"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.3.1.tgz#32ee5791434b9b4dbd1adcce76fcb4cea49cc12c"
+  integrity sha512-cBTxmgyVA1nXPvIK4brjJMXOMJ2v2YrQEuHqLw3LylGb3gsR6jAvdjHMcy/+JGTmmIF9SauTrLLR7bsWDMWqgg==
   dependencies:
     klona "^2.0.6"
     neo-async "^2.6.2"
@@ -9450,9 +9449,9 @@ strong-log-transformer@2.1.0, strong-log-transformer@^2.1.0:
     through "^2.3.4"
 
 style-loader@^3.3.1:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.2.tgz#eaebca714d9e462c19aa1e3599057bc363924899"
-  integrity sha512-RHs/vcrKdQK8wZliteNK4NKzxvLBzpuHMqYmUVWeKa6MkaIQ97ZTOS0b+zapZhy6GcrgWnvWYCMHRirC3FsUmw==
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.3.tgz#bba8daac19930169c0c9c96706749a597ae3acff"
+  integrity sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw==
 
 supports-color@^5.3.0:
   version "5.5.0"
@@ -9692,16 +9691,16 @@ ts-jest@^29.0.1:
     yargs-parser "^21.0.1"
 
 ts-loader@^9.3.1:
-  version "9.4.2"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.4.2.tgz#80a45eee92dd5170b900b3d00abcfa14949aeb78"
-  integrity sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==
+  version "9.4.3"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.4.3.tgz#55cfa7c28dd82a2de968ae45c3adb75fb888b27e"
+  integrity sha512-n3hBnm6ozJYzwiwt5YRiJZkzktftRpMiBApHaJPoWLA+qetQBAXkHqCLM6nwSdRDimqVtA5ocIkcTRLMTt7yzA==
   dependencies:
     chalk "^4.1.0"
     enhanced-resolve "^5.0.0"
     micromatch "^4.0.0"
     semver "^7.3.4"
 
-ts-node@^10.8.0, ts-node@^10.8.1:
+ts-node@^10.8.1, ts-node@^10.9.1:
   version "10.9.1"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
   integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
@@ -9831,15 +9830,15 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
-"typescript@^3 || ^4", typescript@^4.9.3:
+"typescript@^3 || ^4":
   version "4.9.5"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
   integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
-"typescript@^4.6.4 || ^5.0.0":
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.4.tgz#b217fd20119bd61a94d4011274e0ab369058da3b"
-  integrity sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==
+"typescript@^4.6.4 || ^5.0.0", typescript@^5.0.4:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.3.tgz#8d84219244a6b40b6fb2b33cc1c062f715b9e826"
+  integrity sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==
 
 uglify-js@^3.1.4:
   version "3.17.4"
@@ -10076,9 +10075,9 @@ webidl-conversions@^3.0.0:
   integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
 
 webpack-bundle-analyzer@^4.5.0:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.8.0.tgz#951b8aaf491f665d2ae325d8b84da229157b1d04"
-  integrity sha512-ZzoSBePshOKhr+hd8u6oCkZVwpVaXgpw23ScGLFpR6SjYI7+7iIWYarjN6OEYOfRt8o7ZyZZQk0DuMizJ+LEIg==
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.9.0.tgz#fc093c4ab174fd3dcbd1c30b763f56d10141209d"
+  integrity sha512-+bXGmO1LyiNx0i9enBu3H8mv42sj/BJWhZNFwjz92tVnBa9J3JMGo2an2IXlEleoDOPn/Hofl5hr/xCpObUDtw==
   dependencies:
     "@discoveryjs/json-ext" "0.5.7"
     acorn "^8.0.4"
@@ -10103,9 +10102,9 @@ webpack-dev-middleware@^5.3.1:
     schema-utils "^4.0.0"
 
 webpack-dev-server@^4.8.1:
-  version "4.13.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.13.3.tgz#9feb740b8b56b886260bae1360286818a221bae8"
-  integrity sha512-KqqzrzMRSRy5ePz10VhjyL27K2dxqwXQLP5rAKwRJBPUahe7Z2bBWzHw37jeb8GCPKxZRO79ZdQUAPesMh/Nug==
+  version "4.15.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.15.0.tgz#87ba9006eca53c551607ea0d663f4ae88be7af21"
+  integrity sha512-HmNB5QeSl1KpulTBQ8UT4FPrByYyaLxpJoQ0+s7EvUrMc16m0ZS1sgb1XGqzmgCPk0c9y+aaXxn11tbLzuM7NQ==
   dependencies:
     "@types/bonjour" "^3.5.9"
     "@types/connect-history-api-fallback" "^1.3.5"
@@ -10139,9 +10138,9 @@ webpack-dev-server@^4.8.1:
     ws "^8.13.0"
 
 webpack-merge@^5.7.3:
-  version "5.8.0"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61"
-  integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==
+  version "5.9.0"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.9.0.tgz#dc160a1c4cf512ceca515cc231669e9ddb133826"
+  integrity sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg==
   dependencies:
     clone-deep "^4.0.1"
     wildcard "^2.0.0"
@@ -10152,9 +10151,9 @@ webpack-sources@^3.2.3:
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
 webpack@^5.72.0:
-  version "5.82.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.82.0.tgz#3c0d074dec79401db026b4ba0fb23d6333f88e7d"
-  integrity sha512-iGNA2fHhnDcV1bONdUu554eZx+XeldsaeQ8T67H6KKHl2nUSwX8Zm7cmzOA46ox/X1ARxf7Bjv8wQ/HsB5fxBg==
+  version "5.85.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.85.0.tgz#c14a6a3a91f84d67c450225661fda8da36bc7f49"
+  integrity sha512-7gazTiYqwo5OSqwH1tigLDL2r3qDeP2dOKYgd+LlXpsUMqDTklg6tOghexqky0/+6QY38kb/R/uRPUleuL43zg==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^1.0.0"
@@ -10162,10 +10161,10 @@ webpack@^5.72.0:
     "@webassemblyjs/wasm-edit" "^1.11.5"
     "@webassemblyjs/wasm-parser" "^1.11.5"
     acorn "^8.7.1"
-    acorn-import-assertions "^1.7.6"
+    acorn-import-assertions "^1.9.0"
     browserslist "^4.14.5"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.13.0"
+    enhanced-resolve "^5.14.1"
     es-module-lexer "^1.2.1"
     eslint-scope "5.1.1"
     events "^3.2.0"
@@ -10465,9 +10464,9 @@ yargs@^17.0.0, yargs@^17.3.1, yargs@^17.6.2:
     yargs-parser "^21.1.1"
 
 yeoman-environment@^3.9.1:
-  version "3.15.1"
-  resolved "https://registry.yarnpkg.com/yeoman-environment/-/yeoman-environment-3.15.1.tgz#b094b858bfbd24db8061d255d0e7871224190474"
-  integrity sha512-P4DTQxqCxNTBD7gph+P+dIckBdx0xyHmvOYgO3vsc9/Sl67KJ6QInz5Qv6tlXET3CFFJ/YxPIdl9rKb0XwTRLg==
+  version "3.19.3"
+  resolved "https://registry.yarnpkg.com/yeoman-environment/-/yeoman-environment-3.19.3.tgz#49c2339805fdf695fac42c88334a1daa94ee8b6c"
+  integrity sha512-/+ODrTUHtlDPRH9qIC0JREH8+7nsRcjDl3Bxn2Xo/rvAaVvixH5275jHwg0C85g4QsF4P6M2ojfScPPAl+pLAg==
   dependencies:
     "@npmcli/arborist" "^4.0.4"
     are-we-there-yet "^2.0.0"
@@ -10499,6 +10498,7 @@ yeoman-environment@^3.9.1:
     pacote "^12.0.2"
     preferred-pm "^3.0.3"
     pretty-bytes "^5.3.0"
+    readable-stream "^4.3.0"
     semver "^7.1.3"
     slash "^3.0.0"
     strip-ansi "^6.0.0"
@@ -10507,9 +10507,9 @@ yeoman-environment@^3.9.1:
     untildify "^4.0.0"
 
 yeoman-generator@^5.7.0:
-  version "5.8.0"
-  resolved "https://registry.yarnpkg.com/yeoman-generator/-/yeoman-generator-5.8.0.tgz#a1951ce0d95555f94adc5975a517d4741b5ce24d"
-  integrity sha512-dsrwFn9/c2/MOe80sa2nKfbZd/GaPTgmmehdgkFifs1VN/I7qPsW2xcBfvSkHNGK+PZly7uHyH8kaVYSFNUDhQ==
+  version "5.9.0"
+  resolved "https://registry.yarnpkg.com/yeoman-generator/-/yeoman-generator-5.9.0.tgz#a83c9e391b0b3442536da677bc204cfa3f81f2c7"
+  integrity sha512-sN1e01Db4fdd8P/n/yYvizfy77HdbwzvXmPxps9Gwz2D24slegrkSn+qyj+0nmZhtFwGX2i/cH29QDrvAFT9Aw==
   dependencies:
     chalk "^4.1.0"
     dargs "^7.0.0"
@@ -10519,6 +10519,7 @@ yeoman-generator@^5.7.0:
     lodash "^4.17.11"
     mem-fs-editor "^9.0.0"
     minimist "^1.2.5"
+    pacote "^15.2.0"
     read-pkg-up "^7.0.1"
     run-async "^2.0.0"
     semver "^7.2.1"