fix: tests

webpack · Jan 9, 2021 · ff8cb41 · ff8cb41
1 parent 823ca31
commit ff8cb41
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/packages/webpack-cli/lib/webpack-cli.js b/packages/webpack-cli/lib/webpack-cli.js
@@ -349,6 +349,7 @@ class WebpackCLI {
                 } else {
                     pkg = commandName;
                 }
+
                 if (pkg !== 'webpack-cli' && !getPkg(pkg)) {
                     if (!allowToInstall) {
                         return;

diff --git a/test/help/help.test.js b/test/help/help.test.js
@@ -27,6 +27,7 @@ describe('help', () => {
         expect(stdout.match(/init\|c/g)).toHaveLength(1);
         expect(stdout.match(/loader\|l/g)).toHaveLength(1);
         expect(stdout.match(/plugin\|p/g)).toHaveLength(1);
+        expect(stdout.match(/migrate\|m/g)).toHaveLength(1);
         expect(stdout.match(/configtest\|t/g)).toHaveLength(1);
         expect(stdout).toContain("To see list of all supported commands and options run 'webpack --help=verbose'.");
         expect(stdout).toContain('CLI documentation: https://webpack.js.org/api/cli/.');

diff --git a/test/version/version.test.js b/test/version/version.test.js
@@ -144,6 +144,7 @@ describe('single version flag', () => {
         expect(exitCode).toBe(0);
         expect(stderr).toBeFalsy();
         expect(stdout).toContain(`webpack-cli ${pkgJSON.version}`);
+        expect(stdout).toContain(`@webpack-cli/migrate`);
         expect(stdout).toContain(`webpack ${webpack.version}`);
         expect(stdout).toContain(`webpack-dev-server ${webpackDevServerPkgJSON.version}`);
     });

diff --git a/tsconfig.json b/tsconfig.json
@@ -20,7 +20,6 @@
     "declaration": true
   },
   "references": [
-<<<<<<< HEAD
     {
       "path": "packages/generators"
     },
@@ -30,9 +29,6 @@
     {
       "path": "packages/init"
     },
-    {
-      "path": "packages/migrate"
-    },
     {
       "path": "packages/serve"
     },
@@ -42,12 +38,5 @@
     {
       "path": "packages/configtest"
     }
-=======
-    { "path": "packages/generators" },
-    { "path": "packages/info" },
-    { "path": "packages/init" },
-    { "path": "packages/serve" },
-    { "path": "packages/utils" }
->>>>>>> fix: deprecate migrate package
   ]
 }