chore: update types of the config

webpack · May 29, 2019 · a2c49e2 · a2c49e2
1 parent 1323bbf
commit a2c49e2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/packages/generators/add-generator.ts b/packages/generators/add-generator.ts
@@ -42,12 +42,7 @@ export default class AddGenerator extends Generator {
 			configName?: string;
 			topScope?: string[];
 			item?: string;
-			merge?: {
-				configName?: string;
-				topScope?: string[];
-				item?: string; 
-				webpackOptions?: WebpackOptions;
-			};
+			merge?: string|string[];
 			webpackOptions?: WebpackOptions;
 		};
 	};
@@ -112,19 +107,14 @@ export default class AddGenerator extends Generator {
 							);
 						}
 						if (action === "merge") {
-							return this.prompt([mergeFileQuestion])
+							return this.prompt(mergeFileQuestion)
 							.then((mergeFileAnswer: {
-								mergeFile: string;
+								mergeFile: string,
+								mergeConfigName: string
 							}) => {
 								const resolvedPath = resolve(process.cwd(), mergeFileAnswer.mergeFile);
 								// eslint-disable-next-line
-								const mergeConfig = require(resolvedPath);
-								(this.configuration.config.merge as {
-										configName?: string;
-										topScope?: string[];
-										item?: string;
-										webpackOptions?: WebpackOptions;
-								}) = mergeConfig;
+								this.configuration.config["merge"] = [mergeFileAnswer.mergeConfigName, resolvedPath];
 							});
 						}
 					}

diff --git a/packages/utils/modify-config-helper.ts b/packages/utils/modify-config-helper.ts
@@ -14,7 +14,7 @@ export interface Config extends Object {
 	};
 	topScope?: string[];
 	configName?: string;
-	merge: object;
+	merge: string|string[];
 	webpackOptions: object;
 }