diff --git a/packages/create-webpack-app/src/generators/init/default.ts b/packages/create-webpack-app/src/generators/init/default.ts index 08c8491a8bb..fa95521bc19 100644 --- a/packages/create-webpack-app/src/generators/init/default.ts +++ b/packages/create-webpack-app/src/generators/init/default.ts @@ -9,8 +9,8 @@ export default async function (plop: NodePlopAPI) { // dependencies to be installed const devDependencies: Array = ["webpack", "webpack-cli"]; - await plop.load("../../utils/pkgInstallAction.js", {}, true); - await plop.load("../../utils/fileGenerator.js", {}, true); + await plop.load("../../utils/install-dependencies.js", {}, true); + await plop.load("../../utils/generate-files.js", {}, true); plop.setDefaultInclude({ generators: true, actionTypes: true }); plop.setPlopfilePath(resolve(__dirname, "../../plopfile.js")); @@ -181,7 +181,7 @@ export default async function (plop: NodePlopAPI) { for (const file of files) { actions.push({ - type: "fileGenerator", + type: "generate-files", path: join(answers.projectPath, file.filePath), templateFile: join( plop.getPlopfilePath(), @@ -194,7 +194,7 @@ export default async function (plop: NodePlopAPI) { } actions.push({ - type: "pkgInstall", + type: "install-dependencies", path: answers.projectPath, packages: devDependencies, }); diff --git a/packages/create-webpack-app/src/generators/init/react.ts b/packages/create-webpack-app/src/generators/init/react.ts index 9984de2d9d0..6f4fe9873d6 100644 --- a/packages/create-webpack-app/src/generators/init/react.ts +++ b/packages/create-webpack-app/src/generators/init/react.ts @@ -18,8 +18,8 @@ export default async function (plop: NodePlopAPI) { "@types/react-router-dom", ]; - await plop.load("../../utils/pkgInstallAction.js", {}, true); - await plop.load("../../utils/fileGenerator.js", {}, true); + await plop.load("../../utils/install-dependencies.js", {}, true); + await plop.load("../../utils/generate-files.js", {}, true); plop.setDefaultInclude({ generators: true, actionTypes: true }); plop.setPlopfilePath(resolve(__dirname, "../../plopfile.js")); @@ -201,7 +201,7 @@ export default async function (plop: NodePlopAPI) { for (const file of files) { actions.push({ - type: "fileGenerator", + type: "generate-files", path: join(answers.projectPath, file.filePath), templateFile: join( plop.getPlopfilePath(), @@ -214,7 +214,7 @@ export default async function (plop: NodePlopAPI) { } actions.push({ - type: "pkgInstall", + type: "install-dependencies", path: answers.projectPath, packages: devDependencies, }); diff --git a/packages/create-webpack-app/src/generators/init/svelte.ts b/packages/create-webpack-app/src/generators/init/svelte.ts index 1c836156f3d..29f6bdf38d3 100644 --- a/packages/create-webpack-app/src/generators/init/svelte.ts +++ b/packages/create-webpack-app/src/generators/init/svelte.ts @@ -16,8 +16,8 @@ export default async function (plop: NodePlopAPI) { "html-webpack-plugin", ]; - await plop.load("../../utils/pkgInstallAction.js", {}, true); - await plop.load("../../utils/fileGenerator.js", {}, true); + await plop.load("../../utils/install-dependencies.js", {}, true); + await plop.load("../../utils/generate-files.js", {}, true); plop.setDefaultInclude({ generators: true, actionTypes: true }); plop.setPlopfilePath(resolve(__dirname, "../../plopfile.js")); @@ -188,7 +188,7 @@ export default async function (plop: NodePlopAPI) { for (const file of files) { actions.push({ - type: "fileGenerator", + type: "generate-files", path: join(answers.projectPath, file.filePath), templateFile: join( plop.getPlopfilePath(), @@ -201,7 +201,7 @@ export default async function (plop: NodePlopAPI) { } actions.push({ - type: "pkgInstall", + type: "install-dependencies", path: answers.projectPath, packages: devDependencies, }); diff --git a/packages/create-webpack-app/src/generators/init/vue.ts b/packages/create-webpack-app/src/generators/init/vue.ts index fb90403e9c3..42c4e5011ce 100644 --- a/packages/create-webpack-app/src/generators/init/vue.ts +++ b/packages/create-webpack-app/src/generators/init/vue.ts @@ -18,8 +18,8 @@ export default async function (plop: NodePlopAPI) { "vue-router@4", ]; - await plop.load("../../utils/pkgInstallAction.js", {}, true); - await plop.load("../../utils/fileGenerator.js", {}, true); + await plop.load("../../utils/install-dependencies.js", {}, true); + await plop.load("../../utils/generate-files.js", {}, true); plop.setDefaultInclude({ generators: true, actionTypes: true }); plop.setPlopfilePath(resolve(__dirname, "../../plopfile.js")); @@ -210,7 +210,7 @@ export default async function (plop: NodePlopAPI) { for (const file of files) { actions.push({ - type: "fileGenerator", + type: "generate-files", path: join(answers.projectPath, file.filePath), templateFile: join( plop.getPlopfilePath(), @@ -223,7 +223,7 @@ export default async function (plop: NodePlopAPI) { } actions.push({ - type: "pkgInstall", + type: "install-dependencies", path: answers.projectPath, packages: devDependencies, }); diff --git a/packages/create-webpack-app/src/generators/loader/default.ts b/packages/create-webpack-app/src/generators/loader/default.ts index 83f2f1dc5fc..1c5faf48e68 100644 --- a/packages/create-webpack-app/src/generators/loader/default.ts +++ b/packages/create-webpack-app/src/generators/loader/default.ts @@ -10,8 +10,8 @@ export default async function (plop: NodePlopAPI) { // dependencies to be installed const devDependencies: Array = ["webpack-defaults"]; - await plop.load("../../utils/pkgInstallAction.js", {}, true); - await plop.load("../../utils/fileGenerator.js", {}, true); + await plop.load("../../utils/install-dependencies.js", {}, true); + await plop.load("../../utils/generate-files.js", {}, true); // custom helper function plop.setHelper("makeLoaderName", (name: string) => { @@ -76,7 +76,7 @@ export default async function (plop: NodePlopAPI) { for (const file of files) { actions.push({ - type: "fileGenerator", + type: "generate-files", path: join(answers.projectPath, file.filePath), templateFile: join( plop.getPlopfilePath(), @@ -89,7 +89,7 @@ export default async function (plop: NodePlopAPI) { } actions.push({ - type: "pkgInstall", + type: "install-dependencies", path: answers.projectPath, packages: devDependencies, }); diff --git a/packages/create-webpack-app/src/generators/plugin/default.ts b/packages/create-webpack-app/src/generators/plugin/default.ts index e03f7a9b2a7..d640ffaa7e1 100644 --- a/packages/create-webpack-app/src/generators/plugin/default.ts +++ b/packages/create-webpack-app/src/generators/plugin/default.ts @@ -10,8 +10,8 @@ export default async function (plop: NodePlopAPI) { // dependencies to be installed const devDependencies: Array = ["webpack-defaults"]; - await plop.load("../../utils/pkgInstallAction.js", {}, true); - await plop.load("../../utils/fileGenerator.js", {}, true); + await plop.load("../../utils/install-dependencies.js", {}, true); + await plop.load("../../utils/generate-files.js", {}, true); plop.setDefaultInclude({ generators: true, actionTypes: true }); plop.setPlopfilePath(resolve(__dirname, "../../plopfile.js")); @@ -68,7 +68,7 @@ export default async function (plop: NodePlopAPI) { for (const file of files) { actions.push({ - type: "fileGenerator", + type: "generate-files", path: join(answers.projectPath, file.filePath), templateFile: join( plop.getPlopfilePath(), @@ -81,7 +81,7 @@ export default async function (plop: NodePlopAPI) { } actions.push({ - type: "pkgInstall", + type: "install-dependencies", path: answers.projectPath, packages: devDependencies, }); diff --git a/packages/create-webpack-app/src/utils/fileGenerator.ts b/packages/create-webpack-app/src/utils/generate-files.ts similarity index 99% rename from packages/create-webpack-app/src/utils/fileGenerator.ts rename to packages/create-webpack-app/src/utils/generate-files.ts index 15505d95e2f..1ee22c98f03 100644 --- a/packages/create-webpack-app/src/utils/fileGenerator.ts +++ b/packages/create-webpack-app/src/utils/generate-files.ts @@ -240,7 +240,7 @@ export default async function (plop: NodePlopAPI) { plop.setPlopfilePath(path.resolve(__dirname, "../plopfile.js")); plop.setDefaultInclude({ actions: true }); - plop.setActionType("fileGenerator", async (answers, config) => { + plop.setActionType("generate-files", async (answers, config) => { const isTemplate = config.fileType === "text"; const result = await checkAndPrepareContent( { ...config, data: answers } as AddConfig, diff --git a/packages/create-webpack-app/src/utils/pkgInstallAction.ts b/packages/create-webpack-app/src/utils/install-dependencies.ts similarity index 96% rename from packages/create-webpack-app/src/utils/pkgInstallAction.ts rename to packages/create-webpack-app/src/utils/install-dependencies.ts index deda956f247..ba20f13d9fc 100644 --- a/packages/create-webpack-app/src/utils/pkgInstallAction.ts +++ b/packages/create-webpack-app/src/utils/install-dependencies.ts @@ -14,7 +14,7 @@ export default async function (plop: NodePlopAPI) { plop.setPlopfilePath(resolve(__dirname, "../plopfile.js")); plop.setDefaultInclude({ actions: true }); - plop.setActionType("pkgInstall", (answers, config) => { + plop.setActionType("install-dependencies", (answers, config) => { const options: SpawnOptionsWithStdioTuple< StdioNull, StdioNull | StdioPipe, diff --git a/packages/create-webpack-app/src/utils/logger.ts b/packages/create-webpack-app/src/utils/logger.ts index c60809e19d5..0c0fa080792 100644 --- a/packages/create-webpack-app/src/utils/logger.ts +++ b/packages/create-webpack-app/src/utils/logger.ts @@ -29,7 +29,7 @@ const typeDisplay: Record = { function onSuccessHandler(change: PlopActionHooksChanges): void { switch (change.type) { - case "fileGenerator": { + case "generate-files": { change.path.split("\n").forEach((line) => { const [operationType = "", renderPath = ""] = line.split("|"); console.log( @@ -38,7 +38,7 @@ function onSuccessHandler(change: PlopActionHooksChanges): void { }); break; } - case "pkgInstall": { + case "install-dependencies": { logger.success(change.path); break; }