@modern-js/upgrade-generator 3.0.4 → 3.0.5

package/dist/index.js

@@ -35750,7 +35750,7 @@ var require_nodeEnv = __commonJS({
       });
     }
     exports.canUseNpm = canUseNpm3;
-    function canUseYarn3() {
+    function canUseYarn2() {
       return __async(this, null, function* () {
         try {
           yield (0, compiled_1.execa)("yarn", ["--version"], { env: process.env });
@@ -35760,7 +35760,7 @@ var require_nodeEnv = __commonJS({
         }
       });
     }
-    exports.canUseYarn = canUseYarn3;
+    exports.canUseYarn = canUseYarn2;
     function canUsePnpm3() {
       return __async(this, null, function* () {
         try {
@@ -44398,7 +44398,7 @@ var require_env = __commonJS({
     exports.canUseNpm = canUseNpm3;
     exports.canUseNvm = canUseNvm;
     exports.canUsePnpm = canUsePnpm3;
-    exports.canUseYarn = canUseYarn3;
+    exports.canUseYarn = canUseYarn2;
     var _utils = require_dist();
     function canUseNvm() {
       return __async(this, null, function* () {
@@ -44425,7 +44425,7 @@ var require_env = __commonJS({
         }
       });
     }
-    function canUseYarn3() {
+    function canUseYarn2() {
       return __async(this, null, function* () {
         try {
           yield (0, _utils.execa)("yarn", ["--version"], {
@@ -45461,14 +45461,14 @@ var require_packageManager = __commonJS({
       value: true
     });
     exports.canUsePnpm = canUsePnpm3;
-    exports.canUseYarn = canUseYarn3;
+    exports.canUseYarn = canUseYarn2;
     exports.runInstall = runInstall;
     var _path = _interopRequireDefault(require("path"));
     var _utils = require_dist();
     function _interopRequireDefault(obj) {
       return obj && obj.__esModule ? obj : { default: obj };
     }
-    function canUseYarn3() {
+    function canUseYarn2() {
       return __async(this, null, function* () {
         try {
           yield (0, _utils.execa)("yarn", ["--version"], {
@@ -45515,7 +45515,7 @@ var require_packageManager = __commonJS({
             params.push(`--registry=${registryUrl}`);
           }
           yield (0, _utils.execa)("pnpm", params, options);
-        } else if (yield canUseYarn3()) {
+        } else if (yield canUseYarn2()) {
           const params = ["install", "--production", "--silent", "--ignore-scripts"];
           if (registryUrl) {
             params.push(`--registry=${registryUrl}`);
@@ -134808,6 +134808,26 @@ var require_compiled2 = __commonJS({
   }
 });
 
+// ../../../toolkit/utils/dist/commands.js
+var require_commands = __commonJS({
+  "../../../toolkit/utils/dist/commands.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.isDevCommand = exports.getCommand = void 0;
+    var getCommand = () => {
+      const args = process.argv.slice(2);
+      const command = args[0];
+      return command;
+    };
+    exports.getCommand = getCommand;
+    var isDevCommand = () => {
+      const command = (0, exports.getCommand)();
+      return command === "dev" || command === "start";
+    };
+    exports.isDevCommand = isDevCommand;
+  }
+});
+
 // ../../../toolkit/utils/dist/format.js
 var require_format2 = __commonJS({
   "../../../toolkit/utils/dist/format.js"(exports) {
@@ -135382,7 +135402,7 @@ var require_constants6 = __commonJS({
     exports.SERVER_DIR = "server";
     exports.SHARED_DIR = "shared";
     exports.CONFIG_CACHE_DIR = "./node_modules/.cache/node-bundle-require";
-    exports.CONFIG_FILE_EXTENSIONS = [".js", ".ts", ".ejs", ".mjs"];
+    exports.CONFIG_FILE_EXTENSIONS = [".js", ".ts", ".mjs"];
     exports.OUTPUT_CONFIG_FILE = "modern.config.json";
     exports.DEFAULT_SERVER_CONFIG = "modern.server-runtime.config";
     exports.ROUTE_MINIFEST_FILE = "routes-manifest.json";
@@ -135873,7 +135893,7 @@ var require_nodeEnv2 = __commonJS({
       });
     }
     exports.canUseNpm = canUseNpm3;
-    function canUseYarn3() {
+    function canUseYarn2() {
       return __async(this, null, function* () {
         try {
           yield (0, compiled_1.execa)("yarn", ["--version"], { env: process.env });
@@ -135883,7 +135903,7 @@ var require_nodeEnv2 = __commonJS({
         }
       });
     }
-    exports.canUseYarn = canUseYarn3;
+    exports.canUseYarn = canUseYarn2;
     function canUsePnpm3() {
       return __async(this, null, function* () {
         try {
@@ -136962,6 +136982,7 @@ var require_dist3 = __commonJS({
     };
     Object.defineProperty(exports, "__esModule", { value: true });
     __exportStar(require_compiled2(), exports);
+    __exportStar(require_commands(), exports);
     __exportStar(require_format2(), exports);
     __exportStar(require_FileSizeReporter2(), exports);
     __exportStar(require_printBuildError2(), exports);
@@ -137441,15 +137462,6 @@ function getPackageVersion(packageName, registry2) {
       spinner.stop();
       return stripAnsi2(result.stdout);
     }
-    if (yield (0, import_utils3.canUseYarn)()) {
-      const args = ["info", packageName, "version", "--silent"];
-      if (registry2) {
-        args.push(`--registry=${registry2}`);
-      }
-      const result = yield (0, import_utils3.execa)("yarn", args);
-      spinner.stop();
-      return stripAnsi2(result.stdout);
-    }
     if (yield (0, import_utils3.canUseNpm)()) {
       const args = ["view", packageName, "version"];
       if (registry2) {

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.0.4",
+  "version": "3.0.5",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/index.js",
   "files": [
@@ -27,11 +27,11 @@
     "@types/node": "^14",
     "jest": "^27",
     "typescript": "^4",
-    "@modern-js/plugin-i18n": "2.2.0",
-    "@modern-js/generator-utils": "3.0.4",
-    "@modern-js/generator-common": "3.0.4",
-    "@scripts/jest-config": "2.2.0",
-    "@scripts/build": "2.2.0"
+    "@modern-js/generator-common": "3.0.5",
+    "@modern-js/generator-utils": "3.0.5",
+    "@modern-js/plugin-i18n": "2.3.0",
+    "@scripts/jest-config": "2.3.0",
+    "@scripts/build": "2.3.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/src/index.ts

@@ -0,0 +1,214 @@
+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,
+  execa,
+  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');
+    }
+  }
+
+  if (
+    solutions[0] === Solution.Monorepo &&
+    packageManager === PackageManager.Pnpm
+  ) {
+    await execa(
+      'pnpm',
+      ['update', '@modern-js/*', '@modern-js-app/*', '--recursive', '--latest'],
+      {
+        stdin: 'inherit',
+        stdout: 'inherit',
+        stderr: 'inherit',
+      },
+    );
+    return;
+  }
+
+  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 =>
+        (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 `);
+};