@modern-js/runtime 2.69.4 → 3.0.0-alpha.0

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

@@ -1,223 +1,205 @@
 "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 requestHandler_exports = {};
-__export(requestHandler_exports, {
-  createRequestHandler: () => createRequestHandler
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    createRequestHandler: ()=>createRequestHandler
 });
-module.exports = __toCommonJS(requestHandler_exports);
-var import_jsx_runtime = require("react/jsx-runtime");
-var import_node = require("@modern-js/runtime-utils/node");
-var import_request = require("@modern-js/runtime-utils/universal/request");
-var import_react = require("react");
-var import_context = require("../context");
-var import_runtime = require("../context/runtime");
-var import_serverPayload = require("../context/serverPayload/index");
-var import_loaderManager = require("../loader/loaderManager");
-var import_react2 = require("../react");
-var import_constants = require("./constants");
-var import_tracer = require("./tracer");
-var import_utils = require("./utils");
+const jsx_runtime_namespaceObject = require("react/jsx-runtime");
+const node_namespaceObject = require("@modern-js/runtime-utils/node");
+const request_namespaceObject = require("@modern-js/runtime-utils/universal/request");
+const external_react_namespaceObject = require("react");
+var external_react_default = /*#__PURE__*/ __webpack_require__.n(external_react_namespaceObject);
+const index_js_namespaceObject = require("../context/index.js");
+const runtime_js_namespaceObject = require("../context/runtime.js");
+const serverPayload_index_js_namespaceObject = require("../context/serverPayload/index.js");
+const external_react_index_js_namespaceObject = require("../react/index.js");
+const external_constants_js_namespaceObject = require("./constants.js");
+const external_tracer_js_namespaceObject = require("./tracer.js");
+const external_utils_js_namespaceObject = require("./utils.js");
 async function handleRSCRequest(request, Root, context, options, handleRequest) {
-  const serverPayload = (0, import_serverPayload.getServerPayload)();
-  if (typeof serverPayload !== "undefined") {
-    return await handleRequest(request, Root, {
-      ...options,
-      runtimeContext: context,
-      rscRoot: serverPayload
+    const serverPayload = (0, serverPayload_index_js_namespaceObject.getServerPayload)();
+    if (void 0 !== serverPayload) return await handleRequest(request, Root, {
+        ...options,
+        runtimeContext: context,
+        rscRoot: serverPayload
     });
-  }
-  const App = (0, import_context.getGlobalRSCRoot)();
-  if (App) {
-    return await handleRequest(request, import_react.Fragment, {
-      ...options,
-      runtimeContext: context,
-      rscRoot: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {})
+    const App = (0, index_js_namespaceObject.getGlobalRSCRoot)();
+    if (App) return await handleRequest(request, external_react_namespaceObject.Fragment, {
+        ...options,
+        runtimeContext: context,
+        rscRoot: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(App, {})
+    });
+    return await handleRequest(request, Root, {
+        ...options,
+        runtimeContext: context
     });
-  }
-  return await handleRequest(request, Root, {
-    ...options,
-    runtimeContext: context
-  });
 }
 function createSSRContext(request, options) {
-  const { config, loaderContext, onError, onTiming, locals, resource, params, responseProxy, logger, metrics, reporter } = options;
-  const { nonce, useJsonScript } = config;
-  const { entryName, route } = resource;
-  const { headers } = request;
-  const cookie = headers.get("cookie") || "";
-  const cookieMap = (0, import_request.parseCookie)(request);
-  const pathname = (0, import_request.getPathname)(request);
-  const query = (0, import_request.parseQuery)(request);
-  const headersData = (0, import_request.parseHeaders)(request);
-  const url = new URL(request.url);
-  const host = headers.get("X-Forwarded-Host") || headers.get("host") || url.host;
-  let protocol = (headers.get("X-Forwarded-Proto") || url.protocol || "http").split(/\s*,\s*/, 1)[0];
-  if (!protocol.endsWith(":")) {
-    protocol += ":";
-  }
-  const ssrConfig = (0, import_utils.getSSRConfigByEntry)(entryName, config.ssr, config.ssrByEntries);
-  const ssrMode = (0, import_utils.getSSRMode)(ssrConfig);
-  const loaderFailureMode = typeof ssrConfig === "object" ? ssrConfig.loaderFailureMode : void 0;
-  return {
-    nonce,
-    useJsonScript,
-    loaderContext,
-    redirection: {},
-    htmlModifiers: [],
-    logger,
-    metrics,
-    request: {
-      url: request.url.replace(url.host, host).replace(url.protocol, protocol),
-      baseUrl: route.urlPath,
-      userAgent: headers.get("user-agent"),
-      cookie,
-      cookieMap,
-      pathname,
-      query,
-      params,
-      headers: headersData,
-      host,
-      referer: headers.get("referer"),
-      raw: request
-    },
-    response: {
-      setHeader(key, value) {
-        responseProxy.headers[key] = value;
-      },
-      status(code) {
-        responseProxy.status = code;
-      },
-      locals: locals || {}
-    },
-    reporter,
-    mode: ssrMode,
-    onError,
-    onTiming,
-    loaderFailureMode
-  };
-}
-const createRequestHandler = async (handleRequest, createRequestOptions) => {
-  const requestHandler = async (request, options) => {
-    const headersData = (0, import_request.parseHeaders)(request);
-    const responseProxy = {
-      headers: {},
-      status: -1
+    const { config, loaderContext, onError, onTiming, locals, resource, params, responseProxy, reporter } = options;
+    const { nonce, useJsonScript } = config;
+    const { entryName, route } = resource;
+    const { headers } = request;
+    const cookie = headers.get('cookie') || '';
+    const cookieMap = (0, request_namespaceObject.parseCookie)(request);
+    const pathname = (0, request_namespaceObject.getPathname)(request);
+    const query = (0, request_namespaceObject.parseQuery)(request);
+    const headersData = (0, request_namespaceObject.parseHeaders)(request);
+    const url = new URL(request.url);
+    const host = headers.get('X-Forwarded-Host') || headers.get('host') || url.host;
+    let protocol = (headers.get('X-Forwarded-Proto') || url.protocol || 'http').split(/\s*,\s*/, 1)[0];
+    if (!protocol.endsWith(':')) protocol += ':';
+    const ssrConfig = (0, external_utils_js_namespaceObject.getSSRConfigByEntry)(entryName, config.ssr, config.ssrByEntries);
+    let ssrMode = (0, external_utils_js_namespaceObject.getSSRMode)(ssrConfig);
+    const isSsgRender = 'true' === headers.get('x-modern-ssg-render');
+    if (isSsgRender) {
+        const reactMajor = Number((external_react_default().version || '0').split('.')[0]);
+        ssrMode = reactMajor >= 18 ? 'stream' : 'string';
+    }
+    const loaderFailureMode = 'object' == typeof ssrConfig ? ssrConfig.loaderFailureMode : void 0;
+    return {
+        nonce,
+        useJsonScript,
+        loaderContext,
+        htmlModifiers: [],
+        baseUrl: route.urlPath,
+        request: {
+            url: request.url.replace(url.host, host).replace(url.protocol, protocol),
+            userAgent: headers.get('user-agent'),
+            cookie,
+            cookieMap,
+            pathname,
+            query,
+            params,
+            headers: headersData,
+            host,
+            referer: headers.get('referer'),
+            raw: request
+        },
+        response: {
+            setHeader (key, value) {
+                responseProxy.headers[key] = value;
+            },
+            status (code) {
+                responseProxy.status = code;
+            },
+            locals: locals || {}
+        },
+        reporter,
+        mode: ssrMode,
+        onError,
+        onTiming,
+        loaderFailureMode
     };
-    const activeDeferreds = /* @__PURE__ */ new Map();
-    return import_node.storage.run({
-      headers: headersData,
-      request,
-      monitors: options.monitors,
-      responseProxy,
-      activeDeferreds,
-      serverPayload: void 0
-    }, async () => {
-      var _context_routerContext, _context_routerContext1, _context_routerContext2;
-      const Root = (0, import_react2.createRoot)();
-      const internalRuntimeContext = (0, import_context.getGlobalInternalRuntimeContext)();
-      const hooks = internalRuntimeContext.hooks;
-      const { routeManifest } = options.resource;
-      const context = (0, import_runtime.getInitialContext)(false, routeManifest);
-      const runBeforeRender = async (context2) => {
-        const result = await hooks.onBeforeRender.call(context2);
-        if (typeof Response !== "undefined" && result instanceof Response) {
-          return result;
-        }
-        const init = (0, import_context.getGlobalAppInit)();
-        return init === null || init === void 0 ? void 0 : init(context2);
-      };
-      const ssrContext = createSSRContext(request, {
-        ...options,
-        responseProxy
-      });
-      Object.assign(context, {
-        ssrContext,
-        isBrowser: false,
-        loaderManager: (0, import_loaderManager.createLoaderManager)({}, {
-          skipNonStatic: options.staticGenerate,
-          // if not static generate, only non-static loader can exec on prod env
-          skipStatic: process.env.NODE_ENV === "production" && !options.staticGenerate
-        })
-      });
-      const getRedirectResponse = (result) => {
-        if (typeof Response !== "undefined" && // fix: ssg workflow doesn't inject Web Response
-        result instanceof Response && result.status >= 300 && result.status <= 399) {
-          const { status } = result;
-          const redirectUrl = result.headers.get("Location") || "/";
-          const { ssrContext: ssrContext2 } = context;
-          if (ssrContext2) {
-            return new Response(null, {
-              status,
-              headers: {
-                Location: redirectUrl
-              }
+}
+const createRequestHandler = async (handleRequest, createRequestOptions)=>{
+    const requestHandler = async (request, options)=>{
+        const headersData = (0, request_namespaceObject.parseHeaders)(request);
+        const responseProxy = {
+            headers: {},
+            status: -1
+        };
+        const activeDeferreds = new Map();
+        return node_namespaceObject.storage.run({
+            headers: headersData,
+            request,
+            monitors: options.monitors,
+            responseProxy,
+            activeDeferreds,
+            serverPayload: void 0
+        }, async ()=>{
+            const Root = (0, external_react_index_js_namespaceObject.createRoot)();
+            const internalRuntimeContext = (0, index_js_namespaceObject.getGlobalInternalRuntimeContext)();
+            const hooks = internalRuntimeContext.hooks;
+            const { routeManifest } = options.resource;
+            const context = (0, runtime_js_namespaceObject.getInitialContext)(false, routeManifest);
+            const runBeforeRender = async (context)=>{
+                const result = await hooks.onBeforeRender.call(context);
+                if ("u" > typeof Response && result instanceof Response) return result;
+            };
+            const ssrContext = createSSRContext(request, {
+                ...options,
+                responseProxy
             });
-          }
-        }
-        return void 0;
-      };
-      const initialData = await runBeforeRender(context);
-      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) {
-        var _context_routerContext3, _context_ssrContext;
-        (_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.response.status((_context_routerContext3 = context.routerContext) === null || _context_routerContext3 === void 0 ? void 0 : _context_routerContext3.statusCode);
-      }
-      const errors = Object.values(((_context_routerContext2 = context.routerContext) === null || _context_routerContext2 === void 0 ? void 0 : _context_routerContext2.errors) || {});
-      if (errors.length > 0) {
-        options.onError(errors[0], import_tracer.SSRErrors.LOADER_ERROR);
-      }
-      context.initialData = initialData;
-      const redirectResponse = getRedirectResponse(initialData);
-      if (redirectResponse) {
-        if (createRequestOptions === null || createRequestOptions === void 0 ? void 0 : createRequestOptions.enableRsc) {
-          return initialData;
-        } else {
-          return redirectResponse;
-        }
-      }
-      if (!(createRequestOptions === null || createRequestOptions === void 0 ? void 0 : createRequestOptions.enableRsc)) {
-        const { htmlTemplate } = options.resource;
-        options.resource.htmlTemplate = htmlTemplate.replace("</head>", `${import_constants.CHUNK_CSS_PLACEHOLDER}</head>`);
-      }
-      let response;
-      if (createRequestOptions === null || createRequestOptions === void 0 ? void 0 : createRequestOptions.enableRsc) {
-        response = await handleRSCRequest(request, Root, context, options, handleRequest);
-      } else {
-        response = await handleRequest(request, Root, {
-          ...options,
-          runtimeContext: context
-        });
-      }
-      Object.entries(responseProxy.headers).forEach(([key, value]) => {
-        response.headers.set(key, value);
-      });
-      if (responseProxy.status !== -1) {
-        return new Response(response.body, {
-          status: responseProxy.status,
-          headers: response.headers
+            Object.assign(context, {
+                ssrContext,
+                isBrowser: false
+            });
+            const getRedirectResponse = (result)=>{
+                if ("u" > typeof Response && result instanceof Response && result.status >= 300 && result.status <= 399) {
+                    const { status } = result;
+                    const redirectUrl = result.headers.get('Location') || '/';
+                    const { ssrContext } = context;
+                    if (ssrContext) return new Response(null, {
+                        status,
+                        headers: {
+                            Location: redirectUrl
+                        }
+                    });
+                }
+            };
+            const beforeRenderResult = await runBeforeRender(context);
+            if (context.routerContext?.statusCode && context.routerContext?.statusCode !== 200) context.ssrContext?.response.status(context.routerContext?.statusCode);
+            const errors = Object.values(context.routerContext?.errors || {});
+            if (errors.length > 0) options.onError(errors[0], external_tracer_js_namespaceObject.SSRErrors.LOADER_ERROR);
+            const redirectResponse = getRedirectResponse(beforeRenderResult);
+            if (redirectResponse) if (createRequestOptions?.enableRsc) return beforeRenderResult || redirectResponse;
+            else return redirectResponse;
+            if (!createRequestOptions?.enableRsc) {
+                const { htmlTemplate } = options.resource;
+                options.resource.htmlTemplate = htmlTemplate.replace('</head>', `${external_constants_js_namespaceObject.CHUNK_CSS_PLACEHOLDER}</head>`);
+            }
+            let response;
+            response = createRequestOptions?.enableRsc ? await handleRSCRequest(request, Root, context, options, handleRequest) : await handleRequest(request, Root, {
+                ...options,
+                runtimeContext: context
+            });
+            Object.entries(responseProxy.headers).forEach(([key, value])=>{
+                response.headers.set(key, value);
+            });
+            if (-1 !== responseProxy.status) return new Response(response.body, {
+                status: responseProxy.status,
+                headers: response.headers
+            });
+            return response;
         });
-      }
-      return response;
-    });
-  };
-  return requestHandler;
+    };
+    return requestHandler;
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createRequestHandler
+exports.createRequestHandler = __webpack_exports__.createRequestHandler;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "createRequestHandler"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
 });

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

@@ -1,34 +1,44 @@
 "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 server_exports = {};
-__export(server_exports, {
-  createRequestHandler: () => import_requestHandler.createRequestHandler,
-  renderStreaming: () => import_stream.renderStreaming,
-  renderString: () => import_string.renderString
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    createRequestHandler: ()=>external_requestHandler_js_namespaceObject.createRequestHandler,
+    renderString: ()=>index_js_namespaceObject.renderString,
+    renderStreaming: ()=>external_stream_index_js_namespaceObject.renderStreaming
 });
-module.exports = __toCommonJS(server_exports);
-var import_string = require("./string");
-var import_stream = require("./stream");
-var import_requestHandler = require("./requestHandler");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createRequestHandler,
-  renderStreaming,
-  renderString
+const index_js_namespaceObject = require("./string/index.js");
+const external_stream_index_js_namespaceObject = require("./stream/index.js");
+const external_requestHandler_js_namespaceObject = require("./requestHandler.js");
+exports.createRequestHandler = __webpack_exports__.createRequestHandler;
+exports.renderStreaming = __webpack_exports__.renderStreaming;
+exports.renderString = __webpack_exports__.renderString;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "createRequestHandler",
+    "renderStreaming",
+    "renderString"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
 });

package/dist/cjs/core/server/shared.js

@@ -1,30 +1,38 @@
 "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 shared_exports = {};
-__export(shared_exports, {
-  buildHtml: () => buildHtml
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    buildHtml: ()=>buildHtml
 });
-module.exports = __toCommonJS(shared_exports);
 function buildHtml(template, callbacks) {
-  return callbacks.reduce((promise, buildHtmlCb) => promise.then((template2) => buildHtmlCb(template2)), Promise.resolve(template));
+    return callbacks.reduce((promise, buildHtmlCb)=>promise.then((template)=>buildHtmlCb(template)), Promise.resolve(template));
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  buildHtml
+exports.buildHtml = __webpack_exports__.buildHtml;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "buildHtml"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
 });