Merge branch 'next' into base-merge

webpack · Jul 20, 2020 · 29bbc70 · 29bbc70
2 parents d14b1e4 + aafc0e1
commit 29bbc70
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -61,9 +61,8 @@ In case you are suggesting a new feature, we will match your idea with our curre
 -   `git clone <your-clone-url> && cd webpack-cli`
 
 -   We use [yarn](https://yarnpkg.com/lang/en/) workspaces, please install it:
-    ```bash
-    npm install -g yarn
-    ```
+
+    Read the [Installation Guide](https://yarnpkg.com/en/docs/install) on their official website for detailed instructions on how to install Yarn.
 
 > Using yarn is not a requirement, [npm](https://www.npmjs.com/) is included in node.
 

diff --git a/packages/webpack-cli/lib/groups/ConfigGroup.js b/packages/webpack-cli/lib/groups/ConfigGroup.js
@@ -1,7 +1,7 @@
 const { existsSync } = require('fs');
 const { resolve, sep, dirname, parse } = require('path');
-const { extensions } = require('interpret');
 const webpackMerge = require('webpack-merge');
+const { extensions, jsVariants } = require('interpret');
 const GroupHelper = require('../utils/GroupHelper');
 const rechoir = require('rechoir');
 const MergeError = require('../utils/errors/MergeError');
@@ -28,12 +28,6 @@ const modeAlias = {
     development: 'dev',
 };
 
-const fileTypes = {
-    '.babel.js': ['@babel/register', 'babel-register', 'babel-core/register', 'babel/register'],
-    '.babel.ts': ['@babel/register'],
-    '.ts': ['ts-node/register', 'tsconfig-paths/register'],
-};
-
 const getDefaultConfigFiles = () => {
     return DEFAULT_CONFIG_LOC.map((filename) => {
         return Object.keys(extensions).map((ext) => {
@@ -71,7 +65,7 @@ class ConfigGroup extends GroupHelper {
     }
 
     requireConfig(configModule) {
-        const extension = Object.keys(fileTypes).find((t) => configModule.ext.endsWith(t));
+        const extension = Object.keys(jsVariants).find((t) => configModule.ext.endsWith(t));
 
         if (extension) {
             this.requireLoader(extension, configModule.path);

diff --git a/packages/webpack-cli/lib/utils/arg-parser.js b/packages/webpack-cli/lib/utils/arg-parser.js
@@ -16,6 +16,7 @@ function argParser(options, args, argsOnly = false, name = '', helpFunction = un
     const parser = new commander.Command();
     // Set parser name
     parser.name(name);
+    parser.storeOptionsAsProperties(false);
 
     if (commands) {
         commands.reduce((parserInstance, cmd) => {

diff --git a/packages/webpack-cli/package.json b/packages/webpack-cli/package.json
@@ -29,7 +29,7 @@
     "ansi-escapes": "^4.3.1",
     "chalk": "^3.0.0",
     "command-line-usage": "^6.1.0",
-    "commander": "^5.0.0",
+    "commander": "^6.0.0",
     "enquirer": "^2.3.4",
     "execa": "^4.0.0",
     "import-local": "^3.0.2",

diff --git a/yarn.lock b/yarn.lock
@@ -3989,11 +3989,16 @@ commander@^2.20.0, commander@~2.20.3:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^5.0.0, commander@^5.1.0:
+commander@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
   integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
 
+commander@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-6.0.0.tgz#2b270da94f8fb9014455312f829a1129dbf8887e"
+  integrity sha512-s7EA+hDtTYNhuXkTlhqew4txMZVdszBmKWSPEMxGr8ru8JXR7bLUFIAtPhcSuFdJQ0ILMxnJi8GkQL0yvDy/YA==
+
 commitlint-config-cz@^0.13.0:
   version "0.13.1"
   resolved "https://registry.yarnpkg.com/commitlint-config-cz/-/commitlint-config-cz-0.13.1.tgz#26ec3096e3e53dca1e3c389127678a0bc41b814b"
@@ -11558,9 +11563,9 @@ typedarray@^0.0.6:
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
 typescript@^3.9.5:
-  version "3.9.6"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.6.tgz#8f3e0198a34c3ae17091b35571d3afd31999365a"
-  integrity sha512-Pspx3oKAPJtjNwE92YS05HQoY7z2SFyOpHo9MqJor3BXAGNaPUs83CuVp9VISFkSjyRfiTpmKuAYGJB7S7hOxw==
+  version "3.9.7"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
+  integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==
 
 typical@^5.0.0, typical@^5.2.0:
   version "5.2.0"