@modern-js/server-generator 3.1.8 → 3.1.10

package/dist/index.js

@@ -118737,7 +118737,9 @@ var lazy = (moduleName, requireFn) => {
   const importLazyLocal = require_import_lazy()(requireFn);
   return importLazyLocal(moduleName);
 };
-var Import = { lazy };
+var Import = {
+  lazy
+};
 
 // ../../../toolkit/utils/dist/esm/compiled.js
 var import_fs_extra = __toESM(require_fs_extra());
@@ -118769,21 +118771,25 @@ var import_browserslist = __toESM(require_browserslist());
 var import_recursive_readdir = __toESM(require_recursive_readdir());
 var import_commander = __toESM(require_commander());
 var import_signale2 = __toESM(require_signale());
-var mime = Import.lazy(
-  "../compiled/mime-types",
-  require
-);
-var chokidar = Import.lazy(
-  "../compiled/chokidar",
-  require
-);
-var inquirer = Import.lazy(
-  "../compiled/inquirer",
-  require
-);
+var mime = Import.lazy("../compiled/mime-types", require);
+var chokidar = Import.lazy("../compiled/chokidar", require);
+var inquirer = Import.lazy("../compiled/inquirer", require);
 
 // ../../../toolkit/utils/dist/esm/logger.js
 var import_chalk2 = __toESM(require_chalk());
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
 var LOG_LEVEL = {
   error: 0,
   warn: 1,
@@ -118817,22 +118823,15 @@ var LOG_TYPES = {
     label: "debug",
     level: "debug"
   },
-  log: { level: "log" }
+  log: {
+    level: "log"
+  }
 };
 var DEFAULT_CONFIG = {
   displayLabel: true,
   uppercaseLabel: false
 };
 var Logger = class {
-  constructor(options = {}) {
-    this.level = options.level || LOG_TYPES.log.level;
-    this.config = __spreadValues(__spreadValues({}, DEFAULT_CONFIG), options.config || {});
-    this.types = __spreadValues(__spreadValues({}, LOG_TYPES), options.types || {});
-    this.longestLabel = this.getLongestLabel();
-    Object.keys(this.types).forEach((type) => {
-      this[type] = this._log.bind(this, type);
-    });
-  }
   _log(type, message, ...args) {
     if (message === void 0 || message === null) {
       console.log();
@@ -118873,6 +118872,19 @@ ${import_chalk2.default.grey(rest.join("\n"))}`;
     });
     return longestLabel;
   }
+  constructor(options = {}) {
+    _define_property(this, "level", void 0);
+    _define_property(this, "config", void 0);
+    _define_property(this, "types", void 0);
+    _define_property(this, "longestLabel", void 0);
+    this.level = options.level || LOG_TYPES.log.level;
+    this.config = __spreadValues(__spreadValues({}, DEFAULT_CONFIG), options.config || {});
+    this.types = __spreadValues(__spreadValues({}, LOG_TYPES), options.types || {});
+    this.longestLabel = this.getLongestLabel();
+    Object.keys(this.types).forEach((type) => {
+      this[type] = this._log.bind(this, type);
+    });
+  }
 };
 var logger = new Logger();
 logger.Logger = Logger;
@@ -118881,7 +118893,11 @@ logger.Logger = Logger;
 function canUseNpm() {
   return __async(this, null, function* () {
     try {
-      yield (0, import_execa.default)("npm", ["--version"], { env: process.env });
+      yield (0, import_execa.default)("npm", [
+        "--version"
+      ], {
+        env: process.env
+      });
       return true;
     } catch (e) {
       return false;
@@ -118891,7 +118907,11 @@ function canUseNpm() {
 function canUsePnpm() {
   return __async(this, null, function* () {
     try {
-      yield (0, import_execa.default)("pnpm", ["--version"], { env: process.env });
+      yield (0, import_execa.default)("pnpm", [
+        "--version"
+      ], {
+        env: process.env
+      });
       return true;
     } catch (e) {
       return false;
@@ -118917,26 +118937,29 @@ function getObjKeyMap(obj, prefix = "") {
     if ((0, import_lodash2.isString)(obj[key])) {
       result[key] = prefix ? `${prefix}.${key}` : key;
     } else if ((0, import_lodash2.isObject)(obj[key])) {
-      result[key] = getObjKeyMap(
-        obj[key],
-        prefix ? `${prefix}.${key}` : key
-      );
+      result[key] = getObjKeyMap(obj[key], prefix ? `${prefix}.${key}` : key);
     }
   });
   return result;
 }
 
 // ../../../cli/plugin-i18n/dist/esm-node/index.js
-var I18n = class {
-  constructor() {
-    this.language = "en";
-    this.languageMap = {};
+function _define_property2(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
   }
+  return obj;
+}
+var I18n = class {
   format(msg, vars) {
-    return msg.replace(
-      /\{(\w+)\}/g,
-      (_match, capture) => Object.prototype.hasOwnProperty.call(vars, capture) ? vars[capture] : capture
-    );
+    return msg.replace(/\{(\w+)\}/g, (_match, capture) => Object.prototype.hasOwnProperty.call(vars, capture) ? vars[capture] : capture);
   }
   getMessage(lang, key, vars, fallbackText) {
     const languages = Object.keys(this.languageMap);
@@ -118973,6 +118996,10 @@ var I18n = class {
       t: (key, vars, fallbackText) => this.getMessage(lang, key, vars, fallbackText)
     };
   }
+  constructor() {
+    _define_property2(this, "language", "en");
+    _define_property2(this, "languageMap", {});
+  }
 };
 
 // ../../generator-common/dist/esm-node/locale/zh.js
@@ -119172,42 +119199,68 @@ var EN_LOCALE = {
 
 // ../../generator-common/dist/esm-node/locale/index.js
 var i18n = new I18n();
-var localeKeys = i18n.init("en", { zh: ZH_LOCALE, en: EN_LOCALE });
+var localeKeys = i18n.init("en", {
+  zh: ZH_LOCALE,
+  en: EN_LOCALE
+});
 
 // ../../generator-common/dist/esm-node/common/solution.js
-var Solution = /* @__PURE__ */ ((Solution2) => {
+var Solution;
+(function(Solution2) {
   Solution2["MWA"] = "mwa";
   Solution2["Module"] = "module";
   Solution2["Doc"] = "doc";
   Solution2["Monorepo"] = "monorepo";
-  return Solution2;
-})(Solution || {});
+})(Solution || (Solution = {}));
+var SubSolution;
+(function(SubSolution2) {
+  SubSolution2["MWA"] = "mwa";
+  SubSolution2["MWATest"] = "mwa_test";
+  SubSolution2["Module"] = "module";
+  SubSolution2["InnerModule"] = "inner_module";
+})(SubSolution || (SubSolution = {}));
+var SolutionText = {
+  [Solution.MWA]: () => i18n.t(localeKeys.solution.mwa),
+  [Solution.Module]: () => i18n.t(localeKeys.solution.module),
+  [Solution.Doc]: () => i18n.t(localeKeys.solution.doc),
+  [Solution.Monorepo]: () => i18n.t(localeKeys.solution.monorepo)
+};
+var SubSolutionText = {
+  [SubSolution.MWA]: () => i18n.t(localeKeys.sub_solution.mwa),
+  [SubSolution.MWATest]: () => i18n.t(localeKeys.sub_solution.mwa_test),
+  [SubSolution.Module]: () => i18n.t(localeKeys.sub_solution.module),
+  [SubSolution.InnerModule]: () => i18n.t(localeKeys.sub_solution.inner_module)
+};
 var SolutionToolsMap = {
-  [
-    "mwa"
-    /* MWA */
-  ]: "@modern-js/app-tools",
-  [
-    "module"
-    /* Module */
-  ]: "@modern-js/module-tools",
-  [
-    "doc"
-    /* Doc */
-  ]: "@modern-js/doc-tools",
-  [
-    "monorepo"
-    /* Monorepo */
-  ]: "@modern-js/monorepo-tools"
+  [Solution.MWA]: "@modern-js/app-tools",
+  [Solution.Module]: "@modern-js/module-tools",
+  [Solution.Doc]: "@modern-js/doc-tools",
+  [Solution.Monorepo]: "@modern-js/monorepo-tools"
+};
+var SolutionGenerator = {
+  [Solution.MWA]: "@modern-js/mwa-generator",
+  [Solution.Module]: "@modern-js/module-generator",
+  [Solution.Doc]: "@modern-js/doc-generator",
+  [Solution.Monorepo]: "@modern-js/monorepo-generator"
+};
+var SubSolutionGenerator = {
+  [SubSolution.MWA]: "@modern-js/mwa-generator",
+  [SubSolution.MWATest]: "@modern-js/mwa-generator",
+  [SubSolution.Module]: "@modern-js/module-generator",
+  [SubSolution.InnerModule]: "@modern-js/module-generator"
 };
 var DependenceGenerator = "@modern-js/dependence-generator";
 
 // ../../generator-common/dist/esm-node/common/language.js
-var Language = /* @__PURE__ */ ((Language2) => {
+var Language;
+(function(Language2) {
   Language2["TS"] = "ts";
   Language2["JS"] = "js";
-  return Language2;
-})(Language || {});
+})(Language || (Language = {}));
+var LanguageName = {
+  [Language.TS]: "TS",
+  [Language.JS]: "ES6+"
+};
 
 // ../../generator-utils/dist/esm/utils/stripAnsi.js
 function ansiRegex({ onlyFirst = false } = {}) {
@@ -119228,7 +119281,11 @@ function stripAnsi2(string) {
 function isPackageExist(packageName, registry2) {
   return __async(this, null, function* () {
     if (yield canUseNpm()) {
-      const args = ["view", packageName, "version"];
+      const args = [
+        "view",
+        packageName,
+        "version"
+      ];
       if (registry2) {
         args.push(`--registry=${registry2}`);
       }
@@ -119241,7 +119298,11 @@ function isPackageExist(packageName, registry2) {
 function isPackageDeprecated(packageName, registry2) {
   return __async(this, null, function* () {
     if (yield canUseNpm()) {
-      const args = ["view", packageName, "deprecated"];
+      const args = [
+        "view",
+        packageName,
+        "deprecated"
+      ];
       if (registry2) {
         args.push(`--registry=${registry2}`);
       }
@@ -119252,7 +119313,9 @@ function isPackageDeprecated(packageName, registry2) {
   });
 }
 function semverDecrease(version) {
-  const versionObj = import_semver.default.parse(version, { loose: true });
+  const versionObj = import_semver.default.parse(version, {
+    loose: true
+  });
   if (!versionObj) {
     throw new Error(`Version ${version} is not valid semver`);
   }
@@ -119299,7 +119362,11 @@ function getPackageVersion(packageName, registry2) {
       spinner: "runner"
     }).start();
     if (yield canUsePnpm()) {
-      const args = ["info", packageName, "version"];
+      const args = [
+        "info",
+        packageName,
+        "version"
+      ];
       if (registry2) {
         args.push(`--registry=${registry2}`);
       }
@@ -119308,7 +119375,11 @@ function getPackageVersion(packageName, registry2) {
       return stripAnsi2(result.stdout);
     }
     if (yield canUseNpm()) {
-      const args = ["view", packageName, "version"];
+      const args = [
+        "view",
+        packageName,
+        "version"
+      ];
       if (registry2) {
         args.push(`--registry=${registry2}`);
       }
@@ -119326,20 +119397,17 @@ function getModernPluginVersion(_0, _1) {
   }) {
     const { cwd = process.cwd(), registry: registry2, distTag } = options;
     const getLatetPluginVersion = (tag) => __async(this, null, function* () {
-      const version = yield getPackageVersion(
-        `${packageName}@${tag || distTag || "latest"}`,
-        registry2
-      );
+      const version = yield getPackageVersion(`${packageName}@${tag || distTag || "latest"}`, registry2);
       return version;
     });
     if (!packageName.startsWith("@modern-js") || packageName.includes("electron") || packageName.includes("codesmith") || packageName.includes("easy-form") || packageName.startsWith("@modern-js-reduck")) {
       return getLatetPluginVersion("latest");
     }
-    const pkgPath = import_path2.default.join(
-      require.resolve(SolutionToolsMap[solution], { paths: [cwd] }),
-      "../../../../",
-      "package.json"
-    );
+    const pkgPath = import_path2.default.join(require.resolve(SolutionToolsMap[solution], {
+      paths: [
+        cwd
+      ]
+    }), "../../../../", "package.json");
     if (import_fs_extra.default.existsSync(pkgPath)) {
       const pkgInfo = import_fs_extra.default.readJSONSync(pkgPath);
       const modernVersion = pkgInfo.version;

package/package.json

@@ -3,7 +3,11 @@
   "description": "A Progressive React Framework for modern web development.",
   "homepage": "https://modernjs.dev",
   "bugs": "https://github.com/web-infra-dev/modern.js/issues",
-  "repository": "web-infra-dev/modern.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/web-infra-dev/modern.js",
+    "directory": "packages/generator/generators/server-generator"
+  },
   "license": "MIT",
   "keywords": [
     "react",
@@ -11,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.1.8",
+  "version": "3.1.10",
   "jsnext:source": "./src/index.ts",
   "types": "./src/index.ts",
   "main": "./dist/index.js",
@@ -28,11 +32,11 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^4",
-    "@modern-js/generator-common": "3.1.8",
-    "@modern-js/generator-utils": "3.1.8",
-    "@modern-js/dependence-generator": "3.1.8",
-    "@scripts/build": "2.14.0",
-    "@scripts/jest-config": "2.14.0"
+    "@modern-js/generator-common": "3.1.10",
+    "@modern-js/dependence-generator": "3.1.10",
+    "@modern-js/generator-utils": "3.1.10",
+    "@scripts/build": "2.16.0",
+    "@scripts/jest-config": "2.16.0"
   },
   "sideEffects": false,
   "publishConfig": {