@modern-js/base-generator 3.1.20 → 3.1.22

package/dist/index.js

@@ -42252,7 +42252,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();
       }
@@ -42334,7 +42334,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();
@@ -42343,13 +42343,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());
@@ -42377,7 +42377,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();
@@ -113897,6 +113897,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;
       },
@@ -113981,9 +113984,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;
       }
@@ -113991,6 +113991,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";
@@ -114037,8 +114038,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"
     };
@@ -114069,8 +114068,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"
     };
@@ -114086,214 +114083,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,
@@ -114748,11 +114537,14 @@ 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)());
@@ -115086,21 +114878,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_property14;
-    function _define_property14(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) {
@@ -115123,7 +114900,6 @@ var require_logger2 = __commonJS({
         return logger;
       }
     });
-    var _define_property14 = require_define_property();
     var _interop_require_default = require_interop_require_default();
     var _chalk = /* @__PURE__ */ _interop_require_default._(require_chalk2());
     var LOG_LEVEL = {
@@ -115209,10 +114985,6 @@ ${_chalk.default.grey(rest.join("\n"))}`;
         return longestLabel;
       }
       constructor(options = {}) {
-        _define_property14._(this, "level", void 0);
-        _define_property14._(this, "config", void 0);
-        _define_property14._(this, "types", void 0);
-        _define_property14._(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 || {});
@@ -115893,9 +115665,10 @@ var require_prettyInstructions = __commonJS({
       }, []);
     };
     var prettyInstructions = (appContext, config) => {
-      var _config_dev;
+      var _appContext_builder_context_devServer, _appContext_builder, _config_dev;
       const { entrypoints, serverRoutes, port, apiOnly, checkedEntries } = appContext;
-      const urls = getAddressUrls(config.dev.https && (0, _is.isDev)() ? "https" : "http", port, (_config_dev = config.dev) === null || _config_dev === void 0 ? void 0 : _config_dev.host);
+      const isHttps = (0, _is.isDev)() && ((_appContext_builder_context_devServer = (_appContext_builder = appContext.builder) === null || _appContext_builder === void 0 ? void 0 : _appContext_builder.context.devServer) === null || _appContext_builder_context_devServer === void 0 ? void 0 : _appContext_builder_context_devServer.https);
+      const urls = getAddressUrls(isHttps ? "https" : "http", port, (_config_dev = config.dev) === null || _config_dev === void 0 ? void 0 : _config_dev.host);
       const routes = !apiOnly ? serverRoutes.filter((route) => route.entryName) : serverRoutes;
       let message = "App running at:\n\n";
       if ((0, _is.isSingleEntry)(entrypoints) || apiOnly) {
@@ -116141,31 +115914,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) {
@@ -116262,7 +116010,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);
   }
 });
@@ -116332,7 +116079,7 @@ var mime = Import.lazy("../compiled/mime-types", require);
 var chokidar = Import.lazy("../compiled/chokidar", require);
 var inquirer = Import.lazy("../compiled/inquirer", require);
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.2.5_g6gqsypbjnpqx7w2a6bm33mugi/node_modules/@modern-js/codesmith-api-app/dist/esm/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.2.5_@modern-js+codesmith@2.2.5_typescript@5.0.4/node_modules/@modern-js/codesmith-api-app/dist/esm/index.js
 var import_lodash6 = __toESM(require_lodash2());
 var import_comment_json = __toESM(require_src2());
 
@@ -128433,10 +128180,10 @@ var Schema = (
   }()
 );
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.2.5_g6gqsypbjnpqx7w2a6bm33mugi/node_modules/@modern-js/codesmith-formily/dist/esm/prompt.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.2.5_@modern-js+codesmith@2.2.5_typescript@5.0.4/node_modules/@modern-js/codesmith-formily/dist/esm/prompt.js
 var import_inquirer = __toESM(require_inquirer());
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.2.5_g6gqsypbjnpqx7w2a6bm33mugi/node_modules/@modern-js/codesmith-formily/dist/esm/transform.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.2.5_@modern-js+codesmith@2.2.5_typescript@5.0.4/node_modules/@modern-js/codesmith-formily/dist/esm/transform.js
 var import_lodash2 = __toESM(require_lodash2());
 function asyncGeneratorStep9(gen, resolve, reject, _next, _throw, key, arg) {
   try {
@@ -128783,7 +128530,7 @@ function transformForm(schema) {
   return getQuestionFromSchema(schema, configValue, validateMap, initValue);
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.2.5_g6gqsypbjnpqx7w2a6bm33mugi/node_modules/@modern-js/codesmith-formily/dist/esm/prompt.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.2.5_@modern-js+codesmith@2.2.5_typescript@5.0.4/node_modules/@modern-js/codesmith-formily/dist/esm/prompt.js
 function asyncGeneratorStep10(gen, resolve, reject, _next, _throw, key, arg) {
   try {
     var info = gen[key](arg);
@@ -129307,7 +129054,7 @@ function _prompt() {
   return _prompt.apply(this, arguments);
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.2.5_g6gqsypbjnpqx7w2a6bm33mugi/node_modules/@modern-js/codesmith-formily/dist/esm/inquirer.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-formily@2.2.5_@modern-js+codesmith@2.2.5_typescript@5.0.4/node_modules/@modern-js/codesmith-formily/dist/esm/inquirer.js
 function asyncGeneratorStep11(gen, resolve, reject, _next, _throw, key, arg) {
   try {
     var info = gen[key](arg);
@@ -129547,7 +129294,7 @@ var CLIReader = /* @__PURE__ */ function() {
   return CLIReader2;
 }();
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.2.5_g6gqsypbjnpqx7w2a6bm33mugi/node_modules/@modern-js/codesmith-api-app/dist/esm/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.2.5_@modern-js+codesmith@2.2.5_typescript@5.0.4/node_modules/@modern-js/codesmith-api-app/dist/esm/index.js
 var import_inquirer2 = __toESM(require_inquirer2());
 
 // ../../../../node_modules/.pnpm/@modern-js+plugin-i18n@2.18.0/node_modules/@modern-js/plugin-i18n/dist/esm-node/index.js
@@ -129626,7 +129373,7 @@ var I18n = class {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.2.5_g6gqsypbjnpqx7w2a6bm33mugi/node_modules/@modern-js/codesmith-api-app/dist/esm/locale/zh.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.2.5_@modern-js+codesmith@2.2.5_typescript@5.0.4/node_modules/@modern-js/codesmith-api-app/dist/esm/locale/zh.js
 var ZH_LOCALE = {
   environment: {
     node_version: "请升级 Node 版本至 LIS",
@@ -129653,7 +129400,7 @@ var ZH_LOCALE = {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.2.5_g6gqsypbjnpqx7w2a6bm33mugi/node_modules/@modern-js/codesmith-api-app/dist/esm/locale/en.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.2.5_@modern-js+codesmith@2.2.5_typescript@5.0.4/node_modules/@modern-js/codesmith-api-app/dist/esm/locale/en.js
 var EN_LOCALE = {
   environment: {
     node_version: "please upgrade node to lts version",
@@ -129680,14 +129427,14 @@ var EN_LOCALE = {
   }
 };
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.2.5_g6gqsypbjnpqx7w2a6bm33mugi/node_modules/@modern-js/codesmith-api-app/dist/esm/locale/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.2.5_@modern-js+codesmith@2.2.5_typescript@5.0.4/node_modules/@modern-js/codesmith-api-app/dist/esm/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.2.5_g6gqsypbjnpqx7w2a6bm33mugi/node_modules/@modern-js/codesmith-api-app/dist/esm/utils/transform.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.2.5_@modern-js+codesmith@2.2.5_typescript@5.0.4/node_modules/@modern-js/codesmith-api-app/dist/esm/utils/transform.js
 var import_lodash5 = __toESM(require_lodash2());
 function asyncGeneratorStep12(gen, resolve, reject, _next, _throw, key, arg) {
   try {
@@ -129896,7 +129643,7 @@ function transformInquirerSchema(questions) {
   return questions;
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.2.5_g6gqsypbjnpqx7w2a6bm33mugi/node_modules/@modern-js/codesmith-api-app/dist/esm/utils/checkUseNvm.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.2.5_@modern-js+codesmith@2.2.5_typescript@5.0.4/node_modules/@modern-js/codesmith-api-app/dist/esm/utils/checkUseNvm.js
 var import_path4 = __toESM(require("path"));
 function asyncGeneratorStep13(gen, resolve, reject, _next, _throw, key, arg) {
   try {
@@ -130160,7 +129907,7 @@ function _checkUseNvm() {
   return _checkUseNvm.apply(this, arguments);
 }
 
-// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.2.5_g6gqsypbjnpqx7w2a6bm33mugi/node_modules/@modern-js/codesmith-api-app/dist/esm/index.js
+// ../../../../node_modules/.pnpm/@modern-js+codesmith-api-app@2.2.5_@modern-js+codesmith@2.2.5_typescript@5.0.4/node_modules/@modern-js/codesmith-api-app/dist/esm/index.js
 function _array_like_to_array(arr, len) {
   if (len == null || len > arr.length)
     len = arr.length;
@@ -131188,7 +130935,7 @@ var ZH_LOCALE2 = {
     function: {
       self: "启用可选功能",
       question: "请选择功能名称",
-      tailwindcss: "启用 「Tailwind CSS」 支持",
+      tailwindcss: "启用「Tailwind CSS」 支持",
       bff: "启用「BFF」功能",
       micro_frontend: "启用「微前端」模式",
       i18n: "启用「国际化（i18n）」功能",
@@ -131477,8 +131224,6 @@ var src_default = (context, generator) => __async(void 0, null, function* () {
   }
   generator.logger.debug(`forge @modern-js/base-generator succeed `);
 });
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
 /*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
 /*!
  * fill-range <https://github.com/jonschlinkert/fill-range>

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.1.20",
+  "version": "3.1.22",
   "jsnext:source": "./src/index.ts",
   "types": "./src/index.ts",
   "main": "./dist/index.js",
@@ -30,15 +30,16 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "@scripts/jest-config": "2.22.0",
-    "@scripts/build": "2.22.0",
-    "@modern-js/generator-utils": "3.1.20",
-    "@modern-js/generator-common": "3.1.20"
+    "@modern-js/generator-common": "3.1.22",
+    "@modern-js/generator-utils": "3.1.22",
+    "@scripts/build": "2.23.0",
+    "@scripts/jest-config": "2.23.0"
   },
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "provenance": true
   },
   "scripts": {
     "new": "modern-lib new",