@modern-js/utils 2.22.1-alpha.3 → 2.23.0

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @modern-js/utils
 
+## 2.23.0
+
+### Patch Changes
+
+- 7e6fb5f: chore: publishConfig add provenance config
+
+  chore: publishConfig 增加 provenance 配置
+
+- a7a7ad7: chore: move some public code to the utils package
+  chore: 移动一些公共的代码到 utils 包
+- 6dec7c2: test(utils): reuse the snapshot serializer of vitest config
+
+  test(utils): 复用 vitest 的 snapshot serializer
+
+- c3216b5: chore: split the scheme into the plugin
+
+  chore: 拆分 scheme 到插件内部
+
+## 2.22.1
+
+### Patch Changes
+
+- e2848a2: fix: support nonce in streaming SSR
+  fix: 在 streaming SSR 中支持 nonce
+- d4045ed: fix(builder): print https URLs when devServer.https is true
+
+  fix(builder): 当 devServer.https 为 true 时，输出 https 的 URLs
+
 ## 2.22.0
 
 ### Patch Changes

package/dist/cjs/cli/constants/index.js

@@ -100,9 +100,6 @@ _export(exports, {
   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;
   }
@@ -157,8 +154,6 @@ const INTERNAL_MODULE_TOOLS_PLUGINS = {
   "@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"
 };
@@ -189,8 +184,6 @@ const INTERNAL_CLI_PLUGINS = {
   "@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"
 };
@@ -206,214 +199,6 @@ const INTERNAL_SERVER_PLUGINS = {
   [SERVER_PLUGIN_SERVER]: "@modern-js/plugin-server/server",
   [SERVER_PLUGIN_POLYFILL]: "@modern-js/plugin-polyfill/server"
 };
-const 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"
-        ]
-      }
-    }
-  ]
-};
 const DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS = {
   allowNamespaces: true,
   allExtensions: true,

package/dist/cjs/cli/index.js

@@ -24,5 +24,4 @@ _export_star._(require("./print"), exports);
 _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);

package/dist/cjs/cli/is/project.js

@@ -59,11 +59,14 @@ const isPackageInstalled = (name, resolvePaths) => {
     return false;
   }
 };
-const isApiOnly = async (appDirectory, entryDir) => {
-  const srcDir = _path.default.join(appDirectory, entryDir !== null && entryDir !== void 0 ? entryDir : "src");
-  const existSrc = await _compiled.fs.pathExists(srcDir);
+const isApiOnly = async (appDirectory, entryDir, apiDir) => {
+  const existApi = await _compiled.fs.pathExists(apiDir !== null && apiDir !== void 0 ? apiDir : _path.default.join(appDirectory, "api"));
+  const existSrc = await _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;
 };
 const isWebOnly = async () => {
   const options = (0, _compiled.minimist)((0, _commands.getArgv)());

package/dist/cjs/cli/logger.js

@@ -17,7 +17,6 @@ _export(exports, {
     return logger;
   }
 });
-const _define_property = require("@swc/helpers/_/_define_property");
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _chalk = /* @__PURE__ */ _interop_require_default._(require("../../compiled/chalk"));
 const LOG_LEVEL = {
@@ -103,10 +102,6 @@ ${_chalk.default.grey(rest.join("\n"))}`;
     return longestLabel;
   }
   constructor(options = {}) {
-    _define_property._(this, "level", void 0);
-    _define_property._(this, "config", void 0);
-    _define_property._(this, "types", void 0);
-    _define_property._(this, "longestLabel", void 0);
     this.level = options.level || LOG_TYPES.log.level;
     this.config = {
       ...DEFAULT_CONFIG,

package/dist/cjs/cli/prettyInstructions.js

@@ -67,9 +67,10 @@ const getAddressUrls = (protocol = "http", port, host) => {
   }, []);
 };
 const 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) {

package/dist/cjs/runtime/nestedRoutes.js

@@ -72,7 +72,9 @@ const renderNestedRoute = (nestedRoute, options = {}) => {
           /* @__PURE__ */ (0, _jsxruntime.jsx)(Component, {
             ...props
           }),
-          typeof document === "undefined" && DeferredDataComponent && /* @__PURE__ */ (0, _jsxruntime.jsx)(DeferredDataComponent, {})
+          typeof document === "undefined" && DeferredDataComponent && /* @__PURE__ */ (0, _jsxruntime.jsx)(DeferredDataComponent, {
+            nonce: props === null || props === void 0 ? void 0 : props.nonce
+          })
         ]
       });
     } else if (lazyImport) {

package/dist/esm/cli/constants/index.js

@@ -46,8 +46,6 @@ export const INTERNAL_MODULE_TOOLS_PLUGINS = {
   "@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"
 };
@@ -78,8 +76,6 @@ export const INTERNAL_CLI_PLUGINS = {
   "@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"
 };
@@ -95,214 +91,6 @@ export const INTERNAL_SERVER_PLUGINS = {
   [SERVER_PLUGIN_SERVER]: "@modern-js/plugin-server/server",
   [SERVER_PLUGIN_POLYFILL]: "@modern-js/plugin-polyfill/server"
 };
-export const 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"
-        ]
-      }
-    }
-  ]
-};
 export const DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS = {
   allowNamespaces: true,
   allExtensions: true,

package/dist/esm/cli/index.js

@@ -19,5 +19,4 @@ export * from "./print";
 export * from "./require";
 export * from "./routes";
 export * from "./runtimeExports";
-export * from "./test";
 export * from "./watch";

package/dist/esm/cli/is/project.js

@@ -24,11 +24,14 @@ export const isPackageInstalled = (name, resolvePaths) => {
     return false;
   }
 };
-export const isApiOnly = async (appDirectory, entryDir) => {
-  const srcDir = path.join(appDirectory, entryDir !== null && entryDir !== void 0 ? entryDir : "src");
-  const existSrc = await fs.pathExists(srcDir);
+export const isApiOnly = async (appDirectory, entryDir, apiDir) => {
+  const existApi = await fs.pathExists(apiDir !== null && apiDir !== void 0 ? apiDir : path.join(appDirectory, "api"));
+  const existSrc = await fs.pathExists(path.join(appDirectory, entryDir !== null && entryDir !== void 0 ? entryDir : "src"));
   const options = minimist(getArgv());
-  return !existSrc || Boolean(options["api-only"]);
+  if (options["api-only"]) {
+    return true;
+  }
+  return existApi && !existSrc;
 };
 export const isWebOnly = async () => {
   const options = minimist(getArgv());

package/dist/esm/cli/logger.js

@@ -1,4 +1,3 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import chalk from "../../compiled/chalk";
 const LOG_LEVEL = {
   error: 0,
@@ -83,10 +82,6 @@ ${chalk.grey(rest.join("\n"))}`;
     return longestLabel;
   }
   constructor(options = {}) {
-    _define_property(this, "level", void 0);
-    _define_property(this, "config", void 0);
-    _define_property(this, "types", void 0);
-    _define_property(this, "longestLabel", void 0);
     this.level = options.level || LOG_TYPES.log.level;
     this.config = {
       ...DEFAULT_CONFIG,

package/dist/esm/cli/prettyInstructions.js

@@ -47,9 +47,10 @@ export const getAddressUrls = (protocol = "http", port, host) => {
   }, []);
 };
 export const 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 && isDev() ? "https" : "http", port, (_config_dev = config.dev) === null || _config_dev === void 0 ? void 0 : _config_dev.host);
+  const isHttps = 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 (isSingleEntry(entrypoints) || apiOnly) {

package/dist/esm/runtime/nestedRoutes.js

@@ -52,7 +52,9 @@ export const renderNestedRoute = (nestedRoute, options = {}) => {
           /* @__PURE__ */ _jsx(Component, {
             ...props
           }),
-          typeof document === "undefined" && DeferredDataComponent && /* @__PURE__ */ _jsx(DeferredDataComponent, {})
+          typeof document === "undefined" && DeferredDataComponent && /* @__PURE__ */ _jsx(DeferredDataComponent, {
+            nonce: props === null || props === void 0 ? void 0 : props.nonce
+          })
         ]
       });
     } else if (lazyImport) {