one 1.1.484 → 1.1.485
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/createHandleRequest.cjs +2 -1
- package/dist/cjs/createHandleRequest.js +2 -1
- package/dist/cjs/createHandleRequest.js.map +1 -1
- package/dist/cjs/createHandleRequest.native.js +4 -2
- package/dist/cjs/createHandleRequest.native.js.map +1 -1
- package/dist/cjs/server/oneServe.cjs +8 -13
- package/dist/cjs/server/oneServe.js +11 -14
- package/dist/cjs/server/oneServe.js.map +1 -1
- package/dist/cjs/server/oneServe.native.js +20 -23
- package/dist/cjs/server/oneServe.native.js.map +2 -2
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.cjs +1 -1
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.js +1 -1
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.js.map +1 -1
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.native.js +3 -1
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.native.js.map +2 -2
- package/dist/esm/createHandleRequest.js +2 -1
- package/dist/esm/createHandleRequest.js.map +1 -1
- package/dist/esm/createHandleRequest.mjs +1 -1
- package/dist/esm/createHandleRequest.mjs.map +1 -1
- package/dist/esm/createHandleRequest.native.js +1 -1
- package/dist/esm/createHandleRequest.native.js.map +1 -1
- package/dist/esm/server/oneServe.js +17 -15
- package/dist/esm/server/oneServe.js.map +1 -1
- package/dist/esm/server/oneServe.mjs +9 -14
- package/dist/esm/server/oneServe.mjs.map +1 -1
- package/dist/esm/server/oneServe.native.js +21 -24
- package/dist/esm/server/oneServe.native.js.map +1 -1
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.js +2 -2
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.js.map +1 -1
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.mjs +2 -2
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.mjs.map +1 -1
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.native.js +4 -2
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.native.js.map +1 -1
- package/package.json +8 -8
- package/src/createHandleRequest.ts +1 -1
- package/src/server/oneServe.ts +23 -18
- package/src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx +9 -2
- package/types/createHandleRequest.d.ts +1 -0
- package/types/createHandleRequest.d.ts.map +1 -1
- package/types/server/oneServe.d.ts.map +1 -1
- package/types/vite/plugins/generateFileSystemRouteTypesPlugin.d.ts.map +1 -1
|
@@ -25,7 +25,8 @@ __export(createHandleRequest_exports, {
|
|
|
25
25
|
getURLfromRequestURL: () => getURLfromRequestURL,
|
|
26
26
|
resolveAPIRoute: () => resolveAPIRoute,
|
|
27
27
|
resolveLoaderRoute: () => resolveLoaderRoute,
|
|
28
|
-
resolvePageRoute: () => resolvePageRoute
|
|
28
|
+
resolvePageRoute: () => resolvePageRoute,
|
|
29
|
+
runMiddlewares: () => runMiddlewares
|
|
29
30
|
});
|
|
30
31
|
module.exports = __toCommonJS(createHandleRequest_exports);
|
|
31
32
|
var import_constants = require("./constants.cjs"),
|
|
@@ -19,7 +19,8 @@ __export(createHandleRequest_exports, {
|
|
|
19
19
|
getURLfromRequestURL: () => getURLfromRequestURL,
|
|
20
20
|
resolveAPIRoute: () => resolveAPIRoute,
|
|
21
21
|
resolveLoaderRoute: () => resolveLoaderRoute,
|
|
22
|
-
resolvePageRoute: () => resolvePageRoute
|
|
22
|
+
resolvePageRoute: () => resolvePageRoute,
|
|
23
|
+
runMiddlewares: () => runMiddlewares
|
|
23
24
|
});
|
|
24
25
|
module.exports = __toCommonJS(createHandleRequest_exports);
|
|
25
26
|
var import_constants = require("./constants"), import_cleanUrl = require("./utils/cleanUrl"), import_isResponse = require("./utils/isResponse"), import_getManifest = require("./vite/getManifest"), import_resolveResponse = require("./vite/resolveResponse");
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createHandleRequest.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA2C,wBAK3C,kBAAsC,6BACtC,oBAA2B,+BAC3B,qBAA4B,+BAC5B,yBAAoD;AAmBpD,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -20,7 +20,8 @@ __export(createHandleRequest_exports, {
|
|
|
20
20
|
getURLfromRequestURL: () => getURLfromRequestURL,
|
|
21
21
|
resolveAPIRoute: () => resolveAPIRoute,
|
|
22
22
|
resolveLoaderRoute: () => resolveLoaderRoute,
|
|
23
|
-
resolvePageRoute: () => resolvePageRoute
|
|
23
|
+
resolvePageRoute: () => resolvePageRoute,
|
|
24
|
+
runMiddlewares: () => runMiddlewares
|
|
24
25
|
});
|
|
25
26
|
module.exports = __toCommonJS(createHandleRequest_exports);
|
|
26
27
|
var import_constants = require("./constants"), import_cleanUrl = require("./utils/cleanUrl"), import_isResponse = require("./utils/isResponse"), import_getManifest = require("./vite/getManifest"), import_resolveResponse = require("./vite/resolveResponse");
|
|
@@ -250,6 +251,7 @@ function getRouteParams(pathname, route) {
|
|
|
250
251
|
getURLfromRequestURL,
|
|
251
252
|
resolveAPIRoute,
|
|
252
253
|
resolveLoaderRoute,
|
|
253
|
-
resolvePageRoute
|
|
254
|
+
resolvePageRoute,
|
|
255
|
+
runMiddlewares
|
|
254
256
|
});
|
|
255
257
|
//# sourceMappingURL=createHandleRequest.js.map
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createHandleRequest.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["runMiddlewares", "handlers", "request", "route", "getResponse", "middlewares", "length", "loadMiddleware", "Error", "context", "dispatch", "index", "middlewareModule", "exported", "default", "contextKey", "next", "response", "resolveAPIRoute", "url", "pathname", "params", "getRouteParams", "resolveAPIEndpoint", "handleAPI", "loaderProps", "path", "err", "isResponse", "process", "env", "NODE_ENV", "console", "error", "resolveLoaderRoute", "resolveResponse", "headers", "Headers", "set", "loaderResponse", "handleLoader", "type", "undefined", "getLoaderParams", "Response", "resolvePageRoute", "search", "resolved", "handlePage", "getURLfromRequestURL", "urlString", "URL", "get", "compileRouteRegex", "compiledRegex", "RegExp", "namedRegex", "compileManifest", "manifest", "pageRoutes", "map", "apiRoutes", "createHandleRequest", "routerRoot", "getManifest", "compiledManifest", "handler", "startsWith", "apiRoute", "find", "test", "method", "isClientRequestingNewRoute", "endsWith", "LOADER_JS_POSTFIX_UNCACHED", "originalUrl", "getPathFromLoaderPath", "file", "finalUrl", "origin", "routes", "config", "match", "exec", "groups", "Object", "entries", "key", "value", "namedKey", "routeKeys", "regex", "fromEntries"]
|
|
6
6
|
}
|
|
@@ -40,7 +40,8 @@ var import_fs_extra = __toESM(require("fs-extra"), 1),
|
|
|
40
40
|
import_constants = require("../constants.cjs"),
|
|
41
41
|
import_createHandleRequest = require("../createHandleRequest.cjs"),
|
|
42
42
|
import_cleanUrl = require("../utils/cleanUrl.cjs"),
|
|
43
|
-
import_toAbsolute = require("../utils/toAbsolute.cjs")
|
|
43
|
+
import_toAbsolute = require("../utils/toAbsolute.cjs"),
|
|
44
|
+
import_vxrn = require("vxrn");
|
|
44
45
|
async function oneServe(oneOptions, buildInfo, app) {
|
|
45
46
|
const {
|
|
46
47
|
resolveAPIRoute,
|
|
@@ -145,20 +146,14 @@ url: ${url}`);
|
|
|
145
146
|
};
|
|
146
147
|
function createHonoHandler(route) {
|
|
147
148
|
return async (context, next) => {
|
|
148
|
-
if (route.page.endsWith("/+not-found")) {
|
|
149
|
-
let didCallNext = !1;
|
|
150
|
-
const response = await (0, import_serve.serveStatic)({
|
|
151
|
-
root: "./dist/client",
|
|
152
|
-
onFound: (_path, c) => {
|
|
153
|
-
c.header("Cache-Control", "public, immutable, max-age=31536000");
|
|
154
|
-
}
|
|
155
|
-
})(context, async () => {
|
|
156
|
-
didCallNext = !0;
|
|
157
|
-
});
|
|
158
|
-
if (response && !didCallNext) return response;
|
|
159
|
-
}
|
|
160
149
|
try {
|
|
161
150
|
const request = context.req.raw;
|
|
151
|
+
if (route.page.endsWith("/+not-found") || Reflect.ownKeys(route.routeKeys).length > 0) {
|
|
152
|
+
const staticAssetResponse = await (0, import_vxrn.serveStaticAssets)({
|
|
153
|
+
context
|
|
154
|
+
});
|
|
155
|
+
if (staticAssetResponse) return await (0, import_createHandleRequest.runMiddlewares)(requestHandlers, request, route, async () => staticAssetResponse);
|
|
156
|
+
}
|
|
162
157
|
if ((0, import_node_path.extname)(request.url) === ".js" || (0, import_node_path.extname)(request.url) === ".css") return next();
|
|
163
158
|
const url = (0, import_createHandleRequest.getURLfromRequestURL)(request),
|
|
164
159
|
response = await (() => {
|
|
@@ -25,7 +25,7 @@ __export(oneServe_exports, {
|
|
|
25
25
|
oneServe: () => oneServe
|
|
26
26
|
});
|
|
27
27
|
module.exports = __toCommonJS(oneServe_exports);
|
|
28
|
-
var import_fs_extra = __toESM(require("fs-extra"), 1), import_node_path = require("node:path"), import_serve = require("vxrn/serve"), import_constants = require("../constants"), import_createHandleRequest = require("../createHandleRequest"), import_cleanUrl = require("../utils/cleanUrl"), import_toAbsolute = require("../utils/toAbsolute");
|
|
28
|
+
var import_fs_extra = __toESM(require("fs-extra"), 1), import_node_path = require("node:path"), import_serve = require("vxrn/serve"), import_constants = require("../constants"), import_createHandleRequest = require("../createHandleRequest"), import_cleanUrl = require("../utils/cleanUrl"), import_toAbsolute = require("../utils/toAbsolute"), import_vxrn = require("vxrn");
|
|
29
29
|
async function oneServe(oneOptions, buildInfo, app) {
|
|
30
30
|
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;
|
|
31
31
|
if (redirects)
|
|
@@ -103,21 +103,18 @@ url: ${url}`);
|
|
|
103
103
|
};
|
|
104
104
|
function createHonoHandler(route) {
|
|
105
105
|
return async (context, next) => {
|
|
106
|
-
if (route.page.endsWith("/+not-found")) {
|
|
107
|
-
let didCallNext = !1;
|
|
108
|
-
const response = await (0, import_serve.serveStatic)({
|
|
109
|
-
root: "./dist/client",
|
|
110
|
-
onFound: (_path, c) => {
|
|
111
|
-
c.header("Cache-Control", "public, immutable, max-age=31536000");
|
|
112
|
-
}
|
|
113
|
-
})(context, async () => {
|
|
114
|
-
didCallNext = !0;
|
|
115
|
-
});
|
|
116
|
-
if (response && !didCallNext)
|
|
117
|
-
return response;
|
|
118
|
-
}
|
|
119
106
|
try {
|
|
120
107
|
const request = context.req.raw;
|
|
108
|
+
if (route.page.endsWith("/+not-found") || Reflect.ownKeys(route.routeKeys).length > 0) {
|
|
109
|
+
const staticAssetResponse = await (0, import_vxrn.serveStaticAssets)({ context });
|
|
110
|
+
if (staticAssetResponse)
|
|
111
|
+
return await (0, import_createHandleRequest.runMiddlewares)(
|
|
112
|
+
requestHandlers,
|
|
113
|
+
request,
|
|
114
|
+
route,
|
|
115
|
+
async () => staticAssetResponse
|
|
116
|
+
);
|
|
117
|
+
}
|
|
121
118
|
if ((0, import_node_path.extname)(request.url) === ".js" || (0, import_node_path.extname)(request.url) === ".css")
|
|
122
119
|
return next();
|
|
123
120
|
const url = (0, import_createHandleRequest.getURLfromRequestURL)(request), response = await (() => {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/server/oneServe.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAmC,iCAGnC,mBAA8B,sBAC9B,eAA4C,uBAC5C,mBAA+D,yBAC/D,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["buildInfo", "preloads", "FSExtra"]
|
|
6
6
|
}
|
|
@@ -26,7 +26,7 @@ __export(oneServe_exports, {
|
|
|
26
26
|
oneServe: () => oneServe
|
|
27
27
|
});
|
|
28
28
|
module.exports = __toCommonJS(oneServe_exports);
|
|
29
|
-
var import_fs_extra = __toESM(require("fs-extra"), 1), import_node_path = require("node:path"), import_serve = require("vxrn/serve"), import_constants = require("../constants"), import_createHandleRequest = require("../createHandleRequest"), import_cleanUrl = require("../utils/cleanUrl"), import_toAbsolute = require("../utils/toAbsolute");
|
|
29
|
+
var import_fs_extra = __toESM(require("fs-extra"), 1), import_node_path = require("node:path"), import_serve = require("vxrn/serve"), import_constants = require("../constants"), import_createHandleRequest = require("../createHandleRequest"), import_cleanUrl = require("../utils/cleanUrl"), import_toAbsolute = require("../utils/toAbsolute"), import_vxrn = require("vxrn");
|
|
30
30
|
async function oneServe(oneOptions, buildInfo, app) {
|
|
31
31
|
var _oneOptions_web, _oneOptions_build_api, _oneOptions_build, { resolveAPIRoute, resolveLoaderRoute, resolvePageRoute } = await import("../createHandleRequest"), { isResponse } = await import("../utils/isResponse"), { isStatusRedirect } = await import("../utils/isStatus"), isAPIRequest = /* @__PURE__ */ new WeakMap(), redirects = (_oneOptions_web = oneOptions.web) === null || _oneOptions_web === void 0 ? void 0 : _oneOptions_web.redirects;
|
|
32
32
|
if (redirects) {
|
|
@@ -117,23 +117,20 @@ url: ${url}`);
|
|
|
117
117
|
};
|
|
118
118
|
function createHonoHandler(route2) {
|
|
119
119
|
return async function(context, next) {
|
|
120
|
-
if (route2.page.endsWith("/+not-found")) {
|
|
121
|
-
var didCallNext = !1, response = await (0, import_serve.serveStatic)({
|
|
122
|
-
root: "./dist/client",
|
|
123
|
-
onFound: function(_path, c) {
|
|
124
|
-
c.header("Cache-Control", "public, immutable, max-age=31536000");
|
|
125
|
-
}
|
|
126
|
-
})(context, async function() {
|
|
127
|
-
didCallNext = !0;
|
|
128
|
-
});
|
|
129
|
-
if (response && !didCallNext)
|
|
130
|
-
return response;
|
|
131
|
-
}
|
|
132
120
|
try {
|
|
133
121
|
var request = context.req.raw;
|
|
122
|
+
if (route2.page.endsWith("/+not-found") || Reflect.ownKeys(route2.routeKeys).length > 0) {
|
|
123
|
+
var staticAssetResponse = await (0, import_vxrn.serveStaticAssets)({
|
|
124
|
+
context
|
|
125
|
+
});
|
|
126
|
+
if (staticAssetResponse)
|
|
127
|
+
return await (0, import_createHandleRequest.runMiddlewares)(requestHandlers, request, route2, async function() {
|
|
128
|
+
return staticAssetResponse;
|
|
129
|
+
});
|
|
130
|
+
}
|
|
134
131
|
if ((0, import_node_path.extname)(request.url) === ".js" || (0, import_node_path.extname)(request.url) === ".css")
|
|
135
132
|
return next();
|
|
136
|
-
var url = (0, import_createHandleRequest.getURLfromRequestURL)(request),
|
|
133
|
+
var url = (0, import_createHandleRequest.getURLfromRequestURL)(request), response = await function() {
|
|
137
134
|
if (url.pathname.endsWith(import_constants.LOADER_JS_POSTFIX_UNCACHED)) {
|
|
138
135
|
var originalUrl = (0, import_cleanUrl.getPathFromLoaderPath)(url.pathname), finalUrl = new URL(originalUrl, url.origin);
|
|
139
136
|
return resolveLoaderRoute(requestHandlers, request, finalUrl, route2);
|
|
@@ -147,21 +144,21 @@ url: ${url}`);
|
|
|
147
144
|
return resolvePageRoute(requestHandlers, request, url, route2);
|
|
148
145
|
}
|
|
149
146
|
}();
|
|
150
|
-
if (
|
|
151
|
-
if (isResponse(
|
|
152
|
-
if (isStatusRedirect(
|
|
153
|
-
var location = `${
|
|
154
|
-
return
|
|
147
|
+
if (response) {
|
|
148
|
+
if (isResponse(response)) {
|
|
149
|
+
if (isStatusRedirect(response.status)) {
|
|
150
|
+
var location = `${response.headers.get("location") || ""}`;
|
|
151
|
+
return response.headers.forEach(function(value, key) {
|
|
155
152
|
context.header(key, value);
|
|
156
|
-
}), context.redirect(location,
|
|
153
|
+
}), context.redirect(location, response.status);
|
|
157
154
|
}
|
|
158
155
|
if (isAPIRequest.get(request))
|
|
159
156
|
try {
|
|
160
|
-
return !
|
|
157
|
+
return !response.headers.has("cache-control") && !response.headers.has("Cache-Control") && response.headers.set("cache-control", "no-store"), response;
|
|
161
158
|
} catch (err) {
|
|
162
|
-
console.info(`Error updating cache header on api route "${context.req.path}" to no-store, it is ${
|
|
159
|
+
console.info(`Error updating cache header on api route "${context.req.path}" to no-store, it is ${response.headers.get("cache-control")}, continue`, err);
|
|
163
160
|
}
|
|
164
|
-
return
|
|
161
|
+
return response;
|
|
165
162
|
}
|
|
166
163
|
return next();
|
|
167
164
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/server/oneServe.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;sBAAmC,iCAGnC,mBAA8B,sBAC9B,eAA4C,uBAC5C,mBAA+D,yBAC/D,
|
|
5
|
-
"names": ["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", "entryServer", "getServerEntry", "entry", "render", "default", "apiCJS", "build", "api", "outputFormat", "requestHandlers", "handleAPI", "route", "apiFile", "join", "process", "cwd", "page", "loadMiddleware", "toAbsolute", "contextKey", "handleLoader", "request", "url", "loaderProps", "exports", "file", "loader", "console", "warn", "json", "JSON", "stringify", "handlePage", "type", "error", "Object", "keys", "exported", "serverJsPath", "loaderData", "preloads", "headers", "Headers", "set", "rendered", "mode", "path", "css", "Response", "status", "isNotFound", "err", "htmlPath", "pathname", "cleanPath", "html", "FSExtra", "readFile", "createHonoHandler", "next", "
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["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", "entryServer", "getServerEntry", "entry", "render", "default", "apiCJS", "build", "api", "outputFormat", "requestHandlers", "handleAPI", "route", "apiFile", "join", "process", "cwd", "page", "loadMiddleware", "toAbsolute", "contextKey", "handleLoader", "request", "url", "loaderProps", "exports", "file", "loader", "console", "warn", "json", "JSON", "stringify", "handlePage", "type", "error", "Object", "keys", "exported", "serverJsPath", "loaderData", "preloads", "headers", "Headers", "set", "rendered", "mode", "path", "css", "Response", "status", "isNotFound", "err", "htmlPath", "pathname", "cleanPath", "html", "FSExtra", "readFile", "createHonoHandler", "next", "raw", "endsWith", "Reflect", "ownKeys", "routeKeys", "length", "staticAssetResponse", "serveStaticAssets", "runMiddlewares", "extname", "getURLfromRequestURL", "response", "LOADER_JS_POSTFIX_UNCACHED", "originalUrl", "getPathFromLoaderPath", "finalUrl", "URL", "origin", "location", "forEach", "value", "key", "header", "has", "info", "compiledManifest", "compileManifest", "manifest", "apiRoutes", "urlPath", "put", "post", "delete", "patch", "urlCleanPath", "pageRoutes", "c", "PRELOAD_JS_POSTFIX", "body", "_iteratorNormalCompletion", "_didIteratorError", "_iteratorError", "_iterator", "_step", "compiledRegex", "test", "loaderRoute", "loaderServerPath", "resolved"]
|
|
6
6
|
}
|
|
@@ -34,7 +34,7 @@ function generateFileSystemRouteTypesPlugin(options) {
|
|
|
34
34
|
apply: "serve",
|
|
35
35
|
configureServer(server) {
|
|
36
36
|
const appDir = (0, import_node_path.join)(process.cwd(), (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options)),
|
|
37
|
-
outFile = (0, import_node_path.join)(process.cwd(), "routes.d.ts"),
|
|
37
|
+
outFile = (0, import_node_path.dirname)(appDir) !== process.cwd() ? (console.warn("Seems that the router root has been customized and is in a nested folder. For now we will generate the routes.d.ts file beside the app folder. This behavior might be changed in the future."), (0, import_node_path.join)((0, import_node_path.dirname)(appDir), "routes.d.ts")) : (0, import_node_path.join)(process.cwd(), "routes.d.ts"),
|
|
38
38
|
routerRoot = (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options),
|
|
39
39
|
fileWatcherChangeListener = (0, import_perfect_debounce.debounce)(async (type, path) => {
|
|
40
40
|
(type === "add" || type === "delete") && path.startsWith(appDir) && (0, import_generateRouteTypes.generateRouteTypes)(outFile, routerRoot);
|
|
@@ -24,7 +24,7 @@ function generateFileSystemRouteTypesPlugin(options) {
|
|
|
24
24
|
enforce: "post",
|
|
25
25
|
apply: "serve",
|
|
26
26
|
configureServer(server) {
|
|
27
|
-
const appDir = (0, import_node_path.join)(process.cwd(), (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options)), outFile = (0, import_node_path.join)(process.cwd(), "routes.d.ts"), routerRoot = (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options), fileWatcherChangeListener = (0, import_perfect_debounce.debounce)(async (type, path) => {
|
|
27
|
+
const appDir = (0, import_node_path.join)(process.cwd(), (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options)), outFile = (0, import_node_path.dirname)(appDir) !== process.cwd() ? (console.warn("Seems that the router root has been customized and is in a nested folder. For now we will generate the routes.d.ts file beside the app folder. This behavior might be changed in the future."), (0, import_node_path.join)((0, import_node_path.dirname)(appDir), "routes.d.ts")) : (0, import_node_path.join)(process.cwd(), "routes.d.ts"), routerRoot = (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options), fileWatcherChangeListener = (0, import_perfect_debounce.debounce)(async (type, path) => {
|
|
28
28
|
(type === "add" || type === "delete") && path.startsWith(appDir) && (0, import_generateRouteTypes.generateRouteTypes)(outFile, routerRoot);
|
|
29
29
|
}, 100);
|
|
30
30
|
return server.watcher.addListener("all", fileWatcherChangeListener), () => {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA8B,sBAC9B,0BAAyB,6BAGzB,4BAAmC,kDACnC,qCAA4C;AAErC,SAAS,mCAAmC,SAAoC;AACrF,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,IACT,OAAO;AAAA,IAEP,gBAAgB,QAAQ;AACtB,YAAM,aAAS,uBAAK,QAAQ,IAAI,OAAG,gEAA4B,OAAO,CAAC,GACjE,cACA,0BAAQ,MAAM,MAAM,QAAQ,IAAI,KAClC,QAAQ,KAAK,8LAA8L,OACpM,2BAAK,0BAAQ,MAAM,GAAG,aAAa,SAGrC,uBAAK,QAAQ,IAAI,GAAG,aAAa,GAGpC,iBAAa,gEAA4B,OAAO,GAGhD,gCAA4B,kCAAS,OAAO,MAAc,SAAiB;AAC/E,SAAI,SAAS,SAAS,SAAS,aACzB,KAAK,WAAW,MAAM,SAExB,8CAAmB,SAAS,UAAU;AAAA,MAG5C,GAAG,GAAG;AAEN,oBAAO,QAAQ,YAAY,OAAO,yBAAyB,GAEpD,MAAM;AAGX,0DAAmB,SAAS,UAAU;AAAA,MACxC;AAAA,IACF;AAAA,EACF;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -25,7 +25,9 @@ function generateFileSystemRouteTypesPlugin(options) {
|
|
|
25
25
|
enforce: "post",
|
|
26
26
|
apply: "serve",
|
|
27
27
|
configureServer(server) {
|
|
28
|
-
var appDir = (0, import_node_path.join)(process.cwd(), (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options)), outFile =
|
|
28
|
+
var appDir = (0, import_node_path.join)(process.cwd(), (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options)), outFile = function() {
|
|
29
|
+
return (0, import_node_path.dirname)(appDir) !== process.cwd() ? (console.warn("Seems that the router root has been customized and is in a nested folder. For now we will generate the routes.d.ts file beside the app folder. This behavior might be changed in the future."), (0, import_node_path.join)((0, import_node_path.dirname)(appDir), "routes.d.ts")) : (0, import_node_path.join)(process.cwd(), "routes.d.ts");
|
|
30
|
+
}(), routerRoot = (0, import_getRouterRootFromOneOptions.getRouterRootFromOneOptions)(options), fileWatcherChangeListener = (0, import_perfect_debounce.debounce)(async function(type, path) {
|
|
29
31
|
(type === "add" || type === "delete") && path.startsWith(appDir) && (0, import_generateRouteTypes.generateRouteTypes)(outFile, routerRoot);
|
|
30
32
|
}, 100);
|
|
31
33
|
return server.watcher.addListener("all", fileWatcherChangeListener), function() {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;;;;;
|
|
5
|
-
"names": ["generateFileSystemRouteTypesPlugin", "options", "name", "enforce", "apply", "configureServer", "server", "appDir", "join", "process", "cwd", "getRouterRootFromOneOptions", "outFile", "routerRoot", "fileWatcherChangeListener", "debounce", "type", "path", "startsWith", "generateRouteTypes", "watcher", "addListener"]
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;;;;;uBAA8B,sBAC9B,0BAAyB,6BAGzB,4BAAmC,kDACnC,qCAA4C;AAErC,SAASA,mCAAmCC,SAA0B;AAC3E,SAAO;IACLC,MAAM;IACNC,SAAS;IACTC,OAAO;IAEPC,gBAAgBC,QAAM;AACpB,UAAMC,aAASC,uBAAKC,QAAQC,IAAG,OAAIC,gEAA4BV,OAAAA,CAAAA,GACzDW,UAAW,WAAA;AACf,mBAAIC,0BAAQN,MAAAA,MAAYE,QAAQC,IAAG,KACjCI,QAAQC,KAAK,8LAAA,OACNP,2BAAKK,0BAAQN,MAAAA,GAAS,aAAA,SAGxBC,uBAAKC,QAAQC,IAAG,GAAI,aAAA;MAC7B,EAAA,GAEMM,iBAAaL,gEAA4BV,OAAAA,GAGzCgB,gCAA4BC,kCAAS,eAAOC,MAAcC,MAAAA;AAC9D,SAAID,SAAS,SAASA,SAAS,aACzBC,KAAKC,WAAWd,MAAAA,SAElBe,8CAAmBV,SAASI,UAAAA;MAGlC,GAAG,GAAA;AAEHV,oBAAOiB,QAAQC,YAAY,OAAOP,yBAAAA,GAE3B,WAAA;AAGLK,0DAAmBV,SAASI,UAAAA;MAC9B;IACF;EACF;AACF;",
|
|
5
|
+
"names": ["generateFileSystemRouteTypesPlugin", "options", "name", "enforce", "apply", "configureServer", "server", "appDir", "join", "process", "cwd", "getRouterRootFromOneOptions", "outFile", "dirname", "console", "warn", "routerRoot", "fileWatcherChangeListener", "debounce", "type", "path", "startsWith", "generateRouteTypes", "watcher", "addListener"]
|
|
6
6
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createHandleRequest.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,kCAAkC;AAK3C,SAAS,6BAA6B;AACtC,SAAS,kBAAkB;AAC3B,SAAS,mBAAmB;AAC5B,SAAS,oBAAoB,uBAAuB;AAmBpD,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -159,5 +159,5 @@ function getRouteParams(pathname, route) {
|
|
|
159
159
|
const match = new RegExp(route.namedRegex).exec(pathname);
|
|
160
160
|
return match ? Object.fromEntries(Object.entries(route.routeKeys).map(([key, value]) => [value, match.groups?.[key] || ""])) : {};
|
|
161
161
|
}
|
|
162
|
-
export { compileManifest, createHandleRequest, getURLfromRequestURL, resolveAPIRoute, resolveLoaderRoute, resolvePageRoute };
|
|
162
|
+
export { compileManifest, createHandleRequest, getURLfromRequestURL, resolveAPIRoute, resolveLoaderRoute, resolvePageRoute, runMiddlewares };
|
|
163
163
|
//# sourceMappingURL=createHandleRequest.mjs.map
|
|
@@ -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","middlewareModule","exported","default","contextKey","response","next","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","handlePage","getURLfromRequestURL","urlString","URL","get","compileRouteRegex","compiledRegex","RegExp","namedRegex","compileManifest","manifest","pageRoutes","map","apiRoutes","createHandleRequest","routerRoot","compiledManifest","handler","startsWith","apiRoute","find","test","method","endsWith","originalUrl","file","finalUrl","origin","routes","config","match","exec","groups","key","value","Object","entries","namedKey","routeKeys","fromEntries"],"sources":["../../src/createHandleRequest.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,0BAAA,QAAkC;AAK3C,SAASC,qBAAA,QAA6B;AACtC,SAASC,UAAA,QAAkB;AAC3B,SAASC,WAAA,QAAmB;AAC5B,SAASC,kBAAA,EAAoBC,eAAA,QAAuB;AAmBpD,
|
|
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","middlewareModule","exported","default","contextKey","response","next","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","handlePage","getURLfromRequestURL","urlString","URL","get","compileRouteRegex","compiledRegex","RegExp","namedRegex","compileManifest","manifest","pageRoutes","map","apiRoutes","createHandleRequest","routerRoot","compiledManifest","handler","startsWith","apiRoute","find","test","method","endsWith","originalUrl","file","finalUrl","origin","routes","config","match","exec","groups","key","value","Object","entries","namedKey","routeKeys","fromEntries"],"sources":["../../src/createHandleRequest.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -230,5 +230,5 @@ function getRouteParams(pathname, route) {
|
|
|
230
230
|
return [value, ((_match_groups = match.groups) === null || _match_groups === void 0 ? void 0 : _match_groups[key]) || ""];
|
|
231
231
|
})) : {};
|
|
232
232
|
}
|
|
233
|
-
export { compileManifest, createHandleRequest, getURLfromRequestURL, resolveAPIRoute, resolveLoaderRoute, resolvePageRoute };
|
|
233
|
+
export { compileManifest, createHandleRequest, getURLfromRequestURL, resolveAPIRoute, resolveLoaderRoute, resolvePageRoute, runMiddlewares };
|
|
234
234
|
//# sourceMappingURL=createHandleRequest.native.js.map
|
|
@@ -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","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":"AAAA,SAASA,0BAAA,QAAkC;AAK3C,SAASC,qBAAA,QAA6B;AACtC,SAASC,UAAA,QAAkB;AAC3B,SAASC,WAAA,QAAmB;AAC5B,SAASC,kBAAA,EAAoBC,eAAA,QAAuB;AAmBpD,
|
|
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,10 +1,15 @@
|
|
|
1
1
|
import { default as FSExtra } from "fs-extra";
|
|
2
2
|
import { extname, join } from "node:path";
|
|
3
|
-
import { getServerEntry
|
|
3
|
+
import { getServerEntry } from "vxrn/serve";
|
|
4
4
|
import { LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX } from "../constants";
|
|
5
|
-
import {
|
|
5
|
+
import {
|
|
6
|
+
compileManifest,
|
|
7
|
+
getURLfromRequestURL,
|
|
8
|
+
runMiddlewares
|
|
9
|
+
} from "../createHandleRequest";
|
|
6
10
|
import { getPathFromLoaderPath } from "../utils/cleanUrl";
|
|
7
11
|
import { toAbsolute } from "../utils/toAbsolute";
|
|
12
|
+
import { serveStaticAssets } from "vxrn";
|
|
8
13
|
async function oneServe(oneOptions, buildInfo, app) {
|
|
9
14
|
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;
|
|
10
15
|
if (redirects)
|
|
@@ -82,21 +87,18 @@ url: ${url}`);
|
|
|
82
87
|
};
|
|
83
88
|
function createHonoHandler(route) {
|
|
84
89
|
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
|
-
}
|
|
98
90
|
try {
|
|
99
91
|
const request = context.req.raw;
|
|
92
|
+
if (route.page.endsWith("/+not-found") || Reflect.ownKeys(route.routeKeys).length > 0) {
|
|
93
|
+
const staticAssetResponse = await serveStaticAssets({ context });
|
|
94
|
+
if (staticAssetResponse)
|
|
95
|
+
return await runMiddlewares(
|
|
96
|
+
requestHandlers,
|
|
97
|
+
request,
|
|
98
|
+
route,
|
|
99
|
+
async () => staticAssetResponse
|
|
100
|
+
);
|
|
101
|
+
}
|
|
100
102
|
if (extname(request.url) === ".js" || extname(request.url) === ".css")
|
|
101
103
|
return next();
|
|
102
104
|
const url = getURLfromRequestURL(request), response = await (() => {
|
|
@@ -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,10 +1,11 @@
|
|
|
1
1
|
import { default as FSExtra } from "fs-extra";
|
|
2
2
|
import { extname, join } from "node:path";
|
|
3
|
-
import { getServerEntry
|
|
3
|
+
import { getServerEntry } from "vxrn/serve";
|
|
4
4
|
import { LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX } from "../constants.mjs";
|
|
5
|
-
import { compileManifest, getURLfromRequestURL } from "../createHandleRequest.mjs";
|
|
5
|
+
import { compileManifest, getURLfromRequestURL, runMiddlewares } from "../createHandleRequest.mjs";
|
|
6
6
|
import { getPathFromLoaderPath } from "../utils/cleanUrl.mjs";
|
|
7
7
|
import { toAbsolute } from "../utils/toAbsolute.mjs";
|
|
8
|
+
import { serveStaticAssets } from "vxrn";
|
|
8
9
|
async function oneServe(oneOptions, buildInfo, app) {
|
|
9
10
|
const {
|
|
10
11
|
resolveAPIRoute,
|
|
@@ -109,20 +110,14 @@ url: ${url}`);
|
|
|
109
110
|
};
|
|
110
111
|
function createHonoHandler(route) {
|
|
111
112
|
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
|
-
}
|
|
124
113
|
try {
|
|
125
114
|
const request = context.req.raw;
|
|
115
|
+
if (route.page.endsWith("/+not-found") || Reflect.ownKeys(route.routeKeys).length > 0) {
|
|
116
|
+
const staticAssetResponse = await serveStaticAssets({
|
|
117
|
+
context
|
|
118
|
+
});
|
|
119
|
+
if (staticAssetResponse) return await runMiddlewares(requestHandlers, request, route, async () => staticAssetResponse);
|
|
120
|
+
}
|
|
126
121
|
if (extname(request.url) === ".js" || extname(request.url) === ".css") return next();
|
|
127
122
|
const url = getURLfromRequestURL(request),
|
|
128
123
|
response = await (() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["default","FSExtra","extname","join","getServerEntry","
|
|
1
|
+
{"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":"AAAA,SAASA,OAAA,IAAWC,OAAA,QAAe;AAGnC,SAASC,OAAA,EAASC,IAAA,QAAY;AAC9B,SAASC,cAAA,QAAmC;AAC5C,SAASC,0BAAA,EAA4BC,kBAAA,QAA0B;AAC/D,SACEC,eAAA,EACAC,oBAAA,EACAC,cAAA,QAEK;AAEP,SAASC,qBAAA,QAA6B;AACtC,SAASC,UAAA,QAAkB;AAG3B,SAASC,iBAAA,QAAyB;AAElC,eAAsBC,SAASC,UAAA,EAA+BC,SAAA,EAA0BC,GAAA,EAAW;EACjG,MAAM;MAAEC,eAAA;MAAiBC,kBAAA;MAAoBC;IAAiB,IAAI,MAAM,OACtE,4BACF;IACM;MAAEC;IAAW,IAAI,MAAM,OAAO,yBAAqB;IACnD;MAAEC;IAAiB,IAAI,MAAM,OAAO,uBAAmB;IAEvDC,YAAA,GAAe,mBAAIC,OAAA,CAAsB;IAGzCC,SAAA,GAAYV,UAAA,CAAWW,GAAA,EAAKD,SAAA;EAClC,IAAIA,SAAA,EACF,WAAWE,QAAA,IAAYF,SAAA,EACrBR,GAAA,CAAIW,GAAA,CAAID,QAAA,CAASE,MAAA,EAASC,OAAA,IAAY;IACpC,MAAMC,cAAA,GAAiBJ,QAAA,CAASK,WAAA,CAAYC,OAAA,CAAQ,SAAUC,KAAA,IAAU;MACtE,MAAMC,SAAA,GAAYD,KAAA,CAAME,SAAA,CAAU,CAAC;MACnC,OAAON,OAAA,CAAQO,GAAA,CAAIH,KAAA,CAAMC,SAAS,KAAK;IACzC,CAAC;IACD,OAAOL,OAAA,CAAQH,QAAA,CAASI,cAAA,EAAgBJ,QAAA,CAASW,SAAA,GAAY,MAAM,GAAG;EACxE,CAAC;EAIL,IAAI,CAACtB,SAAA,EACH,MAAM,IAAIuB,KAAA,CAAM,0CAA0C;EAG5D,MAAM;MAAEC,gBAAA;MAAkBC;IAAS,IAAIzB,SAAA;IAEjC0B,aAAA,GAAgB;MACpB,GAAG3B,UAAA;MACH4B,IAAA,EAAM;IACR;IAKMC,MAAA,IAFQ,MAAM,OADAvC,cAAA,CAAeqC,aAAa,IAG3BzC,OAAA,CAAQ2C,MAAA;IACvBC,MAAA,GAAS9B,UAAA,CAAW+B,KAAA,EAAOC,GAAA,EAAKC,YAAA,KAAiB;IAEjDC,eAAA,GAAmC;MACvC,MAAMC,UAAU;QAAEC;MAAM,GAAG;QAOzB,OAAO,MAAM,OANG/C,IAAA,CACdgD,OAAA,CAAQC,GAAA,CAAI,GACZ,QACA,OACAF,KAAA,CAAMG,IAAA,CAAKrB,OAAA,CAAQ,KAAK,GAAG,EAAEA,OAAA,CAAQ,KAAK,GAAG,KAAKY,MAAA,GAAS,SAAS,MACtE;MAEF;MAEA,MAAMU,eAAeJ,KAAA,EAAO;QAC1B,OAAO,MAAM,OAAOvC,UAAA,CAAWuC,KAAA,CAAMK,UAAU;MACjD;MAEA,MAAMC,aAAa;QAAEC,OAAA;QAASP,KAAA;QAAOQ,GAAA;QAAKC;MAAY,GAAG;QACvD,MAAMC,OAAA,GAAU,MAAM,OAAOjD,UAAA,CAAWR,IAAA,CAAK,MAAM,eAAe+C,KAAA,CAAMW,IAAI,CAAC;UAEvE;YAAEC;UAAO,IAAIF,OAAA;QAEnB,IAAI,CAACE,MAAA,EACH,OAAAC,OAAA,CAAQC,IAAA,CAAK,8BAA8Bd,KAAA,CAAMW,IAAI,GAC9C;QAGT,MAAMI,IAAA,GAAO,MAAMH,MAAA,CAAOH,WAAW;QAErC,OAAO,qCAAqCO,IAAA,CAAKC,SAAA,CAAUF,IAAI,CAAC;MAClE;MAEA,MAAMG,WAAW;QAAElB,KAAA;QAAOQ,GAAA;QAAKC;MAAY,GAAG;QAC5C,MAAMU,UAAA,GAAY9B,gBAAA,CAAiBW,KAAA,CAAMW,IAAI;QAE7C,IAAIX,KAAA,CAAMoB,IAAA,KAAS,OAAO;UACxB,IAAI,CAACD,UAAA,EACH,MAAAN,OAAA,CAAQQ,KAAA,CAAM,kBAAkBrB,KAAK,GAC/B,IAAIZ,KAAA,CACR,0BAA0BoB,GAAG,YAAYR,KAAA,CAAMW,IAAI;AAAA,IAAiBW,MAAA,CAAOC,IAAA,CAAKlC,gBAAgB,EAAEpC,IAAA,CAAK;AAAA,GAAM,CAAC,EAChH;UAGF,IAAI;YAEF,MAAMuE,UAAA,GAAa,OADF,MAAM,OAAO/D,UAAA,CAAW0D,UAAA,CAAUM,YAAY,IAC7Bb,MAAA,GAASH,WAAW;cAChDiB,SAAA,GAAWP,UAAA,CAAUQ,QAAA;cAErBC,OAAA,GAAU,IAAIC,OAAA,CAAQ;YAC5BD,OAAA,CAAQE,GAAA,CAAI,gBAAgB,WAAW;YAEvC,MAAMC,QAAA,GAAW,MAAMtC,MAAA,CAAO;cAC5BuC,IAAA,EAAMhC,KAAA,CAAMoB,IAAA;cACZI,UAAA;cACAf,WAAA;cACAwB,IAAA,EAAMxB,WAAA,EAAawB,IAAA,IAAQ;cAC3BN,QAAA,EAAAD,SAAA;cACAQ,GAAA,EAAKf,UAAA,CAAUe;YACjB,CAAC;YAED,OAAO,IAAIC,QAAA,CAASJ,QAAA,EAAU;cAC5BH,OAAA;cACAQ,MAAA,EAAQpC,KAAA,CAAMqC,UAAA,GAAa,MAAM;YACnC,CAAC;UACH,SAASC,GAAA,EAAK;YACZzB,OAAA,CAAQQ,KAAA,CAAM,mCAAmCrB,KAAA,CAAMW,IAAI;AAAA;AAAA,EAEnE2B,GAAA,EAAMC,KAAA,IAAYD,GAAG;AAAA;AAAA,OAEhB9B,GAAG,EAAE;UACJ;QACF,OAAO;UACL,MAAMgC,QAAA,GAAWlD,QAAA,CAASkB,GAAA,CAAIiC,QAAQ,KAAKnD,QAAA,CAAS6B,UAAA,EAAWuB,SAAS;UAExE,IAAIF,QAAA,EAAU;YACZ,MAAMG,IAAA,GAAO,MAAM5F,OAAA,CAAQ6F,QAAA,CAAS3F,IAAA,CAAK,eAAeuF,QAAQ,GAAG,OAAO;cACpEZ,OAAA,GAAU,IAAIC,OAAA,CAAQ;YAC5B,OAAAD,OAAA,CAAQE,GAAA,CAAI,gBAAgB,WAAW,GAChC,IAAIK,QAAA,CAASQ,IAAA,EAAM;cAAEf,OAAA;cAASQ,MAAA,EAAQpC,KAAA,CAAMqC,UAAA,GAAa,MAAM;YAAI,CAAC;UAC7E;QACF;MACF;IACF;EAEA,SAASQ,kBAAkB7C,KAAA,EAAkE;IAC3F,OAAO,OAAOrB,OAAA,EAASmE,IAAA,KAAS;MAC9B,IAAI;QACF,MAAMvC,OAAA,GAAU5B,OAAA,CAAQO,GAAA,CAAI6D,GAAA;QAE5B,IAAI/C,KAAA,CAAMG,IAAA,CAAK6C,QAAA,CAAS,aAAa,KAAKC,OAAA,CAAQC,OAAA,CAAQlD,KAAA,CAAMmD,SAAS,EAAEC,MAAA,GAAS,GAAG;UAKrF,MAAMC,mBAAA,GAAsB,MAAM3F,iBAAA,CAAkB;YAAEiB;UAAQ,CAAC;UAC/D,IAAI0E,mBAAA,EACF,OAAO,MAAM9F,cAAA,CACXuC,eAAA,EACAS,OAAA,EACAP,KAAA,EACA,YAAYqD,mBACd;QAEJ;QAIA,IAAIrG,OAAA,CAAQuD,OAAA,CAAQC,GAAG,MAAM,SAASxD,OAAA,CAAQuD,OAAA,CAAQC,GAAG,MAAM,QAC7D,OAAOsC,IAAA,CAAK;QAGd,MAAMtC,GAAA,GAAMlD,oBAAA,CAAqBiD,OAAO;UAElC+C,QAAA,GAAW,OAAO,MAAM;YAG5B,IAAI9C,GAAA,CAAIiC,QAAA,CAASO,QAAA,CAAS7F,0BAA0B,GAAG;cACrD,MAAMoG,WAAA,GAAc/F,qBAAA,CAAsBgD,GAAA,CAAIiC,QAAQ;gBAChDe,QAAA,GAAW,IAAIC,GAAA,CAAIF,WAAA,EAAa/C,GAAA,CAAIkD,MAAM;cAChD,OAAO1F,kBAAA,CAAmB8B,eAAA,EAAiBS,OAAA,EAASiD,QAAA,EAAUxD,KAAK;YACrE;YAEA,QAAQA,KAAA,CAAMoB,IAAA;cACZ,KAAK;gBACH,OAAOrD,eAAA,CAAgB+B,eAAA,EAAiBS,OAAA,EAASC,GAAA,EAAKR,KAAK;cAE7D,KAAK;cACL,KAAK;cACL,KAAK;gBACH,OAAO/B,gBAAA,CAAiB6B,eAAA,EAAiBS,OAAA,EAASC,GAAA,EAAKR,KAAK;YAEhE;UACF,GAAG;QAEH,IAAIsD,QAAA,EAAU;UACZ,IAAIpF,UAAA,CAAWoF,QAAQ,GAAG;YAGxB,IAAInF,gBAAA,CAAiBmF,QAAA,CAASlB,MAAM,GAAG;cACrC,MAAMuB,QAAA,GAAW,GAAGL,QAAA,CAAS1B,OAAA,CAAQnD,GAAA,CAAI,UAAU,KAAK,EAAE;cAC1D,OAAA6E,QAAA,CAAS1B,OAAA,CAAQgC,OAAA,CAAQ,CAACC,KAAA,EAAOC,GAAA,KAAQ;gBACvCnF,OAAA,CAAQoF,MAAA,CAAOD,GAAA,EAAKD,KAAK;cAC3B,CAAC,GACMlF,OAAA,CAAQH,QAAA,CAASmF,QAAA,EAAUL,QAAA,CAASlB,MAAM;YACnD;YAEA,IAAIhE,YAAA,CAAaK,GAAA,CAAI8B,OAAO,GAC1B,IAAI;cACF,OACE,CAAC+C,QAAA,CAAS1B,OAAA,CAAQoC,GAAA,CAAI,eAAe,KACrC,CAACV,QAAA,CAAS1B,OAAA,CAAQoC,GAAA,CAAI,eAAe,KAGrCV,QAAA,CAAS1B,OAAA,CAAQE,GAAA,CAAI,iBAAiB,UAAU,GAE3CwB,QAAA;YACT,SAAShB,GAAA,EAAK;cACZzB,OAAA,CAAQoD,IAAA,CACN,6CACEtF,OAAA,CAAQO,GAAA,CAAI+C,IACd,wBAAwBqB,QAAA,CAAS1B,OAAA,CAAQnD,GAAA,CAAI,eAAe,CAAC,cAC7D6D,GACF;YACF;YAGF,OAAOgB,QAAA;UACT;UAEA,OAAOR,IAAA,CAAK;QACd;MACF,SAASR,GAAA,EAAK;QACZzB,OAAA,CAAQQ,KAAA,CAAM,kCAAmCiB,GAAA,CAAYC,KAAQ,EAAE;MACzE;MAEA,OAAOO,IAAA,CAAK;IACd;EACF;EAEA,MAAMoB,gBAAA,GAAmB7G,eAAA,CAAgBQ,SAAA,CAAUsG,QAAQ;EAE3D,WAAWnE,KAAA,IAASkE,gBAAA,CAAiBE,SAAA,EACnCtG,GAAA,CAAIW,GAAA,CAAIuB,KAAA,CAAMqE,OAAA,EAASxB,iBAAA,CAAkB7C,KAAK,CAAC,GAC/ClC,GAAA,CAAIwG,GAAA,CAAItE,KAAA,CAAMqE,OAAA,EAASxB,iBAAA,CAAkB7C,KAAK,CAAC,GAC/ClC,GAAA,CAAIyG,IAAA,CAAKvE,KAAA,CAAMqE,OAAA,EAASxB,iBAAA,CAAkB7C,KAAK,CAAC,GAChDlC,GAAA,CAAI0G,MAAA,CAAOxE,KAAA,CAAMqE,OAAA,EAASxB,iBAAA,CAAkB7C,KAAK,CAAC,GAClDlC,GAAA,CAAI2G,KAAA,CAAMzE,KAAA,CAAMqE,OAAA,EAASxB,iBAAA,CAAkB7C,KAAK,CAAC,GAE7CA,KAAA,CAAMqE,OAAA,KAAYrE,KAAA,CAAM0E,YAAA,KAC1B5G,GAAA,CAAIW,GAAA,CAAIuB,KAAA,CAAM0E,YAAA,EAAc7B,iBAAA,CAAkB7C,KAAK,CAAC,GACpDlC,GAAA,CAAIwG,GAAA,CAAItE,KAAA,CAAM0E,YAAA,EAAc7B,iBAAA,CAAkB7C,KAAK,CAAC,GACpDlC,GAAA,CAAIyG,IAAA,CAAKvE,KAAA,CAAM0E,YAAA,EAAc7B,iBAAA,CAAkB7C,KAAK,CAAC,GACrDlC,GAAA,CAAI0G,MAAA,CAAOxE,KAAA,CAAM0E,YAAA,EAAc7B,iBAAA,CAAkB7C,KAAK,CAAC,GACvDlC,GAAA,CAAI2G,KAAA,CAAMzE,KAAA,CAAM0E,YAAA,EAAc7B,iBAAA,CAAkB7C,KAAK,CAAC;EAI1D,WAAWA,KAAA,IAASkE,gBAAA,CAAiBS,UAAA,EACnC7G,GAAA,CAAIW,GAAA,CAAIuB,KAAA,CAAMqE,OAAA,EAASxB,iBAAA,CAAkB7C,KAAK,CAAC,GAE3CA,KAAA,CAAMqE,OAAA,KAAYrE,KAAA,CAAM0E,YAAA,IAC1B5G,GAAA,CAAIW,GAAA,CAAIuB,KAAA,CAAM0E,YAAA,EAAc7B,iBAAA,CAAkB7C,KAAK,CAAC;EAIxD,MAAM;IAAE2B;EAAS,IAAI9D,SAAA;EAGrBC,GAAA,CAAIW,GAAA,CAAI,KAAK,OAAOmG,CAAA,EAAG9B,IAAA,KAAS;IAC9B,IAAI8B,CAAA,CAAE1F,GAAA,CAAI+C,IAAA,CAAKe,QAAA,CAAS5F,kBAAkB,KAEpC,CAACuE,QAAA,CAASiD,CAAA,CAAE1F,GAAA,CAAI+C,IAAI,GAEtB,OAAA2C,CAAA,CAAEb,MAAA,CAAO,gBAAgB,iBAAiB,GAC1Ca,CAAA,CAAExC,MAAA,CAAO,GAAG,GACLwC,CAAA,CAAEC,IAAA,CAAK,EAAE;IAIpB,IAAID,CAAA,CAAE1F,GAAA,CAAI+C,IAAA,CAAKe,QAAA,CAAS7F,0BAA0B,GAAG;MACnD,MAAMoD,OAAA,GAAUqE,CAAA,CAAE1F,GAAA,CAAI6D,GAAA;QAChBvC,GAAA,GAAMlD,oBAAA,CAAqBiD,OAAO;QAClCgD,WAAA,GAAc/F,qBAAA,CAAsBoH,CAAA,CAAE1F,GAAA,CAAI+C,IAAI;MAEpD,WAAWjC,KAAA,IAASkE,gBAAA,CAAiBS,UAAA,EAAY;QAM/C,IALI3E,KAAA,CAAMW,IAAA,KAAS,MAKf,CAACX,KAAA,CAAM8E,aAAA,CAAcC,IAAA,CAAKxB,WAAW,GACvC;QAIF,MAAMyB,WAAA,GAAc;YAClB,GAAGhF,KAAA;YACHW,IAAA,EAAMX,KAAA,CAAMiF,gBAAA,IAAoBL,CAAA,CAAE1F,GAAA,CAAI+C;UACxC;UAEMuB,QAAA,GAAW,IAAIC,GAAA,CAAIF,WAAA,EAAa/C,GAAA,CAAIkD,MAAM;QAEhD,IAAI;UAEF,OADiB,MAAM1F,kBAAA,CAAmB8B,eAAA,EAAiBS,OAAA,EAASiD,QAAA,EAAUwB,WAAW;QAE3F,SAAS1C,GAAA,EAAK;UACZ,OAAAzB,OAAA,CAAQQ,KAAA,CAAM,yBAAyBiB,GAAG,EAAE,GACrCQ,IAAA,CAAK;QACd;MACF;IACF;IAEA,OAAOA,IAAA,CAAK;EACd,CAAC;AACH","ignoreList":[]}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { default as FSExtra } from "fs-extra";
|
|
2
2
|
import { extname, join } from "node:path";
|
|
3
|
-
import { getServerEntry
|
|
3
|
+
import { getServerEntry } from "vxrn/serve";
|
|
4
4
|
import { LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX } from "../constants.native.js";
|
|
5
|
-
import { compileManifest, getURLfromRequestURL } from "../createHandleRequest.native.js";
|
|
5
|
+
import { compileManifest, getURLfromRequestURL, runMiddlewares } from "../createHandleRequest.native.js";
|
|
6
6
|
import { getPathFromLoaderPath } from "../utils/cleanUrl.native.js";
|
|
7
7
|
import { toAbsolute } from "../utils/toAbsolute.native.js";
|
|
8
|
+
import { serveStaticAssets } from "vxrn";
|
|
8
9
|
async function oneServe(oneOptions, buildInfo, app) {
|
|
9
10
|
var _oneOptions_web,
|
|
10
11
|
_oneOptions_build_api,
|
|
@@ -139,23 +140,19 @@ url: ${url}`);
|
|
|
139
140
|
};
|
|
140
141
|
function createHonoHandler(route2) {
|
|
141
142
|
return async function (context, next) {
|
|
142
|
-
if (route2.page.endsWith("/+not-found")) {
|
|
143
|
-
var didCallNext = !1,
|
|
144
|
-
response = await serveStatic({
|
|
145
|
-
root: "./dist/client",
|
|
146
|
-
onFound: function (_path, c) {
|
|
147
|
-
c.header("Cache-Control", "public, immutable, max-age=31536000");
|
|
148
|
-
}
|
|
149
|
-
})(context, async function () {
|
|
150
|
-
didCallNext = !0;
|
|
151
|
-
});
|
|
152
|
-
if (response && !didCallNext) return response;
|
|
153
|
-
}
|
|
154
143
|
try {
|
|
155
144
|
var request = context.req.raw;
|
|
145
|
+
if (route2.page.endsWith("/+not-found") || Reflect.ownKeys(route2.routeKeys).length > 0) {
|
|
146
|
+
var staticAssetResponse = await serveStaticAssets({
|
|
147
|
+
context
|
|
148
|
+
});
|
|
149
|
+
if (staticAssetResponse) return await runMiddlewares(requestHandlers, request, route2, async function () {
|
|
150
|
+
return staticAssetResponse;
|
|
151
|
+
});
|
|
152
|
+
}
|
|
156
153
|
if (extname(request.url) === ".js" || extname(request.url) === ".css") return next();
|
|
157
154
|
var url = getURLfromRequestURL(request),
|
|
158
|
-
|
|
155
|
+
response = await function () {
|
|
159
156
|
if (url.pathname.endsWith(LOADER_JS_POSTFIX_UNCACHED)) {
|
|
160
157
|
var originalUrl = getPathFromLoaderPath(url.pathname),
|
|
161
158
|
finalUrl = new URL(originalUrl, url.origin);
|
|
@@ -170,20 +167,20 @@ url: ${url}`);
|
|
|
170
167
|
return resolvePageRoute(requestHandlers, request, url, route2);
|
|
171
168
|
}
|
|
172
169
|
}();
|
|
173
|
-
if (
|
|
174
|
-
if (isResponse(
|
|
175
|
-
if (isStatusRedirect(
|
|
176
|
-
var location = `${
|
|
177
|
-
return
|
|
170
|
+
if (response) {
|
|
171
|
+
if (isResponse(response)) {
|
|
172
|
+
if (isStatusRedirect(response.status)) {
|
|
173
|
+
var location = `${response.headers.get("location") || ""}`;
|
|
174
|
+
return response.headers.forEach(function (value, key) {
|
|
178
175
|
context.header(key, value);
|
|
179
|
-
}), context.redirect(location,
|
|
176
|
+
}), context.redirect(location, response.status);
|
|
180
177
|
}
|
|
181
178
|
if (isAPIRequest.get(request)) try {
|
|
182
|
-
return !
|
|
179
|
+
return !response.headers.has("cache-control") && !response.headers.has("Cache-Control") && response.headers.set("cache-control", "no-store"), response;
|
|
183
180
|
} catch (err) {
|
|
184
|
-
console.info(`Error updating cache header on api route "${context.req.path}" to no-store, it is ${
|
|
181
|
+
console.info(`Error updating cache header on api route "${context.req.path}" to no-store, it is ${response.headers.get("cache-control")}, continue`, err);
|
|
185
182
|
}
|
|
186
|
-
return
|
|
183
|
+
return response;
|
|
187
184
|
}
|
|
188
185
|
return next();
|
|
189
186
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["default","FSExtra","extname","join","getServerEntry","
|
|
1
|
+
{"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":[]}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { join } from "node:path";
|
|
1
|
+
import { dirname, join } from "node:path";
|
|
2
2
|
import { debounce } from "perfect-debounce";
|
|
3
3
|
import { generateRouteTypes } from "../../typed-routes/generateRouteTypes";
|
|
4
4
|
import { getRouterRootFromOneOptions } from "../../utils/getRouterRootFromOneOptions";
|
|
@@ -8,7 +8,7 @@ function generateFileSystemRouteTypesPlugin(options) {
|
|
|
8
8
|
enforce: "post",
|
|
9
9
|
apply: "serve",
|
|
10
10
|
configureServer(server) {
|
|
11
|
-
const appDir = join(process.cwd(), getRouterRootFromOneOptions(options)), outFile = join(process.cwd(), "routes.d.ts"), routerRoot = getRouterRootFromOneOptions(options), fileWatcherChangeListener = debounce(async (type, path) => {
|
|
11
|
+
const appDir = join(process.cwd(), getRouterRootFromOneOptions(options)), outFile = dirname(appDir) !== process.cwd() ? (console.warn("Seems that the router root has been customized and is in a nested folder. For now we will generate the routes.d.ts file beside the app folder. This behavior might be changed in the future."), join(dirname(appDir), "routes.d.ts")) : join(process.cwd(), "routes.d.ts"), routerRoot = getRouterRootFromOneOptions(options), fileWatcherChangeListener = debounce(async (type, path) => {
|
|
12
12
|
(type === "add" || type === "delete") && path.startsWith(appDir) && generateRouteTypes(outFile, routerRoot);
|
|
13
13
|
}, 100);
|
|
14
14
|
return server.watcher.addListener("all", fileWatcherChangeListener), () => {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,YAAY;
|
|
4
|
+
"mappings": "AAAA,SAAS,SAAS,YAAY;AAC9B,SAAS,gBAAgB;AAGzB,SAAS,0BAA0B;AACnC,SAAS,mCAAmC;AAErC,SAAS,mCAAmC,SAAoC;AACrF,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,IACT,OAAO;AAAA,IAEP,gBAAgB,QAAQ;AACtB,YAAM,SAAS,KAAK,QAAQ,IAAI,GAAG,4BAA4B,OAAO,CAAC,GACjE,UACA,QAAQ,MAAM,MAAM,QAAQ,IAAI,KAClC,QAAQ,KAAK,8LAA8L,GACpM,KAAK,QAAQ,MAAM,GAAG,aAAa,KAGrC,KAAK,QAAQ,IAAI,GAAG,aAAa,GAGpC,aAAa,4BAA4B,OAAO,GAGhD,4BAA4B,SAAS,OAAO,MAAc,SAAiB;AAC/E,SAAI,SAAS,SAAS,SAAS,aACzB,KAAK,WAAW,MAAM,KAExB,mBAAmB,SAAS,UAAU;AAAA,MAG5C,GAAG,GAAG;AAEN,oBAAO,QAAQ,YAAY,OAAO,yBAAyB,GAEpD,MAAM;AAGX,2BAAmB,SAAS,UAAU;AAAA,MACxC;AAAA,IACF;AAAA,EACF;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { join } from "node:path";
|
|
1
|
+
import { dirname, join } from "node:path";
|
|
2
2
|
import { debounce } from "perfect-debounce";
|
|
3
3
|
import { generateRouteTypes } from "../../typed-routes/generateRouteTypes.mjs";
|
|
4
4
|
import { getRouterRootFromOneOptions } from "../../utils/getRouterRootFromOneOptions.mjs";
|
|
@@ -9,7 +9,7 @@ function generateFileSystemRouteTypesPlugin(options) {
|
|
|
9
9
|
apply: "serve",
|
|
10
10
|
configureServer(server) {
|
|
11
11
|
const appDir = join(process.cwd(), getRouterRootFromOneOptions(options)),
|
|
12
|
-
outFile = join(process.cwd(), "routes.d.ts"),
|
|
12
|
+
outFile = dirname(appDir) !== process.cwd() ? (console.warn("Seems that the router root has been customized and is in a nested folder. For now we will generate the routes.d.ts file beside the app folder. This behavior might be changed in the future."), join(dirname(appDir), "routes.d.ts")) : join(process.cwd(), "routes.d.ts"),
|
|
13
13
|
routerRoot = getRouterRootFromOneOptions(options),
|
|
14
14
|
fileWatcherChangeListener = debounce(async (type, path) => {
|
|
15
15
|
(type === "add" || type === "delete") && path.startsWith(appDir) && generateRouteTypes(outFile, routerRoot);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["join","debounce","generateRouteTypes","getRouterRootFromOneOptions","generateFileSystemRouteTypesPlugin","options","name","enforce","apply","configureServer","server","appDir","process","cwd","outFile","routerRoot","fileWatcherChangeListener","type","path","startsWith","watcher","addListener"],"sources":["../../../../src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,IAAA,QAAY;
|
|
1
|
+
{"version":3,"names":["dirname","join","debounce","generateRouteTypes","getRouterRootFromOneOptions","generateFileSystemRouteTypesPlugin","options","name","enforce","apply","configureServer","server","appDir","process","cwd","outFile","console","warn","routerRoot","fileWatcherChangeListener","type","path","startsWith","watcher","addListener"],"sources":["../../../../src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,OAAA,EAASC,IAAA,QAAY;AAC9B,SAASC,QAAA,QAAgB;AAGzB,SAASC,kBAAA,QAA0B;AACnC,SAASC,2BAAA,QAAmC;AAErC,SAASC,mCAAmCC,OAAA,EAAoC;EACrF,OAAO;IACLC,IAAA,EAAM;IACNC,OAAA,EAAS;IACTC,KAAA,EAAO;IAEPC,gBAAgBC,MAAA,EAAQ;MACtB,MAAMC,MAAA,GAASX,IAAA,CAAKY,OAAA,CAAQC,GAAA,CAAI,GAAGV,2BAAA,CAA4BE,OAAO,CAAC;QACjES,OAAA,GACAf,OAAA,CAAQY,MAAM,MAAMC,OAAA,CAAQC,GAAA,CAAI,KAClCE,OAAA,CAAQC,IAAA,CAAK,8LAA8L,GACpMhB,IAAA,CAAKD,OAAA,CAAQY,MAAM,GAAG,aAAa,KAGrCX,IAAA,CAAKY,OAAA,CAAQC,GAAA,CAAI,GAAG,aAAa;QAGpCI,UAAA,GAAad,2BAAA,CAA4BE,OAAO;QAGhDa,yBAAA,GAA4BjB,QAAA,CAAS,OAAOkB,IAAA,EAAcC,IAAA,KAAiB;UAC/E,CAAID,IAAA,KAAS,SAASA,IAAA,KAAS,aACzBC,IAAA,CAAKC,UAAA,CAAWV,MAAM,KAExBT,kBAAA,CAAmBY,OAAA,EAASG,UAAU;QAG5C,GAAG,GAAG;MAEN,OAAAP,MAAA,CAAOY,OAAA,CAAQC,WAAA,CAAY,OAAOL,yBAAyB,GAEpD,MAAM;QAGXhB,kBAAA,CAAmBY,OAAA,EAASG,UAAU;MACxC;IACF;EACF;AACF","ignoreList":[]}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { join } from "node:path";
|
|
1
|
+
import { dirname, join } from "node:path";
|
|
2
2
|
import { debounce } from "perfect-debounce";
|
|
3
3
|
import { generateRouteTypes } from "../../typed-routes/generateRouteTypes.native.js";
|
|
4
4
|
import { getRouterRootFromOneOptions } from "../../utils/getRouterRootFromOneOptions.native.js";
|
|
@@ -9,7 +9,9 @@ function generateFileSystemRouteTypesPlugin(options) {
|
|
|
9
9
|
apply: "serve",
|
|
10
10
|
configureServer(server) {
|
|
11
11
|
var appDir = join(process.cwd(), getRouterRootFromOneOptions(options)),
|
|
12
|
-
outFile =
|
|
12
|
+
outFile = function () {
|
|
13
|
+
return dirname(appDir) !== process.cwd() ? (console.warn("Seems that the router root has been customized and is in a nested folder. For now we will generate the routes.d.ts file beside the app folder. This behavior might be changed in the future."), join(dirname(appDir), "routes.d.ts")) : join(process.cwd(), "routes.d.ts");
|
|
14
|
+
}(),
|
|
13
15
|
routerRoot = getRouterRootFromOneOptions(options),
|
|
14
16
|
fileWatcherChangeListener = debounce(async function (type, path) {
|
|
15
17
|
(type === "add" || type === "delete") && path.startsWith(appDir) && generateRouteTypes(outFile, routerRoot);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["join","debounce","generateRouteTypes","getRouterRootFromOneOptions","generateFileSystemRouteTypesPlugin","options","name","enforce","apply","configureServer","server","appDir","process","cwd","outFile","routerRoot","fileWatcherChangeListener","type","path","startsWith","watcher","addListener"],"sources":["../../../../src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,IAAA,QAAY;
|
|
1
|
+
{"version":3,"names":["dirname","join","debounce","generateRouteTypes","getRouterRootFromOneOptions","generateFileSystemRouteTypesPlugin","options","name","enforce","apply","configureServer","server","appDir","process","cwd","outFile","console","warn","routerRoot","fileWatcherChangeListener","type","path","startsWith","watcher","addListener"],"sources":["../../../../src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,OAAA,EAASC,IAAA,QAAY;AAC9B,SAASC,QAAA,QAAgB;AAGzB,SAASC,kBAAA,QAA0B;AACnC,SAASC,2BAAA,QAAmC;AAErC,SAASC,mCAAmCC,OAAA,EAAoC;EACrF,OAAO;IACLC,IAAA,EAAM;IACNC,OAAA,EAAS;IACTC,KAAA,EAAO;IAEPC,gBAAgBC,MAAA,EAAQ;MACtB,IAAAC,MAAM,GAAAX,IAAS,CAAAY,OAAK,CAAAC,GAAQ,IAAIV,2BAAG,CAAAE,OAA4B,EAAO;QAACS,OACjE,eACQ;UAYZ,OAAIf,OAAS,CAAAY,MAAS,MAAAC,OAAS,CAAAC,GAAA,MACzBE,OAAK,CAAAC,IAAA,CAAW,8LAEoB,GAAAhB,IAAA,CAAAD,OAAA,CAAAY,MAAA,qBAAAX,IAAA,CAAAY,OAAA,CAAAC,GAAA;QAG5C,GAAG;QAAAI,UAAG,GAAAd,2BAAA,CAAAE,OAAA;QAAAa,yBAAA,GAAAjB,QAAA,iBAAAkB,IAAA,EAAAC,IAAA;UAEN,CAAAD,IAAA,UAAO,IAAAA,IAAQ,aAAY,KAAOC,IAAA,CAAAC,UAAA,CAAAV,MAAA,CAAyB,IAEpDT,kBAAM,CAAAY,OAAA,EAAAG,UAAA;QAGX;MACF,OAAAP,MAAA,CAAAY,OAAA,CAAAC,WAAA,QAAAL,yBAAA;QACFhB,kBAAA,CAAAY,OAAA,EAAAG,UAAA;MACF;IACF","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "one",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.485",
|
|
4
4
|
"license": "BSD-3-Clause",
|
|
5
5
|
"sideEffects": [
|
|
6
6
|
"setup.mjs",
|
|
@@ -96,15 +96,15 @@
|
|
|
96
96
|
"@react-navigation/routers": "~7",
|
|
97
97
|
"@swc/core": "^1.10.4",
|
|
98
98
|
"@ungap/structured-clone": "^1.2.0",
|
|
99
|
-
"@vxrn/compiler": "1.1.
|
|
100
|
-
"@vxrn/resolve": "1.1.
|
|
101
|
-
"@vxrn/tslib-lite": "1.1.
|
|
102
|
-
"@vxrn/universal-color-scheme": "1.1.
|
|
103
|
-
"@vxrn/use-isomorphic-layout-effect": "1.1.
|
|
99
|
+
"@vxrn/compiler": "1.1.485",
|
|
100
|
+
"@vxrn/resolve": "1.1.485",
|
|
101
|
+
"@vxrn/tslib-lite": "1.1.485",
|
|
102
|
+
"@vxrn/universal-color-scheme": "1.1.485",
|
|
103
|
+
"@vxrn/use-isomorphic-layout-effect": "1.1.485",
|
|
104
104
|
"babel-dead-code-elimination": "^1.0.9",
|
|
105
105
|
"citty": "^0.1.6",
|
|
106
106
|
"core-js": "^3.38.1",
|
|
107
|
-
"create-vxrn": "1.1.
|
|
107
|
+
"create-vxrn": "1.1.485",
|
|
108
108
|
"escape-string-regexp": "^5.0.0",
|
|
109
109
|
"expo-linking": "~6.3.1",
|
|
110
110
|
"expo-modules-core": "2.1.2",
|
|
@@ -130,7 +130,7 @@
|
|
|
130
130
|
"vite": "^6.1.0",
|
|
131
131
|
"vite-plugin-barrel": "^0.4.1",
|
|
132
132
|
"vite-tsconfig-paths": "^5.0.1",
|
|
133
|
-
"vxrn": "1.1.
|
|
133
|
+
"vxrn": "1.1.485",
|
|
134
134
|
"ws": "^8.18.0",
|
|
135
135
|
"xxhashjs": "^0.2.2"
|
|
136
136
|
},
|
|
@@ -25,7 +25,7 @@ type RequestHandlerProps<RouteExtraProps extends Object = {}> = {
|
|
|
25
25
|
|
|
26
26
|
type RequestHandlerResponse = null | string | Response
|
|
27
27
|
|
|
28
|
-
async function runMiddlewares(
|
|
28
|
+
export async function runMiddlewares(
|
|
29
29
|
handlers: RequestHandlers,
|
|
30
30
|
request: Request,
|
|
31
31
|
route: RouteInfo,
|
package/src/server/oneServe.ts
CHANGED
|
@@ -4,12 +4,18 @@ import type { BlankEnv } from 'hono/types'
|
|
|
4
4
|
import { extname, join } from 'node:path'
|
|
5
5
|
import { getServerEntry, serveStatic } from 'vxrn/serve'
|
|
6
6
|
import { LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX } from '../constants'
|
|
7
|
-
import {
|
|
7
|
+
import {
|
|
8
|
+
compileManifest,
|
|
9
|
+
getURLfromRequestURL,
|
|
10
|
+
runMiddlewares,
|
|
11
|
+
type RequestHandlers,
|
|
12
|
+
} from '../createHandleRequest'
|
|
8
13
|
import type { RenderAppProps } from '../types'
|
|
9
14
|
import { getPathFromLoaderPath } from '../utils/cleanUrl'
|
|
10
15
|
import { toAbsolute } from '../utils/toAbsolute'
|
|
11
16
|
import type { One } from '../vite/types'
|
|
12
17
|
import type { RouteInfoCompiled } from './createRoutesManifest'
|
|
18
|
+
import { serveStaticAssets } from 'vxrn'
|
|
13
19
|
|
|
14
20
|
export async function oneServe(oneOptions: One.PluginOptions, buildInfo: One.BuildInfo, app: Hono) {
|
|
15
21
|
const { resolveAPIRoute, resolveLoaderRoute, resolvePageRoute } = await import(
|
|
@@ -135,26 +141,25 @@ url: ${url}`)
|
|
|
135
141
|
|
|
136
142
|
function createHonoHandler(route: RouteInfoCompiled): MiddlewareHandler<BlankEnv, never, {}> {
|
|
137
143
|
return async (context, next) => {
|
|
138
|
-
if (route.page.endsWith('/+not-found')) {
|
|
139
|
-
let didCallNext = false
|
|
140
|
-
|
|
141
|
-
const response = await serveStatic({
|
|
142
|
-
root: './dist/client',
|
|
143
|
-
onFound: (_path, c) => {
|
|
144
|
-
c.header('Cache-Control', `public, immutable, max-age=31536000`)
|
|
145
|
-
},
|
|
146
|
-
})(context, async () => {
|
|
147
|
-
didCallNext = true
|
|
148
|
-
})
|
|
149
|
-
|
|
150
|
-
if (response && !didCallNext) {
|
|
151
|
-
return response
|
|
152
|
-
}
|
|
153
|
-
}
|
|
154
|
-
|
|
155
144
|
try {
|
|
156
145
|
const request = context.req.raw
|
|
157
146
|
|
|
147
|
+
if (route.page.endsWith('/+not-found') || Reflect.ownKeys(route.routeKeys).length > 0) {
|
|
148
|
+
// Static assets should have the highest priority - which is the behavior of the dev server.
|
|
149
|
+
// But if we handle every matching static asset here, it seems to break some of the static routes.
|
|
150
|
+
// So we only handle it if there's a matching not-found or dynamic route, to prevent One from taking over the static asset.
|
|
151
|
+
// If there's no matching not-found or dynamic route, it's very likely that One won't handle it and will fallback to VxRN serving the static asset so it will also work.
|
|
152
|
+
const staticAssetResponse = await serveStaticAssets({ context })
|
|
153
|
+
if (staticAssetResponse) {
|
|
154
|
+
return await runMiddlewares(
|
|
155
|
+
requestHandlers,
|
|
156
|
+
request,
|
|
157
|
+
route,
|
|
158
|
+
async () => staticAssetResponse
|
|
159
|
+
)
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
|
|
158
163
|
// for js we want to serve our js files directly, as they can match a route on accident
|
|
159
164
|
// middleware my want to handle this eventually as well but for now this is a fine balance
|
|
160
165
|
if (extname(request.url) === '.js' || extname(request.url) === '.css') {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { join } from 'node:path'
|
|
1
|
+
import { dirname, join } from 'node:path'
|
|
2
2
|
import { debounce } from 'perfect-debounce'
|
|
3
3
|
import type { Plugin } from 'vite'
|
|
4
4
|
import type { One } from '../types'
|
|
@@ -13,7 +13,14 @@ export function generateFileSystemRouteTypesPlugin(options: One.PluginOptions):
|
|
|
13
13
|
|
|
14
14
|
configureServer(server) {
|
|
15
15
|
const appDir = join(process.cwd(), getRouterRootFromOneOptions(options))
|
|
16
|
-
const outFile =
|
|
16
|
+
const outFile = (() => {
|
|
17
|
+
if (dirname(appDir) !== process.cwd()) {
|
|
18
|
+
console.warn('Seems that the router root has been customized and is in a nested folder. For now we will generate the routes.d.ts file beside the app folder. This behavior might be changed in the future.')
|
|
19
|
+
return join(dirname(appDir), 'routes.d.ts')
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
return join(process.cwd(), 'routes.d.ts')
|
|
23
|
+
})()
|
|
17
24
|
|
|
18
25
|
const routerRoot = getRouterRootFromOneOptions(options)
|
|
19
26
|
|
|
@@ -15,6 +15,7 @@ type RequestHandlerProps<RouteExtraProps extends Object = {}> = {
|
|
|
15
15
|
loaderProps?: LoaderProps;
|
|
16
16
|
};
|
|
17
17
|
type RequestHandlerResponse = null | string | Response;
|
|
18
|
+
export declare function runMiddlewares(handlers: RequestHandlers, request: Request, route: RouteInfo, getResponse: () => Promise<Response>): Promise<Response>;
|
|
18
19
|
export declare function resolveAPIRoute(handlers: RequestHandlers, request: Request, url: URL, route: RouteInfoCompiled): Promise<Response>;
|
|
19
20
|
export declare function resolveLoaderRoute(handlers: RequestHandlers, request: Request, url: URL, route: RouteInfoCompiled): Promise<Response>;
|
|
20
21
|
export declare function resolvePageRoute(handlers: RequestHandlers, request: Request, url: URL, route: RouteInfoCompiled): Promise<Response>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createHandleRequest.d.ts","sourceRoot":"","sources":["../src/createHandleRequest.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAK1C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAE7C,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IACzD,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IAC3D,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IACxD,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;CACpD,CAAA;AAED,KAAK,mBAAmB,CAAC,eAAe,SAAS,MAAM,GAAG,EAAE,IAAI;IAC9D,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,GAAG,eAAe,CAAA;IAC1C,GAAG,EAAE,GAAG,CAAA;IACR,WAAW,CAAC,EAAE,WAAW,CAAA;CAC1B,CAAA;AAED,KAAK,sBAAsB,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ,CAAA;
|
|
1
|
+
{"version":3,"file":"createHandleRequest.d.ts","sourceRoot":"","sources":["../src/createHandleRequest.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAK1C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAE7C,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IACzD,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IAC3D,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IACxD,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;CACpD,CAAA;AAED,KAAK,mBAAmB,CAAC,eAAe,SAAS,MAAM,GAAG,EAAE,IAAI;IAC9D,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,GAAG,eAAe,CAAA;IAC1C,GAAG,EAAE,GAAG,CAAA;IACR,WAAW,CAAC,EAAE,WAAW,CAAA;CAC1B,CAAA;AAED,KAAK,sBAAsB,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ,CAAA;AAEtD,wBAAsB,cAAc,CAClC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,SAAS,EAChB,WAAW,EAAE,MAAM,OAAO,CAAC,QAAQ,CAAC,GACnC,OAAO,CAAC,QAAQ,CAAC,CA8CnB;AAED,wBAAsB,eAAe,CACnC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,iBAAiB,qBAqCzB;AAED,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,iBAAiB,qBAkCzB;AAED,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,iBAAiB,qBAkBzB;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,OAMpD;AASD,wBAAgB,eAAe,CAAC,QAAQ,EAAE;IAAE,UAAU,EAAE,SAAS,EAAE,CAAC;IAAC,SAAS,EAAE,SAAS,EAAE,CAAA;CAAE,GAAG;IAC9F,UAAU,EAAE,iBAAiB,EAAE,CAAA;IAC/B,SAAS,EAAE,iBAAiB,EAAE,CAAA;CAC/B,CAKA;AAGD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,eAAe,EAAE,EAAE,UAAU,EAAE,EAAE;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE;;uBASlD,OAAO,KAAG,OAAO,CAAC,sBAAsB,CAAC;EAqE3F"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oneServe.d.ts","sourceRoot":"","sources":["../../src/server/oneServe.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAqB,MAAM,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"oneServe.d.ts","sourceRoot":"","sources":["../../src/server/oneServe.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAqB,MAAM,MAAM,CAAA;AAcnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAIxC,wBAAsB,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,aAAa,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,iBAoShG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateFileSystemRouteTypesPlugin.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAA;AAInC,wBAAgB,kCAAkC,CAAC,OAAO,EAAE,GAAG,CAAC,aAAa,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"generateFileSystemRouteTypesPlugin.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAA;AAInC,wBAAgB,kCAAkC,CAAC,OAAO,EAAE,GAAG,CAAC,aAAa,GAAG,MAAM,CAsCrF"}
|