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
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { useCallback, useEffect, useState } from "react";
|
|
2
|
+
import { useParams, usePathname } from "./hooks.mjs";
|
|
3
|
+
import { resolveHref } from "./link/href.mjs";
|
|
4
|
+
import { getLoaderPath } from "./utils/cleanUrl.mjs";
|
|
5
|
+
import { dynamicImport } from "./utils/dynamicImport.mjs";
|
|
6
|
+
function experimentalUseLoaderState(loader) {
|
|
7
|
+
const params = useParams(),
|
|
8
|
+
pathname = usePathname(),
|
|
9
|
+
currentPath = resolveHref({
|
|
10
|
+
pathname,
|
|
11
|
+
params
|
|
12
|
+
}).replace(/index$/, ""),
|
|
13
|
+
[data, setData] = useState(null),
|
|
14
|
+
[state, setState] = useState("loading"),
|
|
15
|
+
[error, setError] = useState(null),
|
|
16
|
+
fetchLoader = useCallback(async (bustCache = !1) => {
|
|
17
|
+
setState("loading"), setError(null);
|
|
18
|
+
try {
|
|
19
|
+
let loaderJSUrl = getLoaderPath(currentPath, !0);
|
|
20
|
+
bustCache && (loaderJSUrl += `${loaderJSUrl.includes("?") ? "&" : "?"}_t=${Date.now()}`);
|
|
21
|
+
const result = await (await dynamicImport(loaderJSUrl)).loader();
|
|
22
|
+
setData(result), setState("idle");
|
|
23
|
+
} catch (err) {
|
|
24
|
+
console.error("Error loading:", err), setError(err), setState("idle");
|
|
25
|
+
}
|
|
26
|
+
}, [currentPath]);
|
|
27
|
+
useEffect(() => {
|
|
28
|
+
fetchLoader(!1);
|
|
29
|
+
}, [currentPath]);
|
|
30
|
+
const refetch = useCallback(() => {
|
|
31
|
+
fetchLoader(!0);
|
|
32
|
+
}, [fetchLoader]);
|
|
33
|
+
return {
|
|
34
|
+
data,
|
|
35
|
+
refetch,
|
|
36
|
+
state,
|
|
37
|
+
error
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
export { experimentalUseLoaderState };
|
|
41
|
+
//# sourceMappingURL=experimental-useLoaderState.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["useCallback","useEffect","useState","useParams","usePathname","resolveHref","getLoaderPath","dynamicImport","experimentalUseLoaderState","loader","params","pathname","currentPath","replace","data","setData","state","setState","error","setError","fetchLoader","bustCache","loaderJSUrl","includes","Date","now","result","err","console","refetch"],"sources":["../../src/experimental-useLoaderState.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,EAAaC,SAAA,EAAWC,QAAA,QAAgB;AACjD,SAASC,SAAA,EAAWC,WAAA,QAAmB;AACvC,SAASC,WAAA,QAAmB;AAC5B,SAASC,aAAA,QAAqB;AAC9B,SAASC,aAAA,QAAqB;AAGvB,SAASC,2BAAoDC,MAAA,EAAgB;EAClF,MAAMC,MAAA,GAASP,SAAA,CAAU;IACnBQ,QAAA,GAAWP,WAAA,CAAY;IACvBQ,WAAA,GAAcP,WAAA,CAAY;MAAEM,QAAA;MAAoBD;IAAO,CAAC,EAAEG,OAAA,CAAQ,UAAU,EAAE;IAE9E,CAACC,IAAA,EAAMC,OAAO,IAAIb,QAAA,CAAc,IAAI;IACpC,CAACc,KAAA,EAAOC,QAAQ,IAAIf,QAAA,CAA6B,SAAS;IAC1D,CAACgB,KAAA,EAAOC,QAAQ,IAAIjB,QAAA,CAAuB,IAAI;IAE/CkB,WAAA,GAAcpB,WAAA,CAClB,OAAOqB,SAAA,GAAY,OAAU;MAC3BJ,QAAA,CAAS,SAAS,GAClBE,QAAA,CAAS,IAAI;MAEb,IAAI;QACF,IAAIG,WAAA,GAAchB,aAAA,CAAcM,WAAA,EAAa,EAAI;QAG7CS,SAAA,KACFC,WAAA,IAAe,GAAGA,WAAA,CAAYC,QAAA,CAAS,GAAG,IAAI,MAAM,GAAG,MAAMC,IAAA,CAAKC,GAAA,CAAI,CAAC;QAIzE,MAAMC,MAAA,GAAS,OADA,MAAMnB,aAAA,CAAce,WAAW,GAClBb,MAAA,CAAO;QAEnCM,OAAA,CAAQW,MAAM,GACdT,QAAA,CAAS,MAAM;MACjB,SAASU,GAAA,EAAK;QACZC,OAAA,CAAQV,KAAA,CAAM,kBAAkBS,GAAG,GACnCR,QAAA,CAASQ,GAAY,GACrBV,QAAA,CAAS,MAAM;MACjB;IACF,GACA,CAACL,WAAW,CACd;EAEAX,SAAA,CAAU,MAAM;IACdmB,WAAA,CAAY,EAAK;EACnB,GAAG,CAACR,WAAW,CAAC;EAEhB,MAAMiB,OAAA,GAAU7B,WAAA,CAAY,MAAM;IAChCoB,WAAA,CAAY,EAAI;EAClB,GAAG,CAACA,WAAW,CAAC;EAEhB,OAAO;IAAEN,IAAA;IAAMe,OAAA;IAASb,KAAA;IAAOE;EAAM;AACvC","ignoreList":[]}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import { useCallback, useEffect, useState } from "react";
|
|
2
|
+
import { useParams, usePathname } from "./hooks.native.js";
|
|
3
|
+
import { resolveHref } from "./link/href.native.js";
|
|
4
|
+
import { getLoaderPath } from "./utils/cleanUrl.native.js";
|
|
5
|
+
import { dynamicImport } from "./utils/dynamicImport.native.js";
|
|
6
|
+
function experimentalUseLoaderState(loader) {
|
|
7
|
+
var params = useParams(),
|
|
8
|
+
pathname = usePathname(),
|
|
9
|
+
currentPath = resolveHref({
|
|
10
|
+
pathname,
|
|
11
|
+
params
|
|
12
|
+
}).replace(/index$/, ""),
|
|
13
|
+
[data, setData] = useState(null),
|
|
14
|
+
[state, setState] = useState("loading"),
|
|
15
|
+
[error, setError] = useState(null),
|
|
16
|
+
fetchLoader = useCallback(async function () {
|
|
17
|
+
var bustCache = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : !1;
|
|
18
|
+
setState("loading"), setError(null);
|
|
19
|
+
try {
|
|
20
|
+
var loaderJSUrl = getLoaderPath(currentPath, !0);
|
|
21
|
+
bustCache && (loaderJSUrl += `${loaderJSUrl.includes("?") ? "&" : "?"}_t=${Date.now()}`);
|
|
22
|
+
var module = await dynamicImport(loaderJSUrl),
|
|
23
|
+
result = await module.loader();
|
|
24
|
+
setData(result), setState("idle");
|
|
25
|
+
} catch (err) {
|
|
26
|
+
console.error("Error loading:", err), setError(err), setState("idle");
|
|
27
|
+
}
|
|
28
|
+
}, [currentPath]);
|
|
29
|
+
useEffect(function () {
|
|
30
|
+
fetchLoader(!1);
|
|
31
|
+
}, [currentPath]);
|
|
32
|
+
var refetch = useCallback(function () {
|
|
33
|
+
fetchLoader(!0);
|
|
34
|
+
}, [fetchLoader]);
|
|
35
|
+
return {
|
|
36
|
+
data,
|
|
37
|
+
refetch,
|
|
38
|
+
state,
|
|
39
|
+
error
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
export { experimentalUseLoaderState };
|
|
43
|
+
//# sourceMappingURL=experimental-useLoaderState.native.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["useCallback","useEffect","useState","useParams","usePathname","resolveHref","getLoaderPath","dynamicImport","experimentalUseLoaderState","loader","params","pathname","currentPath","replace","data","setData","state","setState","error","setError","fetchLoader","bustCache","arguments","length","loaderJSUrl","includes","Date","now","module","result","err","console"],"sources":["../../src/experimental-useLoaderState.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,EAAaC,SAAA,EAAWC,QAAA,QAAgB;AACjD,SAASC,SAAA,EAAWC,WAAA,QAAmB;AACvC,SAASC,WAAA,QAAmB;AAC5B,SAASC,aAAA,QAAqB;AAC9B,SAASC,aAAA,QAAqB;AAGvB,SAASC,2BAAoDC,MAAA,EAAgB;EAClF,IAAAC,MAAM,GAAAP,SAAS;IAAUQ,QACnB,GAAAP,WAAW;IAAYQ,WACvB,GAAAP,WAAc;MAOlBM,QAAO;MACLD;IAGA,GAAAG,OAAI;IAAA,CAAAC,IAAA,EAAAC,OAAA,IAAAb,QAAA;IAAA,CAAAc,KAAA,EAAAC,QAAA,IAAAf,QAAA;IAAA,CAAAgB,KAAA,EAAAC,QAAA,IAAAjB,QAAA;IAAAkB,WAAA,GAAApB,WAAA;MACF,IAAAqB,SAAI,GAAAC,SAAc,CAAAC,MAAA,IAAc,IAAAD,SAAa,EAAI,eAAAA,SAAA;MAGjDL,QAAI,UACF,GAAAE,QAAA,KAAe;MAIjB;QAEA,IAAAK,WAAQ,GAAMlB,aACL,CAAAM,WAAM;QACjBS,SAAS,KAAKG,WAAA,OAAAA,WAAA,CAAAC,QAAA,uBAAAC,IAAA,CAAAC,GAAA;QACZ,IAAAC,MAAQ,SAAMrB,aAAA,CAAAiB,WACd;UAAAK,MAAqB,GACrB,MAAAD,MAAS,CAAAnB,MAAM;QACjBM,OAAA,CAAAc,MAAA,GAAAZ,QAAA;MACF,SAAAa,GAAA;QACCC,OAAA,CAAAb,KAAW,mBAAAY,GAAA,GAAAX,QAAA,CAAAW,GAAA,GAAAb,QAAA;MACd;IAEA,IACEL,WAAA,CACF;EAEAX,SAAM,aAAU;IACdmB,WAAA,CAAY,EAAI;EAClB,GAAG,CAEHR,WAAS,CACX","ignoreList":[]}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["getDevServer","url","bundleLoadedFromServer"],"sources":["../../src/getDevServer.ts"],"sourcesContent":[null],"mappings":"AACO,MAAMA,YAAA,GAAeA,CAAA,MAAO;EACjCC,GAAA,EAAK;EACLC,sBAAA,EAAwB;AAC1B","ignoreList":[]}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["default","default2"],"sources":["../../src/getDevServer.native.ts"],"sourcesContent":[null],"mappings":"AAIA,SAAoBA,OAAA,IAAXC,QAAA,QAA+B","ignoreList":[]}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import getDevServer from "
|
|
1
|
+
import { getDevServer } from "./getDevServer.native.js";
|
|
2
|
+
var hasWarnedOnce = !1;
|
|
2
3
|
function getURL() {
|
|
3
4
|
var url = process.env.ONE_SERVER_URL;
|
|
4
5
|
if (__DEV__) {
|
|
5
|
-
url || console.warn("The ONE_SERVER_URL environment variable is not set. While things will work in development mode as we'll be using your development server, you should still set ONE_SERVER_URL in your .env file for your production builds to work.");
|
|
6
|
+
url || hasWarnedOnce && (hasWarnedOnce = !0, console.warn("The ONE_SERVER_URL environment variable is not set. While things will work in development mode as we'll be using your development server, you should still set ONE_SERVER_URL in your .env file for your production builds to work."));
|
|
6
7
|
var {
|
|
7
8
|
url: devServerUrl
|
|
8
9
|
} = getDevServer();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["getDevServer","getURL","url","process","env","ONE_SERVER_URL","__DEV__","console","warn","devServerUrl","replace"],"sources":["../../src/getURL.native.ts"],"sourcesContent":[null],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"names":["getDevServer","hasWarnedOnce","getURL","url","process","env","ONE_SERVER_URL","__DEV__","console","warn","devServerUrl","replace"],"sources":["../../src/getURL.native.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,YAAA,QAAoB;AAC7B,IAAIC,aAAA,GAAgB;AACb,SAASC,OAAA,EAAS;EACrB,IAAIC,GAAA,GAAMC,OAAA,CAAQC,GAAA,CAAIC,cAAA;EACtB,IAAIC,OAAA,EAAS;IAEJJ,GAAA,IACGF,aAAA,KACAA,aAAA,GAAgB,IAChBO,OAAA,CAAQC,IAAA,CAAK,qOAAqO;IAG1P,IAAI;MAAEN,GAAA,EAAKO;IAAa,IAAIV,YAAA,CAAa;IACzCG,GAAA,GAAMO,YAAA;EACV;EACA,OAAKP,GAAA,KAEDA,GAAA,GAAM,kCAEHA,GAAA,CAAIQ,OAAA,CAAQ,QAAQ,EAAE;AACjC","ignoreList":[]}
|
package/dist/esm/index.js
CHANGED
|
@@ -32,7 +32,7 @@ import { router } from "./router/imperative-api";
|
|
|
32
32
|
import * as routerStore from "./router/router";
|
|
33
33
|
import { useNavigation } from "./router/useNavigation";
|
|
34
34
|
import { useFocusEffect } from "./useFocusEffect";
|
|
35
|
-
import { useLoader } from "./useLoader";
|
|
35
|
+
import { useLoader, useLoaderState } from "./useLoader";
|
|
36
36
|
import { useServerHeadInsertion } from "./useServerHeadInsertion";
|
|
37
37
|
import { isResponse } from "./utils/isResponse";
|
|
38
38
|
import { redirect } from "./utils/redirect";
|
|
@@ -75,6 +75,7 @@ export {
|
|
|
75
75
|
useIsFocused,
|
|
76
76
|
useLinkTo,
|
|
77
77
|
useLoader,
|
|
78
|
+
useLoaderState,
|
|
78
79
|
useLocalSearchParams,
|
|
79
80
|
useNavigation,
|
|
80
81
|
useNavigationContainerRef,
|
package/dist/esm/index.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/index.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,iBAAiB;AAyB1B,SAAS,oBAAoB;AAE7B,cAAc;AAId,SAAS,oBAAoB;AAC7B,SAAS,6BAA6B;AAGtC,SAAS,wBAAyC;AAClD,SAAS,cAAc;AACvB,SAAS,YAAY;AAErB;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,YAAY;AAErB,SAAS,aAAa;AACtB,SAAS,YAAY;AAErB,SAAS,yBAAyB;AAClC,SAAS,YAAY;AACrB,SAAS,gBAAgB;AACzB,SAAS,iBAAiB;AAC1B,SAAS,YAAY;AAErB,SAAS,cAAc;AACvB,SAAS,aAAa,aAAa;AAEnC,SAAS,cAAc;AACvB,YAAY,iBAAiB;AAC7B,SAAS,qBAAqB;AAG9B,SAAS,sBAAsB;AAC/B,SAAS,
|
|
4
|
+
"mappings": "AAAA,SAAS,iBAAiB;AAyB1B,SAAS,oBAAoB;AAE7B,cAAc;AAId,SAAS,oBAAoB;AAC7B,SAAS,6BAA6B;AAGtC,SAAS,wBAAyC;AAClD,SAAS,cAAc;AACvB,SAAS,YAAY;AAErB;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,YAAY;AAErB,SAAS,aAAa;AACtB,SAAS,YAAY;AAErB,SAAS,yBAAyB;AAClC,SAAS,YAAY;AACrB,SAAS,gBAAgB;AACzB,SAAS,iBAAiB;AAC1B,SAAS,YAAY;AAErB,SAAS,cAAc;AACvB,SAAS,aAAa,aAAa;AAEnC,SAAS,cAAc;AACvB,YAAY,iBAAiB;AAC7B,SAAS,qBAAqB;AAG9B,SAAS,sBAAsB;AAC/B,SAAS,WAAW,sBAAsB;AAC1C,SAA2C,8BAA8B;AACzE,SAAS,kBAAkB;AAC3B,SAAS,gBAAgB;AACzB,SAAS,qBAAqB;AAC9B,SAAS,uBAAuB;AAChC,SAAS,WAAW,YAAY;AAChC,SAAS,sBAAsB;AAE/B,SAAS,eAAe,oBAAoB,qBAAqB;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/dist/esm/index.mjs
CHANGED
|
@@ -21,7 +21,7 @@ import { router } from "./router/imperative-api.mjs";
|
|
|
21
21
|
import * as routerStore from "./router/router.mjs";
|
|
22
22
|
import { useNavigation } from "./router/useNavigation.mjs";
|
|
23
23
|
import { useFocusEffect } from "./useFocusEffect.mjs";
|
|
24
|
-
import { useLoader } from "./useLoader.mjs";
|
|
24
|
+
import { useLoader, useLoaderState } from "./useLoader.mjs";
|
|
25
25
|
import { useServerHeadInsertion } from "./useServerHeadInsertion.mjs";
|
|
26
26
|
import { isResponse } from "./utils/isResponse.mjs";
|
|
27
27
|
import { redirect } from "./utils/redirect.mjs";
|
|
@@ -30,5 +30,5 @@ import { LoadProgressBar } from "./views/LoadProgressBar.mjs";
|
|
|
30
30
|
import { Navigator, Slot } from "./views/Navigator.mjs";
|
|
31
31
|
import { ScrollBehavior } from "./views/ScrollBehavior.mjs";
|
|
32
32
|
import { getServerData, setResponseHeaders, setServerData } from "./vite/one-server-only.mjs";
|
|
33
|
-
export { ErrorBoundary, Head, Link, LoadProgressBar, Navigator, Redirect, Root, SafeAreaView, ScrollBehavior, Slot, Stack, Tabs, createApp, createMiddleware, createRoute, getServerData, getURL, href, isResponse, onClientLoaderResolve, redirect, render, route, router, routerStore, setResponseHeaders, setServerData, useActiveParams, useFocusEffect, useGlobalSearchParams, useIsFocused, useLinkTo, useLoader, useLocalSearchParams, useNavigation, useNavigationContainerRef, useParams, usePathname, useRootNavigationState, useRouter, useSegments, useServerHeadInsertion, useUnstableGlobalHref, withLayoutContext };
|
|
33
|
+
export { ErrorBoundary, Head, Link, LoadProgressBar, Navigator, Redirect, Root, SafeAreaView, ScrollBehavior, Slot, Stack, Tabs, createApp, createMiddleware, createRoute, getServerData, getURL, href, isResponse, onClientLoaderResolve, redirect, render, route, router, routerStore, setResponseHeaders, setServerData, useActiveParams, useFocusEffect, useGlobalSearchParams, useIsFocused, useLinkTo, useLoader, useLoaderState, useLocalSearchParams, useNavigation, useNavigationContainerRef, useParams, usePathname, useRootNavigationState, useRouter, useSegments, useServerHeadInsertion, useUnstableGlobalHref, withLayoutContext };
|
|
34
34
|
//# sourceMappingURL=index.mjs.map
|
package/dist/esm/index.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["createApp","useIsFocused","SafeAreaView","onClientLoaderResolve","createMiddleware","getURL","Head","useActiveParams","useGlobalSearchParams","useLocalSearchParams","useNavigationContainerRef","useParams","usePathname","useRootNavigationState","useRouter","useSegments","useUnstableGlobalHref","href","Stack","Tabs","withLayoutContext","Link","Redirect","useLinkTo","Root","render","createRoute","route","router","routerStore","useNavigation","useFocusEffect","useLoader","useServerHeadInsertion","isResponse","redirect","ErrorBoundary","LoadProgressBar","Navigator","Slot","ScrollBehavior","getServerData","setResponseHeaders","setServerData"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,SAAA,QAAiB;AAyB1B,SAASC,YAAA,QAAoB;AAE7B,cAAc;AAId,SAASC,YAAA,QAAoB;AAC7B,SAASC,qBAAA,QAA6B;AAGtC,SAASC,gBAAA,QAAyC;AAClD,SAASC,MAAA,QAAc;AACvB,SAASC,IAAA,QAAY;AAErB,SACEC,eAAA,EACAC,qBAAA,EACAC,oBAAA,EACAC,yBAAA,EACAC,SAAA,EACAC,WAAA,EACAC,sBAAA,EACAC,SAAA,EACAC,WAAA,EACAC,qBAAA,QACK;AACP,SAASC,IAAA,QAAY;AAErB,SAASC,KAAA,QAAa;AACtB,SAASC,IAAA,QAAY;AAErB,SAASC,iBAAA,QAAyB;AAClC,SAASC,IAAA,QAAY;AACrB,SAASC,QAAA,QAAgB;AACzB,SAASC,SAAA,QAAiB;AAC1B,SAASC,IAAA,QAAY;AAErB,SAASC,MAAA,QAAc;AACvB,SAASC,WAAA,EAAaC,KAAA,QAAa;AAEnC,SAASC,MAAA,QAAc;AACvB,YAAYC,WAAA,MAAiB;AAC7B,SAASC,aAAA,QAAqB;AAG9B,SAASC,cAAA,QAAsB;AAC/B,SAASC,SAAA,
|
|
1
|
+
{"version":3,"names":["createApp","useIsFocused","SafeAreaView","onClientLoaderResolve","createMiddleware","getURL","Head","useActiveParams","useGlobalSearchParams","useLocalSearchParams","useNavigationContainerRef","useParams","usePathname","useRootNavigationState","useRouter","useSegments","useUnstableGlobalHref","href","Stack","Tabs","withLayoutContext","Link","Redirect","useLinkTo","Root","render","createRoute","route","router","routerStore","useNavigation","useFocusEffect","useLoader","useLoaderState","useServerHeadInsertion","isResponse","redirect","ErrorBoundary","LoadProgressBar","Navigator","Slot","ScrollBehavior","getServerData","setResponseHeaders","setServerData"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,SAAA,QAAiB;AAyB1B,SAASC,YAAA,QAAoB;AAE7B,cAAc;AAId,SAASC,YAAA,QAAoB;AAC7B,SAASC,qBAAA,QAA6B;AAGtC,SAASC,gBAAA,QAAyC;AAClD,SAASC,MAAA,QAAc;AACvB,SAASC,IAAA,QAAY;AAErB,SACEC,eAAA,EACAC,qBAAA,EACAC,oBAAA,EACAC,yBAAA,EACAC,SAAA,EACAC,WAAA,EACAC,sBAAA,EACAC,SAAA,EACAC,WAAA,EACAC,qBAAA,QACK;AACP,SAASC,IAAA,QAAY;AAErB,SAASC,KAAA,QAAa;AACtB,SAASC,IAAA,QAAY;AAErB,SAASC,iBAAA,QAAyB;AAClC,SAASC,IAAA,QAAY;AACrB,SAASC,QAAA,QAAgB;AACzB,SAASC,SAAA,QAAiB;AAC1B,SAASC,IAAA,QAAY;AAErB,SAASC,MAAA,QAAc;AACvB,SAASC,WAAA,EAAaC,KAAA,QAAa;AAEnC,SAASC,MAAA,QAAc;AACvB,YAAYC,WAAA,MAAiB;AAC7B,SAASC,aAAA,QAAqB;AAG9B,SAASC,cAAA,QAAsB;AAC/B,SAASC,SAAA,EAAWC,cAAA,QAAsB;AAC1C,SAA2CC,sBAAA,QAA8B;AACzE,SAASC,UAAA,QAAkB;AAC3B,SAASC,QAAA,QAAgB;AACzB,SAASC,aAAA,QAAqB;AAC9B,SAASC,eAAA,QAAuB;AAChC,SAASC,SAAA,EAAWC,IAAA,QAAY;AAChC,SAASC,cAAA,QAAsB;AAE/B,SAASC,aAAA,EAAeC,kBAAA,EAAoBC,aAAA,QAAqB","ignoreList":[]}
|
package/dist/esm/index.native.js
CHANGED
|
@@ -21,7 +21,7 @@ import { router } from "./router/imperative-api.native.js";
|
|
|
21
21
|
import * as _routerStore from "./router/router.native.js";
|
|
22
22
|
import { useNavigation } from "./router/useNavigation.native.js";
|
|
23
23
|
import { useFocusEffect } from "./useFocusEffect.native.js";
|
|
24
|
-
import { useLoader } from "./useLoader.native.js";
|
|
24
|
+
import { useLoader, useLoaderState } from "./useLoader.native.js";
|
|
25
25
|
import { useServerHeadInsertion } from "./useServerHeadInsertion.native.js";
|
|
26
26
|
import { isResponse } from "./utils/isResponse.native.js";
|
|
27
27
|
import { redirect } from "./utils/redirect.native.js";
|
|
@@ -30,5 +30,5 @@ import { LoadProgressBar } from "./views/LoadProgressBar.native.js";
|
|
|
30
30
|
import { Navigator, Slot } from "./views/Navigator.native.js";
|
|
31
31
|
import { ScrollBehavior } from "./views/ScrollBehavior.native.js";
|
|
32
32
|
import { getServerData, setResponseHeaders, setServerData } from "./vite/one-server-only.native.js";
|
|
33
|
-
export { ErrorBoundary, Head, Link, LoadProgressBar, Navigator, Redirect, Root, SafeAreaView, ScrollBehavior, Slot, Stack, Tabs, createApp, createMiddleware, createRoute, getServerData, getURL, href, isResponse, onClientLoaderResolve, redirect, render, route, router, _routerStore as routerStore, setResponseHeaders, setServerData, useActiveParams, useFocusEffect, useGlobalSearchParams, useIsFocused, useLinkTo, useLoader, useLocalSearchParams, useNavigation, useNavigationContainerRef, useParams, usePathname, useRootNavigationState, useRouter, useSegments, useServerHeadInsertion, useUnstableGlobalHref, withLayoutContext };
|
|
33
|
+
export { ErrorBoundary, Head, Link, LoadProgressBar, Navigator, Redirect, Root, SafeAreaView, ScrollBehavior, Slot, Stack, Tabs, createApp, createMiddleware, createRoute, getServerData, getURL, href, isResponse, onClientLoaderResolve, redirect, render, route, router, _routerStore as routerStore, setResponseHeaders, setServerData, useActiveParams, useFocusEffect, useGlobalSearchParams, useIsFocused, useLinkTo, useLoader, useLoaderState, useLocalSearchParams, useNavigation, useNavigationContainerRef, useParams, usePathname, useRootNavigationState, useRouter, useSegments, useServerHeadInsertion, useUnstableGlobalHref, withLayoutContext };
|
|
34
34
|
//# sourceMappingURL=index.native.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["createApp","useIsFocused","SafeAreaView","onClientLoaderResolve","createMiddleware","getURL","Head","useActiveParams","useGlobalSearchParams","useLocalSearchParams","useNavigationContainerRef","useParams","usePathname","useRootNavigationState","useRouter","useSegments","useUnstableGlobalHref","href","Stack","Tabs","withLayoutContext","Link","Redirect","useLinkTo","Root","render","createRoute","route","router","_routerStore","useNavigation","useFocusEffect","useLoader","useServerHeadInsertion","isResponse","redirect","ErrorBoundary","LoadProgressBar","Navigator","Slot","ScrollBehavior","getServerData","setResponseHeaders","setServerData"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,SAAA,QAAiB;AAyB1B,SAASC,YAAA,QAAoB;AAE7B,cAAc;AAId,SAASC,YAAA,QAAoB;AAC7B,SAASC,qBAAA,QAA6B;AAGtC,SAASC,gBAAA,QAAyC;AAClD,SAASC,MAAA,QAAc;AACvB,SAASC,IAAA,QAAY;AAErB,SAAAC,eAAA,EAAAC,qBAAA,EAAAC,oBAAA,EAAAC,yBAAA,EAAAC,SAAA,EAAAC,WAAA,EAAAC,sBAAA,EAAAC,SAAA,EAAAC,WAAA,EAAAC,qBAAA;AAAA,SACEC,IAAA;AAAA,SACAC,KAAA;AAAA,SACAC,IAAA;AAAA,SACAC,iBAAA;AAAA,SACAC,IAAA;AAAA,SACAC,QAAA;AAAA,SACAC,SAAA;AAAA,SACAC,IAAA;AAAA,SACAC,MAAA;AAAA,SACAC,WAAA,EAAAC,KAAA;AAAA,SACKC,MAAA;AACP,YAASC,YAAY;AAErB,SAASC,aAAa;AACtB,SAASC,cAAY;AAErB,SAASC,SAAA
|
|
1
|
+
{"version":3,"names":["createApp","useIsFocused","SafeAreaView","onClientLoaderResolve","createMiddleware","getURL","Head","useActiveParams","useGlobalSearchParams","useLocalSearchParams","useNavigationContainerRef","useParams","usePathname","useRootNavigationState","useRouter","useSegments","useUnstableGlobalHref","href","Stack","Tabs","withLayoutContext","Link","Redirect","useLinkTo","Root","render","createRoute","route","router","_routerStore","useNavigation","useFocusEffect","useLoader","useLoaderState","useServerHeadInsertion","isResponse","redirect","ErrorBoundary","LoadProgressBar","Navigator","Slot","ScrollBehavior","getServerData","setResponseHeaders","setServerData"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,SAAA,QAAiB;AAyB1B,SAASC,YAAA,QAAoB;AAE7B,cAAc;AAId,SAASC,YAAA,QAAoB;AAC7B,SAASC,qBAAA,QAA6B;AAGtC,SAASC,gBAAA,QAAyC;AAClD,SAASC,MAAA,QAAc;AACvB,SAASC,IAAA,QAAY;AAErB,SAAAC,eAAA,EAAAC,qBAAA,EAAAC,oBAAA,EAAAC,yBAAA,EAAAC,SAAA,EAAAC,WAAA,EAAAC,sBAAA,EAAAC,SAAA,EAAAC,WAAA,EAAAC,qBAAA;AAAA,SACEC,IAAA;AAAA,SACAC,KAAA;AAAA,SACAC,IAAA;AAAA,SACAC,iBAAA;AAAA,SACAC,IAAA;AAAA,SACAC,QAAA;AAAA,SACAC,SAAA;AAAA,SACAC,IAAA;AAAA,SACAC,MAAA;AAAA,SACAC,WAAA,EAAAC,KAAA;AAAA,SACKC,MAAA;AACP,YAASC,YAAY;AAErB,SAASC,aAAa;AACtB,SAASC,cAAY;AAErB,SAASC,SAAA,EAAAC,cAAyB;AAClC,SAASC,sBAAY;AACrB,SAASC,UAAA,QAAgB;AACzB,SAASC,QAAA,oCAAiB;AAC1B,SAASC,aAAY;AAErB,SAASC,eAAc;AACvB,SAASC,SAAA,EAAAC,IAAa,qCAAa;AAEnC,SAASC,cAAc;AACvB,SAAAC,aAAY,EAAAC,kBAAiB,EAAAC,aAAA;AAC7B,SAGAP,aAAS,EACT/B,IAAA,EACAe,IAAA,EACAiB,eAAS,EACTC,SAAS,EACTjB,QAAS,EACTE,IAAA,EACAtB,YAAS,EACTuC,cAAS,EAETD,IAAA,E","ignoreList":[]}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { extname, join } from "node:path";
|
|
2
1
|
import { default as FSExtra } from "fs-extra";
|
|
2
|
+
import { extname, join } from "node:path";
|
|
3
3
|
import { serveStaticAssets } from "vxrn";
|
|
4
4
|
import { getServerEntry } from "vxrn/serve";
|
|
5
5
|
import { LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX } from "../constants";
|
|
@@ -100,8 +100,8 @@ url: ${url}`);
|
|
|
100
100
|
return next();
|
|
101
101
|
const url = getURLfromRequestURL(request), response = await (() => {
|
|
102
102
|
if (url.pathname.endsWith(LOADER_JS_POSTFIX_UNCACHED)) {
|
|
103
|
-
const originalUrl = getPathFromLoaderPath(url.pathname), finalUrl = new URL(originalUrl, url.origin);
|
|
104
|
-
return resolveLoaderRoute(requestHandlers,
|
|
103
|
+
const originalUrl = getPathFromLoaderPath(url.pathname), finalUrl = new URL(originalUrl, url.origin), cleanedRequest = new Request(finalUrl, request);
|
|
104
|
+
return resolveLoaderRoute(requestHandlers, cleanedRequest, finalUrl, route);
|
|
105
105
|
}
|
|
106
106
|
switch (route.type) {
|
|
107
107
|
case "api":
|
|
@@ -156,9 +156,9 @@ url: ${url}`);
|
|
|
156
156
|
const loaderRoute = {
|
|
157
157
|
...route,
|
|
158
158
|
file: route.loaderServerPath || c.req.path
|
|
159
|
-
}, finalUrl = new URL(originalUrl, url.origin);
|
|
159
|
+
}, finalUrl = new URL(originalUrl, url.origin), cleanedRequest = new Request(finalUrl, request);
|
|
160
160
|
try {
|
|
161
|
-
return await resolveLoaderRoute(requestHandlers,
|
|
161
|
+
return await resolveLoaderRoute(requestHandlers, cleanedRequest, finalUrl, loaderRoute);
|
|
162
162
|
} catch (err) {
|
|
163
163
|
return console.error(`Error running loader: ${err}`), next();
|
|
164
164
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/server/oneServe.ts"],
|
|
4
|
-
"mappings": "AAAA,SAAS,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["buildInfo", "preloads"]
|
|
6
6
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { extname, join } from "node:path";
|
|
2
1
|
import { default as FSExtra } from "fs-extra";
|
|
2
|
+
import { extname, join } from "node:path";
|
|
3
3
|
import { serveStaticAssets } from "vxrn";
|
|
4
4
|
import { getServerEntry } from "vxrn/serve";
|
|
5
5
|
import { LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX } from "../constants.mjs";
|
|
@@ -126,8 +126,9 @@ url: ${url}`);
|
|
|
126
126
|
response = await (() => {
|
|
127
127
|
if (url.pathname.endsWith(LOADER_JS_POSTFIX_UNCACHED)) {
|
|
128
128
|
const originalUrl = getPathFromLoaderPath(url.pathname),
|
|
129
|
-
finalUrl = new URL(originalUrl, url.origin)
|
|
130
|
-
|
|
129
|
+
finalUrl = new URL(originalUrl, url.origin),
|
|
130
|
+
cleanedRequest = new Request(finalUrl, request);
|
|
131
|
+
return resolveLoaderRoute(requestHandlers, cleanedRequest, finalUrl, route);
|
|
131
132
|
}
|
|
132
133
|
switch (route.type) {
|
|
133
134
|
case "api":
|
|
@@ -179,9 +180,10 @@ url: ${url}`);
|
|
|
179
180
|
...route,
|
|
180
181
|
file: route.loaderServerPath || c.req.path
|
|
181
182
|
},
|
|
182
|
-
finalUrl = new URL(originalUrl, url.origin)
|
|
183
|
+
finalUrl = new URL(originalUrl, url.origin),
|
|
184
|
+
cleanedRequest = new Request(finalUrl, request);
|
|
183
185
|
try {
|
|
184
|
-
return await resolveLoaderRoute(requestHandlers,
|
|
186
|
+
return await resolveLoaderRoute(requestHandlers, cleanedRequest, finalUrl, loaderRoute);
|
|
185
187
|
} catch (err) {
|
|
186
188
|
return console.error(`Error running loader: ${err}`), next();
|
|
187
189
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["
|
|
1
|
+
{"version":3,"names":["default","FSExtra","extname","join","serveStaticAssets","getServerEntry","LOADER_JS_POSTFIX_UNCACHED","PRELOAD_JS_POSTFIX","compileManifest","getURLfromRequestURL","runMiddlewares","getPathFromLoaderPath","isRolldown","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","useRolldown","requestHandlers","handleAPI","route","fileName","page","slice","process","cwd","loadMiddleware","contextKey","handleLoader","request","url","loaderProps","exports","file","loader","console","warn","json","JSON","stringify","handlePage","buildInfo2","type","error","Object","keys","loaderData","serverJsPath","preloads2","preloads","headers","Headers","set","rendered","mode","path","css","Response","status","isNotFound","err","stack","htmlPath","pathname","cleanPath","html","readFile","createHonoHandler","next","raw","endsWith","Reflect","ownKeys","routeKeys","length","staticAssetResponse","response","originalUrl","finalUrl","URL","origin","cleanedRequest","Request","location","forEach","value","key","header","has","info","compiledManifest","manifest","apiRoutes","urlPath","put","post","delete","patch","urlCleanPath","pageRoutes","c","body","compiledRegex","test","loaderRoute","loaderServerPath"],"sources":["../../../src/server/oneServe.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { extname, join } from "path";
|
|
2
1
|
import { default as FSExtra } from "fs-extra";
|
|
2
|
+
import { extname, join } from "path";
|
|
3
3
|
import { serveStaticAssets } from "vxrn";
|
|
4
4
|
import { getServerEntry } from "vxrn/serve";
|
|
5
5
|
import { LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX } from "../constants.native.js";
|
|
@@ -160,8 +160,9 @@ url: ${url}`);
|
|
|
160
160
|
response = await function () {
|
|
161
161
|
if (url.pathname.endsWith(LOADER_JS_POSTFIX_UNCACHED)) {
|
|
162
162
|
var originalUrl = getPathFromLoaderPath(url.pathname),
|
|
163
|
-
finalUrl = new URL(originalUrl, url.origin)
|
|
164
|
-
|
|
163
|
+
finalUrl = new URL(originalUrl, url.origin),
|
|
164
|
+
cleanedRequest = new Request(finalUrl, request);
|
|
165
|
+
return resolveLoaderRoute(requestHandlers, cleanedRequest, finalUrl, route2);
|
|
165
166
|
}
|
|
166
167
|
switch (route2.type) {
|
|
167
168
|
case "api":
|
|
@@ -250,9 +251,10 @@ url: ${url}`);
|
|
|
250
251
|
...route2,
|
|
251
252
|
file: route2.loaderServerPath || c.req.path
|
|
252
253
|
},
|
|
253
|
-
finalUrl = new URL(originalUrl, url.origin)
|
|
254
|
+
finalUrl = new URL(originalUrl, url.origin),
|
|
255
|
+
cleanedRequest = new Request(finalUrl, request);
|
|
254
256
|
try {
|
|
255
|
-
var resolved = await resolveLoaderRoute(requestHandlers,
|
|
257
|
+
var resolved = await resolveLoaderRoute(requestHandlers, cleanedRequest, finalUrl, loaderRoute);
|
|
256
258
|
return resolved;
|
|
257
259
|
} catch (err) {
|
|
258
260
|
return console.error(`Error running loader: ${err}`), next();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["
|
|
1
|
+
{"version":3,"names":["default","FSExtra","extname","join","serveStaticAssets","getServerEntry","LOADER_JS_POSTFIX_UNCACHED","PRELOAD_JS_POSTFIX","compileManifest","getURLfromRequestURL","runMiddlewares","getPathFromLoaderPath","isRolldown","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","useRolldown","requestHandlers","handleAPI","route","route2","fileName","page","slice","apiFile","process","cwd","loadMiddleware","contextKey","handleLoader","request","url","loaderProps","exports","file","loader","console","warn","json","JSON","stringify","handlePage","_$buildInfo","type","error","Object","keys","_exported_loader","exported","serverJsPath","loaderData","call","preloads2","preloads","headers","Headers","set","rendered","mode","path","css","Response","status","isNotFound","_err_stack","stack","htmlPath","pathname","cleanPath","html","readFile","headers1","createHonoHandler","raw","endsWith","Reflect","ownKeys","routeKeys","length","staticAssetResponse","response","originalUrl","finalUrl","URL","origin","cleanedRequest","Request","location","forEach","key","header","has","info","compiledManifest","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":[]}
|