@modern-js/server-core 2.69.5 → 3.0.0-alpha.0

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

@@ -1,49 +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 dataHandler_exports = {};
-__export(dataHandler_exports, {
-  dataHandler: () => dataHandler
+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__, {
+    dataHandler: ()=>dataHandler
 });
-module.exports = __toCommonJS(dataHandler_exports);
-var import_constants = require("@modern-js/utils/universal/constants");
-const dataHandler = async (request, { routeInfo, serverRoutes, reporter, monitors, onError, onTiming, serverManifest, loaderContext }) => {
-  var _serverManifest_loaderBundles;
-  const serverLoaderModule = serverManifest === null || serverManifest === void 0 ? void 0 : (_serverManifest_loaderBundles = serverManifest.loaderBundles) === null || _serverManifest_loaderBundles === void 0 ? void 0 : _serverManifest_loaderBundles[routeInfo.entryName || import_constants.MAIN_ENTRY_NAME];
-  if (!serverLoaderModule) {
-    return;
-  }
-  const { routes, handleRequest } = serverLoaderModule;
-  const response = await handleRequest({
-    request,
-    serverRoutes,
-    context: {
-      reporter,
-      monitors,
-      loaderContext
-    },
-    onTiming,
-    onError,
-    routes
-  });
-  return response;
+const constants_namespaceObject = require("@modern-js/utils/universal/constants");
+const dataHandler = async (request, { routeInfo, serverRoutes, monitors, onError, onTiming, serverManifest, loaderContext })=>{
+    const serverLoaderModule = serverManifest?.loaderBundles?.[routeInfo.entryName || constants_namespaceObject.MAIN_ENTRY_NAME];
+    if (!serverLoaderModule) return;
+    const { routes, handleRequest } = serverLoaderModule;
+    const response = await handleRequest({
+        request,
+        serverRoutes,
+        context: {
+            monitors,
+            loaderContext
+        },
+        onTiming,
+        onError,
+        routes
+    });
+    return response;
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  dataHandler
+exports.dataHandler = __webpack_exports__.dataHandler;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "dataHandler"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
 });

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

@@ -1,132 +1,158 @@
 "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 __webpack_modules__ = {
+    "../../helper" (module) {
+        module.exports = require("../../helper.js");
+    },
+    "../../utils" (module) {
+        module.exports = require("../../utils/index.js");
+    },
+    "../monitors" (module) {
+        module.exports = require("../monitors.js");
+    },
+    "./inject" (module) {
+        module.exports = require("./inject.js");
+    }
 };
-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 __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var render_exports = {};
-__export(render_exports, {
-  renderPlugin: () => renderPlugin
-});
-module.exports = __toCommonJS(render_exports);
-var import_constants = require("@modern-js/utils/universal/constants");
-var import_helper = require("../../helper");
-var import_utils = require("../../utils");
-var import_customServer = require("../customServer");
-var import_monitors = require("../monitors");
-__reExport(render_exports, require("./inject"), module.exports);
-const renderPlugin = () => ({
-  name: "@modern-js/plugin-render",
-  setup(api) {
-    return {
-      async prepare() {
-        const { middlewares, routes, render, distDirectory: pwd, renderMiddlewares } = api.useAppContext();
-        const hooks = api.getHooks();
-        const config = api.useConfigContext();
-        if (!routes) {
-          return;
-        }
-        const customServer = new import_customServer.CustomServer(hooks, pwd);
-        const pageRoutes = getPageRoutes(routes);
-        middlewares.push({
-          name: "page-latency",
-          handler: (0, import_monitors.requestLatencyMiddleware)()
-        });
-        for (const route of pageRoutes) {
-          var _config_server;
-          const { urlPath: originUrlPath, entryName = import_constants.MAIN_ENTRY_NAME } = route;
-          const urlPath = originUrlPath.endsWith("/") ? `${originUrlPath}*` : `${originUrlPath}/*`;
-          if (((_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.disableHook) !== true) {
-            const customServerHookMiddleware = customServer.getHookMiddleware(entryName, routes);
-            middlewares.push({
-              name: "custom-server-hook",
-              path: urlPath,
-              handler: customServerHookMiddleware
-            });
-          }
-          renderMiddlewares === null || renderMiddlewares === void 0 ? void 0 : renderMiddlewares.forEach((m) => {
-            middlewares.push({
-              name: m.name,
-              path: urlPath,
-              handler: m.handler
-            });
-          });
-          const customServerMiddleware = await customServer.getServerMiddleware();
-          customServerMiddleware && middlewares.push({
-            name: "custom-server-middleware",
-            path: urlPath,
-            handler: customServerMiddleware
-          });
-          render && middlewares.push({
-            name: `render`,
-            path: urlPath,
-            handler: createRenderHandler(render)
-          });
-        }
-      }
+var __webpack_module_cache__ = {};
+function __webpack_require__(moduleId) {
+    var cachedModule = __webpack_module_cache__[moduleId];
+    if (void 0 !== cachedModule) return cachedModule.exports;
+    var module = __webpack_module_cache__[moduleId] = {
+        exports: {}
     };
-  }
-});
-function getPageRoutes(routes) {
-  return routes.filter((route) => !route.isApi).sort(import_utils.sortRoutes);
+    __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
+    return module.exports;
 }
-function createRenderHandler(render) {
-  return async (c, _) => {
-    var _c_env_node;
-    const logger = c.get("logger");
-    const reporter = c.get("reporter");
-    const monitors = c.get("monitors");
-    const templates = c.get("templates") || {};
-    const serverManifest = c.get("serverManifest") || {};
-    const rscServerManifest = c.get("rscServerManifest");
-    const rscClientManifest = c.get("rscClientManifest");
-    const rscSSRManifest = c.get("rscSSRManifest");
-    const locals = c.get("locals");
-    const metrics = c.get("metrics");
-    const matchPathname = c.get("matchPathname");
-    const matchEntryName = c.get("matchEntryName");
-    const loaderContext = (0, import_helper.getLoaderCtx)(c);
-    const request = c.req.raw;
-    const nodeReq = (_c_env_node = c.env.node) === null || _c_env_node === void 0 ? void 0 : _c_env_node.req;
-    const res = await render(request, {
-      nodeReq,
-      monitors,
-      logger,
-      reporter,
-      templates,
-      metrics,
-      serverManifest,
-      rscServerManifest,
-      rscClientManifest,
-      rscSSRManifest,
-      loaderContext,
-      locals,
-      matchPathname,
-      matchEntryName
-    });
-    const { body, status, headers } = res;
-    const headersData = {};
-    headers.forEach((v, k) => {
-      headersData[k] = v;
+(()=>{
+    __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__, {
+        renderPlugin: ()=>renderPlugin
     });
-    return c.body(body, status, headersData);
-  };
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  renderPlugin,
-  ...require("./inject")
+    var _helper__rspack_import_0 = __webpack_require__("../../helper");
+    var _utils__rspack_import_1 = __webpack_require__("../../utils");
+    var _monitors__rspack_import_2 = __webpack_require__("../monitors");
+    var _inject__rspack_import_3 = __webpack_require__("./inject");
+    var __rspack_reexport = {};
+    for(const __rspack_import_key in _inject__rspack_import_3)if ([
+        "renderPlugin",
+        "default"
+    ].indexOf(__rspack_import_key) < 0) __rspack_reexport[__rspack_import_key] = ()=>_inject__rspack_import_3[__rspack_import_key];
+    __webpack_require__.d(__webpack_exports__, __rspack_reexport);
+    const DYNAMIC_ROUTE_REG = /\/:./;
+    function escapeRegexSpecialChars(path) {
+        return path.replace(/[()[\]{}*+?.^$|\\]/g, '\\$&');
+    }
+    const renderPlugin = ()=>({
+            name: '@modern-js/plugin-render',
+            setup (api) {
+                api.onPrepare(async ()=>{
+                    const { middlewares, routes, render, renderMiddlewares } = api.getServerContext();
+                    if (!routes) return;
+                    const pageRoutes = getPageRoutes(routes);
+                    middlewares.push({
+                        name: 'page-latency',
+                        handler: (0, _monitors__rspack_import_2.requestLatencyMiddleware)()
+                    });
+                    for (const route of pageRoutes){
+                        const { urlPath: originUrlPath } = route;
+                        const isDynamic = DYNAMIC_ROUTE_REG.test(originUrlPath);
+                        const escapedPath = isDynamic ? originUrlPath : escapeRegexSpecialChars(originUrlPath);
+                        const urlPath = escapedPath.endsWith('/') ? `${escapedPath}*` : `${escapedPath}/*`;
+                        renderMiddlewares?.forEach((m)=>{
+                            middlewares.push({
+                                name: m.name,
+                                path: urlPath,
+                                handler: m.handler
+                            });
+                        });
+                        render && middlewares.push({
+                            name: "render",
+                            path: urlPath,
+                            handler: createRenderHandler(render)
+                        });
+                    }
+                });
+            }
+        });
+    function getPageRoutes(routes) {
+        return routes.filter((route)=>!route.isApi).sort(_utils__rspack_import_1.sortRoutes);
+    }
+    function createRenderHandler(render) {
+        return async (c, _)=>{
+            const reporter = c.get('reporter');
+            const monitors = c.get('monitors');
+            const templates = c.get('templates') || {};
+            const serverManifest = c.get('serverManifest') || {};
+            const rscServerManifest = c.get('rscServerManifest');
+            const rscClientManifest = c.get('rscClientManifest');
+            const rscSSRManifest = c.get('rscSSRManifest');
+            const locals = c.get('locals');
+            c.get('metrics');
+            const matchPathname = c.get('matchPathname');
+            const matchEntryName = c.get('matchEntryName');
+            const loaderContext = (0, _helper__rspack_import_0.getLoaderCtx)(c);
+            const contextForceCSR = c.get('forceCSR');
+            const request = c.req.raw;
+            const nodeReq = c.env.node?.req;
+            const res = await render(request, {
+                nodeReq,
+                monitors,
+                templates,
+                serverManifest,
+                rscServerManifest,
+                rscClientManifest,
+                rscSSRManifest,
+                loaderContext,
+                locals,
+                matchPathname,
+                matchEntryName,
+                contextForceCSR,
+                reporter
+            });
+            const { body, status, headers } = res;
+            const headersData = {};
+            headers.forEach((v, k)=>{
+                headersData[k] = v;
+            });
+            return c.body(body, status, headersData);
+        };
+    }
+})();
+exports.renderPlugin = __webpack_exports__.renderPlugin;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "renderPlugin"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
 });

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

@@ -1,94 +1,92 @@
 "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 inject_exports = {};
-__export(inject_exports, {
-  getRenderHandler: () => getRenderHandler,
-  injectRenderHandlerPlugin: () => injectRenderHandlerPlugin
-});
-module.exports = __toCommonJS(inject_exports);
-var import_render = require("./render");
-const injectRenderHandlerPlugin = ({ staticGenerate, cacheConfig }) => ({
-  name: "@modern-js/plugin-inject-render",
-  setup(api) {
-    return {
-      async prepare() {
-        const { distDirectory: pwd, routes, metaName } = api.useAppContext();
-        const config = api.useConfigContext();
-        const hookRunner = api.useHookRunners();
-        if (!routes) {
-          return;
-        }
-        const onFallback = async (reason, utils, error) => {
-          await hookRunner.fallback({
-            reason,
-            ...utils,
-            error
-          });
-        };
-        const getRenderHandlerOptions = {
-          pwd,
-          routes,
-          config,
-          metaName,
-          // TODO: support modern.server.ts cache config
-          cacheConfig,
-          staticGenerate,
-          onFallback
-        };
-        const render = await getRenderHandler(getRenderHandlerOptions);
-        api.setAppContext({
-          ...api.useAppContext(),
-          render,
-          getRenderOptions: getRenderHandlerOptions
+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__, {
+    injectRenderHandlerPlugin: ()=>injectRenderHandlerPlugin,
+    getRenderHandler: ()=>getRenderHandler
 });
+const external_render_js_namespaceObject = require("./render.js");
+const injectRenderHandlerPlugin = ({ staticGenerate, cacheConfig })=>({
+        name: '@modern-js/plugin-inject-render',
+        setup (api) {
+            api.onPrepare(async ()=>{
+                const { distDirectory: pwd, routes, metaName } = api.getServerContext();
+                const config = api.getServerConfig();
+                const hooks = api.getHooks();
+                if (!routes) return;
+                const onFallback = async (reason, error)=>{
+                    await hooks.fallback.call({
+                        reason,
+                        error
+                    });
+                };
+                const getRenderHandlerOptions = {
+                    pwd: pwd,
+                    routes,
+                    config,
+                    metaName,
+                    cacheConfig: cacheConfig,
+                    staticGenerate,
+                    onFallback
+                };
+                const render = await getRenderHandler(getRenderHandlerOptions);
+                api.updateServerContext({
+                    render,
+                    getRenderOptions: getRenderHandlerOptions
+                });
+            });
+        }
+    });
 async function getRenderHandler({ pwd, routes, config, cacheConfig, metaName, staticGenerate, onFallback }) {
-  var _config_server, _config_server1, _config_security;
-  const ssrConfig = (_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.ssr;
-  const ssrByEntries = (_config_server1 = config.server) === null || _config_server1 === void 0 ? void 0 : _config_server1.ssrByEntries;
-  const forceCSR = typeof ssrConfig === "object" ? ssrConfig.forceCSR : false;
-  const forceCSRMap = /* @__PURE__ */ new Map();
-  if (ssrByEntries) {
-    Object.entries(ssrByEntries).forEach(([entryName, ssrConfig2]) => {
-      var _ssrConfig_forceCSR;
-      forceCSRMap.set(entryName, typeof ssrConfig2 === "object" ? (_ssrConfig_forceCSR = ssrConfig2.forceCSR) !== null && _ssrConfig_forceCSR !== void 0 ? _ssrConfig_forceCSR : false : false);
+    const ssrConfig = config.server?.ssr;
+    const ssrByEntries = config.server?.ssrByEntries;
+    const forceCSR = 'object' == typeof ssrConfig ? ssrConfig.forceCSR : false;
+    const forceCSRMap = new Map();
+    if (ssrByEntries) Object.entries(ssrByEntries).forEach(([entryName, ssrConfig])=>{
+        forceCSRMap.set(entryName, 'object' == typeof ssrConfig ? ssrConfig.forceCSR ?? false : false);
+    });
+    const render = (0, external_render_js_namespaceObject.createRender)({
+        routes,
+        pwd,
+        config,
+        staticGenerate,
+        cacheConfig,
+        forceCSR,
+        forceCSRMap,
+        nonce: config.security?.nonce,
+        metaName: metaName || 'modern-js',
+        onFallback
     });
-  }
-  const render = (0, import_render.createRender)({
-    routes,
-    pwd,
-    config,
-    staticGenerate,
-    cacheConfig,
-    forceCSR,
-    forceCSRMap,
-    nonce: (_config_security = config.security) === null || _config_security === void 0 ? void 0 : _config_security.nonce,
-    metaName: metaName || "modern-js",
-    onFallback
-  });
-  return render;
+    return render;
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  getRenderHandler,
-  injectRenderHandlerPlugin
+exports.getRenderHandler = __webpack_exports__.getRenderHandler;
+exports.injectRenderHandlerPlugin = __webpack_exports__.injectRenderHandlerPlugin;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "getRenderHandler",
+    "injectRenderHandlerPlugin"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
 });