feat: optimize generator download

.changeset/config.json

@@ -2,7 +2,7 @@
   "$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
   "changelog": "@changesets/cli/changelog",
   "commit": false,
-  "fixed": [["@modern-js/easy-form-*"], ["!(@modern-js/easy-form-*)"]],
+  "fixed": [["@modern-js/*"]],
   "access": "restricted",
   "baseBranch": "main",
   "updateInternalDependencies": "patch",

.changeset/friendly-games-cheat.md

@@ -0,0 +1,9 @@
+---
+"@modern-js/codesmith-api-app": minor
+"@modern-js/codesmith": minor
+"@modern-js/codesmith-cli": minor
+---
+
+feat: optimize generator download
+
+feat: 优化生成器下载

packages/api/app/package.json

@@ -36,8 +36,8 @@
     "@modern-js/codesmith-api-handlebars": "workspace:*",
     "@modern-js/codesmith-api-npm": "workspace:*",
     "@modern-js/codesmith-formily": "workspace:*",
-    "@modern-js/plugin-i18n": "^2.58.0",
-    "@modern-js/utils": "^2.58.0",
+    "@modern-js/codesmith-utils": "workspace:*",
+    "@modern-js/plugin-i18n": "2.60.3",
     "comment-json": "^4.2.3",
     "extra": "^0.2.1",
     "inquirer": "8.1.3"
@@ -47,8 +47,8 @@
   },
   "devDependencies": {
     "@modern-js/codesmith": "workspace:*",
-    "@modern-js/module-tools": "^2.58.0",
-    "@modern-js/plugin-testing": "^2.58.0",
+    "@modern-js/module-tools": "2.60.3",
+    "@modern-js/plugin-testing": "2.60.3",
     "@types/inquirer": "^7.3.3",
     "@types/jest": "^26.0.24",
     "@types/node": "^14.18.42",

packages/api/app/src/index.ts

@@ -13,9 +13,10 @@ import {
   CLIReader as FormilyCLIReader,
   type Schema as FormilySchema,
 } from '@modern-js/codesmith-formily';
-/* eslint-disable max-lines */
-import { fs, execa, semver } from '@modern-js/utils';
-import { merge } from '@modern-js/utils/lodash';
+import { execa } from '@modern-js/codesmith-utils/execa';
+import { fs } from '@modern-js/codesmith-utils/fs-extra';
+import { merge } from '@modern-js/codesmith-utils/lodash';
+import { semver } from '@modern-js/codesmith-utils/semver';
 import { parse, stringify } from 'comment-json';
 import inquirer, { type Question } from 'inquirer';
 import { type I18n, i18n, localeKeys } from './locale';
@@ -84,6 +85,7 @@ export class AppAPI {
       ignoreScripts?: boolean;
     },
   ) {
+    this.generatorCore.logger?.timing?.('🕒 Run Install');
     const {
       config: { packageManager, noNeedInstall, noNeedCheckNvm },
     } = this.generatorContext;
@@ -125,13 +127,15 @@ export class AppAPI {
         })}`,
       );
     }
+    this.generatorCore.logger?.timing?.('🕒 Run Install', true);
   }
 
   // custom install func
   public async runGitAndInstall(
     commitMessage?: string,
     installFunc?: () => Promise<void>,
   ) {
+    this.generatorCore.logger?.timing?.('🕒 Run Git and Install');
     const {
       config: { isMonorepoSubProject = false, noNeedGit },
     } = this.generatorContext;
@@ -166,6 +170,7 @@ export class AppAPI {
       this.generatorCore.logger.debug('❗️ [Git Add and Commit Failed]:', e);
       this.generatorCore.logger.warn(`🟡 ${i18n.t(localeKeys.git.failed)}`);
     }
+    this.generatorCore.logger?.timing?.('🕒 Run Git and Install', true);
   }
 
   public async forgeTemplate(

packages/api/app/src/utils/checkUseNvm.ts

@@ -1,7 +1,9 @@
 import path from 'path';
 import { type ILogger, fsExists } from '@modern-js/codesmith';
 import { canUseNvm, execaWithStreamLog } from '@modern-js/codesmith-api-npm';
-import { fs, execa, semver } from '@modern-js/utils';
+import { execa } from '@modern-js/codesmith-utils/execa';
+import { fs } from '@modern-js/codesmith-utils/fs-extra';
+import { semver } from '@modern-js/codesmith-utils/semver';
 
 const NODE_MAJOR_VERSION_MAP: Record<string, number> = {
   'lts/*': 18,

packages/api/app/src/utils/transform.ts

@@ -1,4 +1,4 @@
-import { isString } from '@modern-js/utils/lodash';
+import { isString } from '@modern-js/codesmith-utils/lodash';
 import type { Question } from 'inquirer';
 
 export function transformInquirerSchema(

packages/api/ejs/package.json

@@ -37,8 +37,8 @@
   },
   "devDependencies": {
     "@modern-js/codesmith": "workspace:*",
-    "@modern-js/module-tools": "^2.58.0",
-    "@modern-js/plugin-testing": "^2.58.0",
+    "@modern-js/module-tools": "2.60.3",
+    "@modern-js/plugin-testing": "2.60.3",
     "@types/ejs": "^3.1.2",
     "@types/jest": "^26.0.24",
     "@types/node": "^14.18.42",

packages/api/fs/package.json

@@ -30,15 +30,15 @@
   },
   "dependencies": {
     "@swc/helpers": "0.5.1",
-    "@modern-js/utils": "^2.58.0"
+    "@modern-js/codesmith-utils": "workspace:*"
   },
   "peerDependencies": {
     "@modern-js/codesmith": "workspace:^2.5.2"
   },
   "devDependencies": {
     "@modern-js/codesmith": "workspace:*",
-    "@modern-js/module-tools": "^2.58.0",
-    "@modern-js/plugin-testing": "^2.58.0",
+    "@modern-js/module-tools": "2.60.3",
+    "@modern-js/plugin-testing": "2.60.3",
     "@types/jest": "^26.0.24",
     "@types/node": "^14.18.42",
     "typescript": "^4.9.5"

packages/api/fs/src/index.ts

@@ -5,7 +5,7 @@ import {
   type FsResource,
   type GeneratorCore,
 } from '@modern-js/codesmith';
-import { fs } from '@modern-js/utils';
+import { fs } from '@modern-js/codesmith-utils/fs-extra';
 
 type RenderDirOptions = {
   nodir?: boolean;

packages/api/git/package.json

@@ -30,15 +30,15 @@
   },
   "dependencies": {
     "@swc/helpers": "0.5.1",
-    "@modern-js/utils": "^2.58.0"
+    "@modern-js/codesmith-utils": "workspace:*"
   },
   "peerDependencies": {
     "@modern-js/codesmith": "workspace:^2.5.2"
   },
   "devDependencies": {
     "@modern-js/codesmith": "workspace:*",
-    "@modern-js/module-tools": "^2.58.0",
-    "@modern-js/plugin-testing": "^2.58.0",
+    "@modern-js/module-tools": "2.60.3",
+    "@modern-js/plugin-testing": "2.60.3",
     "@types/jest": "^26.0.24",
     "@types/node": "^14.18.42",
     "typescript": "^4.9.5"

packages/api/git/src/utils/index.ts

@@ -1,4 +1,4 @@
-import { execa } from '@modern-js/utils';
+import { execa } from '@modern-js/codesmith-utils/execa';
 
 export async function canUseGit() {
   try {

packages/api/git/tests/index.test.ts

@@ -7,7 +7,8 @@ import {
   initGitRepo,
   isInGitRepo,
 } from '@/utils';
-import { fs, execa } from '@modern-js/utils';
+import { execa } from '@modern-js/codesmith-utils/execa';
+import { fs } from '@modern-js/codesmith-utils/fs-extra';
 
 const cwd = path.join(os.tmpdir(), 'codesmith_test', Math.random().toString());
 

packages/api/handlebars/package.json

@@ -37,8 +37,8 @@
   },
   "devDependencies": {
     "@modern-js/codesmith": "workspace:*",
-    "@modern-js/module-tools": "^2.58.0",
-    "@modern-js/plugin-testing": "^2.58.0",
+    "@modern-js/module-tools": "2.60.3",
+    "@modern-js/plugin-testing": "2.60.3",
     "@types/jest": "^26.0.24",
     "@types/node": "^14.18.42",
     "typescript": "^4.9.5"

packages/api/json/package.json

@@ -35,8 +35,8 @@
     "declaration-update": "^0.0.2"
   },
   "devDependencies": {
-    "@modern-js/module-tools": "^2.58.0",
-    "@modern-js/plugin-testing": "^2.58.0",
+    "@modern-js/module-tools": "2.60.3",
+    "@modern-js/plugin-testing": "2.60.3",
     "@types/jest": "^26.0.24",
     "@types/node": "^14.18.42",
     "typescript": "^4.9.5"

packages/api/npm/package.json

@@ -30,12 +30,15 @@
   },
   "dependencies": {
     "@swc/helpers": "0.5.1",
-    "@modern-js/codesmith": "workspace:*",
-    "@modern-js/utils": "^2.58.0"
+    "@modern-js/codesmith-utils": "workspace:*"
+  },
+  "peerDependencies": {
+    "@modern-js/codesmith": "workspace:^2.5.1"
   },
   "devDependencies": {
-    "@modern-js/module-tools": "^2.58.0",
-    "@modern-js/plugin-testing": "^2.58.0",
+    "@modern-js/codesmith": "workspace:*",
+    "@modern-js/module-tools": "2.60.3",
+    "@modern-js/plugin-testing": "2.60.3",
     "@types/jest": "^26.0.24",
     "@types/node": "^14.18.42",
     "typescript": "^4.9.5"

packages/api/npm/src/index.ts

@@ -1,4 +1,5 @@
 import type { GeneratorCore } from '@modern-js/codesmith';
+import type { ExecaReturnValue } from '@modern-js/codesmith-utils/execa';
 import { npmInstall, pnpmInstall, yarnInstall } from './utils';
 
 export * from './utils';
@@ -18,7 +19,7 @@ export class NpmAPI {
     registryUrl?: string;
     ignoreScripts?: boolean;
     useNvm?: boolean;
-  }) {
+  }): Promise<ExecaReturnValue> {
     return npmInstall({
       cwd: cwd || this.generatorCore.outputPath,
       registryUrl,
@@ -35,7 +36,7 @@ export class NpmAPI {
     registryUrl?: string;
     ignoreScripts?: boolean;
     useNvm?: boolean;
-  }) {
+  }): Promise<ExecaReturnValue> {
     return yarnInstall({
       cwd: cwd || this.generatorCore.outputPath,
       registryUrl,
@@ -52,7 +53,7 @@ export class NpmAPI {
     registryUrl?: string;
     ignoreScripts?: boolean;
     useNvm?: boolean;
-  }) {
+  }): Promise<ExecaReturnValue> {
     return pnpmInstall({
       cwd: cwd || this.generatorCore.outputPath,
       registryUrl,

packages/api/npm/src/utils/index.ts

@@ -1,4 +1,9 @@
-export { canUseNvm, canUseNpm, canUseYarn, canUsePnpm } from './env';
+export {
+  canUseNvm,
+  canUseNpm,
+  canUseYarn,
+  canUsePnpm,
+} from '@modern-js/codesmith-utils/npm';
 export {
   npmInstall,
   yarnInstall,

packages/api/npm/src/utils/install.ts

@@ -1,5 +1,9 @@
-import { execa } from '@modern-js/utils';
-import { canUseNpm, canUsePnpm, canUseYarn } from './env';
+import { type ExecaReturnValue, execa } from '@modern-js/codesmith-utils/execa';
+import {
+  canUseNpm,
+  canUsePnpm,
+  canUseYarn,
+} from '@modern-js/codesmith-utils/npm';
 
 export function execaWithStreamLog(
   command: string,
@@ -18,8 +22,8 @@ export function execaWithStreamLog(
 export async function runInstallWithNvm(
   command: string,
   options: Record<string, any>,
-) {
-  await execa(`~/.nvm/nvm-exec ${command}`, {
+): Promise<ExecaReturnValue> {
+  return await execa(`~/.nvm/nvm-exec ${command}`, {
     ...options,
     shell: true,
     stdin: 'inherit',
@@ -38,7 +42,7 @@ export async function npmInstall({
   registryUrl?: string;
   ignoreScripts?: boolean;
   useNvm?: boolean;
-}) {
+}): Promise<ExecaReturnValue> {
   const canUse = await canUseNpm();
   if (canUse) {
     const params = ['install'];
@@ -72,7 +76,7 @@ export async function yarnInstall({
   registryUrl?: string;
   ignoreScripts?: boolean;
   useNvm?: boolean;
-}) {
+}): Promise<ExecaReturnValue> {
   const canUse = await canUseYarn();
   if (canUse) {
     const params = ['install'];
@@ -103,7 +107,7 @@ export async function pnpmInstall({
   registryUrl?: string;
   ignoreScripts?: boolean;
   useNvm?: boolean;
-}) {
+}): Promise<ExecaReturnValue> {
   const canUse = await canUsePnpm();
   if (canUse) {
     const params = ['install'];

packages/api/npm/tests/utils.test.ts

@@ -1,13 +1,17 @@
 import os from 'os';
 import path from 'path';
-import { canUseNpm, canUseNvm, canUseYarn } from '@/utils/env';
 import {
   execaWithStreamLog,
   npmInstall,
   pnpmInstall,
   yarnInstall,
 } from '@/utils/install';
-import { fs } from '@modern-js/utils';
+import { fs } from '@modern-js/codesmith-utils/fs-extra';
+import {
+  canUseNpm,
+  canUseNvm,
+  canUseYarn,
+} from '@modern-js/codesmith-utils/npm';
 
 describe('Env utils cases', () => {
   test('can use nvm', async () => {

packages/cli/modern.config.ts

@@ -3,6 +3,10 @@ import { defineConfig, moduleTools } from '@modern-js/module-tools';
 import { testingPlugin } from '@modern-js/plugin-testing';
 
 export default defineConfig({
-  buildPreset: 'modern-js-universal',
+  buildConfig: {
+    autoExternal: false,
+    dts: false,
+    sideEffects: false,
+  },
   plugins: [moduleTools(), testingPlugin()],
 });

packages/cli/package.json

@@ -13,7 +13,7 @@
   ],
   "version": "2.5.2",
   "jsnext:source": "./src/index.ts",
-  "main": "./dist/cjs/index.js",
+  "main": "./dist/index.js",
   "bin": {
     "codesmith": "./bin/run.js"
   },
@@ -33,14 +33,15 @@
     "test": "modern test --passWithNoTests"
   },
   "dependencies": {
+    "commander": "10.0.0",
     "@swc/helpers": "0.5.1",
     "@modern-js/codesmith": "workspace:*",
-    "@modern-js/plugin-i18n": "^2.58.0",
-    "@modern-js/utils": "^2.58.0"
+    "@modern-js/codesmith-utils": "workspace:*",
+    "@modern-js/plugin-i18n": "2.60.3"
   },
   "devDependencies": {
-    "@modern-js/module-tools": "^2.58.0",
-    "@modern-js/plugin-testing": "^2.58.0",
+    "@modern-js/module-tools": "2.60.3",
+    "@modern-js/plugin-testing": "2.60.3",
     "@types/jest": "^26.0.24",
     "@types/node": "^14.18.42",
     "ts-node": "^10.9.1",

packages/cli/src/actions/genAction.ts

@@ -18,6 +18,8 @@ export async function genAction(generator: string, genOptions: LocalOptions) {
     registryUrl: registry,
   });
 
+  await smith.prepareGlobal();
+
   smith.logger.debug('💡 [Runtime Gen Action]');
   smith.logger.debug('💡 [Generator Name]:', generator);
   smith.logger.debug('💡 [Generator Pwd]:', pwd);

packages/cli/src/index.ts

@@ -1,4 +1,4 @@
-import { Command } from '@modern-js/utils';
+import { Command } from 'commander';
 import { genAction } from './actions/genAction';
 
 export default function () {
@@ -14,7 +14,7 @@ export default function () {
     .option(
       '--registry <registry>',
       'set npm registry url to run npm command',
-      false,
+      undefined,
     )
     .action(genAction);