From 85ef3e77bf81c20c9cced220d1654f07cebe100c Mon Sep 17 00:00:00 2001
From: Devid Farinelli <devid.farinelli@gmail.com>
Date: Fri, 3 May 2019 14:58:58 +0200
Subject: [PATCH] misc(types): correct types

---
 packages/generators/init-generator.ts | 17 +++++++++--------
 packages/generators/utils/entry.ts    |  4 ++--
 packages/generators/utils/language.ts |  4 ++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/packages/generators/init-generator.ts b/packages/generators/init-generator.ts
index ebe49ee6c13..7a4df24f43c 100644
--- a/packages/generators/init-generator.ts
+++ b/packages/generators/init-generator.ts
@@ -1,7 +1,6 @@
 import chalk from "chalk";
 import * as logSymbols from "log-symbols";
 import * as Generator from "yeoman-generator";
-import * as Inquirer from "inquirer";
 import * as path from "path";
 
 import { getPackageManager } from "@webpack-cli/utils/package-manager";
@@ -142,7 +141,7 @@ export default class InitGenerator extends Generator {
 			`Alternatively, run "webpack(-cli) --help" for usage info\n\n`,
 		);
 
-		const { multiEntries }: { multiEntries: boolean } = await this.prompt([
+		const { multiEntries } = await this.prompt([
 				Confirm(
 					"multiEntries",
 					"Will your application have multiple bundles?",
@@ -150,7 +149,8 @@ export default class InitGenerator extends Generator {
 				),
 			]);
 
-		const entryOption: string | object = await entryQuestions(self, multiEntries);
+		// TODO string | object
+		const entryOption: void | {} = await entryQuestions(self, multiEntries);
 			
 		if (typeof entryOption === "string" && entryOption.length > 0) {
 			this.configuration.config.webpackOptions.entry = `${entryOption}`;
@@ -158,7 +158,7 @@ export default class InitGenerator extends Generator {
 			this.configuration.config.webpackOptions.entry = entryOption;
 		}
 
-		const { outputDir }: { outputDir: string } = await this.prompt([
+		const { outputDir } = await this.prompt([
 				Input(
 					"outputDir",
 					"In which folder do you want to store your generated bundles?",
@@ -186,7 +186,7 @@ export default class InitGenerator extends Generator {
 				`path.resolve(__dirname, '${outputDir}')`;
 		}
 	
-		const { langType }: { langType: string } = await this.prompt([
+		const { langType } = await this.prompt([
 				List("langType", "Will you use one of the below JS solutions?", [
 					LangType.ES6,
 					LangType.Typescript,
@@ -197,7 +197,7 @@ export default class InitGenerator extends Generator {
 		langQuestionHandler(this, langType);
 		this.langType = langType;
 
-		const { stylingType }: { stylingType: string } =  await this.prompt([
+		const { stylingType } =  await this.prompt([
 					List("stylingType", "Will you use one of the below CSS solutions?", [
 						"No",
 						StylingType.CSS,
@@ -211,7 +211,7 @@ export default class InitGenerator extends Generator {
 
 		if (this.isProd) {
 			// Ask if the user wants to use extractPlugin
-			const { useExtractPlugin }: { useExtractPlugin: string } = await this.prompt([
+			const { useExtractPlugin } = await this.prompt([
 				Input(
 					"useExtractPlugin",
 					"If you want to bundle your CSS files, what will you name the bundle? (press enter to skip)",
@@ -294,7 +294,8 @@ export default class InitGenerator extends Generator {
 		// Generate README
 		this.fs.copyTpl(
 			path.resolve(__dirname, "./templates/README.md"),
-			this.destinationPath("README.md")
+			this.destinationPath("README.md"),
+			{}
 		);
 
 		// Genrate tsconfig
diff --git a/packages/generators/utils/entry.ts b/packages/generators/utils/entry.ts
index 8748abcb1e5..ea979b4dc94 100644
--- a/packages/generators/utils/entry.ts
+++ b/packages/generators/utils/entry.ts
@@ -19,9 +19,9 @@ interface CustomGenerator extends Generator {
 export default function entry(
 	self: CustomGenerator,
 	multiEntries: boolean,
-): Promise<object | string> {
+): Promise<void | {}> {
 	let entryIdentifiers: string[];
-	let result: Promise<{}>;
+	let result: Promise<void | {}>;
 	if (multiEntries) {
 		result = self
 			.prompt([
diff --git a/packages/generators/utils/language.ts b/packages/generators/utils/language.ts
index 46883fcf4af..266a16c8ccb 100644
--- a/packages/generators/utils/language.ts
+++ b/packages/generators/utils/language.ts
@@ -57,7 +57,7 @@ function getEntryFolders(self): string[] {
  * @returns {ModuleRule} A configuration containing the babel-loader with env preset
  */
 export function getBabelLoader(includeFolders: string[]): ModuleRule {
-	const include = includeFolders.map((folder: string) =>
+	const include = includeFolders.map((folder: string): string =>
 		`path.resolve(__dirname, '${folder}')`
 	);
 	return {
@@ -85,7 +85,7 @@ export function getBabelLoader(includeFolders: string[]): ModuleRule {
  * @returns {ModuleRule} A configuration containing the ts-loader
  */
 export function getTypescriptLoader(includeFolders: string[]): ModuleRule {
-	const include = includeFolders.map((folder: string) =>
+	const include = includeFolders.map((folder: string): string =>
 		`path.resolve(__dirname, '${folder}')`
 	);
 	return {