@modern-js/upgrade-generator 3.0.0-beta.1 → 3.0.0-beta.2

package/dist/index.js

@@ -44801,8 +44801,10 @@ check path: ${_utils.chalk.blue.underline(generator)} exist a package.json file
       };
     }
     async runGenerator(generator, config = {}) {
-      const spinner = (0, _utils.ora)("Loading...").start();
-      spinner.color = "yellow";
+      const spinner = (0, _utils.ora)({
+        text: "Load Generator...",
+        spinner: "runner"
+      }).start();
       const {
         materialKey,
         generatorPkg,
@@ -44821,8 +44823,10 @@ check path: ${_utils.chalk.blue.underline(generator)} exist a package.json file
       this.setCurrent(null);
     }
     async runSubGenerator(subGenerator, relativePwdPath = "", config) {
-      const spinner = (0, _utils.ora)("Loading...").start();
-      spinner.color = "yellow";
+      const spinner = (0, _utils.ora)({
+        text: "Load Generator...",
+        spinner: "runner"
+      }).start();
       const {
         materialKey,
         generatorPkg,
@@ -107880,9 +107884,6 @@ var require_inquirer2 = __commonJSMin((exports, module2) => {
     inquirer2.prompt.restoreDefaultPrompts();
   };
 });
-var require_lodash3 = __commonJSMin((exports, module2) => {
-  module2.exports = require_lodash();
-});
 function getObjKeyMap(obj) {
   var prefix = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "";
   var result = {};
@@ -107897,7 +107898,7 @@ function getObjKeyMap(obj) {
 }
 var import_lodash3;
 var init_utils = __esmMin(() => {
-  import_lodash3 = __toESM2(require_lodash3());
+  import_lodash3 = __toESM2(require_lodash2());
 });
 var treeshaking_exports2 = {};
 __export2(treeshaking_exports2, {
@@ -107908,7 +107909,7 @@ var init_treeshaking2 = __esmMin(() => {
   init_classCallCheck();
   init_createClass();
   init_defineProperty();
-  import_lodash4 = __toESM2(require_lodash3());
+  import_lodash4 = __toESM2(require_lodash2());
   init_utils();
   I18n = /* @__PURE__ */ function() {
     function I18n3() {
@@ -126815,7 +126816,7 @@ var require_dotenv2 = __commonJSMin((exports, module2) => {
     module2.exports = n;
   })();
 });
-var require_lodash4 = __commonJSMin((exports, module2) => {
+var require_lodash3 = __commonJSMin((exports, module2) => {
   module2.exports = require_lodash();
 });
 var require_fast_glob2 = __commonJSMin((exports, module2) => {
@@ -138108,7 +138109,7 @@ var require_compiled2 = __commonJSMin((exports) => {
   Object.defineProperty(exports, "dotenv", { enumerable: true, get: function() {
     return __importDefault(dotenv_1).default;
   } });
-  var lodash_1 = require_lodash4();
+  var lodash_1 = require_lodash3();
   Object.defineProperty(exports, "lodash", { enumerable: true, get: function() {
     return __importDefault(lodash_1).default;
   } });
@@ -138662,7 +138663,7 @@ var require_is2 = __commonJSMin((exports) => {
 var require_compatRequire2 = __commonJSMin((exports) => {
   "use strict";
   Object.defineProperty(exports, "__esModule", { value: true });
-  exports.cleanRequireCache = exports.requireExistModule = exports.compatRequire = void 0;
+  exports.cleanRequireCache = exports.requireExistModule = exports.dynamicImport = exports.compatRequire = void 0;
   var findExists_1 = require_findExists2();
   var compatRequire = (filePath, interop = true) => {
     const mod = __require(filePath);
@@ -138670,6 +138671,7 @@ var require_compatRequire2 = __commonJSMin((exports) => {
     return rtnESMDefault ? mod.default : mod;
   };
   exports.compatRequire = compatRequire;
+  exports.dynamicImport = new Function("modulePath", "return import(modulePath)");
   var requireExistModule = (filename, opt) => {
     const final = {
       extensions: [".ts", ".js"],
@@ -138716,6 +138718,7 @@ var require_constants6 = __commonJSMin((exports) => {
     "@modern-js/monorepo-tools": "@modern-js/monorepo-tools/cli",
     "@modern-js/module-tools": "@modern-js/module-tools/cli",
     "@modern-js/module-tools-v2": "@modern-js/module-tools-v2",
+    "@modern-js/doc-tools": "@modern-js/doc-tools",
     "@modern-js/runtime": "@modern-js/runtime/cli",
     "@modern-js/plugin-proxy": "@modern-js/plugin-proxy/cli",
     "@modern-js/plugin-ssg": "@modern-js/plugin-ssg/cli",
@@ -139287,7 +139290,7 @@ var require_pathSerializer = __commonJSMin((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.createDefaultPathMatchers = exports.applyMatcherReplacement = exports.applyPathMatcher = exports.matchUpwardPathsAsUnknown = void 0;
   var os_1 = __importDefault(__require("os"));
-  var lodash_1 = __importDefault(require_lodash4());
+  var lodash_1 = __importDefault(require_lodash3());
   var path_1 = require_path2();
   var matchUpwardPathsAsUnknown = (p) => (0, lodash_1.default)((0, path_1.upwardPaths)((0, path_1.normalizeToPosixPath)(p))).map((match) => ({ match, mark: "unknown" })).slice(1, -1).value();
   exports.matchUpwardPathsAsUnknown = matchUpwardPathsAsUnknown;
@@ -140052,7 +140055,7 @@ function getObjKeyMap2(obj) {
 }
 var import_lodash5;
 var init_utils2 = __esmMin(() => {
-  import_lodash5 = __toESM2(require_lodash4());
+  import_lodash5 = __toESM2(require_lodash3());
 });
 var treeshaking_exports3 = {};
 __export2(treeshaking_exports3, {
@@ -140063,7 +140066,7 @@ var init_treeshaking3 = __esmMin(() => {
   init_classCallCheck();
   init_createClass();
   init_defineProperty();
-  import_lodash6 = __toESM2(require_lodash4());
+  import_lodash6 = __toESM2(require_lodash3());
   init_utils2();
   I18n2 = /* @__PURE__ */ function() {
     function I18n3() {
@@ -140182,7 +140185,7 @@ var init_zh = __esmMin(() => {
       element: {
         self: "\u521B\u5EFA\u5DE5\u7A0B\u5143\u7D20",
         entry: "\u65B0\u5EFA\u300C\u5E94\u7528\u5165\u53E3\u300D",
-        server: "\u65B0\u5EFA\u300CServer \u81EA\u5B9A\u4E49\u300D\u6E90\u7801\u76EE\u5F55"
+        server: "\u65B0\u5EFA\u300C\u81EA\u5B9A\u4E49 Web Server\u300D\u6E90\u7801\u76EE\u5F55"
       },
       refactor: {
         self: "\u81EA\u52A8\u91CD\u6784",
@@ -140273,7 +140276,7 @@ var init_en = __esmMin(() => {
       element: {
         self: "Create project element",
         entry: 'New "entry"',
-        server: 'New "Server Custom" source code directory'
+        server: 'New "Custom Web Server" source code directory'
       },
       refactor: {
         self: "Automatic refactor",
@@ -141540,8 +141543,10 @@ var require_node8 = __commonJSMin((exports) => {
     return obj && obj.__esModule ? obj : { default: obj };
   }
   async function getPackageVersion(packageName, registry2) {
-    const spinner = (0, _utils.ora)("Loading...").start();
-    spinner.color = "yellow";
+    const spinner = (0, _utils.ora)({
+      text: "Load Generator...",
+      spinner: "runner"
+    }).start();
     if (await (0, _utils.canUsePnpm)()) {
       const args = ["info", packageName, "version"];
       if (registry2) {
@@ -141586,7 +141591,7 @@ var require_node8 = __commonJSMin((exports) => {
       distTag
     } = options3;
     const getLatetPluginVersion = async (tag) => {
-      const version5 = await getPackageVersion(`${packageName}@${tag || distTag}`, registry2);
+      const version5 = await getPackageVersion(`${packageName}@${tag || distTag || "latest"}`, registry2);
       return version5;
     };
     if (!packageName.startsWith("@modern-js") || packageName.includes("electron") || packageName.includes("codesmith") || packageName.includes("easy-form") || packageName.startsWith("@modern-js-reduck")) {
@@ -141601,9 +141606,6 @@ var require_node8 = __commonJSMin((exports) => {
       if (typeof modernVersion !== "string") {
         return getLatetPluginVersion();
       }
-      if (_utils.semver.lt(modernVersion, "1.15.0")) {
-        return getLatetPluginVersion();
-      }
       return (0, _package.getAvailableVersion)(packageName, modernVersion, registry2);
     }
     return getLatetPluginVersion();
@@ -141758,8 +141760,10 @@ var handleTemplateFile = async (context, generator, appApi) => {
   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 = {};
-  const spinner = (0, import_generator_utils.ora)("Loading...").start();
-  spinner.color = "yellow";
+  const spinner = (0, import_generator_utils.ora)({
+    text: "Load Generator...",
+    spinner: "runner"
+  }).start();
   await Promise.all(modernDeps.map(async (dep) => updateInfo[`dependencies.${dep}`] = await (0, import_generator_utils.getAvailableVersion)(dep, modernVersion)));
   await Promise.all(modernDevDeps.map(async (dep) => updateInfo[`devDependencies.${dep}`] = await (0, import_generator_utils.getAvailableVersion)(dep, modernVersion)));
   await jsonAPI.update(context.materials.default.get(import_path.default.join(appDir, "package.json")), {
@@ -141770,28 +141774,31 @@ var handleTemplateFile = async (context, generator, appApi) => {
   });
   spinner.stop();
   const huskyVersion = deps.husky;
-  if (huskyVersion && import_generator_utils.semver.lt(huskyVersion, "8.0.0")) {
-    generator.logger.info(`${i18n2.t(localeKeys2.updateHusky)}`);
-    await jsonAPI.update(context.materials.default.get(import_path.default.join(appDir, "package.json")), {
-      query: {},
-      update: {
-        $set: {
-          "devDependencies.husky": "^8.0.0"
+  try {
+    if (huskyVersion && import_generator_utils.semver.lt(huskyVersion, "8.0.0")) {
+      generator.logger.info(`${i18n2.t(localeKeys2.updateHusky)}`);
+      await jsonAPI.update(context.materials.default.get(import_path.default.join(appDir, "package.json")), {
+        query: {},
+        update: {
+          $set: {
+            "devDependencies.husky": "^8.0.0"
+          }
         }
-      }
-    });
-    const pkgPath = context.materials.default.get(import_path.default.join(appDir, "package.json")).filePath;
-    const pkgInfo2 = import_generator_utils.fs.readJSONSync(pkgPath, "utf-8");
-    const { prepare } = pkgInfo2.scripts;
-    if (!prepare) {
-      pkgInfo2.scripts.prepare = "husky install";
-    } else if (!prepare.includes("husky install")) {
-      pkgInfo2.scripts.prepare = `${prepare} && husky install`;
-    }
-    pkgInfo2.husky = void 0;
-    import_generator_utils.fs.writeJSONSync(pkgPath, pkgInfo2, { spaces: 2 });
-    await appApi.forgeTemplate("templates/**/*");
-    import_generator_utils.fs.chmodSync(import_path.default.join(generator.outputPath, ".husky", "pre-commit"), "755");
+      });
+      const pkgPath = context.materials.default.get(import_path.default.join(appDir, "package.json")).filePath;
+      const pkgInfo2 = import_generator_utils.fs.readJSONSync(pkgPath, "utf-8");
+      const { prepare } = pkgInfo2.scripts;
+      if (!prepare) {
+        pkgInfo2.scripts.prepare = "husky install";
+      } else if (!prepare.includes("husky install")) {
+        pkgInfo2.scripts.prepare = `${prepare} && husky install`;
+      }
+      pkgInfo2.husky = void 0;
+      import_generator_utils.fs.writeJSONSync(pkgPath, pkgInfo2, { spaces: 2 });
+      await appApi.forgeTemplate("templates/**/*");
+      import_generator_utils.fs.chmodSync(import_path.default.join(generator.outputPath, ".husky", "pre-commit"), "755");
+    }
+  } catch (e) {
   }
   await appApi.runInstall();
   appApi.showSuccessInfo(i18n2.t(localeKeys2.success));

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.0.0-beta.1",
+  "version": "3.0.0-beta.2",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/index.js",
   "files": [
@@ -20,18 +20,18 @@
   ],
   "devDependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/codesmith": "2.0.0",
-    "@modern-js/codesmith-api-app": "2.0.0",
-    "@modern-js/codesmith-api-json": "2.0.0",
+    "@modern-js/codesmith": "2.0.1",
+    "@modern-js/codesmith-api-app": "2.0.1",
+    "@modern-js/codesmith-api-json": "2.0.1",
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",
     "typescript": "^4",
-    "@modern-js/generator-common": "3.0.0-beta.1",
-    "@modern-js/generator-utils": "3.0.0-beta.1",
-    "@modern-js/plugin-i18n": "2.0.0-beta.1",
-    "@scripts/build": "2.0.0-beta.1",
-    "@scripts/jest-config": "2.0.0-beta.1"
+    "@modern-js/generator-common": "3.0.0-beta.2",
+    "@modern-js/generator-utils": "3.0.0-beta.2",
+    "@modern-js/plugin-i18n": "2.0.0-beta.2",
+    "@scripts/build": "2.0.0-beta.2",
+    "@scripts/jest-config": "2.0.0-beta.2"
   },
   "sideEffects": false,
   "publishConfig": {
@@ -40,8 +40,8 @@
   },
   "types": "./src/index.ts",
   "scripts": {
-    "new": "modern new",
-    "build": "modern build",
+    "new": "modern-lib new",
+    "build": "modern-lib build",
     "test": "jest --passWithNoTests"
   }
 }