@modern-js/create 2.21.0 → 2.22.0

package/dist/index.js

@@ -36429,7 +36429,7 @@ function getLocaleLanguage() {
 // src/createAction.ts
 var import_path9 = __toESM(require("path"));
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.3/node_modules/@modern-js/codesmith/dist/esm/logger/constants.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.5/node_modules/@modern-js/codesmith/dist/esm/logger/constants.js
 var LoggerLevel;
 (function(LoggerLevel2) {
   LoggerLevel2["Error"] = "error";
@@ -36468,7 +36468,7 @@ var mime = Import.lazy("../compiled/mime-types", require);
 var chokidar = Import.lazy("../compiled/chokidar", require);
 var inquirer = Import.lazy("../compiled/inquirer", require);
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.3/node_modules/@modern-js/codesmith/dist/esm/logger/index.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.5/node_modules/@modern-js/codesmith/dist/esm/logger/index.js
 function _array_like_to_array(arr, len) {
   if (len == null || len > arr.length)
     len = arr.length;
@@ -36653,20 +36653,20 @@ var Logger = /* @__PURE__ */ function() {
   return Logger22;
 }();
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.3/node_modules/@modern-js/codesmith/dist/esm/codesmith/index.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.5/node_modules/@modern-js/codesmith/dist/esm/codesmith/index.js
 var import_path7 = __toESM(require("path"));
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.3/node_modules/@modern-js/codesmith/dist/esm/generator/index.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.5/node_modules/@modern-js/codesmith/dist/esm/generator/index.js
 var import_path4 = __toESM(require("path"));
 var import_events = require("events");
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.3/node_modules/@modern-js/codesmith/dist/esm/materials/FsMaterial.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.5/node_modules/@modern-js/codesmith/dist/esm/materials/FsMaterial.js
 var import_path2 = __toESM(require("path"));
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.3/node_modules/@modern-js/codesmith/dist/esm/materials/FsResource.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.5/node_modules/@modern-js/codesmith/dist/esm/materials/FsResource.js
 var import_path = __toESM(require("path"));
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.3/node_modules/@modern-js/codesmith/dist/esm/materials/constants.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.5/node_modules/@modern-js/codesmith/dist/esm/materials/constants.js
 var IMAGE_EXT_LIST = [
   ".jpg",
   ".jpeg",
@@ -36680,7 +36680,7 @@ var IMAGE_EXT_LIST = [
   ".wmf"
 ];
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.3/node_modules/@modern-js/codesmith/dist/esm/materials/FsResource.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.5/node_modules/@modern-js/codesmith/dist/esm/materials/FsResource.js
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
   try {
     var info = gen[key](arg);
@@ -36912,7 +36912,7 @@ var FsResource = /* @__PURE__ */ function() {
   return FsResource2;
 }();
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.3/node_modules/@modern-js/codesmith/dist/esm/materials/FsMaterial.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.5/node_modules/@modern-js/codesmith/dist/esm/materials/FsMaterial.js
 function asyncGeneratorStep2(gen, resolve, reject, _next, _throw, key, arg) {
   try {
     var info = gen[key](arg);
@@ -37136,7 +37136,7 @@ var FsMaterial = /* @__PURE__ */ function() {
   return FsMaterial2;
 }();
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.3/node_modules/@modern-js/codesmith/dist/esm/utils/nodeRequire.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.5/node_modules/@modern-js/codesmith/dist/esm/utils/nodeRequire.js
 var nodeRequire = function(path11) {
   try {
     var module2 = __non_webpack_require__(path11);
@@ -37153,10 +37153,10 @@ var nodeRequire = function(path11) {
   }
 };
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.3/node_modules/@modern-js/codesmith/dist/esm/utils/getGeneratorDir.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.5/node_modules/@modern-js/codesmith/dist/esm/utils/getGeneratorDir.js
 var import_path3 = __toESM(require("path"));
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.3/node_modules/@modern-js/codesmith/dist/esm/utils/fsExists.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.5/node_modules/@modern-js/codesmith/dist/esm/utils/fsExists.js
 function asyncGeneratorStep3(gen, resolve, reject, _next, _throw, key, arg) {
   try {
     var info = gen[key](arg);
@@ -37329,7 +37329,7 @@ function _fsExists() {
   return _fsExists.apply(this, arguments);
 }
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.3/node_modules/@modern-js/codesmith/dist/esm/utils/getGeneratorDir.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.5/node_modules/@modern-js/codesmith/dist/esm/utils/getGeneratorDir.js
 function asyncGeneratorStep4(gen, resolve, reject, _next, _throw, key, arg) {
   try {
     var info = gen[key](arg);
@@ -37523,7 +37523,7 @@ function _getGeneratorDir() {
   return _getGeneratorDir.apply(this, arguments);
 }
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.3/node_modules/@modern-js/codesmith/dist/esm/generator/index.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.5/node_modules/@modern-js/codesmith/dist/esm/generator/index.js
 function asyncGeneratorStep5(gen, resolve, reject, _next, _throw, key, arg) {
   try {
     var info = gen[key](arg);
@@ -37737,6 +37737,7 @@ var GeneratorCore = /* @__PURE__ */ function() {
     _define_property4(this, "logger", void 0);
     _define_property4(this, "materialsManager", void 0);
     _define_property4(this, "outputPath", void 0);
+    _define_property4(this, "basePath", void 0);
     var _this = this;
     _define_property4(this, "output", {
       fs: function() {
@@ -37774,6 +37775,7 @@ var GeneratorCore = /* @__PURE__ */ function() {
     this.logger = logger;
     this.materialsManager = materialsManager;
     this.outputPath = outputPath;
+    this.basePath = process.cwd();
     this.event = new import_events.EventEmitter();
     this.event.setMaxListeners(15);
     this._context = _object_spread({
@@ -37816,6 +37818,12 @@ var GeneratorCore = /* @__PURE__ */ function() {
         this.outputPath = outputPath;
       }
     },
+    {
+      key: "setbasePath",
+      value: function setbasePath(basePath) {
+        this.basePath = basePath;
+      }
+    },
     {
       key: "loadLocalGenerator",
       value: function loadLocalGenerator(generator) {
@@ -37966,11 +37974,15 @@ var GeneratorCore = /* @__PURE__ */ function() {
       value: function loadGenerator(generator) {
         var _this = this;
         return _async_to_generator5(function() {
-          var loadGeneratorPromise, _ref, generatorPkg, pkgJson, materialKey, generatorScript;
+          var generatorPath, loadGeneratorPromise, _ref, generatorPkg, pkgJson, materialKey, generatorScript;
           return __generator5(this, function(_state) {
             switch (_state.label) {
               case 0:
-                loadGeneratorPromise = import_path4.default.isAbsolute(generator) ? _this.loadLocalGenerator(generator) : _this.loadRemoteGenerator(generator);
+                generatorPath = generator;
+                if (generator.startsWith("file:")) {
+                  generatorPath = import_path4.default.join(_this.basePath, generator.slice(5));
+                }
+                loadGeneratorPromise = import_path4.default.isAbsolute(generatorPath) ? _this.loadLocalGenerator(generatorPath) : _this.loadRemoteGenerator(generator);
                 return [
                   4,
                   loadGeneratorPromise
@@ -38031,6 +38043,7 @@ var GeneratorCore = /* @__PURE__ */ function() {
                   material: generatorPkg
                 });
                 spinner.stop();
+                _this.setbasePath(_this._context.current.material.basePath);
                 return [
                   4,
                   generatorScript(_this._context, _this)
@@ -38052,7 +38065,7 @@ var GeneratorCore = /* @__PURE__ */ function() {
         var relativePwdPath = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "", config = arguments.length > 2 ? arguments[2] : void 0;
         var _this = this;
         return _async_to_generator5(function() {
-          var spinner, _ref, materialKey, generatorPkg, generatorScript, subContext, preOutputPath;
+          var spinner, _ref, materialKey, generatorPkg, generatorScript, subContext, preOutputPath, preBasePath;
           return __generator5(this, function(_state) {
             switch (_state.label) {
               case 0:
@@ -38081,7 +38094,9 @@ var GeneratorCore = /* @__PURE__ */ function() {
                 });
                 _this.logger.debug("subContext", subContext);
                 preOutputPath = _this.outputPath;
+                preBasePath = _this.basePath;
                 _this.setOutputPath(import_path4.default.resolve(_this.outputPath, relativePwdPath || ""));
+                _this.setbasePath(subContext.current.material.basePath);
                 spinner.stop();
                 return [
                   4,
@@ -38090,6 +38105,7 @@ var GeneratorCore = /* @__PURE__ */ function() {
               case 2:
                 _state.sent();
                 _this.setOutputPath(preOutputPath);
+                _this.setbasePath(preBasePath);
                 return [
                   2
                 ];
@@ -38102,10 +38118,10 @@ var GeneratorCore = /* @__PURE__ */ function() {
   return GeneratorCore2;
 }();
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.3/node_modules/@modern-js/codesmith/dist/esm/materials/index.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.5/node_modules/@modern-js/codesmith/dist/esm/materials/index.js
 var import_path6 = __toESM(require("path"));
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.3/node_modules/@modern-js/codesmith/dist/esm/utils/packageManager.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.5/node_modules/@modern-js/codesmith/dist/esm/utils/packageManager.js
 var import_path5 = __toESM(require("path"));
 function asyncGeneratorStep6(gen, resolve, reject, _next, _throw, key, arg) {
   try {
@@ -38438,7 +38454,7 @@ function _runInstall() {
   return _runInstall.apply(this, arguments);
 }
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.3/node_modules/@modern-js/codesmith/dist/esm/utils/timeoutPromise.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.5/node_modules/@modern-js/codesmith/dist/esm/utils/timeoutPromise.js
 function asyncGeneratorStep7(gen, resolve, reject, _next, _throw, key, arg) {
   try {
     var info = gen[key](arg);
@@ -38628,16 +38644,16 @@ function _timeoutPromise() {
   return _timeoutPromise.apply(this, arguments);
 }
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.3/node_modules/@modern-js/codesmith/dist/esm/utils/downloadPackage.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.5/node_modules/@modern-js/codesmith/dist/esm/utils/downloadPackage.js
 var import_os = __toESM(require("os"));
 var import_axios = __toESM(require_axios2());
 var import_tar = __toESM(require_tar());
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.3/node_modules/@modern-js/codesmith/dist/esm/constants.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.5/node_modules/@modern-js/codesmith/dist/esm/constants.js
 var NPM_API_TIMEOUT = 3e4;
 var CATCHE_VALIDITY_PREIOD = 12 * 3600 * 1e3;
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.3/node_modules/@modern-js/codesmith/dist/esm/utils/getNpmTarballUrl.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.5/node_modules/@modern-js/codesmith/dist/esm/utils/getNpmTarballUrl.js
 function asyncGeneratorStep8(gen, resolve, reject, _next, _throw, key, arg) {
   try {
     var info = gen[key](arg);
@@ -38814,7 +38830,7 @@ function _getNpmTarballUrl() {
   return _getNpmTarballUrl.apply(this, arguments);
 }
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.3/node_modules/@modern-js/codesmith/dist/esm/utils/getNpmVersion.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.5/node_modules/@modern-js/codesmith/dist/esm/utils/getNpmVersion.js
 function asyncGeneratorStep9(gen, resolve, reject, _next, _throw, key, arg) {
   try {
     var info = gen[key](arg);
@@ -38986,7 +39002,7 @@ function _getNpmVersion() {
   return _getNpmVersion.apply(this, arguments);
 }
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.3/node_modules/@modern-js/codesmith/dist/esm/utils/downloadPackage.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.5/node_modules/@modern-js/codesmith/dist/esm/utils/downloadPackage.js
 function asyncGeneratorStep10(gen, resolve, reject, _next, _throw, key, arg) {
   try {
     var info = gen[key](arg);
@@ -39240,6 +39256,11 @@ function _downloadPackage() {
         case 0:
           pkgVersion = _arguments.length > 1 && _arguments[1] !== void 0 ? _arguments[1] : "latest", options = _arguments.length > 2 && _arguments[2] !== void 0 ? _arguments[2] : {};
           registryUrl = options.registryUrl, install = options.install;
+          if (!!import_semver.default.valid(pkgVersion))
+            return [
+              3,
+              2
+            ];
           return [
             4,
             getNpmVersion(pkgName, {
@@ -39252,26 +39273,34 @@ function _downloadPackage() {
           if (version2 === void 0) {
             throw new Error("package ".concat(pkgName, "@").concat(pkgVersion, " not found in registry"));
           }
+          return [
+            3,
+            3
+          ];
+        case 2:
+          version2 = pkgVersion;
+          _state.label = 3;
+        case 3:
           targetDir = "".concat(import_os.default.tmpdir(), "/csmith-generator/").concat(pkgName, "@").concat(version2);
           return [
             4,
             fsExists(targetDir)
           ];
-        case 2:
+        case 4:
           _tmp = _state.sent();
           if (!_tmp)
             return [
               3,
-              4
+              6
             ];
           return [
             4,
             isValidCache(targetDir)
           ];
-        case 3:
+        case 5:
           _tmp = _state.sent();
-          _state.label = 4;
-        case 4:
+          _state.label = 6;
+        case 6:
           if (_tmp) {
             return [
               2,
@@ -39282,13 +39311,13 @@ function _downloadPackage() {
             4,
             import_fs_extra.default.remove(targetDir)
           ];
-        case 5:
+        case 7:
           _state.sent();
           return [
             4,
             import_fs_extra.default.mkdirp(targetDir)
           ];
-        case 6:
+        case 8:
           _state.sent();
           return [
             4,
@@ -39296,34 +39325,34 @@ function _downloadPackage() {
               registryUrl
             })
           ];
-        case 7:
+        case 9:
           tarballPkg = _state.sent();
           return [
             4,
             downloadAndDecompressTargz(tarballPkg, targetDir)
           ];
-        case 8:
+        case 10:
           _state.sent();
           if (!install)
             return [
               3,
-              10
+              12
             ];
           return [
             4,
             runInstall(targetDir, registryUrl)
           ];
-        case 9:
+        case 11:
           _state.sent();
-          _state.label = 10;
-        case 10:
+          _state.label = 12;
+        case 12:
           return [
             4,
             import_fs_extra.default.writeFile("".concat(targetDir, "/.codesmith.completed"), (/* @__PURE__ */ new Date()).toISOString(), {
               encoding: "utf-8"
             })
           ];
-        case 11:
+        case 13:
           _state.sent();
           return [
             2,
@@ -39335,7 +39364,7 @@ function _downloadPackage() {
   return _downloadPackage.apply(this, arguments);
 }
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.3/node_modules/@modern-js/codesmith/dist/esm/utils/getPackageInfo.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.5/node_modules/@modern-js/codesmith/dist/esm/utils/getPackageInfo.js
 function getPackageInfo(packageName) {
   if (!packageName) {
     throw new Error("package is not exisit");
@@ -39359,7 +39388,7 @@ function getPackageInfo(packageName) {
   };
 }
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.3/node_modules/@modern-js/codesmith/dist/esm/materials/index.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.5/node_modules/@modern-js/codesmith/dist/esm/materials/index.js
 function asyncGeneratorStep11(gen, resolve, reject, _next, _throw, key, arg) {
   try {
     var info = gen[key](arg);
@@ -39584,7 +39613,7 @@ var MaterialsManager = /* @__PURE__ */ function() {
   return MaterialsManager2;
 }();
 
-// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.3/node_modules/@modern-js/codesmith/dist/esm/codesmith/index.js
+// ../../../node_modules/.pnpm/@modern-js+codesmith@2.2.5/node_modules/@modern-js/codesmith/dist/esm/codesmith/index.js
 function asyncGeneratorStep12(gen, resolve, reject, _next, _throw, key, arg) {
   try {
     var info = gen[key](arg);
@@ -39896,7 +39925,7 @@ var CodeSmith = /* @__PURE__ */ function() {
 }();
 
 // package.json
-var version = "2.21.0";
+var version = "2.22.0";
 
 // ../../../node_modules/.pnpm/@swc+helpers@0.5.1/node_modules/@swc/helpers/esm/_define_property.js
 function _define_property7(obj, key, value) {
@@ -39973,7 +40002,7 @@ var I18n = class {
 // src/locale/zh.ts
 var ZH_LOCALE = {
   command: {
-    description: "创建 @modern-js 应用",
+    description: "创建 Modern.js 工程方案",
     mwa: "一键创建 Web 应用(使用默认配置)",
     module: "一键创建 Module 应用(使用默认配置)",
     monorepo: "一键常见 Monorepo 应用(使用默认配置)",
@@ -39999,7 +40028,7 @@ var ZH_LOCALE = {
 // src/locale/en.ts
 var EN_LOCALE = {
   command: {
-    description: "create @modern-js application",
+    description: "create Modern.js solution project",
     mwa: "create mwa application using default config",
     module: "create module application using default config",
     monorepo: "create monorepo application using default config",

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.21.0",
+  "version": "2.22.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/index.js",
@@ -37,18 +37,18 @@
     }
   },
   "devDependencies": {
-    "@modern-js/codesmith": "2.2.3",
+    "@modern-js/codesmith": "2.2.5",
     "@types/jest": "^29",
     "@types/node": "^14",
     "jest": "^29",
     "ts-node": "^10.9.1",
     "typescript": "^5",
-    "@modern-js/generator-plugin-plugin": "3.1.18",
-    "@modern-js/repo-generator": "3.1.18",
-    "@modern-js/plugin-i18n": "2.21.0",
-    "@modern-js/utils": "2.21.0",
-    "@scripts/jest-config": "2.21.0",
-    "@scripts/build": "2.21.0"
+    "@modern-js/generator-plugin-plugin": "3.1.20",
+    "@modern-js/plugin-i18n": "2.22.0",
+    "@modern-js/utils": "2.22.0",
+    "@modern-js/repo-generator": "3.1.20",
+    "@scripts/build": "2.22.0",
+    "@scripts/jest-config": "2.22.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",