@modern-js/upgrade-generator 3.7.0 → 3.7.1

package/dist/index.js

@@ -601,7 +601,7 @@
                 throw Error(i18n2.t(localeKeys2.tooltip.more_solution));
             }
             generator.logger.info(`[${i18n2.t(localeKeys2.projectType)}]: ${SolutionText[solutions[0]]()}`);
-            const modernVersion = yield getModernVersion(solutions[0], context.config.registry, context.config.distTag);
+            const modernVersion = yield getModernVersion(solutions[0], context.config.registry, context.config.distTag || "latest");
             generator.logger.info(`[${i18n2.t(localeKeys2.modernVersion)}]: ${modernVersion}`);
             if (Object.keys(deps).filter((dep)=>dep.startsWith("@modern-js") || dep.startsWith("@modern-js-app")).filter((dep)=>!dep.includes("electron")).filter((dep)=>!dep.includes("codesmith") && !dep.includes("easy-form")).filter((dep)=>!dep.startsWith("@modern-js-reduck")).filter((dep)=>!dep.includes("eslint-config")).every((dep)=>deps[dep] === modernVersion)) {
                 generator.logger.info(`[${i18n2.t(localeKeys2.alreadyLatest)}]: ${modernVersion}`);

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.7.0",
+  "version": "3.7.1",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/index.js",
   "files": [
@@ -23,19 +23,19 @@
     "/dist/index.js"
   ],
   "devDependencies": {
-    "@modern-js/codesmith": "2.6.4",
-    "@modern-js/codesmith-utils": "2.6.4",
-    "@modern-js/codesmith-api-app": "2.6.4",
-    "@modern-js/codesmith-api-json": "2.6.4",
+    "@modern-js/codesmith": "2.6.5",
+    "@modern-js/codesmith-utils": "2.6.5",
+    "@modern-js/codesmith-api-app": "2.6.5",
+    "@modern-js/codesmith-api-json": "2.6.5",
     "@types/jest": "^29",
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "@modern-js/generator-utils": "3.7.0",
-    "@modern-js/generator-common": "3.7.0",
-    "@modern-js/plugin-i18n": "2.60.4",
-    "@scripts/jest-config": "2.60.4",
-    "@scripts/build": "2.60.4"
+    "@modern-js/generator-common": "3.7.1",
+    "@modern-js/generator-utils": "3.7.1",
+    "@modern-js/plugin-i18n": "2.60.5",
+    "@scripts/build": "2.60.5",
+    "@scripts/jest-config": "2.60.5"
   },
   "sideEffects": false,
   "publishConfig": {

package/src/index.ts

@@ -1,208 +0,0 @@
-import path from 'path';
-import type { GeneratorContext, GeneratorCore } from '@modern-js/codesmith';
-import { AppAPI } from '@modern-js/codesmith-api-app';
-import { JsonAPI } from '@modern-js/codesmith-api-json';
-import {
-  PackageManager,
-  type Solution,
-  SolutionText,
-  SolutionToolsMap,
-} from '@modern-js/generator-common';
-import {
-  fs,
-  getAvailableVersion,
-  getModernVersion,
-  getPackageManager,
-  getPackageObj,
-  getPackageVersion,
-  isPackageExist,
-  ora,
-  semver,
-} from '@modern-js/generator-utils';
-import { i18n, localeKeys } from './locale';
-
-// Special modern.js dependencies, the plugin version maybe not same with other modern.js plugin
-const SpecialModernDeps = [
-  '@modern-js/plugin-storybook',
-  '@modern-js/builder-rspack-provider', // need be removed after 2.46.1
-  '@modern-js/eslint-config',
-  '@modern-js-app/eslint-config',
-];
-
-const DeprecatedModernBuilderDeps = [
-  '@modern-js/builder-plugin-image-compress',
-  '@modern-js/builder-plugin-swc',
-  '@modern-js/builder-plugin-esbuild',
-  '@modern-js/builder-plugin-node-polyfill',
-  '@modern-js/builder-plugin-stylus',
-];
-
-const handleSpecialModernDeps = async (dep: string, modernVersion: string) => {
-  const version = await getAvailableVersion(dep, modernVersion);
-  if (!(await isPackageExist(`${dep}@${version}`))) {
-    return getPackageVersion(dep);
-  }
-  return version;
-};
-
-export const handleTemplateFile = async (
-  context: GeneratorContext,
-  generator: GeneratorCore,
-  appApi: AppAPI,
-) => {
-  const jsonAPI = new JsonAPI(generator);
-  // get project solution type
-  const pkgInfo = await getPackageObj(context);
-  const deps = {
-    ...pkgInfo.devDependencies,
-    ...pkgInfo.dependencies,
-  };
-  const solutions = Object.keys(SolutionToolsMap).filter(
-    solution => deps[SolutionToolsMap[solution as Solution]],
-  );
-  if (solutions.length === 0) {
-    throw Error(i18n.t(localeKeys.tooltip.no_solution));
-  }
-  if (solutions.length >= 2) {
-    throw Error(i18n.t(localeKeys.tooltip.more_solution));
-  }
-
-  generator.logger.info(
-    `[${i18n.t(localeKeys.projectType)}]: ${SolutionText[
-      solutions[0] as Solution
-    ]()}`,
-  );
-
-  // get modern latest version
-  const modernVersion = await getModernVersion(
-    solutions[0] as Solution,
-    context.config.registry,
-    context.config.distTag,
-  );
-
-  generator.logger.info(
-    `[${i18n.t(localeKeys.modernVersion)}]: ${modernVersion}`,
-  );
-
-  // adjust Modern.js packages' version is latest?
-  if (
-    Object.keys(deps)
-      .filter(
-        dep => dep.startsWith('@modern-js') || dep.startsWith('@modern-js-app'),
-      )
-      .filter(dep => !dep.includes('electron'))
-      .filter(dep => !dep.includes('codesmith') && !dep.includes('easy-form'))
-      .filter(dep => !dep.startsWith('@modern-js-reduck'))
-      .filter(dep => !dep.includes('eslint-config'))
-      .every(dep => deps[dep] === modernVersion)
-  ) {
-    generator.logger.info(
-      `[${i18n.t(localeKeys.alreadyLatest)}]: ${modernVersion}`,
-    );
-    return;
-  }
-
-  const appDir = context.materials.default.basePath;
-
-  const packageManager = await getPackageManager(appDir);
-  context.config.packageManager = packageManager;
-
-  if (packageManager === PackageManager.Pnpm) {
-    const npmrcPath = path.join(generator.outputPath, '.npmrc');
-    if (fs.existsSync(npmrcPath)) {
-      const content = fs.readFileSync(npmrcPath, 'utf-8');
-      if (!content.includes('strict-peer-dependencies=false')) {
-        fs.appendFileSync(npmrcPath, '\nstrict-peer-dependencies=false\n');
-      }
-    } else {
-      fs.ensureFileSync(npmrcPath);
-      fs.writeFileSync(npmrcPath, 'strict-peer-dependencies=false');
-    }
-  }
-
-  const modernDeps = Object.keys(pkgInfo.dependencies || {}).filter(
-    dep => dep.startsWith('@modern-js') || dep.startsWith('@modern-js-app'),
-  );
-  const modernDevDeps = Object.keys(pkgInfo.devDependencies || {}).filter(
-    dep => dep.startsWith('@modern-js') || dep.startsWith('@modern-js-app'),
-  );
-  const updateInfo: Record<string, string> = {};
-
-  const spinner = ora({
-    text: 'Load Generator...',
-    spinner: 'runner',
-  }).start();
-
-  await Promise.all(
-    modernDeps.map(async dep => {
-      if (SpecialModernDeps.includes(dep)) {
-        updateInfo[`dependencies.${dep}`] = await handleSpecialModernDeps(
-          dep,
-          modernVersion,
-        );
-      } else if (DeprecatedModernBuilderDeps.includes(dep)) {
-        generator.logger.warn(
-          `🟡 [Deprecated] ${dep} is no longer maintained, please use Rsbuild plugin instead`,
-        );
-      } else {
-        updateInfo[`dependencies.${dep}`] = await getAvailableVersion(
-          dep,
-          modernVersion,
-        );
-      }
-    }),
-  );
-
-  await Promise.all(
-    modernDevDeps.map(async dep => {
-      if (SpecialModernDeps.includes(dep)) {
-        updateInfo[`devDependencies.${dep}`] = await handleSpecialModernDeps(
-          dep,
-          modernVersion,
-        );
-      } else if (DeprecatedModernBuilderDeps.includes(dep)) {
-        generator.logger.warn(
-          `🟡 [Deprecated] ${dep} is no longer maintained, please use Rsbuild plugin instead`,
-        );
-      } else {
-        updateInfo[`devDependencies.${dep}`] = await getAvailableVersion(
-          dep,
-          modernVersion,
-        );
-      }
-    }),
-  );
-  await jsonAPI.update(
-    context.materials.default.get(path.join(appDir, 'package.json')),
-    {
-      query: {},
-      update: {
-        $set: updateInfo,
-      },
-    },
-    true,
-  );
-
-  spinner.stop();
-
-  await appApi.runInstall();
-
-  appApi.showSuccessInfo(i18n.t(localeKeys.success));
-};
-
-export default async (context: GeneratorContext, generator: GeneratorCore) => {
-  const appApi = new AppAPI(context, generator);
-
-  const { locale } = context.config;
-  appApi.i18n.changeLanguage({ locale });
-
-  generator.logger.debug(`🚀 [Start Run Upgrade Generator]`);
-  generator.logger.debug(
-    '💡 [Current Config]:',
-    JSON.stringify(context.config),
-  );
-
-  await handleTemplateFile(context, generator, appApi);
-
-  generator.logger.debug(`🌟 [End Run Upgrade Generator]`);
-};