@modern-js/server-core 2.69.7 → 3.0.0-alpha.1

package/dist/cjs/plugins/render/renderRscHandler.js

@@ -1,76 +1,75 @@
 "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 renderRscHandler_exports = {};
-__export(renderRscHandler_exports, {
-  renderRscHandler: () => renderRscHandler
+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__, {
+    renderRscHandler: ()=>renderRscHandler
 });
-module.exports = __toCommonJS(renderRscHandler_exports);
-var import_constants = require("@modern-js/utils/universal/constants");
-var import_utils = require("./utils");
-const renderRscHandler = async (req, options) => {
-  var _serverManifest_renderBundles;
-  const { routeInfo, serverManifest, rscSSRManifest, rscClientManifest, rscServerManifest, locals, params, loaderContext, reporter, monitors, logger, metrics, onError, onTiming, staticGenerate } = options;
-  const serverBundle = serverManifest === null || serverManifest === void 0 ? void 0 : (_serverManifest_renderBundles = serverManifest.renderBundles) === null || _serverManifest_renderBundles === void 0 ? void 0 : _serverManifest_renderBundles[routeInfo.entryName || import_constants.MAIN_ENTRY_NAME];
-  const loadableStats = serverManifest.loadableStats || {};
-  const routeManifest = serverManifest.routeManifest || {};
-  const config = (0, import_utils.createRequestHandlerConfig)(options.config);
-  const requestHandlerOptions = {
-    resource: {
-      route: routeInfo,
-      loadableStats,
-      routeManifest,
-      entryName: routeInfo.entryName || import_constants.MAIN_ENTRY_NAME
-    },
-    config,
-    params,
-    loaderContext,
-    rscSSRManifest,
-    rscClientManifest,
-    rscServerManifest,
-    locals,
-    reporter,
-    staticGenerate,
-    logger,
-    metrics,
-    monitors,
-    onError,
-    onTiming
-  };
-  if (!serverBundle) {
-    return new Response("Cannot find server bundle for RSC", {
-      status: 500
+const constants_namespaceObject = require("@modern-js/utils/universal/constants");
+const external_utils_js_namespaceObject = require("./utils.js");
+const renderRscHandler = async (req, options)=>{
+    const { routeInfo, serverManifest, rscSSRManifest, rscClientManifest, rscServerManifest, locals, params, loaderContext, monitors, onError, onTiming, staticGenerate } = options;
+    const serverBundle = serverManifest?.renderBundles?.[routeInfo.entryName || constants_namespaceObject.MAIN_ENTRY_NAME];
+    const loadableStats = serverManifest.loadableStats || {};
+    const routeManifest = serverManifest.routeManifest || {};
+    const config = (0, external_utils_js_namespaceObject.createRequestHandlerConfig)(options.config);
+    const requestHandlerOptions = {
+        resource: {
+            route: routeInfo,
+            loadableStats,
+            routeManifest,
+            entryName: routeInfo.entryName || constants_namespaceObject.MAIN_ENTRY_NAME
+        },
+        config,
+        params,
+        loaderContext,
+        rscSSRManifest,
+        rscClientManifest,
+        rscServerManifest,
+        locals,
+        staticGenerate,
+        monitors,
+        onError,
+        onTiming,
+        reporter: options.reporter
+    };
+    if (!serverBundle) return new Response('Cannot find server bundle for RSC', {
+        status: 500
     });
-  }
-  const rscPayloadHandler = await serverBundle.rscPayloadHandler;
-  if (!rscPayloadHandler) {
-    return new Response("Cannot find request handler for RSC", {
-      status: 500
+    const rscPayloadHandler = await serverBundle.rscPayloadHandler;
+    if (!rscPayloadHandler) return new Response('Cannot find request handler for RSC', {
+        status: 500
     });
-  }
-  if (!rscClientManifest) {
-    return new Response("Cannot find rsc client manifest", {
-      status: 500
+    if (!rscClientManifest) return new Response('Cannot find rsc client manifest', {
+        status: 500
     });
-  }
-  return rscPayloadHandler(req, requestHandlerOptions);
+    return rscPayloadHandler(req, requestHandlerOptions);
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  renderRscHandler
+exports.renderRscHandler = __webpack_exports__.renderRscHandler;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "renderRscHandler"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
 });

package/dist/cjs/plugins/render/serverActionHandler.js

@@ -1,51 +1,52 @@
 "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 serverActionHandler_exports = {};
-__export(serverActionHandler_exports, {
-  serverActionHandler: () => serverActionHandler
+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__, {
+    serverActionHandler: ()=>serverActionHandler
 });
-module.exports = __toCommonJS(serverActionHandler_exports);
-var import_constants = require("@modern-js/utils/universal/constants");
-const serverActionHandler = async (req, { serverManifest, routeInfo, rscClientManifest }) => {
-  var _serverManifest_renderBundles;
-  const serverBundle = serverManifest === null || serverManifest === void 0 ? void 0 : (_serverManifest_renderBundles = serverManifest.renderBundles) === null || _serverManifest_renderBundles === void 0 ? void 0 : _serverManifest_renderBundles[routeInfo.entryName || import_constants.MAIN_ENTRY_NAME];
-  if (!serverBundle) {
-    return new Response("Cannot find server bundle for server action", {
-      status: 500
+const constants_namespaceObject = require("@modern-js/utils/universal/constants");
+const serverActionHandler = async (req, { serverManifest, routeInfo, rscClientManifest })=>{
+    const serverBundle = serverManifest?.renderBundles?.[routeInfo.entryName || constants_namespaceObject.MAIN_ENTRY_NAME];
+    if (!serverBundle) return new Response('Cannot find server bundle for server action', {
+        status: 500
+    });
+    const { handleAction } = serverBundle;
+    if (!handleAction) return new Response('Cannot find server action handler', {
+        status: 500
     });
-  }
-  const { handleAction } = serverBundle;
-  if (!handleAction) {
-    return new Response("Cannot find server action handler", {
-      status: 500
+    if (!rscClientManifest) return new Response('Cannot find rsc client manifest', {
+        status: 500
     });
-  }
-  if (!rscClientManifest) {
-    return new Response("Cannot find rsc client manifest", {
-      status: 500
+    return handleAction(req, {
+        clientManifest: rscClientManifest
     });
-  }
-  return handleAction(req, {
-    clientManifest: rscClientManifest
-  });
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  serverActionHandler
+exports.serverActionHandler = __webpack_exports__.serverActionHandler;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "serverActionHandler"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
 });

package/dist/cjs/plugins/render/ssrCache.js

@@ -1,216 +1,198 @@
 "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 ssrCache_exports = {};
-__export(ssrCache_exports, {
-  getCacheResult: () => getCacheResult,
-  matchCacheControl: () => matchCacheControl,
-  shouldUseCache: () => shouldUseCache
+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__, {
+    getCacheResult: ()=>getCacheResult,
+    shouldUseCache: ()=>shouldUseCache,
+    matchCacheControl: ()=>matchCacheControl
 });
-module.exports = __toCommonJS(ssrCache_exports);
-var import_storer = require("@modern-js/runtime-utils/storer");
-var import_constants = require("../../constants");
-var import_utils = require("../../utils");
-const removeTailSlash = (s) => s.replace(/\/+$/, "");
+const storer_namespaceObject = require("@modern-js/runtime-utils/storer");
+const external_constants_js_namespaceObject = require("../../constants.js");
+const index_js_namespaceObject = require("../../utils/index.js");
+const removeTailSlash = (s)=>s.replace(/\/+$/, '');
 const ZERO_RENDER_LEVEL = /"renderLevel":0/;
 const NO_SSR_CACHE = /<meta\s+[^>]*name=["']no-ssr-cache["'][^>]*>/i;
 async function processCache({ request, key, requestHandler, requestHandlerOptions, ttl, container, cacheStatus }) {
-  const response = await requestHandler(request, requestHandlerOptions);
-  const { onError } = requestHandlerOptions;
-  const nonCacheableStatusCodes = [
-    204,
-    305,
-    404,
-    405,
-    500,
-    501,
-    502,
-    503,
-    504
-  ];
-  if (nonCacheableStatusCodes.includes(response.status)) {
-    return response;
-  }
-  const decoder = new TextDecoder();
-  if (response.body) {
-    const stream = (0, import_utils.createTransformStream)();
-    const reader = response.body.getReader();
-    const writer = stream.writable.getWriter();
-    let html = "";
-    const push = () => reader.read().then(({ done, value }) => {
-      if (done) {
-        const match = ZERO_RENDER_LEVEL.test(html) || NO_SSR_CACHE.test(html);
-        if (match) {
-          writer.close();
-          return;
-        }
-        const current = Date.now();
-        const cache = {
-          val: html,
-          cursor: current
-        };
-        container.set(key, JSON.stringify(cache), {
-          ttl
-        }).catch(() => {
-          if (onError) {
-            onError(`[render-cache] set cache failed, key: ${key}, value: ${JSON.stringify(cache)}`);
-          } else {
-            console.error(`[render-cache] set cache failed, key: ${key}, value: ${JSON.stringify(cache)}`);
-          }
+    const response = await requestHandler(request, requestHandlerOptions);
+    const { onError } = requestHandlerOptions;
+    const nonCacheableStatusCodes = [
+        204,
+        305,
+        404,
+        405,
+        500,
+        501,
+        502,
+        503,
+        504
+    ];
+    if (nonCacheableStatusCodes.includes(response.status)) return response;
+    const decoder = new TextDecoder();
+    if (response.body) {
+        const stream = (0, index_js_namespaceObject.createTransformStream)();
+        const reader = response.body.getReader();
+        const writer = stream.writable.getWriter();
+        let html = '';
+        const push = ()=>reader.read().then(({ done, value })=>{
+                if (done) {
+                    const match = ZERO_RENDER_LEVEL.test(html) || NO_SSR_CACHE.test(html);
+                    if (match) return void writer.close();
+                    const current = Date.now();
+                    const cache = {
+                        val: html,
+                        cursor: current
+                    };
+                    container.set(key, JSON.stringify(cache), {
+                        ttl
+                    }).catch(()=>{
+                        if (onError) onError(`[render-cache] set cache failed, key: ${key}, value: ${JSON.stringify(cache)}`);
+                        else console.error(`[render-cache] set cache failed, key: ${key}, value: ${JSON.stringify(cache)}`);
+                    });
+                    writer.close();
+                    return;
+                }
+                const content = decoder.decode(value);
+                html += content;
+                writer.write(value);
+                push();
+            });
+        push();
+        cacheStatus && response.headers.set(external_constants_js_namespaceObject.X_RENDER_CACHE, cacheStatus);
+        return new Response(stream.readable, {
+            status: response.status,
+            headers: response.headers
         });
-        writer.close();
-        return;
-      }
-      const content = decoder.decode(value);
-      html += content;
-      writer.write(value);
-      push();
-    });
-    push();
-    cacheStatus && response.headers.set(import_constants.X_RENDER_CACHE, cacheStatus);
-    return new Response(stream.readable, {
-      status: response.status,
-      headers: response.headers
-    });
-  }
-  return response;
+    }
+    return response;
 }
-const CACHE_NAMESPACE = "__ssr__cache";
-const storage = (0, import_storer.createMemoryStorage)(CACHE_NAMESPACE);
+const CACHE_NAMESPACE = '__ssr__cache';
+const storage = (0, storer_namespaceObject.createMemoryStorage)(CACHE_NAMESPACE);
 function computedKey(req, cacheControl) {
-  const pathname = (0, import_utils.getPathname)(req);
-  const { customKey } = cacheControl;
-  const defaultKey = pathname === "/" ? pathname : removeTailSlash(pathname);
-  if (customKey) {
-    if (typeof customKey === "string") {
-      return customKey;
-    } else {
-      return customKey(defaultKey);
-    }
-  } else {
-    return defaultKey;
-  }
+    const pathname = (0, index_js_namespaceObject.getPathname)(req);
+    const { customKey } = cacheControl;
+    const defaultKey = '/' === pathname ? pathname : removeTailSlash(pathname);
+    if (!customKey) return defaultKey;
+    if ('string' == typeof customKey) return customKey;
+    return customKey(defaultKey);
 }
 function shouldUseCache(request) {
-  const url = new URL(request.url);
-  const hasRSCAction = request.headers.has("x-rsc-action");
-  const hasRSCTree = request.headers.has("x-rsc-tree");
-  const hasLoaderQuery = url.searchParams.has("__loader");
-  return !(hasRSCAction || hasRSCTree || hasLoaderQuery);
+    const url = new URL(request.url);
+    const hasRSCAction = request.headers.has('x-rsc-action');
+    const hasRSCTree = request.headers.has('x-rsc-tree');
+    const hasLoaderQuery = url.searchParams.has('__loader');
+    return !(hasRSCAction || hasRSCTree || hasLoaderQuery);
 }
 function matchCacheControl(cacheOption, req) {
-  if (!cacheOption || !req) {
-    return void 0;
-  } else if (isCacheControl(cacheOption)) {
-    return cacheOption;
-  } else if (isCacheOptionProvider(cacheOption)) {
-    return cacheOption(req);
-  } else {
-    const url = req.url;
-    const options = Object.entries(cacheOption);
-    for (const [key, option] of options) {
-      if (key === "*" || new RegExp(key).test(url)) {
-        if (typeof option === "function") {
-          return option(req);
-        } else {
-          return option;
-        }
-      }
+    if (!cacheOption || !req) return;
+    {
+        if (isCacheControl(cacheOption)) return cacheOption;
+        if (isCacheOptionProvider(cacheOption)) return cacheOption(req);
+        const url = req.url;
+        const options = Object.entries(cacheOption);
+        for (const [key, option] of options)if ('*' === key || new RegExp(key).test(url)) if ('function' == typeof option) return option(req);
+        else return option;
+        return;
+    }
+    function isCacheOptionProvider(option) {
+        return 'function' == typeof option;
+    }
+    function isCacheControl(option) {
+        return 'object' == typeof option && null !== option && 'maxAge' in option;
     }
-    return void 0;
-  }
-  function isCacheOptionProvider(option) {
-    return typeof option === "function";
-  }
-  function isCacheControl(option) {
-    return typeof option === "object" && option !== null && "maxAge" in option;
-  }
 }
 async function getCacheResult(request, options) {
-  const { cacheControl, container = storage, requestHandler, requestHandlerOptions } = options;
-  const { onError } = requestHandlerOptions;
-  const key = computedKey(request, cacheControl);
-  let value;
-  try {
-    value = await container.get(key);
-  } catch (_) {
-    if (onError) {
-      onError(`[render-cache] get cache failed, key: ${key}`);
-    } else {
-      console.error(`[render-cache] get cache failed, key: ${key}`);
+    const { cacheControl, container = storage, requestHandler, requestHandlerOptions } = options;
+    const { onError } = requestHandlerOptions;
+    const key = computedKey(request, cacheControl);
+    let value;
+    try {
+        value = await container.get(key);
+    } catch (_) {
+        if (onError) onError(`[render-cache] get cache failed, key: ${key}`);
+        else console.error(`[render-cache] get cache failed, key: ${key}`);
+        value = void 0;
     }
-    value = void 0;
-  }
-  const { maxAge, staleWhileRevalidate } = cacheControl;
-  const ttl = maxAge + staleWhileRevalidate;
-  if (value) {
-    const cache = JSON.parse(value);
-    const interval = Date.now() - cache.cursor;
-    if (interval <= maxAge) {
-      const cacheStatus = "hit";
-      return new Response(cache.val, {
-        headers: {
-          [import_constants.X_RENDER_CACHE]: cacheStatus
-        }
-      });
-    } else if (interval <= staleWhileRevalidate + maxAge) {
-      processCache({
-        key,
-        request,
-        requestHandler,
-        requestHandlerOptions,
-        ttl,
-        container
-      }).then(async (response) => {
-        await response.text();
-      });
-      const cacheStatus = "stale";
-      return new Response(cache.val, {
-        headers: {
-          [import_constants.X_RENDER_CACHE]: cacheStatus
-        }
-      });
-    } else {
-      return processCache({
+    const { maxAge, staleWhileRevalidate } = cacheControl;
+    const ttl = maxAge + staleWhileRevalidate;
+    if (!value) return processCache({
         key,
         request,
         requestHandler,
         requestHandlerOptions,
         ttl,
         container,
-        cacheStatus: "expired"
-      });
-    }
-  } else {
-    return processCache({
-      key,
-      request,
-      requestHandler,
-      requestHandlerOptions,
-      ttl,
-      container,
-      cacheStatus: "miss"
+        cacheStatus: 'miss'
     });
-  }
+    {
+        const cache = JSON.parse(value);
+        const interval = Date.now() - cache.cursor;
+        if (interval <= maxAge) {
+            const cacheStatus = 'hit';
+            return new Response(cache.val, {
+                headers: {
+                    [external_constants_js_namespaceObject.X_RENDER_CACHE]: cacheStatus
+                }
+            });
+        }
+        if (!(interval <= staleWhileRevalidate + maxAge)) return processCache({
+            key,
+            request,
+            requestHandler,
+            requestHandlerOptions,
+            ttl,
+            container,
+            cacheStatus: 'expired'
+        });
+        {
+            processCache({
+                key,
+                request,
+                requestHandler,
+                requestHandlerOptions,
+                ttl,
+                container
+            }).then(async (response)=>{
+                await response.text();
+            });
+            const cacheStatus = 'stale';
+            return new Response(cache.val, {
+                headers: {
+                    [external_constants_js_namespaceObject.X_RENDER_CACHE]: cacheStatus
+                }
+            });
+        }
+    }
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  getCacheResult,
-  matchCacheControl,
-  shouldUseCache
+exports.getCacheResult = __webpack_exports__.getCacheResult;
+exports.matchCacheControl = __webpack_exports__.matchCacheControl;
+exports.shouldUseCache = __webpack_exports__.shouldUseCache;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "getCacheResult",
+    "matchCacheControl",
+    "shouldUseCache"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
 });