Skip to content

Commit 2db1195

Browse files
alexander-akaitalexander-akait
committed
refactor: code
1 parent fca8c00 commit 2db1195

File tree

9 files changed

+28
-28
lines changed

9 files changed

+28
-28
lines changed

‎packages/create-webpack-app/src/generators/init/default.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ export default async function (plop: NodePlopAPI) {
99
// dependencies to be installed
1010
const devDependencies: Array<string> = ["webpack", "webpack-cli"];
1111

12-
await plop.load("../../utils/pkgInstallAction.js", {}, true);
13-
await plop.load("../../utils/fileGenerator.js", {}, true);
12+
await plop.load("../../utils/install-dependencies.js", {}, true);
13+
await plop.load("../../utils/generate-files.js", {}, true);
1414

1515
plop.setDefaultInclude({ generators: true, actionTypes: true });
1616
plop.setPlopfilePath(resolve(__dirname, "../../plopfile.js"));
@@ -181,7 +181,7 @@ export default async function (plop: NodePlopAPI) {
181181

182182
for (const file of files) {
183183
actions.push({
184-
type: "fileGenerator",
184+
type: "generate-files",
185185
path: join(answers.projectPath, file.filePath),
186186
templateFile: join(
187187
plop.getPlopfilePath(),
@@ -194,7 +194,7 @@ export default async function (plop: NodePlopAPI) {
194194
}
195195

196196
actions.push({
197-
type: "pkgInstall",
197+
type: "install-dependencies",
198198
path: answers.projectPath,
199199
packages: devDependencies,
200200
});

‎packages/create-webpack-app/src/generators/init/react.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ export default async function (plop: NodePlopAPI) {
1818
"@types/react-router-dom",
1919
];
2020

21-
await plop.load("../../utils/pkgInstallAction.js", {}, true);
22-
await plop.load("../../utils/fileGenerator.js", {}, true);
21+
await plop.load("../../utils/install-dependencies.js", {}, true);
22+
await plop.load("../../utils/generate-files.js", {}, true);
2323

2424
plop.setDefaultInclude({ generators: true, actionTypes: true });
2525
plop.setPlopfilePath(resolve(__dirname, "../../plopfile.js"));
@@ -201,7 +201,7 @@ export default async function (plop: NodePlopAPI) {
201201

202202
for (const file of files) {
203203
actions.push({
204-
type: "fileGenerator",
204+
type: "generate-files",
205205
path: join(answers.projectPath, file.filePath),
206206
templateFile: join(
207207
plop.getPlopfilePath(),
@@ -214,7 +214,7 @@ export default async function (plop: NodePlopAPI) {
214214
}
215215

216216
actions.push({
217-
type: "pkgInstall",
217+
type: "install-dependencies",
218218
path: answers.projectPath,
219219
packages: devDependencies,
220220
});

‎packages/create-webpack-app/src/generators/init/svelte.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ export default async function (plop: NodePlopAPI) {
1616
"html-webpack-plugin",
1717
];
1818

19-
await plop.load("../../utils/pkgInstallAction.js", {}, true);
20-
await plop.load("../../utils/fileGenerator.js", {}, true);
19+
await plop.load("../../utils/install-dependencies.js", {}, true);
20+
await plop.load("../../utils/generate-files.js", {}, true);
2121

2222
plop.setDefaultInclude({ generators: true, actionTypes: true });
2323
plop.setPlopfilePath(resolve(__dirname, "../../plopfile.js"));
@@ -188,7 +188,7 @@ export default async function (plop: NodePlopAPI) {
188188

189189
for (const file of files) {
190190
actions.push({
191-
type: "fileGenerator",
191+
type: "generate-files",
192192
path: join(answers.projectPath, file.filePath),
193193
templateFile: join(
194194
plop.getPlopfilePath(),
@@ -201,7 +201,7 @@ export default async function (plop: NodePlopAPI) {
201201
}
202202

203203
actions.push({
204-
type: "pkgInstall",
204+
type: "install-dependencies",
205205
path: answers.projectPath,
206206
packages: devDependencies,
207207
});

‎packages/create-webpack-app/src/generators/init/vue.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ export default async function (plop: NodePlopAPI) {
1818
"vue-router@4",
1919
];
2020

21-
await plop.load("../../utils/pkgInstallAction.js", {}, true);
22-
await plop.load("../../utils/fileGenerator.js", {}, true);
21+
await plop.load("../../utils/install-dependencies.js", {}, true);
22+
await plop.load("../../utils/generate-files.js", {}, true);
2323

2424
plop.setDefaultInclude({ generators: true, actionTypes: true });
2525
plop.setPlopfilePath(resolve(__dirname, "../../plopfile.js"));
@@ -210,7 +210,7 @@ export default async function (plop: NodePlopAPI) {
210210

211211
for (const file of files) {
212212
actions.push({
213-
type: "fileGenerator",
213+
type: "generate-files",
214214
path: join(answers.projectPath, file.filePath),
215215
templateFile: join(
216216
plop.getPlopfilePath(),
@@ -223,7 +223,7 @@ export default async function (plop: NodePlopAPI) {
223223
}
224224

225225
actions.push({
226-
type: "pkgInstall",
226+
type: "install-dependencies",
227227
path: answers.projectPath,
228228
packages: devDependencies,
229229
});

‎packages/create-webpack-app/src/generators/loader/default.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ export default async function (plop: NodePlopAPI) {
1010
// dependencies to be installed
1111
const devDependencies: Array<string> = ["webpack-defaults"];
1212

13-
await plop.load("../../utils/pkgInstallAction.js", {}, true);
14-
await plop.load("../../utils/fileGenerator.js", {}, true);
13+
await plop.load("../../utils/install-dependencies.js", {}, true);
14+
await plop.load("../../utils/generate-files.js", {}, true);
1515

1616
// custom helper function
1717
plop.setHelper("makeLoaderName", (name: string) => {
@@ -76,7 +76,7 @@ export default async function (plop: NodePlopAPI) {
7676

7777
for (const file of files) {
7878
actions.push({
79-
type: "fileGenerator",
79+
type: "generate-files",
8080
path: join(answers.projectPath, file.filePath),
8181
templateFile: join(
8282
plop.getPlopfilePath(),
@@ -89,7 +89,7 @@ export default async function (plop: NodePlopAPI) {
8989
}
9090

9191
actions.push({
92-
type: "pkgInstall",
92+
type: "install-dependencies",
9393
path: answers.projectPath,
9494
packages: devDependencies,
9595
});

‎packages/create-webpack-app/src/generators/plugin/default.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ export default async function (plop: NodePlopAPI) {
1010
// dependencies to be installed
1111
const devDependencies: Array<string> = ["webpack-defaults"];
1212

13-
await plop.load("../../utils/pkgInstallAction.js", {}, true);
14-
await plop.load("../../utils/fileGenerator.js", {}, true);
13+
await plop.load("../../utils/install-dependencies.js", {}, true);
14+
await plop.load("../../utils/generate-files.js", {}, true);
1515

1616
plop.setDefaultInclude({ generators: true, actionTypes: true });
1717
plop.setPlopfilePath(resolve(__dirname, "../../plopfile.js"));
@@ -68,7 +68,7 @@ export default async function (plop: NodePlopAPI) {
6868

6969
for (const file of files) {
7070
actions.push({
71-
type: "fileGenerator",
71+
type: "generate-files",
7272
path: join(answers.projectPath, file.filePath),
7373
templateFile: join(
7474
plop.getPlopfilePath(),
@@ -81,7 +81,7 @@ export default async function (plop: NodePlopAPI) {
8181
}
8282

8383
actions.push({
84-
type: "pkgInstall",
84+
type: "install-dependencies",
8585
path: answers.projectPath,
8686
packages: devDependencies,
8787
});

‎packages/create-webpack-app/src/utils/fileGenerator.ts ‎packages/create-webpack-app/src/utils/generate-files.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ export default async function (plop: NodePlopAPI) {
240240
plop.setPlopfilePath(path.resolve(__dirname, "../plopfile.js"));
241241
plop.setDefaultInclude({ actions: true });
242242

243-
plop.setActionType("fileGenerator", async (answers, config) => {
243+
plop.setActionType("generate-files", async (answers, config) => {
244244
const isTemplate = config.fileType === "text";
245245
const result = await checkAndPrepareContent(
246246
{ ...config, data: answers } as AddConfig,

‎packages/create-webpack-app/src/utils/pkgInstallAction.ts ‎packages/create-webpack-app/src/utils/install-dependencies.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export default async function (plop: NodePlopAPI) {
1414

1515
plop.setPlopfilePath(resolve(__dirname, "../plopfile.js"));
1616
plop.setDefaultInclude({ actions: true });
17-
plop.setActionType("pkgInstall", (answers, config) => {
17+
plop.setActionType("install-dependencies", (answers, config) => {
1818
const options: SpawnOptionsWithStdioTuple<
1919
StdioNull,
2020
StdioNull | StdioPipe,

‎packages/create-webpack-app/src/utils/logger.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const typeDisplay: Record<string, Color | string> = {
2929

3030
function onSuccessHandler(change: PlopActionHooksChanges): void {
3131
switch (change.type) {
32-
case "fileGenerator": {
32+
case "generate-files": {
3333
change.path.split("\n").forEach((line) => {
3434
const [operationType = "", renderPath = ""] = line.split("|");
3535
console.log(
@@ -38,7 +38,7 @@ function onSuccessHandler(change: PlopActionHooksChanges): void {
3838
});
3939
break;
4040
}
41-
case "pkgInstall": {
41+
case "install-dependencies": {
4242
logger.success(change.path);
4343
break;
4444
}

0 commit comments

Comments
 (0)