one 1.1.479 → 1.1.481
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/Root.cjs +1 -1
- package/dist/cjs/Root.js +1 -1
- package/dist/cjs/Root.js.map +1 -1
- package/dist/cjs/Root.native.js +1 -1
- package/dist/cjs/Root.native.js.map +2 -2
- package/dist/cjs/cli/build.cjs +28 -8
- package/dist/cjs/cli/build.js +29 -10
- package/dist/cjs/cli/build.js.map +1 -1
- package/dist/cjs/cli/build.native.js +60 -24
- package/dist/cjs/cli/build.native.js.map +2 -2
- package/dist/cjs/createApp.cjs +3 -1
- package/dist/cjs/createApp.js +3 -1
- package/dist/cjs/createApp.js.map +1 -1
- package/dist/cjs/createApp.native.js +1 -0
- package/dist/cjs/createApp.native.js.map +2 -2
- package/dist/cjs/createHandleRequest.cjs +6 -2
- package/dist/cjs/createHandleRequest.js +2 -2
- package/dist/cjs/createHandleRequest.js.map +1 -1
- package/dist/cjs/createHandleRequest.native.js +4 -2
- package/dist/cjs/createHandleRequest.native.js.map +2 -2
- package/dist/cjs/router/useViteRoutes.cjs +6 -6
- package/dist/cjs/router/useViteRoutes.js +6 -6
- package/dist/cjs/router/useViteRoutes.js.map +1 -1
- package/dist/cjs/router/useViteRoutes.native.js +6 -6
- package/dist/cjs/router/useViteRoutes.native.js.map +2 -2
- package/dist/cjs/server/getServerManifest.cjs +20 -8
- package/dist/cjs/server/getServerManifest.js +15 -14
- package/dist/cjs/server/getServerManifest.js.map +1 -1
- package/dist/cjs/server/getServerManifest.native.js +19 -4
- package/dist/cjs/server/getServerManifest.native.js.map +2 -2
- package/dist/cjs/server/oneServe.cjs +14 -2
- package/dist/cjs/server/oneServe.js +15 -2
- package/dist/cjs/server/oneServe.js.map +1 -1
- package/dist/cjs/server/oneServe.native.js +24 -12
- package/dist/cjs/server/oneServe.native.js.map +2 -2
- package/dist/cjs/typed-routes/generateRouteTypes.cjs +3 -3
- package/dist/cjs/typed-routes/generateRouteTypes.js +2 -2
- package/dist/cjs/typed-routes/generateRouteTypes.js.map +1 -1
- package/dist/cjs/typed-routes/generateRouteTypes.native.js +3 -3
- package/dist/cjs/typed-routes/generateRouteTypes.native.js.map +2 -2
- package/dist/cjs/utils/getRouterRootFromOneOptions.cjs +28 -0
- package/dist/cjs/utils/getRouterRootFromOneOptions.js +23 -0
- package/dist/cjs/utils/getRouterRootFromOneOptions.js.map +6 -0
- package/dist/cjs/utils/getRouterRootFromOneOptions.native.js +29 -0
- package/dist/cjs/utils/getRouterRootFromOneOptions.native.js.map +6 -0
- package/dist/cjs/vercel/build/buildVercelOutputDirectory.cjs +1 -1
- package/dist/cjs/vercel/build/buildVercelOutputDirectory.js +5 -0
- package/dist/cjs/vercel/build/buildVercelOutputDirectory.js.map +1 -1
- package/dist/cjs/vercel/build/buildVercelOutputDirectory.native.js +1 -1
- package/dist/cjs/vercel/build/buildVercelOutputDirectory.native.js.map +2 -2
- package/dist/cjs/vercel/build/generate/createSsrServerlessFunction.cjs +11 -3
- package/dist/cjs/vercel/build/generate/createSsrServerlessFunction.js +11 -3
- package/dist/cjs/vercel/build/generate/createSsrServerlessFunction.js.map +1 -1
- package/dist/cjs/vercel/build/generate/createSsrServerlessFunction.native.js +11 -3
- package/dist/cjs/vercel/build/generate/createSsrServerlessFunction.native.js.map +1 -1
- package/dist/cjs/vite/getManifest.cjs +4 -2
- package/dist/cjs/vite/getManifest.js +2 -2
- package/dist/cjs/vite/getManifest.js.map +1 -1
- package/dist/cjs/vite/getManifest.native.js +2 -2
- package/dist/cjs/vite/getManifest.native.js.map +2 -2
- package/dist/cjs/vite/one.cjs +5 -3
- package/dist/cjs/vite/one.js +3 -3
- package/dist/cjs/vite/one.js.map +1 -1
- package/dist/cjs/vite/one.native.js +3 -3
- package/dist/cjs/vite/one.native.js.map +2 -2
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.cjs +10 -6
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.js +8 -7
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.js.map +1 -1
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.native.js +9 -6
- package/dist/cjs/vite/plugins/fileSystemRouterPlugin.native.js.map +2 -2
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.cjs +6 -4
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.js +4 -4
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.js.map +1 -1
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.native.js +4 -4
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.native.js.map +2 -2
- package/dist/cjs/vite/plugins/virtualEntryPlugin.cjs +4 -2
- package/dist/cjs/vite/plugins/virtualEntryPlugin.js +4 -2
- package/dist/cjs/vite/plugins/virtualEntryPlugin.js.map +1 -1
- package/dist/cjs/vite/plugins/virtualEntryPlugin.native.js +4 -2
- package/dist/cjs/vite/plugins/virtualEntryPlugin.native.js.map +1 -1
- package/dist/cjs/vite/types.native.js.map +1 -1
- package/dist/esm/Root.js +1 -1
- package/dist/esm/Root.js.map +1 -1
- package/dist/esm/Root.mjs +1 -1
- package/dist/esm/Root.mjs.map +1 -1
- package/dist/esm/Root.native.js +1 -1
- package/dist/esm/Root.native.js.map +1 -1
- package/dist/esm/cli/build.js +29 -9
- package/dist/esm/cli/build.js.map +1 -1
- package/dist/esm/cli/build.mjs +28 -8
- package/dist/esm/cli/build.mjs.map +1 -1
- package/dist/esm/cli/build.native.js +60 -24
- package/dist/esm/cli/build.native.js.map +1 -1
- package/dist/esm/createApp.js +3 -1
- package/dist/esm/createApp.js.map +1 -1
- package/dist/esm/createApp.mjs +3 -1
- package/dist/esm/createApp.mjs.map +1 -1
- package/dist/esm/createApp.native.js +1 -0
- package/dist/esm/createApp.native.js.map +1 -1
- package/dist/esm/createHandleRequest.js +2 -2
- package/dist/esm/createHandleRequest.js.map +1 -1
- package/dist/esm/createHandleRequest.mjs +6 -2
- package/dist/esm/createHandleRequest.mjs.map +1 -1
- package/dist/esm/createHandleRequest.native.js +7 -2
- package/dist/esm/createHandleRequest.native.js.map +1 -1
- package/dist/esm/router/useViteRoutes.js +6 -6
- package/dist/esm/router/useViteRoutes.js.map +1 -1
- package/dist/esm/router/useViteRoutes.mjs +6 -6
- package/dist/esm/router/useViteRoutes.mjs.map +1 -1
- package/dist/esm/router/useViteRoutes.native.js +6 -6
- package/dist/esm/router/useViteRoutes.native.js.map +1 -1
- package/dist/esm/server/getServerManifest.js +15 -14
- package/dist/esm/server/getServerManifest.js.map +1 -1
- package/dist/esm/server/getServerManifest.mjs +20 -8
- package/dist/esm/server/getServerManifest.mjs.map +1 -1
- package/dist/esm/server/getServerManifest.native.js +21 -4
- package/dist/esm/server/getServerManifest.native.js.map +1 -1
- package/dist/esm/server/oneServe.js +16 -3
- package/dist/esm/server/oneServe.js.map +1 -1
- package/dist/esm/server/oneServe.mjs +15 -3
- package/dist/esm/server/oneServe.mjs.map +1 -1
- package/dist/esm/server/oneServe.native.js +25 -13
- package/dist/esm/server/oneServe.native.js.map +1 -1
- package/dist/esm/typed-routes/generateRouteTypes.js +2 -2
- package/dist/esm/typed-routes/generateRouteTypes.js.map +1 -1
- package/dist/esm/typed-routes/generateRouteTypes.mjs +3 -3
- package/dist/esm/typed-routes/generateRouteTypes.mjs.map +1 -1
- package/dist/esm/typed-routes/generateRouteTypes.native.js +3 -3
- package/dist/esm/typed-routes/generateRouteTypes.native.js.map +1 -1
- package/dist/esm/utils/getRouterRootFromOneOptions.js +7 -0
- package/dist/esm/utils/getRouterRootFromOneOptions.js.map +6 -0
- package/dist/esm/utils/getRouterRootFromOneOptions.mjs +5 -0
- package/dist/esm/utils/getRouterRootFromOneOptions.mjs.map +1 -0
- package/dist/esm/utils/getRouterRootFromOneOptions.native.js +6 -0
- package/dist/esm/utils/getRouterRootFromOneOptions.native.js.map +1 -0
- package/dist/esm/vercel/build/buildVercelOutputDirectory.js +5 -0
- package/dist/esm/vercel/build/buildVercelOutputDirectory.js.map +1 -1
- package/dist/esm/vercel/build/buildVercelOutputDirectory.mjs +1 -1
- package/dist/esm/vercel/build/buildVercelOutputDirectory.mjs.map +1 -1
- package/dist/esm/vercel/build/buildVercelOutputDirectory.native.js +1 -1
- package/dist/esm/vercel/build/buildVercelOutputDirectory.native.js.map +1 -1
- package/dist/esm/vercel/build/generate/createSsrServerlessFunction.js +11 -3
- package/dist/esm/vercel/build/generate/createSsrServerlessFunction.js.map +1 -1
- package/dist/esm/vercel/build/generate/createSsrServerlessFunction.mjs +11 -3
- package/dist/esm/vercel/build/generate/createSsrServerlessFunction.mjs.map +1 -1
- package/dist/esm/vercel/build/generate/createSsrServerlessFunction.native.js +11 -3
- package/dist/esm/vercel/build/generate/createSsrServerlessFunction.native.js.map +1 -1
- package/dist/esm/vite/getManifest.js +2 -2
- package/dist/esm/vite/getManifest.js.map +1 -1
- package/dist/esm/vite/getManifest.mjs +4 -2
- package/dist/esm/vite/getManifest.mjs.map +1 -1
- package/dist/esm/vite/getManifest.native.js +5 -2
- package/dist/esm/vite/getManifest.native.js.map +1 -1
- package/dist/esm/vite/one.js +3 -2
- package/dist/esm/vite/one.js.map +1 -1
- package/dist/esm/vite/one.mjs +5 -3
- package/dist/esm/vite/one.mjs.map +1 -1
- package/dist/esm/vite/one.native.js +5 -3
- package/dist/esm/vite/one.native.js.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.js +8 -6
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.js.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.mjs +9 -5
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.mjs.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.native.js +9 -5
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.native.js.map +1 -1
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.js +4 -3
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.js.map +1 -1
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.mjs +5 -3
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.mjs.map +1 -1
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.native.js +5 -3
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.native.js.map +1 -1
- package/dist/esm/vite/plugins/virtualEntryPlugin.js +4 -2
- package/dist/esm/vite/plugins/virtualEntryPlugin.js.map +1 -1
- package/dist/esm/vite/plugins/virtualEntryPlugin.mjs +4 -2
- package/dist/esm/vite/plugins/virtualEntryPlugin.mjs.map +1 -1
- package/dist/esm/vite/plugins/virtualEntryPlugin.native.js +4 -2
- package/dist/esm/vite/plugins/virtualEntryPlugin.native.js.map +1 -1
- package/package.json +10 -10
- package/src/Root.tsx +2 -1
- package/src/cli/build.ts +35 -10
- package/src/createApp.native.tsx +8 -6
- package/src/createApp.tsx +5 -1
- package/src/createHandleRequest.ts +2 -2
- package/src/router/useViteRoutes.tsx +6 -4
- package/src/server/getServerManifest.ts +12 -4
- package/src/server/oneServe.ts +30 -1
- package/src/typed-routes/generateRouteTypes.ts +3 -3
- package/src/utils/getRouterRootFromOneOptions.ts +5 -0
- package/src/vercel/build/buildVercelOutputDirectory.ts +9 -0
- package/src/vercel/build/generate/createSsrServerlessFunction.ts +11 -3
- package/src/vite/getManifest.ts +2 -2
- package/src/vite/one.ts +4 -1
- package/src/vite/plugins/fileSystemRouterPlugin.tsx +8 -6
- package/src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx +6 -3
- package/src/vite/plugins/virtualEntryPlugin.ts +4 -2
- package/src/vite/types.ts +7 -0
- package/types/Root.d.ts +1 -0
- package/types/Root.d.ts.map +1 -1
- package/types/cli/build.d.ts.map +1 -1
- package/types/createApp.d.ts +1 -0
- package/types/createApp.d.ts.map +1 -1
- package/types/createApp.native.d.ts +1 -5
- package/types/createApp.native.d.ts.map +1 -1
- package/types/createHandleRequest.d.ts +3 -1
- package/types/createHandleRequest.d.ts.map +1 -1
- package/types/router/useViteRoutes.d.ts +3 -3
- package/types/router/useViteRoutes.d.ts.map +1 -1
- package/types/server/getServerManifest.d.ts.map +1 -1
- package/types/server/oneServe.d.ts.map +1 -1
- package/types/typed-routes/generateRouteTypes.d.ts +1 -1
- package/types/typed-routes/generateRouteTypes.d.ts.map +1 -1
- package/types/utils/getRouterRootFromOneOptions.d.ts +3 -0
- package/types/utils/getRouterRootFromOneOptions.d.ts.map +1 -0
- package/types/vercel/build/buildVercelOutputDirectory.d.ts.map +1 -1
- package/types/vercel/build/generate/createSsrServerlessFunction.d.ts.map +1 -1
- package/types/vite/getManifest.d.ts +3 -1
- package/types/vite/getManifest.d.ts.map +1 -1
- package/types/vite/one.d.ts.map +1 -1
- package/types/vite/plugins/fileSystemRouterPlugin.d.ts.map +1 -1
- package/types/vite/plugins/generateFileSystemRouteTypesPlugin.d.ts.map +1 -1
- package/types/vite/plugins/virtualEntryPlugin.d.ts.map +1 -1
- package/types/vite/types.d.ts +7 -0
- package/types/vite/types.d.ts.map +1 -1
- package/vendor/react-dom/package.json +1 -1
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["LOADER_JS_POSTFIX_UNCACHED","getPathFromLoaderPath","isResponse","getManifest","resolveAPIEndpoint","resolveResponse","runMiddlewares","handlers","request","route","getResponse","middlewares","length","loadMiddleware","Error","context","dispatch","index","_this","middlewareModule","exported","default","contextKey","next","response","resolveAPIRoute","url","pathname","params","getRouteParams","handleAPI","loaderProps","path","err","process","env","NODE_ENV","console","error","resolveLoaderRoute","headers","Headers","set","loaderResponse","handleLoader","type","getLoaderParams","Response","resolvePageRoute","search","resolved","handlePage","getURLfromRequestURL","urlString","URL","get","compileRouteRegex","compiledRegex","RegExp","namedRegex","compileManifest","manifest","pageRoutes","map","apiRoutes","createHandleRequest","compiledManifest","handler","startsWith","apiRoute","find","route2","test","method","isClientRequestingNewRoute","endsWith","originalUrl","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","done","value","file","finalUrl","origin","return","routes"],"sources":["../../src/createHandleRequest.ts"],"sourcesContent":[null],"mappings":"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
|
1
|
+
{"version":3,"names":["LOADER_JS_POSTFIX_UNCACHED","getPathFromLoaderPath","isResponse","getManifest","resolveAPIEndpoint","resolveResponse","runMiddlewares","handlers","request","route","getResponse","middlewares","length","loadMiddleware","Error","context","dispatch","index","_this","middlewareModule","exported","default","contextKey","next","response","resolveAPIRoute","url","pathname","params","getRouteParams","handleAPI","loaderProps","path","err","process","env","NODE_ENV","console","error","resolveLoaderRoute","headers","Headers","set","loaderResponse","handleLoader","type","getLoaderParams","Response","resolvePageRoute","search","resolved","handlePage","getURLfromRequestURL","urlString","URL","get","compileRouteRegex","compiledRegex","RegExp","namedRegex","compileManifest","manifest","pageRoutes","map","apiRoutes","createHandleRequest","param","routerRoot","compiledManifest","handler","startsWith","apiRoute","find","route2","test","method","isClientRequestingNewRoute","endsWith","originalUrl","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","done","value","file","finalUrl","origin","return","routes"],"sources":["../../src/createHandleRequest.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
@@ -1,18 +1,18 @@
|
|
1
1
|
let lastVersion = 0, context;
|
2
|
-
function useViteRoutes(routes, options, version) {
|
3
|
-
return version && version > lastVersion && (context = null, lastVersion = version), context || loadRoutes(routes, options), context;
|
2
|
+
function useViteRoutes(routes, routerRoot, options, version) {
|
3
|
+
return version && version > lastVersion && (context = null, lastVersion = version), context || loadRoutes(routes, routerRoot, options), context;
|
4
4
|
}
|
5
|
-
function loadRoutes(paths, options) {
|
6
|
-
return context || (globalThis.__importMetaGlobbed = paths, context = globbedRoutesToRouteContext(paths, options), context);
|
5
|
+
function loadRoutes(paths, routerRoot, options) {
|
6
|
+
return context || (globalThis.__importMetaGlobbed = paths, context = globbedRoutesToRouteContext(paths, routerRoot, options), context);
|
7
7
|
}
|
8
|
-
function globbedRoutesToRouteContext(paths, options) {
|
8
|
+
function globbedRoutesToRouteContext(paths, routerRoot, options) {
|
9
9
|
const routesSync = {}, promises = {}, loadedRoutes = {}, clears = {};
|
10
10
|
Object.keys(paths).map((path) => {
|
11
11
|
if (!paths[path]) {
|
12
12
|
console.error(`Error: Missing route at path ${path}`);
|
13
13
|
return;
|
14
14
|
}
|
15
|
-
const loadRouteFunction = paths[path], pathWithoutRelative = path.replace(
|
15
|
+
const loadRouteFunction = paths[path], pathWithoutRelative = path.replace(`/${routerRoot}/`, "./"), originalPath = pathWithoutRelative.slice(1).replace(/\.[jt]sx?$/, "");
|
16
16
|
options?.routeModes?.[originalPath] === "spa" ? (console.info(`Spa mode: ${originalPath}`), loadedRoutes[pathWithoutRelative] = () => null) : routesSync[pathWithoutRelative] = loadRouteFunction;
|
17
17
|
});
|
18
18
|
const moduleKeys = Object.keys(routesSync);
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../src/router/useViteRoutes.tsx"],
|
4
|
-
"mappings": "AAKA,IAAI,cAAc,GACd;AAGG,SAAS,cACd,QACA,SACA,SACA;AACA,SAAI,WAAW,UAAU,gBAEvB,UAAU,MACV,cAAc,UAGX,WACH,WAAW,QAAQ,OAAO,
|
4
|
+
"mappings": "AAKA,IAAI,cAAc,GACd;AAGG,SAAS,cACd,QACA,YACA,SACA,SACA;AACA,SAAI,WAAW,UAAU,gBAEvB,UAAU,MACV,cAAc,UAGX,WACH,WAAW,QAAQ,YAAY,OAAO,GAGjC;AACT;AAEO,SAAS,WAAW,OAA4B,YAAoB,SAA4B;AACrG,SAAI,YACJ,WAAW,sBAAyB,OACpC,UAAU,4BAA4B,OAAO,YAAY,OAAO,GACzD;AACT;AAEO,SAAS,4BACd,OACA,YACA,SACkB;AAElB,QAAM,aAAa,CAAC,GACd,WAAW,CAAC,GACZ,eAAe,CAAC,GAChB,SAAS,CAAC;AAEhB,SAAO,KAAK,KAAK,EAAE,IAAI,CAAC,SAAS;AAC/B,QAAI,CAAC,MAAM,IAAI,GAAG;AAChB,cAAQ,MAAM,gCAAgC,IAAI,EAAE;AACpD;AAAA,IACF;AACA,UAAM,oBAAoB,MAAM,IAAI,GAC9B,sBAAsB,KAAK,QAAQ,IAAI,UAAU,KAAK,IAAI,GAE1D,eAAe,oBAAoB,MAAM,CAAC,EAAE,QAAQ,cAAc,EAAE;AAC1E,IAAI,SAAS,aAAa,YAAY,MAAM,SAC1C,QAAQ,KAAK,aAAa,YAAY,EAAE,GAExC,aAAa,mBAAmB,IAAI,MAC3B,QAGT,WAAW,mBAAmB,IAAI;AAAA,EAEtC,CAAC;AAED,QAAM,aAAa,OAAO,KAAK,UAAU;AAEzC,WAAS,QAAQ,IAAY;AAG3B,QAFA,aAAa,OAAO,EAAE,CAAC,GAEnB,aAAa,EAAE;AACjB,aAAO,aAAa,EAAE;AAGxB,QAAI,OAAO,WAAW,EAAE,KAAM;AAC5B,aAAO,WAAW,EAAE;AAGtB,UAAK,SAAS,EAAE,MACd,SAAS,EAAE,IAAI,WAAW,EAAE,EAAE,EAC3B,KAAK,CAAC,SACL,aAAa,EAAE,IAAI,KACnB,OAAO,SAAS,EAAE,GAGlB,OAAO,EAAE,IAAI,WAAW,MAAM;AAC5B,aAAO,aAAa,EAAE;AAAA,IACxB,GAAG,GAAG,GAEC,IACR,EACA,MAAM,CAAC,QAAQ;AACd,cAAQ,MAAM,uBAAuB,IAAI,KAAK,IAAI,MAAM,EAAE,KAAK,GAC/D,aAAa,EAAE,IAAI;AAAA,QACjB,SAAS,MAAM;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,MAkBjB,GACA,OAAO,SAAS,EAAE;AAAA,IACpB,CAAC,GAEC,QAAQ,IAAI,aAAa,kBAC3B,SAAS,EAAE,EAAE,QAAQ,IAAI,MAAM,EAAE,SAO/B,SAAS,EAAE;AAAA,EACnB;AAEA,iBAAQ,OAAO,MAAM,YACrB,QAAQ,KAAK,IACb,QAAQ,UAAU,CAAC,OAAe,IAE3B;AACT;",
|
5
5
|
"names": []
|
6
6
|
}
|
@@ -1,12 +1,12 @@
|
|
1
1
|
let lastVersion = 0,
|
2
2
|
context;
|
3
|
-
function useViteRoutes(routes, options, version) {
|
4
|
-
return version && version > lastVersion && (context = null, lastVersion = version), context || loadRoutes(routes, options), context;
|
3
|
+
function useViteRoutes(routes, routerRoot, options, version) {
|
4
|
+
return version && version > lastVersion && (context = null, lastVersion = version), context || loadRoutes(routes, routerRoot, options), context;
|
5
5
|
}
|
6
|
-
function loadRoutes(paths, options) {
|
7
|
-
return context || (globalThis.__importMetaGlobbed = paths, context = globbedRoutesToRouteContext(paths, options), context);
|
6
|
+
function loadRoutes(paths, routerRoot, options) {
|
7
|
+
return context || (globalThis.__importMetaGlobbed = paths, context = globbedRoutesToRouteContext(paths, routerRoot, options), context);
|
8
8
|
}
|
9
|
-
function globbedRoutesToRouteContext(paths, options) {
|
9
|
+
function globbedRoutesToRouteContext(paths, routerRoot, options) {
|
10
10
|
const routesSync = {},
|
11
11
|
promises = {},
|
12
12
|
loadedRoutes = {},
|
@@ -17,7 +17,7 @@ function globbedRoutesToRouteContext(paths, options) {
|
|
17
17
|
return;
|
18
18
|
}
|
19
19
|
const loadRouteFunction = paths[path],
|
20
|
-
pathWithoutRelative = path.replace(
|
20
|
+
pathWithoutRelative = path.replace(`/${routerRoot}/`, "./"),
|
21
21
|
originalPath = pathWithoutRelative.slice(1).replace(/\.[jt]sx?$/, "");
|
22
22
|
options?.routeModes?.[originalPath] === "spa" ? (console.info(`Spa mode: ${originalPath}`), loadedRoutes[pathWithoutRelative] = () => null) : routesSync[pathWithoutRelative] = loadRouteFunction;
|
23
23
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["lastVersion","context","useViteRoutes","routes","options","version","loadRoutes","paths","globalThis","__importMetaGlobbed","globbedRoutesToRouteContext","routesSync","promises","loadedRoutes","clears","Object","keys","map","path","console","error","loadRouteFunction","pathWithoutRelative","replace","originalPath","slice","routeModes","info","moduleKeys","resolve","id","clearTimeout","then","val","setTimeout","catch","err","Error","stack","default","process","env","NODE_ENV"],"sources":["../../../src/router/useViteRoutes.tsx"],"sourcesContent":[null],"mappings":"AAKA,IAAIA,WAAA,GAAc;EACdC,OAAA;AAGG,SAASC,cACdC,MAAA,EACAC,OAAA,EACAC,OAAA,EACA;EACA,OAAIA,OAAA,IAAWA,OAAA,
|
1
|
+
{"version":3,"names":["lastVersion","context","useViteRoutes","routes","routerRoot","options","version","loadRoutes","paths","globalThis","__importMetaGlobbed","globbedRoutesToRouteContext","routesSync","promises","loadedRoutes","clears","Object","keys","map","path","console","error","loadRouteFunction","pathWithoutRelative","replace","originalPath","slice","routeModes","info","moduleKeys","resolve","id","clearTimeout","then","val","setTimeout","catch","err","Error","stack","default","process","env","NODE_ENV"],"sources":["../../../src/router/useViteRoutes.tsx"],"sourcesContent":[null],"mappings":"AAKA,IAAIA,WAAA,GAAc;EACdC,OAAA;AAGG,SAASC,cACdC,MAAA,EACAC,UAAA,EACAC,OAAA,EACAC,OAAA,EACA;EACA,OAAIA,OAAA,IAAWA,OAAA,GAAUN,WAAA,KAEvBC,OAAA,GAAU,MACVD,WAAA,GAAcM,OAAA,GAGXL,OAAA,IACHM,UAAA,CAAWJ,MAAA,EAAQC,UAAA,EAAYC,OAAO,GAGjCJ,OAAA;AACT;AAEO,SAASM,WAAWC,KAAA,EAA4BJ,UAAA,EAAoBC,OAAA,EAA4B;EACrG,OAAIJ,OAAA,KACJQ,UAAA,CAAWC,mBAAA,GAAyBF,KAAA,EACpCP,OAAA,GAAUU,2BAAA,CAA4BH,KAAA,EAAOJ,UAAA,EAAYC,OAAO,GACzDJ,OAAA;AACT;AAEO,SAASU,4BACdH,KAAA,EACAJ,UAAA,EACAC,OAAA,EACkB;EAElB,MAAMO,UAAA,GAAa,CAAC;IACdC,QAAA,GAAW,CAAC;IACZC,YAAA,GAAe,CAAC;IAChBC,MAAA,GAAS,CAAC;EAEhBC,MAAA,CAAOC,IAAA,CAAKT,KAAK,EAAEU,GAAA,CAAKC,IAAA,IAAS;IAC/B,IAAI,CAACX,KAAA,CAAMW,IAAI,GAAG;MAChBC,OAAA,CAAQC,KAAA,CAAM,gCAAgCF,IAAI,EAAE;MACpD;IACF;IACA,MAAMG,iBAAA,GAAoBd,KAAA,CAAMW,IAAI;MAC9BI,mBAAA,GAAsBJ,IAAA,CAAKK,OAAA,CAAQ,IAAIpB,UAAU,KAAK,IAAI;MAE1DqB,YAAA,GAAeF,mBAAA,CAAoBG,KAAA,CAAM,CAAC,EAAEF,OAAA,CAAQ,cAAc,EAAE;IACtEnB,OAAA,EAASsB,UAAA,GAAaF,YAAY,MAAM,SAC1CL,OAAA,CAAQQ,IAAA,CAAK,aAAaH,YAAY,EAAE,GAExCX,YAAA,CAAaS,mBAAmB,IAAI,MAC3B,QAGTX,UAAA,CAAWW,mBAAmB,IAAID,iBAAA;EAEtC,CAAC;EAED,MAAMO,UAAA,GAAab,MAAA,CAAOC,IAAA,CAAKL,UAAU;EAEzC,SAASkB,QAAQC,EAAA,EAAY;IAG3B,IAFAC,YAAA,CAAajB,MAAA,CAAOgB,EAAE,CAAC,GAEnBjB,YAAA,CAAaiB,EAAE,GACjB,OAAOjB,YAAA,CAAaiB,EAAE;IAGxB,IAAI,OAAOnB,UAAA,CAAWmB,EAAE,KAAM,YAC5B,OAAOnB,UAAA,CAAWmB,EAAE;IAGtB,MAAKlB,QAAA,CAASkB,EAAE,MACdlB,QAAA,CAASkB,EAAE,IAAInB,UAAA,CAAWmB,EAAE,EAAE,EAC3BE,IAAA,CAAMC,GAAA,KACLpB,YAAA,CAAaiB,EAAE,IAAIG,GAAA,EACnB,OAAOrB,QAAA,CAASkB,EAAE,GAGlBhB,MAAA,CAAOgB,EAAE,IAAII,UAAA,CAAW,MAAM;MAC5B,OAAOrB,YAAA,CAAaiB,EAAE;IACxB,GAAG,GAAG,GAECG,GAAA,CACR,EACAE,KAAA,CAAOC,GAAA,IAAQ;MACdjB,OAAA,CAAQC,KAAA,CAAM,uBAAuBU,EAAA,EAAIM,GAAA,EAAK,IAAIC,KAAA,CAAM,EAAEC,KAAK,GAC/DzB,YAAA,CAAaiB,EAAE,IAAI;QACjBS,OAAA,EAASA,CAAA,KAAM;QAAA;QAAA;QAAA;QAAA;QAAA;QAAA;QAAA;QAAA;QAAA;QAAA;QAAA;QAAA;QAAA;QAAA;QAAA;QAAA;QAAA;MAkBjB,GACA,OAAO3B,QAAA,CAASkB,EAAE;IACpB,CAAC,GAECU,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,kBAC3B9B,QAAA,CAASkB,EAAE,EAAEQ,KAAA,GAAQ,IAAID,KAAA,CAAM,EAAEC,KAAA,IAO/B1B,QAAA,CAASkB,EAAE;EACnB;EAEA,OAAAD,OAAA,CAAQb,IAAA,GAAO,MAAMY,UAAA,EACrBC,OAAA,CAAQC,EAAA,GAAK,IACbD,OAAA,CAAQA,OAAA,GAAWC,EAAA,IAAeA,EAAA,EAE3BD,OAAA;AACT","ignoreList":[]}
|
@@ -1,12 +1,12 @@
|
|
1
1
|
var lastVersion = 0,
|
2
2
|
context;
|
3
|
-
function useViteRoutes(routes, options, version) {
|
4
|
-
return version && version > lastVersion && (context = null, lastVersion = version), context || loadRoutes(routes, options), context;
|
3
|
+
function useViteRoutes(routes, routerRoot, options, version) {
|
4
|
+
return version && version > lastVersion && (context = null, lastVersion = version), context || loadRoutes(routes, routerRoot, options), context;
|
5
5
|
}
|
6
|
-
function loadRoutes(paths, options) {
|
7
|
-
return context || (globalThis.__importMetaGlobbed = paths, context = globbedRoutesToRouteContext(paths, options), context);
|
6
|
+
function loadRoutes(paths, routerRoot, options) {
|
7
|
+
return context || (globalThis.__importMetaGlobbed = paths, context = globbedRoutesToRouteContext(paths, routerRoot, options), context);
|
8
8
|
}
|
9
|
-
function globbedRoutesToRouteContext(paths, options) {
|
9
|
+
function globbedRoutesToRouteContext(paths, routerRoot, options) {
|
10
10
|
var routesSync = {},
|
11
11
|
promises = {},
|
12
12
|
loadedRoutes = {},
|
@@ -18,7 +18,7 @@ function globbedRoutesToRouteContext(paths, options) {
|
|
18
18
|
return;
|
19
19
|
}
|
20
20
|
var loadRouteFunction = paths[path],
|
21
|
-
pathWithoutRelative = path.replace(
|
21
|
+
pathWithoutRelative = path.replace(`/${routerRoot}/`, "./"),
|
22
22
|
originalPath = pathWithoutRelative.slice(1).replace(/\.[jt]sx?$/, "");
|
23
23
|
(options == null || (_options_routeModes = options.routeModes) === null || _options_routeModes === void 0 ? void 0 : _options_routeModes[originalPath]) === "spa" ? (console.info(`Spa mode: ${originalPath}`), loadedRoutes[pathWithoutRelative] = function () {
|
24
24
|
return null;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["lastVersion","context","useViteRoutes","routes","options","version","loadRoutes","paths","globalThis","__importMetaGlobbed","globbedRoutesToRouteContext","routesSync","promises","loadedRoutes","clears","Object","keys","map","path","_options_routeModes","console","error","loadRouteFunction","pathWithoutRelative","replace","originalPath","slice","routeModes","info","moduleKeys","resolve","id","clearTimeout","then","val","setTimeout","catch","err","Error","stack","default","process","env","NODE_ENV"],"sources":["../../../src/router/useViteRoutes.tsx"],"sourcesContent":[null],"mappings":"AAKA,IAAIA,WAAA,GAAc;EACdC,OAAA;AAGG,SAASC,cACdC,MAAA,EACAC,OAAA,EACAC,OAAA,EACA;EACA,OAAIA,OAAA,IAAWA,OAAA,
|
1
|
+
{"version":3,"names":["lastVersion","context","useViteRoutes","routes","routerRoot","options","version","loadRoutes","paths","globalThis","__importMetaGlobbed","globbedRoutesToRouteContext","routesSync","promises","loadedRoutes","clears","Object","keys","map","path","_options_routeModes","console","error","loadRouteFunction","pathWithoutRelative","replace","originalPath","slice","routeModes","info","moduleKeys","resolve","id","clearTimeout","then","val","setTimeout","catch","err","Error","stack","default","process","env","NODE_ENV"],"sources":["../../../src/router/useViteRoutes.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
@@ -50,6 +50,7 @@ function getRouteEntry(normalizedRoute, node) {
|
|
50
50
|
type: node.type,
|
51
51
|
namedRegex: result.namedRegex,
|
52
52
|
urlPath: result.urlPath,
|
53
|
+
urlCleanPath: result.urlCleanPath,
|
53
54
|
routeKeys: result.routeKeys,
|
54
55
|
layouts: node.layouts,
|
55
56
|
middlewares: node.middlewares
|
@@ -68,22 +69,22 @@ function removeTrailingSlash(route) {
|
|
68
69
|
return route.replace(/\/$/, "") || "/";
|
69
70
|
}
|
70
71
|
function getPathMeta(route) {
|
71
|
-
const segments = removeTrailingSlash(route).slice(1).split("/"), getSafeRouteKey = buildGetSafeRouteKey(), routeKeys = {}
|
72
|
-
|
72
|
+
const segments = removeTrailingSlash(route).slice(1).split("/"), getSafeRouteKey = buildGetSafeRouteKey(), routeKeys = {}, urlPathParts = [], routeSegments = segments.map((segment, index) => {
|
73
|
+
if (segment === "+not-found" && index === segments.length - 1 && (segment = "[...not-found]"), /^\[.*\]$/.test(segment)) {
|
74
|
+
const { name, optional, repeat } = parseParam(segment);
|
75
|
+
let cleanedKey = name.replace(/\W/g, ""), invalidKey = !1;
|
76
|
+
return (cleanedKey.length === 0 || cleanedKey.length > 30) && (invalidKey = !0), Number.isNaN(Number.parseInt(cleanedKey.slice(0, 1), 10)) || (invalidKey = !0), cleanedKey in routeKeys && (invalidKey = !0), invalidKey && (cleanedKey = getSafeRouteKey()), urlPathParts.push({ content: repeat ? "/*" : `/:${name}${optional ? "?" : ""}` }), routeKeys[cleanedKey] = name, repeat ? optional ? `(?:/(?<${cleanedKey}>.+?))?` : `/(?<${cleanedKey}>.+?)` : `/(?<${cleanedKey}>[^/]+?)`;
|
77
|
+
}
|
78
|
+
if (insideParensRegex.test(segment)) {
|
79
|
+
const groupName = matchGroupName(segment).split(",").map((group) => group.trim()).filter(Boolean);
|
80
|
+
return urlPathParts.push({ content: `/:${groupName}?`, type: "group" }), groupName.length > 1 ? `(?:/${`\\((?:${groupName.map(escapeStringRegexp).join("|")})\\)`})?` : `(?:/${escapeStringRegexp(segment)})?`;
|
81
|
+
}
|
82
|
+
return urlPathParts.push({ content: `/${segment}` }), `/${escapeStringRegexp(segment)}`;
|
83
|
+
}).join(""), urlPath = urlPathParts.map((p) => p.content).join(""), urlCleanPath = urlPathParts.filter((p) => p.type !== "group").map((p) => p.content).join("");
|
73
84
|
return {
|
74
|
-
namedRegex: `^${
|
75
|
-
if (segment === "+not-found" && index === segments.length - 1 && (segment = "[...not-found]"), /^\[.*\]$/.test(segment)) {
|
76
|
-
const { name, optional, repeat } = parseParam(segment);
|
77
|
-
let cleanedKey = name.replace(/\W/g, ""), invalidKey = !1;
|
78
|
-
return (cleanedKey.length === 0 || cleanedKey.length > 30) && (invalidKey = !0), Number.isNaN(Number.parseInt(cleanedKey.slice(0, 1), 10)) || (invalidKey = !0), cleanedKey in routeKeys && (invalidKey = !0), invalidKey && (cleanedKey = getSafeRouteKey()), urlPath += repeat ? "/*" : `/:${name}${optional ? "?" : ""}`, routeKeys[cleanedKey] = name, repeat ? optional ? `(?:/(?<${cleanedKey}>.+?))?` : `/(?<${cleanedKey}>.+?)` : `/(?<${cleanedKey}>[^/]+?)`;
|
79
|
-
}
|
80
|
-
if (insideParensRegex.test(segment)) {
|
81
|
-
const groupName = matchGroupName(segment).split(",").map((group) => group.trim()).filter(Boolean);
|
82
|
-
return urlPath += `/:${groupName}?`, groupName.length > 1 ? `(?:/${`\\((?:${groupName.map(escapeStringRegexp).join("|")})\\)`})?` : `(?:/${escapeStringRegexp(segment)})?`;
|
83
|
-
}
|
84
|
-
return urlPath += `/${segment}`, `/${escapeStringRegexp(segment)}`;
|
85
|
-
}).join("")}(?:/)?$`,
|
85
|
+
namedRegex: `^${routeSegments}(?:/)?$`,
|
86
86
|
urlPath: urlPath === "" ? "/" : urlPath,
|
87
|
+
urlCleanPath: urlCleanPath === "" ? "/" : urlCleanPath,
|
87
88
|
routeKeys
|
88
89
|
};
|
89
90
|
}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../src/server/getServerManifest.ts"],
|
4
|
-
"mappings": "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
|
4
|
+
"mappings": "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",
|
5
5
|
"names": ["route", "key"]
|
6
6
|
}
|
@@ -53,6 +53,7 @@ function getRouteEntry(normalizedRoute, node) {
|
|
53
53
|
type: node.type,
|
54
54
|
namedRegex: result.namedRegex,
|
55
55
|
urlPath: result.urlPath,
|
56
|
+
urlCleanPath: result.urlCleanPath,
|
56
57
|
routeKeys: result.routeKeys,
|
57
58
|
layouts: node.layouts,
|
58
59
|
middlewares: node.middlewares
|
@@ -74,10 +75,9 @@ function removeTrailingSlash(route) {
|
|
74
75
|
function getPathMeta(route) {
|
75
76
|
const segments = removeTrailingSlash(route).slice(1).split("/"),
|
76
77
|
getSafeRouteKey = buildGetSafeRouteKey(),
|
77
|
-
routeKeys = {}
|
78
|
-
|
79
|
-
|
80
|
-
namedRegex: `^${segments.map((segment, index) => {
|
78
|
+
routeKeys = {},
|
79
|
+
urlPathParts = [],
|
80
|
+
routeSegments = segments.map((segment, index) => {
|
81
81
|
if (segment === "+not-found" && index === segments.length - 1 && (segment = "[...not-found]"), /^\[.*\]$/.test(segment)) {
|
82
82
|
const {
|
83
83
|
name,
|
@@ -86,15 +86,27 @@ function getPathMeta(route) {
|
|
86
86
|
} = parseParam(segment);
|
87
87
|
let cleanedKey = name.replace(/\W/g, ""),
|
88
88
|
invalidKey = !1;
|
89
|
-
return (cleanedKey.length === 0 || cleanedKey.length > 30) && (invalidKey = !0), Number.isNaN(Number.parseInt(cleanedKey.slice(0, 1), 10)) || (invalidKey = !0), cleanedKey in routeKeys && (invalidKey = !0), invalidKey && (cleanedKey = getSafeRouteKey()),
|
89
|
+
return (cleanedKey.length === 0 || cleanedKey.length > 30) && (invalidKey = !0), Number.isNaN(Number.parseInt(cleanedKey.slice(0, 1), 10)) || (invalidKey = !0), cleanedKey in routeKeys && (invalidKey = !0), invalidKey && (cleanedKey = getSafeRouteKey()), urlPathParts.push({
|
90
|
+
content: repeat ? "/*" : `/:${name}${optional ? "?" : ""}`
|
91
|
+
}), routeKeys[cleanedKey] = name, repeat ? optional ? `(?:/(?<${cleanedKey}>.+?))?` : `/(?<${cleanedKey}>.+?)` : `/(?<${cleanedKey}>[^/]+?)`;
|
90
92
|
}
|
91
93
|
if (insideParensRegex.test(segment)) {
|
92
94
|
const groupName = matchGroupName(segment).split(",").map(group => group.trim()).filter(Boolean);
|
93
|
-
return
|
95
|
+
return urlPathParts.push({
|
96
|
+
content: `/:${groupName}?`,
|
97
|
+
type: "group"
|
98
|
+
}), groupName.length > 1 ? `(?:/${`\\((?:${groupName.map(escapeStringRegexp).join("|")})\\)`})?` : `(?:/${escapeStringRegexp(segment)})?`;
|
94
99
|
}
|
95
|
-
return
|
96
|
-
|
100
|
+
return urlPathParts.push({
|
101
|
+
content: `/${segment}`
|
102
|
+
}), `/${escapeStringRegexp(segment)}`;
|
103
|
+
}).join(""),
|
104
|
+
urlPath = urlPathParts.map(p => p.content).join(""),
|
105
|
+
urlCleanPath = urlPathParts.filter(p => p.type !== "group").map(p => p.content).join("");
|
106
|
+
return {
|
107
|
+
namedRegex: `^${routeSegments}(?:/)?$`,
|
97
108
|
urlPath: urlPath === "" ? "/" : urlPath,
|
109
|
+
urlCleanPath: urlCleanPath === "" ? "/" : urlCleanPath,
|
98
110
|
routeKeys
|
99
111
|
};
|
100
112
|
}
|
@@ -1 +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","routeKeys","buildGetSafeRouteKey","currentCharCode","currentLength","incrementNext","i","String","fromCharCode","removeTrailingSlash","segments","slice","split","getSafeRouteKey","map","segment","index","test","name","optional","repeat","parseParam","cleanedKey","invalidKey","Number","isNaN","parseInt","insideParensRegex","groupName","group","trim","filter","Boolean","escapeStringRegexp","join","insideBracketsRegex","tripleDotRegex","replaceRegex","hasRegExpRegex","str","param"],"sources":["../../../src/server/getServerManifest.ts"],"sourcesContent":[null],"mappings":"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
|
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":"AAWA,SAASA,aAAA,EAAeC,cAAA,QAAsB;AAC9C,SAASC,UAAA,QAAkB;AAyB3B,SAASC,gBAAgBC,KAAA,EAAkB;EACzC,OAAO,GAAQA,KAAA,CAAMC,OAAA,IAAWD,KAAA,CAAMC,OAAA,CAAQD,KAAA,CAAMC,OAAA,CAAQC,MAAA,GAAS,CAAC,EAAEC,QAAA;AAC1E;AAGO,SAASC,kBAAkBJ,KAAA,EAA6C;EAC7E,SAASK,aAAaC,MAAA,EAAkBC,OAAA,EAA8C;IACpF,IAAID,MAAA,CAAME,QAAA,CAASN,MAAA,EACjB,OAAOI,MAAA,CAAME,QAAA,CAASC,OAAA,CAASC,KAAA,IACtBL,YAAA,CAAaK,KAAA,EAAO,CAAC,IAAIH,OAAA,IAAW,EAAC,GAAID,MAAK,CAAC,CACvD;IAMH,IAAIK,GAAA;IACJ,OAAIL,MAAA,CAAMM,IAAA,KAAS,QACjBD,GAAA,GAAMf,aAAA,CAAcU,MAAA,CAAMO,UAAU,EAAEC,OAAA,CAAQ,YAAY,EAAE,KAAK,MAUjEH,GAAA,GARuBJ,OAAA,EAASE,OAAA,CAASM,MAAA,IAAU;MACjD,MAAMC,IAAA,GAAMpB,aAAA,CAAcmB,MAAA,CAAMf,KAAK,EAAEc,OAAA,CAAQ,YAAY,EAAE,KAAK;MAClE,OAAIE,IAAA,KAAQ,OAAOA,IAAA,CAAIC,UAAA,CAAW,IAAI,IAC7B,EAAC,GAEH,CAACD,IAAG;IACb,CAAC,IAEsBpB,aAAA,CAAcU,MAAA,CAAMN,KAAK,EAAEc,OAAA,CAAQ,YAAY,EAAE,KAAK,KAGxE,CAAC,CAACH,GAAA,EAAK;MAAE,GAAGL,MAAA;MAAOC;IAAQ,CAAC,CAAC;EACtC;EAKA,MAAMW,IAAA,GAAOb,YAAA,CAAaL,KAAK,EAC5BmB,IAAA,CAAK,CAAC,GAAGC,CAAC,GAAG,GAAGC,CAAC,MAAMvB,UAAA,CAAWuB,CAAA,EAAGD,CAAC,CAAC,EACvCE,OAAA,CAAQ;IAGLC,WAAA,GAAyC,CAAC;EAChD,WAAW,CAACC,IAAA,EAAMlB,MAAK,KAAKY,IAAA,EACtBK,WAAA,CAAYC,IAAI,MAClBC,OAAA,CAAQC,IAAA,CAAK;AAAA,oCAAkC,GAC/CD,OAAA,CAAQC,IAAA,CAAK,+EAA+E,GAC5FD,OAAA,CAAQC,IAAA,CAAK,aAAaF,IAAI,EAAE,GAChCC,OAAA,CAAQC,IAAA,CAAK,oBAAoBH,WAAA,CAAYC,IAAI,EAAEX,UAAU,EAAE,GAC/DY,OAAA,CAAQC,IAAA,CAAK,qBAAqBpB,MAAA,CAAMO,UAAU;AAAA,CAAI,IAExDU,WAAA,CAAYC,IAAI,IAAIlB,MAAA;EAGtB,MAAMqB,SAAA,GAA8C,EAAC;IAC/CC,gBAAA,GAAqD,EAAC;IACtDC,UAAA,GAA+C,EAAC;IAEhDC,gBAAA,GAA4C,CAAC;EAEnD,WAAW,CAACN,IAAA,EAAMO,IAAI,KAAKb,IAAA,EAAM;IAC/B,IAAIa,IAAA,CAAKnB,IAAA,KAAS,OAAO;MACvBe,SAAA,CAAUK,IAAA,CAAKC,2BAAA,CAA4BT,IAAA,EAAMO,IAAI,CAAC;MACtD;IACF;IAEA,IAAIA,IAAA,CAAKG,WAAA,EAAahC,MAAA,EACpB,WAAWiC,UAAA,IAAcJ,IAAA,CAAKG,WAAA,EACvBJ,gBAAA,CAAiBK,UAAA,CAAWtB,UAAU,MACzCiB,gBAAA,CAAiBK,UAAA,CAAWtB,UAAU,IAAI,IAC1Ce,gBAAA,CAAiBI,IAAA,CAAKC,2BAAA,CAA4BT,IAAA,EAAMW,UAAU,CAAC;IAKzEN,UAAA,CAAWG,IAAA,CAAKC,2BAAA,CAA4BT,IAAA,EAAMO,IAAI,CAAC;EACzD;EAEA,OAAO;IACLJ,SAAA;IACAC,gBAAA;IACAC;EACF;AACF;AAEA,SAASI,4BACPG,eAAA,EACAL,IAAA,EACgC;EAChC,OAAO;IACL,GAAGM,aAAA,CAAcD,eAAA,EAAiBL,IAAI;IACtCO,SAAA,EAAW;IACXC,UAAA,EAAYxC,eAAA,CAAgBgC,IAAI;EAClC;AACF;AAEA,SAASM,cAAcD,eAAA,EAAyBL,IAAA,EAAiD;EAC/F,MAAMS,MAAA,GAASC,WAAA,CAAYL,eAAe;EAC1C,OAAO;IACLM,IAAA,EAAMX,IAAA,CAAKlB,UAAA;IACX8B,IAAA,EAAM/C,aAAA,CAAcmC,IAAA,CAAK/B,KAAK;IAC9BY,IAAA,EAAMmB,IAAA,CAAKnB,IAAA;IACXgC,UAAA,EAAYJ,MAAA,CAAOI,UAAA;IACnBC,OAAA,EAASL,MAAA,CAAOK,OAAA;IAChBC,YAAA,EAAcN,MAAA,CAAOM,YAAA;IACrBC,SAAA,EAAWP,MAAA,CAAOO,SAAA;IAClBxC,OAAA,EAASwB,IAAA,CAAKxB,OAAA;IACd2B,WAAA,EAAaH,IAAA,CAAKG;EACpB;AACF;AAMA,SAASc,qBAAA,EAAuB;EAC9B,IAAIC,eAAA,GAAkB;IAClBC,aAAA,GAAgB;EAEpB,OAAO,MAAM;IACX,IAAIV,MAAA,GAAS;MACTW,aAAA,GAAgB;IAGpB,SAASC,CAAA,GAAI,GAAGA,CAAA,GAAIF,aAAA,EAAeE,CAAA,IAC7BD,aAAA,KACFF,eAAA,IACIA,eAAA,GAAkB,OACpBA,eAAA,GAAkB,IAClBE,aAAA,GAAgB,MAEhBA,aAAA,GAAgB,KAGpBX,MAAA,GAASa,MAAA,CAAOC,YAAA,CAAaL,eAAe,IAAIT,MAAA;IAIlD,OAAIW,aAAA,KACFD,aAAA,IACAD,eAAA,GAAkB,KAGbT,MAAA;EACT;AACF;AAEA,SAASe,oBAAoBvD,KAAA,EAAuB;EAClD,OAAOA,KAAA,CAAMc,OAAA,CAAQ,OAAO,EAAE,KAAK;AACrC;AAEA,SAAS2B,YAAYzC,KAAA,EAAe;EAClC,MAAMwD,QAAA,GAAWD,mBAAA,CAAoBvD,KAAK,EAAEyD,KAAA,CAAM,CAAC,EAAEC,KAAA,CAAM,GAAG;IACxDC,eAAA,GAAkBX,oBAAA,CAAqB;IACvCD,SAAA,GAAoC,CAAC;IAErCa,YAAA,GAA2D,EAAC;IAE5DC,aAAA,GAAgBL,QAAA,CACnBM,GAAA,CAAI,CAACC,OAAA,EAASC,KAAA,KAAU;MAKvB,IAJID,OAAA,KAAY,gBAAgBC,KAAA,KAAUR,QAAA,CAAStD,MAAA,GAAS,MAC1D6D,OAAA,GAAU,mBAGR,WAAWE,IAAA,CAAKF,OAAO,GAAG;QAC5B,MAAM;UAAEG,IAAA;UAAMC,QAAA;UAAUC;QAAO,IAAIC,UAAA,CAAWN,OAAO;QAErD,IAAIO,UAAA,GAAaJ,IAAA,CAAKpD,OAAA,CAAQ,OAAO,EAAE;UACnCyD,UAAA,GAAa;QAGjB,QAAID,UAAA,CAAWpE,MAAA,KAAW,KAAKoE,UAAA,CAAWpE,MAAA,GAAS,QACjDqE,UAAA,GAAa,KAEVC,MAAA,CAAOC,KAAA,CAAMD,MAAA,CAAOE,QAAA,CAASJ,UAAA,CAAWb,KAAA,CAAM,GAAG,CAAC,GAAG,EAAE,CAAC,MAC3Dc,UAAA,GAAa,KAIXD,UAAA,IAAcvB,SAAA,KAChBwB,UAAA,GAAa,KAGXA,UAAA,KACFD,UAAA,GAAaX,eAAA,CAAgB,IAG/BC,YAAA,CAAa5B,IAAA,CAAK;UAAE2C,OAAA,EAASP,MAAA,GAAS,OAAO,KAAKF,IAAI,GAAGC,QAAA,GAAW,MAAM,EAAE;QAAG,CAAC,GAChFpB,SAAA,CAAUuB,UAAU,IAAIJ,IAAA,EAEjBE,MAAA,GACHD,QAAA,GACE,UAAUG,UAAU,YACpB,OAAOA,UAAU,UACnB,OAAOA,UAAU;MACvB;MAEA,IAAIM,iBAAA,CAAkBX,IAAA,CAAKF,OAAO,GAAG;QACnC,MAAMc,SAAA,GAAYhF,cAAA,CAAekE,OAAO,EACrCL,KAAA,CAAM,GAAG,EACTI,GAAA,CAAKgB,KAAA,IAAUA,KAAA,CAAMC,IAAA,CAAK,CAAC,EAC3BC,MAAA,CAAOC,OAAO;QAIjB,OAFArB,YAAA,CAAa5B,IAAA,CAAK;UAAE2C,OAAA,EAAS,KAAKE,SAAS;UAAKjE,IAAA,EAAM;QAAQ,CAAC,GAE3DiE,SAAA,CAAU3E,MAAA,GAAS,IAId,OAHiB,SAAS2E,SAAA,CAAUf,GAAA,CAAIoB,kBAAkB,EAAEC,IAAA,CAAK,GAAG,CAAC,MAG/C,OAIxB,OAAOD,kBAAA,CAAmBnB,OAAO,CAAC;MAC3C;MAEA,OAAAH,YAAA,CAAa5B,IAAA,CAAK;QAAE2C,OAAA,EAAS,IAAIZ,OAAO;MAAG,CAAC,GAErC,IAAImB,kBAAA,CAAmBnB,OAAO,CAAC;IACxC,CAAC,EACAoB,IAAA,CAAK,EAAE;IAEJtC,OAAA,GAAUe,YAAA,CAAaE,GAAA,CAAKsB,CAAA,IAAMA,CAAA,CAAET,OAAO,EAAEQ,IAAA,CAAK,EAAE;IACpDrC,YAAA,GAAec,YAAA,CAClBoB,MAAA,CAAQI,CAAA,IAAMA,CAAA,CAAExE,IAAA,KAAS,OAAO,EAChCkD,GAAA,CAAKsB,CAAA,IAAMA,CAAA,CAAET,OAAO,EACpBQ,IAAA,CAAK,EAAE;EAEV,OAAO;IACLvC,UAAA,EAAY,IAAIiB,aAAa;IAC7BhB,OAAA,EAASA,OAAA,KAAY,KAAK,MAAMA,OAAA;IAChCC,YAAA,EAAcA,YAAA,KAAiB,KAAK,MAAMA,YAAA;IAC1CC;EACF;AACF;AAEA,MAAMsC,mBAAA,GAAsB;EACtBT,iBAAA,GAAoB;EACpBU,cAAA,GAAiB;EACjBC,YAAA,GAAe;EAEfC,cAAA,GAAiB;AAEvB,SAASN,mBAAmBO,GAAA,EAAa;EAEvC,OAAID,cAAA,CAAevB,IAAA,CAAKwB,GAAG,IAClBA,GAAA,CAAI3E,OAAA,CAAQyE,YAAA,EAAc,MAAM,IAElCE,GAAA;AACT;AAEO,SAASpB,WAAWqB,KAAA,EAAe;EACxC,IAAItB,MAAA,GAAS;IACTD,QAAA,GAAW;IACXD,IAAA,GAAOwB,KAAA;EAEX,OAAIL,mBAAA,CAAoBpB,IAAA,CAAKC,IAAI,MAC/BC,QAAA,GAAW,IACXD,IAAA,GAAOA,IAAA,CAAKT,KAAA,CAAM,GAAG,EAAE,IAGrB6B,cAAA,CAAerB,IAAA,CAAKC,IAAI,MAC1BE,MAAA,GAAS,IACTF,IAAA,GAAOA,IAAA,CAAKT,KAAA,CAAM,CAAC,IAGd;IAAES,IAAA;IAAME,MAAA;IAAQD;EAAS;AAClC","ignoreList":[]}
|
@@ -112,6 +112,7 @@ function getRouteEntry(normalizedRoute, node) {
|
|
112
112
|
type: node.type,
|
113
113
|
namedRegex: result.namedRegex,
|
114
114
|
urlPath: result.urlPath,
|
115
|
+
urlCleanPath: result.urlCleanPath,
|
115
116
|
routeKeys: result.routeKeys,
|
116
117
|
layouts: node.layouts,
|
117
118
|
middlewares: node.middlewares
|
@@ -132,7 +133,7 @@ function getPathMeta(route) {
|
|
132
133
|
var segments = removeTrailingSlash(route).slice(1).split("/"),
|
133
134
|
getSafeRouteKey = buildGetSafeRouteKey(),
|
134
135
|
routeKeys = {},
|
135
|
-
|
136
|
+
urlPathParts = [],
|
136
137
|
routeSegments = segments.map(function (segment, index) {
|
137
138
|
if (segment === "+not-found" && index === segments.length - 1 && (segment = "[...not-found]"), /^\[.*\]$/.test(segment)) {
|
138
139
|
var {
|
@@ -142,23 +143,39 @@ function getPathMeta(route) {
|
|
142
143
|
} = parseParam(segment),
|
143
144
|
cleanedKey = name.replace(/\W/g, ""),
|
144
145
|
invalidKey = !1;
|
145
|
-
return (cleanedKey.length === 0 || cleanedKey.length > 30) && (invalidKey = !0), Number.isNaN(Number.parseInt(cleanedKey.slice(0, 1), 10)) || (invalidKey = !0), cleanedKey in routeKeys && (invalidKey = !0), invalidKey && (cleanedKey = getSafeRouteKey()),
|
146
|
+
return (cleanedKey.length === 0 || cleanedKey.length > 30) && (invalidKey = !0), Number.isNaN(Number.parseInt(cleanedKey.slice(0, 1), 10)) || (invalidKey = !0), cleanedKey in routeKeys && (invalidKey = !0), invalidKey && (cleanedKey = getSafeRouteKey()), urlPathParts.push({
|
147
|
+
content: repeat ? "/*" : `/:${name}${optional ? "?" : ""}`
|
148
|
+
}), routeKeys[cleanedKey] = name, repeat ? optional ? `(?:/(?<${cleanedKey}>.+?))?` : `/(?<${cleanedKey}>.+?)` : `/(?<${cleanedKey}>[^/]+?)`;
|
146
149
|
}
|
147
150
|
if (insideParensRegex.test(segment)) {
|
148
151
|
var groupName = matchGroupName(segment).split(",").map(function (group) {
|
149
152
|
return group.trim();
|
150
153
|
}).filter(Boolean);
|
151
|
-
if (
|
154
|
+
if (urlPathParts.push({
|
155
|
+
content: `/:${groupName}?`,
|
156
|
+
type: "group"
|
157
|
+
}), groupName.length > 1) {
|
152
158
|
var optionalSegment = `\\((?:${groupName.map(escapeStringRegexp).join("|")})\\)`;
|
153
159
|
return `(?:/${optionalSegment})?`;
|
154
160
|
}
|
155
161
|
return `(?:/${escapeStringRegexp(segment)})?`;
|
156
162
|
}
|
157
|
-
return
|
163
|
+
return urlPathParts.push({
|
164
|
+
content: `/${segment}`
|
165
|
+
}), `/${escapeStringRegexp(segment)}`;
|
166
|
+
}).join(""),
|
167
|
+
urlPath = urlPathParts.map(function (p) {
|
168
|
+
return p.content;
|
169
|
+
}).join(""),
|
170
|
+
urlCleanPath = urlPathParts.filter(function (p) {
|
171
|
+
return p.type !== "group";
|
172
|
+
}).map(function (p) {
|
173
|
+
return p.content;
|
158
174
|
}).join("");
|
159
175
|
return {
|
160
176
|
namedRegex: `^${routeSegments}(?:/)?$`,
|
161
177
|
urlPath: urlPath === "" ? "/" : urlPath,
|
178
|
+
urlCleanPath: urlCleanPath === "" ? "/" : urlCleanPath,
|
162
179
|
routeKeys
|
163
180
|
};
|
164
181
|
}
|
@@ -1 +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":"AAWA,SAASA,aAAA,EAAeC,cAAA,QAAsB;AAC9C,SAASC,UAAA,QAAkB;AAyB3B,SAASC,gBAAgBC,KAAA,EAAkB;EACzC,OAAO,GAAQA,KAAA,CAAMC,OAAA,IAAWD,KAAA,CAAMC,OAAA,CAAQD,KAAA,CAAMC,OAAA,CAAQC,MAAA,GAAS,CAAC,EAAEC,QAAA;AAC1E;AAGO,SAASC,kBAAkBJ,KAAA,EAA6C;EAC7E,SAASK,aAAaC,MAAA,EAAkBC,OAAA,EAA8C;IACpF,IAAID,MAAA,CAAME,QAAA,CAASN,MAAA,EACjB,OAAOI,MAAA,CAAME,QAAA,CAASC,OAAA,CAAQ,UAACC,KACtB;MAOP,OAAAL,YAAA,CAAAK,KAAA,GACJ,IAAIH,OAAM,SAIND,MAAM,CACN;IAID;IAML,IAAAK,GAAA;IAKA,IAAML,MAAA,CAAOM,IAAA,UAAa,EAM1BD,GAAA,GAAAf,aAAkB,CAAKU,MAAK,CAAAO,UAAA,EAAAC,OAAA,6BACtB;MACW,IAAAC,cAAA,GAAAR,OAAA,EAAkCE,OAC/C,WAAaO,MAAA;QAKf,IAAAC,IAAA,GAAYrB,aAAQ,CAAAoB,MAAA,CAAAhB,KAAA,EAAAc,OAAA;QAGhB,OAAAG,IAAA,KACA,OAAAA,IAAA,CAAAC,UAAsD,CACtD,aAA+C,CAIrDD,IAAY,CACN;MACF;MACAN,GAAA,GAAAI,cAAA,GAAAnB,aAAA,CAAAU,MAAA,CAAAN,KAAA,EAAAc,OAAA;IACF;IAEA,OAAI,CACF,CACOH,GAAA,EAOT;MACF,GAAAL,MAAA;MAEOC;IACL,EACA,CACA;EACF;EACF,IAAAY,IAAA,GAAAd,YAAA,CAAAL,KAAA,EAAAoB,IAAA,WAAAC,KAAA,EAAAC,MAAA;MAEA,OAASC,CAAA,IAAAF,KAAA;QAAA,GAAAG,CAAA,IAAAF,MACP;MAGA,OAAOxB,UAAA,CAAA0B,CAAA,EAAAD,CAAA;IAAA,EACL,CAAAE,OAAG;IAAAC,WAAc;IAAAC,yBAAqB;IAAAC,iBAAA;IAAAC,cAAA;EAAA,IACtC;IACA,SAAAC,SAAY,GAAAX,IAAA,CAAAY,MAAoB,CAAAC,QAAA,KAAAC,KAAA,IAAAN,yBAAA,IAAAM,KAAA,GAAAH,SAAA,CAAAI,IAAA,IAAAC,IAAA,GAAAR,yBAAA;MAClC,KAAAS,IAAA,EAAAC,OAAA,IAAAJ,KAAA,CAAAK,KAAA;MACFZ,WAAA,CAAAU,IAAA,MAAAG,OAAA,CAAAC,IAAA;AAEA,oCAAuB,GAAAD,OAA0E,CAAAC,IAAA,mFAAAD,OAAA,CAAAC,IAAA,cAAAJ,IAAA,KAAAG,OAAA,CAAAC,IAAA,qBAAAd,WAAA,CAAAU,IAAA,EAAAvB,UAAA,KAAA0B,OAAA,CAAAC,IAAA,sBAAAH,OAAA,CAAAxB,UAAA;AAC/F,KAAAa,WAAM,CAASU,IAAA,IAAAC,OAAY;IAC3B;EAAO,EACL,OAAMI,GAAA,EAAK;IACXb,iBAAM,GAAc,IAAAC,cAAU,GAAAY,GAAA;EAAA,UACxB;IACN;MACA,CAAAd,yBAAgB,IAAAG,SAAA,CAAAY,MAAA,YAAAZ,SAAA,CAAAY,MAAA;IAChB;MACA,IAAAd,
|
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":[]}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
import { default as FSExtra } from "fs-extra";
|
2
2
|
import { extname, join } from "node:path";
|
3
|
-
import { getServerEntry } from "vxrn/serve";
|
3
|
+
import { getServerEntry, serveStatic } from "vxrn/serve";
|
4
4
|
import { LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX } from "../constants";
|
5
5
|
import { compileManifest, getURLfromRequestURL } from "../createHandleRequest";
|
6
6
|
import { getPathFromLoaderPath } from "../utils/cleanUrl";
|
@@ -82,6 +82,19 @@ url: ${url}`);
|
|
82
82
|
};
|
83
83
|
function createHonoHandler(route) {
|
84
84
|
return async (context, next) => {
|
85
|
+
if (route.page.endsWith("/+not-found")) {
|
86
|
+
let didCallNext = !1;
|
87
|
+
const response = await serveStatic({
|
88
|
+
root: "./dist/client",
|
89
|
+
onFound: (_path, c) => {
|
90
|
+
c.header("Cache-Control", "public, immutable, max-age=31536000");
|
91
|
+
}
|
92
|
+
})(context, async () => {
|
93
|
+
didCallNext = !0;
|
94
|
+
});
|
95
|
+
if (response && !didCallNext)
|
96
|
+
return response;
|
97
|
+
}
|
85
98
|
try {
|
86
99
|
const request = context.req.raw;
|
87
100
|
if (extname(request.url) === ".js" || extname(request.url) === ".css")
|
@@ -129,9 +142,9 @@ url: ${url}`);
|
|
129
142
|
}
|
130
143
|
const compiledManifest = compileManifest(buildInfo.manifest);
|
131
144
|
for (const route of compiledManifest.apiRoutes)
|
132
|
-
app.get(route.urlPath, createHonoHandler(route)), app.put(route.urlPath, createHonoHandler(route)), app.post(route.urlPath, createHonoHandler(route)), app.delete(route.urlPath, createHonoHandler(route)), app.patch(route.urlPath, createHonoHandler(route));
|
145
|
+
app.get(route.urlPath, createHonoHandler(route)), app.put(route.urlPath, createHonoHandler(route)), app.post(route.urlPath, createHonoHandler(route)), app.delete(route.urlPath, createHonoHandler(route)), app.patch(route.urlPath, createHonoHandler(route)), route.urlPath !== route.urlCleanPath && (app.get(route.urlCleanPath, createHonoHandler(route)), app.put(route.urlCleanPath, createHonoHandler(route)), app.post(route.urlCleanPath, createHonoHandler(route)), app.delete(route.urlCleanPath, createHonoHandler(route)), app.patch(route.urlCleanPath, createHonoHandler(route)));
|
133
146
|
for (const route of compiledManifest.pageRoutes)
|
134
|
-
app.get(route.urlPath, createHonoHandler(route));
|
147
|
+
app.get(route.urlPath, createHonoHandler(route)), route.urlPath !== route.urlCleanPath && app.get(route.urlCleanPath, createHonoHandler(route));
|
135
148
|
const { preloads } = buildInfo;
|
136
149
|
app.get("*", async (c, next) => {
|
137
150
|
if (c.req.path.endsWith(PRELOAD_JS_POSTFIX) && !preloads[c.req.path])
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../src/server/oneServe.ts"],
|
4
|
-
"mappings": "AAAA,SAAS,WAAW,eAAe;AAGnC,SAAS,SAAS,YAAY;AAC9B,SAAS,
|
4
|
+
"mappings": "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",
|
5
5
|
"names": ["buildInfo", "preloads"]
|
6
6
|
}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
import { default as FSExtra } from "fs-extra";
|
2
2
|
import { extname, join } from "node:path";
|
3
|
-
import { getServerEntry } from "vxrn/serve";
|
3
|
+
import { getServerEntry, serveStatic } from "vxrn/serve";
|
4
4
|
import { LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX } from "../constants.mjs";
|
5
5
|
import { compileManifest, getURLfromRequestURL } from "../createHandleRequest.mjs";
|
6
6
|
import { getPathFromLoaderPath } from "../utils/cleanUrl.mjs";
|
@@ -109,6 +109,18 @@ url: ${url}`);
|
|
109
109
|
};
|
110
110
|
function createHonoHandler(route) {
|
111
111
|
return async (context, next) => {
|
112
|
+
if (route.page.endsWith("/+not-found")) {
|
113
|
+
let didCallNext = !1;
|
114
|
+
const response = await serveStatic({
|
115
|
+
root: "./dist/client",
|
116
|
+
onFound: (_path, c) => {
|
117
|
+
c.header("Cache-Control", "public, immutable, max-age=31536000");
|
118
|
+
}
|
119
|
+
})(context, async () => {
|
120
|
+
didCallNext = !0;
|
121
|
+
});
|
122
|
+
if (response && !didCallNext) return response;
|
123
|
+
}
|
112
124
|
try {
|
113
125
|
const request = context.req.raw;
|
114
126
|
if (extname(request.url) === ".js" || extname(request.url) === ".css") return next();
|
@@ -152,8 +164,8 @@ url: ${url}`);
|
|
152
164
|
};
|
153
165
|
}
|
154
166
|
const compiledManifest = compileManifest(buildInfo.manifest);
|
155
|
-
for (const route of compiledManifest.apiRoutes) app.get(route.urlPath, createHonoHandler(route)), app.put(route.urlPath, createHonoHandler(route)), app.post(route.urlPath, createHonoHandler(route)), app.delete(route.urlPath, createHonoHandler(route)), app.patch(route.urlPath, createHonoHandler(route));
|
156
|
-
for (const route of compiledManifest.pageRoutes) app.get(route.urlPath, createHonoHandler(route));
|
167
|
+
for (const route of compiledManifest.apiRoutes) app.get(route.urlPath, createHonoHandler(route)), app.put(route.urlPath, createHonoHandler(route)), app.post(route.urlPath, createHonoHandler(route)), app.delete(route.urlPath, createHonoHandler(route)), app.patch(route.urlPath, createHonoHandler(route)), route.urlPath !== route.urlCleanPath && (app.get(route.urlCleanPath, createHonoHandler(route)), app.put(route.urlCleanPath, createHonoHandler(route)), app.post(route.urlCleanPath, createHonoHandler(route)), app.delete(route.urlCleanPath, createHonoHandler(route)), app.patch(route.urlCleanPath, createHonoHandler(route)));
|
168
|
+
for (const route of compiledManifest.pageRoutes) app.get(route.urlPath, createHonoHandler(route)), route.urlPath !== route.urlCleanPath && app.get(route.urlCleanPath, createHonoHandler(route));
|
157
169
|
const {
|
158
170
|
preloads
|
159
171
|
} = buildInfo;
|