@modern-js/repo-generator 0.0.0-next-20241014055508 → 0.0.0-next-20241014070959

package/dist/index.js

@@ -143,13 +143,6 @@
             module1.exports = (typeof globalThis !== "undefined" ? globalThis : typeof global !== "undefined" ? global : self || Function("return this")())["codesmithNpmUtils"];
         }
     });
-    // globals:@modern-js/codesmith-utils/ora
-    var require_ora = __commonJS({
-        "globals:@modern-js/codesmith-utils/ora" (exports, module1) {
-            "use strict";
-            module1.exports = (typeof globalThis !== "undefined" ? globalThis : typeof global !== "undefined" ? global : self || Function("return this")())["codesmithOraUtils"];
-        }
-    });
     // globals:@modern-js/codesmith-utils/semver
     var require_semver = __commonJS({
         "globals:@modern-js/codesmith-utils/semver" (exports, module1) {
@@ -157,6 +150,13 @@
             module1.exports = (typeof globalThis !== "undefined" ? globalThis : typeof global !== "undefined" ? global : self || Function("return this")())["codesmithSemverUtils"];
         }
     });
+    // globals:@modern-js/codesmith-utils/ora
+    var require_ora = __commonJS({
+        "globals:@modern-js/codesmith-utils/ora" (exports, module1) {
+            "use strict";
+            module1.exports = (typeof globalThis !== "undefined" ? globalThis : typeof global !== "undefined" ? global : self || Function("return this")())["codesmithOraUtils"];
+        }
+    });
     // globals:@modern-js/codesmith-utils/chalk
     var require_chalk = __commonJS({
         "globals:@modern-js/codesmith-utils/chalk" (exports, module1) {
@@ -19593,14 +19593,12 @@ function encode_char(c) {
         }
     }
     // ../../generator-plugin/dist/esm/index.js
-    var import_codesmith6 = __toESM(require_codesmith());
+    var import_codesmith7 = __toESM(require_codesmith());
     var import_fs_extra3 = __toESM(require_fs_extra());
     var import_lodash5 = __toESM(require_lodash());
     // ../../generator-utils/dist/esm/index.js
-    var import_execa2 = __toESM(require_execa());
+    var import_codesmith = __toESM(require_codesmith());
     var import_fs_extra = __toESM(require_fs_extra());
-    var import_npm2 = __toESM(require_npm());
-    var import_ora = __toESM(require_ora());
     // ../../generator-utils/dist/esm/locale/index.js
     var import_plugin_i18n2 = __toESM(require_plugin_i18n());
     // ../../generator-utils/dist/esm/locale/en.js
@@ -20832,46 +20830,19 @@ function encode_char(c) {
     var lib = JSON5;
     var dist_default = lib;
     // ../../generator-utils/dist/esm/index.js
-    var import_npm3 = __toESM(require_npm());
+    var import_npm2 = __toESM(require_npm());
     var import_fs_extra2 = __toESM(require_fs_extra());
-    var import_ora2 = __toESM(require_ora());
+    var import_ora = __toESM(require_ora());
     var import_semver2 = __toESM(require_semver());
-    var import_execa3 = __toESM(require_execa());
+    var import_execa2 = __toESM(require_execa());
     var import_chalk = __toESM(require_chalk());
-    function getPackageVersion(packageName, registry) {
+    function getPackageVersion(packageName, registryUrl) {
         return __async(this, null, function*() {
-            const spinner = (0, import_ora.ora)({
-                text: "Load Generator...",
-                spinner: "runner"
-            }).start();
-            if (yield (0, import_npm2.canUsePnpm)()) {
-                const args = [
-                    "info",
-                    packageName,
-                    "version"
-                ];
-                if (registry) {
-                    args.push(`--registry=${registry}`);
-                }
-                const result = yield (0, import_execa2.execa)("pnpm", args);
-                spinner.stop();
-                return stripAnsi(result.stdout);
-            }
-            if (yield (0, import_npm2.canUseNpm)()) {
-                const args = [
-                    "view",
-                    packageName,
-                    "version"
-                ];
-                if (registry) {
-                    args.push(`--registry=${registry}`);
-                }
-                const result = yield (0, import_execa2.execa)("npm", args);
-                spinner.stop();
-                return stripAnsi(result.stdout);
-            }
-            spinner.stop();
-            throw new Error("not found npm, please install npm before");
+            const { name, version } = (0, import_codesmith.getPackageInfo)(packageName);
+            return (0, import_codesmith.getNpmVersion)(name, {
+                version,
+                registryUrl
+            });
         });
     }
     function getModernPluginVersion(_0, _1) {
@@ -20929,7 +20900,7 @@ function encode_char(c) {
         return Constructor;
     }
     // ../../generator-plugin/dist/esm/context/file.js
-    var import_codesmith = __toESM(require_codesmith());
+    var import_codesmith2 = __toESM(require_codesmith());
     var import_codesmith_api_json = __toESM(require_codesmith_api_json());
     var import_globby = __toESM(require_globby());
     var FileType;
@@ -21305,7 +21276,7 @@ function encode_char(c) {
                 return __generator(this, function(_state) {
                     switch(_state.label){
                         case 0:
-                            fsMaterial = new import_codesmith.FsMaterial(_this.projectPath);
+                            fsMaterial = new import_codesmith2.FsMaterial(_this.projectPath);
                             return [
                                 4,
                                 _this.jsonAPI.update(fsMaterial.get(fileName), {
@@ -21845,7 +21816,7 @@ function encode_char(c) {
         });
     }
     // ../../new-action/dist/esm/mwa.js
-    var import_codesmith2 = __toESM(require_codesmith());
+    var import_codesmith3 = __toESM(require_codesmith());
     var import_codesmith_formily = __toESM(require_codesmith_formily());
     var import_lodash2 = __toESM(require_lodash());
     // ../../new-action/dist/esm/constants.js
@@ -21866,7 +21837,7 @@ function encode_char(c) {
             i18n.changeLanguage({
                 locale: language
             });
-            const smith = new import_codesmith2.CodeSmith({
+            const smith = new import_codesmith3.CodeSmith({
                 debug,
                 registryUrl: registry
             });
@@ -21947,7 +21918,7 @@ function encode_char(c) {
             });
         });
     // ../../new-action/dist/esm/module.js
-    var import_codesmith3 = __toESM(require_codesmith());
+    var import_codesmith4 = __toESM(require_codesmith());
     var import_codesmith_formily2 = __toESM(require_codesmith_formily());
     var import_lodash3 = __toESM(require_lodash());
     var ModuleNewAction = (options)=>__async(void 0, null, function*() {
@@ -21962,7 +21933,7 @@ function encode_char(c) {
             i18n.changeLanguage({
                 locale: language
             });
-            const smith = new import_codesmith3.CodeSmith({
+            const smith = new import_codesmith4.CodeSmith({
                 debug,
                 registryUrl: registry
             });
@@ -22328,7 +22299,7 @@ function encode_char(c) {
         en: EN_LOCALE3
     });
     // ../../generator-plugin/dist/esm/utils/index.js
-    var import_codesmith5 = __toESM(require_codesmith());
+    var import_codesmith6 = __toESM(require_codesmith());
     // ../../generator-plugin/dist/esm/utils/module.js
     var import_lodash4 = __toESM(require_lodash());
     function requireModule(modulePath) {
@@ -22338,7 +22309,7 @@ function encode_char(c) {
         ]) || module1;
     }
     // ../../generator-plugin/dist/esm/utils/getPackageMeta.js
-    var import_codesmith4 = __toESM(require_codesmith());
+    var import_codesmith5 = __toESM(require_codesmith());
     var NPM_API_TIMEOUT = 3e4;
     function getPackageMeta(packageName, packageVersion, options) {
         return _getPackageMeta.apply(this, arguments);
@@ -22360,10 +22331,10 @@ function encode_char(c) {
                             params.push("--registry");
                             params.push(registryUrl);
                         }
-                        getPkgInfoPromise = (0, import_execa3.execa)("npm", params);
+                        getPkgInfoPromise = (0, import_execa2.execa)("npm", params);
                         return [
                             4,
-                            (0, import_codesmith4.timeoutPromise)(getPkgInfoPromise, NPM_API_TIMEOUT, "Get npm version of '".concat(packageName, "'"))
+                            (0, import_codesmith5.timeoutPromise)(getPkgInfoPromise, NPM_API_TIMEOUT, "Get npm version of '".concat(packageName, "'"))
                         ];
                     case 1:
                         stdout = _state.sent().stdout;
@@ -22428,10 +22399,10 @@ function encode_char(c) {
                                                 }
                                             ];
                                         }
-                                        _getPackageInfo = (0, import_codesmith5.getPackageInfo)(plugin), name = _getPackageInfo.name, version = _getPackageInfo.version;
+                                        _getPackageInfo = (0, import_codesmith6.getPackageInfo)(plugin), name = _getPackageInfo.name, version = _getPackageInfo.version;
                                         return [
                                             4,
-                                            (0, import_codesmith5.downloadPackage)(name, version, {
+                                            (0, import_codesmith6.downloadPackage)(name, version, {
                                                 registryUrl,
                                                 install: true
                                             })
@@ -22526,7 +22497,7 @@ function encode_char(c) {
                                                         6
                                                     ];
                                                 case 4:
-                                                    _getPackageInfo = (0, import_codesmith6.getPackageInfo)(plugin), name = _getPackageInfo.name, pkgVersion = _getPackageInfo.version;
+                                                    _getPackageInfo = (0, import_codesmith7.getPackageInfo)(plugin), name = _getPackageInfo.name, pkgVersion = _getPackageInfo.version;
                                                     return [
                                                         4,
                                                         getPackageMeta(name, pkgVersion, {
@@ -22934,6 +22905,15 @@ function encode_char(c) {
     var src_default = (context, generator)=>__async(void 0, null, function*() {
             var _a;
             process.setMaxListeners(20);
+            const { distTag } = context.config;
+            yield generator.prepareGlobal();
+            yield generator.prepareGenerators([
+                `@modern-js/repo-generator@${distTag || "latest"}`,
+                `@modern-js/base-generator@${distTag || "latest"}`,
+                `@modern-js/mwa-generator@${distTag || "latest"}`,
+                `@modern-js/entry-generator@${distTag || "latest"}`,
+                `@modern-js/module-generator@${distTag || "latest"}`
+            ]);
             const appApi = new import_codesmith_api_app.AppAPI(context, generator);
             const { locale } = context.config;
             i18n.changeLanguage({

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "0.0.0-next-20241014055508",
+  "version": "0.0.0-next-20241014070959",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/index.js",
   "files": [
@@ -30,14 +30,14 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "@modern-js/base-generator": "0.0.0-next-20241014055508",
-    "@modern-js/generator-plugin": "0.0.0-next-20241014055508",
-    "@modern-js/module-generator": "0.0.0-next-20241014055508",
-    "@modern-js/generator-utils": "0.0.0-next-20241014055508",
-    "@modern-js/generator-common": "0.0.0-next-20241014055508",
-    "@modern-js/mwa-generator": "0.0.0-next-20241014055508",
-    "@scripts/build": "0.0.0-next-20241014055508",
-    "@scripts/jest-config": "0.0.0-next-20241014055508"
+    "@modern-js/base-generator": "0.0.0-next-20241014070959",
+    "@modern-js/generator-common": "0.0.0-next-20241014070959",
+    "@modern-js/module-generator": "0.0.0-next-20241014070959",
+    "@modern-js/generator-utils": "0.0.0-next-20241014070959",
+    "@modern-js/mwa-generator": "0.0.0-next-20241014070959",
+    "@scripts/build": "0.0.0-next-20241014070959",
+    "@scripts/jest-config": "0.0.0-next-20241014070959",
+    "@modern-js/generator-plugin": "0.0.0-next-20241014070959"
   },
   "sideEffects": false,
   "publishConfig": {

package/src/index.ts

@@ -90,6 +90,18 @@ const handlePlugin = async (
 export default async (context: GeneratorContext, generator: GeneratorCore) => {
   process.setMaxListeners(20);
 
+  const { distTag } = context.config;
+
+  // avoid create tools version is older
+  await generator.prepareGlobal();
+  await generator.prepareGenerators([
+    `@modern-js/repo-generator@${distTag || 'latest'}`,
+    `@modern-js/base-generator@${distTag || 'latest'}`,
+    `@modern-js/mwa-generator@${distTag || 'latest'}`,
+    `@modern-js/entry-generator@${distTag || 'latest'}`,
+    `@modern-js/module-generator@${distTag || 'latest'}`,
+  ]);
+
   const appApi = new AppAPI(context, generator);
 
   const { locale } = context.config;