Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Optimize generator log information #6240

Merged
merged 5 commits into from
Sep 23, 2024
Merged

feat: Optimize generator log information #6240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d4c7e03
feat: update codesmith version
caohuilin Sep 23, 2024
bf323dc
feat: update generator log
caohuilin Sep 23, 2024
b6b734a
docs: changeset
caohuilin Sep 23, 2024
bba6ce3
fix: typo
caohuilin Sep 23, 2024
6e63671
Merge branch 'main' into feat/refactor-generator-logger
caohuilin Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/hot-dolphins-stare.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@modern-js/create': patch
---

feat: create tools support --time option

feat: create 工具支持 --time 选项
30 changes: 30 additions & 0 deletions .changeset/soft-toes-hug.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
'@modern-js/storybook-next-generator': patch
'@modern-js/tailwindcss-generator': patch
'@modern-js/dependence-generator': patch
'@modern-js/module-doc-generator': patch
'@modern-js/changeset-generator': patch
'@modern-js/generator-generator': patch
'@modern-js/router-v5-generator': patch
'@modern-js/packages-generator': patch
'@modern-js/upgrade-generator': patch
'@modern-js/module-generator': patch
'@modern-js/server-generator': patch
'@modern-js/entry-generator': patch
'@modern-js/base-generator': patch
'@modern-js/repo-generator': patch
'@modern-js/bff-generator': patch
'@modern-js/mwa-generator': patch
'@modern-js/ssg-generator': patch
'@modern-js/generator-common': patch
'@modern-js/generator-plugin': patch
'@modern-js/generator-utils': patch
'@modern-js/sandpack-react': patch
'@modern-js/new-action': patch
'@modern-js/upgrade': patch
'@modern-js/create': patch
---

feat: Optimize generator log information

feat: 优化生成器日志信息
6 changes: 3 additions & 3 deletions packages/generator/generator-common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
"test": "jest --passWithNoTests"
},
"dependencies": {
"@modern-js/codesmith-formily": "2.4.2",
"@modern-js/codesmith-formily": "2.5.0",
"@modern-js/plugin-i18n": "workspace:*",
"@swc/helpers": "0.5.13"
},
"devDependencies": {
"@modern-js/codesmith": "2.4.2",
"@modern-js/codesmith-api-app": "2.4.2",
"@modern-js/codesmith": "2.5.0",
"@modern-js/codesmith-api-app": "2.5.0",
"@modern-js/utils": "workspace:*",
"@scripts/build": "workspace:*",
"@scripts/jest-config": "workspace:*",
Expand Down
10 changes: 5 additions & 5 deletions packages/generator/generator-plugin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
"test": "jest"
},
"dependencies": {
"@modern-js/codesmith": "2.4.2",
"@modern-js/codesmith-api-git": "2.4.2",
"@modern-js/codesmith-api-json": "2.4.2",
"@modern-js/codesmith-api-npm": "2.4.2",
"@modern-js/codesmith-formily": "2.4.2",
"@modern-js/codesmith": "2.5.0",
"@modern-js/codesmith-api-git": "2.5.0",
"@modern-js/codesmith-api-json": "2.5.0",
"@modern-js/codesmith-api-npm": "2.5.0",
"@modern-js/codesmith-formily": "2.5.0",
"@modern-js/generator-common": "workspace:*",
"@modern-js/generator-utils": "workspace:*",
"@modern-js/new-action": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/generator/generator-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@swc/helpers": "0.5.13"
},
"devDependencies": {
"@modern-js/codesmith": "2.4.2",
"@modern-js/codesmith": "2.5.0",
"@scripts/build": "workspace:*",
"@scripts/jest-config": "workspace:*",
"@types/jest": "^29",
Expand Down
4 changes: 2 additions & 2 deletions packages/generator/generators/base-generator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"@modern-js/utils": "workspace:*"
},
"devDependencies": {
"@modern-js/codesmith": "2.4.2",
"@modern-js/codesmith-api-app": "2.4.2",
"@modern-js/codesmith": "2.5.0",
"@modern-js/codesmith-api-app": "2.5.0",
"@modern-js/generator-common": "workspace:*",
"@modern-js/generator-utils": "workspace:*",
"@scripts/build": "workspace:*",
Expand Down
10 changes: 6 additions & 4 deletions packages/generator/generators/base-generator/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,17 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => {
process.exit(1);
}

generator.logger.debug(`start run @modern-js/base-generator`);
generator.logger.debug(`context=${JSON.stringify(context)}`);
generator.logger.debug(`context.data=${JSON.stringify(context.data)}`);
generator.logger.debug(`🚀 [Start Run Base Generator]`);
generator.logger.debug(
'💡 [Current Config]:',
JSON.stringify(context.config),
);

await handleTemplateFile(context, generator, appApi);

if (context.handleForged) {
await context.handleForged('custom', context, context.config.hasPlugin);
}

generator.logger.debug(`forge @modern-js/base-generator succeed `);
generator.logger.debug(`🌟 [End Run Base Generator]`);
};
6 changes: 3 additions & 3 deletions packages/generator/generators/bff-generator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
"@modern-js/utils": "workspace:*"
},
"devDependencies": {
"@modern-js/codesmith": "2.4.2",
"@modern-js/codesmith-api-app": "2.4.2",
"@modern-js/codesmith-api-json": "2.4.2",
"@modern-js/codesmith": "2.5.0",
"@modern-js/codesmith-api-app": "2.5.0",
"@modern-js/codesmith-api-json": "2.5.0",
"@modern-js/generator-common": "workspace:*",
"@modern-js/generator-utils": "workspace:*",
"@modern-js/plugin-i18n": "workspace:*",
Expand Down
14 changes: 8 additions & 6 deletions packages/generator/generators/bff-generator/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ export const handleTemplateFile = async (
if (fs.existsSync(apiDir) && !isEmptyApiDir(apiDir)) {
const files = fs.readdirSync(apiDir);
if (files.length > 0) {
generator.logger.warn("'api' is already exist");
throw Error("'api' is already exist");
generator.logger.warn(`🟡 The 'api' directory already exists.`);
throw Error("The 'api' directory is already exist");
}
}

Expand Down Expand Up @@ -239,9 +239,11 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => {
process.exit(1);
}

generator.logger.debug(`start run @modern-js/bff-generator`);
generator.logger.debug(`context=${JSON.stringify(context)}`);
generator.logger.debug(`context.data=${JSON.stringify(context.data)}`);
generator.logger.debug(`🚀 [Start Run BFF Generator]`);
generator.logger.debug(
'💡 [Current Config]:',
JSON.stringify(context.config),
);

try {
await handleTemplateFile(context, generator, appApi);
Expand Down Expand Up @@ -313,5 +315,5 @@ module.exports = {
}
}

generator.logger.debug(`forge @modern-js/bff-generator succeed `);
generator.logger.debug(`🌟 [End Run BFF Generator]`);
};
4 changes: 2 additions & 2 deletions packages/generator/generators/changeset-generator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"@modern-js/utils": "workspace:*"
},
"devDependencies": {
"@modern-js/codesmith": "2.4.2",
"@modern-js/codesmith-api-app": "2.4.2",
"@modern-js/codesmith": "2.5.0",
"@modern-js/codesmith-api-app": "2.5.0",
"@modern-js/generator-common": "workspace:*",
"@scripts/build": "workspace:*",
"@scripts/jest-config": "workspace:*",
Expand Down
10 changes: 6 additions & 4 deletions packages/generator/generators/changeset-generator/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => {
process.exit(1);
}

generator.logger.debug(`start run @modern-js/changeset-generator`);
generator.logger.debug(`context=${JSON.stringify(context)}`);
generator.logger.debug(`context.data=${JSON.stringify(context.data)}`);
generator.logger.debug(`🚀 [Start Run Changeset Generator]`);
generator.logger.debug(
'💡 [Current Config]:',
JSON.stringify(context.config),
);

await handleTemplateFile(appApi, context);

generator.logger.debug(`forge @modern-js/changeset-generator succeed `);
generator.logger.debug(`🌟 [End Run Changeset Generator]`);
};
6 changes: 3 additions & 3 deletions packages/generator/generators/dependence-generator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
"@modern-js/utils": "workspace:*"
},
"devDependencies": {
"@modern-js/codesmith": "2.4.2",
"@modern-js/codesmith-api-app": "2.4.2",
"@modern-js/codesmith-api-json": "2.4.2",
"@modern-js/codesmith": "2.5.0",
"@modern-js/codesmith-api-app": "2.5.0",
"@modern-js/codesmith-api-json": "2.5.0",
"@modern-js/generator-common": "workspace:*",
"@modern-js/generator-utils": "workspace:*",
"@modern-js/plugin-i18n": "workspace:*",
Expand Down
10 changes: 6 additions & 4 deletions packages/generator/generators/dependence-generator/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,11 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => {
process.exit(1);
}

generator.logger.debug(`start run @modern-js/dependence-generator`);
generator.logger.debug(`context=${JSON.stringify(context)}`);
generator.logger.debug(`context.data=${JSON.stringify(context.data)}`);
generator.logger.debug(`🚀 [Start Run Dependence Generator]`);
generator.logger.debug(
'💡 [Current Config]:',
JSON.stringify(context.config),
);

await handleTemplateFile(context, generator);

Expand Down Expand Up @@ -134,5 +136,5 @@ module.exports = {
}
}

generator.logger.debug(`forge @modern-js/dependence-generator succeed `);
generator.logger.debug(`🌟 [End Run Dependence Generator]`);
};
6 changes: 3 additions & 3 deletions packages/generator/generators/entry-generator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
"@modern-js/utils": "workspace:*"
},
"devDependencies": {
"@modern-js/codesmith": "2.4.2",
"@modern-js/codesmith-api-app": "2.4.2",
"@modern-js/codesmith-api-handlebars": "2.4.2",
"@modern-js/codesmith": "2.5.0",
"@modern-js/codesmith-api-app": "2.5.0",
"@modern-js/codesmith-api-handlebars": "2.5.0",
"@modern-js/generator-common": "workspace:*",
"@modern-js/generator-utils": "workspace:*",
"@modern-js/plugin-i18n": "workspace:*",
Expand Down
18 changes: 11 additions & 7 deletions packages/generator/generators/entry-generator/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ const handleInput = async (
isTsProject: isTsProject(appDir),
};

generator.logger.debug('analysisInfo:', analysisInfo);
generator.logger.debug(
`💡 [Entry Analysis Info]: ${JSON.stringify(analysisInfo)}`,
);

const config = { ...context.config, ...analysisInfo };
const ans = await appApi.getInputBySchemaFunc(getEntrySchema, config);
Expand Down Expand Up @@ -70,7 +72,7 @@ const refactorSingleEntry = async (
);
oldFiles.forEach(file => {
generator.logger.debug(
`rename ${file} to ${file.replace(
`💡 [Rename Entry Info]: from ${file} to ${file.replace(
entriesDir,
path.join(entriesDir, pkgName),
)}`,
Expand All @@ -91,7 +93,7 @@ export const handleTemplateFile = async (

if (ans.isSingleEntry) {
generator.logger.debug(
'current is single entry, refactoring to multi entry',
`💡 [Current Entry Info]: Current Entry is Single Entry`,
);
await refactorSingleEntry(context, generator);
}
Expand Down Expand Up @@ -119,9 +121,11 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => {
process.exit(1);
}

generator.logger.debug(`start run @modern-js/entry-generator`);
generator.logger.debug(`context=${JSON.stringify(context)}`);
generator.logger.debug(`context.data=${JSON.stringify(context.data)}`);
generator.logger.debug(`🚀 [Start Run Entry Generator]`);
generator.logger.debug(
'💡 [Current Config]:',
JSON.stringify(context.config),
);

merge(context.config, { entriesDir: context.config.entriesDir || 'src' });

Expand All @@ -133,5 +137,5 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => {
);
}

generator.logger.debug(`forge @modern-js/entry-generator succeed `);
generator.logger.debug(`🌟 [End Run Entry Generator]`);
};
6 changes: 3 additions & 3 deletions packages/generator/generators/generator-generator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
"@modern-js/utils": "workspace:*"
},
"devDependencies": {
"@modern-js/codesmith": "2.4.2",
"@modern-js/codesmith-api-app": "2.4.2",
"@modern-js/codesmith-api-json": "2.4.2",
"@modern-js/codesmith": "2.5.0",
"@modern-js/codesmith-api-app": "2.5.0",
"@modern-js/codesmith-api-json": "2.5.0",
"@modern-js/generator-common": "workspace:*",
"@modern-js/generator-utils": "workspace:*",
"@modern-js/module-generator": "workspace:*",
Expand Down
14 changes: 8 additions & 6 deletions packages/generator/generators/generator-generator/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ const handleTemplateFile = async (
try {
packages = getAllPackages(outputPath);
} catch (e) {
generator.logger.debug('get all packages error', e);
generator.logger.warn(i18n.t(localeKeys.lerna_error));
generator.logger.debug(`❗️ [Get All Packages Error]: ${e}`);
generator.logger.warn(`🟡 ${i18n.t(localeKeys.lerna_error)}`);
}
}

Expand Down Expand Up @@ -138,15 +138,17 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => {
process.exit(1);
}

generator.logger.debug(`start run @modern-js/generator-generator`);
generator.logger.debug(`context=${JSON.stringify(context)}`);
generator.logger.debug(`context.data=${JSON.stringify(context.data)}`);
generator.logger.debug(`🚀 [Start Run Generator Generator]`);
generator.logger.debug(
'💡 [Current Config]:',
JSON.stringify(context.config),
);

await handleTemplateFile(context, generator, appApi);

await appApi.runGitAndInstall(context.config.gitCommitMessage);

appApi.showSuccessInfo();

generator.logger.debug(`forge @modern-js/generator-generator succeed `);
generator.logger.debug(`🌟 [End Run Generator Generator]`);
};
10 changes: 6 additions & 4 deletions ...es/generator/generators/generator-generator/templates/js-template/src/index.js.handlebars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,17 @@ export default async (context, generator) => {
process.exit(1);
}

generator.logger.debug(`start run @modern-js/{{ packageName }}`);
generator.logger.debug(`context=${JSON.stringify(context)}`);
generator.logger.debug(`context.data=${JSON.stringify(context.data)}`);
generator.logger.debug(`🚀 [Start Run {{ packageName }} Generator]`);
generator.logger.debug(
'💡 [Current Config]:',
JSON.stringify(context.config),
);

await handleTemplateFile(appApi);

await appApi.runInstall();

appApi.showSuccessInfo();

generator.logger.debug(`forge @modern-js/{{ packageName }} succeed `);
generator.logger.debug(`🌟 [End Run {{ packageName }} Generator]`);
};
10 changes: 6 additions & 4 deletions ...es/generator/generators/generator-generator/templates/ts-template/src/index.ts.handlebars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,17 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => {
process.exit(1);
}

generator.logger.debug(`start run @modern-js/{{ packageName }}`);
generator.logger.debug(`context=${JSON.stringify(context)}`);
generator.logger.debug(`context.data=${JSON.stringify(context.data)}`);
generator.logger.debug(`🚀 [Start Run {{ packageName }} Generator]`);
generator.logger.debug(
'💡 [Current Config]:',
JSON.stringify(context.config),
);

await handleTemplateFile(appApi);

await appApi.runInstall();

appApi.showSuccessInfo();

generator.logger.debug(`forge @modern-js/{{ packageName }} succeed `);
generator.logger.debug(`🌟 [End Run {{ packageName }} Generator]`);
};
6 changes: 3 additions & 3 deletions packages/generator/generators/module-doc-generator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
"@modern-js/utils": "workspace:*"
},
"devDependencies": {
"@modern-js/codesmith": "2.4.2",
"@modern-js/codesmith-api-app": "2.4.2",
"@modern-js/codesmith-api-json": "2.4.2",
"@modern-js/codesmith": "2.5.0",
"@modern-js/codesmith-api-app": "2.5.0",
"@modern-js/codesmith-api-json": "2.5.0",
"@modern-js/dependence-generator": "workspace:*",
"@modern-js/generator-common": "workspace:*",
"@modern-js/generator-utils": "workspace:*",
Expand Down
Loading
Loading