@modern-js/mwa-generator 3.4.17 → 3.6.0

package/dist/index.js

@@ -51057,12 +51057,12 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 var import_path7 = __toESM(require("path"));
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.4.1/node_modules/@modern-js/codesmith/dist/esm-node/materials/FsResource.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.4.2/node_modules/@modern-js/codesmith/dist/esm-node/materials/FsResource.js
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var FS_RESOURCE = "_codesmith_core_fs_resource";
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.4.1/node_modules/@modern-js/codesmith/dist/esm-node/utils/fsExists.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith@2.4.2/node_modules/@modern-js/codesmith/dist/esm-node/utils/fsExists.js
 var import_utils2 = require("@modern-js/utils");
 async function fsExists(path7) {
   try {
@@ -51073,13 +51073,13 @@ async function fsExists(path7) {
   }
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-ejs@2.4.1_@modern-js+codesmith@2.4.1/node_modules/@modern-js/codesmith-api-ejs/dist/esm-node/utils/renderString.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-ejs@2.4.2_@modern-js+codesmith@2.4.2/node_modules/@modern-js/codesmith-api-ejs/dist/esm-node/utils/renderString.js
 var import_ejs = __toESM(require_ejs());
 function renderString(template, fullData) {
   return import_ejs.default.render(template, fullData) || "";
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-ejs@2.4.1_@modern-js+codesmith@2.4.1/node_modules/@modern-js/codesmith-api-ejs/dist/esm-node/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-ejs@2.4.2_@modern-js+codesmith@2.4.2/node_modules/@modern-js/codesmith-api-ejs/dist/esm-node/index.js
 var EjsAPI = class {
   async renderTemplate(templateResource, target, parameters = {}) {
     if (templateResource._type !== FS_RESOURCE) {
@@ -51111,7 +51111,7 @@ var EjsAPI = class {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-fs@2.4.1_@modern-js+codesmith@2.4.1/node_modules/@modern-js/codesmith-api-fs/dist/esm-node/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-fs@2.4.2_@modern-js+codesmith@2.4.2/node_modules/@modern-js/codesmith-api-fs/dist/esm-node/index.js
 var import_path2 = __toESM(require("path"));
 var import_utils4 = require("@modern-js/utils");
 var FsAPI = class {
@@ -51138,7 +51138,7 @@ var FsAPI = class {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-git@2.4.1_@modern-js+codesmith@2.4.1/node_modules/@modern-js/codesmith-api-git/dist/esm-node/utils/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-git@2.4.2_@modern-js+codesmith@2.4.2/node_modules/@modern-js/codesmith-api-git/dist/esm-node/utils/index.js
 var import_utils5 = require("@modern-js/utils");
 async function canUseGit() {
   try {
@@ -51213,7 +51213,7 @@ async function gitCommit(cwd, commitMessage) {
   });
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-git@2.4.1_@modern-js+codesmith@2.4.1/node_modules/@modern-js/codesmith-api-git/dist/esm-node/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-git@2.4.2_@modern-js+codesmith@2.4.2/node_modules/@modern-js/codesmith-api-git/dist/esm-node/index.js
 var GitAPI = class {
   async isInGitRepo(cwd = this.generatorCore.outputPath) {
     const canUse = await canUseGit();
@@ -51263,7 +51263,7 @@ var GitAPI = class {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-handlebars@2.4.1_@modern-js+codesmith@2.4.1/node_modules/@modern-js/codesmith-api-handlebars/dist/esm-node/utils/renderString.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-handlebars@2.4.2_@modern-js+codesmith@2.4.2/node_modules/@modern-js/codesmith-api-handlebars/dist/esm-node/utils/renderString.js
 var import_handlebars = __toESM(require_lib());
 function renderString2(template, fullData, registers) {
   const helpers = {
@@ -51277,7 +51277,7 @@ function renderString2(template, fullData, registers) {
   return import_handlebars.default.compile(template)(fullData) || "";
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-handlebars@2.4.1_@modern-js+codesmith@2.4.1/node_modules/@modern-js/codesmith-api-handlebars/dist/esm-node/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-handlebars@2.4.2_@modern-js+codesmith@2.4.2/node_modules/@modern-js/codesmith-api-handlebars/dist/esm-node/index.js
 var HandlebarsAPI = class {
   async registerHelp(helpers) {
     this.registers.helpers = {
@@ -51325,7 +51325,7 @@ var HandlebarsAPI = class {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-npm@2.4.1/node_modules/@modern-js/codesmith-api-npm/dist/esm-node/utils/env.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-npm@2.4.2/node_modules/@modern-js/codesmith-api-npm/dist/esm-node/utils/env.js
 var import_utils8 = require("@modern-js/utils");
 async function canUseNvm() {
   try {
@@ -51375,7 +51375,7 @@ async function canUsePnpm() {
   }
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-npm@2.4.1/node_modules/@modern-js/codesmith-api-npm/dist/esm-node/utils/install.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-npm@2.4.2/node_modules/@modern-js/codesmith-api-npm/dist/esm-node/utils/install.js
 var import_utils9 = require("@modern-js/utils");
 function execaWithStreamLog(command, args, options) {
   const promise = (0, import_utils9.execa)(command, args, {
@@ -51471,7 +51471,7 @@ async function pnpmInstall({ cwd, registryUrl, ignoreScripts, useNvm }) {
   throw new Error("please install pnpm first");
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-npm@2.4.1/node_modules/@modern-js/codesmith-api-npm/dist/esm-node/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-npm@2.4.2/node_modules/@modern-js/codesmith-api-npm/dist/esm-node/index.js
 var NpmAPI = class {
   npmInstall({ cwd, registryUrl, ignoreScripts }) {
     return npmInstall({
@@ -61055,10 +61055,10 @@ var Schema = (
   }()
 );
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.4.1_@modern-js+codesmith@2.4.1_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/prompt.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/prompt.js
 var import_inquirer = __toESM(require_inquirer());
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.4.1_@modern-js+codesmith@2.4.1_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/transform.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/transform.js
 var import_lodash = require("@modern-js/utils/lodash");
 function validateSchema(schema) {
   const { type, properties } = schema;
@@ -61150,7 +61150,7 @@ function transformForm(schema, configValue = {}, validateMap, initValue) {
   return getQuestionFromSchema(schema, configValue, validateMap, initValue);
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.4.1_@modern-js+codesmith@2.4.1_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/prompt.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/prompt.js
 var compileRule = (rule, scope) => {
   const state = Schema.compile(rule, {
     $self: {},
@@ -61254,7 +61254,7 @@ async function prompt(schema, configValue = {}, validateMap, initValue) {
   return answers;
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.4.1_@modern-js+codesmith@2.4.1_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/inquirer.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-formily/dist/esm-node/inquirer.js
 var CLIReader = class {
   getAnswers() {
     return this.answers;
@@ -61283,7 +61283,7 @@ var CLIReader = class {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.1_@modern-js+codesmith@2.4.1_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/index.js
 var import_utils13 = require("@modern-js/utils");
 var import_lodash5 = require("@modern-js/utils/lodash");
 var import_comment_json = __toESM(require_src2());
@@ -61352,7 +61352,7 @@ var I18n = class {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.1_@modern-js+codesmith@2.4.1_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/locale/en.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/locale/en.js
 var EN_LOCALE = {
   environment: {
     node_version: "please upgrade node to lts version",
@@ -61379,7 +61379,7 @@ var EN_LOCALE = {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.1_@modern-js+codesmith@2.4.1_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/locale/zh.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/locale/zh.js
 var ZH_LOCALE = {
   environment: {
     node_version: "请升级 Node 版本至 LIS",
@@ -61406,14 +61406,14 @@ var ZH_LOCALE = {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.1_@modern-js+codesmith@2.4.1_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/locale/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/locale/index.js
 var i18n = new I18n();
 var localeKeys = i18n.init("zh", {
   zh: ZH_LOCALE,
   en: EN_LOCALE
 });
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.1_@modern-js+codesmith@2.4.1_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/utils/checkUseNvm.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/utils/checkUseNvm.js
 var import_path4 = __toESM(require("path"));
 var import_utils12 = require("@modern-js/utils");
 var NODE_MAJOR_VERSION_MAP = {
@@ -61461,7 +61461,7 @@ async function checkUseNvm(cwd, logger) {
   }
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.1_@modern-js+codesmith@2.4.1_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/utils/transform.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/utils/transform.js
 var import_lodash4 = require("@modern-js/utils/lodash");
 function transformInquirerSchema(questions, configValue = {}, validateMap = {}, initValue = {}) {
   for (const question of questions) {
@@ -61489,7 +61489,7 @@ function transformInquirerSchema(questions, configValue = {}, validateMap = {},
   return questions;
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.1_@modern-js+codesmith@2.4.1_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.4.2_@modern-js+codesmith@2.4.2_typescript@5.3.3/node_modules/@modern-js/codesmith-api-app/dist/esm-node/index.js
 var AppAPI = class {
   async checkEnvironment(nodeVersion) {
     if (import_utils13.semver.lt(process.versions.node, nodeVersion || "12.22.12")) {
@@ -61868,11 +61868,6 @@ var EN_LOCALE2 = {
       func: "Function",
       framework: "Framework"
     }
-  },
-  buildTools: {
-    self: "Please select the bundler:",
-    webpack: "webpack",
-    rspack: "Rspack (experimental)"
   }
 };
 
@@ -61960,11 +61955,6 @@ var ZH_LOCALE2 = {
       func: "函数模式",
       framework: "框架模式"
     }
-  },
-  buildTools: {
-    self: "请选择构建工具",
-    webpack: "webpack",
-    rspack: "Rspack (实验性)"
   }
 };
 
@@ -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,8 +62113,7 @@ 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
@@ -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.17",
+  "version": "3.6.0",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/index.js",
   "files": [
@@ -23,24 +23,24 @@
     "/dist/index.js"
   ],
   "dependencies": {
-    "@modern-js/utils": "2.58.3"
+    "@modern-js/utils": "2.60.0"
   },
   "devDependencies": {
-    "@modern-js/codesmith": "2.4.1",
-    "@modern-js/codesmith-api-app": "2.4.1",
+    "@modern-js/codesmith": "2.4.2",
+    "@modern-js/codesmith-api-app": "2.4.2",
     "@types/jest": "^29",
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "@modern-js/base-generator": "3.4.17",
-    "@modern-js/dependence-generator": "3.4.17",
-    "@modern-js/entry-generator": "3.4.17",
-    "@modern-js/generator-common": "3.4.17",
-    "@modern-js/packages-generator": "3.4.17",
-    "@modern-js/generator-utils": "3.4.17",
-    "@modern-js/plugin-i18n": "2.58.3",
-    "@scripts/jest-config": "2.58.3",
-    "@scripts/build": "2.58.3"
+    "@modern-js/base-generator": "3.6.0",
+    "@modern-js/entry-generator": "3.6.0",
+    "@modern-js/generator-common": "3.6.0",
+    "@modern-js/dependence-generator": "3.6.0",
+    "@modern-js/generator-utils": "3.6.0",
+    "@scripts/build": "2.60.0",
+    "@scripts/jest-config": "2.60.0",
+    "@modern-js/packages-generator": "3.6.0",
+    "@modern-js/plugin-i18n": "2.60.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/src/index.ts

@@ -3,7 +3,6 @@ import type { GeneratorContext, GeneratorCore } from '@modern-js/codesmith';
 import { AppAPI } from '@modern-js/codesmith-api-app';
 import {
   BaseGenerator,
-  BuildTools,
   EntryGenerator,
   Language,
   PackagesGenerator,
@@ -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,

package/templates/base-template/package.json.handlebars

@@ -2,15 +2,15 @@
   "name": "{{ name }}",
   "version": "0.1.0",
   "scripts": {
-    "reset": "npx rimraf ./**/node_modules",
+    "reset": "npx rimraf node_modules ./**/node_modules",
     "dev": "modern dev",
     "build": "modern build",
     "start": "modern start",
     "serve": "modern serve",
     "new": "modern new",
-    "lint": "modern lint",
+    "lint": "biome check",
     {{#unless isMonorepoSubProject}}
-    "prepare": "husky install",
+    "prepare": "simple-git-hooks",
     {{/unless}}
     "upgrade": "modern upgrade"
   },
@@ -19,14 +19,13 @@
     "node": ">=16.18.1"
   },
   "lint-staged": {
-    "*.{js,jsx,ts,tsx,mjs,cjs}": [
-      "node --max_old_space_size=8192 ./node_modules/eslint/bin/eslint.js --fix --color --cache --quiet"
+    "*.{js,ts,cjs,mjs,d.cts,d.mts,jsx,tsx,json,jsonc}": [
+      "biome check --files-ignore-unknown=true"
     ]
   },
-  "eslintIgnore": [
-    "node_modules/",
-    "dist/"
-  ],
+  "simple-git-hooks": {
+    "pre-commit": "npx lint-staged"
+  },
   {{/unless}}
   "dependencies": {
     "@modern-js/runtime": "{{modernVersion}}",
@@ -35,9 +34,8 @@
   },
   "devDependencies": {
     "@modern-js/app-tools": "{{modernVersion}}",
-    "@modern-js/eslint-config": "{{modernVersion}}",
     "@modern-js/tsconfig": "{{modernVersion}}",
-    "@modern-js-app/eslint-config": "{{modernVersion}}",
+    "@biomejs/biome": "1.8.3",
     {{#if isTs}}
     "typescript": "~5.0.4",
     "@types/jest": "~29.2.4",
@@ -46,8 +44,7 @@
     "@types/react-dom": "~18.0.10",
     {{/if}}
     "lint-staged": "~13.1.0",
-    "prettier": "~2.8.1",
-    "husky": "~8.0.1",
-    "rimraf": "~3.0.2"
+    "simple-git-hooks": "^2.11.1",
+    "rimraf": "^6.0.1"
   }
 }

package/templates/js-template/.eslintrc.js.handlebars

@@ -1,4 +0,0 @@
-module.exports = {
-  root: true,
-  extends: ['@modern-js'],
-};

package/templates/js-template/src/.eslintrc.js.handlebars

@@ -1,5 +0,0 @@
-// eslint-disable-next-line import/no-commonjs
-module.exports = {
-  root: true,
-  extends: ['@modern-js-app'],
-};

package/templates/js-template/src/modern.runtime.js.handlebars

@@ -1,3 +0,0 @@
-import { defineRuntimeConfig } from '@modern-js/runtime';
-
-export default defineRuntimeConfig({});

package/templates/ts-template/.eslintrc.js.handlebars

@@ -1,4 +0,0 @@
-module.exports = {
-  root: true,
-  extends: ['@modern-js'],
-};

package/templates/ts-template/src/.eslintrc.js.handlebars

@@ -1,9 +0,0 @@
-// eslint-disable-next-line import/no-commonjs
-module.exports = {
-  root: true,
-  extends: ['@modern-js-app'],
-  parserOptions: {
-    tsconfigRootDir: __dirname,
-    project: ['../tsconfig.json'],
-  },
-};