diff --git a/.changeset/hot-dolphins-stare.md b/.changeset/hot-dolphins-stare.md new file mode 100644 index 000000000000..66189a45f53a --- /dev/null +++ b/.changeset/hot-dolphins-stare.md @@ -0,0 +1,7 @@ +--- +'@modern-js/create': patch +--- + +feat: create tools support --time option + +feat: create 工具支持 --time 选项 diff --git a/.changeset/soft-toes-hug.md b/.changeset/soft-toes-hug.md new file mode 100644 index 000000000000..822ef5c47877 --- /dev/null +++ b/.changeset/soft-toes-hug.md @@ -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: 优化生成器日志信息 diff --git a/packages/generator/generator-common/package.json b/packages/generator/generator-common/package.json index b0cfa05c2d89..1d858167d845 100644 --- a/packages/generator/generator-common/package.json +++ b/packages/generator/generator-common/package.json @@ -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:*", diff --git a/packages/generator/generator-plugin/package.json b/packages/generator/generator-plugin/package.json index dfbfe95acd02..68ded2448f95 100644 --- a/packages/generator/generator-plugin/package.json +++ b/packages/generator/generator-plugin/package.json @@ -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:*", diff --git a/packages/generator/generator-utils/package.json b/packages/generator/generator-utils/package.json index 47fff04d7e29..7adb2218108e 100644 --- a/packages/generator/generator-utils/package.json +++ b/packages/generator/generator-utils/package.json @@ -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", diff --git a/packages/generator/generators/base-generator/package.json b/packages/generator/generators/base-generator/package.json index 8c5a1fa91326..4a1b7f5b368c 100644 --- a/packages/generator/generators/base-generator/package.json +++ b/packages/generator/generators/base-generator/package.json @@ -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:*", diff --git a/packages/generator/generators/base-generator/src/index.ts b/packages/generator/generators/base-generator/src/index.ts index ac2e53166cbe..77b58a27f26a 100644 --- a/packages/generator/generators/base-generator/src/index.ts +++ b/packages/generator/generators/base-generator/src/index.ts @@ -62,9 +62,11 @@ 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); @@ -72,5 +74,5 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => { await context.handleForged('custom', context, context.config.hasPlugin); } - generator.logger.debug(`forge @modern-js/base-generator succeed `); + generator.logger.debug(`🌟 [End Run Base Generator]`); }; diff --git a/packages/generator/generators/bff-generator/package.json b/packages/generator/generators/bff-generator/package.json index 94a82db7ab7f..f4c6b8368943 100644 --- a/packages/generator/generators/bff-generator/package.json +++ b/packages/generator/generators/bff-generator/package.json @@ -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:*", diff --git a/packages/generator/generators/bff-generator/src/index.ts b/packages/generator/generators/bff-generator/src/index.ts index 5fa4ab8a56a1..c6db39c5e33a 100644 --- a/packages/generator/generators/bff-generator/src/index.ts +++ b/packages/generator/generators/bff-generator/src/index.ts @@ -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"); } } @@ -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); @@ -313,5 +315,5 @@ module.exports = { } } - generator.logger.debug(`forge @modern-js/bff-generator succeed `); + generator.logger.debug(`🌟 [End Run BFF Generator]`); }; diff --git a/packages/generator/generators/changeset-generator/package.json b/packages/generator/generators/changeset-generator/package.json index 54be942a6e5e..697dea76d9b7 100644 --- a/packages/generator/generators/changeset-generator/package.json +++ b/packages/generator/generators/changeset-generator/package.json @@ -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:*", diff --git a/packages/generator/generators/changeset-generator/src/index.ts b/packages/generator/generators/changeset-generator/src/index.ts index beb335596b6c..2a60a5fe1432 100644 --- a/packages/generator/generators/changeset-generator/src/index.ts +++ b/packages/generator/generators/changeset-generator/src/index.ts @@ -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]`); }; diff --git a/packages/generator/generators/dependence-generator/package.json b/packages/generator/generators/dependence-generator/package.json index 919c97bca62f..7d606a57ba65 100644 --- a/packages/generator/generators/dependence-generator/package.json +++ b/packages/generator/generators/dependence-generator/package.json @@ -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:*", diff --git a/packages/generator/generators/dependence-generator/src/index.ts b/packages/generator/generators/dependence-generator/src/index.ts index 4fff0adf849c..713ad4721908 100644 --- a/packages/generator/generators/dependence-generator/src/index.ts +++ b/packages/generator/generators/dependence-generator/src/index.ts @@ -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); @@ -134,5 +136,5 @@ module.exports = { } } - generator.logger.debug(`forge @modern-js/dependence-generator succeed `); + generator.logger.debug(`🌟 [End Run Dependence Generator]`); }; diff --git a/packages/generator/generators/entry-generator/package.json b/packages/generator/generators/entry-generator/package.json index 0c2f5c06a4e1..ef5386e94d73 100644 --- a/packages/generator/generators/entry-generator/package.json +++ b/packages/generator/generators/entry-generator/package.json @@ -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:*", diff --git a/packages/generator/generators/entry-generator/src/index.ts b/packages/generator/generators/entry-generator/src/index.ts index 0940a5116d15..f1082aa3c005 100644 --- a/packages/generator/generators/entry-generator/src/index.ts +++ b/packages/generator/generators/entry-generator/src/index.ts @@ -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); @@ -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), )}`, @@ -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); } @@ -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' }); @@ -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]`); }; diff --git a/packages/generator/generators/generator-generator/package.json b/packages/generator/generators/generator-generator/package.json index 1681fad12b02..960959ff211b 100644 --- a/packages/generator/generators/generator-generator/package.json +++ b/packages/generator/generators/generator-generator/package.json @@ -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:*", diff --git a/packages/generator/generators/generator-generator/src/index.ts b/packages/generator/generators/generator-generator/src/index.ts index 4197b91ebc93..3518b3020392 100644 --- a/packages/generator/generators/generator-generator/src/index.ts +++ b/packages/generator/generators/generator-generator/src/index.ts @@ -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)}`); } } @@ -138,9 +138,11 @@ 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); @@ -148,5 +150,5 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => { appApi.showSuccessInfo(); - generator.logger.debug(`forge @modern-js/generator-generator succeed `); + generator.logger.debug(`🌟 [End Run Generator Generator]`); }; diff --git a/packages/generator/generators/generator-generator/templates/js-template/src/index.js.handlebars b/packages/generator/generators/generator-generator/templates/js-template/src/index.js.handlebars index fa0f3e7d6d48..d4ff3894c25d 100644 --- a/packages/generator/generators/generator-generator/templates/js-template/src/index.js.handlebars +++ b/packages/generator/generators/generator-generator/templates/js-template/src/index.js.handlebars @@ -14,9 +14,11 @@ 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); @@ -24,5 +26,5 @@ export default async (context, generator) => { appApi.showSuccessInfo(); - generator.logger.debug(`forge @modern-js/{{ packageName }} succeed `); + generator.logger.debug(`🌟 [End Run {{ packageName }} Generator]`); }; diff --git a/packages/generator/generators/generator-generator/templates/ts-template/src/index.ts.handlebars b/packages/generator/generators/generator-generator/templates/ts-template/src/index.ts.handlebars index 65b21f043d8a..35481e1a04b4 100644 --- a/packages/generator/generators/generator-generator/templates/ts-template/src/index.ts.handlebars +++ b/packages/generator/generators/generator-generator/templates/ts-template/src/index.ts.handlebars @@ -15,9 +15,11 @@ 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); @@ -25,5 +27,5 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => { appApi.showSuccessInfo(); - generator.logger.debug(`forge @modern-js/{{ packageName }} succeed `); + generator.logger.debug(`🌟 [End Run {{ packageName }} Generator]`); }; diff --git a/packages/generator/generators/module-doc-generator/package.json b/packages/generator/generators/module-doc-generator/package.json index 859c13700d10..e1e196048f47 100644 --- a/packages/generator/generators/module-doc-generator/package.json +++ b/packages/generator/generators/module-doc-generator/package.json @@ -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:*", diff --git a/packages/generator/generators/module-doc-generator/src/index.ts b/packages/generator/generators/module-doc-generator/src/index.ts index fae7f8a76388..d89193e17104 100644 --- a/packages/generator/generators/module-doc-generator/src/index.ts +++ b/packages/generator/generators/module-doc-generator/src/index.ts @@ -33,9 +33,11 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => { process.exit(1); } - generator.logger.debug(`start run @modern-js/module-doc-generator`); - generator.logger.debug(`context=${JSON.stringify(context)}`); - generator.logger.debug(`context.data=${JSON.stringify(context.data)}`); + generator.logger.debug(`🚀 [Start Run Module Doc Generator]`); + generator.logger.debug( + '💡 [Current Config]:', + JSON.stringify(context.config), + ); await handleTemplateFile(context, appApi, generator); @@ -55,5 +57,5 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => { }), ); - generator.logger.debug(`forge @modern-js/module-doc-generator succeed `); + generator.logger.debug(`🌟 [End Run Module Doc Generator]`); }; diff --git a/packages/generator/generators/module-generator/package.json b/packages/generator/generators/module-generator/package.json index be9b25444f0e..be63c3089224 100644 --- a/packages/generator/generators/module-generator/package.json +++ b/packages/generator/generators/module-generator/package.json @@ -34,8 +34,8 @@ "devDependencies": { "@modern-js/base-generator": "workspace:*", "@modern-js/changeset-generator": "workspace:*", - "@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/dependence-generator": "workspace:*", "@modern-js/generator-common": "workspace:*", "@modern-js/generator-utils": "workspace:*", diff --git a/packages/generator/generators/module-generator/src/index.ts b/packages/generator/generators/module-generator/src/index.ts index 3feb926bc798..c4109dae058e 100644 --- a/packages/generator/generators/module-generator/src/index.ts +++ b/packages/generator/generators/module-generator/src/index.ts @@ -42,8 +42,8 @@ export const handleTemplateFile = async ( try { packages = getAllPackages(outputPath); } catch (e) { - generator.logger.debug('get all packages error', e); - generator.logger.warn(i18n.t(localeKeys.get_packages_error)); + generator.logger.debug(`❗️ [Get All Packages Error]: ${e}`); + generator.logger.warn(`🟡 ${i18n.t(localeKeys.get_packages_error)}`); } } @@ -108,7 +108,7 @@ export const handleTemplateFile = async ( context.config.distTag, ); - generator.logger.debug(`inputData=${JSON.stringify(ans)}`, ans); + generator.logger.debug(`💡 [Input Answer]: ${JSON.stringify(ans)}`); const { packageName, packagePath, language, packageManager } = ans; @@ -205,15 +205,17 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => { process.exit(1); } - generator.logger.debug(`start run @modern-js/module-generator`); - generator.logger.debug(`context=${JSON.stringify(context)}`); - generator.logger.debug(`context.data=${JSON.stringify(context.data)}`); + generator.logger.debug(`🚀 [Start Run Module Generator]`); + generator.logger.debug( + '💡 [Current Config]:', + JSON.stringify(context.config), + ); let projectPath = ''; try { ({ projectPath } = await handleTemplateFile(context, generator, appApi)); } catch (e) { - generator.logger.error(e); + generator.logger.error(`🔴 [Handle Module Template Error]:`, e); process.exit(1); } @@ -243,5 +245,5 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => { }), ); - generator.logger.debug(`forge @modern-js/module-generator succeed `); + generator.logger.debug(`🌟 [End Run Module Generator]`); }; diff --git a/packages/generator/generators/mwa-generator/package.json b/packages/generator/generators/mwa-generator/package.json index a842c275dfab..74085afa5acb 100644 --- a/packages/generator/generators/mwa-generator/package.json +++ b/packages/generator/generators/mwa-generator/package.json @@ -33,8 +33,8 @@ }, "devDependencies": { "@modern-js/base-generator": "workspace:*", - "@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/dependence-generator": "workspace:*", "@modern-js/entry-generator": "workspace:*", "@modern-js/generator-common": "workspace:*", diff --git a/packages/generator/generators/mwa-generator/src/index.ts b/packages/generator/generators/mwa-generator/src/index.ts index ed2c14913711..ed327d691d19 100644 --- a/packages/generator/generators/mwa-generator/src/index.ts +++ b/packages/generator/generators/mwa-generator/src/index.ts @@ -37,8 +37,8 @@ export const handleTemplateFile = async ( try { packages = getAllPackages(outputPath); } catch (e) { - generator.logger.debug('get all packages error', e); - generator.logger.warn(i18n.t(localeKeys.get_packages_error)); + generator.logger.debug(`❗️ [Get All Packages Error]: ${e}`); + generator.logger.warn(`🟡 ${i18n.t(localeKeys.get_packages_error)}`); } } @@ -104,7 +104,7 @@ export const handleTemplateFile = async ( context.config.distTag, ); - generator.logger.debug(`inputData=${JSON.stringify(ans)}`, ans); + generator.logger.debug(`💡 [Input Answer]: ${JSON.stringify(ans)}`); const { packageName, packagePath, language, packageManager } = ans; const { packagesInfo } = context.config; @@ -206,15 +206,17 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => { process.exit(1); } - generator.logger.debug(`start run @modern-js/mwa-generator`); - generator.logger.debug(`context=${JSON.stringify(context)}`); - generator.logger.debug(`context.data=${JSON.stringify(context.data)}`); + generator.logger.debug(`🚀 [Start Run MWA Generator]`); + generator.logger.debug( + '💡 [Current Config]:', + JSON.stringify(context.config), + ); let projectPath = ''; try { ({ projectPath } = await handleTemplateFile(context, generator, appApi)); } catch (e) { - generator.logger.error(e); + generator.logger.error(`🔴 [Handle MWA Template Error]:`, e); process.exit(1); } @@ -230,7 +232,6 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => { try { await appApi.runGitAndInstall(context.config.gitCommitMessage); } catch (e) { - generator.logger.error(e); process.exit(1); } @@ -246,5 +247,5 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => { ); } - generator.logger.debug(`forge @modern-js/mwa-generator succeed `); + generator.logger.debug(`🌟 [End Run MWA Generator]`); }; diff --git a/packages/generator/generators/packages-generator/package.json b/packages/generator/generators/packages-generator/package.json index e40fc2f51aed..42e12a5ad0d6 100644 --- a/packages/generator/generators/packages-generator/package.json +++ b/packages/generator/generators/packages-generator/package.json @@ -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:*", "@scripts/build": "workspace:*", diff --git a/packages/generator/generators/packages-generator/src/index.ts b/packages/generator/generators/packages-generator/src/index.ts index 951ab2dc8511..d63efc6684ab 100644 --- a/packages/generator/generators/packages-generator/src/index.ts +++ b/packages/generator/generators/packages-generator/src/index.ts @@ -92,11 +92,13 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => { process.exit(1); } - generator.logger.debug(`start run @modern-js/packages-generator`); - generator.logger.debug(`context=${JSON.stringify(context)}`); - generator.logger.debug(`context.data=${JSON.stringify(context.data)}`); + generator.logger.debug(`🚀 [Start Run Packages Generator]`); + generator.logger.debug( + '💡 [Current Config]:', + JSON.stringify(context.config), + ); await handleTemplateFile(context, generator); - generator.logger.debug(`forge @modern-js/packages-generator succeed `); + generator.logger.debug(`🌟 [End Run Packages Generator]`); }; diff --git a/packages/generator/generators/repo-generator/package.json b/packages/generator/generators/repo-generator/package.json index 17399e76ee04..73b318f3156f 100644 --- a/packages/generator/generators/repo-generator/package.json +++ b/packages/generator/generators/repo-generator/package.json @@ -33,8 +33,8 @@ }, "devDependencies": { "@modern-js/base-generator": "workspace:*", - "@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-plugin": "workspace:*", "@modern-js/generator-utils": "workspace:*", diff --git a/packages/generator/generators/repo-generator/src/index.ts b/packages/generator/generators/repo-generator/src/index.ts index 3f1d6e9d2e84..ae1db0ae3c18 100644 --- a/packages/generator/generators/repo-generator/src/index.ts +++ b/packages/generator/generators/repo-generator/src/index.ts @@ -59,7 +59,7 @@ const handleTemplateFile = async ( : SolutionGenerator[solution as Solution]; if (!solution || !solutionGenerator) { - generator.logger.error('solution is not valid '); + generator.logger.error(`🔴 [Check Solution]: ${solution} is not support`); } await appApi.runSubGenerator( @@ -99,10 +99,11 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => { if (!(await appApi.checkEnvironment())) { process.exit(1); } - - generator.logger.debug(`start run @modern-js/repo-generator`); - generator.logger.debug(`context=${JSON.stringify(context)}`); - generator.logger.debug(`context.data=${JSON.stringify(context.data)}`); + generator.logger.debug(`🚀 [Start Run Repo Generator]`); + generator.logger.debug( + '💡 [Current Config]:', + JSON.stringify(context.config), + ); mergeDefaultConfig(context); @@ -114,9 +115,9 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => { try { await handleTemplateFile(context, generator, appApi, generatorPlugin); } catch (e) { - generator.logger.error(e); + generator.logger.error(`🔴 [Handle Repo Template Error]:`, e); process.exit(1); } - generator.logger.debug(`forge @modern-js/repo-generator succeed `); + generator.logger.debug(`🚀 [End Run Repo Generator]`); }; diff --git a/packages/generator/generators/router-v5-generator/package.json b/packages/generator/generators/router-v5-generator/package.json index 50bc97411587..a8a869a94d59 100644 --- a/packages/generator/generators/router-v5-generator/package.json +++ b/packages/generator/generators/router-v5-generator/package.json @@ -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/dependence-generator": "workspace:*", "@modern-js/generator-common": "workspace:*", "@modern-js/generator-utils": "workspace:*", diff --git a/packages/generator/generators/router-v5-generator/src/index.ts b/packages/generator/generators/router-v5-generator/src/index.ts index 21b743d9e22f..8016ddc9ca71 100644 --- a/packages/generator/generators/router-v5-generator/src/index.ts +++ b/packages/generator/generators/router-v5-generator/src/index.ts @@ -67,9 +67,11 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => { process.exit(1); } - generator.logger.debug(`start run @modern-js/router-v5-generator`); - generator.logger.debug(`context=${JSON.stringify(context)}`); - generator.logger.debug(`context.data=${JSON.stringify(context.data)}`); + generator.logger.debug(`🚀 [Start Run Router-v5 Generator]`); + generator.logger.debug( + '💡 [Current Config]:', + JSON.stringify(context.config), + ); await handleTemplateFile(context, generator, appApi); @@ -135,5 +137,5 @@ module.exports = { ); } } - generator.logger.debug(`forge @modern-js/router-v5-generator succeed `); + generator.logger.debug(`🌟 [End Run Repo Generator]`); }; diff --git a/packages/generator/generators/server-generator/package.json b/packages/generator/generators/server-generator/package.json index 0fbe1937151d..a804faa5c2f6 100644 --- a/packages/generator/generators/server-generator/package.json +++ b/packages/generator/generators/server-generator/package.json @@ -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/dependence-generator": "workspace:*", "@modern-js/generator-common": "workspace:*", "@modern-js/generator-utils": "workspace:*", diff --git a/packages/generator/generators/server-generator/src/index.ts b/packages/generator/generators/server-generator/src/index.ts index 8643dd98333d..f04b965e6269 100644 --- a/packages/generator/generators/server-generator/src/index.ts +++ b/packages/generator/generators/server-generator/src/index.ts @@ -43,8 +43,8 @@ const handleTemplateFile = async ( if (fs.existsSync(serverDir) && !isEmptyServerDir(serverDir)) { const files = fs.readdirSync('server'); if (files.length > 0) { - generator.logger.warn("'server' is already exist"); - process.exit(1); + generator.logger.warn(`🟡 The 'server' directory already exists.`); + throw Error("The 'server' directory is already exist"); } } @@ -112,11 +112,13 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => { process.exit(1); } - generator.logger.debug(`start run @modern-js/server-generator`); - generator.logger.debug(`context=${JSON.stringify(context)}`); - generator.logger.debug(`context.data=${JSON.stringify(context.data)}`); + generator.logger.debug(`🚀 [Start Run Server Generator]`); + generator.logger.debug( + '💡 [Current Config]:', + JSON.stringify(context.config), + ); await handleTemplateFile(context, generator, appApi); - generator.logger.debug(`forge @modern-js/server-generator succeed `); + generator.logger.debug(`🌟 [End Run Server Generator]`); }; diff --git a/packages/generator/generators/ssg-generator/package.json b/packages/generator/generators/ssg-generator/package.json index f5d17b1c14aa..07d1f80def4a 100644 --- a/packages/generator/generators/ssg-generator/package.json +++ b/packages/generator/generators/ssg-generator/package.json @@ -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/dependence-generator": "workspace:*", "@modern-js/generator-common": "workspace:*", "@modern-js/generator-utils": "workspace:*", diff --git a/packages/generator/generators/ssg-generator/src/index.ts b/packages/generator/generators/ssg-generator/src/index.ts index 5a3d3cb775c0..3ded1f8d7540 100644 --- a/packages/generator/generators/ssg-generator/src/index.ts +++ b/packages/generator/generators/ssg-generator/src/index.ts @@ -37,9 +37,11 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => { process.exit(1); } - generator.logger.debug(`start run @modern-js/ssg-generator`); - generator.logger.debug(`context=${JSON.stringify(context)}`); - generator.logger.debug(`context.data=${JSON.stringify(context.data)}`); + generator.logger.debug(`🚀 [Start Run SSG Generator]`); + generator.logger.debug( + '💡 [Current Config]:', + JSON.stringify(context.config), + ); await handleTemplateFile(context, generator, appApi); @@ -96,5 +98,5 @@ module.exports = { } } } - generator.logger.debug(`forge @modern-js/ssg-generator succeed `); + generator.logger.debug(`🌟 [End Run SSG Generator]`); }; diff --git a/packages/generator/generators/storybook-next-generator/package.json b/packages/generator/generators/storybook-next-generator/package.json index 45d796f19447..ac92641f7d0f 100644 --- a/packages/generator/generators/storybook-next-generator/package.json +++ b/packages/generator/generators/storybook-next-generator/package.json @@ -29,9 +29,9 @@ "test": "jest --passWithNoTests" }, "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:*", diff --git a/packages/generator/generators/storybook-next-generator/src/index.ts b/packages/generator/generators/storybook-next-generator/src/index.ts index 7ee4b2be9727..b380a1e25d4a 100644 --- a/packages/generator/generators/storybook-next-generator/src/index.ts +++ b/packages/generator/generators/storybook-next-generator/src/index.ts @@ -143,9 +143,11 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => { i18n.changeLanguage({ locale }); appApi.i18n.changeLanguage({ locale }); - generator.logger.debug(`start run @modern-js/storybook-next-generator`); - generator.logger.debug(`context=${JSON.stringify(context)}`); - generator.logger.debug(`context.data=${JSON.stringify(context.data)}`); + generator.logger.debug(`🚀 [Start Run Storybook Next Generator]`); + generator.logger.debug( + '💡 [Current Config]:', + JSON.stringify(context.config), + ); const { packageManager } = await handleTemplateFile( context, @@ -159,5 +161,5 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => { }), ); - generator.logger.debug(`forge @modern-js/storybook-next-generator succeed `); + generator.logger.debug(`🌟 [End Run Storybook Next Generator]`); }; diff --git a/packages/generator/generators/tailwindcss-generator/package.json b/packages/generator/generators/tailwindcss-generator/package.json index cdf3ea5f24f3..dcdfa5603eb6 100644 --- a/packages/generator/generators/tailwindcss-generator/package.json +++ b/packages/generator/generators/tailwindcss-generator/package.json @@ -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:*", diff --git a/packages/generator/generators/tailwindcss-generator/src/index.ts b/packages/generator/generators/tailwindcss-generator/src/index.ts index 2edb6fa6a904..61fedd0d506f 100644 --- a/packages/generator/generators/tailwindcss-generator/src/index.ts +++ b/packages/generator/generators/tailwindcss-generator/src/index.ts @@ -85,11 +85,13 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => { process.exit(1); } - generator.logger.debug(`start run @modern-js/tailwindcss-generator`); - generator.logger.debug(`context=${JSON.stringify(context)}`); - generator.logger.debug(`context.data=${JSON.stringify(context.data)}`); + generator.logger.debug(`🚀 [Start Run Tailwindcss Generator]`); + generator.logger.debug( + '💡 [Current Config]:', + JSON.stringify(context.config), + ); await handleTemplateFile(context, generator, appApi); - generator.logger.debug(`forge @modern-js/tailwindcss-generator succeed `); + generator.logger.debug(`🌟 [End Run Tailwindcss Generator]`); }; diff --git a/packages/generator/generators/upgrade-generator/package.json b/packages/generator/generators/upgrade-generator/package.json index cbef88555258..9f815ea8d2f3 100644 --- a/packages/generator/generators/upgrade-generator/package.json +++ b/packages/generator/generators/upgrade-generator/package.json @@ -29,9 +29,9 @@ "test": "jest --passWithNoTests" }, "dependencies": { - "@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:*", diff --git a/packages/generator/generators/upgrade-generator/src/index.ts b/packages/generator/generators/upgrade-generator/src/index.ts index 017b14ff3a4e..5990b6b1226e 100644 --- a/packages/generator/generators/upgrade-generator/src/index.ts +++ b/packages/generator/generators/upgrade-generator/src/index.ts @@ -142,7 +142,7 @@ export const handleTemplateFile = async ( ); } else if (DeprecatedModernBuilderDeps.includes(dep)) { generator.logger.warn( - `[Deprecated] ${dep} is no longer maintained, please use Rsbuild plugin instead`, + `🟡 [Deprecated] ${dep} is no longer maintained, please use Rsbuild plugin instead`, ); } else { updateInfo[`dependencies.${dep}`] = await getAvailableVersion( @@ -162,7 +162,7 @@ export const handleTemplateFile = async ( ); } else if (DeprecatedModernBuilderDeps.includes(dep)) { generator.logger.warn( - `[Deprecated] ${dep} is no longer maintained, please use Rsbuild plugin instead`, + `🟡 [Deprecated] ${dep} is no longer maintained, please use Rsbuild plugin instead`, ); } else { updateInfo[`devDependencies.${dep}`] = await getAvailableVersion( @@ -196,11 +196,13 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => { const { locale } = context.config; appApi.i18n.changeLanguage({ locale }); - generator.logger.debug(`start run @modern-js/upgrade-generator`); - generator.logger.debug(`context=${JSON.stringify(context)}`); - generator.logger.debug(`context.data=${JSON.stringify(context.data)}`); + generator.logger.debug(`🚀 [Start Run Upgrade Generator]`); + generator.logger.debug( + '💡 [Current Config]:', + JSON.stringify(context.config), + ); await handleTemplateFile(context, generator, appApi); - generator.logger.debug(`forge @modern-js/upgrade-generator succeed `); + generator.logger.debug(`🌟 [End Run Upgrade Generator]`); }; diff --git a/packages/generator/new-action/package.json b/packages/generator/new-action/package.json index d59308e7d0d3..30c05761c1c7 100644 --- a/packages/generator/new-action/package.json +++ b/packages/generator/new-action/package.json @@ -39,8 +39,8 @@ "test": "jest --passWithNoTests" }, "dependencies": { - "@modern-js/codesmith": "2.4.2", - "@modern-js/codesmith-formily": "2.4.2", + "@modern-js/codesmith": "2.5.0", + "@modern-js/codesmith-formily": "2.5.0", "@modern-js/generator-common": "workspace:*", "@modern-js/generator-utils": "workspace:*", "@modern-js/utils": "workspace:*", diff --git a/packages/generator/sandpack-react/package.json b/packages/generator/sandpack-react/package.json index ed6d380506ed..6accbdbd47d3 100644 --- a/packages/generator/sandpack-react/package.json +++ b/packages/generator/sandpack-react/package.json @@ -44,7 +44,7 @@ }, "devDependencies": { "@modern-js/base-generator": "workspace:*", - "@modern-js/codesmith-api-handlebars": "2.4.2", + "@modern-js/codesmith-api-handlebars": "2.5.0", "@modern-js/entry-generator": "workspace:*", "@modern-js/generator-common": "workspace:*", "@modern-js/generator-utils": "workspace:*", diff --git a/packages/toolkit/create/package.json b/packages/toolkit/create/package.json index eb1a2876834a..dcfafe51c2ad 100644 --- a/packages/toolkit/create/package.json +++ b/packages/toolkit/create/package.json @@ -43,7 +43,7 @@ "test": "jest --passWithNoTests" }, "devDependencies": { - "@modern-js/codesmith": "2.4.2", + "@modern-js/codesmith": "2.5.0", "@modern-js/generator-plugin-plugin": "workspace:*", "@modern-js/plugin-i18n": "workspace:*", "@modern-js/repo-generator": "workspace:*", diff --git a/packages/toolkit/create/src/createAction.ts b/packages/toolkit/create/src/createAction.ts index df7b2e993b69..2c06471de3a2 100644 --- a/packages/toolkit/create/src/createAction.ts +++ b/packages/toolkit/create/src/createAction.ts @@ -1,6 +1,7 @@ import path from 'path'; import { CodeSmith, type Logger } from '@modern-js/codesmith'; import { getLocaleLanguage } from '@modern-js/plugin-i18n/language-detector'; +import { logger } from '@modern-js/utils'; import { version as pkgVersion } from '../package.json'; import { i18n, localeKeys } from './locale'; import { createDir } from './utils'; @@ -18,6 +19,7 @@ interface Options { needInstall?: boolean; version?: boolean; lang?: string; + time?: boolean; } type RunnerTask = Array<{ @@ -115,9 +117,12 @@ export async function createAction(projectDir: string, options: Options) { registry, distTag, generator: customGenerator, + time, } = options; const smith = new CodeSmith({ debug, + time, + namespace: 'create', registryUrl: registry, }); @@ -125,11 +130,13 @@ export async function createAction(projectDir: string, options: Options) { i18n.changeLanguage({ locale: lang }); } if (version) { - smith.logger.info('@modern-js/create', `v${pkgVersion}`); + logger.greet(`@modern-js/create v${pkgVersion}`); return; } - smith.logger.debug('@modern-js/create', projectDir || '', options); + smith.logger.debug('📦 @modern-js/create:', `v${pkgVersion}`); + smith.logger.debug('💡 [Current Dir]:', projectDir || ''); + smith.logger.debug('💡 [Current Config]:', JSON.stringify(options)); let pwd = process.cwd(); try { diff --git a/packages/toolkit/create/src/index.ts b/packages/toolkit/create/src/index.ts index b080f9ea7aa1..f5e57bf2d9da 100644 --- a/packages/toolkit/create/src/index.ts +++ b/packages/toolkit/create/src/index.ts @@ -39,6 +39,7 @@ export default function () { .option('--packages ', i18n.t(localeKeys.command.packages), '{}') .option('--registry ', i18n.t(localeKeys.command.registry), '') .option('--no-need-install', i18n.t(localeKeys.command.noNeedInstall)) + .option('--time', i18n.t(localeKeys.command.time), false) .action(createAction); program.parse(process.argv); diff --git a/packages/toolkit/create/src/locale/en.ts b/packages/toolkit/create/src/locale/en.ts index 2e4d194b37e7..9c22f7326327 100644 --- a/packages/toolkit/create/src/locale/en.ts +++ b/packages/toolkit/create/src/locale/en.ts @@ -16,6 +16,7 @@ export const EN_LOCALE = { version: 'show create tools version', lang: 'set create tools language(en or zh)', cleanCache: 'clean locale generator cache', + time: 'show run generator time log', }, tooltip: { dir_entry: `you can execute 'cd {dirName}' to entry the project directory`, diff --git a/packages/toolkit/create/src/locale/zh.ts b/packages/toolkit/create/src/locale/zh.ts index f63158879f49..852f9db5de47 100644 --- a/packages/toolkit/create/src/locale/zh.ts +++ b/packages/toolkit/create/src/locale/zh.ts @@ -14,6 +14,7 @@ export const ZH_LOCALE = { version: '当前 create 工具版本号', lang: '设置 create 工具语言(zh 或者 en)', cleanCache: '清除本地生成器缓存', + time: '展示生成器时间日志信息', }, tooltip: { dir_entry: `你可以执行 'cd {dirName}' 进入目录`, diff --git a/packages/toolkit/upgrade/package.json b/packages/toolkit/upgrade/package.json index 7d62dd23204e..357efe7bf2bf 100644 --- a/packages/toolkit/upgrade/package.json +++ b/packages/toolkit/upgrade/package.json @@ -43,7 +43,7 @@ "test": "jest --passWithNoTests" }, "dependencies": { - "@modern-js/codesmith": "2.4.2", + "@modern-js/codesmith": "2.5.0", "@modern-js/plugin-i18n": "workspace:*", "@modern-js/utils": "workspace:*", "@swc/helpers": "0.5.13" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b49d43838923..b17d11b20d7a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -272,7 +272,7 @@ importers: version: 0.5.13 axios: specifier: ^1.7.4 - version: 1.7.4 + version: 1.7.4(debug@4.3.7) resolve-from: specifier: ^5.0.0 version: 5.0.0 @@ -1227,8 +1227,8 @@ importers: packages/generator/generator-common: dependencies: '@modern-js/codesmith-formily': - specifier: 2.4.2 - version: 2.4.2(@modern-js/codesmith@2.4.2)(typescript@5.3.3) + specifier: 2.5.0 + version: 2.5.0(@modern-js/codesmith@2.5.0)(typescript@5.3.3) '@modern-js/plugin-i18n': specifier: workspace:* version: link:../../cli/plugin-i18n @@ -1237,11 +1237,11 @@ importers: version: 0.5.13 devDependencies: '@modern-js/codesmith': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/codesmith-api-app': - specifier: 2.4.2 - version: 2.4.2(@modern-js/codesmith@2.4.2)(typescript@5.3.3) + specifier: 2.5.0 + version: 2.5.0(@modern-js/codesmith@2.5.0)(typescript@5.3.3) '@modern-js/utils': specifier: workspace:* version: link:../../toolkit/utils @@ -1267,20 +1267,20 @@ importers: packages/generator/generator-plugin: dependencies: '@modern-js/codesmith': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/codesmith-api-git': - specifier: 2.4.2 - version: 2.4.2(@modern-js/codesmith@2.4.2) + specifier: 2.5.0 + version: 2.5.0(@modern-js/codesmith@2.5.0) '@modern-js/codesmith-api-json': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/codesmith-api-npm': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/codesmith-formily': - specifier: 2.4.2 - version: 2.4.2(@modern-js/codesmith@2.4.2)(typescript@5.3.3) + specifier: 2.5.0 + version: 2.5.0(@modern-js/codesmith@2.5.0)(typescript@5.3.3) '@modern-js/generator-common': specifier: workspace:* version: link:../generator-common @@ -1344,8 +1344,8 @@ importers: version: 0.5.13 devDependencies: '@modern-js/codesmith': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@scripts/build': specifier: workspace:* version: link:../../../scripts/build @@ -1372,11 +1372,11 @@ importers: version: link:../../../toolkit/utils devDependencies: '@modern-js/codesmith': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/codesmith-api-app': - specifier: 2.4.2 - version: 2.4.2(@modern-js/codesmith@2.4.2)(typescript@5.3.3) + specifier: 2.5.0 + version: 2.5.0(@modern-js/codesmith@2.5.0)(typescript@5.3.3) '@modern-js/generator-common': specifier: workspace:* version: link:../../generator-common @@ -1409,14 +1409,14 @@ importers: version: link:../../../toolkit/utils devDependencies: '@modern-js/codesmith': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/codesmith-api-app': - specifier: 2.4.2 - version: 2.4.2(@modern-js/codesmith@2.4.2)(typescript@5.3.3) + specifier: 2.5.0 + version: 2.5.0(@modern-js/codesmith@2.5.0)(typescript@5.3.3) '@modern-js/codesmith-api-json': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/generator-common': specifier: workspace:* version: link:../../generator-common @@ -1452,11 +1452,11 @@ importers: version: link:../../../toolkit/utils devDependencies: '@modern-js/codesmith': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/codesmith-api-app': - specifier: 2.4.2 - version: 2.4.2(@modern-js/codesmith@2.4.2)(typescript@5.3.3) + specifier: 2.5.0 + version: 2.5.0(@modern-js/codesmith@2.5.0)(typescript@5.3.3) '@modern-js/generator-common': specifier: workspace:* version: link:../../generator-common @@ -1486,14 +1486,14 @@ importers: version: link:../../../toolkit/utils devDependencies: '@modern-js/codesmith': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/codesmith-api-app': - specifier: 2.4.2 - version: 2.4.2(@modern-js/codesmith@2.4.2)(typescript@5.3.3) + specifier: 2.5.0 + version: 2.5.0(@modern-js/codesmith@2.5.0)(typescript@5.3.3) '@modern-js/codesmith-api-json': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/generator-common': specifier: workspace:* version: link:../../generator-common @@ -1529,14 +1529,14 @@ importers: version: link:../../../toolkit/utils devDependencies: '@modern-js/codesmith': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/codesmith-api-app': - specifier: 2.4.2 - version: 2.4.2(@modern-js/codesmith@2.4.2)(typescript@5.3.3) + specifier: 2.5.0 + version: 2.5.0(@modern-js/codesmith@2.5.0)(typescript@5.3.3) '@modern-js/codesmith-api-handlebars': - specifier: 2.4.2 - version: 2.4.2(@modern-js/codesmith@2.4.2) + specifier: 2.5.0 + version: 2.5.0(@modern-js/codesmith@2.5.0) '@modern-js/generator-common': specifier: workspace:* version: link:../../generator-common @@ -1572,14 +1572,14 @@ importers: version: link:../../../toolkit/utils devDependencies: '@modern-js/codesmith': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/codesmith-api-app': - specifier: 2.4.2 - version: 2.4.2(@modern-js/codesmith@2.4.2)(typescript@5.3.3) + specifier: 2.5.0 + version: 2.5.0(@modern-js/codesmith@2.5.0)(typescript@5.3.3) '@modern-js/codesmith-api-json': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/generator-common': specifier: workspace:* version: link:../../generator-common @@ -1618,14 +1618,14 @@ importers: version: link:../../../toolkit/utils devDependencies: '@modern-js/codesmith': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/codesmith-api-app': - specifier: 2.4.2 - version: 2.4.2(@modern-js/codesmith@2.4.2)(typescript@5.3.3) + specifier: 2.5.0 + version: 2.5.0(@modern-js/codesmith@2.5.0)(typescript@5.3.3) '@modern-js/codesmith-api-json': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/dependence-generator': specifier: workspace:* version: link:../dependence-generator @@ -1670,11 +1670,11 @@ importers: specifier: workspace:* version: link:../changeset-generator '@modern-js/codesmith': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/codesmith-api-app': - specifier: 2.4.2 - version: 2.4.2(@modern-js/codesmith@2.4.2)(typescript@5.3.3) + specifier: 2.5.0 + version: 2.5.0(@modern-js/codesmith@2.5.0)(typescript@5.3.3) '@modern-js/dependence-generator': specifier: workspace:* version: link:../dependence-generator @@ -1719,11 +1719,11 @@ importers: specifier: workspace:* version: link:../base-generator '@modern-js/codesmith': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/codesmith-api-app': - specifier: 2.4.2 - version: 2.4.2(@modern-js/codesmith@2.4.2)(typescript@5.3.3) + specifier: 2.5.0 + version: 2.5.0(@modern-js/codesmith@2.5.0)(typescript@5.3.3) '@modern-js/dependence-generator': specifier: workspace:* version: link:../dependence-generator @@ -1768,14 +1768,14 @@ importers: version: link:../../../toolkit/utils devDependencies: '@modern-js/codesmith': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/codesmith-api-app': - specifier: 2.4.2 - version: 2.4.2(@modern-js/codesmith@2.4.2)(typescript@5.3.3) + specifier: 2.5.0 + version: 2.5.0(@modern-js/codesmith@2.5.0)(typescript@5.3.3) '@modern-js/codesmith-api-json': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/generator-common': specifier: workspace:* version: link:../../generator-common @@ -1811,11 +1811,11 @@ importers: specifier: workspace:* version: link:../base-generator '@modern-js/codesmith': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/codesmith-api-app': - specifier: 2.4.2 - version: 2.4.2(@modern-js/codesmith@2.4.2)(typescript@5.3.3) + specifier: 2.5.0 + version: 2.5.0(@modern-js/codesmith@2.5.0)(typescript@5.3.3) '@modern-js/generator-common': specifier: workspace:* version: link:../../generator-common @@ -1857,11 +1857,11 @@ importers: version: link:../../../toolkit/utils devDependencies: '@modern-js/codesmith': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/codesmith-api-app': - specifier: 2.4.2 - version: 2.4.2(@modern-js/codesmith@2.4.2)(typescript@5.3.3) + specifier: 2.5.0 + version: 2.5.0(@modern-js/codesmith@2.5.0)(typescript@5.3.3) '@modern-js/dependence-generator': specifier: workspace:* version: link:../dependence-generator @@ -1900,14 +1900,14 @@ importers: version: link:../../../toolkit/utils devDependencies: '@modern-js/codesmith': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/codesmith-api-app': - specifier: 2.4.2 - version: 2.4.2(@modern-js/codesmith@2.4.2)(typescript@5.3.3) + specifier: 2.5.0 + version: 2.5.0(@modern-js/codesmith@2.5.0)(typescript@5.3.3) '@modern-js/codesmith-api-json': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/dependence-generator': specifier: workspace:* version: link:../dependence-generator @@ -1943,11 +1943,11 @@ importers: version: link:../../../toolkit/utils devDependencies: '@modern-js/codesmith': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/codesmith-api-app': - specifier: 2.4.2 - version: 2.4.2(@modern-js/codesmith@2.4.2)(typescript@5.3.3) + specifier: 2.5.0 + version: 2.5.0(@modern-js/codesmith@2.5.0)(typescript@5.3.3) '@modern-js/dependence-generator': specifier: workspace:* version: link:../dependence-generator @@ -1982,14 +1982,14 @@ importers: packages/generator/generators/storybook-next-generator: devDependencies: '@modern-js/codesmith': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/codesmith-api-app': - specifier: 2.4.2 - version: 2.4.2(@modern-js/codesmith@2.4.2)(typescript@5.3.3) + specifier: 2.5.0 + version: 2.5.0(@modern-js/codesmith@2.5.0)(typescript@5.3.3) '@modern-js/codesmith-api-json': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/dependence-generator': specifier: workspace:* version: link:../dependence-generator @@ -2028,14 +2028,14 @@ importers: version: link:../../../toolkit/utils devDependencies: '@modern-js/codesmith': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/codesmith-api-app': - specifier: 2.4.2 - version: 2.4.2(@modern-js/codesmith@2.4.2)(typescript@5.3.3) + specifier: 2.5.0 + version: 2.5.0(@modern-js/codesmith@2.5.0)(typescript@5.3.3) '@modern-js/codesmith-api-json': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/dependence-generator': specifier: workspace:* version: link:../dependence-generator @@ -2067,14 +2067,14 @@ importers: packages/generator/generators/upgrade-generator: dependencies: '@modern-js/codesmith': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/codesmith-api-app': - specifier: 2.4.2 - version: 2.4.2(@modern-js/codesmith@2.4.2)(typescript@5.3.3) + specifier: 2.5.0 + version: 2.5.0(@modern-js/codesmith@2.5.0)(typescript@5.3.3) '@modern-js/codesmith-api-json': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/generator-common': specifier: workspace:* version: link:../../generator-common @@ -2110,11 +2110,11 @@ importers: packages/generator/new-action: dependencies: '@modern-js/codesmith': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/codesmith-formily': - specifier: 2.4.2 - version: 2.4.2(@modern-js/codesmith@2.4.2)(typescript@5.3.3) + specifier: 2.5.0 + version: 2.5.0(@modern-js/codesmith@2.5.0)(typescript@5.3.3) '@modern-js/generator-common': specifier: workspace:* version: link:../generator-common @@ -2202,8 +2202,8 @@ importers: specifier: workspace:* version: link:../generators/base-generator '@modern-js/codesmith-api-handlebars': - specifier: 2.4.2 - version: 2.4.2(@modern-js/codesmith@2.4.2) + specifier: 2.5.0 + version: 2.5.0(@modern-js/codesmith@2.5.0) '@modern-js/entry-generator': specifier: workspace:* version: link:../generators/entry-generator @@ -3607,7 +3607,7 @@ importers: version: 0.5.13 axios: specifier: ^1.7.4 - version: 1.7.4 + version: 1.7.4(debug@4.3.7) connect-history-api-fallback: specifier: ^2.0.0 version: 2.0.0 @@ -4175,8 +4175,8 @@ importers: packages/toolkit/create: devDependencies: '@modern-js/codesmith': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/generator-plugin-plugin': specifier: workspace:* version: link:../../generator/plugins/generator-plugin @@ -4398,8 +4398,8 @@ importers: packages/toolkit/upgrade: dependencies: '@modern-js/codesmith': - specifier: 2.4.2 - version: 2.4.2 + specifier: 2.5.0 + version: 2.5.0 '@modern-js/plugin-i18n': specifier: workspace:* version: link:../../cli/plugin-i18n @@ -6002,7 +6002,7 @@ importers: version: 14.18.35 axios: specifier: ^1.7.4 - version: 1.7.4 + version: 1.7.4(debug@4.3.7) tests/integration/entries/fixtures/app-builder: dependencies: @@ -6947,7 +6947,7 @@ importers: version: link:../../../../packages/runtime/plugin-runtime axios: specifier: ^1.7.4 - version: 1.7.4 + version: 1.7.4(debug@4.3.7) react: specifier: ^18 version: 18.2.0 @@ -7120,7 +7120,7 @@ importers: version: link:../../../packages/runtime/plugin-runtime axios: specifier: ^1.7.4 - version: 1.7.4 + version: 1.7.4(debug@4.3.7) express: specifier: ^4.17.2 version: 4.18.1 @@ -7151,7 +7151,7 @@ importers: version: link:../../../packages/runtime/plugin-runtime axios: specifier: ^1.7.4 - version: 1.7.4 + version: 1.7.4(debug@4.3.7) express: specifier: ^4.17.2 version: 4.18.1 @@ -7339,7 +7339,7 @@ importers: version: 14.18.35 axios: specifier: ^1.7.4 - version: 1.7.4 + version: 1.7.4(debug@4.3.7) tests/integration/ssr/fixtures/base: dependencies: @@ -13268,18 +13268,18 @@ packages: redux: 4.2.0 dev: false - /@modern-js/codesmith-api-app@2.4.2(@modern-js/codesmith@2.4.2)(typescript@5.3.3): - resolution: {integrity: sha512-CrPPsME/P/GB7Sbd+kD59t0ipZWwKfhxKb+L584y27kBvQI7mu6MuzZdVhCyEoilYIeH6w1vjHDfOmDR+tnEag==} + /@modern-js/codesmith-api-app@2.5.0(@modern-js/codesmith@2.5.0)(typescript@5.3.3): + resolution: {integrity: sha512-j0SQrIjIKQ25orq/KJ5bM0fKn482/FrfDY2noe4zQbBsA23KW9Dpg6gU4ydHPgxAXntB5lZ8AdN6O9nNLQ8SKQ==} peerDependencies: - '@modern-js/codesmith': ^2.4.2 + '@modern-js/codesmith': ^2.5.0 dependencies: - '@modern-js/codesmith': 2.4.2 - '@modern-js/codesmith-api-ejs': 2.4.2(@modern-js/codesmith@2.4.2) - '@modern-js/codesmith-api-fs': 2.4.2(@modern-js/codesmith@2.4.2) - '@modern-js/codesmith-api-git': 2.4.2(@modern-js/codesmith@2.4.2) - '@modern-js/codesmith-api-handlebars': 2.4.2(@modern-js/codesmith@2.4.2) - '@modern-js/codesmith-api-npm': 2.4.2 - '@modern-js/codesmith-formily': 2.4.2(@modern-js/codesmith@2.4.2)(typescript@5.3.3) + '@modern-js/codesmith': 2.5.0 + '@modern-js/codesmith-api-ejs': 2.5.0(@modern-js/codesmith@2.5.0) + '@modern-js/codesmith-api-fs': 2.5.0(@modern-js/codesmith@2.5.0) + '@modern-js/codesmith-api-git': 2.5.0(@modern-js/codesmith@2.5.0) + '@modern-js/codesmith-api-handlebars': 2.5.0(@modern-js/codesmith@2.5.0) + '@modern-js/codesmith-api-npm': 2.5.0 + '@modern-js/codesmith-formily': 2.5.0(@modern-js/codesmith@2.5.0)(typescript@5.3.3) '@modern-js/plugin-i18n': 2.58.0 '@modern-js/utils': 2.58.1 '@swc/helpers': 0.5.1 @@ -13287,88 +13287,88 @@ packages: extra: 0.2.1 inquirer: 8.1.3 transitivePeerDependencies: - - debug + - supports-color - typescript - /@modern-js/codesmith-api-ejs@2.4.2(@modern-js/codesmith@2.4.2): - resolution: {integrity: sha512-9S/+EdwVS52xs3FqcjSrO5nuiCUo4D+gy278f3zag8MF0syXfAT1AsYvOwQqsKMssI3PcanpKgwVLhZv6M3XWw==} + /@modern-js/codesmith-api-ejs@2.5.0(@modern-js/codesmith@2.5.0): + resolution: {integrity: sha512-eZ8V6569xmQcwJhnW0PToYDNJvB7ylLF4vvUmTUaFfD9fnESzk6ynxk/bNiMqA+L/J7XqySvJ73u1HQYRRL/CQ==} peerDependencies: - '@modern-js/codesmith': ^2.4.2 + '@modern-js/codesmith': ^2.5.0 dependencies: - '@modern-js/codesmith': 2.4.2 + '@modern-js/codesmith': 2.5.0 '@swc/helpers': 0.5.1 ejs: 3.1.9 - /@modern-js/codesmith-api-fs@2.4.2(@modern-js/codesmith@2.4.2): - resolution: {integrity: sha512-GSa6NMjoVODR8kAhNzJXLrglsbRcZg6ybfn3skwD7bIRodEuWPcaLwYsoeidk9mVqfUUnu6n4r5Kg1s+rUDeAg==} + /@modern-js/codesmith-api-fs@2.5.0(@modern-js/codesmith@2.5.0): + resolution: {integrity: sha512-Ou4iScouCCfOdbEd42KQW6bO2I0WYlgjm3Q14ZH/QD+JyGMou8YBEMf06qH3A9Snh1shxoQIcG7MsLcSszHGTA==} peerDependencies: - '@modern-js/codesmith': ^2.4.2 + '@modern-js/codesmith': ^2.5.0 dependencies: - '@modern-js/codesmith': 2.4.2 + '@modern-js/codesmith': 2.5.0 '@modern-js/utils': 2.58.1 '@swc/helpers': 0.5.1 - /@modern-js/codesmith-api-git@2.4.2(@modern-js/codesmith@2.4.2): - resolution: {integrity: sha512-0SepBePZzsRuR9r5Sst802+uWuiHBSZfPBZxNqPomt0nSMX3mtR6awcE+rRjPV28svVWqeE17ufahpsVH1sxHA==} + /@modern-js/codesmith-api-git@2.5.0(@modern-js/codesmith@2.5.0): + resolution: {integrity: sha512-/jKzpHkJhxseFG3AGgf0uKZ2ApJriocAiXO732AOecqqmElVAADbmdDP2sbHtMdRCHOyE0TMnD4VPVKCdqy0Qw==} peerDependencies: - '@modern-js/codesmith': ^2.4.2 + '@modern-js/codesmith': ^2.5.0 dependencies: - '@modern-js/codesmith': 2.4.2 + '@modern-js/codesmith': 2.5.0 '@modern-js/utils': 2.58.1 '@swc/helpers': 0.5.1 - /@modern-js/codesmith-api-handlebars@2.4.2(@modern-js/codesmith@2.4.2): - resolution: {integrity: sha512-95/vTBTd/5u/3aCb+dWWaf5TkAI4vXkTEAgkhRfEOCUNfuQZqHb8iUyr1PyIU+Y0KEx9LAEYAlbbmB9IJ4k/fw==} + /@modern-js/codesmith-api-handlebars@2.5.0(@modern-js/codesmith@2.5.0): + resolution: {integrity: sha512-Rpm5zdFAmjPV1MdjoSY3i4wdZ5DfyWLYGkyT5VyHMqLWwsXA+e2XZvm4q/FglPnvZqPdcv+AM5qTDTdG9vFzBQ==} peerDependencies: - '@modern-js/codesmith': ^2.4.2 + '@modern-js/codesmith': ^2.5.0 dependencies: - '@modern-js/codesmith': 2.4.2 + '@modern-js/codesmith': 2.5.0 '@swc/helpers': 0.5.1 handlebars: 4.7.7 - /@modern-js/codesmith-api-json@2.4.2: - resolution: {integrity: sha512-aY/cRL+88gZfpMZDRn13zUSqfyo7mr/bGt1moDMyo+BNZwhH7YY93P/XGejmhwx8D1Npub4QMA1PrVgHNyOshQ==} + /@modern-js/codesmith-api-json@2.5.0: + resolution: {integrity: sha512-K5658wTvRKjeDetD1FUYVk4zehc0F5kwjvEOeVCoe7kQvr7lG8H1Or1gp+RofzlvuT+Nf8ubNU5bI1lnwn1ayQ==} dependencies: - '@modern-js/codesmith': 2.4.2 + '@modern-js/codesmith': 2.5.0 '@swc/helpers': 0.5.1 comment-json: 4.2.3 declaration-update: 0.0.2 transitivePeerDependencies: - - debug - supports-color - /@modern-js/codesmith-api-npm@2.4.2: - resolution: {integrity: sha512-NDra1CAdp8myNdThvE4Ev+hw5D95kLoj6O8R1/1W6GcAzSTQ53Ok3ro3Tn/oA012ZGMJvyyy8jxVY4vtXM21HQ==} + /@modern-js/codesmith-api-npm@2.5.0: + resolution: {integrity: sha512-0c4RnEs2wVyys28AKxsUHOmpB0eepaHte2whosimftNgq/hslxn7sjvTK115uMWt0phFrbpwCDxyzHeGs0ozUQ==} dependencies: - '@modern-js/codesmith': 2.4.2 + '@modern-js/codesmith': 2.5.0 '@modern-js/utils': 2.58.1 '@swc/helpers': 0.5.1 transitivePeerDependencies: - - debug + - supports-color - /@modern-js/codesmith-formily@2.4.2(@modern-js/codesmith@2.4.2)(typescript@5.3.3): - resolution: {integrity: sha512-WvlfjJ4l8bJwBcKVDlM1/9oTSSM5InnSvGXwA7NvjtgoJTr0OlD//IHEwqrlfL3gSOeB2lK0dD+u4U8MglBGOw==} + /@modern-js/codesmith-formily@2.5.0(@modern-js/codesmith@2.5.0)(typescript@5.3.3): + resolution: {integrity: sha512-dRulXYeQr2lWinhp+yOf5aPxFOBNkTFz7i2YGpRjx/vZwmBh+RE5oshDTzZekI9AGMAgenStvL7th49ZHfXTlw==} peerDependencies: - '@modern-js/codesmith': ^2.4.2 + '@modern-js/codesmith': ^2.5.0 dependencies: '@formily/json-schema': 2.2.24(typescript@5.3.3) '@formily/validator': 2.2.24 - '@modern-js/codesmith': 2.4.2 + '@modern-js/codesmith': 2.5.0 '@modern-js/utils': 2.58.1 '@swc/helpers': 0.5.1 inquirer: 8.2.5 transitivePeerDependencies: - typescript - /@modern-js/codesmith@2.4.2: - resolution: {integrity: sha512-yndbb/tRF9wz1l21ohrbcg9dabqIE7xcyYznLvsunJ5Rp/60bhYlNLVzjAq0Oc7fiiucSZQqXWIWATWAQWfPOQ==} + /@modern-js/codesmith@2.5.0: + resolution: {integrity: sha512-jqo8UYKzExU2RldbNau4nBZ5GZFAM2eMxHJNwrjmmTPmz5TT00cknkNsiRd8Q5P0kv3I6ldnbXgiI48DkKgx9Q==} dependencies: '@modern-js/utils': 2.58.1 '@swc/helpers': 0.5.1 - axios: 1.7.4 + axios: 1.7.4(debug@4.3.7) + debug: 4.3.7 tar: 6.2.0 transitivePeerDependencies: - - debug + - supports-color /@modern-js/doc-plugin-auto-sidebar@2.58.1(react@18.2.0): resolution: {integrity: sha512-dw0HFaGKnXqZ2nztyvZF0KP21Sj6DLgnzcf9pUEJlKXnZjWfcL/ecOkJu0nh/tOzu6AV2EllqLHiehceBVmYxA==} @@ -16128,7 +16128,7 @@ packages: '@rsdoctor/sdk': 0.2.4(@rspack/core@0.5.1)(esbuild@0.17.19) '@rsdoctor/types': 0.2.4(@rspack/core@0.5.1)(esbuild@0.17.19) '@rsdoctor/utils': 0.2.4(@rspack/core@0.5.1)(esbuild@0.17.19) - axios: 1.7.4 + axios: 1.7.4(debug@4.3.7) bytes: 3.1.2 enhanced-resolve: 5.12.0 fs-extra: 11.2.0 @@ -19761,16 +19761,16 @@ packages: /axios@0.27.2: resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==} dependencies: - follow-redirects: 1.15.6 + follow-redirects: 1.15.6(debug@4.3.7) form-data: 4.0.0 transitivePeerDependencies: - debug dev: true - /axios@1.7.4: + /axios@1.7.4(debug@4.3.7): resolution: {integrity: sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==} dependencies: - follow-redirects: 1.15.6 + follow-redirects: 1.15.6(debug@4.3.7) form-data: 4.0.0 proxy-from-env: 1.1.0 transitivePeerDependencies: @@ -21815,6 +21815,17 @@ packages: ms: 2.1.2 supports-color: 9.3.1 + /debug@4.3.7: + resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==} + engines: {node: '>=6.0'} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + dependencies: + ms: 2.1.3 + /decamelize-keys@1.1.0: resolution: {integrity: sha512-ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg==} engines: {node: '>=0.10.0'} @@ -23545,7 +23556,7 @@ packages: tslib: 2.6.2 dev: false - /follow-redirects@1.15.6: + /follow-redirects@1.15.6(debug@4.3.7): resolution: {integrity: sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==} engines: {node: '>=4.0'} peerDependencies: @@ -23553,6 +23564,8 @@ packages: peerDependenciesMeta: debug: optional: true + dependencies: + debug: 4.3.7 /for-each@0.3.3: resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==} @@ -24647,7 +24660,7 @@ packages: engines: {node: '>=8.0.0'} dependencies: eventemitter3: 4.0.7 - follow-redirects: 1.15.6 + follow-redirects: 1.15.6(debug@4.3.7) requires-port: 1.0.0 transitivePeerDependencies: - debug @@ -27998,7 +28011,7 @@ packages: '@yarnpkg/lockfile': 1.1.0 '@yarnpkg/parsers': 3.0.0-rc.46 '@zkochan/js-yaml': 0.0.6 - axios: 1.7.4 + axios: 1.7.4(debug@4.3.7) chalk: 4.1.2 cli-cursor: 3.1.0 cli-spinners: 2.6.1