@modern-js/base-generator 2.2.1 → 2.3.3

package/dist/index.js

@@ -35664,20 +35664,28 @@ var require_compiled = __commonJSMin((exports) => {
 var require_format = __commonJSMin((exports) => {
   "use strict";
   Object.defineProperty(exports, "__esModule", { value: true });
-  exports.formatProxyOptions = exports.formatWebpackMessages = void 0;
-  var friendlySyntaxErrorLabel = "Syntax error:";
+  exports.formatWebpackMessages = void 0;
+  var friendlySyntaxErrorLabel = "SyntaxError:";
   function isLikelyASyntaxError(message) {
     return message.includes(friendlySyntaxErrorLabel);
   }
-  function formatMessage(message) {
-    var _a;
+  function formatMessage(stats) {
     let lines = [];
-    if (typeof message === "object") {
-      message = `${message.moduleName && `${message.moduleName}
-`}${message.details || message.stack || message.message}`;
+    let message;
+    if (typeof stats === "object") {
+      const fileName = stats.moduleName ? `File: ${stats.moduleName}
+` : "";
+      const mainMessage = stats.message;
+      const details = stats.details ? `
+Details: ${stats.details}
+` : "";
+      const stack = stats.stack ? `
+${stats.stack}` : "";
+      message = `${fileName}${mainMessage}${details}${stack}`;
+    } else {
+      message = stats;
     }
     lines = message.split("\n");
-    lines = lines.filter((line3) => !/Module [A-z ]+\(from/.test(line3));
     lines = lines.map((line3) => {
       const parsingError = /Line (\d+):(?:(\d+):)?\s*Parsing error: (.+)$/.exec(line3);
       if (!parsingError) {
@@ -35694,11 +35702,8 @@ var require_format = __commonJSMin((exports) => {
       lines.splice(1, 1);
     }
     lines[0] = lines[0].replace(/^(.*) \d+:\d+-\d+$/, "$1");
-    if ((_a = lines[1]) === null || _a === void 0 ? void 0 : _a.startsWith("Module not found: ")) {
-      lines = [
-        lines[0],
-        lines[1].replace("Error: ", "").replace("Module not found: Cannot find file:", "Cannot find file:").replace("[CaseSensitivePathsPlugin] ", "").replace("Cannot resolve 'file' or 'directory' ", "")
-      ];
+    if (lines[1] && lines[1].indexOf("Module not found:") !== -1) {
+      lines[1] = lines[1].replace("Error: ", "");
     }
     message = lines.join("\n");
     message = message.replace(/^\s*at\s((?!webpack:).)*:\d+:\d+[\s)]*(\n|$)/gm, "");
@@ -35725,29 +35730,6 @@ var require_format = __commonJSMin((exports) => {
     return result;
   }
   exports.formatWebpackMessages = formatWebpackMessages;
-  function formatProxyOptions(proxyOptions) {
-    const formattedProxy = [];
-    if (!Array.isArray(proxyOptions)) {
-      if ("target" in proxyOptions) {
-        formattedProxy.push(proxyOptions);
-      } else {
-        Array.prototype.push.apply(formattedProxy, Object.keys(proxyOptions).reduce((total, source) => {
-          const option = proxyOptions[source];
-          total.push({
-            context: source,
-            changeOrigin: true,
-            logLevel: "warn",
-            ...typeof option === "string" ? { target: option } : option
-          });
-          return total;
-        }, []));
-      }
-    } else {
-      formattedProxy.push(...proxyOptions);
-    }
-    return formattedProxy;
-  }
-  exports.formatProxyOptions = formatProxyOptions;
 });
 var require_logger = __commonJSMin((exports) => {
   "use strict";
@@ -36247,7 +36229,6 @@ var require_constants = __commonJSMin((exports) => {
     "@modern-js/plugin-electron": { cli: "@modern-js/plugin-electron/cli" },
     "@modern-js/plugin-testing": { cli: "@modern-js/plugin-testing/cli" },
     "@modern-js/plugin-storybook": { cli: "@modern-js/plugin-storybook/cli" },
-    "@modern-js/plugin-docsite": { cli: "@modern-js/plugin-docsite/cli" },
     "@modern-js/plugin-express": {
       cli: "@modern-js/plugin-express/cli",
       server: "@modern-js/plugin-express"
@@ -36265,7 +36246,6 @@ var require_constants = __commonJSMin((exports) => {
       server: "@modern-js/plugin-nest/server"
     },
     "@modern-js/plugin-unbundle": { cli: "@modern-js/plugin-unbundle" },
-    "@modern-js/plugin-server-build": { cli: "@modern-js/plugin-server-build" },
     "@modern-js/plugin-server": {
       cli: "@modern-js/plugin-server/cli",
       server: "@modern-js/plugin-server/server"
@@ -36273,26 +36253,12 @@ var require_constants = __commonJSMin((exports) => {
     "@modern-js/plugin-garfish": {
       cli: "@modern-js/plugin-garfish/cli"
     },
-    "@modern-js/plugin-jarvis": { cli: "@modern-js/plugin-jarvis/cli" },
     "@modern-js/plugin-tailwindcss": { cli: "@modern-js/plugin-tailwindcss/cli" },
-    "@modern-js/plugin-lambda-fc": { cli: "@modern-js/plugin-lambda-fc/cli" },
-    "@modern-js/plugin-lambda-scf": { cli: "@modern-js/plugin-lambda-scf/cli" },
-    "@modern-js/plugin-cdn-oss": { cli: "@modern-js/plugin-cdn-oss/cli" },
-    "@modern-js/plugin-cdn-cos": { cli: "@modern-js/plugin-cdn-cos/cli" },
-    "@modern-js/plugin-static-hosting": {
-      cli: "@modern-js/plugin-static-hosting/cli"
-    },
     "@modern-js/plugin-polyfill": {
       cli: "@modern-js/plugin-polyfill/cli",
       server: "@modern-js/plugin-polyfill"
     },
-    "@modern-js/plugin-multiprocess": {
-      cli: "@modern-js/plugin-multiprocess/cli"
-    },
-    "@modern-js/plugin-nocode": { cli: "@modern-js/plugin-nocode/cli" },
-    "@modern-js/plugin-design-token": {
-      cli: "@modern-js/plugin-design-token/cli"
-    }
+    "@modern-js/plugin-nocode": { cli: "@modern-js/plugin-nocode/cli" }
   };
   exports.PLUGIN_SCHEMAS = {
     "@modern-js/runtime": [
@@ -37280,8 +37246,8 @@ var require_analyzeProject = __commonJSMin((exports) => {
   exports.isApiOnly = void 0;
   var path = __importStar(__require("path"));
   var compiled_1 = require_compiled();
-  var isApiOnly = async (appDirectory) => {
-    const srcDir = path.join(appDirectory, "src");
+  var isApiOnly = async (appDirectory, entryDir) => {
+    const srcDir = path.join(appDirectory, entryDir !== null && entryDir !== void 0 ? entryDir : "src");
     const existSrc = await compiled_1.fs.pathExists(srcDir);
     const options2 = (0, compiled_1.minimist)(process.argv.slice(2));
     return !existSrc || Boolean(options2["api-only"]);
@@ -37295,7 +37261,18 @@ var require_chainId = __commonJSMin((exports) => {
   exports.CHAIN_ID = {
     RULE: {
       MJS: "mjs",
-      LOADERS: "loaders"
+      LOADERS: "loaders",
+      FONT: "font",
+      IMAGE: "image",
+      MEDIA: "media",
+      JS: "js",
+      TS: "ts",
+      CSS: "css",
+      LESS: "less",
+      SASS: "sass",
+      SVG: "svg",
+      SVG_INLINE: "svg-inline",
+      SVG_URL: "svg-url"
     },
     ONE_OF: {
       JS: "js",
@@ -37321,6 +37298,8 @@ var require_chainId = __commonJSMin((exports) => {
     USE: {
       TS: "ts",
       CSS: "css",
+      SASS: "sass",
+      LESS: "less",
       URL: "url",
       FILE: "file",
       SVGR: "svgr",
@@ -37349,6 +37328,7 @@ var require_chainId = __commonJSMin((exports) => {
       INLINE_HTML: "inline-html",
       BUNDLE_ANALYZER: "bundle-analyze",
       BOTTOM_TEMPLATE: "bottom-template",
+      HTML_CROSS_ORIGIN: "html-cross-origin",
       MINI_CSS_EXTRACT: "mini-css-extract",
       REACT_FAST_REFRESH: "react-fast-refresh",
       NODE_POLYFILL_PROVIDE: "node-polyfill-provide"
@@ -37364,6 +37344,32 @@ var require_chainId = __commonJSMin((exports) => {
     }
   };
 });
+var require_reactVersion = __commonJSMin((exports) => {
+  "use strict";
+  var __importDefault = exports && exports.__importDefault || function(mod) {
+    return mod && mod.__esModule ? mod : { "default": mod };
+  };
+  Object.defineProperty(exports, "__esModule", { value: true });
+  exports.isReact18 = void 0;
+  var path_1 = __importDefault(__require("path"));
+  var compiled_1 = require_compiled();
+  var isReact18 = (cwd) => {
+    const pkgPath = path_1.default.join(cwd, "package.json");
+    if (!compiled_1.fs.existsSync(pkgPath)) {
+      return false;
+    }
+    const pkgInfo = JSON.parse(compiled_1.fs.readFileSync(pkgPath, "utf8"));
+    const deps = {
+      ...pkgInfo.devDependencies,
+      ...pkgInfo.dependencies
+    };
+    if (typeof deps.react !== "string") {
+      return false;
+    }
+    return compiled_1.semver.satisfies(compiled_1.semver.minVersion(deps.react), ">=18.0.0");
+  };
+  exports.isReact18 = isReact18;
+});
 var require_dist = __commonJSMin((exports) => {
   "use strict";
   var __createBinding = exports && exports.__createBinding || (Object.create ? function(o, m, k, k2) {
@@ -37423,6 +37429,7 @@ var require_dist = __commonJSMin((exports) => {
   __exportStar(require_tryResolve(), exports);
   __exportStar(require_analyzeProject(), exports);
   __exportStar(require_chainId(), exports);
+  __exportStar(require_reactVersion(), exports);
 });
 var require_esprima = __commonJSMin((exports, module2) => {
   (function webpackUniversalModuleDefinition(root, factory) {
@@ -45792,6 +45799,7 @@ var require_generator = __commonJSMin((exports) => {
       this.materialsManager = materialsManager;
       this.outputPath = outputPath;
       this.event = new _events.EventEmitter();
+      this.event.setMaxListeners(15);
       this._context = _objectSpread({
         materials: {},
         config: {},
@@ -99707,7 +99715,6 @@ var ZH_LOCALE = {
       mwa_storybook: "\u542F\u7528\u300CVisual Testing (Storybook)\u300D\u6A21\u5F0F",
       ssg: "\u542F\u7528\u300CSSG\u300D\u529F\u80FD",
       polyfill: "\u542F\u7528\u300C\u57FA\u4E8E UA \u7684 Polyfill\u300D\u529F\u80FD",
-      deploy: "\u542F\u7528\u300C\u90E8\u7F72\u300D\u529F\u80FD",
       proxy: "\u542F\u7528\u300C\u5168\u5C40\u4EE3\u7406\u300D"
     },
     element: {
@@ -99735,22 +99742,15 @@ var ZH_LOCALE = {
     no: "\u4E0D\u9700\u8981",
     electron: "Electron"
   },
-  needModifyConfig: {
-    self: "\u662F\u5426\u9700\u8981\u8C03\u6574\u9ED8\u8BA4\u914D\u7F6E?",
-    enableLess: "\u662F\u5426\u542F\u7528 Less \u652F\u6301?",
-    enableSass: "\u662F\u5426\u542F\u7528 Sass \u652F\u6301?"
-  },
   entry: {
     name: "\u8BF7\u586B\u5199\u5165\u53E3\u540D\u79F0",
     no_empty: "\u5165\u53E3\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A\uFF01",
     no_pages: '\u5165\u53E3\u540D\u79F0\u4E0D\u652F\u6301 "pages"\uFF01',
     needModifyConfig: "\u662F\u5426\u9700\u8981\u8C03\u6574\u9ED8\u8BA4\u914D\u7F6E?",
-    disableStateManagement: "\u662F\u5426\u5173\u95ED\u300C\u5E94\u7528\u72B6\u6001\u7BA1\u7406\u300D\u529F\u80FD?",
     clientRoute: {
       self: "\u8BF7\u9009\u62E9\u5BA2\u6237\u7AEF\u8DEF\u7531\u65B9\u5F0F",
-      selfControlRoute: "\u542F\u7528\u81EA\u63A7\u8DEF\u7531",
-      conventionalRoute: "\u542F\u7528\u7EA6\u5B9A\u5F0F\u8DEF\u7531",
-      no: "\u4E0D\u542F\u7528"
+      selfControlRoute: "\u81EA\u63A7\u8DEF\u7531",
+      conventionalRoute: "\u7EA6\u5B9A\u5F0F\u8DEF\u7531"
     }
   },
   packageName: {
@@ -99776,23 +99776,6 @@ var ZH_LOCALE = {
       func: "\u51FD\u6570\u6A21\u5F0F",
       framework: "\u6846\u67B6\u6A21\u5F0F"
     }
-  },
-  deploy: {
-    cloud: {
-      self: "\u9ED8\u8BA4\u4F7F\u7528\u6846\u67B6\u5185\u7F6E\u7684\u4EA7\u54C1\u7EA7 Web \u670D\u52A1\u5668\uFF0C\u662F\u5426\u8C03\u6574\uFF1F"
-    },
-    cdn: {
-      self: "\u8BF7\u9009\u62E9 CDN \u5E73\u53F0",
-      oss: "\u963F\u91CC\u4E91 OSS",
-      cos: "\u817E\u8BAF\u4E91 COS",
-      no: "\u4E0D\u4F7F\u7528 CDN"
-    },
-    lambda: {
-      self: "\u8BF7\u9009\u62E9\u4E91\u51FD\u6570\u5E73\u53F0",
-      fc: "\u963F\u91CC\u4E91 FC",
-      scf: "\u817E\u8BAF\u4E91 SCF",
-      no: "\u4E0D\u4F7F\u7528\u4E91\u51FD\u6570\u90E8\u7F72"
-    }
   }
 };
 var EN_LOCALE = {
@@ -99834,7 +99817,6 @@ var EN_LOCALE = {
       mwa_storybook: "Enable Visual Testing (Storybook)",
       ssg: "Enable SSG",
       polyfill: "Enable UA-based Polyfill Feature",
-      deploy: "Enable Deploy",
       proxy: "Enable Global Proxy"
     },
     element: {
@@ -99872,21 +99854,15 @@ var EN_LOCALE = {
     no: "Not Enabled",
     electron: "Electron"
   },
-  needModifyConfig: {
-    self: "Modify the Default Configuration?",
-    enableLess: "Enable Less?",
-    enableSass: "Enable Sass?"
-  },
   entry: {
     name: "Entry name",
     no_empty: "The entry name cannot be empty!",
     no_pages: 'The entry name cannot be "pages"!',
-    disableStateManagement: "Disable App State Management?",
+    needModifyConfig: "Modify the Default Configuration?",
     clientRoute: {
       self: "Client Routing",
-      selfControlRoute: "Enable Self Control Route",
-      conventionalRoute: "Enable Conventional Route",
-      no: "Not Enabled"
+      selfControlRoute: "Self Control Route",
+      conventionalRoute: "Conventional Route"
     }
   },
   framework: {
@@ -99902,23 +99878,6 @@ var EN_LOCALE = {
       func: "Function",
       framework: "Framework"
     }
-  },
-  deploy: {
-    cloud: {
-      self: "Modify the default Web Server?"
-    },
-    cdn: {
-      self: "Please select the cdn platform you want to use",
-      oss: "Aliyun OSS",
-      cos: "Tencent COS",
-      no: "Not Enabled"
-    },
-    lambda: {
-      self: "Please select the lambda you want to use",
-      fc: "Aliyun FC",
-      scf: "Tencent SCF",
-      no: "Not Enabled"
-    }
   }
 };
 var i18n = new I18n2();

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.2.1",
+  "version": "2.3.3",
   "jsnext:source": "./src/index.ts",
   "types": "./src/index.ts",
   "main": "./dist/index.js",
@@ -21,15 +21,15 @@
   ],
   "devDependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/codesmith": "^1.4.0",
-    "@modern-js/codesmith-api-app": "^1.3.0",
-    "@modern-js/generator-common": "2.2.1",
+    "@modern-js/codesmith": "^1.5.0",
+    "@modern-js/codesmith-api-app": "^1.5.0",
+    "@modern-js/generator-common": "2.3.3",
+    "@scripts/build": "1.18.0",
+    "@scripts/jest-config": "1.18.0",
     "@types/jest": "^27",
     "@types/node": "^14",
-    "typescript": "^4",
-    "@scripts/build": "1.15.0",
     "jest": "^27",
-    "@scripts/jest-config": "1.15.0"
+    "typescript": "^4"
   },
   "sideEffects": false,
   "modernConfig": {