From 65824e6713f6ff2ea41967e399f8b88b3dd94f8a Mon Sep 17 00:00:00 2001 From: "devid.farinelli@gmail.com" Date: Wed, 1 May 2019 17:56:30 +0200 Subject: [PATCH] misc(packages): refactor yeoman-generator imports --- packages/generators/add-generator.ts | 2 +- packages/generators/addon-generator.ts | 2 +- packages/generators/init-generator.ts | 4 ++-- packages/generators/remove-generator.ts | 2 +- packages/generators/update-generator.ts | 2 +- packages/generators/utils/entry.ts | 2 +- packages/utils/modify-config-helper.ts | 3 ++- packages/webpack-scaffold/index.ts | 2 +- 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/packages/generators/add-generator.ts b/packages/generators/add-generator.ts index 4c52a105ffc..1a6339167a6 100644 --- a/packages/generators/add-generator.ts +++ b/packages/generators/add-generator.ts @@ -1,4 +1,4 @@ -import Generator = require("yeoman-generator"); +import * as Generator from "yeoman-generator"; import * as glob from "glob-all"; import * as autoComplete from "inquirer-autocomplete-prompt"; diff --git a/packages/generators/addon-generator.ts b/packages/generators/addon-generator.ts index a9b3a4d6f82..fbbcf7fc8e5 100644 --- a/packages/generators/addon-generator.ts +++ b/packages/generators/addon-generator.ts @@ -1,6 +1,6 @@ import * as mkdirp from "mkdirp"; import * as path from "path"; -import Generator from "yeoman-generator"; +import * as Generator from "yeoman-generator"; import * as copyUtils from "@webpack-cli/utils/copy-utils"; diff --git a/packages/generators/init-generator.ts b/packages/generators/init-generator.ts index 082dbdb8bb1..8836df70c19 100644 --- a/packages/generators/init-generator.ts +++ b/packages/generators/init-generator.ts @@ -1,7 +1,7 @@ import chalk from "chalk"; import * as logSymbols from "log-symbols"; -import Generator = require("yeoman-generator"); -import Inquirer = require("inquirer"); +import * as Generator from "yeoman-generator"; +import * as Inquirer from "inquirer"; import { getPackageManager } from "@webpack-cli/utils/package-manager"; import { Confirm, Input, List } from "@webpack-cli/webpack-scaffold"; diff --git a/packages/generators/remove-generator.ts b/packages/generators/remove-generator.ts index 879ed5c6d7c..6d47ac1c2f3 100644 --- a/packages/generators/remove-generator.ts +++ b/packages/generators/remove-generator.ts @@ -1,6 +1,6 @@ import * as fs from "fs"; import * as path from "path"; -import Generator = require("yeoman-generator"); +import * as Generator from "yeoman-generator"; import PROP_TYPES from "@webpack-cli/utils/prop-types"; import { List } from "@webpack-cli/webpack-scaffold"; diff --git a/packages/generators/update-generator.ts b/packages/generators/update-generator.ts index ca5d7ce78ce..f5c3060de66 100644 --- a/packages/generators/update-generator.ts +++ b/packages/generators/update-generator.ts @@ -1,3 +1,3 @@ -import Generator = require("yeoman-generator"); +import * as Generator from "yeoman-generator"; export default class UpdateGenerator extends Generator {} diff --git a/packages/generators/utils/entry.ts b/packages/generators/utils/entry.ts index 57c0f7982c9..47762928337 100644 --- a/packages/generators/utils/entry.ts +++ b/packages/generators/utils/entry.ts @@ -1,4 +1,4 @@ -import Generator from "yeoman-generator"; +import * as Generator from "yeoman-generator"; import { InputValidate } from "@webpack-cli/webpack-scaffold"; import validate from "./validate"; diff --git a/packages/utils/modify-config-helper.ts b/packages/utils/modify-config-helper.ts index 3d972114251..e836f283991 100644 --- a/packages/utils/modify-config-helper.ts +++ b/packages/utils/modify-config-helper.ts @@ -3,7 +3,8 @@ import * as fs from "fs"; import * as logSymbols from "log-symbols"; import * as path from "path"; import * as yeoman from "yeoman-environment"; -import Generator from "yeoman-generator"; +import * as Generator from "yeoman-generator"; + import runTransform from "./scaffold"; diff --git a/packages/webpack-scaffold/index.ts b/packages/webpack-scaffold/index.ts index 2da9488a73b..0a4ceb38d5c 100755 --- a/packages/webpack-scaffold/index.ts +++ b/packages/webpack-scaffold/index.ts @@ -1,5 +1,5 @@ import * as jscodeshift from "jscodeshift"; -import Generator from "yeoman-generator"; +import * as Generator from "yeoman-generator"; export function createArrowFunction(value: string): string { return `() => '${value}'`;