@modern-js/upgrade-generator 2.4.16 → 2.4.18

package/dist/index.js

@@ -52415,7 +52415,6 @@ var require_downloadPackage = __commonJSMin((exports) => {
     if (response.status !== 200) {
       throw new Error(`download tar package get bad status code: ${response.status}`);
     }
-    const contentLength = Number(response.headers["content-length"]);
     const randomId = Math.floor(Math.random() * 1e4);
     const tempTgzFilePath = `${_os.default.tmpdir()}/temp-${randomId}.tgz`;
     const dest = _utils.fs.createWriteStream(tempTgzFilePath);
@@ -52428,9 +52427,6 @@ var require_downloadPackage = __commonJSMin((exports) => {
         resolve();
       });
     });
-    if ((await _utils.fs.stat(tempTgzFilePath)).size !== contentLength) {
-      throw new Error("download tar package get bad content length");
-    }
     await new Promise((resolve, reject) => {
       _utils.fs.createReadStream(tempTgzFilePath).pipe(_tar.default.x({
         strip: 1,

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.4.16",
+  "version": "2.4.18",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/index.js",
   "files": [
@@ -20,18 +20,18 @@
   ],
   "devDependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/codesmith": "1.6.3",
-    "@modern-js/codesmith-api-app": "1.6.3",
-    "@modern-js/codesmith-api-json": "1.6.3",
+    "@modern-js/codesmith": "1.6.4",
+    "@modern-js/codesmith-api-app": "1.6.4",
+    "@modern-js/codesmith-api-json": "1.6.4",
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",
     "typescript": "^4",
-    "@modern-js/generator-common": "2.4.16",
-    "@modern-js/generator-utils": "2.4.16",
-    "@modern-js/plugin-i18n": "1.22.5",
-    "@scripts/build": "1.22.5",
-    "@scripts/jest-config": "1.22.5"
+    "@modern-js/generator-common": "2.4.18",
+    "@modern-js/generator-utils": "2.4.18",
+    "@modern-js/plugin-i18n": "1.22.7",
+    "@scripts/build": "1.22.7",
+    "@scripts/jest-config": "1.22.7"
   },
   "sideEffects": false,
   "publishConfig": {

package/src/index.ts

@@ -0,0 +1,195 @@
+import path from 'path';
+import { GeneratorContext, GeneratorCore } from '@modern-js/codesmith';
+import { AppAPI } from '@modern-js/codesmith-api-app';
+import { JsonAPI } from '@modern-js/codesmith-api-json';
+import {
+  ora,
+  getAvailableVersion,
+  getModernVersion,
+  getPackageManager,
+  getPackageObj,
+  semver,
+  fs,
+} from '@modern-js/generator-utils';
+import {
+  PackageManager,
+  Solution,
+  SolutionText,
+  SolutionToolsMap,
+} from '@modern-js/generator-common';
+import { i18n, localeKeys } from './locale';
+
+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'))
+      .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('Loading...').start();
+  spinner.color = 'yellow';
+
+  await Promise.all(
+    modernDeps.map(
+      async dep =>
+        (updateInfo[`dependencies.${dep}`] = await getAvailableVersion(
+          dep,
+          modernVersion,
+        )),
+    ),
+  );
+
+  await Promise.all(
+    modernDevDeps.map(
+      async dep =>
+        (updateInfo[`devDependencies.${dep}`] = await getAvailableVersion(
+          dep,
+          modernVersion,
+        )),
+    ),
+  );
+  await jsonAPI.update(
+    context.materials.default.get(path.join(appDir, 'package.json')),
+    {
+      query: {},
+      update: {
+        $set: updateInfo,
+      },
+    },
+  );
+
+  spinner.stop();
+
+  // update husky
+  const huskyVersion = deps.husky;
+  try {
+    if (huskyVersion && semver.lt(huskyVersion, '8.0.0')) {
+      generator.logger.info(`${i18n.t(localeKeys.updateHusky)}`);
+      await jsonAPI.update(
+        context.materials.default.get(path.join(appDir, 'package.json')),
+        {
+          query: {},
+          update: {
+            $set: {
+              'devDependencies.husky': '^8.0.0',
+            },
+          },
+        },
+      );
+
+      const pkgPath = context.materials.default.get(
+        path.join(appDir, 'package.json'),
+      ).filePath;
+      const pkgInfo = fs.readJSONSync(pkgPath, 'utf-8');
+      const { prepare } = pkgInfo.scripts;
+      if (!prepare) {
+        pkgInfo.scripts.prepare = 'husky install';
+      } else if (!prepare.includes('husky install')) {
+        pkgInfo.scripts.prepare = `${prepare} && husky install`;
+      }
+      pkgInfo.husky = undefined;
+
+      fs.writeJSONSync(pkgPath, pkgInfo, { spaces: 2 });
+
+      await appApi.forgeTemplate('templates/**/*');
+      fs.chmodSync(
+        path.join(generator.outputPath, '.husky', 'pre-commit'),
+        '755',
+      );
+    }
+  } catch (e) {}
+
+  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 @modern-js/upgrade-generator`);
+  generator.logger.debug(`context=${JSON.stringify(context)}`);
+  generator.logger.debug(`context.data=${JSON.stringify(context.data)}`);
+
+  await handleTemplateFile(context, generator, appApi);
+
+  generator.logger.debug(`forge @modern-js/upgrade-generator succeed `);
+};