@modern-js/repo-generator 3.6.4-next.0 → 3.7.0

package/dist/index.js

@@ -33203,7 +33203,7 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.0/node_modules/@modern-js/codesmith/dist/esm-node/logger/constants.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/logger/constants.js
 var LoggerLevel;
 (function(LoggerLevel2) {
   LoggerLevel2["Error"] = "error";
@@ -33215,10 +33215,10 @@ var LoggerLevel;
   LoggerLevel2["Timing"] = "timing";
 })(LoggerLevel || (LoggerLevel = {}));
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.0/node_modules/@modern-js/codesmith-utils/dist/esm/chalk.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.4/node_modules/@modern-js/codesmith-utils/dist/esm/chalk.js
 var import_chalk = __toESM(require_source());
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.0/node_modules/@modern-js/codesmith/dist/esm-node/logger/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/logger/index.js
 var import_debug = __toESM(require_src());
 var Logger = class {
   info(...meta) {
@@ -33276,26 +33276,26 @@ var Logger = class {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.0/node_modules/@modern-js/codesmith/dist/esm-node/codesmith/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/codesmith/index.js
 var import_path7 = __toESM(require("path"));
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.0/node_modules/@modern-js/codesmith/dist/esm-node/generator/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/generator/index.js
 var import_events2 = require("events");
 var import_path5 = __toESM(require("path"));
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.0/node_modules/@modern-js/codesmith/dist/esm-node/materials/FsMaterial.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/materials/FsMaterial.js
 var import_path2 = __toESM(require("path"));
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.0/node_modules/@modern-js/codesmith-utils/dist/esm/glob.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.4/node_modules/@modern-js/codesmith-utils/dist/esm/glob.js
 var import_glob = __toESM(require_glob());
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.0/node_modules/@modern-js/codesmith/dist/esm-node/materials/FsResource.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/materials/FsResource.js
 var import_path = __toESM(require("path"));
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.0/node_modules/@modern-js/codesmith-utils/dist/esm/fs-extra.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.4/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.0/node_modules/@modern-js/codesmith/dist/esm-node/materials/constants.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/materials/constants.js
 var IMAGE_EXT_LIST = [
   ".jpg",
   ".jpeg",
@@ -33309,7 +33309,7 @@ var IMAGE_EXT_LIST = [
   ".wmf"
 ];
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.0/node_modules/@modern-js/codesmith/dist/esm-node/materials/FsResource.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/materials/FsResource.js
 var FS_RESOURCE = "_codesmith_core_fs_resource";
 var FsResource = class {
   value() {
@@ -33334,7 +33334,7 @@ var FsResource = class {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.0/node_modules/@modern-js/codesmith/dist/esm-node/materials/FsMaterial.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/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));
 });
@@ -33361,7 +33361,7 @@ var FsMaterial = class {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.0/node_modules/@modern-js/codesmith/dist/esm-node/utils/fsExists.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/utils/fsExists.js
 function fsExists(path9) {
   return __async(this, null, function* () {
     try {
@@ -33373,7 +33373,7 @@ function fsExists(path9) {
   });
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.0/node_modules/@modern-js/codesmith/dist/esm-node/utils/nodeRequire.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/utils/nodeRequire.js
 var nodeRequire = (path9) => {
   try {
     const module2 = __non_webpack_require__(path9);
@@ -33390,13 +33390,13 @@ var nodeRequire = (path9) => {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.0/node_modules/@modern-js/codesmith/dist/esm-node/utils/packageManager.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/utils/packageManager.js
 var import_path3 = __toESM(require("path"));
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.0/node_modules/@modern-js/codesmith-utils/dist/esm/execa.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.4/node_modules/@modern-js/codesmith-utils/dist/esm/execa.js
 var import_execa = __toESM(require_execa());
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.0/node_modules/@modern-js/codesmith/dist/esm-node/utils/packageManager.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/utils/packageManager.js
 function canUseYarn() {
   return __async(this, null, function* () {
     try {
@@ -33480,7 +33480,7 @@ function runInstall(targetDir, registryUrl, logger) {
   });
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.0/node_modules/@modern-js/codesmith/dist/esm-node/utils/timeoutPromise.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/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;
@@ -33504,14 +33504,14 @@ function timeoutPromise(promise, ms, reason = "Operation") {
   });
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.0/node_modules/@modern-js/codesmith/dist/esm-node/utils/downloadPackage.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/utils/downloadPackage.js
 var import_os = __toESM(require("os"));
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.0/node_modules/@modern-js/codesmith/dist/esm-node/constants.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/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.0/node_modules/@modern-js/codesmith-utils/dist/esm/semver.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.4/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
@@ -36858,45 +36858,57 @@ var {
   mergeConfig: mergeConfig2
 } = axios_default;
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.0/node_modules/@modern-js/codesmith/dist/esm-node/utils/downloadPackage.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/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.0/node_modules/@modern-js/codesmith/dist/esm-node/utils/getNpmTarballUrl.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/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", [
+      "config",
+      "get",
+      "registry"
+    ]);
+    return stdout.replace(/\/$/, "") || "https://registry.npmjs.org";
+  });
+}
+
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/utils/getNpmPackageInfo.js
+var NpmPackageInfoCache = /* @__PURE__ */ new Map();
+function getNpmPackageInfo(pkgName, pkgVersion, options) {
+  return __async(this, null, function* () {
+    const packageName = `${pkgName}@${pkgVersion}`;
+    const packageInfo = NpmPackageInfoCache.get(packageName);
+    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 } = response.data;
+    NpmPackageInfoCache.set(`${pkgName}@${version || pkgVersion}`, response.data);
+    return response.data;
+  });
+}
+
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/utils/getNpmTarballUrl.js
 function getNpmTarballUrl(pkgName, pkgVersion, options) {
   return __async(this, null, function* () {
-    const { registryUrl } = options || {};
-    const params = [
-      "view",
-      `${pkgName}@${pkgVersion}`,
-      "dist",
-      "--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.tarball;
-    } catch (e) {
-      throw new Error(`Version \`${pkgVersion}\` for package \`${pkgName}\` could not be found`);
-    }
+    const packageInfo = yield getNpmPackageInfo(pkgName, pkgVersion, options);
+    return packageInfo.dist.tarball;
   });
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.0/node_modules/@modern-js/codesmith/dist/esm-node/utils/getNpmVersion.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/utils/getNpmVersion.js
 function getNpmVersion(packageName, options) {
   return __async(this, null, function* () {
-    const { version = "latest", registryUrl = "https://registry.npmjs.org" } = options || {};
-    const url2 = `${registryUrl}/${packageName}/${version}`;
-    const response = yield timeoutPromise(axios_default.get(url2), NPM_API_TIMEOUT, `Get npm version of '${packageName}'`);
-    return response.data.version;
+    const { version = "latest" } = options || {};
+    const packageInfo = yield getNpmPackageInfo(packageName, version, options);
+    return packageInfo.version;
   });
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.0/node_modules/@modern-js/codesmith/dist/esm-node/utils/downloadPackage.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/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 = {}) {
@@ -36929,9 +36941,12 @@ function getGeneratorVersion(_0) {
     return version;
   });
 }
-function isValidCache(cacheDir) {
+function isValidCache(cacheDir, pkgName) {
   return __async(this, null, function* () {
     if (yield fsExists(`${cacheDir}/.codesmith.completed`)) {
+      if (pkgName === "@modern-js/codesmith-global") {
+        return true;
+      }
       const preCacheTimeStr = yield import_fs_extra.default.readFile(`${cacheDir}/.codesmith.completed`, {
         encoding: "utf-8"
       });
@@ -36999,7 +37014,7 @@ function downloadPackage(_0) {
     }
     const targetDir = `${import_os.default.tmpdir()}/csmith-generator/${pkgName}@${version}`;
     logger === null || logger === void 0 ? void 0 : (_logger_debug = logger.debug) === null || _logger_debug === void 0 ? void 0 : _logger_debug.call(logger, `💡 [Download Generator Package]: ${pkgName}@${version} to ${targetDir}`);
-    if ((yield fsExists(targetDir)) && (yield isValidCache(targetDir))) {
+    if ((yield fsExists(targetDir)) && (yield isValidCache(targetDir, pkgName))) {
       return targetDir;
     }
     yield import_fs_extra.default.remove(targetDir);
@@ -37026,7 +37041,7 @@ function downloadPackage(_0) {
   });
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.0/node_modules/@modern-js/codesmith/dist/esm-node/utils/getPackageInfo.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/utils/getPackageInfo.js
 function getPackageInfo(packageName) {
   if (!packageName) {
     throw new Error("package is not exisit");
@@ -37050,7 +37065,7 @@ function getPackageInfo(packageName) {
   };
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.0/node_modules/@modern-js/codesmith/dist/esm-node/utils/getGeneratorDir.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/utils/getGeneratorDir.js
 var import_path4 = __toESM(require("path"));
 var MaxTimes = 5;
 function getGeneratorDir(generator) {
@@ -37072,10 +37087,10 @@ function getGeneratorDir(generator) {
   });
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.0/node_modules/@modern-js/codesmith-utils/dist/esm/ora.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-utils@2.6.4/node_modules/@modern-js/codesmith-utils/dist/esm/ora.js
 var import_ora = __toESM(require_ora());
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.0/node_modules/@modern-js/codesmith/dist/esm-node/generator/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/generator/index.js
 var GeneratorCore = class {
   get lifeCycleMethod() {
     return {
@@ -37291,7 +37306,7 @@ check path: ${import_chalk.default.blue.underline(generator)} exist a package.js
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.0/node_modules/@modern-js/codesmith/dist/esm-node/materials/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/materials/index.js
 var import_path6 = __toESM(require("path"));
 var MaterialsManager = class {
   loadLocalGenerator(generator) {
@@ -37357,7 +37372,7 @@ var MaterialsManager = class {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.0/node_modules/@modern-js/codesmith/dist/esm-node/codesmith/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.6.4/node_modules/@modern-js/codesmith/dist/esm-node/codesmith/index.js
 var CodeSmith = class {
   forge(_0) {
     return __async(this, arguments, function* ({ tasks, pwd }) {
@@ -37434,6 +37449,7 @@ var getGeneratorPath = (generator, distTag, paths) => {
 // src/index.ts
 var src_default = (context, generator) => __async(void 0, null, function* () {
   process.setMaxListeners(20);
+  generator.logger.debug(`🚀 [Start Run Repo Generator]`);
   if (!global.codesmith) {
     generator.logger.warn(
       "🟡 Please use the latest @modern-js/create version to run generator"
@@ -37442,12 +37458,11 @@ var src_default = (context, generator) => __async(void 0, null, function* () {
     yield codesmith.prepareGlobal();
   }
   const RepoNextGeneratort = "@modern-js/repo-next-generator";
-  generator.runSubGenerator(
+  yield generator.runSubGenerator(
     getGeneratorPath(RepoNextGeneratort, context.config.distTag, [__dirname]),
     void 0,
     context.config
   );
-  generator.logger.debug(`🚀 [Start Run Repo Generator]`);
   generator.logger.debug(`🚀 [End Run Repo Generator]`);
 });
 /*! Bundled license information:

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.6.4-next.0",
+  "version": "3.7.0",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/index.js",
   "files": [
@@ -23,17 +23,18 @@
     "/dist/index.js"
   ],
   "devDependencies": {
-    "@modern-js/codesmith": "2.6.0",
+    "@modern-js/codesmith": "2.6.4",
     "@types/node": "^14",
     "typescript": "^5",
-    "@modern-js/generator-utils": "3.6.3",
-    "@scripts/build": "2.60.3",
-    "@modern-js/repo-next-generator": "3.6.3"
+    "@modern-js/generator-utils": "3.7.0",
+    "@scripts/build": "2.60.4",
+    "@modern-js/repo-next-generator": "3.7.0"
   },
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "provenance": true
   },
   "types": "./src/index.ts",
   "scripts": {

package/src/index.ts

@@ -8,8 +8,9 @@ import { getGeneratorPath } from '@modern-js/generator-utils';
 export default async (context: GeneratorContext, generator: GeneratorCore) => {
   process.setMaxListeners(20);
 
-  // check prepare global
+  generator.logger.debug(`🚀 [Start Run Repo Generator]`);
 
+  // check prepare global
   if (!(global as any).codesmith) {
     generator.logger.warn(
       '🟡 Please use the latest @modern-js/create version to run generator',
@@ -20,13 +21,11 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => {
 
   const RepoNextGeneratort = '@modern-js/repo-next-generator';
 
-  generator.runSubGenerator(
+  await generator.runSubGenerator(
     getGeneratorPath(RepoNextGeneratort, context.config.distTag, [__dirname]),
     undefined,
     context.config,
   );
 
-  generator.logger.debug(`🚀 [Start Run Repo Generator]`);
-
   generator.logger.debug(`🚀 [End Run Repo Generator]`);
 };