@modern-js/create 2.60.4 → 2.60.5

package/dist/index.js

@@ -41528,10 +41528,10 @@ var {
 var import_os = __toESM(require("os"));
 var import_path = __toESM(require("path"));
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.4/node_modules/@modern-js/codesmith-utils/dist/esm/fs-extra.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.5/node_modules/@modern-js/codesmith-utils/dist/esm/fs-extra.js
 var import_fs_extra = __toESM(require_lib());
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.4/node_modules/@modern-js/codesmith-utils/dist/esm/ora.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.5/node_modules/@modern-js/codesmith-utils/dist/esm/ora.js
 var import_ora = __toESM(require_ora());
 
 // ../../cli/plugin-i18n/dist/esm-node/index.js
@@ -41672,7 +41672,7 @@ function cleanCacheAction() {
 // src/createAction.ts
 var import_path10 = __toESM(require("path"));
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/logger/constants.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/logger/constants.js
 var LoggerLevel;
 (function(LoggerLevel2) {
   LoggerLevel2["Error"] = "error";
@@ -41684,10 +41684,10 @@ var LoggerLevel;
   LoggerLevel2["Timing"] = "timing";
 })(LoggerLevel || (LoggerLevel = {}));
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.4/node_modules/@modern-js/codesmith-utils/dist/esm/chalk.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.5/node_modules/@modern-js/codesmith-utils/dist/esm/chalk.js
 var import_chalk = __toESM(require_source());
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/logger/index.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/logger/index.js
 var import_debug = __toESM(require_src());
 var Logger = class {
   info(...meta) {
@@ -41745,23 +41745,23 @@ var Logger = class {
   }
 };
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/codesmith/index.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/codesmith/index.js
 var import_path8 = __toESM(require("path"));
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/generator/index.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/generator/index.js
 var import_events2 = require("events");
 var import_path6 = __toESM(require("path"));
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/materials/FsMaterial.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/materials/FsMaterial.js
 var import_path3 = __toESM(require("path"));
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.4/node_modules/@modern-js/codesmith-utils/dist/esm/glob.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.5/node_modules/@modern-js/codesmith-utils/dist/esm/glob.js
 var import_glob = __toESM(require_glob());
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/materials/FsResource.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/materials/FsResource.js
 var import_path2 = __toESM(require("path"));
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/materials/constants.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/materials/constants.js
 var IMAGE_EXT_LIST = [
   ".jpg",
   ".jpeg",
@@ -41775,7 +41775,7 @@ var IMAGE_EXT_LIST = [
   ".wmf"
 ];
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/materials/FsResource.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/materials/FsResource.js
 var FS_RESOURCE = "_codesmith_core_fs_resource";
 var FsResource = class {
   value() {
@@ -41800,7 +41800,7 @@ var FsResource = class {
   }
 };
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/materials/FsMaterial.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/materials/FsMaterial.js
 var promisifyGlob = (pattern, options) => new Promise((resolve, reject) => {
   (0, import_glob.default)(pattern, options, (err, files) => err === null ? resolve(files) : reject(err));
 });
@@ -41827,7 +41827,7 @@ var FsMaterial = class {
   }
 };
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/utils/fsExists.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/utils/fsExists.js
 function fsExists(path11) {
   return __async(this, null, function* () {
     try {
@@ -41839,7 +41839,7 @@ function fsExists(path11) {
   });
 }
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/utils/nodeRequire.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/utils/nodeRequire.js
 var nodeRequire = (path11) => {
   try {
     const module2 = __non_webpack_require__(path11);
@@ -41856,13 +41856,13 @@ var nodeRequire = (path11) => {
   }
 };
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/utils/packageManager.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/utils/packageManager.js
 var import_path4 = __toESM(require("path"));
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.4/node_modules/@modern-js/codesmith-utils/dist/esm/execa.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.5/node_modules/@modern-js/codesmith-utils/dist/esm/execa.js
 var import_execa = __toESM(require_execa());
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/utils/packageManager.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/utils/packageManager.js
 function canUseYarn() {
   return __async(this, null, function* () {
     try {
@@ -41946,7 +41946,7 @@ function runInstall(targetDir, registryUrl, logger) {
   });
 }
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/utils/timeoutPromise.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/utils/timeoutPromise.js
 function timeoutPromise(promise, ms, reason = "Operation") {
   return __async(this, null, function* () {
     let timeoutId = null;
@@ -41970,14 +41970,14 @@ function timeoutPromise(promise, ms, reason = "Operation") {
   });
 }
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/utils/downloadPackage.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/utils/downloadPackage.js
 var import_os2 = __toESM(require("os"));
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/constants.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/constants.js
 var NPM_API_TIMEOUT = 3e4;
 var CATCHE_VALIDITY_PREIOD = 7 * 24 * 3600 * 1e3;
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.4/node_modules/@modern-js/codesmith-utils/dist/esm/semver.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.5/node_modules/@modern-js/codesmith-utils/dist/esm/semver.js
 var import_semver = __toESM(require_semver2());
 
 // ../../../node_modules/.pnpm/axios@1.7.7_debug@4.3.7/node_modules/axios/lib/helpers/bind.js
@@ -45324,10 +45324,10 @@ var {
   mergeConfig: mergeConfig2
 } = axios_default;
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/utils/downloadPackage.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/utils/downloadPackage.js
 var import_tar = __toESM(require_tar());
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/utils/getNpmRegistry.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/utils/getNpmRegistry.js
 function getNpmRegistry() {
   return __async(this, null, function* () {
     const { stdout } = yield (0, import_execa.default)("npm", [
@@ -45339,8 +45339,32 @@ function getNpmRegistry() {
   });
 }
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/utils/getNpmPackageInfo.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/utils/getNpmPackageInfo.js
 var NpmPackageInfoCache = /* @__PURE__ */ new Map();
+function getNpmPackageInfoWithCommand(pkgName, pkgVersion, options) {
+  return __async(this, null, function* () {
+    const { registryUrl } = options || {};
+    const params = [
+      "view",
+      `${pkgName}@${pkgVersion}`,
+      "dist",
+      "version",
+      "--json"
+    ];
+    if (registryUrl) {
+      params.push("--registry");
+      params.push(registryUrl);
+    }
+    const getPkgInfoPromise = (0, import_execa.default)("npm", params);
+    const { stdout } = yield timeoutPromise(getPkgInfoPromise, NPM_API_TIMEOUT, `Get npm tarball of '${pkgName}'`);
+    try {
+      const pkgDistInfo = JSON.parse(stdout);
+      return pkgDistInfo;
+    } catch (e) {
+      throw new Error(`Version \`${pkgVersion}\` for package \`${pkgName}\` could not be found`);
+    }
+  });
+}
 function getNpmPackageInfo(pkgName, pkgVersion, options) {
   return __async(this, null, function* () {
     const packageName = `${pkgName}@${pkgVersion}`;
@@ -45348,16 +45372,22 @@ function getNpmPackageInfo(pkgName, pkgVersion, options) {
     if (packageInfo) {
       return packageInfo;
     }
-    const { registryUrl = yield getNpmRegistry() } = options || {};
-    const url2 = `${registryUrl.replace(/\/$/, "")}/${pkgName}/${pkgVersion}`;
-    const response = yield timeoutPromise(axios_default.get(url2), NPM_API_TIMEOUT, `Get npm package info of '${pkgName}'`);
-    const { version: version2 } = response.data;
-    NpmPackageInfoCache.set(`${pkgName}@${version2 || pkgVersion}`, response.data);
-    return response.data;
+    const { registryUrl = yield getNpmRegistry(), logger } = options || {};
+    const url2 = `${registryUrl.replace(/\/$/, "")}/${pkgName}/${pkgVersion || "latest"}`;
+    let response;
+    try {
+      response = (yield timeoutPromise(axios_default.get(url2), NPM_API_TIMEOUT, `Get npm package info of '${pkgName}'`)).data;
+    } catch (e) {
+      logger === null || logger === void 0 ? void 0 : logger.error(e);
+      response = yield getNpmPackageInfoWithCommand(pkgName, pkgVersion, options);
+    }
+    const { version: version2 } = response;
+    NpmPackageInfoCache.set(`${pkgName}@${version2 || pkgVersion}`, response);
+    return response;
   });
 }
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/utils/getNpmTarballUrl.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/utils/getNpmTarballUrl.js
 function getNpmTarballUrl(pkgName, pkgVersion, options) {
   return __async(this, null, function* () {
     const packageInfo = yield getNpmPackageInfo(pkgName, pkgVersion, options);
@@ -45365,7 +45395,7 @@ function getNpmTarballUrl(pkgName, pkgVersion, options) {
   });
 }
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/utils/getNpmVersion.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/utils/getNpmVersion.js
 function getNpmVersion(packageName, options) {
   return __async(this, null, function* () {
     const { version: version2 = "latest" } = options || {};
@@ -45374,7 +45404,7 @@ function getNpmVersion(packageName, options) {
   });
 }
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/utils/downloadPackage.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/utils/downloadPackage.js
 var GeneratorVersionMap = /* @__PURE__ */ new Map();
 function getGeneratorVersion(_0) {
   return __async(this, arguments, function* (pkgName, pkgVersion = "latest", options = {}) {
@@ -45392,7 +45422,8 @@ function getGeneratorVersion(_0) {
       try {
         version2 = yield getNpmVersion(pkgName, {
           registryUrl,
-          version: pkgVersion
+          version: pkgVersion,
+          logger
         });
       } catch (error) {
         throw new Error(`Failed to get version for package ${pkgName}@${pkgVersion}: ${error.message}`);
@@ -45469,7 +45500,8 @@ function downloadPackage(_0) {
       logger === null || logger === void 0 ? void 0 : logger.timing(`🕒 get ${pkgName} version`);
       version2 = yield getNpmVersion(pkgName, {
         registryUrl,
-        version: pkgVersion
+        version: pkgVersion,
+        logger
       });
       logger === null || logger === void 0 ? void 0 : logger.timing(`🕒 get ${pkgName} version`, true);
       if (version2 === void 0) {
@@ -45487,7 +45519,8 @@ function downloadPackage(_0) {
     yield import_fs_extra.default.mkdirp(targetDir);
     logger === null || logger === void 0 ? void 0 : logger.timing(`🕒 get ${pkgName}@${version2} tarball url`);
     const tarballPkg = yield getNpmTarballUrl(pkgName, version2, {
-      registryUrl
+      registryUrl,
+      logger
     });
     logger === null || logger === void 0 ? void 0 : logger.timing(`🕒 get ${pkgName}@${version2} tarball url`, true);
     logger === null || logger === void 0 ? void 0 : logger.timing(`🕒 download ${pkgName}@${version2} tarball`);
@@ -45507,7 +45540,7 @@ function downloadPackage(_0) {
   });
 }
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/utils/getPackageInfo.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/utils/getPackageInfo.js
 function getPackageInfo(packageName) {
   if (!packageName) {
     throw new Error("package is not exisit");
@@ -45531,7 +45564,7 @@ function getPackageInfo(packageName) {
   };
 }
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/utils/getGeneratorDir.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/utils/getGeneratorDir.js
 var import_path5 = __toESM(require("path"));
 var MaxTimes = 5;
 function getGeneratorDir(generator) {
@@ -45553,7 +45586,7 @@ function getGeneratorDir(generator) {
   });
 }
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/generator/index.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/generator/index.js
 var GeneratorCore = class {
   get lifeCycleMethod() {
     return {
@@ -45769,7 +45802,7 @@ check path: ${import_chalk.default.blue.underline(generator)} exist a package.js
   }
 };
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/materials/index.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/materials/index.js
 var import_path7 = __toESM(require("path"));
 var MaterialsManager = class {
   loadLocalGenerator(generator) {
@@ -45835,7 +45868,7 @@ var MaterialsManager = class {
   }
 };
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/codesmith/index.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.6.5/node_modules/@modern-js/codesmith/dist/esm-node/codesmith/index.js
 var CodeSmith = class {
   forge(_0) {
     return __async(this, arguments, function* ({ tasks, pwd }) {
@@ -45895,7 +45928,7 @@ var CodeSmith = class {
 };
 
 // package.json
-var version = "2.60.4";
+var version = "2.60.5";
 
 // src/utils/index.ts
 var import_path9 = __toESM(require("path"));

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.60.4",
+  "version": "2.60.5",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/index.js",
@@ -38,18 +38,18 @@
   },
   "devDependencies": {
     "commander": "10.0.1",
-    "@modern-js/codesmith": "2.6.4",
-    "@modern-js/codesmith-utils": "2.6.4",
+    "@modern-js/codesmith": "2.6.5",
+    "@modern-js/codesmith-utils": "2.6.5",
     "@types/jest": "^29",
     "@types/node": "^14",
     "jest": "^29",
     "ts-node": "^10.9.1",
     "typescript": "^5",
-    "@modern-js/generator-plugin-plugin": "3.7.0",
-    "@modern-js/repo-generator": "3.7.0",
-    "@modern-js/plugin-i18n": "2.60.4",
-    "@scripts/build": "2.60.4",
-    "@scripts/jest-config": "2.60.4"
+    "@modern-js/generator-plugin-plugin": "3.7.1",
+    "@modern-js/repo-generator": "3.7.1",
+    "@modern-js/plugin-i18n": "2.60.5",
+    "@scripts/build": "2.60.5",
+    "@scripts/jest-config": "2.60.5"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",