one 1.1.469 → 1.1.470
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/cli/build.cjs +9 -1
- package/dist/cjs/cli/build.js +9 -2
- package/dist/cjs/cli/build.js.map +1 -1
- package/dist/cjs/cli/build.native.js +7 -1
- package/dist/cjs/cli/build.native.js.map +2 -2
- package/dist/cjs/cli/buildPage.cjs +1 -0
- package/dist/cjs/cli/buildPage.js +1 -0
- package/dist/cjs/cli/buildPage.js.map +1 -1
- package/dist/cjs/cli/buildPage.native.js +1 -0
- package/dist/cjs/cli/buildPage.native.js.map +1 -1
- package/dist/cjs/router/Route.js.map +1 -1
- package/dist/cjs/router/Route.native.js.map +1 -1
- package/dist/cjs/server/getServerManifest.cjs +2 -2
- package/dist/cjs/server/getServerManifest.js +2 -2
- package/dist/cjs/server/getServerManifest.js.map +1 -1
- package/dist/cjs/server/getServerManifest.native.js +2 -2
- package/dist/cjs/server/getServerManifest.native.js.map +2 -2
- package/dist/cjs/server/oneServe.cjs +13 -7
- package/dist/cjs/server/oneServe.js +13 -8
- package/dist/cjs/server/oneServe.js.map +1 -1
- package/dist/cjs/server/oneServe.native.js +12 -7
- package/dist/cjs/server/oneServe.native.js.map +2 -2
- package/dist/esm/cli/build.js +9 -2
- package/dist/esm/cli/build.js.map +1 -1
- package/dist/esm/cli/build.mjs +9 -1
- package/dist/esm/cli/build.mjs.map +1 -1
- package/dist/esm/cli/build.native.js +7 -1
- package/dist/esm/cli/build.native.js.map +1 -1
- package/dist/esm/cli/buildPage.js +1 -0
- package/dist/esm/cli/buildPage.js.map +1 -1
- package/dist/esm/cli/buildPage.mjs +1 -0
- package/dist/esm/cli/buildPage.mjs.map +1 -1
- package/dist/esm/cli/buildPage.native.js +1 -0
- package/dist/esm/cli/buildPage.native.js.map +1 -1
- package/dist/esm/router/Route.js.map +1 -1
- package/dist/esm/router/Route.mjs.map +1 -1
- package/dist/esm/router/Route.native.js.map +1 -1
- package/dist/esm/server/getServerManifest.js +2 -2
- package/dist/esm/server/getServerManifest.js.map +1 -1
- package/dist/esm/server/getServerManifest.mjs +2 -2
- package/dist/esm/server/getServerManifest.mjs.map +1 -1
- package/dist/esm/server/getServerManifest.native.js +2 -2
- package/dist/esm/server/getServerManifest.native.js.map +1 -1
- package/dist/esm/server/oneServe.js +13 -8
- package/dist/esm/server/oneServe.js.map +1 -1
- package/dist/esm/server/oneServe.mjs +13 -7
- package/dist/esm/server/oneServe.mjs.map +1 -1
- package/dist/esm/server/oneServe.native.js +13 -7
- package/dist/esm/server/oneServe.native.js.map +1 -1
- package/package.json +8 -8
- package/src/cli/build.ts +8 -2
- package/src/cli/buildPage.ts +1 -0
- package/src/router/Route.tsx +2 -3
- package/src/server/getServerManifest.ts +2 -6
- package/src/server/oneServe.ts +10 -5
- package/src/vite/types.ts +2 -1
- package/types/cli/build.d.ts.map +1 -1
- package/types/cli/buildPage.d.ts.map +1 -1
- package/types/router/Route.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/vite/types.d.ts +2 -1
- package/types/vite/types.d.ts.map +1 -1
@@ -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,
|
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":[]}
|
@@ -44,8 +44,10 @@ async function oneServe(oneOptions, buildInfo, app) {
|
|
44
44
|
const buildInfo2 = routeToBuildInfo[route.file];
|
45
45
|
if (route.type === "ssr") {
|
46
46
|
if (!buildInfo2)
|
47
|
-
throw new Error(
|
48
|
-
`No buildinfo found for ${url}, route: ${route.
|
47
|
+
throw console.error("Error in route", route), new Error(
|
48
|
+
`No buildinfo found for ${url}, route: ${route.file}, in keys:
|
49
|
+
${Object.keys(routeToBuildInfo).join(`
|
50
|
+
`)}`
|
49
51
|
);
|
50
52
|
try {
|
51
53
|
const loaderData = await (await import(toAbsolute(buildInfo2.serverJsPath))).loader?.(loaderProps), preloads2 = buildInfo2.preloads, headers = new Headers();
|
@@ -55,14 +57,15 @@ async function oneServe(oneOptions, buildInfo, app) {
|
|
55
57
|
loaderData,
|
56
58
|
loaderProps,
|
57
59
|
path: loaderProps?.path || "/",
|
58
|
-
preloads: preloads2
|
60
|
+
preloads: preloads2,
|
61
|
+
css: buildInfo2.css
|
59
62
|
});
|
60
63
|
return new Response(rendered, {
|
61
64
|
headers,
|
62
65
|
status: route.isNotFound ? 404 : 200
|
63
66
|
});
|
64
67
|
} catch (err) {
|
65
|
-
console.error(`[one] Error rendering SSR route ${route.
|
68
|
+
console.error(`[one] Error rendering SSR route ${route.file}
|
66
69
|
|
67
70
|
${err?.stack ?? err}
|
68
71
|
|
@@ -109,7 +112,7 @@ url: ${url}`);
|
|
109
112
|
return response.headers.set("Cache-Control", "no-store"), response;
|
110
113
|
} catch (err) {
|
111
114
|
console.info(
|
112
|
-
`Error
|
115
|
+
`Error updating cache header on api route "${context.req.path}" to no-store, it is ${response.headers.get("cache-control")}, continue`,
|
113
116
|
err
|
114
117
|
);
|
115
118
|
}
|
@@ -137,10 +140,12 @@ url: ${url}`);
|
|
137
140
|
for (const route of compiledManifest.pageRoutes) {
|
138
141
|
if (route.file === "" || !route.compiledRegex.test(originalUrl))
|
139
142
|
continue;
|
140
|
-
|
141
|
-
|
143
|
+
const loaderRoute = {
|
144
|
+
...route,
|
145
|
+
file: route.loaderServerPath || c.req.path
|
146
|
+
}, finalUrl = new URL(originalUrl, url.origin);
|
142
147
|
try {
|
143
|
-
return await resolveLoaderRoute(requestHandlers, request, finalUrl,
|
148
|
+
return await resolveLoaderRoute(requestHandlers, request, finalUrl, loaderRoute);
|
144
149
|
} catch (err) {
|
145
150
|
return console.error(`Error running loader: ${err}`), next();
|
146
151
|
}
|
@@ -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,sBAAsB;AAC/B,SAAS,4BAA4B,0BAA0B;AAC/D,SAAS,iBAAiB,4BAAkD;AAE5E,SAAS,6BAA6B;AACtC,SAAS,kBAAkB;AAI3B,eAAsB,SAAS,YAA+B,WAA0B,KAAW;AACjG,QAAM,EAAE,iBAAiB,oBAAoB,iBAAiB,IAAI,MAAM,OACtE,wBACF,GACM,EAAE,WAAW,IAAI,MAAM,OAAO,qBAAqB,GACnD,EAAE,iBAAiB,IAAI,MAAM,OAAO,mBAAmB,GAEvD,eAAe,oBAAI,QAAsB,GAGzC,YAAY,WAAW,KAAK;AAClC,MAAI;AACF,eAAW,YAAY;AACrB,UAAI,IAAI,SAAS,QAAQ,CAAC,YAAY;AACpC,cAAM,iBAAiB,SAAS,YAAY,QAAQ,SAAS,CAAC,UAAU;AACtE,gBAAM,YAAY,MAAM,UAAU,CAAC;AACnC,iBAAO,QAAQ,IAAI,MAAM,SAAS,KAAK;AAAA,QACzC,CAAC;AACD,eAAO,QAAQ,SAAS,gBAAgB,SAAS,YAAY,MAAM,GAAG;AAAA,MACxE,CAAC;AAIL,MAAI,CAAC;AACH,UAAM,IAAI,MAAM,0CAA0C;AAG5D,QAAM,EAAE,kBAAkB,SAAS,IAAI,WAEjC,gBAAgB;AAAA,IACpB,GAAG;AAAA,IACH,MAAM;AAAA,EACR,GAKM,UAFQ,MAAM,OADA,eAAe,aAAa,IAG3B,QAAQ,QACvB,SAAS,WAAW,OAAO,KAAK,iBAAiB,OAEjD,kBAAmC;AAAA,IACvC,MAAM,UAAU,EAAE,MAAM,GAAG;AAOzB,aAAO,MAAM,OANG;AAAA,QACd,QAAQ,IAAI;AAAA,QACZ;AAAA,QACA;AAAA,QACA,MAAM,KAAK,QAAQ,KAAK,GAAG,EAAE,QAAQ,KAAK,GAAG,KAAK,SAAS,SAAS;AAAA,MACtE;AAAA,IAEF;AAAA,IAEA,MAAM,eAAe,OAAO;AAC1B,aAAO,MAAM,OAAO,WAAW,MAAM,UAAU;AAAA,IACjD;AAAA,IAEA,MAAM,aAAa,EAAE,SAAS,OAAO,KAAK,YAAY,GAAG;AACvD,YAAM,UAAU,MAAM,OAAO,WAAW,KAAK,MAAM,eAAe,MAAM,IAAI,CAAC,IAEvE,EAAE,OAAO,IAAI;AAEnB,UAAI,CAAC;AACH,uBAAQ,KAAK,8BAA8B,MAAM,IAAI,GAC9C;AAGT,YAAM,OAAO,MAAM,OAAO,WAAW;AAErC,aAAO,qCAAqC,KAAK,UAAU,IAAI,CAAC;AAAA,IAClE;AAAA,IAEA,MAAM,WAAW,EAAE,OAAO,KAAK,YAAY,GAAG;AAC5C,YAAMA,aAAY,iBAAiB,MAAM,IAAI;AAE7C,UAAI,MAAM,SAAS,OAAO;AACxB,YAAI,CAACA;AACH,
|
4
|
+
"mappings": "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",
|
5
5
|
"names": ["buildInfo", "preloads"]
|
6
6
|
}
|
@@ -67,7 +67,9 @@ async function oneServe(oneOptions, buildInfo, app) {
|
|
67
67
|
}) {
|
68
68
|
const buildInfo2 = routeToBuildInfo[route.file];
|
69
69
|
if (route.type === "ssr") {
|
70
|
-
if (!buildInfo2) throw new Error(`No buildinfo found for ${url}, route: ${route.
|
70
|
+
if (!buildInfo2) throw console.error("Error in route", route), new Error(`No buildinfo found for ${url}, route: ${route.file}, in keys:
|
71
|
+
${Object.keys(routeToBuildInfo).join(`
|
72
|
+
`)}`);
|
71
73
|
try {
|
72
74
|
const loaderData = await (await import(toAbsolute(buildInfo2.serverJsPath))).loader?.(loaderProps),
|
73
75
|
preloads2 = buildInfo2.preloads,
|
@@ -78,14 +80,15 @@ async function oneServe(oneOptions, buildInfo, app) {
|
|
78
80
|
loaderData,
|
79
81
|
loaderProps,
|
80
82
|
path: loaderProps?.path || "/",
|
81
|
-
preloads: preloads2
|
83
|
+
preloads: preloads2,
|
84
|
+
css: buildInfo2.css
|
82
85
|
});
|
83
86
|
return new Response(rendered, {
|
84
87
|
headers,
|
85
88
|
status: route.isNotFound ? 404 : 200
|
86
89
|
});
|
87
90
|
} catch (err) {
|
88
|
-
console.error(`[one] Error rendering SSR route ${route.
|
91
|
+
console.error(`[one] Error rendering SSR route ${route.file}
|
89
92
|
|
90
93
|
${err?.stack ?? err}
|
91
94
|
|
@@ -136,7 +139,7 @@ url: ${url}`);
|
|
136
139
|
if (isAPIRequest.get(request)) try {
|
137
140
|
return response.headers.set("Cache-Control", "no-store"), response;
|
138
141
|
} catch (err) {
|
139
|
-
console.info(`Error
|
142
|
+
console.info(`Error updating cache header on api route "${context.req.path}" to no-store, it is ${response.headers.get("cache-control")}, continue`, err);
|
140
143
|
}
|
141
144
|
return response;
|
142
145
|
}
|
@@ -163,10 +166,13 @@ url: ${url}`);
|
|
163
166
|
originalUrl = getPathFromLoaderPath(c.req.path);
|
164
167
|
for (const route of compiledManifest.pageRoutes) {
|
165
168
|
if (route.file === "" || !route.compiledRegex.test(originalUrl)) continue;
|
166
|
-
|
167
|
-
|
169
|
+
const loaderRoute = {
|
170
|
+
...route,
|
171
|
+
file: route.loaderServerPath || c.req.path
|
172
|
+
},
|
173
|
+
finalUrl = new URL(originalUrl, url.origin);
|
168
174
|
try {
|
169
|
-
return await resolveLoaderRoute(requestHandlers, request, finalUrl,
|
175
|
+
return await resolveLoaderRoute(requestHandlers, request, finalUrl, loaderRoute);
|
170
176
|
} catch (err) {
|
171
177
|
return console.error(`Error running loader: ${err}`), next();
|
172
178
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["default","FSExtra","extname","join","getServerEntry","LOADER_JS_POSTFIX_UNCACHED","PRELOAD_JS_POSTFIX","compileManifest","getURLfromRequestURL","getPathFromLoaderPath","toAbsolute","oneServe","oneOptions","buildInfo","app","resolveAPIRoute","resolveLoaderRoute","resolvePageRoute","isResponse","isStatusRedirect","isAPIRequest","WeakMap","redirects","web","redirect","get","source","context","destinationUrl","destination","replace","param","paramName","substring","req","permanent","Error","routeToBuildInfo","routeMap","serverOptions","root","render","apiCJS","build","api","outputFormat","requestHandlers","handleAPI","route","process","cwd","page","loadMiddleware","contextKey","handleLoader","request","url","loaderProps","exports","file","loader","console","warn","json","JSON","stringify","handlePage","buildInfo2","type","Object","keys","loaderData","serverJsPath","preloads2","preloads","headers","Headers","set","rendered","mode","path","Response","status","isNotFound","err","
|
1
|
+
{"version":3,"names":["default","FSExtra","extname","join","getServerEntry","LOADER_JS_POSTFIX_UNCACHED","PRELOAD_JS_POSTFIX","compileManifest","getURLfromRequestURL","getPathFromLoaderPath","toAbsolute","oneServe","oneOptions","buildInfo","app","resolveAPIRoute","resolveLoaderRoute","resolvePageRoute","isResponse","isStatusRedirect","isAPIRequest","WeakMap","redirects","web","redirect","get","source","context","destinationUrl","destination","replace","param","paramName","substring","req","permanent","Error","routeToBuildInfo","routeMap","serverOptions","root","render","apiCJS","build","api","outputFormat","requestHandlers","handleAPI","route","process","cwd","page","loadMiddleware","contextKey","handleLoader","request","url","loaderProps","exports","file","loader","console","warn","json","JSON","stringify","handlePage","buildInfo2","type","error","Object","keys","loaderData","serverJsPath","preloads2","preloads","headers","Headers","set","rendered","mode","path","css","Response","status","isNotFound","err","stack","htmlPath","pathname","cleanPath","html","readFile","createHonoHandler","next","raw","response","endsWith","originalUrl","finalUrl","URL","origin","location","forEach","value","key","header","info","compiledManifest","manifest","apiRoutes","urlPath","put","post","delete","patch","pageRoutes","loaders","c","body","compiledRegex","test","loaderRoute","loaderServerPath"],"sources":["../../../src/server/oneServe.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
@@ -94,7 +94,9 @@ async function oneServe(oneOptions, buildInfo, app) {
|
|
94
94
|
} = param,
|
95
95
|
_$buildInfo = routeToBuildInfo[route2.file];
|
96
96
|
if (route2.type === "ssr") {
|
97
|
-
if (!_$buildInfo) throw new Error(`No buildinfo found for ${url}, route: ${route2.
|
97
|
+
if (!_$buildInfo) throw console.error("Error in route", route2), new Error(`No buildinfo found for ${url}, route: ${route2.file}, in keys:
|
98
|
+
${Object.keys(routeToBuildInfo).join(`
|
99
|
+
`)}`);
|
98
100
|
try {
|
99
101
|
var _exported_loader,
|
100
102
|
exported = await import(toAbsolute(_$buildInfo.serverJsPath)),
|
@@ -107,7 +109,8 @@ async function oneServe(oneOptions, buildInfo, app) {
|
|
107
109
|
loaderData,
|
108
110
|
loaderProps,
|
109
111
|
path: loaderProps?.path || "/",
|
110
|
-
preloads: preloads2
|
112
|
+
preloads: preloads2,
|
113
|
+
css: _$buildInfo.css
|
111
114
|
});
|
112
115
|
return new Response(rendered, {
|
113
116
|
headers,
|
@@ -115,7 +118,7 @@ async function oneServe(oneOptions, buildInfo, app) {
|
|
115
118
|
});
|
116
119
|
} catch (err) {
|
117
120
|
var _err_stack;
|
118
|
-
console.error(`[one] Error rendering SSR route ${route2.
|
121
|
+
console.error(`[one] Error rendering SSR route ${route2.file}
|
119
122
|
|
120
123
|
${(_err_stack = err?.stack) !== null && _err_stack !== void 0 ? _err_stack : err}
|
121
124
|
|
@@ -166,7 +169,7 @@ url: ${url}`);
|
|
166
169
|
if (isAPIRequest.get(request)) try {
|
167
170
|
return response.headers.set("Cache-Control", "no-store"), response;
|
168
171
|
} catch (err) {
|
169
|
-
console.info(`Error
|
172
|
+
console.info(`Error updating cache header on api route "${context.req.path}" to no-store, it is ${response.headers.get("cache-control")}, continue`, err);
|
170
173
|
}
|
171
174
|
return response;
|
172
175
|
}
|
@@ -230,10 +233,13 @@ url: ${url}`);
|
|
230
233
|
for (var _iterator3 = compiledManifest.pageRoutes[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = !0) {
|
231
234
|
var route2 = _step3.value;
|
232
235
|
if (route2.file !== "" && route2.compiledRegex.test(originalUrl)) {
|
233
|
-
|
234
|
-
|
236
|
+
var loaderRoute = {
|
237
|
+
...route2,
|
238
|
+
file: route2.loaderServerPath || c.req.path
|
239
|
+
},
|
240
|
+
finalUrl = new URL(originalUrl, url.origin);
|
235
241
|
try {
|
236
|
-
var resolved = await resolveLoaderRoute(requestHandlers, request, finalUrl,
|
242
|
+
var resolved = await resolveLoaderRoute(requestHandlers, request, finalUrl, loaderRoute);
|
237
243
|
return resolved;
|
238
244
|
} catch (err) {
|
239
245
|
return console.error(`Error running loader: ${err}`), next();
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["default","FSExtra","extname","join","getServerEntry","LOADER_JS_POSTFIX_UNCACHED","PRELOAD_JS_POSTFIX","compileManifest","getURLfromRequestURL","getPathFromLoaderPath","toAbsolute","oneServe","oneOptions","buildInfo","app","_oneOptions_web","_oneOptions_build_api","_oneOptions_build","resolveAPIRoute","resolveLoaderRoute","resolvePageRoute","isResponse","isStatusRedirect","isAPIRequest","WeakMap","redirects","web","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_loop","redirect","_step","value","get","source","context","destinationUrl","destination","replace","param","paramName","substring","req","permanent","_iterator","Symbol","iterator","next","done","err","return","Error","routeToBuildInfo","routeMap","serverOptions","root","entryServer","entry","render","apiCJS","build","api","outputFormat","requestHandlers","handleAPI","route","route2","apiFile","process","cwd","page","loadMiddleware","contextKey","handleLoader","request","url","loaderProps","exports","file","loader","console","warn","json","JSON","stringify","handlePage","_$buildInfo","type","Object","keys","_exported_loader","exported","serverJsPath","loaderData","call","preloads2","preloads","headers","Headers","set","rendered","mode","path","Response","status","isNotFound","_err_stack","
|
1
|
+
{"version":3,"names":["default","FSExtra","extname","join","getServerEntry","LOADER_JS_POSTFIX_UNCACHED","PRELOAD_JS_POSTFIX","compileManifest","getURLfromRequestURL","getPathFromLoaderPath","toAbsolute","oneServe","oneOptions","buildInfo","app","_oneOptions_web","_oneOptions_build_api","_oneOptions_build","resolveAPIRoute","resolveLoaderRoute","resolvePageRoute","isResponse","isStatusRedirect","isAPIRequest","WeakMap","redirects","web","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_loop","redirect","_step","value","get","source","context","destinationUrl","destination","replace","param","paramName","substring","req","permanent","_iterator","Symbol","iterator","next","done","err","return","Error","routeToBuildInfo","routeMap","serverOptions","root","entryServer","entry","render","apiCJS","build","api","outputFormat","requestHandlers","handleAPI","route","route2","apiFile","process","cwd","page","loadMiddleware","contextKey","handleLoader","request","url","loaderProps","exports","file","loader","console","warn","json","JSON","stringify","handlePage","_$buildInfo","type","error","Object","keys","_exported_loader","exported","serverJsPath","loaderData","call","preloads2","preloads","headers","Headers","set","rendered","mode","path","css","Response","status","isNotFound","_err_stack","stack","htmlPath","pathname","cleanPath","html","readFile","headers1","createHonoHandler","raw","response","endsWith","originalUrl","finalUrl","URL","origin","location","forEach","key","header","info","compiledManifest","manifest","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","apiRoutes","_step1","urlPath","put","post","delete","patch","_iteratorNormalCompletion2","_didIteratorError2","_iteratorError2"],"sources":["../../../src/server/oneServe.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "one",
|
3
|
-
"version": "1.1.
|
3
|
+
"version": "1.1.470",
|
4
4
|
"license": "BSD-3-Clause",
|
5
5
|
"sideEffects": [
|
6
6
|
"setup.mjs",
|
@@ -94,15 +94,15 @@
|
|
94
94
|
"@react-navigation/routers": "~7",
|
95
95
|
"@swc/core": "^1.10.4",
|
96
96
|
"@ungap/structured-clone": "^1.2.0",
|
97
|
-
"@vxrn/compiler": "1.1.
|
98
|
-
"@vxrn/resolve": "1.1.
|
99
|
-
"@vxrn/tslib-lite": "1.1.
|
100
|
-
"@vxrn/universal-color-scheme": "1.1.
|
101
|
-
"@vxrn/use-isomorphic-layout-effect": "1.1.
|
97
|
+
"@vxrn/compiler": "1.1.470",
|
98
|
+
"@vxrn/resolve": "1.1.470",
|
99
|
+
"@vxrn/tslib-lite": "1.1.470",
|
100
|
+
"@vxrn/universal-color-scheme": "1.1.470",
|
101
|
+
"@vxrn/use-isomorphic-layout-effect": "1.1.470",
|
102
102
|
"babel-dead-code-elimination": "^1.0.9",
|
103
103
|
"citty": "^0.1.6",
|
104
104
|
"core-js": "^3.38.1",
|
105
|
-
"create-vxrn": "1.1.
|
105
|
+
"create-vxrn": "1.1.470",
|
106
106
|
"escape-string-regexp": "^5.0.0",
|
107
107
|
"expo-linking": "~6.3.1",
|
108
108
|
"expo-modules-core": "2.1.2",
|
@@ -128,7 +128,7 @@
|
|
128
128
|
"vite": "^6.1.0",
|
129
129
|
"vite-plugin-barrel": "^0.4.1",
|
130
130
|
"vite-tsconfig-paths": "^5.0.1",
|
131
|
-
"vxrn": "1.1.
|
131
|
+
"vxrn": "1.1.470",
|
132
132
|
"ws": "^8.18.0",
|
133
133
|
"xxhashjs": "^0.2.2"
|
134
134
|
},
|
package/src/cli/build.ts
CHANGED
@@ -455,7 +455,7 @@ export async function build(args: {
|
|
455
455
|
|
456
456
|
// write out the static paths (pathname => html) for the server
|
457
457
|
const routeMap: Record<string, string> = {}
|
458
|
-
const routeToBuildInfo: Record<string, One.RouteBuildInfo
|
458
|
+
const routeToBuildInfo: Record<string, Omit<One.RouteBuildInfo, 'loaderData'>> = {}
|
459
459
|
const preloads: Record<string, boolean> = {}
|
460
460
|
const loaders: Record<string, boolean> = {}
|
461
461
|
|
@@ -463,7 +463,13 @@ export async function build(args: {
|
|
463
463
|
if (!route.cleanPath.includes('*')) {
|
464
464
|
routeMap[route.cleanPath] = route.htmlPath
|
465
465
|
}
|
466
|
-
|
466
|
+
const {
|
467
|
+
// dont include loaderData it can be huge
|
468
|
+
loaderData: _loaderData,
|
469
|
+
...rest
|
470
|
+
} = route
|
471
|
+
|
472
|
+
routeToBuildInfo[route.routeFile] = rest
|
467
473
|
preloads[route.preloadPath] = true
|
468
474
|
loaders[route.loaderPath] = true
|
469
475
|
}
|
package/src/cli/buildPage.ts
CHANGED
package/src/router/Route.tsx
CHANGED
@@ -1,8 +1,7 @@
|
|
1
|
-
import React, { createContext, useContext,
|
2
|
-
|
3
|
-
import { getContextKey } from './matchers'
|
1
|
+
import React, { createContext, useContext, type ReactNode } from 'react'
|
4
2
|
import type { ErrorBoundaryProps } from '../views/Try'
|
5
3
|
import type { One } from '../vite/types'
|
4
|
+
import { getContextKey } from './matchers'
|
6
5
|
|
7
6
|
export type DynamicConvention = { name: string; deep: boolean; notFound?: boolean }
|
8
7
|
|
@@ -125,18 +125,14 @@ function getGeneratedNamedRouteRegex(
|
|
125
125
|
node: RouteNode
|
126
126
|
): OneRouterServerManifestV1Route {
|
127
127
|
return {
|
128
|
-
...
|
128
|
+
...getRouteEntry(normalizedRoute, node),
|
129
129
|
generated: true,
|
130
130
|
isNotFound: isNotFoundRoute(node),
|
131
131
|
}
|
132
132
|
}
|
133
133
|
|
134
|
-
function
|
135
|
-
normalizedRoute: string,
|
136
|
-
node: RouteNode
|
137
|
-
): OneRouterServerManifestV1Route {
|
134
|
+
function getRouteEntry(normalizedRoute: string, node: RouteNode): OneRouterServerManifestV1Route {
|
138
135
|
const result = getPathMeta(normalizedRoute)
|
139
|
-
|
140
136
|
return {
|
141
137
|
file: node.contextKey,
|
142
138
|
page: getContextKey(node.route),
|
package/src/server/oneServe.ts
CHANGED
@@ -86,8 +86,9 @@ export async function oneServe(oneOptions: One.PluginOptions, buildInfo: One.Bui
|
|
86
86
|
|
87
87
|
if (route.type === 'ssr') {
|
88
88
|
if (!buildInfo) {
|
89
|
+
console.error(`Error in route`, route)
|
89
90
|
throw new Error(
|
90
|
-
`No buildinfo found for ${url}, route: ${route.
|
91
|
+
`No buildinfo found for ${url}, route: ${route.file}, in keys:\n ${Object.keys(routeToBuildInfo).join('\n ')}`
|
91
92
|
)
|
92
93
|
}
|
93
94
|
|
@@ -105,6 +106,7 @@ export async function oneServe(oneOptions: One.PluginOptions, buildInfo: One.Bui
|
|
105
106
|
loaderProps,
|
106
107
|
path: loaderProps?.path || '/',
|
107
108
|
preloads,
|
109
|
+
css: buildInfo.css,
|
108
110
|
})
|
109
111
|
|
110
112
|
return new Response(rendered, {
|
@@ -112,7 +114,7 @@ export async function oneServe(oneOptions: One.PluginOptions, buildInfo: One.Bui
|
|
112
114
|
status: route.isNotFound ? 404 : 200,
|
113
115
|
})
|
114
116
|
} catch (err) {
|
115
|
-
console.error(`[one] Error rendering SSR route ${route.
|
117
|
+
console.error(`[one] Error rendering SSR route ${route.file}
|
116
118
|
|
117
119
|
${err?.['stack'] ?? err}
|
118
120
|
|
@@ -182,7 +184,7 @@ url: ${url}`)
|
|
182
184
|
return response
|
183
185
|
} catch (err) {
|
184
186
|
console.info(
|
185
|
-
`Error
|
187
|
+
`Error updating cache header on api route "${
|
186
188
|
context.req.path
|
187
189
|
}" to no-store, it is ${response.headers.get('cache-control')}, continue`,
|
188
190
|
err
|
@@ -247,12 +249,15 @@ url: ${url}`)
|
|
247
249
|
}
|
248
250
|
|
249
251
|
// for now just change this
|
250
|
-
|
252
|
+
const loaderRoute = {
|
253
|
+
...route,
|
254
|
+
file: route.loaderServerPath || c.req.path,
|
255
|
+
}
|
251
256
|
|
252
257
|
const finalUrl = new URL(originalUrl, url.origin)
|
253
258
|
|
254
259
|
try {
|
255
|
-
const resolved = await resolveLoaderRoute(requestHandlers, request, finalUrl,
|
260
|
+
const resolved = await resolveLoaderRoute(requestHandlers, request, finalUrl, loaderRoute)
|
256
261
|
return resolved
|
257
262
|
} catch (err) {
|
258
263
|
console.error(`Error running loader: ${err}`)
|
package/src/vite/types.ts
CHANGED
@@ -277,7 +277,7 @@ export namespace One {
|
|
277
277
|
CACHE_KEY: string
|
278
278
|
}
|
279
279
|
oneOptions?: PluginOptions
|
280
|
-
routeToBuildInfo: Record<string, One.RouteBuildInfo
|
280
|
+
routeToBuildInfo: Record<string, Omit<One.RouteBuildInfo, 'loaderData'>>
|
281
281
|
routeMap: Record<string, string>
|
282
282
|
manifest: {
|
283
283
|
pageRoutes: RouteInfo[]
|
@@ -305,6 +305,7 @@ export namespace One {
|
|
305
305
|
params: Object
|
306
306
|
loaderData: any
|
307
307
|
preloads: string[]
|
308
|
+
css: string[]
|
308
309
|
}
|
309
310
|
|
310
311
|
export type ServerContext = {
|
package/types/cli/build.d.ts.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/cli/build.ts"],"names":[],"mappings":"AAkCA,wBAAsB,KAAK,CAAC,IAAI,EAAE;IAChC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,SAAS,CAAA;CACrC,
|
1
|
+
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/cli/build.ts"],"names":[],"mappings":"AAkCA,wBAAsB,KAAK,CAAC,IAAI,EAAE;IAChC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,SAAS,CAAA;CACrC,iBAmhBA"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"buildPage.d.ts","sourceRoot":"","sources":["../../src/cli/buildPage.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAInD,wBAAsB,SAAS,CAC7B,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,GAAG,EACX,UAAU,EAAE,SAAS,CAAC,MAAM,CAAC,EAC7B,mBAAmB,EAAE,GAAG,EACxB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACxC,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAAE,EAClB,MAAM,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,
|
1
|
+
{"version":3,"file":"buildPage.d.ts","sourceRoot":"","sources":["../../src/cli/buildPage.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAInD,wBAAsB,SAAS,CAC7B,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,GAAG,EACX,UAAU,EAAE,SAAS,CAAC,MAAM,CAAC,EAC7B,mBAAmB,EAAE,GAAG,EACxB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACxC,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAAE,EAClB,MAAM,EAAE,MAAM,EAAE,GACf,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAqG7B"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"Route.d.ts","sourceRoot":"","sources":["../../src/router/Route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
1
|
+
{"version":3,"file":"Route.d.ts","sourceRoot":"","sources":["../../src/router/Route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAA6B,KAAK,SAAS,EAAE,MAAM,OAAO,CAAA;AACxE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AACtD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAGxC,MAAM,MAAM,iBAAiB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,CAAA;AAEnF,MAAM,MAAM,WAAW,GAAG;IACxB,aAAa,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAA;IACvD,OAAO,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAA;IAClC,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACvC,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,GAAG,CAAA;IAClC,oBAAoB,CAAC,EAAE,CAAC,KAAK,EAAE;QAC7B,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAA;KAC3C,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE,CAAA;IACzC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE;QACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAA;KAC3C,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE,CAAA;CAC1C,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,4BAA4B;IAC5B,IAAI,EAAE,GAAG,CAAC,SAAS,CAAA;IACnB,kEAAkE;IAClE,SAAS,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAAA;IACrC,iCAAiC;IACjC,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,oBAAoB;IACpB,QAAQ,EAAE,SAAS,EAAE,CAAA;IACrB,kCAAkC;IAClC,OAAO,EAAE,IAAI,GAAG,iBAAiB,EAAE,CAAA;IACnC,sCAAsC;IACtC,KAAK,EAAE,MAAM,CAAA;IACb,qDAAqD;IACrD,UAAU,EAAE,MAAM,CAAA;IAClB,sBAAsB;IACtB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,wFAAwF;IACxF,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,oLAAoL;IACpL,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;IACtB,qBAAqB;IACrB,OAAO,CAAC,EAAE,SAAS,EAAE,CAAA;IACrB,yBAAyB;IACzB,WAAW,CAAC,EAAE,SAAS,EAAE,CAAA;CAC1B,CAAA;AAED,eAAO,MAAM,kBAAkB,+DAAoE,CAAA;AAQnG,+DAA+D;AAC/D,wBAAgB,YAAY,IAAI,SAAS,GAAG,IAAI,CAE/C;AAED,wBAAgB,aAAa,IAAI,MAAM,CAMtC;AAED,iEAAiE;AACjE,wBAAgB,KAAK,CAAC,EACpB,QAAQ,EACR,IAAI,EACJ,KAAK,GACN,EAAE;IACD,QAAQ,EAAE,SAAS,CAAA;IACnB,IAAI,EAAE,SAAS,CAAA;IACf,KAAK,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;KAAE,CAAA;CACxD,2CAMA"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getServerManifest.d.ts","sourceRoot":"","sources":["../../src/server/getServerManifest.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAGhD,OAAO,KAAK,EAAO,SAAS,EAAE,MAAM,eAAe,CAAA;AAGnD,MAAM,MAAM,8BAA8B,CAAC,MAAM,GAAG,MAAM,IAAI,SAAS,GAAG;IACxE,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,yBAAyB,CAAC,MAAM,GAAG,MAAM,IAAI;IACvD,SAAS,EAAE,8BAA8B,CAAC,MAAM,CAAC,EAAE,CAAA;IACnD,gBAAgB,EAAE,8BAA8B,CAAC,MAAM,CAAC,EAAE,CAAA;IAC1D,UAAU,EAAE,8BAA8B,CAAC,MAAM,CAAC,EAAE,CAAA;CACrD,CAAA;AAED,MAAM,WAAW,KAAK;IACpB,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,OAAO,CAAA;IACf,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IAC7B,EAAE,EAAE,MAAM,CAAA;CACX;AAOD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,SAAS,GAAG,yBAAyB,CA8E7E;
|
1
|
+
{"version":3,"file":"getServerManifest.d.ts","sourceRoot":"","sources":["../../src/server/getServerManifest.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAGhD,OAAO,KAAK,EAAO,SAAS,EAAE,MAAM,eAAe,CAAA;AAGnD,MAAM,MAAM,8BAA8B,CAAC,MAAM,GAAG,MAAM,IAAI,SAAS,GAAG;IACxE,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,yBAAyB,CAAC,MAAM,GAAG,MAAM,IAAI;IACvD,SAAS,EAAE,8BAA8B,CAAC,MAAM,CAAC,EAAE,CAAA;IACnD,gBAAgB,EAAE,8BAA8B,CAAC,MAAM,CAAC,EAAE,CAAA;IAC1D,UAAU,EAAE,8BAA8B,CAAC,MAAM,CAAC,EAAE,CAAA;CACrD,CAAA;AAED,MAAM,WAAW,KAAK;IACpB,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,OAAO,CAAA;IACf,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IAC7B,EAAE,EAAE,MAAM,CAAA;CACX;AAOD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,SAAS,GAAG,yBAAyB,CA8E7E;AAgKD,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM;;;;EAgBvC"}
|
@@ -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;AASnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAGxC,wBAAsB,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,aAAa,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,
|
1
|
+
{"version":3,"file":"oneServe.d.ts","sourceRoot":"","sources":["../../src/server/oneServe.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAqB,MAAM,MAAM,CAAA;AASnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAGxC,wBAAsB,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,aAAa,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,iBAiQhG"}
|
package/types/vite/types.d.ts
CHANGED
@@ -235,7 +235,7 @@ export declare namespace One {
|
|
235
235
|
CACHE_KEY: string;
|
236
236
|
};
|
237
237
|
oneOptions?: PluginOptions;
|
238
|
-
routeToBuildInfo: Record<string, One.RouteBuildInfo
|
238
|
+
routeToBuildInfo: Record<string, Omit<One.RouteBuildInfo, 'loaderData'>>;
|
239
239
|
routeMap: Record<string, string>;
|
240
240
|
manifest: {
|
241
241
|
pageRoutes: RouteInfo[];
|
@@ -259,6 +259,7 @@ export declare namespace One {
|
|
259
259
|
params: Object;
|
260
260
|
loaderData: any;
|
261
261
|
preloads: string[];
|
262
|
+
css: string[];
|
262
263
|
};
|
263
264
|
export type ServerContext = {
|
264
265
|
css?: string[];
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/vite/types.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/vite/types.ts"],"names":[],"mappings":"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"}
|