one 1.1.483 → 1.1.485

package/dist/esm/server/createRoutesManifest.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["getRoutes","getServerManifest","createMockModuleWithContext","map","arguments","length","contextModule","key","default","Object","defineProperty","value","createRoutesManifest","paths","options","routeTree","preserveApiRoutes","ignoreRequireErrors","ignoreEntryPoints"],"sources":["../../../src/server/createRoutesManifest.ts"],"sourcesContent":[null],"mappings":"AAAA,SAAuBA,SAAA,QAAiB;AACxC,SAASC,iBAAA,QAAyB;AAgBlC,SAASC,4BAAA,EAA4B;EACnC,IAAAC,GAAM,GAAAC,SAAA,CAAAC,MAAiB,QAAWD,SAAA,CAAU,gBAAAA,SAAA;IAAAE,aAAA,YAAAA,CAAAC,GAAA;MAAG;QAE/CC,QAAA,EAAO,CACL;MACD;IAGH;EAEO,OAASC,MAAA,CAAAC,cAAqB,CAAAJ,aAAiB,EAAyC;IAC7FK,KAAM,WAAAA,CAAA,EAAY;MAChB,OAAGR,GAAA;IACH;EAAmB,EACnB,EAAAG,aAAA;AAAqB;AACF,SACnBM,oBAAUA,CAAAC,KAAA,EAAAC,OAAA;EACZ,IAACC,SAAA,GAAAf,SAAA,CAAAE,2BAAA,CAAAW,KAAA;IAED,GAAKC,OAAA;IACHE,iBAAgB;IAGlBC,mBAAO,IAAkB;IAC3BC,iBAAA","ignoreList":[]}
+{"version":3,"names":["getRoutes","getServerManifest","createMockModuleWithContext","map","arguments","length","contextModule","key","default","Object","defineProperty","value","createRoutesManifest","paths","options","routeTree","preserveApiRoutes","ignoreRequireErrors","ignoreEntryPoints"],"sources":["../../../src/server/createRoutesManifest.ts"],"sourcesContent":[null],"mappings":"AAAA,SAAuBA,SAAA,QAAiB;AACxC,SAASC,iBAAA,QAAyB;AAiBlC,SAASC,4BAAA,EAA4B;EACnC,IAAAC,GAAM,GAAAC,SAAA,CAAAC,MAAiB,QAAWD,SAAA,CAAU,gBAAAA,SAAA;IAAAE,aAAA,YAAAA,CAAAC,GAAA;MAAG;QAE/CC,QAAA,EAAO,CACL;MACD;IAGH;EAEO,OAASC,MAAA,CAAAC,cAAqB,CAAAJ,aAAiB,EAAyC;IAC7FK,KAAM,WAAAA,CAAA,EAAY;MAChB,OAAGR,GAAA;IACH;EAAmB,EACnB,EAAAG,aAAA;AAAqB;AACF,SACnBM,oBAAUA,CAAAC,KAAA,EAAAC,OAAA;EACZ,IAACC,SAAA,GAAAf,SAAA,CAAAE,2BAAA,CAAAW,KAAA;IAED,GAAKC,OAAA;IACHE,iBAAgB;IAGlBC,mBAAO,IAAkB;IAC3BC,iBAAA","ignoreList":[]}

package/dist/esm/server/getServerManifest.js

@@ -8,31 +8,40 @@ function getServerManifest(route) {
     if (route2.children.length)
       return route2.children.flatMap((child) => getFlatNodes(child, [...layouts || [], route2]));
     let key;
-    return route2.type === "api" ? key = getContextKey(route2.contextKey).replace(/\/index$/, "") || "/" : key = layouts?.flatMap((route3) => {
-      const key2 = getContextKey(route3.route).replace(/\/index$/, "") || "/";
-      return key2 === "/" || key2.startsWith("/(") ? [] : [key2];
-    }) + getContextKey(route2.route).replace(/\/index$/, "") || "/", [[key, { ...route2, layouts }]];
+    if (route2.type === "api")
+      key = getContextKey(route2.contextKey).replace(/\/index$/, "") || "/";
+    else {
+      const parentSegments = layouts?.flatMap((route3) => {
+        const key2 = getContextKey(route3.route).replace(/\/index$/, "") || "/";
+        return key2 === "/" || key2.startsWith("/(") ? [] : [key2];
+      });
+      key = (parentSegments ? parentSegments.join("") : "") + getContextKey(route2.route).replace(/\/index$/, "") || "/";
+    }
+    return [[key, { ...route2, layouts }]];
   }
   const flat = getFlatNodes(route).sort(([, a], [, b]) => sortRoutes(b, a)).reverse(), pathToRoute = {};
   for (const [path, route2] of flat)
     pathToRoute[path] && (console.warn(`
 [one] \u274C Duplicate routes error`), console.warn("  Multiple routes at the same path! One route will always win over the other."), console.warn(`    path: ${path}`), console.warn(`    first route: ${pathToRoute[path].contextKey}`), console.warn(`    second route: ${route2.contextKey}
 `)), pathToRoute[path] = route2;
-  const apiRoutes = [], middlewareRoutes = [], pageRoutes = [], addedMiddlewares = {};
+  const apiRoutes = [], middlewareRoutes = [], pageRoutes = [], allRoutes = [], addedMiddlewares = {};
   for (const [path, node] of flat) {
     if (node.type === "api") {
-      apiRoutes.push(getGeneratedNamedRouteRegex(path, node));
+      const route3 = getGeneratedNamedRouteRegex(path, node);
+      apiRoutes.push(route3), allRoutes.push(route3);
       continue;
     }
     if (node.middlewares?.length)
       for (const middleware of node.middlewares)
         addedMiddlewares[middleware.contextKey] || (addedMiddlewares[middleware.contextKey] = !0, middlewareRoutes.push(getGeneratedNamedRouteRegex(path, middleware)));
-    pageRoutes.push(getGeneratedNamedRouteRegex(path, node));
+    const route2 = getGeneratedNamedRouteRegex(path, node);
+    pageRoutes.push(route2), allRoutes.push(route2);
   }
   return {
     apiRoutes,
     middlewareRoutes,
-    pageRoutes
+    pageRoutes,
+    allRoutes
   };
 }
 function getGeneratedNamedRouteRegex(normalizedRoute, node) {

package/dist/esm/server/getServerManifest.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/server/getServerManifest.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["route", "key"]
 }

package/dist/esm/server/getServerManifest.mjs

@@ -7,10 +7,14 @@ function getServerManifest(route) {
   function getFlatNodes(route2, layouts) {
     if (route2.children.length) return route2.children.flatMap(child => getFlatNodes(child, [...(layouts || []), route2]));
     let key;
-    return route2.type === "api" ? key = getContextKey(route2.contextKey).replace(/\/index$/, "") || "/" : key = layouts?.flatMap(route3 => {
-      const key2 = getContextKey(route3.route).replace(/\/index$/, "") || "/";
-      return key2 === "/" || key2.startsWith("/(") ? [] : [key2];
-    }) + getContextKey(route2.route).replace(/\/index$/, "") || "/", [[key, {
+    if (route2.type === "api") key = getContextKey(route2.contextKey).replace(/\/index$/, "") || "/";else {
+      const parentSegments = layouts?.flatMap(route3 => {
+        const key2 = getContextKey(route3.route).replace(/\/index$/, "") || "/";
+        return key2 === "/" || key2.startsWith("/(") ? [] : [key2];
+      });
+      key = (parentSegments ? parentSegments.join("") : "") + getContextKey(route2.route).replace(/\/index$/, "") || "/";
+    }
+    return [[key, {
       ...route2,
       layouts
     }]];
@@ -23,19 +27,23 @@ function getServerManifest(route) {
   const apiRoutes = [],
     middlewareRoutes = [],
     pageRoutes = [],
+    allRoutes = [],
     addedMiddlewares = {};
   for (const [path, node] of flat) {
     if (node.type === "api") {
-      apiRoutes.push(getGeneratedNamedRouteRegex(path, node));
+      const route3 = getGeneratedNamedRouteRegex(path, node);
+      apiRoutes.push(route3), allRoutes.push(route3);
       continue;
     }
     if (node.middlewares?.length) for (const middleware of node.middlewares) addedMiddlewares[middleware.contextKey] || (addedMiddlewares[middleware.contextKey] = !0, middlewareRoutes.push(getGeneratedNamedRouteRegex(path, middleware)));
-    pageRoutes.push(getGeneratedNamedRouteRegex(path, node));
+    const route2 = getGeneratedNamedRouteRegex(path, node);
+    pageRoutes.push(route2), allRoutes.push(route2);
   }
   return {
     apiRoutes,
     middlewareRoutes,
-    pageRoutes
+    pageRoutes,
+    allRoutes
   };
 }
 function getGeneratedNamedRouteRegex(normalizedRoute, node) {

package/dist/esm/server/getServerManifest.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["getContextKey","matchGroupName","sortRoutes","isNotFoundRoute","route","dynamic","length","notFound","getServerManifest","getFlatNodes","route2","layouts","children","flatMap","child","key","type","contextKey","replace","route3","key2","startsWith","flat","sort","a","b","reverse","pathToRoute","path","console","warn","apiRoutes","middlewareRoutes","pageRoutes","addedMiddlewares","node","push","getGeneratedNamedRouteRegex","middlewares","middleware","normalizedRoute","getRouteEntry","generated","isNotFound","result","getPathMeta","file","page","namedRegex","urlPath","urlCleanPath","routeKeys","buildGetSafeRouteKey","currentCharCode","currentLength","incrementNext","i","String","fromCharCode","removeTrailingSlash","segments","slice","split","getSafeRouteKey","urlPathParts","routeSegments","map","segment","index","test","name","optional","repeat","parseParam","cleanedKey","invalidKey","Number","isNaN","parseInt","content","insideParensRegex","groupName","group","trim","filter","Boolean","escapeStringRegexp","join","p","insideBracketsRegex","tripleDotRegex","replaceRegex","hasRegExpRegex","str","param"],"sources":["../../../src/server/getServerManifest.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["getContextKey","matchGroupName","sortRoutes","isNotFoundRoute","route","dynamic","length","notFound","getServerManifest","getFlatNodes","route2","layouts","children","flatMap","child","key","type","contextKey","replace","parentSegments","route3","key2","startsWith","join","flat","sort","a","b","reverse","pathToRoute","path","console","warn","apiRoutes","middlewareRoutes","pageRoutes","allRoutes","addedMiddlewares","node","getGeneratedNamedRouteRegex","push","middlewares","middleware","normalizedRoute","getRouteEntry","generated","isNotFound","result","getPathMeta","file","page","namedRegex","urlPath","urlCleanPath","routeKeys","buildGetSafeRouteKey","currentCharCode","currentLength","incrementNext","i","String","fromCharCode","removeTrailingSlash","segments","slice","split","getSafeRouteKey","urlPathParts","routeSegments","map","segment","index","test","name","optional","repeat","parseParam","cleanedKey","invalidKey","Number","isNaN","parseInt","content","insideParensRegex","groupName","group","trim","filter","Boolean","escapeStringRegexp","p","insideBracketsRegex","tripleDotRegex","replaceRegex","hasRegExpRegex","str","param"],"sources":["../../../src/server/getServerManifest.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/server/getServerManifest.native.js

@@ -14,7 +14,7 @@ function getServerManifest(route) {
         var key2 = getContextKey(route3.route).replace(/\/index$/, "") || "/";
         return key2 === "/" || key2.startsWith("/(") ? [] : [key2];
       });
-      key = parentSegments + getContextKey(route2.route).replace(/\/index$/, "") || "/";
+      key = (parentSegments ? parentSegments.join("") : "") + getContextKey(route2.route).replace(/\/index$/, "") || "/";
     }
     return [[key, {
       ...route2,
@@ -49,6 +49,7 @@ function getServerManifest(route) {
   var apiRoutes = [],
     middlewareRoutes = [],
     pageRoutes = [],
+    allRoutes = [],
     addedMiddlewares = {},
     _iteratorNormalCompletion1 = !0,
     _didIteratorError1 = !1,
@@ -58,7 +59,8 @@ function getServerManifest(route) {
       var [path1, node] = _step1.value,
         _node_middlewares;
       if (node.type === "api") {
-        apiRoutes.push(getGeneratedNamedRouteRegex(path1, node));
+        var _$route1 = getGeneratedNamedRouteRegex(path1, node);
+        apiRoutes.push(_$route1), allRoutes.push(_$route1);
         continue;
       }
       if (!((_node_middlewares = node.middlewares) === null || _node_middlewares === void 0) && _node_middlewares.length) {
@@ -80,7 +82,8 @@ function getServerManifest(route) {
           }
         }
       }
-      pageRoutes.push(getGeneratedNamedRouteRegex(path1, node));
+      var _$route2 = getGeneratedNamedRouteRegex(path1, node);
+      pageRoutes.push(_$route2), allRoutes.push(_$route2);
     }
   } catch (err) {
     _didIteratorError1 = !0, _iteratorError1 = err;
@@ -94,7 +97,8 @@ function getServerManifest(route) {
   return {
     apiRoutes,
     middlewareRoutes,
-    pageRoutes
+    pageRoutes,
+    allRoutes
   };
 }
 function getGeneratedNamedRouteRegex(normalizedRoute, node) {

package/dist/esm/server/getServerManifest.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["getContextKey","matchGroupName","sortRoutes","isNotFoundRoute","route","dynamic","length","notFound","getServerManifest","getFlatNodes","route2","layouts","children","flatMap","child","key","type","contextKey","replace","parentSegments","route3","key2","startsWith","flat","sort","param","param1","a","b","reverse","pathToRoute","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","path","_$route","value","console","warn","err","return","apiRoutes","middlewareRoutes","pageRoutes","addedMiddlewares","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","_step1","path1","node","_node_middlewares","push","getGeneratedNamedRouteRegex","middlewares","_iteratorNormalCompletion2","_didIteratorError2","_iteratorError2","_iterator2","_step2","middleware"],"sources":["../../../src/server/getServerManifest.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["getContextKey","matchGroupName","sortRoutes","isNotFoundRoute","route","dynamic","length","notFound","getServerManifest","getFlatNodes","route2","layouts","children","flatMap","child","key","type","contextKey","replace","parentSegments","route3","key2","startsWith","join","flat","sort","param","param1","a","b","reverse","pathToRoute","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","path","_$route","value","console","warn","err","return","apiRoutes","middlewareRoutes","pageRoutes","allRoutes","addedMiddlewares","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","_step1","path1","node","_node_middlewares","_$route1","getGeneratedNamedRouteRegex","push","middlewares","_iteratorNormalCompletion2","_didIteratorError2","_iteratorError2","_iterator2","_step2","middleware","_$route2","normalizedRoute","getRouteEntry"],"sources":["../../../src/server/getServerManifest.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/server/oneServe.js

@@ -1,10 +1,15 @@
 import { default as FSExtra } from "fs-extra";
 import { extname, join } from "node:path";
-import { getServerEntry, serveStatic } from "vxrn/serve";
+import { getServerEntry } from "vxrn/serve";
 import { LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX } from "../constants";
-import { compileManifest, getURLfromRequestURL } from "../createHandleRequest";
+import {
+  compileManifest,
+  getURLfromRequestURL,
+  runMiddlewares
+} from "../createHandleRequest";
 import { getPathFromLoaderPath } from "../utils/cleanUrl";
 import { toAbsolute } from "../utils/toAbsolute";
+import { serveStaticAssets } from "vxrn";
 async function oneServe(oneOptions, buildInfo, app) {
   const { resolveAPIRoute, resolveLoaderRoute, resolvePageRoute } = await import("../createHandleRequest"), { isResponse } = await import("../utils/isResponse"), { isStatusRedirect } = await import("../utils/isStatus"), isAPIRequest = /* @__PURE__ */ new WeakMap(), redirects = oneOptions.web?.redirects;
   if (redirects)
@@ -82,21 +87,18 @@ url: ${url}`);
   };
   function createHonoHandler(route) {
     return async (context, next) => {
-      if (route.page.endsWith("/+not-found")) {
-        let didCallNext = !1;
-        const response = await serveStatic({
-          root: "./dist/client",
-          onFound: (_path, c) => {
-            c.header("Cache-Control", "public, immutable, max-age=31536000");
-          }
-        })(context, async () => {
-          didCallNext = !0;
-        });
-        if (response && !didCallNext)
-          return response;
-      }
       try {
         const request = context.req.raw;
+        if (route.page.endsWith("/+not-found") || Reflect.ownKeys(route.routeKeys).length > 0) {
+          const staticAssetResponse = await serveStaticAssets({ context });
+          if (staticAssetResponse)
+            return await runMiddlewares(
+              requestHandlers,
+              request,
+              route,
+              async () => staticAssetResponse
+            );
+        }
         if (extname(request.url) === ".js" || extname(request.url) === ".css")
           return next();
         const url = getURLfromRequestURL(request), response = await (() => {

package/dist/esm/server/oneServe.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/server/oneServe.ts"],
-  "mappings": "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",
+  "mappings": "AAAA,SAAS,WAAW,eAAe;AAGnC,SAAS,SAAS,YAAY;AAC9B,SAAS,sBAAmC;AAC5C,SAAS,4BAA4B,0BAA0B;AAC/D;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OAEK;AAEP,SAAS,6BAA6B;AACtC,SAAS,kBAAkB;AAG3B,SAAS,yBAAyB;AAElC,eAAsB,SAAS,YAA+B,WAA0B,KAAW;AACjG,QAAM,EAAE,iBAAiB,oBAAoB,iBAAiB,IAAI,MAAM,OACtE,wBACF,GACM,EAAE,WAAW,IAAI,MAAM,OAAO,qBAAqB,GACnD,EAAE,iBAAiB,IAAI,MAAM,OAAO,mBAAmB,GAEvD,eAAe,oBAAI,QAAsB,GAGzC,YAAY,WAAW,KAAK;AAClC,MAAI;AACF,eAAW,YAAY;AACrB,UAAI,IAAI,SAAS,QAAQ,CAAC,YAAY;AACpC,cAAM,iBAAiB,SAAS,YAAY,QAAQ,SAAS,CAAC,UAAU;AACtE,gBAAM,YAAY,MAAM,UAAU,CAAC;AACnC,iBAAO,QAAQ,IAAI,MAAM,SAAS,KAAK;AAAA,QACzC,CAAC;AACD,eAAO,QAAQ,SAAS,gBAAgB,SAAS,YAAY,MAAM,GAAG;AAAA,MACxE,CAAC;AAIL,MAAI,CAAC;AACH,UAAM,IAAI,MAAM,0CAA0C;AAG5D,QAAM,EAAE,kBAAkB,SAAS,IAAI,WAEjC,gBAAgB;AAAA,IACpB,GAAG;AAAA,IACH,MAAM;AAAA,EACR,GAKM,UAFQ,MAAM,OADA,eAAe,aAAa,IAG3B,QAAQ,QACvB,SAAS,WAAW,OAAO,KAAK,iBAAiB,OAEjD,kBAAmC;AAAA,IACvC,MAAM,UAAU,EAAE,MAAM,GAAG;AAOzB,aAAO,MAAM,OANG;AAAA,QACd,QAAQ,IAAI;AAAA,QACZ;AAAA,QACA;AAAA,QACA,MAAM,KAAK,QAAQ,KAAK,GAAG,EAAE,QAAQ,KAAK,GAAG,KAAK,SAAS,SAAS;AAAA,MACtE;AAAA,IAEF;AAAA,IAEA,MAAM,eAAe,OAAO;AAC1B,aAAO,MAAM,OAAO,WAAW,MAAM,UAAU;AAAA,IACjD;AAAA,IAEA,MAAM,aAAa,EAAE,SAAS,OAAO,KAAK,YAAY,GAAG;AACvD,YAAM,UAAU,MAAM,OAAO,WAAW,KAAK,MAAM,eAAe,MAAM,IAAI,CAAC,IAEvE,EAAE,OAAO,IAAI;AAEnB,UAAI,CAAC;AACH,uBAAQ,KAAK,8BAA8B,MAAM,IAAI,GAC9C;AAGT,YAAM,OAAO,MAAM,OAAO,WAAW;AAErC,aAAO,qCAAqC,KAAK,UAAU,IAAI,CAAC;AAAA,IAClE;AAAA,IAEA,MAAM,WAAW,EAAE,OAAO,KAAK,YAAY,GAAG;AAC5C,YAAMA,aAAY,iBAAiB,MAAM,IAAI;AAE7C,UAAI,MAAM,SAAS,OAAO;AACxB,YAAI,CAACA;AACH,wBAAQ,MAAM,kBAAkB,KAAK,GAC/B,IAAI;AAAA,YACR,0BAA0B,GAAG,YAAY,MAAM,IAAI;AAAA,IAAiB,OAAO,KAAK,gBAAgB,EAAE,KAAK;AAAA,GAAM,CAAC;AAAA,UAChH;AAGF,YAAI;AAEF,gBAAM,aAAa,OADF,MAAM,OAAO,WAAWA,WAAU,YAAY,IAC7B,SAAS,WAAW,GAChDC,YAAWD,WAAU,UAErB,UAAU,IAAI,QAAQ;AAC5B,kBAAQ,IAAI,gBAAgB,WAAW;AAEvC,gBAAM,WAAW,MAAM,OAAO;AAAA,YAC5B,MAAM,MAAM;AAAA,YACZ;AAAA,YACA;AAAA,YACA,MAAM,aAAa,QAAQ;AAAA,YAC3B,UAAAC;AAAA,YACA,KAAKD,WAAU;AAAA,UACjB,CAAC;AAED,iBAAO,IAAI,SAAS,UAAU;AAAA,YAC5B;AAAA,YACA,QAAQ,MAAM,aAAa,MAAM;AAAA,UACnC,CAAC;AAAA,QACH,SAAS,KAAK;AACZ,kBAAQ,MAAM,mCAAmC,MAAM,IAAI;AAAA;AAAA,EAEnE,KAAM,SAAY,GAAG;AAAA;AAAA,OAEhB,GAAG,EAAE;AAAA,QACJ;AAAA,MACF,OAAO;AACL,cAAM,WAAW,SAAS,IAAI,QAAQ,KAAK,SAASA,YAAW,SAAS;AAExE,YAAI,UAAU;AACZ,gBAAM,OAAO,MAAM,QAAQ,SAAS,KAAK,eAAe,QAAQ,GAAG,OAAO,GACpE,UAAU,IAAI,QAAQ;AAC5B,yBAAQ,IAAI,gBAAgB,WAAW,GAChC,IAAI,SAAS,MAAM,EAAE,SAAS,QAAQ,MAAM,aAAa,MAAM,IAAI,CAAC;AAAA,QAC7E;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,WAAS,kBAAkB,OAAkE;AAC3F,WAAO,OAAO,SAAS,SAAS;AAC9B,UAAI;AACF,cAAM,UAAU,QAAQ,IAAI;AAE5B,YAAI,MAAM,KAAK,SAAS,aAAa,KAAK,QAAQ,QAAQ,MAAM,SAAS,EAAE,SAAS,GAAG;AAKrF,gBAAM,sBAAsB,MAAM,kBAAkB,EAAE,QAAQ,CAAC;AAC/D,cAAI;AACF,mBAAO,MAAM;AAAA,cACX;AAAA,cACA;AAAA,cACA;AAAA,cACA,YAAY;AAAA,YACd;AAAA,QAEJ;AAIA,YAAI,QAAQ,QAAQ,GAAG,MAAM,SAAS,QAAQ,QAAQ,GAAG,MAAM;AAC7D,iBAAO,KAAK;AAGd,cAAM,MAAM,qBAAqB,OAAO,GAElC,WAAW,OAAO,MAAM;AAG5B,cAAI,IAAI,SAAS,SAAS,0BAA0B,GAAG;AACrD,kBAAM,cAAc,sBAAsB,IAAI,QAAQ,GAChD,WAAW,IAAI,IAAI,aAAa,IAAI,MAAM;AAChD,mBAAO,mBAAmB,iBAAiB,SAAS,UAAU,KAAK;AAAA,UACrE;AAEA,kBAAQ,MAAM,MAAM;AAAA,YAClB,KAAK;AACH,qBAAO,gBAAgB,iBAAiB,SAAS,KAAK,KAAK;AAAA,YAE7D,KAAK;AAAA,YACL,KAAK;AAAA,YACL,KAAK;AACH,qBAAO,iBAAiB,iBAAiB,SAAS,KAAK,KAAK;AAAA,UAEhE;AAAA,QACF,GAAG;AAEH,YAAI,UAAU;AACZ,cAAI,WAAW,QAAQ,GAAG;AAGxB,gBAAI,iBAAiB,SAAS,MAAM,GAAG;AACrC,oBAAM,WAAW,GAAG,SAAS,QAAQ,IAAI,UAAU,KAAK,EAAE;AAC1D,8BAAS,QAAQ,QAAQ,CAAC,OAAO,QAAQ;AACvC,wBAAQ,OAAO,KAAK,KAAK;AAAA,cAC3B,CAAC,GACM,QAAQ,SAAS,UAAU,SAAS,MAAM;AAAA,YACnD;AAEA,gBAAI,aAAa,IAAI,OAAO;AAC1B,kBAAI;AACF,uBACE,CAAC,SAAS,QAAQ,IAAI,eAAe,KACrC,CAAC,SAAS,QAAQ,IAAI,eAAe,KAGrC,SAAS,QAAQ,IAAI,iBAAiB,UAAU,GAE3C;AAAA,cACT,SAAS,KAAK;AACZ,wBAAQ;AAAA,kBACN,6CACE,QAAQ,IAAI,IACd,wBAAwB,SAAS,QAAQ,IAAI,eAAe,CAAC;AAAA,kBAC7D;AAAA,gBACF;AAAA,cACF;AAGF,mBAAO;AAAA,UACT;AAEA,iBAAO,KAAK;AAAA,QACd;AAAA,MACF,SAAS,KAAK;AACZ,gBAAQ,MAAM,kCAAmC,IAAY,KAAQ,EAAE;AAAA,MACzE;AAEA,aAAO,KAAK;AAAA,IACd;AAAA,EACF;AAEA,QAAM,mBAAmB,gBAAgB,UAAU,QAAQ;AAE3D,aAAW,SAAS,iBAAiB;AACnC,QAAI,IAAI,MAAM,SAAS,kBAAkB,KAAK,CAAC,GAC/C,IAAI,IAAI,MAAM,SAAS,kBAAkB,KAAK,CAAC,GAC/C,IAAI,KAAK,MAAM,SAAS,kBAAkB,KAAK,CAAC,GAChD,IAAI,OAAO,MAAM,SAAS,kBAAkB,KAAK,CAAC,GAClD,IAAI,MAAM,MAAM,SAAS,kBAAkB,KAAK,CAAC,GAE7C,MAAM,YAAY,MAAM,iBAC1B,IAAI,IAAI,MAAM,cAAc,kBAAkB,KAAK,CAAC,GACpD,IAAI,IAAI,MAAM,cAAc,kBAAkB,KAAK,CAAC,GACpD,IAAI,KAAK,MAAM,cAAc,kBAAkB,KAAK,CAAC,GACrD,IAAI,OAAO,MAAM,cAAc,kBAAkB,KAAK,CAAC,GACvD,IAAI,MAAM,MAAM,cAAc,kBAAkB,KAAK,CAAC;AAI1D,aAAW,SAAS,iBAAiB;AACnC,QAAI,IAAI,MAAM,SAAS,kBAAkB,KAAK,CAAC,GAE3C,MAAM,YAAY,MAAM,gBAC1B,IAAI,IAAI,MAAM,cAAc,kBAAkB,KAAK,CAAC;AAIxD,QAAM,EAAE,SAAS,IAAI;AAGrB,MAAI,IAAI,KAAK,OAAO,GAAG,SAAS;AAC9B,QAAI,EAAE,IAAI,KAAK,SAAS,kBAAkB,KAEpC,CAAC,SAAS,EAAE,IAAI,IAAI;AAEtB,eAAE,OAAO,gBAAgB,iBAAiB,GAC1C,EAAE,OAAO,GAAG,GACL,EAAE,KAAK,EAAE;AAIpB,QAAI,EAAE,IAAI,KAAK,SAAS,0BAA0B,GAAG;AACnD,YAAM,UAAU,EAAE,IAAI,KAChB,MAAM,qBAAqB,OAAO,GAClC,cAAc,sBAAsB,EAAE,IAAI,IAAI;AAEpD,iBAAW,SAAS,iBAAiB,YAAY;AAM/C,YALI,MAAM,SAAS,MAKf,CAAC,MAAM,cAAc,KAAK,WAAW;AACvC;AAIF,cAAM,cAAc;AAAA,UAClB,GAAG;AAAA,UACH,MAAM,MAAM,oBAAoB,EAAE,IAAI;AAAA,QACxC,GAEM,WAAW,IAAI,IAAI,aAAa,IAAI,MAAM;AAEhD,YAAI;AAEF,iBADiB,MAAM,mBAAmB,iBAAiB,SAAS,UAAU,WAAW;AAAA,QAE3F,SAAS,KAAK;AACZ,yBAAQ,MAAM,yBAAyB,GAAG,EAAE,GACrC,KAAK;AAAA,QACd;AAAA,MACF;AAAA,IACF;AAEA,WAAO,KAAK;AAAA,EACd,CAAC;AACH;",
   "names": ["buildInfo", "preloads"]
 }

package/dist/esm/server/oneServe.mjs

@@ -1,10 +1,11 @@
 import { default as FSExtra } from "fs-extra";
 import { extname, join } from "node:path";
-import { getServerEntry, serveStatic } from "vxrn/serve";
+import { getServerEntry } from "vxrn/serve";
 import { LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX } from "../constants.mjs";
-import { compileManifest, getURLfromRequestURL } from "../createHandleRequest.mjs";
+import { compileManifest, getURLfromRequestURL, runMiddlewares } from "../createHandleRequest.mjs";
 import { getPathFromLoaderPath } from "../utils/cleanUrl.mjs";
 import { toAbsolute } from "../utils/toAbsolute.mjs";
+import { serveStaticAssets } from "vxrn";
 async function oneServe(oneOptions, buildInfo, app) {
   const {
       resolveAPIRoute,
@@ -109,20 +110,14 @@ url: ${url}`);
     };
   function createHonoHandler(route) {
     return async (context, next) => {
-      if (route.page.endsWith("/+not-found")) {
-        let didCallNext = !1;
-        const response = await serveStatic({
-          root: "./dist/client",
-          onFound: (_path, c) => {
-            c.header("Cache-Control", "public, immutable, max-age=31536000");
-          }
-        })(context, async () => {
-          didCallNext = !0;
-        });
-        if (response && !didCallNext) return response;
-      }
       try {
         const request = context.req.raw;
+        if (route.page.endsWith("/+not-found") || Reflect.ownKeys(route.routeKeys).length > 0) {
+          const staticAssetResponse = await serveStaticAssets({
+            context
+          });
+          if (staticAssetResponse) return await runMiddlewares(requestHandlers, request, route, async () => staticAssetResponse);
+        }
         if (extname(request.url) === ".js" || extname(request.url) === ".css") return next();
         const url = getURLfromRequestURL(request),
           response = await (() => {

package/dist/esm/server/oneServe.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["default","FSExtra","extname","join","getServerEntry","serveStatic","LOADER_JS_POSTFIX_UNCACHED","PRELOAD_JS_POSTFIX","compileManifest","getURLfromRequestURL","getPathFromLoaderPath","toAbsolute","oneServe","oneOptions","buildInfo","app","resolveAPIRoute","resolveLoaderRoute","resolvePageRoute","isResponse","isStatusRedirect","isAPIRequest","WeakMap","redirects","web","redirect","get","source","context","destinationUrl","destination","replace","param","paramName","substring","req","permanent","Error","routeToBuildInfo","routeMap","serverOptions","root","render","apiCJS","build","api","outputFormat","requestHandlers","handleAPI","route","process","cwd","page","loadMiddleware","contextKey","handleLoader","request","url","loaderProps","exports","file","loader","console","warn","json","JSON","stringify","handlePage","buildInfo2","type","error","Object","keys","loaderData","serverJsPath","preloads2","preloads","headers","Headers","set","rendered","mode","path","css","Response","status","isNotFound","err","stack","htmlPath","pathname","cleanPath","html","readFile","createHonoHandler","next","endsWith","didCallNext","response","onFound","_path","c","header","raw","originalUrl","finalUrl","URL","origin","location","forEach","value","key","has","info","compiledManifest","manifest","apiRoutes","urlPath","put","post","delete","patch","urlCleanPath","pageRoutes","body","compiledRegex","test","loaderRoute","loaderServerPath"],"sources":["../../../src/server/oneServe.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["default","FSExtra","extname","join","getServerEntry","LOADER_JS_POSTFIX_UNCACHED","PRELOAD_JS_POSTFIX","compileManifest","getURLfromRequestURL","runMiddlewares","getPathFromLoaderPath","toAbsolute","serveStaticAssets","oneServe","oneOptions","buildInfo","app","resolveAPIRoute","resolveLoaderRoute","resolvePageRoute","isResponse","isStatusRedirect","isAPIRequest","WeakMap","redirects","web","redirect","get","source","context","destinationUrl","destination","replace","param","paramName","substring","req","permanent","Error","routeToBuildInfo","routeMap","serverOptions","root","render","apiCJS","build","api","outputFormat","requestHandlers","handleAPI","route","process","cwd","page","loadMiddleware","contextKey","handleLoader","request","url","loaderProps","exports","file","loader","console","warn","json","JSON","stringify","handlePage","buildInfo2","type","error","Object","keys","loaderData","serverJsPath","preloads2","preloads","headers","Headers","set","rendered","mode","path","css","Response","status","isNotFound","err","stack","htmlPath","pathname","cleanPath","html","readFile","createHonoHandler","next","raw","endsWith","Reflect","ownKeys","routeKeys","length","staticAssetResponse","response","originalUrl","finalUrl","URL","origin","location","forEach","value","key","header","has","info","compiledManifest","manifest","apiRoutes","urlPath","put","post","delete","patch","urlCleanPath","pageRoutes","c","body","compiledRegex","test","loaderRoute","loaderServerPath"],"sources":["../../../src/server/oneServe.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/server/oneServe.native.js

@@ -1,10 +1,11 @@
 import { default as FSExtra } from "fs-extra";
 import { extname, join } from "node:path";
-import { getServerEntry, serveStatic } from "vxrn/serve";
+import { getServerEntry } from "vxrn/serve";
 import { LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX } from "../constants.native.js";
-import { compileManifest, getURLfromRequestURL } from "../createHandleRequest.native.js";
+import { compileManifest, getURLfromRequestURL, runMiddlewares } from "../createHandleRequest.native.js";
 import { getPathFromLoaderPath } from "../utils/cleanUrl.native.js";
 import { toAbsolute } from "../utils/toAbsolute.native.js";
+import { serveStaticAssets } from "vxrn";
 async function oneServe(oneOptions, buildInfo, app) {
   var _oneOptions_web,
     _oneOptions_build_api,
@@ -139,23 +140,19 @@ url: ${url}`);
     };
   function createHonoHandler(route2) {
     return async function (context, next) {
-      if (route2.page.endsWith("/+not-found")) {
-        var didCallNext = !1,
-          response = await serveStatic({
-            root: "./dist/client",
-            onFound: function (_path, c) {
-              c.header("Cache-Control", "public, immutable, max-age=31536000");
-            }
-          })(context, async function () {
-            didCallNext = !0;
-          });
-        if (response && !didCallNext) return response;
-      }
       try {
         var request = context.req.raw;
+        if (route2.page.endsWith("/+not-found") || Reflect.ownKeys(route2.routeKeys).length > 0) {
+          var staticAssetResponse = await serveStaticAssets({
+            context
+          });
+          if (staticAssetResponse) return await runMiddlewares(requestHandlers, request, route2, async function () {
+            return staticAssetResponse;
+          });
+        }
         if (extname(request.url) === ".js" || extname(request.url) === ".css") return next();
         var url = getURLfromRequestURL(request),
-          response1 = await function () {
+          response = await function () {
             if (url.pathname.endsWith(LOADER_JS_POSTFIX_UNCACHED)) {
               var originalUrl = getPathFromLoaderPath(url.pathname),
                 finalUrl = new URL(originalUrl, url.origin);
@@ -170,20 +167,20 @@ url: ${url}`);
                 return resolvePageRoute(requestHandlers, request, url, route2);
             }
           }();
-        if (response1) {
-          if (isResponse(response1)) {
-            if (isStatusRedirect(response1.status)) {
-              var location = `${response1.headers.get("location") || ""}`;
-              return response1.headers.forEach(function (value, key) {
+        if (response) {
+          if (isResponse(response)) {
+            if (isStatusRedirect(response.status)) {
+              var location = `${response.headers.get("location") || ""}`;
+              return response.headers.forEach(function (value, key) {
                 context.header(key, value);
-              }), context.redirect(location, response1.status);
+              }), context.redirect(location, response.status);
             }
             if (isAPIRequest.get(request)) try {
-              return !response1.headers.has("cache-control") && !response1.headers.has("Cache-Control") && response1.headers.set("cache-control", "no-store"), response1;
+              return !response.headers.has("cache-control") && !response.headers.has("Cache-Control") && response.headers.set("cache-control", "no-store"), response;
             } catch (err) {
-              console.info(`Error updating cache header on api route "${context.req.path}" to no-store, it is ${response1.headers.get("cache-control")}, continue`, err);
+              console.info(`Error updating cache header on api route "${context.req.path}" to no-store, it is ${response.headers.get("cache-control")}, continue`, err);
             }
-            return response1;
+            return response;
           }
           return next();
         }

package/dist/esm/server/oneServe.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["default","FSExtra","extname","join","getServerEntry","serveStatic","LOADER_JS_POSTFIX_UNCACHED","PRELOAD_JS_POSTFIX","compileManifest","getURLfromRequestURL","getPathFromLoaderPath","toAbsolute","oneServe","oneOptions","buildInfo","app","_oneOptions_web","_oneOptions_build_api","_oneOptions_build","resolveAPIRoute","resolveLoaderRoute","resolvePageRoute","isResponse","isStatusRedirect","isAPIRequest","WeakMap","redirects","web","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_loop","redirect","_step","value","get","source","context","destinationUrl","destination","replace","param","paramName","substring","req","permanent","_iterator","Symbol","iterator","next","done","err","return","Error","routeToBuildInfo","routeMap","serverOptions","root","entryServer","entry","render","apiCJS","build","api","outputFormat","requestHandlers","handleAPI","route","route2","apiFile","process","cwd","page","loadMiddleware","contextKey","handleLoader","request","url","loaderProps","exports","file","loader","console","warn","json","JSON","stringify","handlePage","_$buildInfo","type","error","Object","keys","_exported_loader","exported","serverJsPath","loaderData","call","preloads2","preloads","headers","Headers","set","rendered","mode","path","css","Response","status","isNotFound","_err_stack","stack","htmlPath","pathname","cleanPath","html","readFile","headers1","createHonoHandler","endsWith","didCallNext","response","onFound","_path","c","header","raw","response1","originalUrl","finalUrl","URL","origin","location","forEach","key","has","info","compiledManifest","manifest","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","apiRoutes","_step1","urlPath","put","post","delete","patch","urlCleanPath","_iteratorNormalCompletion2","_didIteratorError2","_iteratorError2","_iterator2","pageRoutes","_step2"],"sources":["../../../src/server/oneServe.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["default","FSExtra","extname","join","getServerEntry","LOADER_JS_POSTFIX_UNCACHED","PRELOAD_JS_POSTFIX","compileManifest","getURLfromRequestURL","runMiddlewares","getPathFromLoaderPath","toAbsolute","serveStaticAssets","oneServe","oneOptions","buildInfo","app","_oneOptions_web","_oneOptions_build_api","_oneOptions_build","resolveAPIRoute","resolveLoaderRoute","resolvePageRoute","isResponse","isStatusRedirect","isAPIRequest","WeakMap","redirects","web","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_loop","redirect","_step","value","get","source","context","destinationUrl","destination","replace","param","paramName","substring","req","permanent","_iterator","Symbol","iterator","next","done","err","return","Error","routeToBuildInfo","routeMap","serverOptions","root","entryServer","entry","render","apiCJS","build","api","outputFormat","requestHandlers","handleAPI","route","route2","apiFile","process","cwd","page","loadMiddleware","contextKey","handleLoader","request","url","loaderProps","exports","file","loader","console","warn","json","JSON","stringify","handlePage","_$buildInfo","type","error","Object","keys","_exported_loader","exported","serverJsPath","loaderData","call","preloads2","preloads","headers","Headers","set","rendered","mode","path","css","Response","status","isNotFound","_err_stack","stack","htmlPath","pathname","cleanPath","html","readFile","headers1","createHonoHandler","raw","endsWith","Reflect","ownKeys","routeKeys","length","staticAssetResponse","response","originalUrl","finalUrl","URL","origin","location","forEach","key","header","has","info","compiledManifest","manifest","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","apiRoutes","_step1","urlPath","put","post","delete","patch","urlCleanPath","_iteratorNormalCompletion2","_didIteratorError2","_iteratorError2","_iterator2","pageRoutes","_step2","route1"],"sources":["../../../src/server/oneServe.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}