feat: Optimize generator log information (#6240)

web-infra-dev · Sep 23, 2024 · 0b6d335 · 0b6d335
1 parent b52552f
commit 0b6d335
Show file tree

Hide file tree

Showing 50 changed files with 430 additions and 332 deletions.
diff --git a/.changeset/hot-dolphins-stare.md 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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]`);
 };
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,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]`);
 };
diff --git a/...es/generator/generators/generator-generator/templates/js-template/src/index.js.handlebars b/...es/generator/generators/generator-generator/templates/js-template/src/index.js.handlebars
@@ -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]`);
 };
diff --git a/...es/generator/generators/generator-generator/templates/ts-template/src/index.ts.handlebars b/...es/generator/generators/generator-generator/templates/ts-template/src/index.ts.handlebars
@@ -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]`);
 };
diff --git 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:*",