chore: lint

webpack · May 28, 2019 · 5778bdf · 5778bdf
1 parent 915c4ab
commit 5778bdf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/packages/generators/add-generator.ts b/packages/generators/add-generator.ts
@@ -22,8 +22,9 @@ import { Input, List } from "@webpack-cli/webpack-scaffold";
 
 import { SchemaProperties, WebpackOptions } from "./types";
 import entryQuestions from "./utils/entry";
-import { AutoComplete } from "@webpack-cli/webpack-scaffold";
-import { resolve } from "path";
+import * as AutoComplete from "inquirer-autocomplete-prompt";
+import path, { resolve } from "path";
+import glob from 'glob'
 
 /**
  *
@@ -41,6 +42,12 @@ export default class AddGenerator extends Generator {
 			configName?: string;
 			topScope?: string[];
 			item?: string;
+			merge?: {
+				configName?: string;
+				topScope?: string[];
+				item?: string; 
+				webpackOptions?: WebpackOptions;
+			};
 			webpackOptions?: WebpackOptions;
 		};
 	};

diff --git a/packages/generators/utils/add/questions/index.ts b/packages/generators/utils/add/questions/index.ts
@@ -1,22 +1,22 @@
 import {
 	AutoComplete,
 	Confirm,
-	IInquirerInput,
+	InquirerInput,
 	Input,
 	InputValidate,
-	List,
 } from "@webpack-cli/webpack-scaffold";
 import { existsSync } from "fs";
 import { resolve } from "path";
 import {
 	searchProps,
 } from "../index";
+import { Question } from "inquirer";
 
 /**
  * Returns Inquirer question for given action
  * @param action string
  */
-export const manualOrListInput: (action: string) => IInquirerInput = (action: string) => {
+export const manualOrListInput: (action: string) => Question = (action: string) => {
 	const actionQuestion = `What do you want to add to ${action}?`;
 	return Input("actionAnswer", actionQuestion);
 };