@modern-js/mwa-generator 3.1.9 → 3.1.10

package/dist/index.js

@@ -133982,26 +133982,29 @@ function getObjKeyMap2(obj, prefix = "") {
     if ((0, import_lodash6.isString)(obj[key])) {
       result[key] = prefix ? `${prefix}.${key}` : key;
     } else if ((0, import_lodash6.isObject)(obj[key])) {
-      result[key] = getObjKeyMap2(
-        obj[key],
-        prefix ? `${prefix}.${key}` : key
-      );
+      result[key] = getObjKeyMap2(obj[key], prefix ? `${prefix}.${key}` : key);
     }
   });
   return result;
 }
 
 // ../../../cli/plugin-i18n/dist/esm-node/index.js
-var I18n2 = class {
-  constructor() {
-    this.language = "en";
-    this.languageMap = {};
+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 I18n2 = 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);
@@ -134038,6 +134041,10 @@ var I18n2 = class {
       t: (key, vars, fallbackText) => this.getMessage(lang, key, vars, fallbackText)
     };
   }
+  constructor() {
+    _define_property(this, "language", "en");
+    _define_property(this, "languageMap", {});
+  }
 };
 
 // ../../generator-common/dist/esm-node/locale/zh.js
@@ -134237,61 +134244,81 @@ var EN_LOCALE2 = {
 
 // ../../generator-common/dist/esm-node/locale/index.js
 var i18n2 = new I18n2();
-var localeKeys2 = i18n2.init("en", { zh: ZH_LOCALE2, en: EN_LOCALE2 });
+var localeKeys2 = i18n2.init("en", {
+  zh: ZH_LOCALE2,
+  en: EN_LOCALE2
+});
 
 // ../../generator-common/dist/esm-node/common/boolean.js
-var BooleanConfig = /* @__PURE__ */ ((BooleanConfig2) => {
+var BooleanConfig;
+(function(BooleanConfig2) {
   BooleanConfig2["NO"] = "no";
   BooleanConfig2["YES"] = "yes";
-  return BooleanConfig2;
-})(BooleanConfig || {});
+})(BooleanConfig || (BooleanConfig = {}));
+var BooleanConfigName = {
+  [BooleanConfig.NO]: () => i18n2.t(localeKeys2.boolean.no),
+  [BooleanConfig.YES]: () => i18n2.t(localeKeys2.boolean.yes)
+};
 
 // ../../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]: () => i18n2.t(localeKeys2.solution.mwa),
+  [Solution.Module]: () => i18n2.t(localeKeys2.solution.module),
+  [Solution.Doc]: () => i18n2.t(localeKeys2.solution.doc),
+  [Solution.Monorepo]: () => i18n2.t(localeKeys2.solution.monorepo)
+};
+var SubSolutionText = {
+  [SubSolution.MWA]: () => i18n2.t(localeKeys2.sub_solution.mwa),
+  [SubSolution.MWATest]: () => i18n2.t(localeKeys2.sub_solution.mwa_test),
+  [SubSolution.Module]: () => i18n2.t(localeKeys2.sub_solution.module),
+  [SubSolution.InnerModule]: () => i18n2.t(localeKeys2.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 BaseGenerator = "@modern-js/base-generator";
 var PackagesGenerator = "@modern-js/packages-generator";
 var RspackGenerator = "@modern-js/rspack-generator";
+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 EntryGenerator = "@modern-js/entry-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 = {
-  [
-    "ts"
-    /* TS */
-  ]: "TS",
-  [
-    "js"
-    /* JS */
-  ]: "ES6+"
+  [Language.TS]: "TS",
+  [Language.JS]: "ES6+"
 };
 var getLanguageSchema = (_extra = {}) => {
   return {
@@ -134305,33 +134332,24 @@ var getLanguageSchema = (_extra = {}) => {
 };
 
 // ../../generator-common/dist/esm-node/common/packageManager.js
-var PackageManager = /* @__PURE__ */ ((PackageManager2) => {
+var PackageManager;
+(function(PackageManager2) {
   PackageManager2["Pnpm"] = "pnpm";
   PackageManager2["Yarn"] = "yarn";
   PackageManager2["Npm"] = "npm";
-  return PackageManager2;
-})(PackageManager || {});
+})(PackageManager || (PackageManager = {}));
 var PackageManagerName = {
-  [
-    "pnpm"
-    /* Pnpm */
-  ]: "pnpm",
-  [
-    "yarn"
-    /* Yarn */
-  ]: "Yarn",
-  [
-    "npm"
-    /* Npm */
-  ]: "npm"
+  [PackageManager.Pnpm]: "pnpm",
+  [PackageManager.Yarn]: "Yarn",
+  [PackageManager.Npm]: "npm"
 };
 var getPackageManagerSchema = (extra = {}) => {
   return {
     type: "string",
     title: i18n2.t(localeKeys2.packageManager.self),
-    enum: Object.values(PackageManager).filter(
-      (packageManager) => (extra == null ? void 0 : extra.solution) === "monorepo" ? packageManager !== "npm" : true
-    ).map((packageManager) => ({
+    enum: Object.values(PackageManager).filter((packageManager) => {
+      return (extra === null || extra === void 0 ? void 0 : extra.solution) === "monorepo" ? packageManager !== PackageManager.Npm : true;
+    }).map((packageManager) => ({
       value: packageManager,
       label: PackageManagerName[packageManager]
     })),
@@ -134340,7 +134358,7 @@ var getPackageManagerSchema = (extra = {}) => {
         dependencies: [],
         fulfill: {
           state: {
-            visible: !(extra == null ? void 0 : extra.isMonorepoSubProject) && !(extra == null ? void 0 : extra.isSubProject)
+            visible: !(extra === null || extra === void 0 ? void 0 : extra.isMonorepoSubProject) && !(extra === null || extra === void 0 ? void 0 : extra.isSubProject)
           }
         }
       }
@@ -134352,13 +134370,13 @@ var getPackageManagerSchema = (extra = {}) => {
 var getPackageNameSchema = (extra = {}) => {
   return {
     type: "string",
-    title: (extra == null ? void 0 : extra.isMonorepoSubProject) ? i18n2.t(localeKeys2.packageName.sub_name) : i18n2.t(localeKeys2.packageName.self),
+    title: (extra === null || extra === void 0 ? void 0 : extra.isMonorepoSubProject) ? i18n2.t(localeKeys2.packageName.sub_name) : i18n2.t(localeKeys2.packageName.self),
     "x-reactions": [
       {
         dependencies: [],
         fulfill: {
           state: {
-            visible: Boolean(extra == null ? void 0 : extra.isMonorepoSubProject) || !(extra == null ? void 0 : extra.isMwa) && !(extra == null ? void 0 : extra.isDoc)
+            visible: Boolean(extra === null || extra === void 0 ? void 0 : extra.isMonorepoSubProject) || !(extra === null || extra === void 0 ? void 0 : extra.isMwa) && !(extra === null || extra === void 0 ? void 0 : extra.isDoc)
           }
         }
       }
@@ -134373,20 +134391,20 @@ var getPackageNameSchema = (extra = {}) => {
 };
 
 // ../../generator-common/dist/esm-node/common/packagePath.js
-var PackagePathRegex = new RegExp(
-  "^[a-z0-9]*[-_/]?([a-z0-9]*[-_]?[a-z0-9]*)*[-_/]?[a-z0-9-_]+$"
-);
+var PackagePathRegex = new RegExp("^[a-z0-9-_]+[a-z0-9-/_]*$");
 var getPackagePathSchema = (extra) => {
   return {
     type: "string",
     title: i18n2.t(localeKeys2.packagePath.self),
     "x-reactions": [
       {
-        dependencies: ["packageName"],
+        dependencies: [
+          "packageName"
+        ],
         fulfill: {
           state: {
             value: "{{$deps[0]}}",
-            visible: Boolean(extra == null ? void 0 : extra.isMonorepoSubProject)
+            visible: Boolean(extra === null || extra === void 0 ? void 0 : extra.isMonorepoSubProject)
           }
         }
       }
@@ -134404,11 +134422,16 @@ var getPackagePathSchema = (extra) => {
 };
 
 // ../../generator-common/dist/esm-node/mwa/common.js
-var BuildTools = /* @__PURE__ */ ((BuildTools2) => {
+var Framework;
+(function(Framework2) {
+  Framework2["Express"] = "express";
+  Framework2["Koa"] = "koa";
+})(Framework || (Framework = {}));
+var BuildTools;
+(function(BuildTools2) {
   BuildTools2["Webpack"] = "webpack";
   BuildTools2["Rspack"] = "rspack";
-  return BuildTools2;
-})(BuildTools || {});
+})(BuildTools || (BuildTools = {}));
 var getBuildToolsSchema = (_extra = {}) => {
   return {
     type: "string",
@@ -134419,6 +134442,10 @@ var getBuildToolsSchema = (_extra = {}) => {
     }))
   };
 };
+var FrameworkAppendTypeContent = {
+  [Framework.Express]: `/// <reference types='@modern-js/plugin-express/types' />`,
+  [Framework.Koa]: `/// <reference types='@modern-js/plugin-koa/types' />`
+};
 
 // ../../generator-common/dist/esm-node/mwa/project.js
 var getMWASchemaProperties = (extra) => {
@@ -134451,7 +134478,9 @@ var lazy = (moduleName, requireFn) => {
   const importLazyLocal = require_import_lazy2()(requireFn);
   return importLazyLocal(moduleName);
 };
-var Import = { lazy };
+var Import = {
+  lazy
+};
 
 // ../../../toolkit/utils/dist/esm/compiled.js
 var import_fs_extra = __toESM(require_fs_extra2());
@@ -134483,18 +134512,9 @@ var import_browserslist = __toESM(require_browserslist2());
 var import_recursive_readdir = __toESM(require_recursive_readdir2());
 var import_commander = __toESM(require_commander2());
 var import_signale2 = __toESM(require_signale2());
-var mime = Import.lazy(
-  "../compiled/mime-types",
-  require
-);
-var chokidar = Import.lazy(
-  "../compiled/chokidar",
-  require
-);
-var inquirer3 = Import.lazy(
-  "../compiled/inquirer",
-  require
-);
+var mime = Import.lazy("../compiled/mime-types", require);
+var chokidar = Import.lazy("../compiled/chokidar", require);
+var inquirer3 = Import.lazy("../compiled/inquirer", require);
 
 // ../../../toolkit/utils/dist/esm/monorepo.js
 var import_fs = __toESM(require("fs"));
@@ -134506,44 +134526,36 @@ var WORKSPACE_FILES = {
 };
 var isLerna = (root) => import_fs.default.existsSync(import_path5.default.join(root, WORKSPACE_FILES.LERNA));
 var isYarnWorkspaces = (root) => {
-  var _a2;
+  var _json_workspaces;
   const pkg = import_path5.default.join(root, WORKSPACE_FILES.YARN);
   if (!import_fs.default.existsSync(pkg)) {
     return false;
   }
   const json = JSON.parse(import_fs.default.readFileSync(pkg, "utf8"));
-  return Boolean((_a2 = json.workspaces) == null ? void 0 : _a2.packages);
+  return Boolean((_json_workspaces = json.workspaces) === null || _json_workspaces === void 0 ? void 0 : _json_workspaces.packages);
 };
 var getMonorepoPackages = (root) => {
   let packages = [];
   if (isYarnWorkspaces(root)) {
-    const json = JSON.parse(
-      import_fs.default.readFileSync(import_path5.default.join(root, "package.json"), "utf8")
-    );
+    const json = JSON.parse(import_fs.default.readFileSync(import_path5.default.join(root, "package.json"), "utf8"));
     ({ packages } = json.workspaces);
   } else if (isLerna(root)) {
-    const json = JSON.parse(
-      import_fs.default.readFileSync(import_path5.default.resolve(root, "lerna.json"), "utf8")
-    );
+    const json = JSON.parse(import_fs.default.readFileSync(import_path5.default.resolve(root, "lerna.json"), "utf8"));
     ({ packages } = json);
   } else {
-    ({ packages } = import_js_yaml.default.load(
-      import_fs.default.readFileSync(import_path5.default.join(root, WORKSPACE_FILES.PNPM), "utf8")
-    ));
+    ({ packages } = import_js_yaml.default.load(import_fs.default.readFileSync(import_path5.default.join(root, WORKSPACE_FILES.PNPM), "utf8")));
   }
   if (packages) {
-    return packages.map(
-      (name) => (
-        // The trailing / ensures only dirs are picked up
-        import_glob.default.sync(import_path5.default.join(root, `${name}/`), {
-          ignore: ["**/node_modules/**"]
-        })
-      )
-    ).reduce((acc, val) => acc.concat(val), []).filter((filepath) => import_fs.default.existsSync(import_path5.default.resolve(filepath, "package.json"))).map((filepath) => ({
+    return packages.map((name) => (
+      // The trailing / ensures only dirs are picked up
+      import_glob.default.sync(import_path5.default.join(root, `${name}/`), {
+        ignore: [
+          "**/node_modules/**"
+        ]
+      })
+    )).reduce((acc, val) => acc.concat(val), []).filter((filepath) => import_fs.default.existsSync(import_path5.default.resolve(filepath, "package.json"))).map((filepath) => ({
       path: filepath,
-      name: JSON.parse(
-        import_fs.default.readFileSync(import_path5.default.resolve(filepath, "package.json"), "utf8")
-      ).name
+      name: JSON.parse(import_fs.default.readFileSync(import_path5.default.resolve(filepath, "package.json"), "utf8")).name
     }));
   }
   return [];
@@ -134553,7 +134565,11 @@ var getMonorepoPackages = (root) => {
 function canUseNpm2() {
   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;
@@ -134563,7 +134579,11 @@ function canUseNpm2() {
 function canUsePnpm2() {
   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;
@@ -134588,19 +134608,30 @@ function stripAnsi3(string) {
 
 // ../../generator-utils/dist/esm/locale/zh.js
 var ZH_LOCALE3 = {
-  packageName: { exit: "项目名称 {value} 已存在" },
-  packagePath: { exit: "目录 {value} 已存在" }
+  packageName: {
+    exit: "项目名称 {value} 已存在"
+  },
+  packagePath: {
+    exit: "目录 {value} 已存在"
+  }
 };
 
 // ../../generator-utils/dist/esm/locale/en.js
 var EN_LOCALE3 = {
-  packageName: { exit: "package name `{value}` is already exists" },
-  packagePath: { exit: "package path {value} is already exists" }
+  packageName: {
+    exit: "package name `{value}` is already exists"
+  },
+  packagePath: {
+    exit: "package path {value} is already exists"
+  }
 };
 
 // ../../generator-utils/dist/esm/locale/index.js
 var i18n3 = new I18n2();
-var localeKeys3 = i18n3.init("en", { zh: ZH_LOCALE3, en: EN_LOCALE3 });
+var localeKeys3 = i18n3.init("en", {
+  zh: ZH_LOCALE3,
+  en: EN_LOCALE3
+});
 
 // ../../generator-utils/dist/esm/index.js
 function getPackageVersion(packageName, registry2) {
@@ -134610,7 +134641,11 @@ function getPackageVersion(packageName, registry2) {
       spinner: "runner"
     }).start();
     if (yield canUsePnpm2()) {
-      const args = ["info", packageName, "version"];
+      const args = [
+        "info",
+        packageName,
+        "version"
+      ];
       if (registry2) {
         args.push(`--registry=${registry2}`);
       }
@@ -134619,7 +134654,11 @@ function getPackageVersion(packageName, registry2) {
       return stripAnsi3(result.stdout);
     }
     if (yield canUseNpm2()) {
-      const args = ["view", packageName, "version"];
+      const args = [
+        "view",
+        packageName,
+        "version"
+      ];
       if (registry2) {
         args.push(`--registry=${registry2}`);
       }
@@ -134650,10 +134689,14 @@ function validatePackageName(value, packages, options) {
   if (isMonorepoSubProject && packages.includes(value)) {
     return {
       success: false,
-      error: i18n3.t(localeKeys3.packageName.exit, { value })
+      error: i18n3.t(localeKeys3.packageName.exit, {
+        value
+      })
     };
   }
-  return { success: true };
+  return {
+    success: true
+  };
 }
 function validatePackagePath(value, projectDir, options) {
   const { isMwa, isPublic, isTest, isDoc } = options || {};
@@ -134669,10 +134712,14 @@ function validatePackagePath(value, projectDir, options) {
   if (import_fs_extra.default.existsSync(packageDir)) {
     return {
       success: false,
-      error: i18n3.t(localeKeys3.packagePath.exit, { value })
+      error: i18n3.t(localeKeys3.packagePath.exit, {
+        value
+      })
     };
   }
-  return { success: true };
+  return {
+    success: true
+  };
 }
 function getMWAProjectPath(packagePath, isMonorepoSubProject, isTest = false) {
   if (isMonorepoSubProject && packagePath) {

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/mwa-generator"
+  },
   "license": "MIT",
   "keywords": [
     "react",
@@ -11,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.1.9",
+  "version": "3.1.10",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/index.js",
   "files": [
@@ -27,16 +31,16 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^4",
-    "@modern-js/base-generator": "3.1.9",
-    "@modern-js/dependence-generator": "3.1.9",
-    "@modern-js/entry-generator": "3.1.9",
-    "@modern-js/generator-common": "3.1.9",
-    "@modern-js/generator-utils": "3.1.9",
-    "@modern-js/packages-generator": "3.1.9",
-    "@modern-js/rspack-generator": "3.1.9",
-    "@modern-js/plugin-i18n": "2.15.0",
-    "@scripts/build": "2.15.0",
-    "@scripts/jest-config": "2.15.0"
+    "@modern-js/base-generator": "3.1.10",
+    "@modern-js/dependence-generator": "3.1.10",
+    "@modern-js/entry-generator": "3.1.10",
+    "@modern-js/generator-common": "3.1.10",
+    "@modern-js/generator-utils": "3.1.10",
+    "@modern-js/packages-generator": "3.1.10",
+    "@modern-js/rspack-generator": "3.1.10",
+    "@modern-js/plugin-i18n": "2.16.0",
+    "@scripts/build": "2.16.0",
+    "@scripts/jest-config": "2.16.0"
   },
   "sideEffects": false,
   "publishConfig": {