@modern-js/runtime 2.55.0 → 2.56.1

package/dist/cjs/cli/index.js

@@ -39,7 +39,6 @@ __export(cli_exports, {
 module.exports = __toCommonJS(cli_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
-var import_core = require("@rsbuild/core");
 var import_cli = require("../state/cli");
 var import_cli2 = require("../router/cli");
 var import_cli3 = require("../document/cli");
@@ -151,10 +150,10 @@ const runtimePlugin = (params) => ({
                 ]);
               }
             },
-            rspack: (_config, { appendPlugins }) => {
+            rspack: (_config, { appendPlugins, rspack }) => {
               if (!isReact18) {
                 appendPlugins([
-                  new import_core.rspack.IgnorePlugin({
+                  new rspack.IgnorePlugin({
                     resourceRegExp: /^react-dom\/client$/,
                     contextRegExp: /./
                   })

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

@@ -53,6 +53,33 @@ const checkUseStringSSR = (config) => {
   const { output } = config;
   return Boolean(output === null || output === void 0 ? void 0 : output.ssg) || hasStringSSREntry(config);
 };
+const ssrBuilderPlugin = (modernAPI) => ({
+  name: "@modern-js/builder-plugin-ssr",
+  setup(api) {
+    api.modifyEnvironmentConfig((config, { name, mergeEnvironmentConfig }) => {
+      const isServerEnvironment = config.output.target === "node" || name === "serviceWorker";
+      const userConfig = modernAPI.useResolvedConfigContext();
+      const useLoadablePlugin = (0, import_utils.isUseSSRBundle)(userConfig) && !isServerEnvironment && checkUseStringSSR(userConfig);
+      return mergeEnvironmentConfig(config, {
+        source: {
+          define: {
+            "process.env.MODERN_TARGET": isServerEnvironment ? JSON.stringify("node") : JSON.stringify("browser")
+          }
+        },
+        tools: {
+          bundlerChain: useLoadablePlugin ? (chain) => {
+            const LoadableBundlerPlugin = require("./loadable-bundler-plugin.js");
+            chain.plugin("loadable").use(LoadableBundlerPlugin, [
+              {
+                filename: import_utils.LOADABLE_STATS_FILE
+              }
+            ]);
+          } : void 0
+        }
+      });
+    });
+  }
+});
 const ssrPlugin = () => ({
   name: "@modern-js/plugin-ssr",
   required: [
@@ -86,27 +113,16 @@ const ssrPlugin = () => ({
           }
         })();
         return {
+          builderPlugins: [
+            ssrBuilderPlugin(api)
+          ],
           source: {
             alias: {
               // ensure that all packages use the same storage in @modern-js/runtime-utils/node
               "@modern-js/runtime-utils/node$": require.resolve("@modern-js/runtime-utils/node")
-            },
-            globalVars: (values, { target }) => {
-              values["process.env.MODERN_TARGET"] = target === "node" || target === "service-worker" ? "node" : "browser";
             }
           },
           tools: {
-            bundlerChain(chain, { isServer, isServiceWorker }) {
-              const userConfig = api.useResolvedConfigContext();
-              if ((0, import_utils.isUseSSRBundle)(userConfig) && !isServer && !isServiceWorker && checkUseStringSSR(userConfig)) {
-                const LoadableBundlerPlugin = require("./loadable-bundler-plugin.js");
-                chain.plugin("loadable").use(LoadableBundlerPlugin, [
-                  {
-                    filename: import_utils.LOADABLE_STATS_FILE
-                  }
-                ]);
-              }
-            },
             babel: babelHandler
           }
         };

package/dist/cjs/core/browser/index.js

@@ -32,12 +32,32 @@ __export(browser_exports, {
 });
 module.exports = __toCommonJS(browser_exports);
 var import_react = __toESM(require("react"));
+var import_cookie = __toESM(require("cookie"));
 var import_context = require("../context");
 var import_runtime = require("../context/runtime");
 var import_loaderManager = require("../loader/loaderManager");
 var import_runner = require("../plugin/runner");
 var import_hydrate = require("./hydrate");
 const IS_REACT18 = process.env.IS_REACT18 === "true";
+function getSSRData() {
+  const ssrData = window._SSR_DATA;
+  if (ssrData) {
+    const finalSSRData = {
+      ...ssrData,
+      context: {
+        ...ssrData.context,
+        request: {
+          ...ssrData.context.request,
+          cookieMap: import_cookie.default.parse(document.cookie || "") || {},
+          cookie: document.cookie || "",
+          userAgent: navigator.userAgent,
+          referer: document.referrer
+        }
+      }
+    };
+    return finalSSRData;
+  }
+}
 function isClientArgs(id) {
   return typeof id === "undefined" || typeof id === "string" || typeof HTMLElement !== "undefined" && id instanceof HTMLElement;
 }
@@ -54,7 +74,7 @@ async function render(App, id) {
   });
   if (isClientArgs(id)) {
     var _ssrData_data, _ssrData_data1;
-    const ssrData = window._SSR_DATA;
+    const ssrData = getSSRData();
     const loadersData = (ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data = ssrData.data) === null || _ssrData_data === void 0 ? void 0 : _ssrData_data.loadersData) || {};
     const initialLoadersState = Object.keys(loadersData).reduce((res, key) => {
       const loaderData = loadersData[key];

package/dist/cjs/core/plugin/index.js

@@ -23,7 +23,7 @@ __export(plugin_exports, {
   registerPlugin: () => registerPlugin
 });
 module.exports = __toCommonJS(plugin_exports);
-var import_lodash = require("@modern-js/utils/lodash");
+var import_merge = require("../utils/merge");
 var import_base = require("./base");
 var import_runner = require("./runner");
 __reExport(plugin_exports, require("./base"), module.exports);
@@ -35,7 +35,7 @@ function registerPlugin(internalPlugins, runtimeConfig, customRuntime) {
   return runner;
 }
 function mergeConfig(config, ...otherConfig) {
-  return (0, import_lodash.merge)(config, ...otherConfig);
+  return (0, import_merge.merge)(config, ...otherConfig);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/core/server/stream/createReadableStream.js

@@ -32,7 +32,6 @@ __export(createReadableStream_exports, {
 });
 module.exports = __toCommonJS(createReadableStream_exports);
 var import_stream = require("stream");
-var import_server = require("react-dom/server");
 var import_node = require("@modern-js/runtime-utils/node");
 var import_styled_components = require("styled-components");
 var import_isbot = __toESM(require("isbot"));
@@ -40,7 +39,8 @@ var import_common = require("../../../common");
 var import_constants = require("../../constants");
 var import_template = require("./template");
 var import_shared = require("./shared");
-const createReadableStreamFromElement = (request, rootElement, options) => {
+const createReadableStreamFromElement = async (request, rootElement, options) => {
+  const { renderToPipeableStream } = await Promise.resolve().then(() => __toESM(require("react-dom/server")));
   const { runtimeContext, htmlTemplate, config, ssrConfig } = options;
   let shellChunkStatus = import_shared.ShellChunkStatus.START;
   let renderLevel = import_constants.RenderLevel.SERVER_RENDER;
@@ -51,7 +51,7 @@ const createReadableStreamFromElement = (request, rootElement, options) => {
   const chunkVec = [];
   const root = forceStream2String ? sheet.collectStyles(rootElement) : rootElement;
   return new Promise((resolve) => {
-    const { pipe } = (0, import_server.renderToPipeableStream)(root, {
+    const { pipe } = renderToPipeableStream(root, {
       nonce: config.nonce,
       [onReady]() {
         var _options_onReady;

package/dist/cjs/core/server/string/index.js

@@ -58,6 +58,7 @@ const renderString = async (request, serverRoot, options) => {
     };
     const routerContext = runtimeContext.routerContext;
     const { htmlTemplate, entryName, loadableStats, routeManifest } = resource;
+    const ssrConfig = (0, import_utils.getSSRConfigByEntry)(entryName, config.ssr, config.ssrByEntries, staticGenerate);
     const chunkSet = {
       renderLevel: import_constants2.RenderLevel.CLIENT_RENDER,
       ssrScripts: "",
@@ -66,12 +67,11 @@ const renderString = async (request, serverRoot, options) => {
     };
     let prefetchData = {};
     try {
-      prefetchData = await (0, import_prefetch.prefetch)(serverRoot, request, options, tracer);
+      prefetchData = await (0, import_prefetch.prefetch)(serverRoot, request, options, ssrConfig, tracer);
       chunkSet.renderLevel = import_constants2.RenderLevel.SERVER_PREFETCH;
     } catch (e) {
       chunkSet.renderLevel = import_constants2.RenderLevel.CLIENT_RENDER;
     }
-    const ssrConfig = (0, import_utils.getSSRConfigByEntry)(entryName, config.ssr, config.ssrByEntries, staticGenerate);
     const collectors = [
       new import_styledComponent.StyledCollector(chunkSet),
       new import_loadable.LoadableCollector({

package/dist/cjs/core/server/string/loadable.js

@@ -144,7 +144,7 @@ class LoadableCollector {
         return link;
       }
     }));
-    chunkSet.jsChunk += css.filter((css2) => Boolean(css2)).join("");
+    chunkSet.cssChunk += css.filter((css2) => Boolean(css2)).join("");
   }
   generateAttributes(extraAtr = {}) {
     const { config } = this.options;

package/dist/cjs/core/server/string/prefetch.js

@@ -38,13 +38,13 @@ var import_time = require("@modern-js/runtime-utils/time");
 var import_request = require("@modern-js/runtime-utils/universal/request");
 var import_react = __toESM(require("react"));
 var import_tracer = require("../tracer");
-const prefetch = async (App, request, options, { onError, onTiming }) => {
+const prefetch = async (App, request, options, ssrConfig, { onError, onTiming }) => {
   const headersData = (0, import_request.parseHeaders)(request);
-  const { runtimeContext: context, resource, config } = options;
+  const { runtimeContext: context, resource } = options;
   const { entryName, loadableStats } = resource;
   return (0, import_node.run)(headersData, async () => {
     var _context_store;
-    if (!config.disablePrerender) {
+    if (typeof ssrConfig === "boolean" || !ssrConfig.disablePrerender) {
       try {
         const end = (0, import_time.time)();
         if (loadableStats) {

package/dist/cjs/core/utils/merge.js

@@ -0,0 +1,53 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var merge_exports = {};
+__export(merge_exports, {
+  merge: () => merge
+});
+module.exports = __toCommonJS(merge_exports);
+function isObject(obj) {
+  return obj && typeof obj === "object" && !Array.isArray(obj);
+}
+function merge(target, ...sources) {
+  if (!sources.length) {
+    return target;
+  }
+  const source = sources.shift();
+  if (isObject(target) && isObject(source)) {
+    for (const key in source) {
+      if (isObject(source[key])) {
+        if (!target[key]) {
+          Object.assign(target, {
+            [key]: {}
+          });
+        }
+        merge(target[key], source[key]);
+      } else {
+        Object.assign(target, {
+          [key]: source[key]
+        });
+      }
+    }
+  }
+  return merge(target, ...sources);
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  merge
+});

package/dist/cjs/router/cli/code/index.js

@@ -48,10 +48,10 @@ const generateCode = async (appContext, config, entrypoints, api) => {
   const oldVersion = typeof (config === null || config === void 0 ? void 0 : config.runtime.router) === "object" ? Boolean((config === null || config === void 0 ? void 0 : config.runtime.router).oldVersion) : false;
   await Promise.all(entrypoints.map(generateEntryCode));
   async function generateEntryCode(entrypoint) {
-    const { entryName, isMainEntry, isAutoMount, fileSystemRoutes } = entrypoint;
+    const { entryName, isMainEntry, isAutoMount, pageRoutesEntry, nestedRoutesEntry } = entrypoint;
     const { metaName } = api.useAppContext();
     if (isAutoMount) {
-      if (fileSystemRoutes) {
+      if (pageRoutesEntry || nestedRoutesEntry) {
         var _config_output;
         let initialRoutes = [];
         let nestedRoutes = null;

package/dist/cjs/router/cli/entry.js

@@ -54,29 +54,30 @@ const modifyEntrypoints = (entrypoints, config = {}) => {
     if (!entrypoint.isAutoMount) {
       return entrypoint;
     }
+    if (entrypoint === null || entrypoint === void 0 ? void 0 : entrypoint.isCustomSourceEntry) {
+      if (entrypoint.fileSystemRoutes) {
+        if ((0, import_utils.isRouterV5)(config)) {
+          throw Error("Custom entries with conventional routing not support use react router v5!");
+        }
+        entrypoint.nestedRoutesEntry = entrypoint.entry;
+      }
+      return entrypoint;
+    }
     const isHasApp = (0, import_entry.hasApp)(entrypoint.absoluteEntryDir);
     if (isHasApp) {
       return entrypoint;
     }
-    const isHasNestedRoutes = hasNestedRoutes(entrypoint.absoluteEntryDir);
     const isHasPages = hasPages(entrypoint.absoluteEntryDir);
-    if (!isHasNestedRoutes && !isHasPages && !entrypoint.fileSystemRoutes) {
-      return entrypoint;
-    }
-    if (entrypoint.fileSystemRoutes && !(0, import_utils.isRouterV5)(config)) {
-      entrypoint.nestedRoutesEntry = entrypoint.entry;
-    } else if (!entrypoint.fileSystemRoutes) {
+    if (isHasPages) {
+      entrypoint.pageRoutesEntry = import_path.default.join(entrypoint.absoluteEntryDir, import_constants.PAGES_DIR_NAME);
       entrypoint.fileSystemRoutes = {
+        ...entrypoint.fileSystemRoutes,
         globalApp: (0, import_utils.findExists)(import_utils.JS_EXTENSIONS.map((ext) => import_path.default.resolve(entrypoint.absoluteEntryDir, `./${import_constants.PAGES_DIR_NAME}/${import_constants.FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT}${ext}`)))
       };
-      if (isHasPages) {
-        entrypoint.pageRoutesEntry = import_path.default.join(entrypoint.absoluteEntryDir, import_constants.PAGES_DIR_NAME);
-      }
-      if (isHasNestedRoutes) {
-        entrypoint.nestedRoutesEntry = import_path.default.join(entrypoint.absoluteEntryDir, import_constants.NESTED_ROUTES_DIR);
-      }
-    } else {
-      throw Error("Custom entries with conventional routing not support use react router v5!");
+    }
+    const isHasNestedRoutes = hasNestedRoutes(entrypoint.absoluteEntryDir);
+    if (isHasNestedRoutes) {
+      entrypoint.nestedRoutesEntry = import_path.default.join(entrypoint.absoluteEntryDir, import_constants.NESTED_ROUTES_DIR);
     }
     return entrypoint;
   });

package/dist/cjs/router/runtime/PrefetchLink.js

@@ -105,7 +105,7 @@ async function loadRouteModule(route, routeAssets) {
   }
   try {
     await Promise.all(chunkIds.map((chunkId) => {
-      return __webpack_chunk_load__ === null || __webpack_chunk_load__ === void 0 ? void 0 : __webpack_chunk_load__(String(chunkId));
+      return __webpack_chunk_load__ === null || __webpack_chunk_load__ === void 0 ? void 0 : __webpack_chunk_load__(chunkId);
     }));
   } catch (error) {
     console.error(error);

package/dist/cjs/router/runtime/plugin.node.js

@@ -28,7 +28,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var plugin_node_exports = {};
 __export(plugin_node_exports, {
-  createFetchHeaders: () => createFetchHeaders,
   modifyRoutes: () => modifyRoutes,
   routerPlugin: () => routerPlugin
 });
@@ -47,20 +46,15 @@ var import_context = require("../../core/context");
 var import_utils = require("./utils");
 var import_hooks = require("./hooks");
 var import_DeferredDataScripts = __toESM(require("./DeferredDataScripts.node"));
-function createFetchHeaders(requestHeaders) {
-  const headers = new Headers();
-  for (const [key, values] of Object.entries(requestHeaders || {})) {
-    if (values) {
-      if (Array.isArray(values)) {
-        for (const value of values) {
-          headers.append(key, value);
-        }
-      } else {
-        headers.set(key, values);
-      }
-    }
-  }
-  return headers;
+function createRemixReuqest(request) {
+  const method = "GET";
+  const { headers } = request;
+  const controller = new AbortController();
+  return new Request(request.url, {
+    method,
+    headers,
+    signal: controller.signal
+  });
 }
 const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
   return {
@@ -101,7 +95,7 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
           const { query } = (0, import_remix_router.createStaticHandler)(routes, {
             basename: _basename
           });
-          const remixRequest = context.ssrContext.request.raw;
+          const remixRequest = createRemixReuqest(context.ssrContext.request.raw);
           const end = (0, import_time.time)();
           const routerContext = await query(remixRequest, {
             requestContext
@@ -186,7 +180,6 @@ const modifyRoutes = () => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createFetchHeaders,
   modifyRoutes,
   routerPlugin
 });

package/dist/esm/cli/index.js

@@ -3,7 +3,6 @@ import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import { isReact18 as checkIsReact18, cleanRequireCache, createRuntimeExportsUtils } from "@modern-js/utils";
-import { rspack } from "@rsbuild/core";
 import { statePlugin } from "../state/cli";
 import { routerPlugin } from "../router/cli";
 import { documentPlugin } from "../document/cli";
@@ -138,7 +137,7 @@ var runtimePlugin = function(params) {
                 }
               },
               rspack: function(_config, param) {
-                var appendPlugins = param.appendPlugins;
+                var appendPlugins = param.appendPlugins, rspack = param.rspack;
                 if (!isReact18) {
                   appendPlugins([
                     new rspack.IgnorePlugin({

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

@@ -38,6 +38,36 @@ var checkUseStringSSR = function(config) {
   var output = config.output;
   return Boolean(output === null || output === void 0 ? void 0 : output.ssg) || hasStringSSREntry(config);
 };
+var ssrBuilderPlugin = function(modernAPI) {
+  return {
+    name: "@modern-js/builder-plugin-ssr",
+    setup: function setup(api) {
+      api.modifyEnvironmentConfig(function(config, param) {
+        var name = param.name, mergeEnvironmentConfig = param.mergeEnvironmentConfig;
+        var isServerEnvironment = config.output.target === "node" || name === "serviceWorker";
+        var userConfig = modernAPI.useResolvedConfigContext();
+        var useLoadablePlugin = isUseSSRBundle(userConfig) && !isServerEnvironment && checkUseStringSSR(userConfig);
+        return mergeEnvironmentConfig(config, {
+          source: {
+            define: {
+              "process.env.MODERN_TARGET": isServerEnvironment ? JSON.stringify("node") : JSON.stringify("browser")
+            }
+          },
+          tools: {
+            bundlerChain: useLoadablePlugin ? function(chain) {
+              var LoadableBundlerPlugin = require("./loadable-bundler-plugin.js");
+              chain.plugin("loadable").use(LoadableBundlerPlugin, [
+                {
+                  filename: LOADABLE_STATS_FILE
+                }
+              ]);
+            } : void 0
+          }
+        });
+      });
+    }
+  };
+};
 var ssrPlugin = function() {
   return {
     name: "@modern-js/plugin-ssr",
@@ -72,29 +102,16 @@ var ssrPlugin = function() {
             }
           }();
           return {
+            builderPlugins: [
+              ssrBuilderPlugin(api)
+            ],
             source: {
               alias: {
                 // ensure that all packages use the same storage in @modern-js/runtime-utils/node
                 "@modern-js/runtime-utils/node$": require.resolve("@modern-js/runtime-utils/node")
-              },
-              globalVars: function(values, param) {
-                var target = param.target;
-                values["process.env.MODERN_TARGET"] = target === "node" || target === "service-worker" ? "node" : "browser";
               }
             },
             tools: {
-              bundlerChain: function bundlerChain(chain, param) {
-                var isServer = param.isServer, isServiceWorker = param.isServiceWorker;
-                var userConfig = api.useResolvedConfigContext();
-                if (isUseSSRBundle(userConfig) && !isServer && !isServiceWorker && checkUseStringSSR(userConfig)) {
-                  var LoadableBundlerPlugin = require("./loadable-bundler-plugin.js");
-                  chain.plugin("loadable").use(LoadableBundlerPlugin, [
-                    {
-                      filename: LOADABLE_STATS_FILE
-                    }
-                  ]);
-                }
-              },
               babel: babelHandler
             }
           };

package/dist/esm/core/browser/index.js

@@ -1,14 +1,32 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import React from "react";
+import cookieTool from "cookie";
 import { getGlobalAppInit } from "../context";
 import { getInitialContext } from "../context/runtime";
 import { createLoaderManager } from "../loader/loaderManager";
 import { getGlobalRunner } from "../plugin/runner";
 import { hydrateRoot } from "./hydrate";
 var IS_REACT18 = process.env.IS_REACT18 === "true";
+function getSSRData() {
+  var ssrData = window._SSR_DATA;
+  if (ssrData) {
+    var finalSSRData = _object_spread_props(_object_spread({}, ssrData), {
+      context: _object_spread_props(_object_spread({}, ssrData.context), {
+        request: _object_spread_props(_object_spread({}, ssrData.context.request), {
+          cookieMap: cookieTool.parse(document.cookie || "") || {},
+          cookie: document.cookie || "",
+          userAgent: navigator.userAgent,
+          referer: document.referrer
+        })
+      })
+    });
+    return finalSSRData;
+  }
+}
 function isClientArgs(id) {
   return typeof id === "undefined" || typeof id === "string" || typeof HTMLElement !== "undefined" && _instanceof(id, HTMLElement);
 }
@@ -73,7 +91,7 @@ function _render() {
           ModernHydrate = function ModernHydrate2(App2, callback) {
             return _ModernHydrate.apply(this, arguments);
           };
-          ssrData = window._SSR_DATA;
+          ssrData = getSSRData();
           loadersData = (ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_data = ssrData.data) === null || _ssrData_data === void 0 ? void 0 : _ssrData_data.loadersData) || {};
           initialLoadersState = Object.keys(loadersData).reduce(function(res, key) {
             var loaderData = loadersData[key];

package/dist/esm/core/plugin/index.js

@@ -1,5 +1,5 @@
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
-import { merge } from "@modern-js/utils/lodash";
+import { merge } from "../utils/merge";
 import { runtime } from "./base";
 import { setGlobalRunner } from "./runner";
 export * from "./base";