fix: upgrade lock file (#1885)

* fix: upgrade lock file
webpack · Oct 7, 2020 · 8df291e · 8df291e
1 parent 80db425
commit 8df291e
Show file tree

Hide file tree

Showing 10 changed files with 932 additions and 1,114 deletions.
diff --git a/packages/generate-loader/package.json b/packages/generate-loader/package.json
@@ -17,5 +17,8 @@
     "@webpack-cli/generators": "^1.0.1-rc.1",
     "yeoman-environment": "^2.10.3"
   },
+  "peerDependencies": {
+    "webpack-cli": "3.x.x || 4.x.x"
+  },
   "gitHead": "fb50f766851f500ca12867a2aa9de81fa6e368f9"
 }
diff --git a/packages/generate-loader/src/index.ts b/packages/generate-loader/src/index.ts
@@ -1,5 +1,6 @@
 import { loaderGenerator } from '@webpack-cli/generators';
 import yeoman from 'yeoman-environment';
+import logger from 'webpack-cli/lib/utils/logger';
 
 /**
  * Runs a yeoman generator to create a new webpack loader project
@@ -12,5 +13,7 @@ export default function loaderCreator(): void {
 
     env.registerStub(loaderGenerator, generatorName);
 
-    env.run(generatorName);
+    env.run(generatorName, () => {
+        logger.success('Loader template has been successfully scaffolded.');
+    });
 }
diff --git a/packages/generate-plugin/package.json b/packages/generate-plugin/package.json
@@ -17,5 +17,8 @@
     "@webpack-cli/generators": "^1.0.1-rc.1",
     "yeoman-environment": "^2.10.3"
   },
+  "peerDependencies": {
+    "webpack-cli": "3.x.x || 4.x.x"
+  },
   "gitHead": "fb50f766851f500ca12867a2aa9de81fa6e368f9"
 }
diff --git a/packages/generate-plugin/src/index.ts b/packages/generate-plugin/src/index.ts
@@ -1,5 +1,6 @@
 import { pluginGenerator } from '@webpack-cli/generators';
 import yeoman from 'yeoman-environment';
+import logger from 'webpack-cli/lib/utils/logger';
 
 /**
  * Runs a yeoman generator to create a new webpack plugin project
@@ -12,5 +13,7 @@ export default function pluginCreator(): void {
 
     env.registerStub(pluginGenerator, generatorName);
 
-    env.run(generatorName);
+    env.run(generatorName, () => {
+        logger.success('Plugin template has been successfully scaffolded.');
+    });
 }
diff --git a/packages/generators/package.json b/packages/generators/package.json
@@ -25,7 +25,7 @@
   "devDependencies": {
     "@types/mkdirp": "^1.0.0",
     "@types/yeoman-assert": "^3.1.1",
-    "@types/yeoman-generator": "^3.1.4",
+    "@types/yeoman-generator": "^4.11.2",
     "@types/yeoman-test": "^2.0.3",
     "rimraf": "^3.0.2",
     "yeoman-assert": "^3.1.1",

diff --git a/packages/generators/src/addon-generator.ts b/packages/generators/src/addon-generator.ts
@@ -32,7 +32,7 @@ const addonGenerator = (
     copyFiles: string[],
     copyTemplateFiles: string[],
     templateFn: Function,
-): typeof Generator => {
+): Generator.GeneratorConstructor => {
     return class extends Generator {
         public props: Generator.Question;
         public copy: (value: string, index: number, array: string[]) => void;

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -31,7 +31,7 @@
   "devDependencies": {
     "@types/got": "9.6.9",
     "@types/prettier": "1.19.0",
-    "@types/yeoman-generator": "3.1.4"
+    "@types/yeoman-generator": "^4.11.2"
   },
   "gitHead": "fb50f766851f500ca12867a2aa9de81fa6e368f9"
 }
diff --git a/packages/utils/src/modify-config-helper.ts b/packages/utils/src/modify-config-helper.ts
@@ -48,7 +48,7 @@ const DEFAULT_WEBPACK_CONFIG_FILENAME = 'webpack.config.js';
 
 export function modifyHelperUtil(
     action: string,
-    generator: typeof Generator,
+    generator: Generator.GeneratorConstructor,
     configFile: string = DEFAULT_WEBPACK_CONFIG_FILENAME,
     packages?: string[],
     autoSetDefaults = false,
@@ -91,11 +91,13 @@ export function modifyHelperUtil(
     }
 
     env.registerStub(generator, generatorName);
-    env.run(generatorName, {
-        configFile,
-        autoSetDefaults,
-    })
-        .then((): void => {
+    env.run(
+        generatorName,
+        {
+            configFile,
+            autoSetDefaults,
+        },
+        () => {
             let configModule: object;
             let finalConfig: WebpackScaffoldObject = {
                 config: {},
@@ -128,29 +130,26 @@ export function modifyHelperUtil(
                 process.exitCode = 2;
             }
 
-            const transformConfig = Object.assign(
-                {
-                    configFile: !configPath ? null : fs.readFileSync(configPath, 'utf8'),
-                    configPath,
-                },
-                finalConfig,
-            ) as TransformConfig;
-            if (finalConfig.usingDefaults && finalConfig.usingDefaults === true) {
-                const runCommand = getPackageManager() === 'yarn' ? 'yarn build' : 'npm run build';
+            try {
+                const transformConfig = Object.assign(
+                    {
+                        configFile: !configPath ? null : fs.readFileSync(configPath, 'utf8'),
+                        configPath,
+                    },
+                    finalConfig,
+                ) as TransformConfig;
+                if (finalConfig.usingDefaults && finalConfig.usingDefaults === true) {
+                    const runCommand = getPackageManager() === 'yarn' ? 'yarn build' : 'npm run build';
 
-                logger.log(`\nYou can now run ${green(runCommand)} to bundle your application!\n`);
-            }
+                    logger.log(`\nYou can now run ${green(runCommand)} to bundle your application!\n`);
+                }
 
-            // scaffold webpack config file from using .yo-rc.json
-            return runTransform(transformConfig, 'init', generateConfig);
-        })
-        .catch((err): void => {
-            logger.error(
-                `
-Unexpected Error
-please file an issue here https://github.com/webpack/webpack-cli/issues/new?template=Bug_report.md
-				`,
-            );
-            logger.error(err);
-        });
+                // scaffold webpack config file from using .yo-rc.json
+                return runTransform(transformConfig, 'init', generateConfig);
+            } catch (err) {
+                logger.error(err);
+                process.exitCode = 2;
+            }
+        },
+    );
 }
diff --git a/packages/webpack-scaffold/package.json b/packages/webpack-scaffold/package.json
@@ -13,7 +13,7 @@
     "yeoman-generator": "^4.7.2"
   },
   "devDependencies": {
-    "@types/yeoman-generator": "^3.1.4"
+    "@types/yeoman-generator": "^4.11.2"
   },
   "gitHead": "fb50f766851f500ca12867a2aa9de81fa6e368f9"
 }