one 1.2.18 → 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/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/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/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/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
|
@@ -65,6 +65,7 @@ async function resolveAPIRoute(handlers, request, url, route) {
|
|
|
65
65
|
url,
|
|
66
66
|
loaderProps: {
|
|
67
67
|
path: pathname,
|
|
68
|
+
search: url.search,
|
|
68
69
|
params
|
|
69
70
|
}
|
|
70
71
|
}), request, params || {});
|
|
@@ -91,6 +92,7 @@ async function resolveLoaderRoute(handlers, request, url, route) {
|
|
|
91
92
|
url,
|
|
92
93
|
loaderProps: {
|
|
93
94
|
path: url.pathname,
|
|
95
|
+
search: url.search,
|
|
94
96
|
request: route.type === "ssr" ? request : void 0,
|
|
95
97
|
params: getLoaderParams(url, route)
|
|
96
98
|
}
|
|
@@ -114,7 +116,8 @@ async function resolvePageRoute(handlers, request, url, route) {
|
|
|
114
116
|
route,
|
|
115
117
|
url,
|
|
116
118
|
loaderProps: {
|
|
117
|
-
path: pathname
|
|
119
|
+
path: pathname,
|
|
120
|
+
search,
|
|
118
121
|
// Ensure SSR loaders receive the original request
|
|
119
122
|
request: route.type === "ssr" ? request : void 0,
|
|
120
123
|
params: getLoaderParams(url, route)
|
|
@@ -164,7 +167,9 @@ function createHandleRequest(handlers, {
|
|
|
164
167
|
for (const route of compiledManifest.pageRoutes) {
|
|
165
168
|
if (route.file === "") continue;
|
|
166
169
|
const finalUrl = new URL(originalUrl, url.origin);
|
|
167
|
-
if (finalUrl.search = url.search,
|
|
170
|
+
if (finalUrl.search = url.search, !route.compiledRegex.test(finalUrl.pathname)) continue;
|
|
171
|
+
const cleanedRequest = new Request(finalUrl, request);
|
|
172
|
+
return resolveLoaderRoute(handlers, cleanedRequest, finalUrl, route);
|
|
168
173
|
}
|
|
169
174
|
return process.env.NODE_ENV === "development" && console.error("No matching route found for loader!", {
|
|
170
175
|
originalUrl,
|
|
@@ -53,6 +53,7 @@ async function resolveAPIRoute(handlers, request, url, route) {
|
|
|
53
53
|
url,
|
|
54
54
|
loaderProps: {
|
|
55
55
|
path: pathname,
|
|
56
|
+
search: url.search,
|
|
56
57
|
params
|
|
57
58
|
}
|
|
58
59
|
}),
|
|
@@ -83,6 +84,7 @@ async function resolveLoaderRoute(handlers, request, url, route) {
|
|
|
83
84
|
url,
|
|
84
85
|
loaderProps: {
|
|
85
86
|
path: url.pathname,
|
|
87
|
+
search: url.search,
|
|
86
88
|
request: route.type === "ssr" ? request : void 0,
|
|
87
89
|
params: getLoaderParams(url, route)
|
|
88
90
|
}
|
|
@@ -104,7 +106,8 @@ async function resolvePageRoute(handlers, request, url, route) {
|
|
|
104
106
|
route,
|
|
105
107
|
url,
|
|
106
108
|
loaderProps: {
|
|
107
|
-
path: pathname
|
|
109
|
+
path: pathname,
|
|
110
|
+
search,
|
|
108
111
|
// Ensure SSR loaders receive the original request
|
|
109
112
|
request: route.type === "ssr" ? request : void 0,
|
|
110
113
|
params: getLoaderParams(url, route)
|
|
@@ -154,8 +157,10 @@ function createHandleRequest(handlers, { routerRoot }) {
|
|
|
154
157
|
if (route.file === "")
|
|
155
158
|
continue;
|
|
156
159
|
const finalUrl = new URL(originalUrl, url.origin);
|
|
157
|
-
if (finalUrl.search = url.search,
|
|
158
|
-
|
|
160
|
+
if (finalUrl.search = url.search, !route.compiledRegex.test(finalUrl.pathname))
|
|
161
|
+
continue;
|
|
162
|
+
const cleanedRequest = new Request(finalUrl, request);
|
|
163
|
+
return resolveLoaderRoute(handlers, cleanedRequest, finalUrl, route);
|
|
159
164
|
}
|
|
160
165
|
return process.env.NODE_ENV === "development" && console.error("No matching route found for loader!", {
|
|
161
166
|
originalUrl,
|
|
@@ -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;AAAA,uBAA2C,wBAK3C,kBAAsC,6BACtC,oBAA2B,+BAC3B,qBAA4B,+BAC5B,yBAAoD;AAmBpD,eAAsB,eACpB,UACA,SACA,OACA,aACmB;AACnB,QAAM,cAAc,MAAM;AAE1B,MAAI,CAAC,aAAa;AAChB,WAAO,MAAM,YAAY;AAE3B,MAAI,CAAC,SAAS;AACZ,UAAM,IAAI,MAAM,kCAAkC;AAGpD,QAAM,UAA6B,CAAC;AAEpC,iBAAe,SAAS,OAAkC;AACxD,UAAM,mBAAmB,YAAa,KAAK;AAG3C,QAAI,CAAC;AACH,aAAO,MAAM,YAAY;AAG3B,UAAM,YAAY,MAAM,SAAS,eAAgB,gBAAgB,IAAI;AAIrE,QAAI,CAAC;AACH,YAAM,IAAI,MAAM,wCAAwC,iBAAiB,UAAU,EAAE;AASvF,UAAM,WAAW,MAAM,SAAS,EAAE,SAAS,MAL9B,YACJ,SAAS,QAAQ,CAAC,GAIsB,QAAQ,CAAC;AAE1D,WAAI,YAKG,SAAS,QAAQ,CAAC;AAAA,EAC3B;AAGA,SAAO,SAAS,CAAC;AACnB;AAEA,eAAsB,gBACpB,UACA,SACA,KACA,OACA;AACA,QAAM,EAAE,SAAS,IAAI,KACf,SAAS,eAAe,UAAU,KAAK;AAE7C,MAAI;AACF,eAAO;AAAA,MACL,MACE,SAAS,UAAW;AAAA,QAClB;AAAA,QACA;AAAA,QACA;AAAA,QACA,aAAa;AAAA,UACX,MAAM;AAAA,UACN;AAAA,QACF;AAAA,MACF,CAAC;AAAA,MACH;AAAA,MACA,UAAU,CAAC;AAAA,IACb;AAAA,EACF,SAAS,KAAK;AACZ,YAAI,8BAAW,GAAG;AAChB,aAAO;AAGT,UAAI,QAAQ,IAAI,aAAa,iBAC3B,QAAQ,MAAM;AAAA,sCAAyC,QAAQ;AAAA;AAAA,UAE3D,GAAG;AAAA;AAAA;AAAA;AAAA,OAIN,GAGG;AAAA,EACR;AACF;AAEA,eAAsB,mBACpB,UACA,SACA,KACA,OACA;AACA,SAAO,MAAM,eAAe,UAAU,SAAS,OAAO,YAC7C,UAAM,wCAAgB,YAAY;AACvC,UAAM,UAAU,IAAI,QAAQ;AAC5B,YAAQ,IAAI,gBAAgB,iBAAiB;AAE7C,QAAI;AACF,YAAM,iBAAiB,MAAM,SAAS,aAAc;AAAA,QAClD;AAAA,QACA;AAAA,QACA;AAAA,QACA,aAAa;AAAA,UACX,MAAM,IAAI;AAAA,UACV,SAAS,MAAM,SAAS,QAAQ,UAAU;AAAA,UAC1C,QAAQ,gBAAgB,KAAK,KAAK;AAAA,QACpC;AAAA,MACF,CAAC;AAED,aAAO,IAAI,SAAS,gBAAgB;AAAA,QAClC;AAAA,MACF,CAAC;AAAA,IACH,SAAS,KAAK;AAEZ,cAAI,8BAAW,GAAG;AAChB,eAAO;AAGT,oBAAQ,MAAM,yBAAyB,GAAG,EAAE,GAEtC;AAAA,IACR;AAAA,EACF,CAAC,CACF;AACH;AAEA,eAAsB,iBACpB,UACA,SACA,KACA,OACA;AACA,QAAM,EAAE,UAAU,OAAO,IAAI;AAE7B,aAAO,wCAAgB,YACJ,MAAM,eAAe,UAAU,SAAS,OAAO,YACvD,MAAM,SAAS,WAAY;AAAA,IAChC;AAAA,IACA;AAAA,IACA;AAAA,IACA,aAAa;AAAA,MACX,MAAM,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -72,6 +72,7 @@ async function resolveAPIRoute(handlers, request, url, route) {
|
|
|
72
72
|
url,
|
|
73
73
|
loaderProps: {
|
|
74
74
|
path: pathname,
|
|
75
|
+
search: url.search,
|
|
75
76
|
params
|
|
76
77
|
}
|
|
77
78
|
});
|
|
@@ -100,6 +101,7 @@ async function resolveLoaderRoute(handlers, request, url, route) {
|
|
|
100
101
|
url,
|
|
101
102
|
loaderProps: {
|
|
102
103
|
path: url.pathname,
|
|
104
|
+
search: url.search,
|
|
103
105
|
request: route.type === "ssr" ? request : void 0,
|
|
104
106
|
params: getLoaderParams(url, route)
|
|
105
107
|
}
|
|
@@ -126,7 +128,8 @@ async function resolvePageRoute(handlers, request, url, route) {
|
|
|
126
128
|
route,
|
|
127
129
|
url,
|
|
128
130
|
loaderProps: {
|
|
129
|
-
path: pathname
|
|
131
|
+
path: pathname,
|
|
132
|
+
search,
|
|
130
133
|
// Ensure SSR loaders receive the original request
|
|
131
134
|
request: route.type === "ssr" ? request : void 0,
|
|
132
135
|
params: getLoaderParams(url, route)
|
|
@@ -189,7 +192,10 @@ function createHandleRequest(handlers, param) {
|
|
|
189
192
|
var route = _step.value;
|
|
190
193
|
if (route.file !== "") {
|
|
191
194
|
var finalUrl = new URL(originalUrl, url.origin);
|
|
192
|
-
if (finalUrl.search = url.search, !!route.compiledRegex.test(finalUrl.pathname))
|
|
195
|
+
if (finalUrl.search = url.search, !!route.compiledRegex.test(finalUrl.pathname)) {
|
|
196
|
+
var cleanedRequest = new Request(finalUrl, request);
|
|
197
|
+
return resolveLoaderRoute(handlers, cleanedRequest, finalUrl, route);
|
|
198
|
+
}
|
|
193
199
|
}
|
|
194
200
|
}
|
|
195
201
|
} catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","createHandleRequest_exports","__export","compileManifest","createHandleRequest","getURLfromRequestURL","resolveAPIRoute","resolveLoaderRoute","resolvePageRoute","runMiddlewares","module","exports","import_constants","require","import_cleanUrl","import_isResponse","import_getManifest","import_resolveResponse","handlers","request","route","getResponse","middlewares","length","loadMiddleware","Error","context","dispatch","index","_this","middlewareModule","exported","default","contextKey","next","response","url","pathname","params","getRouteParams","resolveAPIEndpoint","handleAPI","loaderProps","path","err","isResponse","process","env","NODE_ENV","console","error","resolveResponse","headers","Headers","set","loaderResponse","handleLoader","type","getLoaderParams","Response","
|
|
1
|
+
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","createHandleRequest_exports","__export","compileManifest","createHandleRequest","getURLfromRequestURL","resolveAPIRoute","resolveLoaderRoute","resolvePageRoute","runMiddlewares","module","exports","import_constants","require","import_cleanUrl","import_isResponse","import_getManifest","import_resolveResponse","handlers","request","route","getResponse","middlewares","length","loadMiddleware","Error","context","dispatch","index","_this","middlewareModule","exported","default","contextKey","next","response","url","pathname","params","getRouteParams","resolveAPIEndpoint","handleAPI","loaderProps","path","search","err","isResponse","process","env","NODE_ENV","console","error","resolveResponse","headers","Headers","set","loaderResponse","handleLoader","type","getLoaderParams","Response","resolved","handlePage","urlString","URL","get","compileRouteRegex","compiledRegex","RegExp","namedRegex","manifest","pageRoutes","map","apiRoutes","param","routerRoot","getManifest","compiledManifest","handler","startsWith","apiRoute","find","route2","test","method","isClientRequestingNewRoute","endsWith","LOADER_JS_POSTFIX_UNCACHED","originalUrl","getPathFromLoaderPath","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","done","file","finalUrl","origin","cleanedRequest","Request","return"],"sources":["../../src/createHandleRequest.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,2BAAA;AAAAC,QAAA,CAAAD,2BAAA;EAAAE,eAAA,EAAAA,CAAA,KAAAA,eAAA;EAAAC,mBAAA,EAAAA,CAAA,KAAAA,mBAAA;EAAAC,oBAAA,EAAAA,CAAA,KAAAA,oBAAA;EAAAC,eAAA,EAAAA,CAAA,KAAAA,eAAA;EAAAC,kBAAA,EAAAA,CAAA,KAAAA,kBAAA;EAAAC,gBAAA,EAAAA,CAAA,KAAAA,gBAAA;EAAAC,cAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAf,YAA2C,CAAAK,2BAK3C;AAsBA,IAAAW,gBAAsB,GAAAC,OACpB,wBACA;EAAAC,eAEA,GAAAD,OACmB;EAAAE,iBAAA,GAAAF,OAAA;EAAAG,kBAAA,GAAAH,OAAA;EAAAI,sBAAA,GAAAJ,OAAA;AACnB,eAAMJ,cAAoBA,CAAAS,QAAA,EAAAC,OAAA,EAAAC,KAAA,EAAAC,WAAA;EAE1B,IAAIC,WAAC,GAAaF,KAAA,CAAAE,WAAA;EAChB,KAAAA,WAAa,EAAAC,MAAA,EAEf,OAAK,MAASF,WAAA;EACZ,KAAAH,QAAU,CAAAM,cAAM,EAGlB,MAAM,IAAAC,KAA8B;EAEpC,IAAAC,OAAA,IAAe;EACb,eAAMC,SAAAC,KAAmB;IAGzB,IAAIC,KAAC;MAAAC,gBAAA,GAAAR,WAAA,CAAAM,KAAA;IACH,KAAAE,gBAAa,EAGf,OAAM,MAAAT,WAAkB;IAIxB,IAAIU,QAAC,IAAAF,KAAA,SAAAX,QAAA,CAAAM,cAAA,CAAAM,gBAAA,eAAAD,KAAA,uBAAAA,KAAA,CAAAG,OAAA;IACH,KAAAD,QAAU,EASZ,MAAM,IAAAN,KAAW,yCALJK,gBACK,CAAAG,UAI+B;IAEjD,IAAAC,IAAI,kBAAAA,CAAA,EAKY;QAClB,OAAAP,QAAA,CAAAC,KAAA;MAGA;MAAAO,QAAO,GAAS,MAACJ,QAAA;QACnBZ,OAAA;QAEAe,IAAA;QAMER;MAGA,EAAI;IACF,OAAAS,QAAO,IAAAR,QAAA,CAAAC,KAAA;EAAA;EAEiB,OAClBD,QAAA;AAAA;AACA,eACArB,gBAAAY,QAAA,EAAAC,OAAA,EAAAiB,GAAA,EAAAhB,KAAA;EAAA;MACAiB;IAAA,IAAaD,GAAA;IAAAE,MAAA,GAAAC,cAAA,CAAAF,QAAA,EAAAjB,KAAA;EAAA;IACL,OACN,IAAAH,sBAAY,CAAAuB,kBAAA;MAAA,OACZtB,QAAA,CAAAuB,SAAA;QACFtB,OAAA;QACDC,KAAA;QACHgB,GAAA;QACAM,WAAW;UACbC,IAAA,EAAAN,QAAA;UACFO,MAAc,EAAAR,GAAA,CAAAQ,MAAA;UACZN;QACE;MAGF;IACgB,GAAAnB,OAAA,EAAAmB,MAAA;EAAiD,SAAAO,GAAA;IAAA,MAE3D,EAAA9B,iBAAG,CAAA+B,UAAA,EAAAD,GAAA,UAAAA,GAAA;IAAA,MAAAE,OAAA,CAAAC,GAAA,CAAAC,QAAA,sBAAAC,OAAA,CAAAC,KAAA;AAAA,sCAAAd,QAAA;AAAA;AAOH,UACRQ,GAAA;AACF;AAEA;AAME;AAEI,UAAMA,GAAA;EACN;AAEA;AACE,eAAMtC,kBAAiBA,CAAAW,QAAM,EAASC,OAAA,EAAAiB,GAAA,EAAchB,KAAA;EAAA,OAClD,MAAAX,cAAA,CAAAS,QAAA,EAAAC,OAAA,EAAAC,KAAA;IAAA,OACA,UAAAH,sBAAA,CAAAmC,eAAA;MAAA,IACAC,OAAA,OAAAC,OAAA;MAAAD,OACA,CAAAE,GAAA,eAAa;MAAA,IACX;QAAU,IACVC,cAAY,SAAAtC,QAAA,CAAAuC,YAAA;UACZtC,OAAA;UACAC,KAAA;UACFgB,GAAA;UACDM,WAAA;YAEDC,IAAO,EAAIP,GAAA,CAAAC,QAAS;YAClBO,MAAA,EAAAR,GAAA,CAAAQ,MAAA;YACDzB,OAAA,EAAAC,KAAA,CAAAsC,IAAA,aAAAvC,OAAA;YACHmB,MAAc,EAAAqB,eAAA,CAAAvB,GAAA,EAAAhB,KAAA;UAEZ;QACE;QAGF,WAAAwC,QAAc,CAAAJ,cAAA;UAGhBH;QAEH;MACH,SAAAR,GAAA;QAEA,QAAsB9B,iBACpB,CAAA+B,UACA,EAAAD,GAAA,GAIQ,OAAAA,GAAU;QAElB,MAAOK,OAAA,CAAAC,KAAA,0BAAgBN,GAAA,KAAAA,GAAA;MAGjB;IACA;EAAA,EACA;AAAA;AACa,eACLrC,iBAAAU,QAAA,EAAAC,OAAA,EAAAiB,GAAA,EAAAhB,KAAA;EAAA,IACN;IAAAiB,QAAA;IAAAO;EAAA,IAAAR,GAAA;EAAA,WAAAnB,sBAAA,CAAAmC,eAAA;IAAA,IAEAS,QAAS,SAAMpD,cAAiB,CAAAS,QAAU,EAAAC,OAAA,EAAAC,KAAA;MAC1C,aAAQF,QAAA,CAAA4C,UAAqB;QAC/B3C,OAAA;QAILC,KAAA;QACHgB,GAAA;QAEOM,WAAS;UACRC,IAAA,EAAAN,QAAY;UACXO,MAAI;UACT;UACAzB,OAAQ,EAAAC,KAAY,CAAAsC,IAAA,KAAU,QAAAvC,OAAU,GAAQ;UAClDmB,MAAA,EAAAqB,eAAA,CAAAvB,GAAA,EAAAhB,KAAA;QACF;MAEA;IACE;IACE,OAAGyC,QAAA;EAAA,EACH;AAA0C;AAE9C,SAAAxD,qBAAAc,OAAA;EAEO,IAAA4C,SAAS,GAAA5C,OAAgB,CAAAiB,GAAA,MAG9B;EACA,OAAO,IAAA4B,GAAA,CAAAD,SAAA,QAAA5C,OAAA,CAAAkC,OAAA,CAAAY,GAAA,qBAAA9C,OAAA,CAAAkC,OAAA,CAAAY,GAAA;AAAA;AACgD,SACrDC,iBAAoBA,CAAA9C,KAAA,EAAU;EAChC;IACF,GAAAA,KAAA;IAGO+C,aAAS,MAAAC,MACd,CAAAhD,KAAA,CAAAiD,UACE;EAEF;AACA;AACE,SAAAlE,eAAgBA,CAAAmE,QAAA;EAElB,OAAM;IAENC,UAAO,EAAAD,QAAA,CAAAC,UAAA,CAAAC,GAAA,CAAAN,iBAAA;IACLO,SAAA,EAAAH,QAAA,CAAAG,SAAA,CAAAD,GAAA,CAAAN,iBAAA;EAAA;AAEE;AAGA,SAAA9D,mBAAiBA,CAAAc,QAAA,EAAgBwD,KAAA;EAC/B;MAAAC;IAAO,IAAAD,KAAA;IAAAJ,QAAA,OAAAtD,kBAAA,CAAA4D,WAAA;MAGTD;IACE;EAGA,KAAAL,QAAI,EACF,UAAA7C,KAAO,qBAAsB;EAAgC,IAEjEoD,gBAAA,GAAA1E,eAAA,CAAAmE,QAAA;EAEA;IACEA,QAAA;IAGFQ,OAAI,iBAAAA,CAAS3D,OACwB;MAGjC,IAAAiB,GAAA,GAAM/B,oBAAc,CAAAc,OAAA;QAAA;UAAAkB,QAAA;UAAAO;QAAA,IAAAR,GAAsB;MAE1C,IAAAC,QAAA,KAAW,YAAS,IAAAA,QAAiB,CAAA0C,UAAY,QAC/C,OAAI;MAEF,IAAA7D,QAAA,CAAAuB,SAAA;QAGF,IAAAuC,QAAM,GAAAH,gBAAmB,CAAAJ,SAAa,CAAAQ,IAAI,WAAMC,MAAA;UAGhD,OAFAA,MAAS,CAAAf,aAAa,CAAAgB,IAAA,CAAA9C,QAEX;QACT;QAGF,IAAA2C,QAAM,EACN,OAAO,MAAA1E,eAAmB,CAAAY,QAAU,EAAAC,OAAA,EAAAiB,GAAA,EAAgB4C,QAAA,CAAU;MAAK;MAGrE,IAAA7D,OAAI,CAAAiE,MAAQ,KAAI,OACuC,OACnD;MAAA,IACAlE,QAAA,CAAAuC,YAAA;QAAA,IACA4B,0BAAiB,GAAAhD,QAAA,CAAAiD,QAAA,CAAA1E,gBAAA,CAAA2E,0BAAA;QACnB,IAKKF,0BAAe;UACxB,IAAAG,WAAA,OAAA1E,eAAA,CAAA2E,qBAAA,EAAApD,QAAA;YAAAqD,yBAAA;YAAAC,iBAAA;YAAAC,cAAA;UAGE;YACF,SAAWC,SAAS,GAAAhB,gBAAiB,CAAAN,UAAA,CAAAuB,MAAA,CAAAC,QAAA,KAAAC,KAAA,IAAAN,yBAAA,IAAAM,KAAA,GAAAH,SAAA,CAAA3D,IAAA,IAAA+D,IAAA,GAAAP,yBAAA;cAC9B,IAAAtE,KAAM,GAAA4E,KAAA,CAAAhG,KAAc;cAGzB,IAAAoB,KAAO,CAAA8E,IAAA,SAAiB;gBAA6B,IAAAC,QAAA,OAAAnC,GAAA,CAAAwB,WAAA,EAAApD,GAAA,CAAAgE,MAAA;gBAIlD,IAAAD,QAAA,CAAAvD,MAAA,GAAAR,GAAA,CAAAQ,MAAA,IAAAxB,KAAA,CAAA+C,aAAA,CAAAgB,IAAA,CAAAgB,QAAA,CAAA9D,QAAA;kBACT,IAAAgE,cAAA,OAAAC,OAAA,CAAAH,QAAA,EAAAhF,OAAA;kBACF,OAAAZ,kBAAA,CAAAW,QAAA,EAAAmF,cAAA,EAAAF,QAAA,EAAA/E,KAAA;gBACF;cAES;YAID;UAEF,SAAOyB,GAAA;YACT8C,iBAAsB,GAAK,IAAAC,cAAe,GAAM/C,GAAA;UAC9C,UAAM;YACN,IAAO;cACT,CAAA6C,yBAAA,IAAAG,SAAA,CAAAU,MAAA,YAAAV,SAAA,CAAAU,MAAA;YAEK;cACT,IAAAZ,iBAAA,EAGS,MAAAC,cAAiC;YAElC;UACD;UAEH,OAAO7C,OAAQ,CAAMC,GAAA,CAAAC,QAAW,KAAM,aAAU,IACtCC,OAAQ,CAAAC,KAAM,sCACvB;YAJiBqC,WAAA;YAMtBnD,QAAA","ignoreList":[]}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
var __defProp = Object.defineProperty;
|
|
2
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
3
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
4
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
5
|
+
var __export = (target, all) => {
|
|
6
|
+
for (var name in all) __defProp(target, name, {
|
|
7
|
+
get: all[name],
|
|
8
|
+
enumerable: !0
|
|
9
|
+
});
|
|
10
|
+
},
|
|
11
|
+
__copyProps = (to, from, except, desc) => {
|
|
12
|
+
if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
|
|
13
|
+
get: () => from[key],
|
|
14
|
+
enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
|
|
15
|
+
});
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
|
|
19
|
+
value: !0
|
|
20
|
+
}), mod);
|
|
21
|
+
var experimental_useLoaderState_exports = {};
|
|
22
|
+
__export(experimental_useLoaderState_exports, {
|
|
23
|
+
experimentalUseLoaderState: () => experimentalUseLoaderState
|
|
24
|
+
});
|
|
25
|
+
module.exports = __toCommonJS(experimental_useLoaderState_exports);
|
|
26
|
+
var import_react = require("react"),
|
|
27
|
+
import_hooks = require("./hooks.cjs"),
|
|
28
|
+
import_href = require("./link/href.cjs"),
|
|
29
|
+
import_cleanUrl = require("./utils/cleanUrl.cjs"),
|
|
30
|
+
import_dynamicImport = require("./utils/dynamicImport.cjs");
|
|
31
|
+
function experimentalUseLoaderState(loader) {
|
|
32
|
+
const params = (0, import_hooks.useParams)(),
|
|
33
|
+
pathname = (0, import_hooks.usePathname)(),
|
|
34
|
+
currentPath = (0, import_href.resolveHref)({
|
|
35
|
+
pathname,
|
|
36
|
+
params
|
|
37
|
+
}).replace(/index$/, ""),
|
|
38
|
+
[data, setData] = (0, import_react.useState)(null),
|
|
39
|
+
[state, setState] = (0, import_react.useState)("loading"),
|
|
40
|
+
[error, setError] = (0, import_react.useState)(null),
|
|
41
|
+
fetchLoader = (0, import_react.useCallback)(async (bustCache = !1) => {
|
|
42
|
+
setState("loading"), setError(null);
|
|
43
|
+
try {
|
|
44
|
+
let loaderJSUrl = (0, import_cleanUrl.getLoaderPath)(currentPath, !0);
|
|
45
|
+
bustCache && (loaderJSUrl += `${loaderJSUrl.includes("?") ? "&" : "?"}_t=${Date.now()}`);
|
|
46
|
+
const result = await (await (0, import_dynamicImport.dynamicImport)(loaderJSUrl)).loader();
|
|
47
|
+
setData(result), setState("idle");
|
|
48
|
+
} catch (err) {
|
|
49
|
+
console.error("Error loading:", err), setError(err), setState("idle");
|
|
50
|
+
}
|
|
51
|
+
}, [currentPath]);
|
|
52
|
+
(0, import_react.useEffect)(() => {
|
|
53
|
+
fetchLoader(!1);
|
|
54
|
+
}, [currentPath]);
|
|
55
|
+
const refetch = (0, import_react.useCallback)(() => {
|
|
56
|
+
fetchLoader(!0);
|
|
57
|
+
}, [fetchLoader]);
|
|
58
|
+
return {
|
|
59
|
+
data,
|
|
60
|
+
refetch,
|
|
61
|
+
state,
|
|
62
|
+
error
|
|
63
|
+
};
|
|
64
|
+
}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
var __defProp = Object.defineProperty;
|
|
2
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
3
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
4
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
5
|
+
var __export = (target, all) => {
|
|
6
|
+
for (var name in all)
|
|
7
|
+
__defProp(target, name, { get: all[name], enumerable: !0 });
|
|
8
|
+
}, __copyProps = (to, from, except, desc) => {
|
|
9
|
+
if (from && typeof from == "object" || typeof from == "function")
|
|
10
|
+
for (let key of __getOwnPropNames(from))
|
|
11
|
+
!__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
12
|
+
return to;
|
|
13
|
+
};
|
|
14
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
|
|
15
|
+
var experimental_useLoaderState_exports = {};
|
|
16
|
+
__export(experimental_useLoaderState_exports, {
|
|
17
|
+
experimentalUseLoaderState: () => experimentalUseLoaderState
|
|
18
|
+
});
|
|
19
|
+
module.exports = __toCommonJS(experimental_useLoaderState_exports);
|
|
20
|
+
var import_react = require("react"), import_hooks = require("./hooks"), import_href = require("./link/href"), import_cleanUrl = require("./utils/cleanUrl"), import_dynamicImport = require("./utils/dynamicImport");
|
|
21
|
+
function experimentalUseLoaderState(loader) {
|
|
22
|
+
const params = (0, import_hooks.useParams)(), pathname = (0, import_hooks.usePathname)(), currentPath = (0, import_href.resolveHref)({ pathname, params }).replace(/index$/, ""), [data, setData] = (0, import_react.useState)(null), [state, setState] = (0, import_react.useState)("loading"), [error, setError] = (0, import_react.useState)(null), fetchLoader = (0, import_react.useCallback)(
|
|
23
|
+
async (bustCache = !1) => {
|
|
24
|
+
setState("loading"), setError(null);
|
|
25
|
+
try {
|
|
26
|
+
let loaderJSUrl = (0, import_cleanUrl.getLoaderPath)(currentPath, !0);
|
|
27
|
+
bustCache && (loaderJSUrl += `${loaderJSUrl.includes("?") ? "&" : "?"}_t=${Date.now()}`);
|
|
28
|
+
const result = await (await (0, import_dynamicImport.dynamicImport)(loaderJSUrl)).loader();
|
|
29
|
+
setData(result), setState("idle");
|
|
30
|
+
} catch (err) {
|
|
31
|
+
console.error("Error loading:", err), setError(err), setState("idle");
|
|
32
|
+
}
|
|
33
|
+
},
|
|
34
|
+
[currentPath]
|
|
35
|
+
);
|
|
36
|
+
(0, import_react.useEffect)(() => {
|
|
37
|
+
fetchLoader(!1);
|
|
38
|
+
}, [currentPath]);
|
|
39
|
+
const refetch = (0, import_react.useCallback)(() => {
|
|
40
|
+
fetchLoader(!0);
|
|
41
|
+
}, [fetchLoader]);
|
|
42
|
+
return { data, refetch, state, error };
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=experimental-useLoaderState.js.map
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../src/experimental-useLoaderState.ts"],
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAiD,kBACjD,eAAuC,oBACvC,cAA4B,wBAC5B,kBAA8B,6BAC9B,uBAA8B;AAGvB,SAAS,2BAAoD,QAAgB;AAClF,QAAM,aAAS,wBAAU,GACnB,eAAW,0BAAY,GACvB,kBAAc,yBAAY,EAAE,UAAoB,OAAO,CAAC,EAAE,QAAQ,UAAU,EAAE,GAE9E,CAAC,MAAM,OAAO,QAAI,uBAAc,IAAI,GACpC,CAAC,OAAO,QAAQ,QAAI,uBAA6B,SAAS,GAC1D,CAAC,OAAO,QAAQ,QAAI,uBAAuB,IAAI,GAE/C,kBAAc;AAAA,IAClB,OAAO,YAAY,OAAU;AAC3B,eAAS,SAAS,GAClB,SAAS,IAAI;AAEb,UAAI;AACF,YAAI,kBAAc,+BAAc,aAAa,EAAI;AAGjD,QAAI,cACF,eAAe,GAAG,YAAY,SAAS,GAAG,IAAI,MAAM,GAAG,MAAM,KAAK,IAAI,CAAC;AAIzE,cAAM,SAAS,OADA,UAAM,oCAAc,WAAW,GAClB,OAAO;AAEnC,gBAAQ,MAAM,GACd,SAAS,MAAM;AAAA,MACjB,SAAS,KAAK;AACZ,gBAAQ,MAAM,kBAAkB,GAAG,GACnC,SAAS,GAAY,GACrB,SAAS,MAAM;AAAA,MACjB;AAAA,IACF;AAAA,IACA,CAAC,WAAW;AAAA,EACd;AAEA,8BAAU,MAAM;AACd,gBAAY,EAAK;AAAA,EACnB,GAAG,CAAC,WAAW,CAAC;AAEhB,QAAM,cAAU,0BAAY,MAAM;AAChC,gBAAY,EAAI;AAAA,EAClB,GAAG,CAAC,WAAW,CAAC;AAEhB,SAAO,EAAE,MAAM,SAAS,OAAO,MAAM;AACvC;",
|
|
5
|
+
"names": []
|
|
6
|
+
}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var __defProp = Object.defineProperty;
|
|
4
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
5
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
6
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
7
|
+
var __export = (target, all) => {
|
|
8
|
+
for (var name in all) __defProp(target, name, {
|
|
9
|
+
get: all[name],
|
|
10
|
+
enumerable: !0
|
|
11
|
+
});
|
|
12
|
+
},
|
|
13
|
+
__copyProps = (to, from, except, desc) => {
|
|
14
|
+
if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
|
|
15
|
+
get: () => from[key],
|
|
16
|
+
enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
|
|
17
|
+
});
|
|
18
|
+
return to;
|
|
19
|
+
};
|
|
20
|
+
var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
|
|
21
|
+
value: !0
|
|
22
|
+
}), mod);
|
|
23
|
+
var experimental_useLoaderState_exports = {};
|
|
24
|
+
__export(experimental_useLoaderState_exports, {
|
|
25
|
+
experimentalUseLoaderState: () => experimentalUseLoaderState
|
|
26
|
+
});
|
|
27
|
+
module.exports = __toCommonJS(experimental_useLoaderState_exports);
|
|
28
|
+
var import_react = require("react"),
|
|
29
|
+
import_hooks = require("./hooks.native.js"),
|
|
30
|
+
import_href = require("./link/href.native.js"),
|
|
31
|
+
import_cleanUrl = require("./utils/cleanUrl.native.js"),
|
|
32
|
+
import_dynamicImport = require("./utils/dynamicImport.native.js");
|
|
33
|
+
function experimentalUseLoaderState(loader) {
|
|
34
|
+
var params = (0, import_hooks.useParams)(),
|
|
35
|
+
pathname = (0, import_hooks.usePathname)(),
|
|
36
|
+
currentPath = (0, import_href.resolveHref)({
|
|
37
|
+
pathname,
|
|
38
|
+
params
|
|
39
|
+
}).replace(/index$/, ""),
|
|
40
|
+
[data, setData] = (0, import_react.useState)(null),
|
|
41
|
+
[state, setState] = (0, import_react.useState)("loading"),
|
|
42
|
+
[error, setError] = (0, import_react.useState)(null),
|
|
43
|
+
fetchLoader = (0, import_react.useCallback)(async function () {
|
|
44
|
+
var bustCache = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : !1;
|
|
45
|
+
setState("loading"), setError(null);
|
|
46
|
+
try {
|
|
47
|
+
var loaderJSUrl = (0, import_cleanUrl.getLoaderPath)(currentPath, !0);
|
|
48
|
+
bustCache && (loaderJSUrl += `${loaderJSUrl.includes("?") ? "&" : "?"}_t=${Date.now()}`);
|
|
49
|
+
var module2 = await (0, import_dynamicImport.dynamicImport)(loaderJSUrl),
|
|
50
|
+
result = await module2.loader();
|
|
51
|
+
setData(result), setState("idle");
|
|
52
|
+
} catch (err) {
|
|
53
|
+
console.error("Error loading:", err), setError(err), setState("idle");
|
|
54
|
+
}
|
|
55
|
+
}, [currentPath]);
|
|
56
|
+
(0, import_react.useEffect)(function () {
|
|
57
|
+
fetchLoader(!1);
|
|
58
|
+
}, [currentPath]);
|
|
59
|
+
var refetch = (0, import_react.useCallback)(function () {
|
|
60
|
+
fetchLoader(!0);
|
|
61
|
+
}, [fetchLoader]);
|
|
62
|
+
return {
|
|
63
|
+
data,
|
|
64
|
+
refetch,
|
|
65
|
+
state,
|
|
66
|
+
error
|
|
67
|
+
};
|
|
68
|
+
}
|
|
69
|
+
//# sourceMappingURL=experimental-useLoaderState.native.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","experimental_useLoaderState_exports","__export","experimentalUseLoaderState","module","exports","import_react","require","import_hooks","import_href","import_cleanUrl","import_dynamicImport","loader","params","useParams","pathname","usePathname","currentPath","resolveHref","replace","data","setData","useState","state","setState","error","setError","fetchLoader","useCallback","bustCache","arguments","length","loaderJSUrl","getLoaderPath","includes","Date","now","module2","dynamicImport","result","err","console","useEffect"],"sources":["../../src/experimental-useLoaderState.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,mCAAA;AAAAC,QAAA,CAAAD,mCAAA;EAAAE,0BAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAAiD,CAAAK,mCACV;AAMhC,IAAAK,YAAS,GAAAC,OAAA;EAAoDC,YAAgB,GAAAD,OAAA;EAAAE,WAAA,GAAAF,OAAA;EAAAG,eAAA,GAAAH,OAAA;EAAAI,oBAAA,GAAAJ,OAAA;AAClF,SAAMJ,0BAASA,CAAAS,MAAA;EAQK,IAClBC,MAAO,OAAAL,YAAsB,CAAAM,SAAA;IAAAC,QAAA,OAAAP,YAAA,CAAAQ,WAAA;IAAAC,WAAA,OAAAR,WAAA,CAAAS,WAAA;MAC3BH,QAAA;MAGAF;IACE,GAAAM,OAAI;IAAA,CAAAC,IAAc,EAAAC,OAAA,QAAAf,YAAc,CAAAgB,QAAA,MAAiB;IAAA,CAAAC,KAAA,EAAAC,QAAA,QAAAlB,YAAA,CAAAgB,QAAA;IAAA,CAAAG,KAAA,EAAAC,QAAA,QAAApB,YAAA,CAAAgB,QAAA;IAAAK,WAAA,OAAArB,YAAA,CAAAsB,WAAA;MAGjD,IAAIC,SAAA,GAAAC,SACF,CAAAC,MAAA,GAAe,CAAG,IAAAD,SAAY,QAAS,KAAG,IAAIA,SAAS,MAAM;MAI/DN,QAAA,UAAM,CAAS,EAAAE,QADA;MAGf;QAEF,IAAAM,WAAc,OAAAtB,eAAA,CAAAuB,aAAA,EAAAhB,WAAA;QACZY,SAAA,KAAQG,WAAM,OAAAA,WACd,CAAAE,QAAqB,IACrB,UAAS,SAAMC,IAAA,CAAAC,GAAA;QACjB,IAAAC,OAAA,aAAA1B,oBAAA,CAAA2B,aAAA,EAAAN,WAAA;UAAAO,MAAA,SAAAF,OAAA,CAAAzB,MAAA;QACFS,OAAA,CAAAkB,MAAA,GAAAf,QAAA;MACA,CAAC,QAAAgB,GAAW;QACdC,OAAA,CAAAhB,KAAA,mBAAAe,GAAA,GAAAd,QAAA,CAAAc,GAAA,GAAAhB,QAAA;MAEA;IACE,IACFP,WAAI,CAEJ;EACE,IAAAX,YAAgB,CAAAoC,SAAA;IAClBf,WAAI,EAAW,CAAC;EAEhB,IACFV,WAAA,C","ignoreList":[]}
|
package/dist/cjs/index.cjs
CHANGED
|
@@ -65,6 +65,7 @@ __export(index_exports, {
|
|
|
65
65
|
useIsFocused: () => import_core.useIsFocused,
|
|
66
66
|
useLinkTo: () => import_useLinkTo.useLinkTo,
|
|
67
67
|
useLoader: () => import_useLoader.useLoader,
|
|
68
|
+
useLoaderState: () => import_useLoader.useLoaderState,
|
|
68
69
|
useLocalSearchParams: () => import_hooks.useLocalSearchParams,
|
|
69
70
|
useNavigation: () => import_useNavigation.useNavigation,
|
|
70
71
|
useNavigationContainerRef: () => import_hooks.useNavigationContainerRef,
|
package/dist/cjs/index.js
CHANGED
|
@@ -54,6 +54,7 @@ __export(index_exports, {
|
|
|
54
54
|
useIsFocused: () => import_core.useIsFocused,
|
|
55
55
|
useLinkTo: () => import_useLinkTo.useLinkTo,
|
|
56
56
|
useLoader: () => import_useLoader.useLoader,
|
|
57
|
+
useLoaderState: () => import_useLoader.useLoaderState,
|
|
57
58
|
useLocalSearchParams: () => import_hooks.useLocalSearchParams,
|
|
58
59
|
useNavigation: () => import_useNavigation.useNavigation,
|
|
59
60
|
useNavigationContainerRef: () => import_hooks.useNavigationContainerRef,
|
package/dist/cjs/index.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/index.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA0B,wBAyB1B,cAA6B;AAE7B,0BAAc,yCA3Bd;AA+BA,4CAA6B,2CAC7B,8BAAsC,mCAGtC,0BAAkD,+BAClD,gBAAuB,qBACvB,cAAqB,mBAErB,eAWO,oBACP,cAAqB,mBAErB,eAAsB,4BACtB,cAAqB,2BAErB,2BAAkC,wCAClC,cAAqB,wBACrB,kBAAyB,4BACzB,mBAA0B,6BAC1B,cAAqB,mBAErB,gBAAuB,qBACvB,qBAAmC,iCAEnC,wBAAuB,oCACvB,cAA6B,wCAC7B,uBAA8B,mCAG9B,wBAA+B,6BAC/B,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA0B,wBAyB1B,cAA6B;AAE7B,0BAAc,yCA3Bd;AA+BA,4CAA6B,2CAC7B,8BAAsC,mCAGtC,0BAAkD,+BAClD,gBAAuB,qBACvB,cAAqB,mBAErB,eAWO,oBACP,cAAqB,mBAErB,eAAsB,4BACtB,cAAqB,2BAErB,2BAAkC,wCAClC,cAAqB,wBACrB,kBAAyB,4BACzB,mBAA0B,6BAC1B,cAAqB,mBAErB,gBAAuB,qBACvB,qBAAmC,iCAEnC,wBAAuB,oCACvB,cAA6B,wCAC7B,uBAA8B,mCAG9B,wBAA+B,6BAC/B,mBAA0C,wBAC1C,gCAAyE,qCACzE,oBAA2B,+BAC3B,kBAAyB,6BACzB,uBAA8B,kCAC9B,yBAAgC,oCAChC,mBAAgC,8BAChC,wBAA+B,mCAE/B,yBAAiE;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/cjs/index.native.js
CHANGED
|
@@ -67,6 +67,7 @@ __export(index_exports, {
|
|
|
67
67
|
useIsFocused: () => import_core.useIsFocused,
|
|
68
68
|
useLinkTo: () => import_useLinkTo.useLinkTo,
|
|
69
69
|
useLoader: () => import_useLoader.useLoader,
|
|
70
|
+
useLoaderState: () => import_useLoader.useLoaderState,
|
|
70
71
|
useLocalSearchParams: () => import_hooks.useLocalSearchParams,
|
|
71
72
|
useNavigation: () => import_useNavigation.useNavigation,
|
|
72
73
|
useNavigationContainerRef: () => import_hooks.useNavigationContainerRef,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","index_exports","__export","ErrorBoundary","import_ErrorBoundary","Head","import_head","Link","import_Link","LoadProgressBar","import_LoadProgressBar","Navigator","import_Navigator","Redirect","import_Redirect","Root","import_Root","SafeAreaView","import_react_native_safe_area_context","ScrollBehavior","import_ScrollBehavior","Slot","Stack","import_Stack","Tabs","import_Tabs","createApp","import_createApp","createMiddleware","import_createMiddleware","createRoute","import_createRoute","getServerData","import_one_server_only","getURL","import_getURL","href","import_href","isResponse","import_isResponse","onClientLoaderResolve","import_clientLoaderResolver","redirect","import_redirect","render","import_render","route","router","import_imperative_api","routerStore","_routerStore","setResponseHeaders","setServerData","useActiveParams","import_hooks","useFocusEffect","import_useFocusEffect","useGlobalSearchParams","useIsFocused","import_core","useLinkTo","import_useLinkTo","useLoader","import_useLoader","useLocalSearchParams","useNavigation","import_useNavigation","useNavigationContainerRef","useParams","usePathname","useRootNavigationState","useRouter","useSegments","useServerHeadInsertion","import_useServerHeadInsertion","useUnstableGlobalHref","withLayoutContext","import_withLayoutContext","module","exports","require","__reExport"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAAA;EAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;IAAAC,KAAA;EAAA,IAAAH,GAAA;AAAA,IAAAI,aAAA;AAAAC,QAAA,CAAAD,aAAA;EAAAE,aAAA,EAAAA,CAAA,KAAAC,oBAAA,CAAAD,aAAA;EAAAE,IAAA,EAAAA,CAAA,KAAAC,WAAA,CAAAD,IAAA;EAAAE,IAAA,EAAAA,CAAA,KAAAC,WAAA,CAAAD,IAAA;EAAAE,eAAA,EAAAA,CAAA,KAAAC,sBAAA,CAAAD,eAAA;EAAAE,SAAA,EAAAA,CAAA,KAAAC,gBAAA,CAAAD,SAAA;EAAAE,QAAA,EAAAA,CAAA,KAAAC,eAAA,CAAAD,QAAA;EAAAE,IAAA,EAAAA,CAAA,KAAAC,WAAA,CAAAD,IAAA;EAAAE,YAAA,EAAAA,CAAA,KAAAC,qCAAA,CAAAD,YAAA;EAAAE,cAAA,EAAAA,CAAA,KAAAC,qBAAA,CAAAD,cAAA;EAAAE,IAAA,EAAAA,CAAA,KAAAT,gBAAA,CAAAS,IAAA;EAAAC,KAAA,EAAAA,CAAA,KAAAC,YAAA,CAAAD,KAAA;EAAAE,IAAA,EAAAA,CAAA,KAAAC,WAAA,CAAAD,IAAA;EAAAE,SAAA,EAAAA,CAAA,KAAAC,gBAAA,CAAAD,SAAA;EAAAE,gBAAA,EAAAA,CAAA,KAAAC,uBAAA,CAAAD,gBAAA;EAAAE,WAAA,EAAAA,CAAA,KAAAC,kBAAA,CAAAD,WAAA;EAAAE,aAAA,EAAAA,CAAA,KAAAC,sBAAA,CAAAD,aAAA;EAAAE,MAAA,EAAAA,CAAA,KAAAC,aAAA,CAAAD,MAAA;EAAAE,IAAA,EAAAA,CAAA,KAAAC,WAAA,CAAAD,IAAA;EAAAE,UAAA,EAAAA,CAAA,KAAAC,iBAAA,CAAAD,UAAA;EAAAE,qBAAA,EAAAA,CAAA,KAAAC,2BAAA,CAAAD,qBAAA;EAAAE,QAAA,EAAAA,CAAA,KAAAC,eAAA,CAAAD,QAAA;EAAAE,MAAA,EAAAA,CAAA,KAAAC,aAAA,CAAAD,MAAA;EAAAE,KAAA,EAAAA,CAAA,KAAAf,kBAAA,CAAAe,KAAA;EAAAC,MAAA,EAAAA,CAAA,KAAAC,qBAAA,CAAAD,MAAA;EAAAE,WAAA,EAAAA,CAAA,KAAAC,YAAA;EAAAC,kBAAA,EAAAA,CAAA,KAAAlB,sBAAA,CAAAkB,kBAAA;EAAAC,aAAA,EAAAA,CAAA,KAAAnB,sBAAA,CAAAmB,aAAA;EAAAC,eAAA,EAAAA,CAAA,KAAAC,YAAA,CAAAD,eAAA;EAAAE,cAAA,EAAAA,CAAA,KAAAC,qBAAA,CAAAD,cAAA;EAAAE,qBAAA,EAAAA,CAAA,KAAAH,YAAA,CAAAG,qBAAA;EAAAC,YAAA,EAAAA,CAAA,KAAAC,WAAA,CAAAD,YAAA;EAAAE,SAAA,EAAAA,CAAA,KAAAC,gBAAA,CAAAD,SAAA;EAAAE,SAAA,EAAAA,CAAA,KAAAC,gBAAA,CAAAD,SAAA;EAAAE,oBAAA,EAAAA,CAAA,
|
|
1
|
+
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","index_exports","__export","ErrorBoundary","import_ErrorBoundary","Head","import_head","Link","import_Link","LoadProgressBar","import_LoadProgressBar","Navigator","import_Navigator","Redirect","import_Redirect","Root","import_Root","SafeAreaView","import_react_native_safe_area_context","ScrollBehavior","import_ScrollBehavior","Slot","Stack","import_Stack","Tabs","import_Tabs","createApp","import_createApp","createMiddleware","import_createMiddleware","createRoute","import_createRoute","getServerData","import_one_server_only","getURL","import_getURL","href","import_href","isResponse","import_isResponse","onClientLoaderResolve","import_clientLoaderResolver","redirect","import_redirect","render","import_render","route","router","import_imperative_api","routerStore","_routerStore","setResponseHeaders","setServerData","useActiveParams","import_hooks","useFocusEffect","import_useFocusEffect","useGlobalSearchParams","useIsFocused","import_core","useLinkTo","import_useLinkTo","useLoader","import_useLoader","useLoaderState","useLocalSearchParams","useNavigation","import_useNavigation","useNavigationContainerRef","useParams","usePathname","useRootNavigationState","useRouter","useSegments","useServerHeadInsertion","import_useServerHeadInsertion","useUnstableGlobalHref","withLayoutContext","import_withLayoutContext","module","exports","require","__reExport"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -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": "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",
|
|
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();
|