From faabbfb83a8fab67efa8a3620c47eeaaa1ace4b7 Mon Sep 17 00:00:00 2001
From: Anshuman Verma <anshu.av97@gmail.com>
Date: Wed, 5 Jun 2019 10:28:04 +0530
Subject: [PATCH] chore(refactor): use all utils from the root file in
 generators

use all utils from root file in generators
---
 .../__tests__/add-generator.test.ts           |  2 +-
 packages/generators/add-generator.ts          |  4 +--
 packages/generators/init-generator.ts         | 17 +++++++-----
 packages/generators/utils/index.ts            | 26 +++++++++++++++++++
 4 files changed, 40 insertions(+), 9 deletions(-)
 create mode 100644 packages/generators/utils/index.ts

diff --git a/packages/generators/__tests__/add-generator.test.ts b/packages/generators/__tests__/add-generator.test.ts
index 76588aa87df..85b17d76c8d 100644
--- a/packages/generators/__tests__/add-generator.test.ts
+++ b/packages/generators/__tests__/add-generator.test.ts
@@ -1,4 +1,4 @@
-import { generatePluginName } from "../utils/plugins";
+import { generatePluginName } from "../utils";
 
 describe("generatePluginName", () => {
 	it("should return webpack Standard Plugin Name for Name : extract-text-webpack-plugin", () => {
diff --git a/packages/generators/add-generator.ts b/packages/generators/add-generator.ts
index a1fc3da8c20..3fc98b09049 100644
--- a/packages/generators/add-generator.ts
+++ b/packages/generators/add-generator.ts
@@ -10,10 +10,10 @@ import PROP_TYPES from "@webpack-cli/utils/prop-types";
 import { AutoComplete, Confirm, Input, List } from "@webpack-cli/webpack-scaffold";
 
 import { SchemaProperties, WebpackOptions } from "./types";
-import entryQuestions from "./utils/entry";
-import { generatePluginName } from "./utils/plugins";
+import { entryQuestions, generatePluginName } from "./utils";
 import * as webpackDevServerSchema from "webpack-dev-server/lib/options.json";
 import * as webpackSchema from "./utils/optionsSchema.json";
+
 const PROPS: string[] = Array.from(PROP_TYPES.keys());
 
 /**
diff --git a/packages/generators/init-generator.ts b/packages/generators/init-generator.ts
index 8ba18e4ca65..9f58491abad 100644
--- a/packages/generators/init-generator.ts
+++ b/packages/generators/init-generator.ts
@@ -6,13 +6,18 @@ 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 {
+	getDefaultOptimization,
+	LangType,
+	langQuestionHandler,
+	tooltip,
+	generatePluginName,
+	Loader,
+	StylingType,
+	styleQuestionHandler,
+	entryQuestions
+} from "./utils";
 import { WebpackOptions } from "./types";
-import entryQuestions from "./utils/entry";
-import langQuestionHandler, { LangType } from "./utils/languageSupport";
-import styleQuestionHandler, { Loader, StylingType } from "./utils/styleSupport";
-import tooltip from "./utils/tooltip";
-import { generatePluginName } from "./utils/plugins";
 
 /**
  *
diff --git a/packages/generators/utils/index.ts b/packages/generators/utils/index.ts
new file mode 100644
index 00000000000..de2b14d7f4e
--- /dev/null
+++ b/packages/generators/utils/index.ts
@@ -0,0 +1,26 @@
+import entryQuestions from './entry'
+import langQuestionHandler, { LangType, getBabelLoader, getTypescriptLoader } from "./languageSupport";
+import plugins , { replaceAt, generatePluginName } from './plugins'
+import styleQuestionHandler, { StylingType, LoaderName, StyleRegex, Loader } from './styleSupport'
+import tooltip from "./tooltip";
+import validate from './validate'
+import { getDefaultOptimization } from './webpackConfig';
+
+export {
+	entryQuestions,
+	langQuestionHandler,
+	LangType,
+	getBabelLoader,
+	getTypescriptLoader,
+	plugins,
+	replaceAt,
+	generatePluginName,
+	styleQuestionHandler,
+	StylingType,
+	LoaderName,
+	StyleRegex,
+	Loader,
+	tooltip,
+	validate,
+	getDefaultOptimization
+};