@modern-js/mwa-generator 3.4.16 → 3.5.0

package/dist/index.js

@@ -61784,98 +61784,6 @@ var I18n2 = class {
   }
 };
 
-// ../../generator-common/dist/esm-node/locale/zh.js
-var ZH_LOCALE2 = {
-  solution: {
-    self: "请选择你想创建的工程类型",
-    mwa: "Web 应用",
-    module: "Npm 模块",
-    custom: "自定义",
-    default: "默认"
-  },
-  scenes: {
-    self: "请选择项目场景"
-  },
-  sub_solution: {
-    self: "请选择你想创建的工程类型",
-    mwa: "Web 应用",
-    module: "Npm 模块"
-  },
-  action: {
-    self: "请选择你想要的操作",
-    function: {
-      self: "启用可选功能",
-      question: "请选择功能名称",
-      tailwindcss: "启用「Tailwind CSS」 支持",
-      bff: "启用「BFF」功能",
-      micro_frontend: "启用「微前端」模式",
-      i18n: "启用「国际化（i18n）」功能",
-      storybookV7: "启用「Storybook」V7",
-      runtime_api: "启用「Runtime API」",
-      ssg: "启用「SSG」功能",
-      polyfill: "启用「基于 UA 的 Polyfill」功能",
-      proxy: "启用「全局代理」",
-      swc: "启用「SWC 编译」",
-      module_doc: "启动「模块文档」功能"
-    },
-    element: {
-      self: "创建工程元素",
-      question: "请选择创建元素类型",
-      entry: "新建「应用入口」",
-      server: "新建「自定义 Web Server」源码目录"
-    },
-    refactor: {
-      self: "自动重构",
-      question: "请选择重构类型",
-      react_router_5: "使用 React Router v5"
-    }
-  },
-  boolean: {
-    yes: "是",
-    no: "否"
-  },
-  language: {
-    self: "请选择开发语言"
-  },
-  packageManager: {
-    self: "请选择包管理工具"
-  },
-  entry: {
-    name: "请填写入口名称",
-    no_empty: "入口名称不能为空！",
-    no_pages: '入口名称不支持 "pages"！'
-  },
-  packageName: {
-    self: "请填写项目名称",
-    sub_name: "请填写子项目名称",
-    no_empty: "项目名称不能为空！"
-  },
-  packagePath: {
-    self: "请填写子项目目录名称",
-    no_empty: "目录名称不能为空！",
-    format: "目录名称只能使用小写字母、数字和分隔线（-）、下划线（_）和目录分隔符（/）"
-  },
-  framework: {
-    self: "请选择运行时框架",
-    egg: "Egg",
-    express: "Express",
-    koa: "Koa",
-    nest: "Nest"
-  },
-  bff: {
-    bffType: {
-      self: "请选择 BFF 类型",
-      func: "函数模式",
-      framework: "框架模式"
-    }
-  },
-  buildTools: {
-    self: "请选择构建工具",
-    webpack: "webpack",
-    rspack: "Rspack (实验性)"
-  }
-};
-
 // ../../generator-common/dist/esm-node/locale/en.js
 var EN_LOCALE2 = {
   solution: {
@@ -61960,11 +61868,93 @@ var EN_LOCALE2 = {
       func: "Function",
       framework: "Framework"
     }
+  }
+};
+
+// ../../generator-common/dist/esm-node/locale/zh.js
+var ZH_LOCALE2 = {
+  solution: {
+    self: "请选择你想创建的工程类型",
+    mwa: "Web 应用",
+    module: "Npm 模块",
+    custom: "自定义",
+    default: "默认"
+  },
+  scenes: {
+    self: "请选择项目场景"
+  },
+  sub_solution: {
+    self: "请选择你想创建的工程类型",
+    mwa: "Web 应用",
+    module: "Npm 模块"
+  },
+  action: {
+    self: "请选择你想要的操作",
+    function: {
+      self: "启用可选功能",
+      question: "请选择功能名称",
+      tailwindcss: "启用「Tailwind CSS」 支持",
+      bff: "启用「BFF」功能",
+      micro_frontend: "启用「微前端」模式",
+      i18n: "启用「国际化（i18n）」功能",
+      storybookV7: "启用「Storybook」V7",
+      runtime_api: "启用「Runtime API」",
+      ssg: "启用「SSG」功能",
+      polyfill: "启用「基于 UA 的 Polyfill」功能",
+      proxy: "启用「全局代理」",
+      swc: "启用「SWC 编译」",
+      module_doc: "启动「模块文档」功能"
+    },
+    element: {
+      self: "创建工程元素",
+      question: "请选择创建元素类型",
+      entry: "新建「应用入口」",
+      server: "新建「自定义 Web Server」源码目录"
+    },
+    refactor: {
+      self: "自动重构",
+      question: "请选择重构类型",
+      react_router_5: "使用 React Router v5"
+    }
+  },
+  boolean: {
+    yes: "是",
+    no: "否"
+  },
+  language: {
+    self: "请选择开发语言"
+  },
+  packageManager: {
+    self: "请选择包管理工具"
+  },
+  entry: {
+    name: "请填写入口名称",
+    no_empty: "入口名称不能为空！",
+    no_pages: '入口名称不支持 "pages"！'
+  },
+  packageName: {
+    self: "请填写项目名称",
+    sub_name: "请填写子项目名称",
+    no_empty: "项目名称不能为空！"
   },
-  buildTools: {
-    self: "Please select the bundler:",
-    webpack: "webpack",
-    rspack: "Rspack (experimental)"
+  packagePath: {
+    self: "请填写子项目目录名称",
+    no_empty: "目录名称不能为空！",
+    format: "目录名称只能使用小写字母、数字和分隔线（-）、下划线（_）和目录分隔符（/）"
+  },
+  framework: {
+    self: "请选择运行时框架",
+    egg: "Egg",
+    express: "Express",
+    koa: "Koa",
+    nest: "Nest"
+  },
+  bff: {
+    bffType: {
+      self: "请选择 BFF 类型",
+      func: "函数模式",
+      framework: "框架模式"
+    }
   }
 };
 
@@ -62105,36 +62095,13 @@ var getPackagePathSchema = (extra) => {
   };
 };
 
-// ../../generator-common/dist/esm-node/mwa/common.js
-var Framework;
-(function(Framework2) {
-  Framework2["Express"] = "express";
-  Framework2["Koa"] = "koa";
-})(Framework || (Framework = {}));
-var BuildTools;
-(function(BuildTools2) {
-  BuildTools2["Webpack"] = "webpack";
-  BuildTools2["Rspack"] = "rspack";
-})(BuildTools || (BuildTools = {}));
-var getBuildToolsSchema = (_extra = {}) => {
-  return {
-    type: "string",
-    title: i18n2.t(localeKeys2.buildTools.self),
-    enum: Object.values(BuildTools).map((tool) => ({
-      value: tool,
-      label: i18n2.t(localeKeys2.buildTools[tool])
-    }))
-  };
-};
-
 // ../../generator-common/dist/esm-node/mwa/project.js
 var getMWASchemaProperties = (extra) => {
   return {
     packageName: getPackageNameSchema(extra),
     packagePath: getPackagePathSchema(extra),
     language: getLanguageSchema(extra),
-    packageManager: getPackageManagerSchema(extra),
-    buildTools: getBuildToolsSchema(extra)
+    packageManager: getPackageManagerSchema(extra)
   };
 };
 var getMWASchema = (extra = {}) => {
@@ -62146,46 +62113,30 @@ var getMWASchema = (extra = {}) => {
 var MWADefaultConfig = {
   language: Language.TS,
   packageManager: PackageManager.Pnpm,
-  needModifyMWAConfig: BooleanConfig.NO,
-  buildTools: BuildTools.Webpack
+  needModifyMWAConfig: BooleanConfig.NO
 };
 
 // ../../generator-utils/dist/esm/index.js
 var import_path6 = __toESM(require("path"));
 var import_utils15 = require("@modern-js/utils");
 
-// ../../generator-utils/dist/esm/utils/stripAnsi.js
-function ansiRegex2({ onlyFirst = false } = {}) {
-  const pattern = [
-    "[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)",
-    "(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))"
-  ].join("|");
-  return new RegExp(pattern, onlyFirst ? void 0 : "g");
-}
-function stripAnsi2(string) {
-  if (typeof string !== "string") {
-    throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``);
-  }
-  return string.replace(ansiRegex2(), "");
-}
-
-// ../../generator-utils/dist/esm/locale/zh.js
-var ZH_LOCALE3 = {
+// ../../generator-utils/dist/esm/locale/en.js
+var EN_LOCALE3 = {
   packageName: {
-    exit: "项目名称 {value} 已存在"
+    exit: "package name `{value}` is already exists"
   },
   packagePath: {
-    exit: "目录 {value} 已存在"
+    exit: "package path {value} is already exists"
   }
 };
 
-// ../../generator-utils/dist/esm/locale/en.js
-var EN_LOCALE3 = {
+// ../../generator-utils/dist/esm/locale/zh.js
+var ZH_LOCALE3 = {
   packageName: {
-    exit: "package name `{value}` is already exists"
+    exit: "项目名称 {value} 已存在"
   },
   packagePath: {
-    exit: "package path {value} is already exists"
+    exit: "目录 {value} 已存在"
   }
 };
 
@@ -62196,6 +62147,21 @@ var localeKeys3 = i18n3.init("en", {
   en: EN_LOCALE3
 });
 
+// ../../generator-utils/dist/esm/utils/stripAnsi.js
+function ansiRegex2({ onlyFirst = false } = {}) {
+  const pattern = [
+    "[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)",
+    "(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))"
+  ].join("|");
+  return new RegExp(pattern, onlyFirst ? void 0 : "g");
+}
+function stripAnsi2(string) {
+  if (typeof string !== "string") {
+    throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``);
+  }
+  return string.replace(ansiRegex2(), "");
+}
+
 // ../../generator-utils/dist/esm/utils/getGeneratorPath.js
 var import_path5 = __toESM(require("path"));
 var getGeneratorPath = (generator, distTag, paths) => {
@@ -62296,18 +62262,6 @@ function getMWAProjectPath(packagePath, isMonorepoSubProject) {
   return "";
 }
 
-// src/locale/zh.ts
-var ZH_LOCALE4 = {
-  get_packages_error: "获取包列表失败，请检查环境后重试",
-  success: `创建成功！
-可在新项目的目录下运行以下命令：
-{packageManager} dev          # 启动开发服务器
-{packageManager} build        # 构建生产环境产物
-{packageManager} serve        # 启动生产环境服务
-{packageManager} lint         # 运行 ESLint 并自动修复问题
-{packageManager} new          # 启用可选功能或创建项目要素`
-};
-
 // src/locale/en.ts
 var EN_LOCALE4 = {
   get_packages_error: "get all packages failed，please check this environment and try again",
@@ -62320,6 +62274,18 @@ You can run the following command in the directory of the new project:
 {packageManager} new          # Enable optional features or add a new entry`
 };
 
+// src/locale/zh.ts
+var ZH_LOCALE4 = {
+  get_packages_error: "获取包列表失败，请检查环境后重试",
+  success: `创建成功！
+可在新项目的目录下运行以下命令：
+{packageManager} dev          # 启动开发服务器
+{packageManager} build        # 构建生产环境产物
+{packageManager} serve        # 启动生产环境服务
+{packageManager} lint         # 运行 ESLint 并自动修复问题
+{packageManager} new          # 启用可选功能或创建项目要素`
+};
+
 // src/locale/index.ts
 var i18n4 = new I18n2();
 var localeKeys4 = i18n4.init("en", { zh: ZH_LOCALE4, en: EN_LOCALE4 });
@@ -62391,8 +62357,8 @@ var handleTemplateFile = async (context, generator, appApi) => {
   );
   generator.logger.debug(`inputData=${JSON.stringify(ans)}`, ans);
   const { packageName, packagePath, language, packageManager } = ans;
-  const { packagesInfo, buildTools } = context.config;
-  const bundler = buildTools === BuildTools.Rspack ? `'experimental-rspack',` : `'webpack', // Set to 'experimental-rspack' to enable rspack ⚡️🦀`;
+  const { packagesInfo } = context.config;
+  const bundler = `'rspack', // Set to 'webpack' to enable webpack`;
   const projectPath = getMWAProjectPath(
     packagePath,
     isMonorepoSubProject

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.4.16",
+  "version": "3.5.0",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/index.js",
   "files": [
@@ -23,7 +23,7 @@
     "/dist/index.js"
   ],
   "dependencies": {
-    "@modern-js/utils": "2.58.2"
+    "@modern-js/utils": "2.59.0"
   },
   "devDependencies": {
     "@modern-js/codesmith": "2.4.1",
@@ -32,15 +32,15 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "@modern-js/base-generator": "3.4.16",
-    "@modern-js/dependence-generator": "3.4.16",
-    "@modern-js/entry-generator": "3.4.16",
-    "@modern-js/generator-common": "3.4.16",
-    "@modern-js/generator-utils": "3.4.16",
-    "@modern-js/packages-generator": "3.4.16",
-    "@modern-js/plugin-i18n": "2.58.2",
-    "@scripts/build": "2.58.2",
-    "@scripts/jest-config": "2.58.2"
+    "@modern-js/dependence-generator": "3.5.0",
+    "@modern-js/base-generator": "3.5.0",
+    "@modern-js/entry-generator": "3.5.0",
+    "@modern-js/generator-utils": "3.5.0",
+    "@modern-js/packages-generator": "3.5.0",
+    "@scripts/jest-config": "2.59.0",
+    "@modern-js/plugin-i18n": "2.59.0",
+    "@modern-js/generator-common": "3.5.0",
+    "@scripts/build": "2.59.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/src/index.ts

@@ -2,24 +2,23 @@ import path from 'path';
 import type { GeneratorContext, GeneratorCore } from '@modern-js/codesmith';
 import { AppAPI } from '@modern-js/codesmith-api-app';
 import {
-  i18n as commonI18n,
   BaseGenerator,
-  Solution,
-  getMWASchema,
-  Language,
   EntryGenerator,
+  Language,
   PackagesGenerator,
-  BuildTools,
+  Solution,
+  i18n as commonI18n,
+  getMWASchema,
 } from '@modern-js/generator-common';
 import {
-  getMWAProjectPath,
   getAllPackages,
+  getGeneratorPath,
+  getMWAProjectPath,
+  getModernVersion,
+  getPackageManagerText,
   i18n as utilsI18n,
   validatePackageName,
   validatePackagePath,
-  getPackageManagerText,
-  getModernVersion,
-  getGeneratorPath,
 } from '@modern-js/generator-utils';
 import { i18n, localeKeys } from './locale';
 
@@ -108,12 +107,9 @@ export const handleTemplateFile = async (
   generator.logger.debug(`inputData=${JSON.stringify(ans)}`, ans);
 
   const { packageName, packagePath, language, packageManager } = ans;
-  const { packagesInfo, buildTools } = context.config;
+  const { packagesInfo } = context.config;
 
-  const bundler =
-    buildTools === BuildTools.Rspack
-      ? `'experimental-rspack',`
-      : `'webpack', // Set to 'experimental-rspack' to enable rspack ⚡️🦀`;
+  const bundler = `'rspack', // Set to 'webpack' to enable webpack`;
 
   const projectPath = getMWAProjectPath(
     packagePath as string,