@modern-js/router-v5-generator 3.7.18 → 3.7.20

package/dist/index.js

@@ -1629,9 +1629,9 @@ var require_source = __commonJS({
   }
 });
 
-// ../../../../node_modules/.pnpm/universalify@2.0.0/node_modules/universalify/index.js
+// ../../../../node_modules/.pnpm/universalify@2.0.1/node_modules/universalify/index.js
 var require_universalify = __commonJS({
-  "../../../../node_modules/.pnpm/universalify@2.0.0/node_modules/universalify/index.js"(exports) {
+  "../../../../node_modules/.pnpm/universalify@2.0.1/node_modules/universalify/index.js"(exports) {
     "use strict";
     exports.fromCallback = function(fn) {
       return Object.defineProperty(function(...args) {
@@ -1639,11 +1639,8 @@ var require_universalify = __commonJS({
           fn.apply(this, args);
         else {
           return new Promise((resolve, reject) => {
-            fn.call(
-              this,
-              ...args,
-              (err, res) => err != null ? reject(err) : resolve(res)
-            );
+            args.push((err, res) => err != null ? reject(err) : resolve(res));
+            fn.apply(this, args);
           });
         }
       }, "name", { value: fn.name });
@@ -1653,8 +1650,10 @@ var require_universalify = __commonJS({
         const cb = args[args.length - 1];
         if (typeof cb !== "function")
           return fn.apply(this, args);
-        else
-          fn.apply(this, args.slice(0, -1)).then((r) => cb(null, r), cb);
+        else {
+          args.pop();
+          fn.apply(this, args).then((r) => cb(null, r), cb);
+        }
       }, "name", { value: fn.name });
     };
   }
@@ -3876,6 +3875,37 @@ var require_ensure = __commonJS({
   }
 });
 
+// ../../../../node_modules/.pnpm/universalify@2.0.0/node_modules/universalify/index.js
+var require_universalify2 = __commonJS({
+  "../../../../node_modules/.pnpm/universalify@2.0.0/node_modules/universalify/index.js"(exports) {
+    "use strict";
+    exports.fromCallback = function(fn) {
+      return Object.defineProperty(function(...args) {
+        if (typeof args[args.length - 1] === "function")
+          fn.apply(this, args);
+        else {
+          return new Promise((resolve, reject) => {
+            fn.call(
+              this,
+              ...args,
+              (err, res) => err != null ? reject(err) : resolve(res)
+            );
+          });
+        }
+      }, "name", { value: fn.name });
+    };
+    exports.fromPromise = function(fn) {
+      return Object.defineProperty(function(...args) {
+        const cb = args[args.length - 1];
+        if (typeof cb !== "function")
+          return fn.apply(this, args);
+        else
+          fn.apply(this, args.slice(0, -1)).then((r) => cb(null, r), cb);
+      }, "name", { value: fn.name });
+    };
+  }
+});
+
 // ../../../../node_modules/.pnpm/jsonfile@6.1.0/node_modules/jsonfile/utils.js
 var require_utils2 = __commonJS({
   "../../../../node_modules/.pnpm/jsonfile@6.1.0/node_modules/jsonfile/utils.js"(exports, module2) {
@@ -3904,7 +3934,7 @@ var require_jsonfile = __commonJS({
     } catch (_) {
       _fs = require("fs");
     }
-    var universalify = require_universalify();
+    var universalify = require_universalify2();
     var { stringify: stringify2, stripBom } = require_utils2();
     function _readFile(_0) {
       return __async(this, arguments, function* (file, options = {}) {
@@ -63498,16 +63528,16 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 var import_path6 = __toESM(require("path"));
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.5/node_modules/@modern-js/codesmith-utils/dist/esm/chalk.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.6/node_modules/@modern-js/codesmith-utils/dist/esm/chalk.js
 var import_chalk = __toESM(require_source());
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.5/node_modules/@modern-js/codesmith-utils/dist/esm/fs-extra.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.6/node_modules/@modern-js/codesmith-utils/dist/esm/fs-extra.js
 var import_fs_extra = __toESM(require_lib());
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/materials/FsResource.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.6/node_modules/@modern-js/codesmith/dist/esm-node/materials/FsResource.js
 var FS_RESOURCE = "_codesmith_core_fs_resource";
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/utils/fsExists.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.6/node_modules/@modern-js/codesmith/dist/esm-node/utils/fsExists.js
 function fsExists(path6) {
   return __async(this, null, function* () {
     try {
@@ -63519,19 +63549,19 @@ function fsExists(path6) {
   });
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.5/node_modules/@modern-js/codesmith-utils/dist/esm/execa.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.6/node_modules/@modern-js/codesmith-utils/dist/esm/execa.js
 var import_execa = __toESM(require_execa());
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.5/node_modules/@modern-js/codesmith-utils/dist/esm/semver.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.6/node_modules/@modern-js/codesmith-utils/dist/esm/semver.js
 var import_semver = __toESM(require_semver2());
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-ejs@2.6.5_@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith-api-ejs/dist/esm-node/utils/renderString.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-ejs@2.6.6_@modern-js+codesmith@2.6.6/node_modules/@modern-js/codesmith-api-ejs/dist/esm-node/utils/renderString.js
 var import_ejs = __toESM(require_ejs());
 function renderString(template, fullData) {
   return import_ejs.default.render(template, fullData) || "";
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-ejs@2.6.5_@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith-api-ejs/dist/esm-node/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-ejs@2.6.6_@modern-js+codesmith@2.6.6/node_modules/@modern-js/codesmith-api-ejs/dist/esm-node/index.js
 var EjsAPI = class {
   renderTemplate(_0, _1) {
     return __async(this, arguments, function* (templateResource, target, parameters = {}) {
@@ -63566,7 +63596,7 @@ var EjsAPI = class {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-fs@2.6.5_@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith-api-fs/dist/esm-node/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-fs@2.6.6_@modern-js+codesmith@2.6.6/node_modules/@modern-js/codesmith-api-fs/dist/esm-node/index.js
 var import_path = __toESM(require("path"));
 var FsAPI = class {
   renderFile(resource, target) {
@@ -63595,7 +63625,7 @@ var FsAPI = class {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-git@2.6.5_@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith-api-git/dist/esm-node/utils/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-git@2.6.6_@modern-js+codesmith@2.6.6/node_modules/@modern-js/codesmith-api-git/dist/esm-node/utils/index.js
 function canUseGit() {
   return __async(this, null, function* () {
     try {
@@ -63679,7 +63709,7 @@ function gitCommit(cwd, commitMessage) {
   });
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-git@2.6.5_@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith-api-git/dist/esm-node/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-git@2.6.6_@modern-js+codesmith@2.6.6/node_modules/@modern-js/codesmith-api-git/dist/esm-node/index.js
 var GitAPI = class {
   isInGitRepo() {
     return __async(this, arguments, function* (cwd = this.generatorCore.outputPath) {
@@ -63735,7 +63765,7 @@ var GitAPI = class {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-handlebars@2.6.5_@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith-api-handlebars/dist/esm-node/utils/renderString.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-handlebars@2.6.6_@modern-js+codesmith@2.6.6/node_modules/@modern-js/codesmith-api-handlebars/dist/esm-node/utils/renderString.js
 var import_handlebars = __toESM(require_lib2());
 function renderString2(template, fullData, registers) {
   const helpers = __spreadValues({}, registers === null || registers === void 0 ? void 0 : registers.helpers);
@@ -63745,7 +63775,7 @@ function renderString2(template, fullData, registers) {
   return import_handlebars.default.compile(template)(fullData) || "";
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-handlebars@2.6.5_@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith-api-handlebars/dist/esm-node/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-handlebars@2.6.6_@modern-js+codesmith@2.6.6/node_modules/@modern-js/codesmith-api-handlebars/dist/esm-node/index.js
 var HandlebarsAPI = class {
   registerHelp(helpers) {
     return __async(this, null, function* () {
@@ -63902,7 +63932,7 @@ function __generator(thisArg, body) {
   }
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.5/node_modules/@modern-js/codesmith-utils/dist/esm/npm.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.6/node_modules/@modern-js/codesmith-utils/dist/esm/npm.js
 var import_execa3 = __toESM(require_execa());
 function canUseNvm() {
   return _canUseNvm.apply(this, arguments);
@@ -63947,6 +63977,49 @@ function _canUseNvm() {
   });
   return _canUseNvm.apply(this, arguments);
 }
+function canUseFnm() {
+  return _canUseFnm.apply(this, arguments);
+}
+function _canUseFnm() {
+  _canUseFnm = _async_to_generator(function() {
+    var e;
+    return __generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          _state.trys.push([
+            0,
+            2,
+            ,
+            3
+          ]);
+          return [
+            4,
+            (0, import_execa3.default)("fnm --version", {
+              env: process.env,
+              shell: true
+            })
+          ];
+        case 1:
+          _state.sent();
+          return [
+            2,
+            true
+          ];
+        case 2:
+          e = _state.sent();
+          return [
+            2,
+            false
+          ];
+        case 3:
+          return [
+            2
+          ];
+      }
+    });
+  });
+  return _canUseFnm.apply(this, arguments);
+}
 function canUseNpm() {
   return _canUseNpm.apply(this, arguments);
 }
@@ -64080,7 +64153,7 @@ function _canUsePnpm() {
   return _canUsePnpm.apply(this, arguments);
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-npm@2.6.5_@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith-api-npm/dist/esm-node/utils/install.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-npm@2.6.6_@modern-js+codesmith@2.6.6/node_modules/@modern-js/codesmith-api-npm/dist/esm-node/utils/install.js
 function execaWithStreamLog(command, args, options) {
   const promise = (0, import_execa.default)(command, args, __spreadProps(__spreadValues({}, options), {
     stdin: "inherit",
@@ -64181,7 +64254,7 @@ function pnpmInstall(_0) {
   });
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-npm@2.6.5_@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith-api-npm/dist/esm-node/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-npm@2.6.6_@modern-js+codesmith@2.6.6/node_modules/@modern-js/codesmith-api-npm/dist/esm-node/index.js
 var NpmAPI = class {
   npmInstall({ cwd, registryUrl, ignoreScripts }) {
     return npmInstall({
@@ -64209,7 +64282,7 @@ var NpmAPI = class {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.5/node_modules/@modern-js/codesmith-utils/dist/esm/lodash.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.6/node_modules/@modern-js/codesmith-utils/dist/esm/lodash.js
 var import_lodash = __toESM(require_lodash());
 var import_lodash2 = __toESM(require_lodash2());
 var import_lodash3 = __toESM(require_lodash3());
@@ -69976,10 +70049,10 @@ var Schema = (
   }()
 );
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.6.5_@modern-js+codesmith@2.6.5_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/prompt.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.6.6_@modern-js+codesmith@2.6.6_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/prompt.js
 var import_inquirer = __toESM(require_inquirer());
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.6.5_@modern-js+codesmith@2.6.5_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/transform.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.6.6_@modern-js+codesmith@2.6.6_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/transform.js
 function validateSchema(schema) {
   const { type, properties } = schema;
   if (type !== "object") {
@@ -70066,7 +70139,7 @@ function transformForm(schema, configValue = {}, validateMap, initValue) {
   return getQuestionFromSchema(schema, configValue, validateMap, initValue);
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.6.5_@modern-js+codesmith@2.6.5_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/prompt.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.6.6_@modern-js+codesmith@2.6.6_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/prompt.js
 var compileRule = (rule, scope) => {
   const state = Schema.compile(rule, __spreadValues({
     $self: {},
@@ -70166,7 +70239,7 @@ function prompt(_0) {
   });
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.6.5_@modern-js+codesmith@2.6.5_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/inquirer.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.6.6_@modern-js+codesmith@2.6.6_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/inquirer.js
 var CLIReader = class {
   getAnswers() {
     return this.answers;
@@ -70194,7 +70267,7 @@ var CLIReader = class {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.6.5_@modern-js+codesmith@2.6.5_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.6.6_@modern-js+codesmith@2.6.6_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/index.js
 var import_comment_json = __toESM(require_src2());
 var import_inquirer2 = __toESM(require_inquirer2());
 
@@ -70261,7 +70334,7 @@ var I18n = class {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.6.5_@modern-js+codesmith@2.6.5_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/locale/en.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.6.6_@modern-js+codesmith@2.6.6_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/locale/en.js
 var EN_LOCALE = {
   environment: {
     node_version: "The version of Node.js is too low. Please upgrade to the LTS version: https://nodejs.org/",
@@ -70288,7 +70361,7 @@ var EN_LOCALE = {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.6.5_@modern-js+codesmith@2.6.5_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/locale/zh.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.6.6_@modern-js+codesmith@2.6.6_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/locale/zh.js
 var ZH_LOCALE = {
   environment: {
     node_version: "Node.js 版本太低，请升级至 LTS 版本： https://nodejs.org/",
@@ -70315,14 +70388,14 @@ var ZH_LOCALE = {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.6.5_@modern-js+codesmith@2.6.5_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/locale/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.6.6_@modern-js+codesmith@2.6.6_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/locale/index.js
 var i18n = new I18n();
 var localeKeys = i18n.init("zh", {
   zh: ZH_LOCALE,
   en: EN_LOCALE
 });
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.6.5_@modern-js+codesmith@2.6.5_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/utils/checkUseNvm.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.6.6_@modern-js+codesmith@2.6.6_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/utils/checkUseNvm.js
 var import_path3 = __toESM(require("path"));
 var NODE_MAJOR_VERSION_MAP = {
   "lts/*": 18,
@@ -70357,7 +70430,7 @@ function checkUseNvm(cwd, logger) {
     if (expectNodeVersion === import_semver.default.major(currentNodeVersion)) {
       return false;
     }
-    if (!(yield canUseNvm())) {
+    if (!((yield canUseNvm()) || (yield canUseFnm()))) {
       logger.warn(`🟡 [Check nvm Error]: Current node version is not expect, you should install ${expectNodeVersion}`);
       return false;
     }
@@ -70373,7 +70446,7 @@ function checkUseNvm(cwd, logger) {
   });
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.6.5_@modern-js+codesmith@2.6.5_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/utils/transform.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.6.6_@modern-js+codesmith@2.6.6_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/utils/transform.js
 function transformInquirerSchema(questions, configValue = {}, validateMap = {}, initValue = {}) {
   for (const question of questions) {
     question.default = initValue[question.name] || question.default;
@@ -70400,7 +70473,7 @@ function transformInquirerSchema(questions, configValue = {}, validateMap = {},
   return questions;
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.6.5_@modern-js+codesmith@2.6.5_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.6.6_@modern-js+codesmith@2.6.6_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/index.js
 var AppAPI = class {
   checkEnvironment(nodeVersion) {
     return __async(this, null, function* () {

package/package.json

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