@bleedingdev/modern-js-server-core 3.9.0-ultramodern.12 → 3.9.0-ultramodern.14

package/dist/cjs/adapters/node/plugins/static.js

@@ -199,7 +199,7 @@ function createStaticMiddleware(options) {
             respondAsset: options.respondAsset,
             respondPublicFallback: options.respondPublicFallback
         })(c, next);
-        {
+        else {
             const filepath = external_path_default().join(pwd, pathname.replace(pathPrefix, ()=>''));
             if (!isPathInside(filepath, pwd)) return next();
             if (!await utils_namespaceObject.fs.pathExists(filepath)) return next();

package/dist/cjs/helper.js

@@ -31,7 +31,7 @@ const LOADER_CONTEXT = 'loaderContext';
 function getLoaderCtx(c) {
     const loaderContext = c.get(LOADER_CONTEXT);
     if (loaderContext) return loaderContext;
-    {
+    else {
         const loaderContext = new Map();
         c.set(LOADER_CONTEXT, loaderContext);
         return loaderContext;

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

@@ -87,8 +87,7 @@ var __webpack_exports__ = {};
                 void 0,
                 {}
             ];
-        }
-        {
+        } else {
             const result = matchedRoutes[0];
             if (!result) return [
                 void 0,
@@ -243,7 +242,7 @@ var __webpack_exports__ = {};
         if (req.headers.get('x-rsc-action')) return 'rsc-action';
         if (req.headers.get('x-rsc-tree')) return 'rsc-tree';
         if (!isSSR) return 'csr';
-        {
+        else {
             if (query.__loader) return 'data';
             const fallbackHeaderValue = req.headers.get(fallbackHeader) || nodeReq?.headers[fallbackHeader];
             if (forceCSR && (query.csr || fallbackHeaderValue || contextForceCSR)) {
@@ -272,7 +271,7 @@ var __webpack_exports__ = {};
                 [external_constants_js_namespaceObject.X_MODERNJS_RENDER]: 'client'
             })
         });
-        return (0, external_csrRscRender_js_namespaceObject.csrRscRender)(request, options);
+        else return (0, external_csrRscRender_js_namespaceObject.csrRscRender)(request, options);
     }
 })();
 exports.createRender = __webpack_exports__.createRender;

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

@@ -112,7 +112,7 @@ function computedKey(req, cacheControl) {
     const defaultKey = '/' === pathname ? pathname : removeTailSlash(pathname);
     if (customKey) if ('string' == typeof customKey) return customKey;
     else return customKey(defaultKey);
-    {
+    else {
         const url = new URL(req.url);
         return `${url.origin}${defaultKey}${url.search}`;
     }
@@ -126,7 +126,7 @@ function shouldUseCache(request) {
 }
 function matchCacheControl(cacheOption, req) {
     if (!cacheOption || !req) return;
-    {
+    else {
         if (isCacheControl(cacheOption)) return cacheOption;
         if (isCacheOptionProvider(cacheOption)) return cacheOption(req);
         const url = req.url;
@@ -167,7 +167,7 @@ async function getCacheResult(request, options) {
         container,
         cacheStatus: 'miss'
     });
-    {
+    else {
         const cache = JSON.parse(value);
         const interval = Date.now() - cache.cursor;
         if (interval <= maxAge) {
@@ -178,17 +178,16 @@ async function getCacheResult(request, options) {
                     [external_constants_js_namespaceObject.X_RENDER_CACHE]: cacheStatus
                 }
             });
-        }
-        if (!(interval <= staleWhileRevalidate + maxAge)) return processCache({
-            key,
-            request,
-            requestHandler,
-            requestHandlerOptions,
-            ttl,
-            container,
-            cacheStatus: 'expired'
-        });
-        {
+        } else {
+            if (!(interval <= staleWhileRevalidate + maxAge)) return processCache({
+                key,
+                request,
+                requestHandler,
+                requestHandlerOptions,
+                ttl,
+                container,
+                cacheStatus: 'expired'
+            });
             processCache({
                 key,
                 request,

package/dist/cjs/serverBase.js

@@ -179,7 +179,7 @@ function applyMiddlewares() {
         if (middleware.before) {
             const targetIndex = finalMiddlewares.findIndex((item)=>{
                 if (middleware.before?.includes(item.name)) return true;
-                return false;
+                else return false;
             });
             if (-1 !== targetIndex) finalMiddlewares.splice(targetIndex, 0, middleware);
             else finalMiddlewares.push(middleware);
@@ -200,7 +200,7 @@ function applyMiddlewares() {
     }
     function handler2Handlers(handler) {
         if (Array.isArray(handler)) return handler;
-        return [
+        else return [
             handler
         ];
     }

package/dist/cjs/utils/transformStream.js

@@ -43,7 +43,7 @@ function transformResponse(response, transformCb) {
     if (response.body) {
         const stream = createTransformStream(async (before)=>{
             if (Array.isArray(transformCb)) return transformCb.reduce(async (before, cb)=>cb(await before), Promise.resolve(before));
-            return transformCb(before);
+            else return transformCb(before);
         });
         response.body.pipeThrough(stream);
         readable = stream.readable;

package/dist/esm/adapters/node/plugins/static.mjs

@@ -154,7 +154,7 @@ function createStaticMiddleware(options) {
             respondAsset: options.respondAsset,
             respondPublicFallback: options.respondPublicFallback
         })(c, next);
-        {
+        else {
             const filepath = path.join(pwd, pathname.replace(pathPrefix, ()=>''));
             if (!isPathInside(filepath, pwd)) return next();
             if (!await fs.pathExists(filepath)) return next();

package/dist/esm/helper.mjs

@@ -2,7 +2,7 @@ const LOADER_CONTEXT = 'loaderContext';
 function getLoaderCtx(c) {
     const loaderContext = c.get(LOADER_CONTEXT);
     if (loaderContext) return loaderContext;
-    {
+    else {
         const loaderContext = new Map();
         c.set(LOADER_CONTEXT, loaderContext);
         return loaderContext;

package/dist/esm/plugins/render/render.mjs

@@ -7,12 +7,6 @@ import { dataHandler } from "./dataHandler.mjs";
 import { renderRscHandler } from "./renderRscHandler.mjs";
 import { serverActionHandler } from "./serverActionHandler.mjs";
 import { ssrRender } from "./ssrRender.mjs";
-import { __webpack_require__ } from "../../rslib-runtime~1.mjs";
-__webpack_require__.add({
-    718 (module) {
-        module.exports = require("@modern-js/runtime-utils/router");
-    }
-});
 const DYNAMIC_ROUTE_REG = /\/:./;
 function getRouter(routes) {
     const dynamicRoutes = [];
@@ -45,8 +39,7 @@ function matchRoute(router, pathname, entryName) {
             void 0,
             {}
         ];
-    }
-    {
+    } else {
         const result = matchedRoutes[0];
         if (!result) return [
             void 0,
@@ -163,7 +156,7 @@ async function renderHandler(request, options, mode, fallbackWrapper, framework)
         const { nestedRoutesJson } = serverManifest;
         const routes = nestedRoutesJson?.[options.routeInfo.entryName];
         if (routes) {
-            const { matchRoutes } = __webpack_require__(718);
+            const { matchRoutes } = require("@modern-js/runtime-utils/router");
             const url = new URL(request.url);
             const matchedRoutes = matchRoutes(routes, url.pathname, options.routeInfo.urlPath);
             if (matchedRoutes) {
@@ -201,7 +194,7 @@ async function getRenderMode(req, fallbackHeader, isSSR, forceCSR, nodeReq, onFa
     if (req.headers.get('x-rsc-action')) return 'rsc-action';
     if (req.headers.get('x-rsc-tree')) return 'rsc-tree';
     if (!isSSR) return 'csr';
-    {
+    else {
         if (query.__loader) return 'data';
         const fallbackHeaderValue = req.headers.get(fallbackHeader) || nodeReq?.headers[fallbackHeader];
         if (forceCSR && (query.csr || fallbackHeaderValue || contextForceCSR)) {
@@ -230,6 +223,6 @@ async function csrRender(request, options) {
             [X_MODERNJS_RENDER]: 'client'
         })
     });
-    return csrRscRender(request, options);
+    else return csrRscRender(request, options);
 }
 export { createRender, matchRoute };

package/dist/esm/plugins/render/ssrCache.mjs

@@ -78,7 +78,7 @@ function computedKey(req, cacheControl) {
     const defaultKey = '/' === pathname ? pathname : removeTailSlash(pathname);
     if (customKey) if ('string' == typeof customKey) return customKey;
     else return customKey(defaultKey);
-    {
+    else {
         const url = new URL(req.url);
         return `${url.origin}${defaultKey}${url.search}`;
     }
@@ -92,7 +92,7 @@ function shouldUseCache(request) {
 }
 function matchCacheControl(cacheOption, req) {
     if (!cacheOption || !req) return;
-    {
+    else {
         if (isCacheControl(cacheOption)) return cacheOption;
         if (isCacheOptionProvider(cacheOption)) return cacheOption(req);
         const url = req.url;
@@ -133,7 +133,7 @@ async function getCacheResult(request, options) {
         container,
         cacheStatus: 'miss'
     });
-    {
+    else {
         const cache = JSON.parse(value);
         const interval = Date.now() - cache.cursor;
         if (interval <= maxAge) {
@@ -144,17 +144,16 @@ async function getCacheResult(request, options) {
                     [X_RENDER_CACHE]: cacheStatus
                 }
             });
-        }
-        if (!(interval <= staleWhileRevalidate + maxAge)) return processCache({
-            key,
-            request,
-            requestHandler,
-            requestHandlerOptions,
-            ttl,
-            container,
-            cacheStatus: 'expired'
-        });
-        {
+        } else {
+            if (!(interval <= staleWhileRevalidate + maxAge)) return processCache({
+                key,
+                request,
+                requestHandler,
+                requestHandlerOptions,
+                ttl,
+                container,
+                cacheStatus: 'expired'
+            });
             processCache({
                 key,
                 request,

package/dist/esm/serverBase.mjs

@@ -146,7 +146,7 @@ function applyMiddlewares() {
         if (middleware.before) {
             const targetIndex = finalMiddlewares.findIndex((item)=>{
                 if (middleware.before?.includes(item.name)) return true;
-                return false;
+                else return false;
             });
             if (-1 !== targetIndex) finalMiddlewares.splice(targetIndex, 0, middleware);
             else finalMiddlewares.push(middleware);
@@ -167,7 +167,7 @@ function applyMiddlewares() {
     }
     function handler2Handlers(handler) {
         if (Array.isArray(handler)) return handler;
-        return [
+        else return [
             handler
         ];
     }

package/dist/esm/utils/transformStream.mjs

@@ -14,7 +14,7 @@ function transformResponse(response, transformCb) {
     if (response.body) {
         const stream = createTransformStream(async (before)=>{
             if (Array.isArray(transformCb)) return transformCb.reduce(async (before, cb)=>cb(await before), Promise.resolve(before));
-            return transformCb(before);
+            else return transformCb(before);
         });
         response.body.pipeThrough(stream);
         readable = stream.readable;

package/dist/esm-node/adapters/node/plugins/static.mjs

@@ -155,7 +155,7 @@ function createStaticMiddleware(options) {
             respondAsset: options.respondAsset,
             respondPublicFallback: options.respondPublicFallback
         })(c, next);
-        {
+        else {
             const filepath = path.join(pwd, pathname.replace(pathPrefix, ()=>''));
             if (!isPathInside(filepath, pwd)) return next();
             if (!await fs.pathExists(filepath)) return next();

package/dist/esm-node/helper.mjs

@@ -3,7 +3,7 @@ const LOADER_CONTEXT = 'loaderContext';
 function getLoaderCtx(c) {
     const loaderContext = c.get(LOADER_CONTEXT);
     if (loaderContext) return loaderContext;
-    {
+    else {
         const loaderContext = new Map();
         c.set(LOADER_CONTEXT, loaderContext);
         return loaderContext;

package/dist/esm-node/plugins/render/render.mjs

@@ -8,14 +8,8 @@ import { dataHandler } from "./dataHandler.mjs";
 import { renderRscHandler } from "./renderRscHandler.mjs";
 import { serverActionHandler } from "./serverActionHandler.mjs";
 import { ssrRender } from "./ssrRender.mjs";
-import { __webpack_require__ } from "../../rslib-runtime~0.mjs";
 import { createRequire as __rspack_createRequire } from "node:module";
 const __rspack_createRequire_require = __rspack_createRequire(import.meta.url);
-__webpack_require__.add({
-    "@modern-js/runtime-utils/router" (module) {
-        module.exports = __rspack_createRequire_require("@modern-js/runtime-utils/router");
-    }
-});
 const DYNAMIC_ROUTE_REG = /\/:./;
 function getRouter(routes) {
     const dynamicRoutes = [];
@@ -48,8 +42,7 @@ function matchRoute(router, pathname, entryName) {
             void 0,
             {}
         ];
-    }
-    {
+    } else {
         const result = matchedRoutes[0];
         if (!result) return [
             void 0,
@@ -166,7 +159,7 @@ async function renderHandler(request, options, mode, fallbackWrapper, framework)
         const { nestedRoutesJson } = serverManifest;
         const routes = nestedRoutesJson?.[options.routeInfo.entryName];
         if (routes) {
-            const { matchRoutes } = __webpack_require__("@modern-js/runtime-utils/router");
+            const { matchRoutes } = __rspack_createRequire_require("@modern-js/runtime-utils/router");
             const url = new URL(request.url);
             const matchedRoutes = matchRoutes(routes, url.pathname, options.routeInfo.urlPath);
             if (matchedRoutes) {
@@ -204,7 +197,7 @@ async function getRenderMode(req, fallbackHeader, isSSR, forceCSR, nodeReq, onFa
     if (req.headers.get('x-rsc-action')) return 'rsc-action';
     if (req.headers.get('x-rsc-tree')) return 'rsc-tree';
     if (!isSSR) return 'csr';
-    {
+    else {
         if (query.__loader) return 'data';
         const fallbackHeaderValue = req.headers.get(fallbackHeader) || nodeReq?.headers[fallbackHeader];
         if (forceCSR && (query.csr || fallbackHeaderValue || contextForceCSR)) {
@@ -233,6 +226,6 @@ async function csrRender(request, options) {
             [X_MODERNJS_RENDER]: 'client'
         })
     });
-    return csrRscRender(request, options);
+    else return csrRscRender(request, options);
 }
 export { createRender, matchRoute };

package/dist/esm-node/plugins/render/ssrCache.mjs

@@ -79,7 +79,7 @@ function computedKey(req, cacheControl) {
     const defaultKey = '/' === pathname ? pathname : removeTailSlash(pathname);
     if (customKey) if ('string' == typeof customKey) return customKey;
     else return customKey(defaultKey);
-    {
+    else {
         const url = new URL(req.url);
         return `${url.origin}${defaultKey}${url.search}`;
     }
@@ -93,7 +93,7 @@ function shouldUseCache(request) {
 }
 function matchCacheControl(cacheOption, req) {
     if (!cacheOption || !req) return;
-    {
+    else {
         if (isCacheControl(cacheOption)) return cacheOption;
         if (isCacheOptionProvider(cacheOption)) return cacheOption(req);
         const url = req.url;
@@ -134,7 +134,7 @@ async function getCacheResult(request, options) {
         container,
         cacheStatus: 'miss'
     });
-    {
+    else {
         const cache = JSON.parse(value);
         const interval = Date.now() - cache.cursor;
         if (interval <= maxAge) {
@@ -145,17 +145,16 @@ async function getCacheResult(request, options) {
                     [X_RENDER_CACHE]: cacheStatus
                 }
             });
-        }
-        if (!(interval <= staleWhileRevalidate + maxAge)) return processCache({
-            key,
-            request,
-            requestHandler,
-            requestHandlerOptions,
-            ttl,
-            container,
-            cacheStatus: 'expired'
-        });
-        {
+        } else {
+            if (!(interval <= staleWhileRevalidate + maxAge)) return processCache({
+                key,
+                request,
+                requestHandler,
+                requestHandlerOptions,
+                ttl,
+                container,
+                cacheStatus: 'expired'
+            });
             processCache({
                 key,
                 request,

package/dist/esm-node/serverBase.mjs

@@ -147,7 +147,7 @@ function applyMiddlewares() {
         if (middleware.before) {
             const targetIndex = finalMiddlewares.findIndex((item)=>{
                 if (middleware.before?.includes(item.name)) return true;
-                return false;
+                else return false;
             });
             if (-1 !== targetIndex) finalMiddlewares.splice(targetIndex, 0, middleware);
             else finalMiddlewares.push(middleware);
@@ -168,7 +168,7 @@ function applyMiddlewares() {
     }
     function handler2Handlers(handler) {
         if (Array.isArray(handler)) return handler;
-        return [
+        else return [
             handler
         ];
     }

package/dist/esm-node/utils/transformStream.mjs

@@ -15,7 +15,7 @@ function transformResponse(response, transformCb) {
     if (response.body) {
         const stream = createTransformStream(async (before)=>{
             if (Array.isArray(transformCb)) return transformCb.reduce(async (before, cb)=>cb(await before), Promise.resolve(before));
-            return transformCb(before);
+            else return transformCb(before);
         });
         response.body.pipeThrough(stream);
         readable = stream.readable;

package/package.json

@@ -17,7 +17,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.9.0-ultramodern.12",
+  "version": "3.9.0-ultramodern.14",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "exports": {
@@ -66,25 +66,25 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.12",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.12",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.12",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.14",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.14",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.14",
     "@swc/helpers": "^0.5.23",
     "@web-std/fetch": "^4.2.1",
     "@web-std/file": "^3.0.3",
     "@web-std/stream": "^1.0.3",
     "cloneable-readable": "^3.0.0",
     "flatted": "^3.4.4",
-    "hono": "^4.13.7",
+    "hono": "^4.13.8",
     "ts-deepmerge": "8.0.0"
   },
   "devDependencies": {
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.12",
-    "@rslib/core": "1.0.0",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.14",
+    "@rslib/core": "1.0.2",
     "@scripts/rstest-config": "2.66.0",
     "@types/cloneable-readable": "^2.0.3",
     "@types/merge-deep": "^3.0.3",
-    "@types/node": "^26.4.1",
+    "@types/node": "^26.6.2",
     "@typescript/native-preview": "7.0.0-dev.20260707.2",
     "http-proxy-middleware": "^4.2.0",
     "typescript": "^7.0.2"

package/dist/esm/rslib-runtime~1.mjs

@@ -1,18 +0,0 @@
-var __webpack_modules__ = {};
-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: {}
-    };
-    __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
-    return module.exports;
-}
-__webpack_require__.m = __webpack_modules__;
-(()=>{
-    __webpack_require__.add = function(modules) {
-        Object.assign(__webpack_require__.m, modules);
-    };
-})();
-export { __webpack_require__ };

package/dist/esm-node/rslib-runtime~0.mjs

@@ -1,19 +0,0 @@
-import "node:module";
-var __webpack_modules__ = {};
-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: {}
-    };
-    __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
-    return module.exports;
-}
-__webpack_require__.m = __webpack_modules__;
-(()=>{
-    __webpack_require__.add = function(modules) {
-        Object.assign(__webpack_require__.m, modules);
-    };
-})();
-export { __webpack_require__ };