@modern-js/upgrade-generator 3.1.21 → 3.1.23

package/dist/index.js

@@ -42240,7 +42240,7 @@ var require_parse = __commonJS({
       return current.type === "Punctuator" ? current.value : current.type;
     };
     var is = (t) => type() === t;
-    var expect2 = (a) => {
+    var expect = (a) => {
       if (!is(a)) {
         unexpected();
       }
@@ -42322,7 +42322,7 @@ var require_parse = __commonJS({
       while (!is(CURLY_BRACKET_CLOSE)) {
         if (started) {
           assign_comments(PREFIX_AFTER_VALUE);
-          expect2(COMMA);
+          expect(COMMA);
           next();
           parse_comments();
           assign_after_comments();
@@ -42331,13 +42331,13 @@ var require_parse = __commonJS({
           }
         }
         started = true;
-        expect2("String");
+        expect("String");
         name = JSON.parse(current.value);
         set_prop(name);
         assign_comments(PREFIX_BEFORE);
         next();
         parse_comments(PREFIX_AFTER_PROP);
-        expect2(COLON);
+        expect(COLON);
         next();
         parse_comments(PREFIX_AFTER_COLON);
         obj[name] = transform(name, walk());
@@ -42365,7 +42365,7 @@ var require_parse = __commonJS({
       while (!is(BRACKET_CLOSE)) {
         if (started) {
           assign_comments(PREFIX_AFTER_VALUE);
-          expect2(COMMA);
+          expect(COMMA);
           next();
           parse_comments();
           assign_after_comments();
@@ -115330,10 +115330,14 @@ var require_chainId = __commonJS({
         SVG: "svg",
         /** Rule for pug */
         PUG: "pug",
+        /** Rule for Vue */
+        VUE: "vue",
         /** Rule for toml */
         TOML: "toml",
         /** Rule for yaml */
         YAML: "yaml",
+        /** Rule for wasm */
+        WASM: "wasm",
         /** Rule for bff */
         JS_BFF_API: "js-bff-api"
       },
@@ -115360,6 +115364,8 @@ var require_chainId = __commonJS({
         URL: "url",
         /** pug-loader */
         PUG: "pug",
+        /** vue-loader */
+        VUE: "vue",
         /** file-loader */
         FILE: "file",
         /** @svgr/webpack */
@@ -115429,12 +115435,16 @@ var require_chainId = __commonJS({
         BUNDLE_ANALYZER: "bundle-analyze",
         /** BottomTemplatePlugin */
         BOTTOM_TEMPLATE: "bottom-template",
-        /** HtmlCrossOriginPlugin */
-        HTML_CROSS_ORIGIN: "html-cross-origin",
+        /** HtmlTagsPlugin */
+        HTML_TAGS: "html-tags",
         /** HtmlNoncePlugin */
         HTML_NONCE: "html-nonce",
+        /** HtmlCrossOriginPlugin */
+        HTML_CROSS_ORIGIN: "html-cross-origin",
         /** MiniCssExtractPlugin */
         MINI_CSS_EXTRACT: "mini-css-extract",
+        /** VueLoaderPlugin */
+        VUE_LOADER_PLUGIN: "vue-loader-plugin",
         /** ReactFastRefreshPlugin */
         REACT_FAST_REFRESH: "react-fast-refresh",
         /** ProvidePlugin for node polyfill */
@@ -115448,9 +115458,7 @@ var require_chainId = __commonJS({
         /** HtmlAsyncChunkPlugin */
         HTML_ASYNC_CHUNK: "html-async-chunk",
         /** SWC_POLYFILL_CHECKER */
-        SWC_POLYFILL_CHECKER: "swc-polyfill-checker-plugin",
-        /** HtmlTagsPlugin */
-        HTML_TAGS: "html-tags"
+        SWC_POLYFILL_CHECKER: "swc-polyfill-checker-plugin"
       },
       /** Predefined minimizers */
       MINIMIZER: {
@@ -115492,6 +115500,9 @@ var require_constants = __commonJS({
       ROUTE_SPEC_FILE: function() {
         return ROUTE_SPEC_FILE;
       },
+      NESTED_ROUTE_SPEC_FILE: function() {
+        return NESTED_ROUTE_SPEC_FILE;
+      },
       MAIN_ENTRY_NAME: function() {
         return MAIN_ENTRY_NAME;
       },
@@ -115576,9 +115587,6 @@ var require_constants = __commonJS({
       INTERNAL_SERVER_PLUGINS: function() {
         return INTERNAL_SERVER_PLUGINS;
       },
-      PLUGIN_SCHEMAS: function() {
-        return PLUGIN_SCHEMAS;
-      },
       DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS: function() {
         return DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS;
       }
@@ -115586,6 +115594,7 @@ var require_constants = __commonJS({
     var _export_star = require_export_star();
     _export_star._(require_chainId(), exports);
     var ROUTE_SPEC_FILE = "route.json";
+    var NESTED_ROUTE_SPEC_FILE = "nestedRoutes.json";
     var MAIN_ENTRY_NAME = "main";
     var SERVER_BUNDLE_DIRECTORY = "bundles";
     var SERVER_WORKER_BUNDLE_DIRECTORY = "worker";
@@ -115632,8 +115641,6 @@ var require_constants = __commonJS({
       "@modern-js/plugin-testing": "@modern-js/plugin-testing/cli",
       "@modern-js/plugin-storybook": "@modern-js/plugin-storybook/cli",
       "@modern-js/plugin-tailwindcss": "@modern-js/plugin-tailwindcss/cli",
-      // TODO: Maybe can remove it
-      "@modern-js/plugin-nocode": "@modern-js/plugin-nocode/cli",
       // legacy router (inner react-router-dom v5)
       "@modern-js/plugin-router-legacy": "@modern-js/plugin-router-legacy/cli"
     };
@@ -115664,8 +115671,6 @@ var require_constants = __commonJS({
       "@modern-js/plugin-garfish": "@modern-js/plugin-garfish/cli",
       "@modern-js/plugin-tailwindcss": "@modern-js/plugin-tailwindcss/cli",
       "@modern-js/plugin-polyfill": "@modern-js/plugin-polyfill/cli",
-      // TODO: Maybe can remove it
-      "@modern-js/plugin-nocode": "@modern-js/plugin-nocode/cli",
       // legacy router (inner react-router-dom v5)
       "@modern-js/plugin-router-v5": "@modern-js/plugin-router-v5/cli"
     };
@@ -115681,214 +115686,6 @@ var require_constants = __commonJS({
       [SERVER_PLUGIN_SERVER]: "@modern-js/plugin-server/server",
       [SERVER_PLUGIN_POLYFILL]: "@modern-js/plugin-polyfill/server"
     };
-    var PLUGIN_SCHEMAS = {
-      "@modern-js/runtime": [
-        {
-          target: "runtime",
-          schema: {
-            type: "object",
-            additionalProperties: false
-          }
-        },
-        {
-          target: "runtimeByEntries",
-          schema: {
-            type: "object",
-            patternProperties: {
-              [ENTRY_NAME_PATTERN]: {
-                type: "object"
-              }
-            },
-            additionalProperties: false
-          }
-        }
-      ],
-      "@modern-js/plugin-swc": [
-        {
-          target: "tools.swc",
-          schema: {
-            typeof: [
-              "object"
-            ]
-          }
-        }
-      ],
-      "@modern-js/plugin-bff": [
-        {
-          target: "bff",
-          schema: {
-            type: "object",
-            properties: {
-              prefix: {
-                type: [
-                  "string",
-                  "array"
-                ],
-                items: {
-                  type: "string"
-                }
-              },
-              fetcher: {
-                type: "string"
-              },
-              proxy: {
-                type: "object"
-              },
-              requestCreator: {
-                type: "string"
-              }
-            }
-          }
-        }
-      ],
-      "@modern-js/plugin-tailwindcss": [
-        {
-          target: "tools.tailwindcss",
-          schema: {
-            typeof: [
-              "object",
-              "function"
-            ]
-          }
-        }
-      ],
-      "@modern-js/plugin-proxy": [
-        {
-          target: "dev.proxy",
-          schema: {
-            typeof: [
-              "string",
-              "object"
-            ]
-          }
-        }
-      ],
-      "@modern-js/plugin-ssg": [
-        {
-          target: "output.ssg",
-          schema: {
-            oneOf: [
-              {
-                type: "boolean"
-              },
-              {
-                type: "object"
-              },
-              {
-                instanceof: "Function"
-              }
-            ]
-          }
-        }
-      ],
-      "@modern-js/plugin-state": [
-        {
-          target: "runtime.state",
-          schema: {
-            type: [
-              "boolean",
-              "object"
-            ]
-          }
-        }
-      ],
-      "@modern-js/plugin-design-token": [
-        // Legacy Features
-        {
-          target: "source.designSystem",
-          schema: {
-            typeof: [
-              "object"
-            ]
-          }
-        },
-        {
-          target: "source.designSystem.supportStyledComponents",
-          schema: {
-            type: [
-              "boolean"
-            ]
-          }
-        },
-        {
-          target: "designSystem",
-          schema: {
-            typeof: [
-              "object"
-            ]
-          }
-        }
-      ],
-      "@modern-js/plugin-router": [
-        {
-          target: "runtime.router",
-          schema: {
-            type: [
-              "boolean",
-              "object"
-            ]
-          }
-        }
-      ],
-      "@modern-js/plugin-testing": [
-        {
-          target: "testing",
-          schema: {
-            typeof: [
-              "object"
-            ]
-          }
-        },
-        {
-          target: "tools.jest",
-          schema: {
-            typeof: [
-              "object",
-              "function"
-            ]
-          }
-        }
-      ],
-      "@modern-js/plugin-garfish": [
-        {
-          target: "runtime.masterApp",
-          schema: {
-            type: [
-              "boolean",
-              "object"
-            ]
-          }
-        },
-        {
-          target: "dev.withMasterApp",
-          schema: {
-            type: [
-              "object"
-            ]
-          }
-        },
-        {
-          target: "deploy.microFrontend",
-          schema: {
-            type: [
-              "boolean",
-              "object"
-            ]
-          }
-        }
-      ],
-      "@modern-js/plugin-nocode": [],
-      "@modern-js/plugin-worker": [
-        {
-          target: "deploy.worker.ssr",
-          schema: {
-            type: [
-              "boolean"
-            ]
-          }
-        }
-      ]
-    };
     var DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS = {
       allowNamespaces: true,
       allExtensions: true,
@@ -116318,6 +116115,7 @@ var require_project = __commonJS({
     });
     var _interop_require_default = require_interop_require_default();
     var _path = /* @__PURE__ */ _interop_require_default._(require("path"));
+    var _pkgup = /* @__PURE__ */ _interop_require_default._(require_pkg_up2());
     var _commands = require_commands();
     var _compiled = require_compiled();
     var _common = require_common3();
@@ -116343,19 +116141,24 @@ var require_project = __commonJS({
         return false;
       }
     };
-    var isApiOnly = (appDirectory, entryDir) => __async(exports, null, function* () {
-      const srcDir = _path.default.join(appDirectory, entryDir !== null && entryDir !== void 0 ? entryDir : "src");
-      const existSrc = yield _compiled.fs.pathExists(srcDir);
+    var isApiOnly = (appDirectory, entryDir, apiDir) => __async(exports, null, function* () {
+      const existApi = yield _compiled.fs.pathExists(apiDir !== null && apiDir !== void 0 ? apiDir : _path.default.join(appDirectory, "api"));
+      const existSrc = yield _compiled.fs.pathExists(_path.default.join(appDirectory, entryDir !== null && entryDir !== void 0 ? entryDir : "src"));
       const options = (0, _compiled.minimist)((0, _commands.getArgv)());
-      return !existSrc || Boolean(options["api-only"]);
+      if (options["api-only"]) {
+        return true;
+      }
+      return existApi && !existSrc;
     });
     var isWebOnly = () => __async(exports, null, function* () {
       const options = (0, _compiled.minimist)((0, _commands.getArgv)());
       return Boolean(options["web-only"]);
     });
     var isBeyondReact17 = (cwd) => {
-      const pkgPath = _path.default.join(cwd, "package.json");
-      if (!_compiled.fs.existsSync(pkgPath)) {
+      const pkgPath = _pkgup.default.sync({
+        cwd
+      });
+      if (!pkgPath) {
         return false;
       }
       const pkgInfo = JSON.parse(_compiled.fs.readFileSync(pkgPath, "utf8"));
@@ -116681,21 +116484,6 @@ var require_get2 = __commonJS({
   }
 });
 
-// ../../../../node_modules/.pnpm/@swc+helpers@0.5.1/node_modules/@swc/helpers/cjs/_define_property.cjs
-var require_define_property = __commonJS({
-  "../../../../node_modules/.pnpm/@swc+helpers@0.5.1/node_modules/@swc/helpers/cjs/_define_property.cjs"(exports) {
-    "use strict";
-    exports._ = exports._define_property = _define_property15;
-    function _define_property15(obj, key, value) {
-      if (key in obj) {
-        Object.defineProperty(obj, key, { value, enumerable: true, configurable: true, writable: true });
-      } else
-        obj[key] = value;
-      return obj;
-    }
-  }
-});
-
 // ../../../toolkit/utils/dist/cjs/cli/logger.js
 var require_logger2 = __commonJS({
   "../../../toolkit/utils/dist/cjs/cli/logger.js"(exports) {
@@ -116718,7 +116506,6 @@ var require_logger2 = __commonJS({
         return logger2;
       }
     });
-    var _define_property15 = require_define_property();
     var _interop_require_default = require_interop_require_default();
     var _chalk = /* @__PURE__ */ _interop_require_default._(require_chalk2());
     var LOG_LEVEL = {
@@ -116804,10 +116591,6 @@ ${_chalk.default.grey(rest.join("\n"))}`;
         return longestLabel;
       }
       constructor(options = {}) {
-        _define_property15._(this, "level", void 0);
-        _define_property15._(this, "config", void 0);
-        _define_property15._(this, "types", void 0);
-        _define_property15._(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 || {});
@@ -117737,31 +117520,6 @@ var require_runtimeExports = __commonJS({
   }
 });
 
-// ../../../toolkit/utils/dist/cjs/cli/test.js
-var require_test = __commonJS({
-  "../../../toolkit/utils/dist/cjs/cli/test.js"(exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", {
-      value: true
-    });
-    Object.defineProperty(exports, "initSnapshotSerializer", {
-      enumerable: true,
-      get: function() {
-        return initSnapshotSerializer;
-      }
-    });
-    var initSnapshotSerializer = (root) => {
-      expect.addSnapshotSerializer({
-        test: (val) => typeof val === "string" && (val.includes("modern.js") || val.includes("node_modules") || val.includes(root)),
-        print: (val) => (
-          // eslint-disable-next-line no-nested-ternary
-          typeof val === "string" ? val.includes("node_modules") ? `"${val.replace(/.+node_modules/, ``).replace(/\\/g, "/")}"` : val.includes("modern.js") ? `"${val.replace(/.+modern\.js/, ``).replace(/\\/g, "/")}"` : `"${val.replace(root, "").replace(/\\/g, "/")}"` : val
-        )
-      });
-    };
-  }
-});
-
 // ../../../toolkit/utils/dist/cjs/cli/watch.js
 var require_watch = __commonJS({
   "../../../toolkit/utils/dist/cjs/cli/watch.js"(exports) {
@@ -117858,7 +117616,6 @@ var require_cli = __commonJS({
     _export_star._(require_require(), exports);
     _export_star._(require_routes(), exports);
     _export_star._(require_runtimeExports(), exports);
-    _export_star._(require_test(), exports);
     _export_star._(require_watch(), exports);
   }
 });
@@ -133268,7 +133025,7 @@ var ZH_LOCALE2 = {
     function: {
       self: "启用可选功能",
       question: "请选择功能名称",
-      tailwindcss: "启用 「Tailwind CSS」 支持",
+      tailwindcss: "启用「Tailwind CSS」 支持",
       bff: "启用「BFF」功能",
       micro_frontend: "启用「微前端」模式",
       i18n: "启用「国际化（i18n）」功能",

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.1.21",
+  "version": "3.1.23",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/index.js",
   "files": [
@@ -30,16 +30,17 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "@scripts/build": "2.22.1",
-    "@scripts/jest-config": "2.22.1",
-    "@modern-js/generator-utils": "3.1.21",
-    "@modern-js/plugin-i18n": "2.22.1",
-    "@modern-js/generator-common": "3.1.21"
+    "@scripts/build": "2.23.1",
+    "@scripts/jest-config": "2.23.1",
+    "@modern-js/plugin-i18n": "2.23.1",
+    "@modern-js/generator-utils": "3.1.23",
+    "@modern-js/generator-common": "3.1.23"
   },
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "provenance": true
   },
   "types": "./src/index.ts",
   "scripts": {