one 1.2.17 → 1.2.19
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 +7 -2
- package/dist/cjs/createHandleRequest.js +8 -3
- package/dist/cjs/createHandleRequest.js.map +1 -1
- package/dist/cjs/createHandleRequest.native.js +8 -2
- package/dist/cjs/createHandleRequest.native.js.map +1 -1
- package/dist/cjs/experimental-useLoaderState.cjs +64 -0
- package/dist/cjs/experimental-useLoaderState.js +44 -0
- package/dist/cjs/experimental-useLoaderState.js.map +6 -0
- package/dist/cjs/experimental-useLoaderState.native.js +69 -0
- package/dist/cjs/experimental-useLoaderState.native.js.map +1 -0
- package/dist/cjs/getDevServer.cjs +29 -0
- package/dist/cjs/getDevServer.js +24 -0
- package/dist/cjs/getDevServer.js.map +6 -0
- package/dist/cjs/getDevServer.native.js +40 -0
- package/dist/cjs/getDevServer.native.js.map +1 -0
- package/dist/cjs/getURL.native.js +8 -18
- package/dist/cjs/getURL.native.js.map +1 -1
- package/dist/cjs/index.cjs +1 -0
- package/dist/cjs/index.js +1 -0
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/index.native.js +1 -0
- package/dist/cjs/index.native.js.map +1 -1
- package/dist/cjs/server/oneServe.cjs +8 -6
- package/dist/cjs/server/oneServe.js +5 -5
- package/dist/cjs/server/oneServe.js.map +1 -1
- package/dist/cjs/server/oneServe.native.js +8 -6
- package/dist/cjs/server/oneServe.native.js.map +1 -1
- package/dist/cjs/setup.native.js.map +6 -1
- package/dist/cjs/useLoader.cjs +117 -36
- package/dist/cjs/useLoader.js +108 -33
- package/dist/cjs/useLoader.js.map +2 -2
- package/dist/cjs/useLoader.native.js +151 -55
- package/dist/cjs/useLoader.native.js.map +1 -1
- package/dist/cjs/utils/cleanUrl.cjs +6 -5
- package/dist/cjs/utils/cleanUrl.js +4 -8
- package/dist/cjs/utils/cleanUrl.js.map +1 -1
- package/dist/cjs/utils/cleanUrl.native.js +6 -3
- package/dist/cjs/utils/cleanUrl.native.js.map +1 -1
- package/dist/esm/createHandleRequest.js +8 -3
- package/dist/esm/createHandleRequest.js.map +1 -1
- package/dist/esm/createHandleRequest.mjs +7 -2
- package/dist/esm/createHandleRequest.mjs.map +1 -1
- package/dist/esm/createHandleRequest.native.js +8 -2
- package/dist/esm/createHandleRequest.native.js.map +1 -1
- package/dist/esm/experimental-useLoaderState.js +32 -0
- package/dist/esm/experimental-useLoaderState.js.map +6 -0
- package/dist/esm/experimental-useLoaderState.mjs +41 -0
- package/dist/esm/experimental-useLoaderState.mjs.map +1 -0
- package/dist/esm/experimental-useLoaderState.native.js +43 -0
- package/dist/esm/experimental-useLoaderState.native.js.map +1 -0
- package/dist/esm/getDevServer.js +8 -0
- package/dist/esm/getDevServer.js.map +6 -0
- package/dist/esm/getDevServer.mjs +6 -0
- package/dist/esm/getDevServer.mjs.map +1 -0
- package/dist/esm/getDevServer.native.js +3 -0
- package/dist/esm/getDevServer.native.js.map +1 -0
- package/dist/esm/getURL.native.js +3 -2
- package/dist/esm/getURL.native.js.map +1 -1
- package/dist/esm/index.js +2 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/index.mjs +2 -2
- package/dist/esm/index.mjs.map +1 -1
- package/dist/esm/index.native.js +2 -2
- package/dist/esm/index.native.js.map +1 -1
- package/dist/esm/server/oneServe.js +5 -5
- package/dist/esm/server/oneServe.js.map +1 -1
- package/dist/esm/server/oneServe.mjs +7 -5
- package/dist/esm/server/oneServe.mjs.map +1 -1
- package/dist/esm/server/oneServe.native.js +7 -5
- package/dist/esm/server/oneServe.native.js.map +1 -1
- package/dist/esm/useLoader.js +110 -35
- package/dist/esm/useLoader.js.map +2 -2
- package/dist/esm/useLoader.mjs +117 -38
- package/dist/esm/useLoader.mjs.map +1 -1
- package/dist/esm/useLoader.native.js +151 -57
- package/dist/esm/useLoader.native.js.map +1 -1
- package/dist/esm/utils/cleanUrl.js +4 -8
- package/dist/esm/utils/cleanUrl.js.map +1 -1
- package/dist/esm/utils/cleanUrl.mjs +6 -5
- package/dist/esm/utils/cleanUrl.mjs.map +1 -1
- package/dist/esm/utils/cleanUrl.native.js +6 -3
- package/dist/esm/utils/cleanUrl.native.js.map +1 -1
- package/dist/esm/vite/plugins/fileSystemRouterPlugin.mjs.map +1 -1
- package/package.json +10 -10
- package/src/createHandleRequest.ts +6 -2
- package/src/getDevServer.native.ts +5 -0
- package/src/getDevServer.ts +5 -0
- package/src/getURL.native.ts +10 -5
- package/src/index.ts +1 -1
- package/src/server/oneServe.ts +12 -6
- package/src/types.ts +1 -0
- package/src/useLoader.ts +206 -90
- package/src/utils/cleanUrl.ts +7 -10
- package/types/createHandleRequest.d.ts.map +1 -1
- package/types/experimental-useLoaderState.d.ts.map +1 -0
- package/types/getDevServer.d.ts +5 -0
- package/types/getDevServer.d.ts.map +1 -0
- package/types/getDevServer.native.d.ts +2 -0
- package/types/getDevServer.native.d.ts.map +1 -0
- package/types/getURL.native.d.ts.map +1 -1
- package/types/index.d.ts +1 -1
- package/types/index.d.ts.map +1 -1
- package/types/server/oneServe.d.ts.map +1 -1
- package/types/types.d.ts +1 -0
- package/types/types.d.ts.map +1 -1
- package/types/useLoader.d.ts +9 -0
- package/types/useLoader.d.ts.map +1 -1
- package/types/utils/cleanUrl.d.ts +1 -1
- package/types/utils/cleanUrl.d.ts.map +1 -1
|
@@ -34,8 +34,8 @@ __export(oneServe_exports, {
|
|
|
34
34
|
oneServe: () => oneServe
|
|
35
35
|
});
|
|
36
36
|
module.exports = __toCommonJS(oneServe_exports);
|
|
37
|
-
var
|
|
38
|
-
|
|
37
|
+
var import_fs_extra = __toESM(require("fs-extra"), 1),
|
|
38
|
+
import_node_path = require("node:path"),
|
|
39
39
|
import_vxrn = require("vxrn"),
|
|
40
40
|
import_serve = require("vxrn/serve"),
|
|
41
41
|
import_constants = require("../constants.cjs"),
|
|
@@ -162,8 +162,9 @@ url: ${url}`);
|
|
|
162
162
|
response = await (() => {
|
|
163
163
|
if (url.pathname.endsWith(import_constants.LOADER_JS_POSTFIX_UNCACHED)) {
|
|
164
164
|
const originalUrl = (0, import_cleanUrl.getPathFromLoaderPath)(url.pathname),
|
|
165
|
-
finalUrl = new URL(originalUrl, url.origin)
|
|
166
|
-
|
|
165
|
+
finalUrl = new URL(originalUrl, url.origin),
|
|
166
|
+
cleanedRequest = new Request(finalUrl, request);
|
|
167
|
+
return resolveLoaderRoute(requestHandlers, cleanedRequest, finalUrl, route);
|
|
167
168
|
}
|
|
168
169
|
switch (route.type) {
|
|
169
170
|
case "api":
|
|
@@ -215,9 +216,10 @@ url: ${url}`);
|
|
|
215
216
|
...route,
|
|
216
217
|
file: route.loaderServerPath || c.req.path
|
|
217
218
|
},
|
|
218
|
-
finalUrl = new URL(originalUrl, url.origin)
|
|
219
|
+
finalUrl = new URL(originalUrl, url.origin),
|
|
220
|
+
cleanedRequest = new Request(finalUrl, request);
|
|
219
221
|
try {
|
|
220
|
-
return await resolveLoaderRoute(requestHandlers,
|
|
222
|
+
return await resolveLoaderRoute(requestHandlers, cleanedRequest, finalUrl, loaderRoute);
|
|
221
223
|
} catch (err) {
|
|
222
224
|
return console.error(`Error running loader: ${err}`), next();
|
|
223
225
|
}
|
|
@@ -25,7 +25,7 @@ __export(oneServe_exports, {
|
|
|
25
25
|
oneServe: () => oneServe
|
|
26
26
|
});
|
|
27
27
|
module.exports = __toCommonJS(oneServe_exports);
|
|
28
|
-
var
|
|
28
|
+
var import_fs_extra = __toESM(require("fs-extra"), 1), import_node_path = require("node:path"), import_vxrn = require("vxrn"), import_serve = require("vxrn/serve"), import_constants = require("../constants"), import_createHandleRequest = require("../createHandleRequest"), import_cleanUrl = require("../utils/cleanUrl"), import_isRolldown = require("../utils/isRolldown"), import_toAbsolute = require("../utils/toAbsolute");
|
|
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)
|
|
@@ -115,8 +115,8 @@ url: ${url}`);
|
|
|
115
115
|
return next();
|
|
116
116
|
const url = (0, import_createHandleRequest.getURLfromRequestURL)(request), response = await (() => {
|
|
117
117
|
if (url.pathname.endsWith(import_constants.LOADER_JS_POSTFIX_UNCACHED)) {
|
|
118
|
-
const originalUrl = (0, import_cleanUrl.getPathFromLoaderPath)(url.pathname), finalUrl = new URL(originalUrl, url.origin);
|
|
119
|
-
return resolveLoaderRoute(requestHandlers,
|
|
118
|
+
const originalUrl = (0, import_cleanUrl.getPathFromLoaderPath)(url.pathname), finalUrl = new URL(originalUrl, url.origin), cleanedRequest = new Request(finalUrl, request);
|
|
119
|
+
return resolveLoaderRoute(requestHandlers, cleanedRequest, finalUrl, route);
|
|
120
120
|
}
|
|
121
121
|
switch (route.type) {
|
|
122
122
|
case "api":
|
|
@@ -171,9 +171,9 @@ url: ${url}`);
|
|
|
171
171
|
const loaderRoute = {
|
|
172
172
|
...route,
|
|
173
173
|
file: route.loaderServerPath || c.req.path
|
|
174
|
-
}, finalUrl = new URL(originalUrl, url.origin);
|
|
174
|
+
}, finalUrl = new URL(originalUrl, url.origin), cleanedRequest = new Request(finalUrl, request);
|
|
175
175
|
try {
|
|
176
|
-
return await resolveLoaderRoute(requestHandlers,
|
|
176
|
+
return await resolveLoaderRoute(requestHandlers, cleanedRequest, finalUrl, loaderRoute);
|
|
177
177
|
} catch (err) {
|
|
178
178
|
return console.error(`Error running loader: ${err}`), next();
|
|
179
179
|
}
|
|
@@ -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,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAmC,iCAGnC,mBAA8B,sBAC9B,cAAkC,iBAClC,eAA+B,uBAC/B,mBAA+D,yBAC/D,6BAKO,mCAEP,kBAAsC,8BACtC,oBAA2B,gCAC3B,oBAA2B;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,WADA,6BAAe,aAAa,IAG3B,QAAQ,QACvB,SAAS,WAAW,OAAO,KAAK,iBAAiB,OAEjD,cAAc,UAAM,8BAAW,GAE/B,kBAAmC;AAAA,IACvC,MAAM,UAAU,EAAE,MAAM,GAAG;AACzB,YAAM,WAAW,cACb,MAAM,KAAK,MAAM,CAAC,IAClB,MAAM,KAAK,MAAM,CAAC,EAAE,QAAQ,OAAO,GAAG,EAAE,QAAQ,OAAO,GAAG;AAE9D,aAAO,MAAM,WADG,uBAAK,QAAQ,IAAI,GAAG,QAAQ,OAAO,YAAY,SAAS,SAAS,MAAM;AAAA,IAEzF;AAAA,IAEA,MAAM,eAAe,OAAO;AAC1B,aAAO,MAAM,WAAO,8BAAW,MAAM,UAAU;AAAA,IACjD;AAAA,IAEA,MAAM,aAAa,EAAE,SAAS,OAAO,KAAK,YAAY,GAAG;AACvD,YAAM,UAAU,MAAM,WAAO,kCAAW,uBAAK,MAAM,eAAe,MAAM,IAAI,CAAC,IAEvE,EAAE,OAAO,IAAI;AAEnB,UAAI,CAAC;AACH,uBAAQ,KAAK,8BAA8B,MAAM,IAAI,GAC9C;AAGT,YAAM,OAAO,MAAM,OAAO,WAAW;AAErC,aAAO,qCAAqC,KAAK,UAAU,IAAI,CAAC;AAAA,IAClE;AAAA,IAEA,MAAM,WAAW,EAAE,OAAO,KAAK,YAAY,GAAG;AAC5C,YAAMA,aAAY,iBAAiB,MAAM,IAAI;AAE7C,UAAI,MAAM,SAAS,OAAO;AACxB,YAAI,CAACA;AACH,wBAAQ,MAAM,kBAAkB,KAAK,GAC/B,IAAI;AAAA,YACR,0BAA0B,GAAG,YAAY,MAAM,IAAI;AAAA,IAAiB,OAAO,KAAK,gBAAgB,EAAE,KAAK;AAAA,GAAM,CAAC;AAAA,UAChH;AAGF,YAAI;AAEF,gBAAM,aAAa,OADF,MAAM,WAAO,8BAAWA,WAAU,YAAY,IAC7B,SAAS,WAAW,GAChDC,YAAWD,WAAU,UAErB,UAAU,IAAI,QAAQ;AAC5B,kBAAQ,IAAI,gBAAgB,WAAW;AAEvC,gBAAM,WAAW,MAAM,OAAO;AAAA,YAC5B,MAAM,MAAM;AAAA,YACZ;AAAA,YACA;AAAA,YACA,MAAM,aAAa,QAAQ;AAAA,YAC3B,UAAAC;AAAA,YACA,KAAKD,WAAU;AAAA,UACjB,CAAC;AAED,iBAAO,IAAI,SAAS,UAAU;AAAA,YAC5B;AAAA,YACA,QAAQ,MAAM,aAAa,MAAM;AAAA,UACnC,CAAC;AAAA,QACH,SAAS,KAAK;AACZ,kBAAQ,MAAM,mCAAmC,MAAM,IAAI;AAAA;AAAA,EAEnE,KAAM,SAAY,GAAG;AAAA;AAAA,OAEhB,GAAG,EAAE;AAAA,QACJ;AAAA,MACF,OAAO;AACL,cAAM,WAAW,SAAS,IAAI,QAAQ,KAAK,SAASA,YAAW,SAAS;AAExE,YAAI,UAAU;AACZ,gBAAM,OAAO,MAAM,gBAAAE,QAAQ,aAAS,uBAAK,eAAe,QAAQ,GAAG,OAAO,GACpE,UAAU,IAAI,QAAQ;AAC5B,yBAAQ,IAAI,gBAAgB,WAAW,GAChC,IAAI,SAAS,MAAM,EAAE,SAAS,QAAQ,MAAM,aAAa,MAAM,IAAI,CAAC;AAAA,QAC7E;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,WAAS,kBAAkB,OAAkE;AAC3F,WAAO,OAAO,SAAS,SAAS;AAC9B,UAAI;AACF,cAAM,UAAU,QAAQ,IAAI;AAE5B,YAAI,MAAM,KAAK,SAAS,aAAa,KAAK,QAAQ,QAAQ,MAAM,SAAS,EAAE,SAAS,GAAG;AAKrF,gBAAM,sBAAsB,UAAM,+BAAkB,EAAE,QAAQ,CAAC;AAC/D,cAAI;AACF,mBAAO,UAAM;AAAA,cACX;AAAA,cACA;AAAA,cACA;AAAA,cACA,YAAY;AAAA,YACd;AAAA,QAEJ;AAIA,gBAAI,0BAAQ,QAAQ,GAAG,MAAM,aAAS,0BAAQ,QAAQ,GAAG,MAAM;AAC7D,iBAAO,KAAK;AAGd,cAAM,UAAM,iDAAqB,OAAO,GAElC,WAAW,OAAO,MAAM;AAE5B,cAAI,IAAI,SAAS,SAAS,2CAA0B,GAAG;AACrD,kBAAM,kBAAc,uCAAsB,IAAI,QAAQ,GAChD,WAAW,IAAI,IAAI,aAAa,IAAI,MAAM,GAC1C,iBAAiB,IAAI,QAAQ,UAAU,OAAO;AACpD,mBAAO,mBAAmB,iBAAiB,gBAAgB,UAAU,KAAK;AAAA,UAC5E;AAEA,kBAAQ,MAAM,MAAM;AAAA,YAClB,KAAK;AACH,qBAAO,gBAAgB,iBAAiB,SAAS,KAAK,KAAK;AAAA,YAE7D,KAAK;AAAA,YACL,KAAK;AAAA,YACL,KAAK;AACH,qBAAO,iBAAiB,iBAAiB,SAAS,KAAK,KAAK;AAAA,UAEhE;AAAA,QACF,GAAG;AAEH,YAAI,UAAU;AACZ,cAAI,WAAW,QAAQ,GAAG;AAGxB,gBAAI,iBAAiB,SAAS,MAAM,GAAG;AACrC,oBAAM,WAAW,GAAG,SAAS,QAAQ,IAAI,UAAU,KAAK,EAAE;AAC1D,8BAAS,QAAQ,QAAQ,CAAC,OAAO,QAAQ;AACvC,wBAAQ,OAAO,KAAK,KAAK;AAAA,cAC3B,CAAC,GACM,QAAQ,SAAS,UAAU,SAAS,MAAM;AAAA,YACnD;AAEA,gBAAI,aAAa,IAAI,OAAO;AAC1B,kBAAI;AACF,uBACE,CAAC,SAAS,QAAQ,IAAI,eAAe,KACrC,CAAC,SAAS,QAAQ,IAAI,eAAe,KAGrC,SAAS,QAAQ,IAAI,iBAAiB,UAAU,GAE3C;AAAA,cACT,SAAS,KAAK;AACZ,wBAAQ;AAAA,kBACN,6CACE,QAAQ,IAAI,IACd,wBAAwB,SAAS,QAAQ,IAAI,eAAe,CAAC;AAAA,kBAC7D;AAAA,gBACF;AAAA,cACF;AAGF,mBAAO;AAAA,UACT;AAEA,iBAAO,KAAK;AAAA,QACd;AAAA,MACF,SAAS,KAAK;AACZ,gBAAQ,MAAM,kCAAmC,IAAY,KAAQ,EAAE;AAAA,MACzE;AAEA,aAAO,KAAK;AAAA,IACd;AAAA,EACF;AAEA,QAAM,uBAAmB,4CAAgB,UAAU,QAAQ;AAE3D,aAAW,SAAS,iBAAiB;AACnC,QAAI,IAAI,MAAM,SAAS,kBAAkB,KAAK,CAAC,GAC/C,IAAI,IAAI,MAAM,SAAS,kBAAkB,KAAK,CAAC,GAC/C,IAAI,KAAK,MAAM,SAAS,kBAAkB,KAAK,CAAC,GAChD,IAAI,OAAO,MAAM,SAAS,kBAAkB,KAAK,CAAC,GAClD,IAAI,MAAM,MAAM,SAAS,kBAAkB,KAAK,CAAC,GAE7C,MAAM,YAAY,MAAM,iBAC1B,IAAI,IAAI,MAAM,cAAc,kBAAkB,KAAK,CAAC,GACpD,IAAI,IAAI,MAAM,cAAc,kBAAkB,KAAK,CAAC,GACpD,IAAI,KAAK,MAAM,cAAc,kBAAkB,KAAK,CAAC,GACrD,IAAI,OAAO,MAAM,cAAc,kBAAkB,KAAK,CAAC,GACvD,IAAI,MAAM,MAAM,cAAc,kBAAkB,KAAK,CAAC;AAI1D,aAAW,SAAS,iBAAiB;AACnC,QAAI,IAAI,MAAM,SAAS,kBAAkB,KAAK,CAAC,GAE3C,MAAM,YAAY,MAAM,gBAC1B,IAAI,IAAI,MAAM,cAAc,kBAAkB,KAAK,CAAC;AAIxD,QAAM,EAAE,SAAS,IAAI;AAGrB,MAAI,IAAI,KAAK,OAAO,GAAG,SAAS;AAC9B,QAAI,EAAE,IAAI,KAAK,SAAS,mCAAkB,KAEpC,CAAC,SAAS,EAAE,IAAI,IAAI;AAEtB,eAAE,OAAO,gBAAgB,iBAAiB,GAC1C,EAAE,OAAO,GAAG,GACL,EAAE,KAAK,EAAE;AAIpB,QAAI,EAAE,IAAI,KAAK,SAAS,2CAA0B,GAAG;AACnD,YAAM,UAAU,EAAE,IAAI,KAChB,UAAM,iDAAqB,OAAO,GAClC,kBAAc,uCAAsB,EAAE,IAAI,IAAI;AAEpD,iBAAW,SAAS,iBAAiB,YAAY;AAM/C,YALI,MAAM,SAAS,MAKf,CAAC,MAAM,cAAc,KAAK,WAAW;AACvC;AAIF,cAAM,cAAc;AAAA,UAClB,GAAG;AAAA,UACH,MAAM,MAAM,oBAAoB,EAAE,IAAI;AAAA,QACxC,GAEM,WAAW,IAAI,IAAI,aAAa,IAAI,MAAM,GAC1C,iBAAiB,IAAI,QAAQ,UAAU,OAAO;AAEpD,YAAI;AAEF,iBADiB,MAAM,mBAAmB,iBAAiB,gBAAgB,UAAU,WAAW;AAAA,QAElG,SAAS,KAAK;AACZ,yBAAQ,MAAM,yBAAyB,GAAG,EAAE,GACrC,KAAK;AAAA,QACd;AAAA,MACF;AAAA,IACF;AAEA,WAAO,KAAK;AAAA,EACd,CAAC;AACH;",
|
|
5
5
|
"names": ["buildInfo", "preloads", "FSExtra"]
|
|
6
6
|
}
|
|
@@ -36,8 +36,8 @@ __export(oneServe_exports, {
|
|
|
36
36
|
oneServe: () => oneServe
|
|
37
37
|
});
|
|
38
38
|
module.exports = __toCommonJS(oneServe_exports);
|
|
39
|
-
var
|
|
40
|
-
|
|
39
|
+
var import_fs_extra = __toESM(require("fs-extra"), 1),
|
|
40
|
+
import_path = require("path"),
|
|
41
41
|
import_vxrn = require("vxrn"),
|
|
42
42
|
import_serve = require("vxrn/serve"),
|
|
43
43
|
import_constants = require("../constants.native.js"),
|
|
@@ -198,8 +198,9 @@ url: ${url}`);
|
|
|
198
198
|
response = await function () {
|
|
199
199
|
if (url.pathname.endsWith(import_constants.LOADER_JS_POSTFIX_UNCACHED)) {
|
|
200
200
|
var originalUrl = (0, import_cleanUrl.getPathFromLoaderPath)(url.pathname),
|
|
201
|
-
finalUrl = new URL(originalUrl, url.origin)
|
|
202
|
-
|
|
201
|
+
finalUrl = new URL(originalUrl, url.origin),
|
|
202
|
+
cleanedRequest = new Request(finalUrl, request);
|
|
203
|
+
return resolveLoaderRoute(requestHandlers, cleanedRequest, finalUrl, route2);
|
|
203
204
|
}
|
|
204
205
|
switch (route2.type) {
|
|
205
206
|
case "api":
|
|
@@ -288,9 +289,10 @@ url: ${url}`);
|
|
|
288
289
|
...route2,
|
|
289
290
|
file: route2.loaderServerPath || c.req.path
|
|
290
291
|
},
|
|
291
|
-
finalUrl = new URL(originalUrl, url.origin)
|
|
292
|
+
finalUrl = new URL(originalUrl, url.origin),
|
|
293
|
+
cleanedRequest = new Request(finalUrl, request);
|
|
292
294
|
try {
|
|
293
|
-
var resolved = await resolveLoaderRoute(requestHandlers,
|
|
295
|
+
var resolved = await resolveLoaderRoute(requestHandlers, cleanedRequest, finalUrl, loaderRoute);
|
|
294
296
|
return resolved;
|
|
295
297
|
} catch (err) {
|
|
296
298
|
return console.error(`Error running loader: ${err}`), next();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","oneServe_exports","__export","oneServe","module","exports","
|
|
1
|
+
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","oneServe_exports","__export","oneServe","module","exports","import_fs_extra","__toESM","require","import_path","import_vxrn","import_serve","import_constants","import_createHandleRequest","import_cleanUrl","import_isRolldown","import_toAbsolute","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","get","source","context","destinationUrl","destination","replace","param","paramName","substring","req","permanent","_iterator","Symbol","iterator","next","done","err","return","Error","routeToBuildInfo","routeMap","serverOptions","root","entryServer","getServerEntry","entry","render","default","apiCJS","build","api","outputFormat","useRolldown","isRolldown","requestHandlers","handleAPI","route","route2","fileName","page","slice","apiFile","join","process","cwd","loadMiddleware","toAbsolute","contextKey","handleLoader","request","url","loaderProps","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","serveStaticAssets","runMiddlewares","extname","getURLfromRequestURL","response","LOADER_JS_POSTFIX_UNCACHED","originalUrl","getPathFromLoaderPath","finalUrl","URL","origin","cleanedRequest","Request","location","forEach","key","header","has","info","compiledManifest","compileManifest","manifest","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","apiRoutes","_step1","urlPath","put","post","delete","patch","urlCleanPath"],"sources":["../../../src/server/oneServe.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/dist/cjs/useLoader.cjs
CHANGED
|
@@ -20,7 +20,9 @@ var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
|
|
|
20
20
|
}), mod);
|
|
21
21
|
var useLoader_exports = {};
|
|
22
22
|
__export(useLoader_exports, {
|
|
23
|
-
|
|
23
|
+
refetchLoader: () => refetchLoader,
|
|
24
|
+
useLoader: () => useLoader,
|
|
25
|
+
useLoaderState: () => useLoaderState
|
|
24
26
|
});
|
|
25
27
|
module.exports = __toCommonJS(useLoader_exports);
|
|
26
28
|
var import_react = require("react"),
|
|
@@ -31,51 +33,130 @@ var import_react = require("react"),
|
|
|
31
33
|
import_dynamicImport = require("./utils/dynamicImport.cjs"),
|
|
32
34
|
import_weakKey = require("./utils/weakKey.cjs"),
|
|
33
35
|
import_one_server_only = require("./vite/one-server-only.cjs");
|
|
34
|
-
const
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
36
|
+
const loaderState = {},
|
|
37
|
+
subscribers = /* @__PURE__ */new Set();
|
|
38
|
+
function updateState(path, updates) {
|
|
39
|
+
loaderState[path] = {
|
|
40
|
+
...loaderState[path],
|
|
41
|
+
...updates
|
|
42
|
+
}, subscribers.forEach(callback => {
|
|
43
|
+
callback();
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
function subscribe(callback) {
|
|
47
|
+
return subscribers.add(callback), () => subscribers.delete(callback);
|
|
48
|
+
}
|
|
49
|
+
function getLoaderState(path, preloadedData2) {
|
|
50
|
+
return loaderState[path] || (loaderState[path] = {
|
|
51
|
+
data: preloadedData2,
|
|
52
|
+
error: void 0,
|
|
53
|
+
promise: void 0,
|
|
54
|
+
state: "idle",
|
|
55
|
+
hasLoadedOnce: !!preloadedData2
|
|
56
|
+
}), loaderState[path];
|
|
57
|
+
}
|
|
58
|
+
async function refetchLoader(pathname2) {
|
|
59
|
+
updateState(pathname2, {
|
|
60
|
+
state: "loading",
|
|
61
|
+
error: null
|
|
45
62
|
});
|
|
46
|
-
|
|
63
|
+
try {
|
|
64
|
+
const cacheBust = `${Date.now()}`,
|
|
65
|
+
loaderJSUrl2 = (0, import_cleanUrl.getLoaderPath)(pathname2, !0, cacheBust),
|
|
66
|
+
result2 = await (await (0, import_dynamicImport.dynamicImport)(loaderJSUrl2)).loader();
|
|
67
|
+
updateState(pathname2, {
|
|
68
|
+
data: result2,
|
|
69
|
+
state: "idle",
|
|
70
|
+
timestamp: Date.now(),
|
|
71
|
+
hasLoadedOnce: !0
|
|
72
|
+
});
|
|
73
|
+
} catch (err) {
|
|
74
|
+
throw updateState(pathname2, {
|
|
75
|
+
error: err,
|
|
76
|
+
state: "idle"
|
|
77
|
+
}), err;
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
function useLoaderState(loader) {
|
|
81
|
+
const {
|
|
82
|
+
loaderProps: loaderPropsFromServerContext,
|
|
83
|
+
loaderData: loaderDataFromServerContext
|
|
84
|
+
} = (0, import_one_server_only.useServerContext)() || {},
|
|
85
|
+
params = (0, import_hooks.useParams)(),
|
|
47
86
|
pathname = (0, import_hooks.usePathname)(),
|
|
48
87
|
currentPath = (0, import_href.resolveHref)({
|
|
49
88
|
pathname,
|
|
50
89
|
params
|
|
51
|
-
}).replace(/index$/, "")
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
90
|
+
}).replace(/index$/, "");
|
|
91
|
+
if (typeof window > "u" && loader) return {
|
|
92
|
+
data: useAsyncFn(loader, loaderPropsFromServerContext || {
|
|
93
|
+
path: pathname,
|
|
94
|
+
params
|
|
95
|
+
}),
|
|
96
|
+
refetch: async () => {},
|
|
97
|
+
state: "idle"
|
|
98
|
+
};
|
|
99
|
+
const preloadedData = loaderPropsFromServerContext?.path === currentPath ? loaderDataFromServerContext : void 0,
|
|
100
|
+
loaderStateEntry = (0, import_react.useSyncExternalStore)(subscribe, () => getLoaderState(currentPath, preloadedData), () => getLoaderState(currentPath, preloadedData)),
|
|
101
|
+
refetch = (0, import_react.useCallback)(() => refetchLoader(currentPath), [currentPath]);
|
|
102
|
+
if (!loader) return {
|
|
103
|
+
refetch,
|
|
104
|
+
state: loaderStateEntry.state
|
|
105
|
+
};
|
|
106
|
+
if (!loaderStateEntry.data && !loaderStateEntry.promise && !loaderStateEntry.hasLoadedOnce && loader) if (import_router.preloadingLoader[currentPath]) {
|
|
107
|
+
typeof import_router.preloadingLoader[currentPath] == "function" && (import_router.preloadingLoader[currentPath] = import_router.preloadingLoader[currentPath]());
|
|
108
|
+
const promise2 = import_router.preloadingLoader[currentPath].then(val => {
|
|
109
|
+
delete import_router.preloadingLoader[currentPath], updateState(currentPath, {
|
|
110
|
+
data: val,
|
|
111
|
+
hasLoadedOnce: !0,
|
|
112
|
+
promise: void 0
|
|
113
|
+
});
|
|
62
114
|
}).catch(err => {
|
|
63
|
-
console.error("Error
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
115
|
+
console.error("Error running loader()", err), delete import_router.preloadingLoader[currentPath], updateState(currentPath, {
|
|
116
|
+
error: err,
|
|
117
|
+
promise: void 0
|
|
118
|
+
});
|
|
119
|
+
});
|
|
120
|
+
loaderStateEntry.promise = promise2;
|
|
121
|
+
} else {
|
|
122
|
+
const loadData = async () => {
|
|
67
123
|
try {
|
|
68
|
-
const
|
|
69
|
-
|
|
124
|
+
const loaderJSUrl = (0, import_cleanUrl.getLoaderPath)(currentPath, !0),
|
|
125
|
+
module = await (0, import_dynamicImport.dynamicImport)(loaderJSUrl),
|
|
126
|
+
result = await module.loader();
|
|
127
|
+
updateState(currentPath, {
|
|
128
|
+
data: result,
|
|
129
|
+
hasLoadedOnce: !0,
|
|
130
|
+
promise: void 0
|
|
131
|
+
});
|
|
70
132
|
} catch (err) {
|
|
71
|
-
|
|
133
|
+
updateState(currentPath, {
|
|
134
|
+
error: err,
|
|
135
|
+
promise: void 0
|
|
136
|
+
});
|
|
72
137
|
}
|
|
73
|
-
}
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
throw promises[currentPath];
|
|
138
|
+
},
|
|
139
|
+
promise = loadData();
|
|
140
|
+
loaderStateEntry.promise = promise;
|
|
77
141
|
}
|
|
78
|
-
|
|
142
|
+
if (loader) {
|
|
143
|
+
if (loaderStateEntry.error && !loaderStateEntry.hasLoadedOnce) throw loaderStateEntry.error;
|
|
144
|
+
if (loaderStateEntry.data === void 0 && loaderStateEntry.promise && !loaderStateEntry.hasLoadedOnce) throw loaderStateEntry.promise;
|
|
145
|
+
return {
|
|
146
|
+
data: loaderStateEntry.data,
|
|
147
|
+
refetch,
|
|
148
|
+
state: loaderStateEntry.state
|
|
149
|
+
};
|
|
150
|
+
} else return {
|
|
151
|
+
refetch,
|
|
152
|
+
state: loaderStateEntry.state
|
|
153
|
+
};
|
|
154
|
+
}
|
|
155
|
+
function useLoader(loader2) {
|
|
156
|
+
const {
|
|
157
|
+
data: data2
|
|
158
|
+
} = useLoaderState(loader2);
|
|
159
|
+
return data2;
|
|
79
160
|
}
|
|
80
161
|
const results = /* @__PURE__ */new Map(),
|
|
81
162
|
started = /* @__PURE__ */new Map();
|
package/dist/cjs/useLoader.js
CHANGED
|
@@ -14,49 +14,124 @@ var __export = (target, all) => {
|
|
|
14
14
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
|
|
15
15
|
var useLoader_exports = {};
|
|
16
16
|
__export(useLoader_exports, {
|
|
17
|
-
|
|
17
|
+
refetchLoader: () => refetchLoader,
|
|
18
|
+
useLoader: () => useLoader,
|
|
19
|
+
useLoaderState: () => useLoaderState
|
|
18
20
|
});
|
|
19
21
|
module.exports = __toCommonJS(useLoader_exports);
|
|
20
22
|
var import_react = require("react"), import_hooks = require("./hooks"), import_href = require("./link/href"), import_router = require("./router/router"), import_cleanUrl = require("./utils/cleanUrl"), import_dynamicImport = require("./utils/dynamicImport"), import_weakKey = require("./utils/weakKey"), import_one_server_only = require("./vite/one-server-only");
|
|
21
|
-
const
|
|
22
|
-
function
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
23
|
+
const loaderState = {}, subscribers = /* @__PURE__ */ new Set();
|
|
24
|
+
function updateState(path, updates) {
|
|
25
|
+
loaderState[path] = { ...loaderState[path], ...updates }, subscribers.forEach((callback) => {
|
|
26
|
+
callback();
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
function subscribe(callback) {
|
|
30
|
+
return subscribers.add(callback), () => subscribers.delete(callback);
|
|
31
|
+
}
|
|
32
|
+
function getLoaderState(path, preloadedData2) {
|
|
33
|
+
return loaderState[path] || (loaderState[path] = {
|
|
34
|
+
data: preloadedData2,
|
|
35
|
+
error: void 0,
|
|
36
|
+
promise: void 0,
|
|
37
|
+
state: "idle",
|
|
38
|
+
hasLoadedOnce: !!preloadedData2
|
|
39
|
+
}), loaderState[path];
|
|
40
|
+
}
|
|
41
|
+
async function refetchLoader(pathname2) {
|
|
42
|
+
updateState(pathname2, {
|
|
43
|
+
state: "loading",
|
|
44
|
+
error: null
|
|
45
|
+
});
|
|
46
|
+
try {
|
|
47
|
+
const cacheBust = `${Date.now()}`, loaderJSUrl2 = (0, import_cleanUrl.getLoaderPath)(pathname2, !0, cacheBust), result2 = await (await (0, import_dynamicImport.dynamicImport)(loaderJSUrl2)).loader();
|
|
48
|
+
updateState(pathname2, {
|
|
49
|
+
data: result2,
|
|
50
|
+
state: "idle",
|
|
51
|
+
timestamp: Date.now(),
|
|
52
|
+
hasLoadedOnce: !0
|
|
53
|
+
});
|
|
54
|
+
} catch (err) {
|
|
55
|
+
throw updateState(pathname2, {
|
|
56
|
+
error: err,
|
|
57
|
+
state: "idle"
|
|
58
|
+
}), err;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
function useLoaderState(loader) {
|
|
62
|
+
const { loaderProps: loaderPropsFromServerContext, loaderData: loaderDataFromServerContext } = (0, import_one_server_only.useServerContext)() || {}, params = (0, import_hooks.useParams)(), pathname = (0, import_hooks.usePathname)(), currentPath = (0, import_href.resolveHref)({ pathname, params }).replace(/index$/, "");
|
|
63
|
+
if (typeof window > "u" && loader)
|
|
64
|
+
return { data: useAsyncFn(
|
|
26
65
|
loader,
|
|
27
66
|
loaderPropsFromServerContext || {
|
|
28
|
-
path:
|
|
29
|
-
params
|
|
67
|
+
path: pathname,
|
|
68
|
+
params
|
|
30
69
|
}
|
|
31
|
-
)
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
if (
|
|
39
|
-
return
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
const
|
|
47
|
-
|
|
70
|
+
), refetch: async () => {
|
|
71
|
+
}, state: "idle" };
|
|
72
|
+
const preloadedData = loaderPropsFromServerContext?.path === currentPath ? loaderDataFromServerContext : void 0, loaderStateEntry = (0, import_react.useSyncExternalStore)(
|
|
73
|
+
subscribe,
|
|
74
|
+
() => getLoaderState(currentPath, preloadedData),
|
|
75
|
+
() => getLoaderState(currentPath, preloadedData)
|
|
76
|
+
), refetch = (0, import_react.useCallback)(() => refetchLoader(currentPath), [currentPath]);
|
|
77
|
+
if (!loader)
|
|
78
|
+
return {
|
|
79
|
+
refetch,
|
|
80
|
+
state: loaderStateEntry.state
|
|
81
|
+
};
|
|
82
|
+
if (!loaderStateEntry.data && !loaderStateEntry.promise && !loaderStateEntry.hasLoadedOnce && loader)
|
|
83
|
+
if (import_router.preloadingLoader[currentPath]) {
|
|
84
|
+
typeof import_router.preloadingLoader[currentPath] == "function" && (import_router.preloadingLoader[currentPath] = import_router.preloadingLoader[currentPath]());
|
|
85
|
+
const promise2 = import_router.preloadingLoader[currentPath].then((val) => {
|
|
86
|
+
delete import_router.preloadingLoader[currentPath], updateState(currentPath, {
|
|
87
|
+
data: val,
|
|
88
|
+
hasLoadedOnce: !0,
|
|
89
|
+
promise: void 0
|
|
90
|
+
});
|
|
91
|
+
}).catch((err) => {
|
|
92
|
+
console.error("Error running loader()", err), delete import_router.preloadingLoader[currentPath], updateState(currentPath, {
|
|
93
|
+
error: err,
|
|
94
|
+
promise: void 0
|
|
95
|
+
});
|
|
96
|
+
});
|
|
97
|
+
loaderStateEntry.promise = promise2;
|
|
98
|
+
} else {
|
|
99
|
+
const loadData = async () => {
|
|
48
100
|
try {
|
|
49
|
-
const
|
|
50
|
-
|
|
101
|
+
const loaderJSUrl = (0, import_cleanUrl.getLoaderPath)(currentPath, !0), module = await (0, import_dynamicImport.dynamicImport)(loaderJSUrl), result = await module.loader();
|
|
102
|
+
updateState(currentPath, {
|
|
103
|
+
data: result,
|
|
104
|
+
hasLoadedOnce: !0,
|
|
105
|
+
promise: void 0
|
|
106
|
+
});
|
|
51
107
|
} catch (err) {
|
|
52
|
-
|
|
108
|
+
updateState(currentPath, {
|
|
109
|
+
error: err,
|
|
110
|
+
promise: void 0
|
|
111
|
+
});
|
|
53
112
|
}
|
|
54
|
-
};
|
|
55
|
-
|
|
113
|
+
}, promise = loadData();
|
|
114
|
+
loaderStateEntry.promise = promise;
|
|
56
115
|
}
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
116
|
+
if (loader) {
|
|
117
|
+
if (loaderStateEntry.error && !loaderStateEntry.hasLoadedOnce)
|
|
118
|
+
throw loaderStateEntry.error;
|
|
119
|
+
if (loaderStateEntry.data === void 0 && loaderStateEntry.promise && !loaderStateEntry.hasLoadedOnce)
|
|
120
|
+
throw loaderStateEntry.promise;
|
|
121
|
+
return {
|
|
122
|
+
data: loaderStateEntry.data,
|
|
123
|
+
refetch,
|
|
124
|
+
state: loaderStateEntry.state
|
|
125
|
+
};
|
|
126
|
+
} else
|
|
127
|
+
return {
|
|
128
|
+
refetch,
|
|
129
|
+
state: loaderStateEntry.state
|
|
130
|
+
};
|
|
131
|
+
}
|
|
132
|
+
function useLoader(loader2) {
|
|
133
|
+
const { data: data2 } = useLoaderState(loader2);
|
|
134
|
+
return data2;
|
|
60
135
|
}
|
|
61
136
|
const results = /* @__PURE__ */ new Map(), started = /* @__PURE__ */ new Map();
|
|
62
137
|
function useAsyncFn(val, props) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/useLoader.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;
|
|
5
|
-
"names": []
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["preloadedData", "pathname", "loaderJSUrl", "result", "promise", "loader", "data"]
|
|
6
6
|
}
|