@modern-js/runtime 2.58.2-alpha.0 → 2.58.3

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

@@ -35,12 +35,12 @@ module.exports = __toCommonJS(code_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var import_lodash = require("@modern-js/utils/lodash");
-var import_constants = require("../constants");
-var import_constants2 = require("../../../cli/constants");
-var templates = __toESM(require("./templates"));
+var import_constants = require("../../../cli/constants");
+var import_constants2 = require("../constants");
 var import_getClientRoutes = require("./getClientRoutes");
-var import_utils2 = require("./utils");
 var import_nestedRoutes = require("./nestedRoutes");
+var templates = __toESM(require("./templates"));
+var import_utils2 = require("./utils");
 const generateCode = async (appContext, config, entrypoints, api) => {
   const { internalDirectory, srcDirectory, internalDirAlias, internalSrcAlias, packageName } = appContext;
   const hookRunners = api.useHookRunners();
@@ -140,7 +140,7 @@ const generateCode = async (appContext, config, entrypoints, api) => {
           const serverLoaderFile = (0, import_utils2.getServerCombinedModueFile)(internalDirectory, entryName);
           await import_utils.fs.outputFile(serverLoaderFile, serverLoaderCombined);
         }
-        await import_utils.fs.outputFile(import_path.default.resolve(internalDirectory, `./${entryName}/${import_constants.FILE_SYSTEM_ROUTES_FILE_NAME}`), code, "utf8");
+        await import_utils.fs.outputFile(import_path.default.resolve(internalDirectory, `./${entryName}/${import_constants2.FILE_SYSTEM_ROUTES_FILE_NAME}`), code, "utf8");
       }
     }
   }
@@ -165,7 +165,7 @@ function markRoutes(routes, routeIds) {
   });
 }
 function generatorRegisterCode(internalDirectory, entryName, code) {
-  import_utils.fs.outputFileSync(import_path.default.resolve(internalDirectory, `./${entryName}/${import_constants2.ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME}`), code, "utf8");
+  import_utils.fs.outputFileSync(import_path.default.resolve(internalDirectory, `./${entryName}/${import_constants.ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME}`), code, "utf8");
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -368,14 +368,21 @@ function ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext) {
     if (!config.source.enableAsyncEntry) {
       return combinedModule;
     }
-    return `export default Promise.all([import("${(0, import_utils.slash)(serverLoaderRuntime)}"),import("${(0, import_utils.slash)(serverLoadersFile)}")]).then(res=>{
-      return res.reduce((sum,cur)=>{
-        return {
-          ...sum,
-          ...cur
-        }
-     },{})
-    })`;
+    return `
+    async function loadModules() {
+      const [moduleA, moduleB] = await Promise.all([
+        import("${(0, import_utils.slash)(serverLoaderRuntime)}"),
+        import("${(0, import_utils.slash)(serverLoadersFile)}")
+      ]);
+
+      return {
+        ...moduleA,
+        ...moduleB
+      };
+    }
+
+    export { loadModules };
+    `;
   }
   return null;
 }

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

@@ -42,8 +42,8 @@ module.exports = __toCommonJS(utils_exports);
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
-var import_esbuild = require("esbuild");
 var import_es_module_lexer = require("es-module-lexer");
+var import_esbuild = require("esbuild");
 var import_constants = require("../constants");
 const walkDirectory = (dir) => import_fs.default.readdirSync(dir).reduce((previous, filename) => {
   const filePath = import_path.default.join(dir, filename);

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

@@ -35,9 +35,9 @@ __export(handler_exports, {
 module.exports = __toCommonJS(handler_exports);
 var import_path = __toESM(require("path"));
 var import_lodash = require("@modern-js/utils/lodash");
-var import_entry = require("./entry");
-var import_utils = require("./code/utils");
 var templates = __toESM(require("./code/templates"));
+var import_utils = require("./code/utils");
+var import_entry = require("./entry");
 let originEntrypoints = [];
 async function handleModifyEntrypoints(api, entrypoints) {
   const config = api.useResolvedConfigContext();

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

@@ -22,9 +22,9 @@ __export(DeferredDataScripts_node_exports, {
 });
 module.exports = __toCommonJS(DeferredDataScripts_node_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
-var import_react = require("react");
-var import_router = require("@modern-js/runtime-utils/router");
 var import_node = require("@modern-js/runtime-utils/node");
+var import_router = require("@modern-js/runtime-utils/router");
+var import_react = require("react");
 var import_utils = require("./utils");
 const setupFnStr = `function s(r,e){_ROUTER_DATA.r=_ROUTER_DATA.r||{},_ROUTER_DATA.r[r]=_ROUTER_DATA.r[r]||{};return new Promise((function(A,R){_ROUTER_DATA.r[r][e]={resolve:A,reject:R}}))};`;
 const resolveFnStr = `function r(e,r,o,A){A?_ROUTER_DATA.r[e][r].reject(A):_ROUTER_DATA.r[e][r].resolve(o)};`;

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

@@ -34,8 +34,8 @@ __export(PrefetchLink_exports, {
 });
 module.exports = __toCommonJS(PrefetchLink_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
-var import_react = __toESM(require("react"));
 var import_router = require("@modern-js/runtime-utils/router");
+var import_react = __toESM(require("react"));
 var import_core = require("../../core");
 function composeEventHandlers(theirHandler, ourHandler) {
   return (event) => {

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

@@ -25,12 +25,12 @@ __export(plugin_exports, {
 });
 module.exports = __toCommonJS(plugin_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
-var import_react = require("react");
-var import_router = require("@modern-js/runtime-utils/router");
-var import_parsed = require("@modern-js/runtime-utils/parsed");
 var import_merge = require("@modern-js/runtime-utils/merge");
-var import_context = require("../../core/context");
+var import_parsed = require("@modern-js/runtime-utils/parsed");
+var import_router = require("@modern-js/runtime-utils/router");
+var import_react = require("react");
 var import_core = require("../../core");
+var import_context = require("../../core/context");
 var import_hooks = require("./hooks");
 var import_utils = require("./utils");
 let finalRouteConfig = {

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

@@ -33,20 +33,20 @@ __export(plugin_node_exports, {
 });
 module.exports = __toCommonJS(plugin_node_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
-var import_react = require("react");
-var import_remix_router = require("@modern-js/runtime-utils/remix-router");
+var import_merge = require("@modern-js/runtime-utils/merge");
+var import_node = require("@modern-js/runtime-utils/node");
 var import_router = require("@modern-js/runtime-utils/node/router");
+var import_remix_router = require("@modern-js/runtime-utils/remix-router");
 var import_router2 = require("@modern-js/runtime-utils/router");
-var import_node = require("@modern-js/runtime-utils/node");
 var import_time = require("@modern-js/runtime-utils/time");
 var import_constants = require("@modern-js/utils/universal/constants");
-var import_merge = require("@modern-js/runtime-utils/merge");
+var import_react = require("react");
 var import_common = require("../../common");
 var import_core = require("../../core");
 var import_context = require("../../core/context");
-var import_utils = require("./utils");
-var import_hooks = require("./hooks");
 var import_DeferredDataScripts = __toESM(require("./DeferredDataScripts.node"));
+var import_hooks = require("./hooks");
+var import_utils = require("./utils");
 function createRemixReuqest(request) {
   const method = "GET";
   const { headers } = request;

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

@@ -38,9 +38,9 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
-var import_router = require("@modern-js/runtime-utils/router");
-var import_remix_router = require("@modern-js/runtime-utils/remix-router");
 var import_browser = require("@modern-js/runtime-utils/browser");
+var import_remix_router = require("@modern-js/runtime-utils/remix-router");
+var import_router = require("@modern-js/runtime-utils/router");
 var import_DefaultNotFound = require("./DefaultNotFound");
 var import_DeferredDataScripts = __toESM(require("./DeferredDataScripts"));
 function getRouteComponents(routes, { globalApp, ssrMode, props, reporter }) {

package/dist/cjs/state/plugins.js

@@ -34,8 +34,8 @@ __export(plugins_exports, {
   immer: () => immer
 });
 module.exports = __toCommonJS(plugins_exports);
-var import_plugin_effects = require("@modern-js-reduck/plugin-effects");
 var import_plugin_auto_actions = __toESM(require("@modern-js-reduck/plugin-auto-actions"));
+var import_plugin_effects = require("@modern-js-reduck/plugin-effects");
 var import_plugin_immutable = __toESM(require("@modern-js-reduck/plugin-immutable"));
 var import_plugin_devtools = __toESM(require("@modern-js-reduck/plugin-devtools"));
 const effects = () => import_plugin_effects.plugin;

package/dist/cjs/state/runtime/plugin.js

@@ -24,13 +24,13 @@ __export(plugin_exports, {
 });
 module.exports = __toCommonJS(plugin_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
-var import_react = require("react");
+var import_react = require("@modern-js-reduck/react");
 var import_store = require("@modern-js-reduck/store");
-var import_react2 = require("@modern-js-reduck/react");
 var import_merge = require("@modern-js/runtime-utils/merge");
-var import_plugins = require("../plugins");
-var import_core = require("../../core");
+var import_react2 = require("react");
 var import_common = require("../../common");
+var import_core = require("../../core");
+var import_plugins = require("../plugins");
 __reExport(plugin_exports, require("../plugins"), module.exports);
 const StatePluginHandleMap = {
   immer: import_plugins.immer,
@@ -63,8 +63,8 @@ const statePlugin = (userConfig = {}) => ({
     return {
       wrapRoot(App) {
         const getStateApp = (props) => {
-          const context = (0, import_react.useContext)(import_core.RuntimeReactContext);
-          return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react2.Provider, {
+          const context = (0, import_react2.useContext)(import_core.RuntimeReactContext);
+          return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Provider, {
             store: context.store,
             config: storeConfig,
             children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {

package/dist/esm/cli/code.js

@@ -1,12 +1,11 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
-import { MAIN_ENTRY_NAME, fs } from "@modern-js/utils";
-import { INDEX_FILE_NAME, ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_POINT_REGISTER_FILE_NAME, ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME, ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME, SERVER_ENTRY_POINT_FILE_NAME, ENTRY_SERVER_BOOTSTRAP_FILE_NAME } from "./constants";
+import { fs } from "@modern-js/utils";
+import { ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_POINT_REGISTER_FILE_NAME, ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME, ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME, ENTRY_SERVER_BOOTSTRAP_FILE_NAME, INDEX_FILE_NAME, SERVER_ENTRY_POINT_FILE_NAME } from "./constants";
 import * as template from "./template";
 import * as serverTemplate from "./template.server";
-function getSSRMode() {
-  var entry = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : MAIN_ENTRY_NAME, config = arguments.length > 1 ? arguments[1] : void 0;
+function getSSRMode(entry, config) {
   var _config_server = config.server, ssr = _config_server.ssr, ssrByEntries = _config_server.ssrByEntries;
   if (config.output.ssg) {
     return "string";

package/dist/esm/cli/index.js

@@ -3,14 +3,14 @@ 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 { statePlugin } from "../state/cli";
-import { routerPlugin } from "../router/cli";
 import { documentPlugin } from "../document/cli";
-import { ssrPlugin } from "./ssr";
-import { isRuntimeEntry } from "./entry";
-import { ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME } from "./constants";
-import { generateCode } from "./code";
+import { routerPlugin } from "../router/cli";
+import { statePlugin } from "../state/cli";
 import { builderPluginAlias } from "./alias";
+import { generateCode } from "./code";
+import { ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME } from "./constants";
+import { isRuntimeEntry } from "./entry";
+import { ssrPlugin } from "./ssr";
 import { isRuntimeEntry as isRuntimeEntry2 } from "./entry";
 var runtimePlugin = function(params) {
   return {
@@ -122,10 +122,7 @@ var runtimePlugin = function(params) {
                 ]
               },
               bundlerChain: function(chain) {
-                chain.module.rule("modern-entry").test([
-                  /\.js$/,
-                  /\.jsx$/
-                ]).include.add(path.resolve(appDirectory, "node_modules", ".".concat(metaName))).end().sideEffects(true);
+                chain.module.rule("modern-entry").test(/\.jsx?$/).include.add(path.resolve(appDirectory, "node_modules", ".".concat(metaName))).end().sideEffects(true);
               },
               /**
               * Add IgnorePlugin to fix react-dom/client import error when use react17

package/dist/esm/cli/ssr/babel-plugin-ssr-loader-id.js

@@ -2,8 +2,8 @@ var __getOwnPropNames = Object.getOwnPropertyNames;
 var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
-import crypto from "crypto";
 import { Buffer as Buffer2 } from "buffer";
+import crypto from "crypto";
 import * as t from "@babel/types";
 import { get } from "@modern-js/utils/lodash";
 var require_babel_plugin_ssr_loader_id = __commonJS({

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

@@ -1,3 +1,5 @@
+import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import path from "path";
 import { LOADABLE_STATS_FILE, isUseSSRBundle } from "@modern-js/utils";
 var hasStringSSREntry = function(userConfig) {
@@ -75,6 +77,7 @@ var ssrPlugin = function() {
       "@modern-js/runtime"
     ],
     setup: function(api) {
+      var appContext = api.useAppContext();
       return {
         // for bundle
         config: function config() {
@@ -112,7 +115,19 @@ var ssrPlugin = function() {
               }
             },
             tools: {
-              babel: babelHandler
+              babel: babelHandler,
+              bundlerChain: function(chain, param) {
+                var isServer = param.isServer;
+                if (isServer && appContext.moduleType === "module") {
+                  chain.output.libraryTarget("module").set("chunkFormat", "module");
+                  chain.output.library({
+                    type: "module"
+                  });
+                  chain.experiments(_object_spread_props(_object_spread({}, chain.get("experiments")), {
+                    outputModule: true
+                  }));
+                }
+              }
             }
           };
         }

package/dist/esm/cli/template.js

@@ -44,7 +44,7 @@ var runtimeRegister = function(param) {
 };
 var runtimeGlobalContext = function(param) {
   var srcDirectory = param.srcDirectory, internalSrcAlias = param.internalSrcAlias, metaName = param.metaName, entry = param.entry, customEntry = param.customEntry;
-  return "import { setGlobalContext } from '@".concat(metaName, "/runtime/context'\n\nimport App from '").concat(formatImportPath(customEntry ? entry.replace("entry.tsx", "App.tsx").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias)), "';\n\nsetGlobalContext({\n  App,\n});");
+  return "import { setGlobalContext } from '@".concat(metaName, "/runtime/context'\n\nimport App from '").concat(formatImportPath(customEntry ? entry.replace("entry.tsx", "App").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace(".tsx", "")), "';\n\nsetGlobalContext({\n  App,\n});");
 };
 export {
   index,

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

@@ -1,8 +1,8 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { normalizePathname } from "@modern-js/runtime-utils/url";
 import { loadableReady } from "@loadable/component";
+import { normalizePathname } from "@modern-js/runtime-utils/url";
 import { RenderLevel } from "../constants";
 import { wrapRuntimeContextProvider } from "../react/wrapper";
 import { WithCallback } from "./withCallback";

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

@@ -2,32 +2,51 @@ 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 _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import cookieTool from "cookie";
 import { parsedJSONFromElement } from "@modern-js/runtime-utils/parsed";
+import cookieTool from "cookie";
+import { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID } from "../constants";
 import { getGlobalAppInit } from "../context";
 import { getInitialContext } from "../context/runtime";
 import { createLoaderManager } from "../loader/loaderManager";
 import { getGlobalRunner } from "../plugin/runner";
 import { wrapRuntimeContextProvider } from "../react/wrapper";
-import { ROUTER_DATA_JSON_ID, SSR_DATA_JSON_ID } from "../constants";
 import { hydrateRoot } from "./hydrate";
 var IS_REACT18 = process.env.IS_REACT18 === "true";
+var getQuery = function() {
+  return window.location.search.substring(1).split("&").reduce(function(res, item) {
+    var _item_split = _sliced_to_array(item.split("="), 2), key = _item_split[0], value = _item_split[1];
+    if (key) {
+      res[key] = value;
+    }
+    return res;
+  }, {});
+};
 function getSSRData() {
+  var _ssrData_context, _ssrData_context1, _ssrRequest_headers;
   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
-        })
+  var ssrRequest = ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_context = ssrData.context) === null || _ssrData_context === void 0 ? void 0 : _ssrData_context.request;
+  var finalSSRData = _object_spread_props(_object_spread({}, ssrData || {
+    renderLevel: 0,
+    mode: "string"
+  }), {
+    context: _object_spread_props(_object_spread({}, (ssrData === null || ssrData === void 0 ? void 0 : ssrData.context) || {}), {
+      request: _object_spread_props(_object_spread({}, (ssrData === null || ssrData === void 0 ? void 0 : (_ssrData_context1 = ssrData.context) === null || _ssrData_context1 === void 0 ? void 0 : _ssrData_context1.request) || {}), {
+        params: (ssrRequest === null || ssrRequest === void 0 ? void 0 : ssrRequest.params) || {},
+        host: (ssrRequest === null || ssrRequest === void 0 ? void 0 : ssrRequest.host) || location.host,
+        pathname: (ssrRequest === null || ssrRequest === void 0 ? void 0 : ssrRequest.pathname) || location.pathname,
+        headers: (ssrRequest === null || ssrRequest === void 0 ? void 0 : ssrRequest.headers) || {},
+        cookieMap: cookieTool.parse(document.cookie || "") || {},
+        cookie: document.cookie || "",
+        userAgent: (ssrRequest === null || ssrRequest === void 0 ? void 0 : (_ssrRequest_headers = ssrRequest.headers) === null || _ssrRequest_headers === void 0 ? void 0 : _ssrRequest_headers["user-agent"]) || navigator.userAgent,
+        referer: document.referrer,
+        query: _object_spread({}, getQuery(), (ssrRequest === null || ssrRequest === void 0 ? void 0 : ssrRequest.query) || {}),
+        url: location.href
       })
-    });
-    return finalSSRData;
-  }
+    })
+  });
+  return finalSSRData;
 }
 function isClientArgs(id) {
   return typeof id === "undefined" || typeof id === "string" || typeof HTMLElement !== "undefined" && _instanceof(id, HTMLElement);

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

@@ -1,4 +1,4 @@
-import { useRef, useLayoutEffect } from "react";
+import { useLayoutEffect, useRef } from "react";
 var WithCallback = function(param) {
   var callback = param.callback, children = param.children;
   var once = useRef(false);

package/dist/esm/core/compatible.js

@@ -4,14 +4,14 @@ 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 { jsx as _jsx } from "react/jsx-runtime";
-import React, { useContext, useMemo } from "react";
 import { ROUTE_MANIFEST } from "@modern-js/utils/universal/constants";
+import React, { useContext, useMemo } from "react";
+import { hydrateRoot as ModernHydrateRoot } from "./browser/hydrate";
+import { getGlobalAppInit } from "./context";
 import { RuntimeReactContext } from "./context/runtime";
-import { registerPlugin } from "./plugin";
 import { createLoaderManager } from "./loader/loaderManager";
+import { registerPlugin } from "./plugin";
 import { getGlobalRunner } from "./plugin/runner";
-import { getGlobalAppInit } from "./context";
-import { hydrateRoot as ModernHydrateRoot } from "./browser/hydrate";
 import { wrapRuntimeContextProvider } from "./react/wrapper";
 var IS_REACT18 = process.env.IS_REACT18 === "true";
 function isClientArgs(id) {

package/dist/esm/core/context/runtime.js

@@ -1,5 +1,5 @@
-import { createContext } from "react";
 import { ROUTE_MANIFEST } from "@modern-js/utils/universal/constants";
+import { createContext } from "react";
 import { createLoaderManager } from "../loader/loaderManager";
 var RuntimeReactContext = createContext({});
 var ServerRouterContext = createContext({});

package/dist/esm/core/loader/loaderManager.js

@@ -30,7 +30,9 @@ var createLoader = function(id) {
     reloading: false,
     data: void 0,
     error: void 0
-  }, loaderFn = arguments.length > 2 ? arguments[2] : void 0, skip = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : false;
+  }, loaderFn = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : function() {
+    return Promise.resolve();
+  }, skip = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : false;
   var promise;
   var status = 0;
   var data = initialData.data, error = initialData.error;

package/dist/esm/core/loader/useLoader.js

@@ -2,8 +2,8 @@ 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 _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
-import { useContext, useRef, useMemo, useState, useCallback, useEffect } from "react";
 import invariant from "invariant";
+import { useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
 import { RuntimeReactContext } from "../context/runtime";
 import { LoaderStatus } from "./loaderManager";
 var useLoader = function(loaderFn) {

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

@@ -1,4 +1,4 @@
-import { createManager, createWaterfall, createAsyncInterruptWorkflow, createSyncParallelWorkflow, createContext } from "@modern-js/plugin";
+import { createAsyncInterruptWorkflow, createContext, createManager, createSyncParallelWorkflow, createWaterfall } from "@modern-js/plugin";
 var RuntimeConfigContext = createContext({});
 var useRuntimeConfigContext = function() {
   return RuntimeConfigContext.use().value;

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

@@ -1,6 +1,6 @@
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { merge } from "@modern-js/runtime-utils/merge";
-import { runtime, RuntimeConfigContext } from "./base";
+import { RuntimeConfigContext, runtime } from "./base";
 import { getGlobalRunner, setGlobalRunner } from "./runner";
 export * from "./base";
 function setupConfigContext() {

package/dist/esm/core/server/react/prerender/index.js

@@ -5,9 +5,9 @@ import { _ as _inherits } from "@swc/helpers/_/_inherits";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _create_super } from "@swc/helpers/_/_create_super";
-import withSideEffect from "react-side-effect";
 import React, { createElement } from "react";
-import { getOutermostProperty, aggKeysFromPropsList, exist, aggMatchesFromPropsList } from "./util";
+import withSideEffect from "react-side-effect";
+import { aggKeysFromPropsList, aggMatchesFromPropsList, exist, getOutermostProperty } from "./util";
 var PROP_NAMES = {
   INTERVAL: "interval",
   STALE_LIMIT: "staleLimit",

package/dist/esm/core/server/requestHandler.js

@@ -5,13 +5,13 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { getPathname, parseCookie, parseHeaders, parseQuery } from "@modern-js/runtime-utils/universal/request";
-import { createRoot } from "../react";
 import { getGlobalAppInit } from "../context";
-import { getGlobalRunner } from "../plugin/runner";
 import { getInitialContext } from "../context/runtime";
 import { createLoaderManager } from "../loader/loaderManager";
-import { getSSRConfigByEntry, getSSRMode } from "./utils";
+import { getGlobalRunner } from "../plugin/runner";
+import { createRoot } from "../react";
 import { CHUNK_CSS_PLACEHOLDER } from "./constants";
+import { getSSRConfigByEntry, getSSRMode } from "./utils";
 function createSSRContext(request, options) {
   var config = options.config, loaderContext = options.loaderContext, onError = options.onError, onTiming = options.onTiming, locals = options.locals, resource = options.resource, params = options.params, responseProxy = options.responseProxy, logger = options.logger, metrics = options.metrics, reporter = options.reporter;
   var nonce = config.nonce;
@@ -24,7 +24,10 @@ function createSSRContext(request, options) {
   var headersData = parseHeaders(request);
   var url = new URL(request.url);
   var host = headers.get("X-Forwarded-Host") || headers.get("host") || url.host;
-  var protocal = "".concat(headers.get("X-Forwarded-Proto") || url.protocol || "http", ":");
+  var protocol = (headers.get("X-Forwarded-Proto") || url.protocol || "http").split(/\s*,\s*/, 1)[0];
+  if (!protocol.endsWith(":")) {
+    protocol += ":";
+  }
   var ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries);
   var ssrMode = getSSRMode(ssrConfig);
   var loaderFailureMode = typeof ssrConfig === "object" ? ssrConfig.loaderFailureMode : void 0;
@@ -36,7 +39,7 @@ function createSSRContext(request, options) {
     logger,
     metrics,
     request: {
-      url: request.url.replace(url.host, host).replace(url.protocol, protocal),
+      url: request.url.replace(url.host, host).replace(url.protocol, protocol),
       baseUrl: route.urlPath,
       userAgent: headers.get("user-agent"),
       cookie,
@@ -70,7 +73,7 @@ var createRequestHandler = function() {
     return _ts_generator(this, function(_state) {
       requestHandler = function() {
         var _ref2 = _async_to_generator(function(request, options) {
-          var Root, runner, routeManifest, context, runBeforeRender, responseProxy, ssrContext, getRedirectResponse, initialData, redirectResponse, htmlTemplate, response;
+          var _context_routerContext, _context_routerContext1, Root, runner, routeManifest, context, runBeforeRender, responseProxy, ssrContext, getRedirectResponse, initialData, _context_routerContext2, _context_ssrContext, redirectResponse, htmlTemplate, response;
           return _ts_generator(this, function(_state2) {
             switch (_state2.label) {
               case 0:
@@ -147,6 +150,10 @@ var createRequestHandler = function() {
                 ];
               case 1:
                 initialData = _state2.sent();
+                if (((_context_routerContext = context.routerContext) === null || _context_routerContext === void 0 ? void 0 : _context_routerContext.statusCode) && ((_context_routerContext1 = context.routerContext) === null || _context_routerContext1 === void 0 ? void 0 : _context_routerContext1.statusCode) !== 200) {
+                  ;
+                  (_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.response.status((_context_routerContext2 = context.routerContext) === null || _context_routerContext2 === void 0 ? void 0 : _context_routerContext2.statusCode);
+                }
                 context.initialData = initialData;
                 redirectResponse = getRedirectResponse(initialData);
                 if (redirectResponse) {

package/dist/esm/core/server/stream/afterTemplate.js

@@ -2,9 +2,9 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { serializeJson } from "@modern-js/runtime-utils/node";
-import { attributesToString, safeReplace } from "../utils";
 import { SSR_DATA_PLACEHOLDER } from "../constants";
 import { buildHtml } from "../shared";
+import { attributesToString, safeReplace } from "../utils";
 function buildShellAfterTemplate(afterAppTemplate, options) {
   var request = options.request, config = options.config, ssrConfig = options.ssrConfig, runtimeContext = options.runtimeContext, renderLevel = options.renderLevel, entryName = options.entryName;
   var callbacks = [

package/dist/esm/core/server/stream/beforeTemplate.js

@@ -2,12 +2,12 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import ReactHelmet from "react-helmet";
 import { matchRoutes } from "@modern-js/runtime-utils/router";
-import { createReplaceHelemt } from "../helmet";
+import ReactHelmet from "react-helmet";
 import { CHUNK_CSS_PLACEHOLDER } from "../constants";
-import { checkIsNode, safeReplace } from "../utils";
+import { createReplaceHelemt } from "../helmet";
 import { buildHtml } from "../shared";
+import { checkIsNode, safeReplace } from "../utils";
 var readAsset = function() {
   var _ref = _async_to_generator(function(chunk) {
     var fs, path, filepath;

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

@@ -4,12 +4,12 @@ import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { Transform } from "stream";
 import { createReadableStreamFromReadable } from "@modern-js/runtime-utils/node";
-import { ServerStyleSheet } from "styled-components";
 import checkIsBot from "isbot";
+import { ServerStyleSheet } from "styled-components";
 import { ESCAPED_SHELL_STREAM_END_MARK } from "../../../common";
 import { RenderLevel } from "../../constants";
-import { getTemplates } from "./template";
 import { ShellChunkStatus, getReadableStreamFromString } from "./shared";
+import { getTemplates } from "./template";
 var createReadableStreamFromElement = function() {
   var _ref = _async_to_generator(function(request, rootElement, options) {
     var renderToPipeableStream, runtimeContext, htmlTemplate, config, ssrConfig, entryName, shellChunkStatus, renderLevel, forceStream2String, isbot, onReady, sheet, chunkVec, root;

package/dist/esm/core/server/stream/createReadableStream.worker.js

@@ -1,9 +1,9 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { renderToReadableStream } from "react-dom/server";
 import checkIsBot from "isbot";
-import { RenderLevel } from "../../constants";
+import { renderToReadableStream } from "react-dom/server";
 import { ESCAPED_SHELL_STREAM_END_MARK } from "../../../common";
+import { RenderLevel } from "../../constants";
 import { ShellChunkStatus, encodeForWebStream, getReadableStreamFromString } from "./shared";
 import { getTemplates } from "./template";
 var createReadableStreamFromElement = function() {

package/dist/esm/core/server/stream/shared.js

@@ -1,8 +1,8 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import { run } from "@modern-js/runtime-utils/node";
 import { time } from "@modern-js/runtime-utils/time";
 import { parseHeaders } from "@modern-js/runtime-utils/universal/request";
-import { run } from "@modern-js/runtime-utils/node";
 import { wrapRuntimeContextProvider } from "../../react/wrapper";
 import { SSRErrors, SSRTimings, createOnError, createOnTiming } from "../tracer";
 import { getSSRConfigByEntry } from "../utils";