misc(generators): refactor

webpack · May 29, 2019 · 376dcbd · 376dcbd
1 parent 782f56c
commit 376dcbd
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 33 deletions.
diff --git a/packages/generators/init-generator.ts b/packages/generators/init-generator.ts
@@ -6,10 +6,11 @@ import * as path from "path";
 import { getPackageManager } from "@webpack-cli/utils/package-manager";
 import { Confirm, Input, List } from "@webpack-cli/webpack-scaffold";
 
+import { getDefaultOptimization } from "./utils/webpackConfig";
 import { WebpackOptions } from "./types";
 import entryQuestions from "./utils/entry";
-import langQuestionHandler, { LangType } from "./utils/language";
-import styleQuestionHandler, { Loader, StylingType } from "./utils/style";
+import langQuestionHandler, { LangType } from "./utils/languageSupport";
+import styleQuestionHandler, { Loader, StylingType } from "./utils/styleSupport";
 import tooltip from "./utils/tooltip";
 
 /**
@@ -87,36 +88,8 @@ export default class InitGenerator extends Generator {
 			"new webpack.ProgressPlugin()",
 		);
 
-		let optimizationObj;
-
-		if (!this.isProd) {
-			optimizationObj = {
-				splitChunks: {
-					chunks: "'all'",
-				},
-			};
-		} else {
-			optimizationObj = {
-				minimizer: [
-					"new TerserPlugin()",
-				],
-				splitChunks: {
-					cacheGroups: {
-						vendors: {
-							priority: -10,
-							test: "/[\\\\/]node_modules[\\\\/]/",
-						},
-					},
-					chunks: "'async'",
-					minChunks: 1,
-					minSize: 30000,
-					// for production name is recommended to be off
-					name: !this.isProd,
-				},
-			};
-		}
-
-		this.configuration.config.webpackOptions.optimization = optimizationObj;
+		let optimizationConfig = getDefaultOptimization(this.isProd);
+		this.configuration.config.webpackOptions.optimization = optimizationConfig;
 
 		if (!this.isProd) {
 			this.configuration.config.webpackOptions.devServer = {

diff --git a/packages/generators/utils/language.ts → packages/generators/utils/languageSupport.ts b/packages/generators/utils/language.ts → packages/generators/utils/languageSupport.ts
diff --git a/packages/generators/utils/style.ts → packages/generators/utils/styleSupport.ts b/packages/generators/utils/style.ts → packages/generators/utils/styleSupport.ts
diff --git a/packages/generators/utils/webpackConfig.ts b/packages/generators/utils/webpackConfig.ts
@@ -0,0 +1,32 @@
+import { WebpackOptions } from '../types';
+
+export function getDefaultOptimization(isProd: boolean): WebpackOptions["optimization"] {
+    let optimizationOptions;
+    if (isProd) {
+        optimizationOptions = {
+            splitChunks: {
+                chunks: "'all'",
+            },
+        };
+    } else {
+        optimizationOptions = {
+            minimizer: [
+                "new TerserPlugin()",
+            ],
+            splitChunks: {
+                cacheGroups: {
+                    vendors: {
+                        priority: -10,
+                        test: "/[\\\\/]node_modules[\\\\/]/",
+                    },
+                },
+                chunks: "'async'",
+                minChunks: 1,
+                minSize: 30000,
+                // for production name is recommended to be off
+                name: !this.isProd,
+            },
+        };
+    }
+    return optimizationOptions;
+}
diff --git a/packages/webpack-scaffold/README.md b/packages/webpack-scaffold/README.md
@@ -192,7 +192,7 @@ const validation = value => {
 	if (value.length > 4) {
 		return true;
 	} else {
-		return "The entry point must be longer than 4, try again";
+		return "Your answer must be longer than 4, try again";
 	}
 };
 InputValidate("entry", "what is your entry point?", validation, "src/index");