From a2c49e2b4505b24d0a707f11352ac1509c73a314 Mon Sep 17 00:00:00 2001
From: Rishabh <rishabh31121999@gmail.com>
Date: Wed, 29 May 2019 17:04:16 +0530
Subject: [PATCH] chore: update types of the config

---
 packages/generators/add-generator.ts   | 20 +++++---------------
 packages/utils/modify-config-helper.ts |  2 +-
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/packages/generators/add-generator.ts b/packages/generators/add-generator.ts
index eb3822edd1e..dfbb660173c 100644
--- 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
index 5d25385c8c0..b1e40368cc4 100644
--- 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;
 }