one 1.1.484 → 1.1.486
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/createHandleRequest.cjs +2 -1
- package/dist/cjs/createHandleRequest.js +2 -1
- package/dist/cjs/createHandleRequest.js.map +1 -1
- package/dist/cjs/createHandleRequest.native.js +4 -2
- package/dist/cjs/createHandleRequest.native.js.map +1 -1
- package/dist/cjs/hooks.cjs +8 -5
- package/dist/cjs/hooks.js +7 -6
- package/dist/cjs/hooks.js.map +1 -1
- package/dist/cjs/hooks.native.js +7 -6
- package/dist/cjs/hooks.native.js.map +2 -2
- package/dist/cjs/router/Route.cjs +4 -1
- package/dist/cjs/router/Route.js +2 -2
- package/dist/cjs/router/Route.js.map +1 -1
- package/dist/cjs/router/Route.native.js +4 -2
- package/dist/cjs/router/Route.native.js.map +2 -2
- package/dist/cjs/router/RouteInfoContext.cjs +61 -0
- package/dist/cjs/router/RouteInfoContext.js +51 -0
- package/dist/cjs/router/RouteInfoContext.js.map +6 -0
- package/dist/cjs/router/RouteInfoContext.native.js +50 -0
- package/dist/cjs/router/RouteInfoContext.native.js.map +6 -0
- package/dist/cjs/server/oneServe.cjs +8 -13
- package/dist/cjs/server/oneServe.js +11 -14
- package/dist/cjs/server/oneServe.js.map +1 -1
- package/dist/cjs/server/oneServe.native.js +20 -23
- package/dist/cjs/server/oneServe.native.js.map +2 -2
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.cjs +1 -1
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.js +1 -1
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.js.map +1 -1
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.native.js +3 -1
- package/dist/cjs/vite/plugins/generateFileSystemRouteTypesPlugin.native.js.map +2 -2
- package/dist/esm/createHandleRequest.js +2 -1
- package/dist/esm/createHandleRequest.js.map +1 -1
- package/dist/esm/createHandleRequest.mjs +1 -1
- package/dist/esm/createHandleRequest.mjs.map +1 -1
- package/dist/esm/createHandleRequest.native.js +1 -1
- package/dist/esm/createHandleRequest.native.js.map +1 -1
- package/dist/esm/hooks.js +9 -7
- package/dist/esm/hooks.js.map +1 -1
- package/dist/esm/hooks.mjs +10 -7
- package/dist/esm/hooks.mjs.map +1 -1
- package/dist/esm/hooks.native.js +11 -7
- package/dist/esm/hooks.native.js.map +1 -1
- package/dist/esm/router/Route.js +2 -1
- package/dist/esm/router/Route.js.map +1 -1
- package/dist/esm/router/Route.mjs +4 -1
- package/dist/esm/router/Route.mjs.map +1 -1
- package/dist/esm/router/Route.native.js +4 -1
- package/dist/esm/router/Route.native.js.map +1 -1
- package/dist/esm/router/RouteInfoContext.js +38 -0
- package/dist/esm/router/RouteInfoContext.js.map +6 -0
- package/dist/esm/router/RouteInfoContext.mjs +37 -0
- package/dist/esm/router/RouteInfoContext.mjs.map +1 -0
- package/dist/esm/router/RouteInfoContext.native.js +39 -0
- package/dist/esm/router/RouteInfoContext.native.js.map +1 -0
- package/dist/esm/server/oneServe.js +17 -15
- package/dist/esm/server/oneServe.js.map +1 -1
- package/dist/esm/server/oneServe.mjs +9 -14
- package/dist/esm/server/oneServe.mjs.map +1 -1
- package/dist/esm/server/oneServe.native.js +21 -24
- package/dist/esm/server/oneServe.native.js.map +1 -1
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.js +2 -2
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.js.map +1 -1
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.mjs +2 -2
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.mjs.map +1 -1
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.native.js +4 -2
- package/dist/esm/vite/plugins/generateFileSystemRouteTypesPlugin.native.js.map +1 -1
- package/package.json +15 -15
- package/src/createHandleRequest.ts +1 -1
- package/src/hooks.tsx +29 -8
- package/src/router/Route.tsx +7 -2
- package/src/router/RouteInfoContext.tsx +94 -0
- package/src/server/oneServe.ts +23 -18
- package/src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx +9 -2
- package/types/createHandleRequest.d.ts +1 -0
- package/types/createHandleRequest.d.ts.map +1 -1
- package/types/hooks.d.ts.map +1 -1
- package/types/layouts/Drawer.d.ts +14 -4
- package/types/layouts/Drawer.d.ts.map +1 -1
- package/types/layouts/Stack.d.ts +14 -4
- package/types/layouts/Stack.d.ts.map +1 -1
- package/types/layouts/Tabs.d.ts +14 -4
- package/types/layouts/Tabs.d.ts.map +1 -1
- package/types/router/Route.d.ts.map +1 -1
- package/types/router/RouteInfoContext.d.ts +27 -0
- package/types/router/RouteInfoContext.d.ts.map +1 -0
- package/types/server/oneServe.d.ts.map +1 -1
- package/types/views/Navigator.d.ts +2 -2
- package/types/views/Navigator.d.ts.map +1 -1
- package/types/vite/plugins/generateFileSystemRouteTypesPlugin.d.ts.map +1 -1
@@ -1,6 +1,7 @@
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
2
2
|
import React, { createContext, useContext } from "react";
|
3
3
|
import { getContextKey } from "./matchers.native.js";
|
4
|
+
import { RouteInfoContextProvider } from "./RouteInfoContext.native.js";
|
4
5
|
var RouteParamsContext = /* @__PURE__ */createContext({}),
|
5
6
|
CurrentRouteContext = /* @__PURE__ */React.createContext(null);
|
6
7
|
process.env.NODE_ENV !== "production" && (CurrentRouteContext.displayName = "RouteNode");
|
@@ -22,7 +23,9 @@ function Route(param) {
|
|
22
23
|
value: route?.params,
|
23
24
|
children: /* @__PURE__ */_jsx(CurrentRouteContext.Provider, {
|
24
25
|
value: node,
|
25
|
-
children
|
26
|
+
children: /* @__PURE__ */_jsx(RouteInfoContextProvider, {
|
27
|
+
children
|
28
|
+
})
|
26
29
|
})
|
27
30
|
});
|
28
31
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["jsx","_jsx","React","createContext","useContext","getContextKey","RouteParamsContext","CurrentRouteContext","process","env","NODE_ENV","displayName","useRouteNode","useContextKey","node","Error","contextKey","Route","param","children","route","Provider","value","params"],"sources":["../../../src/router/Route.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAAOA,GAAA,IAASC,IAAA,2BAAe;AAG/B,OAAAC,KAAS,IAAAC,aAAA,EAAqBC,UAAA;
|
1
|
+
{"version":3,"names":["jsx","_jsx","React","createContext","useContext","getContextKey","RouteInfoContextProvider","RouteParamsContext","CurrentRouteContext","process","env","NODE_ENV","displayName","useRouteNode","useContextKey","node","Error","contextKey","Route","param","children","route","Provider","value","params"],"sources":["../../../src/router/Route.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAAOA,GAAA,IAASC,IAAA,2BAAe;AAG/B,OAAAC,KAAS,IAAAC,aAAA,EAAqBC,UAAA;AAC9B,SAASC,aAAA,8BAAgC;AAgFjC,SAAAC,wBAAA;AApCD,IAAAC,kBAAM,kBAEXJ,aAEI;EAAAK,mBAA4B,kBAAoCN,KAAA,CAAAC,aAAA;AAElEM,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,iBAC3BH,mBAAA,CAAoBI,WAAA,GAAc;AAI7B,SAASC,aAAA,EAAiC;EAC/C,OAAOT,UAAA,CAAWI,mBAAmB;AACvC;AAEO,SAASM,cAAA,EAAwB;EACtC,IAAAC,IAAM,GAAAF,YAAO;EACb,IAAIE,IAAA,IAAQ,MACV,MAAM,IAAIC,KAAA,CAAM,oDAAoD;EAEtE,OAAOX,aAAA,CAAcU,IAAA,CAAKE,UAAU;AACtC;AAGO,SAASC,MAAMC,KAAA;EACpB;IAAAC,QAAA;IAAAL,IAAA;IAAAM;EAAA,IAAAF,KAAA;EACA,sBAAAlB,IAAA,CAAAM,kBAAA,CAAAe,QAAA;IACAC,KAAA,EAAAF,KAAA,EAAAG,MAAA;IAKCJ,QAAA,iBAAAnB,IAAA,CAAAO,mBAAA,CAAAc,QAAA;MACDC,KACE,EAAAR,IAAA;MAMJK,QAAA,iBAAAnB,IAAA,CAAAK,wBAAA","ignoreList":[]}
|
@@ -0,0 +1,38 @@
|
|
1
|
+
import { createContext, useRef } from "react";
|
2
|
+
import { useStateForPath } from "@react-navigation/core";
|
3
|
+
import { getRouteInfo } from "./router";
|
4
|
+
import { jsx } from "react/jsx-runtime";
|
5
|
+
const RouteInfoContext = createContext(void 0);
|
6
|
+
function RouteInfoContextProvider({ children }) {
|
7
|
+
const currentState = useStateForPath(), currentStateRef = useRef(void 0), lastStateRef = useRef(void 0), cachedRouteInfoValueRef = useRef(void 0), lazilyCalculatedRouteInfo = useRef();
|
8
|
+
return currentState && currentStateRef.current !== currentState && (lazilyCalculatedRouteInfo.current = makeLazilyCalculatedRouteInfo({
|
9
|
+
currentStateRef,
|
10
|
+
lastStateRef,
|
11
|
+
cachedRouteInfoValueRef
|
12
|
+
})), currentStateRef.current = currentState, /* @__PURE__ */ jsx(
|
13
|
+
RouteInfoContext.Provider,
|
14
|
+
{
|
15
|
+
value: currentState ? lazilyCalculatedRouteInfo.current : void 0,
|
16
|
+
children
|
17
|
+
}
|
18
|
+
);
|
19
|
+
}
|
20
|
+
function makeLazilyCalculatedRouteInfo({
|
21
|
+
currentStateRef,
|
22
|
+
lastStateRef,
|
23
|
+
cachedRouteInfoValueRef
|
24
|
+
}) {
|
25
|
+
return new Proxy({}, {
|
26
|
+
get(_, p) {
|
27
|
+
const state = currentStateRef.current;
|
28
|
+
if (!state)
|
29
|
+
throw new Error("[lazilyCalculatedRouteInfo] cannot get state");
|
30
|
+
return (!cachedRouteInfoValueRef.current || lastStateRef.current !== state) && (cachedRouteInfoValueRef.current = getRouteInfo(state), lastStateRef.current = state), cachedRouteInfoValueRef.current[p];
|
31
|
+
}
|
32
|
+
});
|
33
|
+
}
|
34
|
+
export {
|
35
|
+
RouteInfoContext,
|
36
|
+
RouteInfoContextProvider
|
37
|
+
};
|
38
|
+
//# sourceMappingURL=RouteInfoContext.js.map
|
@@ -0,0 +1,6 @@
|
|
1
|
+
{
|
2
|
+
"version": 3,
|
3
|
+
"sources": ["../../../src/router/RouteInfoContext.tsx"],
|
4
|
+
"mappings": "AACA,SAAS,eAAe,cAAc;AAEtC,SAAS,uBAAuB;AAChC,SAAS,oBAAoB;AAsDzB;AApDG,MAAM,mBAAmB,cAAqC,MAAS;AAsBvE,SAAS,yBAAyB,EAAE,SAAS,GAAkC;AACpF,QAAM,eAAe,gBAAgB,GAO/B,kBAAkB,OAA4B,MAAS,GAOvD,eAAe,OAA4B,MAAS,GACpD,0BAA0B,OAA8B,MAAS,GAEjE,4BAA4B,OAA8B;AAEhE,SAAI,gBAAgB,gBAAgB,YAAY,iBAC9C,0BAA0B,UAAU,8BAA8B;AAAA,IAChE;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC,IAEH,gBAAgB,UAAU,cAGxB;AAAA,IAAC,iBAAiB;AAAA,IAAjB;AAAA,MACC,OAAO,eAAe,0BAA0B,UAAU;AAAA,MAEzD;AAAA;AAAA,EACH;AAEJ;AAEA,SAAS,8BAA8B;AAAA,EACrC;AAAA,EACA;AAAA,EACA;AACF,GAIG;AACD,SAAO,IAAI,MAAM,CAAC,GAAU;AAAA,IAC1B,IAAI,GAAG,GAAoB;AACzB,YAAM,QAAQ,gBAAgB;AAC9B,UAAI,CAAC;AAGH,cAAM,IAAI,MAAM,8CAA8C;AAIhE,cAAI,CAAC,wBAAwB,WAAW,aAAa,YAAY,WAC/D,wBAAwB,UAAU,aAAa,KAAK,GACpD,aAAa,UAAU,QAGlB,wBAAwB,QAAS,CAAC;AAAA,IAC3C;AAAA,EACF,CAAC;AACH;",
|
5
|
+
"names": []
|
6
|
+
}
|
@@ -0,0 +1,37 @@
|
|
1
|
+
import { createContext, useRef } from "react";
|
2
|
+
import { useStateForPath } from "@react-navigation/core";
|
3
|
+
import { getRouteInfo } from "./router.mjs";
|
4
|
+
import { jsx } from "react/jsx-runtime";
|
5
|
+
const RouteInfoContext = createContext(void 0);
|
6
|
+
function RouteInfoContextProvider({
|
7
|
+
children
|
8
|
+
}) {
|
9
|
+
const currentState = useStateForPath(),
|
10
|
+
currentStateRef = useRef(void 0),
|
11
|
+
lastStateRef = useRef(void 0),
|
12
|
+
cachedRouteInfoValueRef = useRef(void 0),
|
13
|
+
lazilyCalculatedRouteInfo = useRef();
|
14
|
+
return currentState && currentStateRef.current !== currentState && (lazilyCalculatedRouteInfo.current = makeLazilyCalculatedRouteInfo({
|
15
|
+
currentStateRef,
|
16
|
+
lastStateRef,
|
17
|
+
cachedRouteInfoValueRef
|
18
|
+
})), currentStateRef.current = currentState, /* @__PURE__ */jsx(RouteInfoContext.Provider, {
|
19
|
+
value: currentState ? lazilyCalculatedRouteInfo.current : void 0,
|
20
|
+
children
|
21
|
+
});
|
22
|
+
}
|
23
|
+
function makeLazilyCalculatedRouteInfo({
|
24
|
+
currentStateRef,
|
25
|
+
lastStateRef,
|
26
|
+
cachedRouteInfoValueRef
|
27
|
+
}) {
|
28
|
+
return new Proxy({}, {
|
29
|
+
get(_, p) {
|
30
|
+
const state = currentStateRef.current;
|
31
|
+
if (!state) throw new Error("[lazilyCalculatedRouteInfo] cannot get state");
|
32
|
+
return (!cachedRouteInfoValueRef.current || lastStateRef.current !== state) && (cachedRouteInfoValueRef.current = getRouteInfo(state), lastStateRef.current = state), cachedRouteInfoValueRef.current[p];
|
33
|
+
}
|
34
|
+
});
|
35
|
+
}
|
36
|
+
export { RouteInfoContext, RouteInfoContextProvider };
|
37
|
+
//# sourceMappingURL=RouteInfoContext.mjs.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"names":["createContext","useRef","useStateForPath","getRouteInfo","jsx","RouteInfoContext","RouteInfoContextProvider","children","currentState","currentStateRef","lastStateRef","cachedRouteInfoValueRef","lazilyCalculatedRouteInfo","current","makeLazilyCalculatedRouteInfo","Provider","value","Proxy","get","_","p","state","Error"],"sources":["../../../src/router/RouteInfoContext.tsx"],"sourcesContent":[null],"mappings":"AACA,SAASA,aAAA,EAAeC,MAAA,QAAc;AAEtC,SAASC,eAAA,QAAuB;AAChC,SAASC,YAAA,QAAoB;AAsDzB,SAAAC,GAAA;AApDG,MAAMC,gBAAA,GAAmBL,aAAA,CAAqC,MAAS;AAsBvE,SAASM,yBAAyB;EAAEC;AAAS,GAAkC;EACpF,MAAMC,YAAA,GAAeN,eAAA,CAAgB;IAO/BO,eAAA,GAAkBR,MAAA,CAA4B,MAAS;IAOvDS,YAAA,GAAeT,MAAA,CAA4B,MAAS;IACpDU,uBAAA,GAA0BV,MAAA,CAA8B,MAAS;IAEjEW,yBAAA,GAA4BX,MAAA,CAA8B;EAEhE,OAAIO,YAAA,IAAgBC,eAAA,CAAgBI,OAAA,KAAYL,YAAA,KAC9CI,yBAAA,CAA0BC,OAAA,GAAUC,6BAAA,CAA8B;IAChEL,eAAA;IACAC,YAAA;IACAC;EACF,CAAC,IAEHF,eAAA,CAAgBI,OAAA,GAAUL,YAAA,EAGxB,eAAAJ,GAAA,CAACC,gBAAA,CAAiBU,QAAA,EAAjB;IACCC,KAAA,EAAOR,YAAA,GAAeI,yBAAA,CAA0BC,OAAA,GAAU;IAEzDN;EAAA,CACH;AAEJ;AAEA,SAASO,8BAA8B;EACrCL,eAAA;EACAC,YAAA;EACAC;AACF,GAIG;EACD,OAAO,IAAIM,KAAA,CAAM,CAAC,GAAU;IAC1BC,IAAIC,CAAA,EAAGC,CAAA,EAAoB;MACzB,MAAMC,KAAA,GAAQZ,eAAA,CAAgBI,OAAA;MAC9B,IAAI,CAACQ,KAAA,EAGH,MAAM,IAAIC,KAAA,CAAM,8CAA8C;MAIhE,QAAI,CAACX,uBAAA,CAAwBE,OAAA,IAAWH,YAAA,CAAaG,OAAA,KAAYQ,KAAA,MAC/DV,uBAAA,CAAwBE,OAAA,GAAUV,YAAA,CAAakB,KAAK,GACpDX,YAAA,CAAaG,OAAA,GAAUQ,KAAA,GAGlBV,uBAAA,CAAwBE,OAAA,CAASO,CAAC;IAC3C;EACF,CAAC;AACH","ignoreList":[]}
|
@@ -0,0 +1,39 @@
|
|
1
|
+
import { jsx as _jsx } from "react/jsx-runtime";
|
2
|
+
import { createContext, useRef } from "react";
|
3
|
+
import { useStateForPath } from "@react-navigation/core";
|
4
|
+
import { getRouteInfo } from "./router.native.js";
|
5
|
+
var RouteInfoContext = /* @__PURE__ */createContext(void 0);
|
6
|
+
function RouteInfoContextProvider(param) {
|
7
|
+
var {
|
8
|
+
children
|
9
|
+
} = param,
|
10
|
+
currentState = useStateForPath(),
|
11
|
+
currentStateRef = useRef(void 0),
|
12
|
+
lastStateRef = useRef(void 0),
|
13
|
+
cachedRouteInfoValueRef = useRef(void 0),
|
14
|
+
lazilyCalculatedRouteInfo = useRef();
|
15
|
+
return currentState && currentStateRef.current !== currentState && (lazilyCalculatedRouteInfo.current = makeLazilyCalculatedRouteInfo({
|
16
|
+
currentStateRef,
|
17
|
+
lastStateRef,
|
18
|
+
cachedRouteInfoValueRef
|
19
|
+
})), currentStateRef.current = currentState, /* @__PURE__ */_jsx(RouteInfoContext.Provider, {
|
20
|
+
value: currentState ? lazilyCalculatedRouteInfo.current : void 0,
|
21
|
+
children
|
22
|
+
});
|
23
|
+
}
|
24
|
+
function makeLazilyCalculatedRouteInfo(param) {
|
25
|
+
var {
|
26
|
+
currentStateRef,
|
27
|
+
lastStateRef,
|
28
|
+
cachedRouteInfoValueRef
|
29
|
+
} = param;
|
30
|
+
return new Proxy({}, {
|
31
|
+
get(_, p) {
|
32
|
+
var state = currentStateRef.current;
|
33
|
+
if (!state) throw new Error("[lazilyCalculatedRouteInfo] cannot get state");
|
34
|
+
return (!cachedRouteInfoValueRef.current || lastStateRef.current !== state) && (cachedRouteInfoValueRef.current = getRouteInfo(state), lastStateRef.current = state), cachedRouteInfoValueRef.current[p];
|
35
|
+
}
|
36
|
+
});
|
37
|
+
}
|
38
|
+
export { RouteInfoContext, RouteInfoContextProvider };
|
39
|
+
//# sourceMappingURL=RouteInfoContext.native.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"names":["jsx","_jsx","createContext","useRef","useStateForPath","getRouteInfo","RouteInfoContext","RouteInfoContextProvider","param","children","currentState","currentStateRef","lastStateRef","cachedRouteInfoValueRef","lazilyCalculatedRouteInfo","current","makeLazilyCalculatedRouteInfo","Provider","value","Proxy","get","_","p","state","Error"],"sources":["../../../src/router/RouteInfoContext.tsx"],"sourcesContent":[null],"mappings":"AACA,SAASA,GAAA,IAAAC,IAAA,QAAe,mBAAc;AAEtC,SAASC,aAAA,EAAAC,MAAA,QAAuB;AAChC,SAASC,eAAA,QAAoB;AAsDzB,SAAAC,YAAA;AApDG,IAAAC,gBAAM,kBAAwDJ,aAAS;AAsBvE,SAASK,yBAAyBC,KAAE;EACzC;MAAMC;IAAA,IAAAD,KAAe;IAAAE,YAAgB,GAO/BN,eAAA,EAAkB;IAAAO,eAOlB,GAAAR,MAAA,MAAe;IAAAS,YACf,GAAAT,MAAA;IAAAU,uBAEA,GAAAV,MAAA;IAAAW,yBAA0D,GAAAX,MAAA;EAEhE,OAAIO,YAAA,IAAgBC,eAAA,CAAgBI,OAAA,KAAYL,YAAA,KAC9CI,yBAAA,CAA0BC,OAAA,GAAUC,6BAAA,CAA8B;IAChEL,eAAA;IACAC,YAAA;IACAC;EACF,CAAC,IAEHF,eAAA,CAAgBI,OAAA,GAAUL,YAAA,EAGxB,eAAAT,IAAA,CAAAK,gBAAA,CAAAW,QAAA;IAACC,KAAA,EAAAR,YAAiB,GAAAI,yBAAA,CAAAC,OAAA;IAAjBN;EAAA;AAC2D;AAEzD,SAAAO,8BAAAR,KAAA;EACH;IAAAG,eAAA;IAAAC,YAAA;IAAAC;EAAA,IAAAL,KAAA;EAEJ,WAAAW,KAAA;IAEAC,IAAAC,CAAS,EAAAC,CAAA;MACP,IAAAC,KAAA,GAAAZ,eAAA,CAAAI,OAAA;MACA,KAAAQ,KAAA,EACA,UAAAC,KAAA;MAKC,SAAAX,uBAAA,CAAAE,OAAA,IAAAH,YAAA,CAAAG,OAAA,KAAAQ,KAAA,MAAAV,uBAAA,CAAAE,OAAA,GAAAV,YAAA,CAAAkB,KAAA,GAAAX,YAAA,CAAAG,OAAA,GAAAQ,KAAA,GAAAV,uBAAA,CAAAE,OAAA,CAAAO,CAAA;IACD;EAA4B,EAC1B;AACE;AACA,SAGEhB,gBAAU,EAIZC,wBAAK","ignoreList":[]}
|
@@ -1,10 +1,15 @@
|
|
1
1
|
import { default as FSExtra } from "fs-extra";
|
2
2
|
import { extname, join } from "node:path";
|
3
|
-
import { getServerEntry
|
3
|
+
import { getServerEntry } from "vxrn/serve";
|
4
4
|
import { LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX } from "../constants";
|
5
|
-
import {
|
5
|
+
import {
|
6
|
+
compileManifest,
|
7
|
+
getURLfromRequestURL,
|
8
|
+
runMiddlewares
|
9
|
+
} from "../createHandleRequest";
|
6
10
|
import { getPathFromLoaderPath } from "../utils/cleanUrl";
|
7
11
|
import { toAbsolute } from "../utils/toAbsolute";
|
12
|
+
import { serveStaticAssets } from "vxrn";
|
8
13
|
async function oneServe(oneOptions, buildInfo, app) {
|
9
14
|
const { resolveAPIRoute, resolveLoaderRoute, resolvePageRoute } = await import("../createHandleRequest"), { isResponse } = await import("../utils/isResponse"), { isStatusRedirect } = await import("../utils/isStatus"), isAPIRequest = /* @__PURE__ */ new WeakMap(), redirects = oneOptions.web?.redirects;
|
10
15
|
if (redirects)
|
@@ -82,21 +87,18 @@ url: ${url}`);
|
|
82
87
|
};
|
83
88
|
function createHonoHandler(route) {
|
84
89
|
return async (context, next) => {
|
85
|
-
if (route.page.endsWith("/+not-found")) {
|
86
|
-
let didCallNext = !1;
|
87
|
-
const response = await serveStatic({
|
88
|
-
root: "./dist/client",
|
89
|
-
onFound: (_path, c) => {
|
90
|
-
c.header("Cache-Control", "public, immutable, max-age=31536000");
|
91
|
-
}
|
92
|
-
})(context, async () => {
|
93
|
-
didCallNext = !0;
|
94
|
-
});
|
95
|
-
if (response && !didCallNext)
|
96
|
-
return response;
|
97
|
-
}
|
98
90
|
try {
|
99
91
|
const request = context.req.raw;
|
92
|
+
if (route.page.endsWith("/+not-found") || Reflect.ownKeys(route.routeKeys).length > 0) {
|
93
|
+
const staticAssetResponse = await serveStaticAssets({ context });
|
94
|
+
if (staticAssetResponse)
|
95
|
+
return await runMiddlewares(
|
96
|
+
requestHandlers,
|
97
|
+
request,
|
98
|
+
route,
|
99
|
+
async () => staticAssetResponse
|
100
|
+
);
|
101
|
+
}
|
100
102
|
if (extname(request.url) === ".js" || extname(request.url) === ".css")
|
101
103
|
return next();
|
102
104
|
const url = getURLfromRequestURL(request), response = await (() => {
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../src/server/oneServe.ts"],
|
4
|
-
"mappings": "AAAA,SAAS,WAAW,eAAe;AAGnC,SAAS,SAAS,YAAY;AAC9B,SAAS,
|
4
|
+
"mappings": "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",
|
5
5
|
"names": ["buildInfo", "preloads"]
|
6
6
|
}
|
@@ -1,10 +1,11 @@
|
|
1
1
|
import { default as FSExtra } from "fs-extra";
|
2
2
|
import { extname, join } from "node:path";
|
3
|
-
import { getServerEntry
|
3
|
+
import { getServerEntry } from "vxrn/serve";
|
4
4
|
import { LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX } from "../constants.mjs";
|
5
|
-
import { compileManifest, getURLfromRequestURL } from "../createHandleRequest.mjs";
|
5
|
+
import { compileManifest, getURLfromRequestURL, runMiddlewares } from "../createHandleRequest.mjs";
|
6
6
|
import { getPathFromLoaderPath } from "../utils/cleanUrl.mjs";
|
7
7
|
import { toAbsolute } from "../utils/toAbsolute.mjs";
|
8
|
+
import { serveStaticAssets } from "vxrn";
|
8
9
|
async function oneServe(oneOptions, buildInfo, app) {
|
9
10
|
const {
|
10
11
|
resolveAPIRoute,
|
@@ -109,20 +110,14 @@ url: ${url}`);
|
|
109
110
|
};
|
110
111
|
function createHonoHandler(route) {
|
111
112
|
return async (context, next) => {
|
112
|
-
if (route.page.endsWith("/+not-found")) {
|
113
|
-
let didCallNext = !1;
|
114
|
-
const response = await serveStatic({
|
115
|
-
root: "./dist/client",
|
116
|
-
onFound: (_path, c) => {
|
117
|
-
c.header("Cache-Control", "public, immutable, max-age=31536000");
|
118
|
-
}
|
119
|
-
})(context, async () => {
|
120
|
-
didCallNext = !0;
|
121
|
-
});
|
122
|
-
if (response && !didCallNext) return response;
|
123
|
-
}
|
124
113
|
try {
|
125
114
|
const request = context.req.raw;
|
115
|
+
if (route.page.endsWith("/+not-found") || Reflect.ownKeys(route.routeKeys).length > 0) {
|
116
|
+
const staticAssetResponse = await serveStaticAssets({
|
117
|
+
context
|
118
|
+
});
|
119
|
+
if (staticAssetResponse) return await runMiddlewares(requestHandlers, request, route, async () => staticAssetResponse);
|
120
|
+
}
|
126
121
|
if (extname(request.url) === ".js" || extname(request.url) === ".css") return next();
|
127
122
|
const url = getURLfromRequestURL(request),
|
128
123
|
response = await (() => {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["default","FSExtra","extname","join","getServerEntry","
|
1
|
+
{"version":3,"names":["default","FSExtra","extname","join","getServerEntry","LOADER_JS_POSTFIX_UNCACHED","PRELOAD_JS_POSTFIX","compileManifest","getURLfromRequestURL","runMiddlewares","getPathFromLoaderPath","toAbsolute","serveStaticAssets","oneServe","oneOptions","buildInfo","app","resolveAPIRoute","resolveLoaderRoute","resolvePageRoute","isResponse","isStatusRedirect","isAPIRequest","WeakMap","redirects","web","redirect","get","source","context","destinationUrl","destination","replace","param","paramName","substring","req","permanent","Error","routeToBuildInfo","routeMap","serverOptions","root","render","apiCJS","build","api","outputFormat","requestHandlers","handleAPI","route","process","cwd","page","loadMiddleware","contextKey","handleLoader","request","url","loaderProps","exports","file","loader","console","warn","json","JSON","stringify","handlePage","buildInfo2","type","error","Object","keys","loaderData","serverJsPath","preloads2","preloads","headers","Headers","set","rendered","mode","path","css","Response","status","isNotFound","err","stack","htmlPath","pathname","cleanPath","html","readFile","createHonoHandler","next","raw","endsWith","Reflect","ownKeys","routeKeys","length","staticAssetResponse","response","originalUrl","finalUrl","URL","origin","location","forEach","value","key","header","has","info","compiledManifest","manifest","apiRoutes","urlPath","put","post","delete","patch","urlCleanPath","pageRoutes","c","body","compiledRegex","test","loaderRoute","loaderServerPath"],"sources":["../../../src/server/oneServe.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
@@ -1,10 +1,11 @@
|
|
1
1
|
import { default as FSExtra } from "fs-extra";
|
2
2
|
import { extname, join } from "node:path";
|
3
|
-
import { getServerEntry
|
3
|
+
import { getServerEntry } from "vxrn/serve";
|
4
4
|
import { LOADER_JS_POSTFIX_UNCACHED, PRELOAD_JS_POSTFIX } from "../constants.native.js";
|
5
|
-
import { compileManifest, getURLfromRequestURL } from "../createHandleRequest.native.js";
|
5
|
+
import { compileManifest, getURLfromRequestURL, runMiddlewares } from "../createHandleRequest.native.js";
|
6
6
|
import { getPathFromLoaderPath } from "../utils/cleanUrl.native.js";
|
7
7
|
import { toAbsolute } from "../utils/toAbsolute.native.js";
|
8
|
+
import { serveStaticAssets } from "vxrn";
|
8
9
|
async function oneServe(oneOptions, buildInfo, app) {
|
9
10
|
var _oneOptions_web,
|
10
11
|
_oneOptions_build_api,
|
@@ -139,23 +140,19 @@ url: ${url}`);
|
|
139
140
|
};
|
140
141
|
function createHonoHandler(route2) {
|
141
142
|
return async function (context, next) {
|
142
|
-
if (route2.page.endsWith("/+not-found")) {
|
143
|
-
var didCallNext = !1,
|
144
|
-
response = await serveStatic({
|
145
|
-
root: "./dist/client",
|
146
|
-
onFound: function (_path, c) {
|
147
|
-
c.header("Cache-Control", "public, immutable, max-age=31536000");
|
148
|
-
}
|
149
|
-
})(context, async function () {
|
150
|
-
didCallNext = !0;
|
151
|
-
});
|
152
|
-
if (response && !didCallNext) return response;
|
153
|
-
}
|
154
143
|
try {
|
155
144
|
var request = context.req.raw;
|
145
|
+
if (route2.page.endsWith("/+not-found") || Reflect.ownKeys(route2.routeKeys).length > 0) {
|
146
|
+
var staticAssetResponse = await serveStaticAssets({
|
147
|
+
context
|
148
|
+
});
|
149
|
+
if (staticAssetResponse) return await runMiddlewares(requestHandlers, request, route2, async function () {
|
150
|
+
return staticAssetResponse;
|
151
|
+
});
|
152
|
+
}
|
156
153
|
if (extname(request.url) === ".js" || extname(request.url) === ".css") return next();
|
157
154
|
var url = getURLfromRequestURL(request),
|
158
|
-
|
155
|
+
response = await function () {
|
159
156
|
if (url.pathname.endsWith(LOADER_JS_POSTFIX_UNCACHED)) {
|
160
157
|
var originalUrl = getPathFromLoaderPath(url.pathname),
|
161
158
|
finalUrl = new URL(originalUrl, url.origin);
|
@@ -170,20 +167,20 @@ url: ${url}`);
|
|
170
167
|
return resolvePageRoute(requestHandlers, request, url, route2);
|
171
168
|
}
|
172
169
|
}();
|
173
|
-
if (
|
174
|
-
if (isResponse(
|
175
|
-
if (isStatusRedirect(
|
176
|
-
var location = `${
|
177
|
-
return
|
170
|
+
if (response) {
|
171
|
+
if (isResponse(response)) {
|
172
|
+
if (isStatusRedirect(response.status)) {
|
173
|
+
var location = `${response.headers.get("location") || ""}`;
|
174
|
+
return response.headers.forEach(function (value, key) {
|
178
175
|
context.header(key, value);
|
179
|
-
}), context.redirect(location,
|
176
|
+
}), context.redirect(location, response.status);
|
180
177
|
}
|
181
178
|
if (isAPIRequest.get(request)) try {
|
182
|
-
return !
|
179
|
+
return !response.headers.has("cache-control") && !response.headers.has("Cache-Control") && response.headers.set("cache-control", "no-store"), response;
|
183
180
|
} catch (err) {
|
184
|
-
console.info(`Error updating cache header on api route "${context.req.path}" to no-store, it is ${
|
181
|
+
console.info(`Error updating cache header on api route "${context.req.path}" to no-store, it is ${response.headers.get("cache-control")}, continue`, err);
|
185
182
|
}
|
186
|
-
return
|
183
|
+
return response;
|
187
184
|
}
|
188
185
|
return next();
|
189
186
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["default","FSExtra","extname","join","getServerEntry","
|
1
|
+
{"version":3,"names":["default","FSExtra","extname","join","getServerEntry","LOADER_JS_POSTFIX_UNCACHED","PRELOAD_JS_POSTFIX","compileManifest","getURLfromRequestURL","runMiddlewares","getPathFromLoaderPath","toAbsolute","serveStaticAssets","oneServe","oneOptions","buildInfo","app","_oneOptions_web","_oneOptions_build_api","_oneOptions_build","resolveAPIRoute","resolveLoaderRoute","resolvePageRoute","isResponse","isStatusRedirect","isAPIRequest","WeakMap","redirects","web","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_loop","redirect","_step","value","get","source","context","destinationUrl","destination","replace","param","paramName","substring","req","permanent","_iterator","Symbol","iterator","next","done","err","return","Error","routeToBuildInfo","routeMap","serverOptions","root","entryServer","entry","render","apiCJS","build","api","outputFormat","requestHandlers","handleAPI","route","route2","apiFile","process","cwd","page","loadMiddleware","contextKey","handleLoader","request","url","loaderProps","exports","file","loader","console","warn","json","JSON","stringify","handlePage","_$buildInfo","type","error","Object","keys","_exported_loader","exported","serverJsPath","loaderData","call","preloads2","preloads","headers","Headers","set","rendered","mode","path","css","Response","status","isNotFound","_err_stack","stack","htmlPath","pathname","cleanPath","html","readFile","headers1","createHonoHandler","raw","endsWith","Reflect","ownKeys","routeKeys","length","staticAssetResponse","response","originalUrl","finalUrl","URL","origin","location","forEach","key","header","has","info","compiledManifest","manifest","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","apiRoutes","_step1","urlPath","put","post","delete","patch","urlCleanPath","_iteratorNormalCompletion2","_didIteratorError2","_iteratorError2","_iterator2","pageRoutes","_step2","route1"],"sources":["../../../src/server/oneServe.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,OAAA,IAAWC,OAAA,QAAe;AAGnC,SAASC,OAAA,EAASC,IAAA,QAAY;AAC9B,SAASC,cAAA,QAAmC;AAC5C,SAASC,0BAAA,EAA4BC,kBAAA,QAA0B;AAC/D,SAAAC,eAAA,EAAAC,oBAAA,EAAAC,cAAA;AAAA,SACEC,qBAAA;AAAA,SACAC,UAAA;AAAA,SACAC,iBAAA;AAAA,eAEKC,SAAAC,UAAA,EAAAC,SAAA,EAAAC,GAAA;EAEP,IAAAC,eAAS;IAAAC,qBAA6B;IAAAC,iBAAA;IAAA;MAAAC,eAAA;MAAAC,kBAAA;MAAAC;IAAA;IAAA;MAAAC;IAAA;IAAA;MAAAC;IAAA;IAAAC,YAAA,sBAAAC,OAAA;IAAAC,SAAA,IAAAV,eAAA,GAAAH,UAAA,CAAAc,GAAA,cAAAX,eAAA,uBAAAA,eAAA,CAAAU,SAAA;EACtC,IAAAA,SAAS;IAGT,IAAAE,yBAAS,GAAyB;MAAAC,iBAAA;MAAAC,cAAA;IAElC;MACE,KAAQ,IAAAC,KAAA,YAAAA,CAAA,EAAiB;UAUrB,IAAAC,QAAA,GAAAC,KAAA,CAAAC,KAAA;UACFnB,GAAA,CAAAoB,GAAW,CAAAH,QAAA,CAAAI,MAAY,YAAAC,OAAA;YACjB,IAAIC,cAAS,GAAQN,QAAC,CAAAO,WAAY,CAAAC,OAAA,oBAAAC,KAAA;cACpC,IAAMC,SAAA,GAAAD,KAAiB,CAAAE,SAAS;cAC9B,OAAMN,OAAA,CAAAO,GAAY,CAAAH,KAAM,CAAAC,SAAW;YACnC;YACD,OAAAL,OAAA,CAAAL,QAAA,CAAAM,cAAA,EAAAN,QAAA,CAAAa,SAAA;UACD;QACF,CAAC,EAAAC,SAAA,GAAApB,SAAA,CAAAqB,MAAA,CAAAC,QAAA,KAAAf,KAAA,IAAAL,yBAAA,IAAAK,KAAA,GAAAa,SAAA,CAAAG,IAAA,IAAAC,IAAA,GAAAtB,yBAAA,OAAAG,KAAA;IAIL,EAAI,OAACoB,GAAA;MACHtB,iBAAgB,OAAAC,cAAA,GAAAqB,GAAA;IAGlB,UAAQ;MAGN,IAAG;QACH,CAAAvB,yBAAM,IAAAkB,SAAA,CAAAM,MAAA,YAAAN,SAAA,CAAAM,MAAA;MAMF,UAFQ;QAMZ,IAAMvB,iBAAkB,EAOtB,MAAOC,cANS;MAAA;IACF;EACZ;EACA,KAAAhB,SACM,EAA8D,MACtE,IAAAuC,KAAA;EAAA,IAEF;MAAAC,gBAAA;MAAAC;IAAA,IAAAzC,SAAA;IAAA0C,aAAA;MAEA,GAAA3C,UAAM;MACJ4C,IAAA;IAA+C;IACjDC,WAAA,GAAAvD,cAAA,CAAAqD,aAAA;IAAAG,KAAA,gBAAAD,WAAA;IAAAE,MAAA,GAAAD,KAAA,CAAA5D,OAAA,CAAA6D,MAAA;IAAAC,MAAA,KAAA3C,iBAAA,GAAAL,UAAA,CAAAiD,KAAA,cAAA5C,iBAAA,gBAAAD,qBAAA,GAAAC,iBAAA,CAAA6C,GAAA,cAAA9C,qBAAA,uBAAAA,qBAAA,CAAA+C,YAAA;IAAAC,eAAA;MAEA,MAAMC,UAAAzB,KAAe;QACnB;YAAM0B,KAAA,EAAAC;UAAU,IAAM3B,KAAO;UAAA4B,OAAA,GAAWnE,IAAK,CAAAoE,OAAM,CAAAC,GAAA,UAAe,OAAM,EAAIH,MAEtE,CAAEI,IAAA,CAAAhC,OAAW,WAAAA,OAAA,cAAAqB,MAAA;QAEnB,OAAK,aAAAQ,OAAA;MACH;MAIF,MAAAI,cAAaA,CAAML,MAAA,EAAO;QAE1B,OAAO,aAAA1D,UAAA,CAAA0D,MAAA,CAAAM,UAAqC,CAAK;MACnD;MAEA,MAAMC,YAAWA,CAAElC,KAAA,EAAO;QACxB;YAAMmC,OAAA;YAAAT,KAAY,EAAAC,MAAA;YAAAS,GAAA;YAAAC;UAA2B,IAAArC,KAAA;UAAAsC,OAAA,gBAAArE,UAAA,CAAAR,IAAA,sBAAAkE,MAAA,CAAAY,IAAA;UAAA;YAAAC;UAAA,IAAAF,OAAA;QAE7C,IAAI,CAAAE,MAAM,EACR,OAAKC,OAAA,CAAAC,IAAA,+BAAAf,MAAA,CAAAY,IAAA;QACH,IAAAI,IAAA,SAAAH,MAAQ,CAAMH,WAAA;QACJ,OACR,qCAA6BO,IAAY,CAAAC,SAAU,CAAAF,IAAA;MAAiB;MAA0C,MAAAG,WAAA9C,KAAA;QAAA,IAChH;YAAA0B,KAAA,EAAAC,MAAA;YAAAS,GAAA;YAAAC;UAAA,IAAArC,KAAA;UAAA+C,WAAA,GAAAlC,gBAAA,CAAAc,MAAA,CAAAY,IAAA;QAGF,IAAAZ,MAAI,CAAAqB,IAAA;UAEF,KAAAD,WAAM,EAIN,MAAAN,OAAY,CAAAQ,KAAA,iBAAgB,EAAAtB,MAAW,OAAAf,KAAA,2BAAAwB,GAAA,YAAAT,MAAA,CAAAY,IAAA;AAEvC,IAAAW,MAAA,CAAAC,IAAA,CAAMtC,gBAAW,CAAM,CAAApD,IAAA;AAAO;UAChB,IACZ;YAAA,IACA2F,gBAAA;cAAAC,QAAA,gBAAApF,UAAA,CAAA8E,WAAA,CAAAO,YAAA;cAAAC,UAAA,WAAAH,gBAAA,GAAAC,QAAA,CAAAb,MAAA,cAAAY,gBAAA,uBAAAA,gBAAA,CAAAI,IAAA,CAAAH,QAAA,EAAAhB,WAAA;cAAAoB,SAAA,GAAAV,WAAA,CAAAW,QAAA;cAAAC,OAAA,OAAAC,OAAA;YAAAD,OACA,CAAME,GAAA,eAAa,aAAQ;YAAA,IAC3BC,QAAA,SAAA3C,MAAA;cACA4C,IAAA,EAAKpC,MAAA,CAAAqB,IAAU;cAChBO,UAAA;cAEDlB,WAAW;cACT2B,IAAA,EAAA3B,WAAA,EAAA2B,IAAA;cACAN,QAAQ,EAAAD,SAAM;cACfQ,GAAA,EAAAlB,WAAA,CAAAkB;YACH;YACE,WAAQC,QAAM,CAAAJ,QAAA;cAA6CH,OAAA;cAE7DQ,MAAY,EAAGxC,MAAA,CAAAyC,UAAA;YAAA;UAEhB,EAAG,OAAE1D,GAAA;YACJ,IAAA2D,UAAA;YACF5B,OAAO,CAAAQ,KAAA,oCAAAtB,MAAA,CAAAY,IAAA;AACL;AAEA,GAAA8B,UAAI,GAAA3D,GAAA,EAAA4D,KAAU,cAAAD,UAAA,cAAAA,UAAA,GAAA3D,GAAA;AACZ;AAEA,OAAA0B,GAAA;UAEF;QACF;UACF,IAAAmC,QAAA,GAAAzD,QAAA,CAAAsB,GAAA,CAAAoC,QAAA,KAAA1D,QAAA,CAAAiC,WAAA,EAAA0B,SAAA;UACF,IAAAF,QAAA;YAEA,IAASG,IAAA,SAAAnH,OAAkB,CAAAoH,QAAkE,CAAAlH,IAAA,gBAAA8G,QAAA;cAAAK,QAAA,OAAAhB,OAAA;YAC3F,OAAOgB,QAAO,CAAAf,GAAS,eAAS,oBAAAK,QAAA,CAAAQ,IAAA;cAC1Bf,OAAA,EAAAiB,QAAA;cACFT,MAAM,EAAAxC,MAAU,CAAAyC,UAAY;YAE5B,EAAI;UAKF;QACA;MACE;IAAa;EACX,SAAAS,iBACAA,CAAAlD,MAAA;IAAA,uBACA/B,OAAA,EAAAY,IAAA;MAAA;QACY,IACd2B,OAAA,GAAAvC,OAAA,CAAAO,GAAA,CAAA2E,GAAA;QAEJ,IAAAnD,MAAA,CAAAI,IAAA,CAAAgD,QAAA,mBAAAC,OAAA,CAAAC,OAAA,CAAAtD,MAAA,CAAAuD,SAAA,EAAAC,MAAA;UAIA,IAAIC,mBAAmB,SAAMlH,iBAAiB;YAC5C0B;UAGF;UAKE,IAAIwF,mBAAa,EACf,OAAM,MAAArH,cAAc,CAAAyD,eAAsB,EAAAW,OAAI,EAAQR,MAChD,oBAAmB;YACzB,OAAOyD,mBAAmB;UAC5B;QAEA;QAAoB,IAClB5H,OAAK,CAAA2E,OAAA,CAAAC,GAAA,eAAA5E,OAAA,CAAA2E,OAAA,CAAAC,GAAA,cACH,OAAA5B,IAAO;QAAoD,IAE7D4B,GAAA,GAAKtE,oBAAA,CAAAqE,OAAA;UAAAkD,QAAA;YAAA,IACLjD,GAAK,CAAAoC,QAAA,CAAAO,QAAA,CAAApH,0BAAA;cACL,IAAA2H,WAAK,GAAAtH,qBAAA,CAAAoE,GAAA,CAAAoC,QAAA;gBAAAe,QAAA,OAAAC,GAAA,CAAAF,WAAA,EAAAlD,GAAA,CAAAqD,MAAA;cACH,OAAA9G,kBAAO,CAAiB6C,eAAA,EAAiBW,OAAA,EAASoD,QAAK,EAAK5D,MAAA;YAEhE;YACF,QAAGA,MAAA,CAAAqB,IAAA;cAEC,UAAU;gBACR,OAAAtE,eAAsB,CAAA8C,eAAA,EAAAW,OAAA,EAAAC,GAAA,EAAAT,MAAA;cAGxB,KAAI;cACF,UAAM;cACN;gBACE,OAAA/C,gBAAoB,CAAA4C,eAAK,EAAAW,OAAA,EAAAC,GAAA,EAAAT,MAAA;YAAA;UAEsB;QAGnD,IAAA0D,QAAI;UACF,IAAAxG,UAAI,CAAAwG,QAAA;YACF,IAAAvG,gBACG,CAASuG,QAAQ,CAAAlB,MAAI;cAO1B,IAAAuB,QAAS,GAAK,GAAAL,QAAA,CAAA1B,OAAA,CAAAjE,GAAA;cACZ,OAAA2F,QAAQ,CAAA1B,OAAA,CAAAgC,OAAA,WAAAlG,KAAA,EAAAmG,GAAA;gBAAAhG,OACN,CAAAiG,MAAA,CAAAD,GAAA,EAAAnG,KAAA;cAE6D,IAC7DG,OAAA,CAAAL,QAAA,CAAAmG,QAAA,EAAAL,QAAA,CAAAlB,MAAA;YAAA;YACF,IACFpF,YAAA,CAAAW,GAAA,CAAAyC,OAAA,GAGF;cACF,QAAAkD,QAAA,CAAA1B,OAAA,CAAAmC,GAAA,sBAAAT,QAAA,CAAA1B,OAAA,CAAAmC,GAAA,qBAAAT,QAAA,CAAA1B,OAAA,CAAAE,GAAA,+BAAAwB,QAAA;YAEA,SAAY3E,GAAA;cACd+B,OAAA,CAAAsD,IAAA,8CAAAnG,OAAA,CAAAO,GAAA,CAAA6D,IAAA,wBAAAqB,QAAA,CAAA1B,OAAA,CAAAjE,GAAA,+BAAAgB,GAAA;YACF;YACE,OAAQ2E,QAAM;UAChB;UAEA,OAAO7E,IAAK;QACd;MACF,SAAAE,GAAA;QAEM+B,OAAA,CAAAQ,KAAA,mCAA6CvC,GAAA,CAAA4D,KAAQ;MAE3D;MACE,OAAQ9D,IAAA,CAAM;IAehB;EACE;EAOF,IAAAwF,gBAAiB,GAAInI,eAAA,CAAAQ,SAAA,CAAA4H,QAAA;IAAAC,0BAAA;IAAAC,kBAAA;IAAAC,eAAA;EAGrB,IAAI;IACF,KAAI,IAAEC,UAAS,GAAAL,gBAAS,CAAAM,SAEjB,CAAAhG,MAAA,CAAAC,QAAe,GAAI,EAAAgG,MAAA,IAAAL,0BAAA,IAAAK,MAAA,GAAAF,UAAA,CAAA7F,IAAA,IAAAC,IAAA,GAAAyF,0BAAA;MAEtB,IAAAxE,KAAE,GAAA6E,MAAO,CAAA9G,KAAA;MAMbnB,GAAI,CAAEoB,GAAA,CAAIgC,KAAK,CAAA8E,OAAA,EAAS3B,iBAAA,CAAAnD,KAAA,EAA0B,EAAApD,GAAG,CAAAmI,GAAA,CAAA/E,KAAA,CAAA8E,OAAA,EAAA3B,iBAAA,CAAAnD,KAAA,IAAApD,GAAA,CAAAoI,IAAA,CAAAhF,KAAA,CAAA8E,OAAA,EAAA3B,iBAAA,CAAAnD,KAAA,IAAApD,GAAA,CAAAqI,MAAA,CAAAjF,KAAA,CAAA8E,OAAA,EAAA3B,iBAAA,CAAAnD,KAAA,IAAApD,GAAA,CAAAsI,KAAA,CAAAlF,KAAA,CAAA8E,OAAA,EAAA3B,iBAAA,CAAAnD,KAAA,IAAAA,KAAA,CAAA8E,OAAA,KAAA9E,KAAA,CAAAmF,YAAA,KAAAvI,GAAA,CAAAoB,GAAA,CAAAgC,KAAA,CAAAmF,YAAA,EAAAhC,iBAAA,CAAAnD,KAAA,IAAApD,GAAA,CAAAmI,GAAA,CAAA/E,KAAA,CAAAmF,YAAA,EAAAhC,iBAAA,CAAAnD,KAAA,IAAApD,GAAA,CAAAoI,IAAA,CAAAhF,KAAA,CAAAmF,YAAA,EAAAhC,iBAAA,CAAAnD,KAAA,IAAApD,GAAA,CAAAqI,MAAA,CAAAjF,KAAA,CAAAmF,YAAA,EAAAhC,iBAAA,CAAAnD,KAAA,IAAApD,GAAA,CAAAsI,KAAA,CAAAlF,KAAA,CAAAmF,YAAA,EAAAhC,iBAAA,CAAAnD,KAAA;IACnD;EAIA,SAAAhB,GAAA;IAMEyF,kBALU,KAAS,EAAAC,eAKR,GAAA1F,GAAA;EACT;IAIF;MAAoB,CAAAwF,0BACf,IAAAG,UAAA,CAAA1F,MAAA,YAAA0F,UAAA,CAAA1F,MAAA;IAAA,UACH;MAAsC,IACxCwF,kBAEqB,EAErB,MAAIC,eAAA;IAEF;EADyF;EAGzF,IAAAU,0BAAc;IAAAC,kBAAyB,GAAG,CAAE;IACrCC,eAAK;EAAA;IACd,KACF,IAAAC,UAAA,GAAAjB,gBAAA,CAAAkB,UAAA,CAAA5G,MAAA,CAAAC,QAAA,KAAA4G,MAAA,IAAAL,0BAAA,IAAAK,MAAA,GAAAF,UAAA,CAAAzG,IAAA,IAAAC,IAAA,GAAAqG,0BAAA;MACF,IAAAM,MAAA,GAAAD,MAAA,CAAA1H,KAAA;MAEAnB,GAAA,CAAAoB,GAAO,CAAA0H,MAAK,CAAAZ,OAAA,EAAA3B,iBAAA,CAAAuC,MAAA,IAAAA,MAAA,CAAAZ,OAAA,KAAAY,MAAA,CAAAP,YAAA,IAAAvI,GAAA,CAAAoB,GAAA,CAAA0H,MAAA,CAAAP,YAAA,EAAAhC,iBAAA,CAAAuC,MAAA;IACb;EACH,SAAA1G,GAAA","ignoreList":[]}
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import { join } from "node:path";
|
1
|
+
import { dirname, join } from "node:path";
|
2
2
|
import { debounce } from "perfect-debounce";
|
3
3
|
import { generateRouteTypes } from "../../typed-routes/generateRouteTypes";
|
4
4
|
import { getRouterRootFromOneOptions } from "../../utils/getRouterRootFromOneOptions";
|
@@ -8,7 +8,7 @@ function generateFileSystemRouteTypesPlugin(options) {
|
|
8
8
|
enforce: "post",
|
9
9
|
apply: "serve",
|
10
10
|
configureServer(server) {
|
11
|
-
const appDir = join(process.cwd(), getRouterRootFromOneOptions(options)), outFile = join(process.cwd(), "routes.d.ts"), routerRoot = getRouterRootFromOneOptions(options), fileWatcherChangeListener = debounce(async (type, path) => {
|
11
|
+
const appDir = join(process.cwd(), getRouterRootFromOneOptions(options)), outFile = dirname(appDir) !== process.cwd() ? (console.warn("Seems that the router root has been customized and is in a nested folder. For now we will generate the routes.d.ts file beside the app folder. This behavior might be changed in the future."), join(dirname(appDir), "routes.d.ts")) : join(process.cwd(), "routes.d.ts"), routerRoot = getRouterRootFromOneOptions(options), fileWatcherChangeListener = debounce(async (type, path) => {
|
12
12
|
(type === "add" || type === "delete") && path.startsWith(appDir) && generateRouteTypes(outFile, routerRoot);
|
13
13
|
}, 100);
|
14
14
|
return server.watcher.addListener("all", fileWatcherChangeListener), () => {
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../../src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx"],
|
4
|
-
"mappings": "AAAA,SAAS,YAAY;
|
4
|
+
"mappings": "AAAA,SAAS,SAAS,YAAY;AAC9B,SAAS,gBAAgB;AAGzB,SAAS,0BAA0B;AACnC,SAAS,mCAAmC;AAErC,SAAS,mCAAmC,SAAoC;AACrF,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,IACT,OAAO;AAAA,IAEP,gBAAgB,QAAQ;AACtB,YAAM,SAAS,KAAK,QAAQ,IAAI,GAAG,4BAA4B,OAAO,CAAC,GACjE,UACA,QAAQ,MAAM,MAAM,QAAQ,IAAI,KAClC,QAAQ,KAAK,8LAA8L,GACpM,KAAK,QAAQ,MAAM,GAAG,aAAa,KAGrC,KAAK,QAAQ,IAAI,GAAG,aAAa,GAGpC,aAAa,4BAA4B,OAAO,GAGhD,4BAA4B,SAAS,OAAO,MAAc,SAAiB;AAC/E,SAAI,SAAS,SAAS,SAAS,aACzB,KAAK,WAAW,MAAM,KAExB,mBAAmB,SAAS,UAAU;AAAA,MAG5C,GAAG,GAAG;AAEN,oBAAO,QAAQ,YAAY,OAAO,yBAAyB,GAEpD,MAAM;AAGX,2BAAmB,SAAS,UAAU;AAAA,MACxC;AAAA,IACF;AAAA,EACF;AACF;",
|
5
5
|
"names": []
|
6
6
|
}
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import { join } from "node:path";
|
1
|
+
import { dirname, join } from "node:path";
|
2
2
|
import { debounce } from "perfect-debounce";
|
3
3
|
import { generateRouteTypes } from "../../typed-routes/generateRouteTypes.mjs";
|
4
4
|
import { getRouterRootFromOneOptions } from "../../utils/getRouterRootFromOneOptions.mjs";
|
@@ -9,7 +9,7 @@ function generateFileSystemRouteTypesPlugin(options) {
|
|
9
9
|
apply: "serve",
|
10
10
|
configureServer(server) {
|
11
11
|
const appDir = join(process.cwd(), getRouterRootFromOneOptions(options)),
|
12
|
-
outFile = join(process.cwd(), "routes.d.ts"),
|
12
|
+
outFile = dirname(appDir) !== process.cwd() ? (console.warn("Seems that the router root has been customized and is in a nested folder. For now we will generate the routes.d.ts file beside the app folder. This behavior might be changed in the future."), join(dirname(appDir), "routes.d.ts")) : join(process.cwd(), "routes.d.ts"),
|
13
13
|
routerRoot = getRouterRootFromOneOptions(options),
|
14
14
|
fileWatcherChangeListener = debounce(async (type, path) => {
|
15
15
|
(type === "add" || type === "delete") && path.startsWith(appDir) && generateRouteTypes(outFile, routerRoot);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["join","debounce","generateRouteTypes","getRouterRootFromOneOptions","generateFileSystemRouteTypesPlugin","options","name","enforce","apply","configureServer","server","appDir","process","cwd","outFile","routerRoot","fileWatcherChangeListener","type","path","startsWith","watcher","addListener"],"sources":["../../../../src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,IAAA,QAAY;
|
1
|
+
{"version":3,"names":["dirname","join","debounce","generateRouteTypes","getRouterRootFromOneOptions","generateFileSystemRouteTypesPlugin","options","name","enforce","apply","configureServer","server","appDir","process","cwd","outFile","console","warn","routerRoot","fileWatcherChangeListener","type","path","startsWith","watcher","addListener"],"sources":["../../../../src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,OAAA,EAASC,IAAA,QAAY;AAC9B,SAASC,QAAA,QAAgB;AAGzB,SAASC,kBAAA,QAA0B;AACnC,SAASC,2BAAA,QAAmC;AAErC,SAASC,mCAAmCC,OAAA,EAAoC;EACrF,OAAO;IACLC,IAAA,EAAM;IACNC,OAAA,EAAS;IACTC,KAAA,EAAO;IAEPC,gBAAgBC,MAAA,EAAQ;MACtB,MAAMC,MAAA,GAASX,IAAA,CAAKY,OAAA,CAAQC,GAAA,CAAI,GAAGV,2BAAA,CAA4BE,OAAO,CAAC;QACjES,OAAA,GACAf,OAAA,CAAQY,MAAM,MAAMC,OAAA,CAAQC,GAAA,CAAI,KAClCE,OAAA,CAAQC,IAAA,CAAK,8LAA8L,GACpMhB,IAAA,CAAKD,OAAA,CAAQY,MAAM,GAAG,aAAa,KAGrCX,IAAA,CAAKY,OAAA,CAAQC,GAAA,CAAI,GAAG,aAAa;QAGpCI,UAAA,GAAad,2BAAA,CAA4BE,OAAO;QAGhDa,yBAAA,GAA4BjB,QAAA,CAAS,OAAOkB,IAAA,EAAcC,IAAA,KAAiB;UAC/E,CAAID,IAAA,KAAS,SAASA,IAAA,KAAS,aACzBC,IAAA,CAAKC,UAAA,CAAWV,MAAM,KAExBT,kBAAA,CAAmBY,OAAA,EAASG,UAAU;QAG5C,GAAG,GAAG;MAEN,OAAAP,MAAA,CAAOY,OAAA,CAAQC,WAAA,CAAY,OAAOL,yBAAyB,GAEpD,MAAM;QAGXhB,kBAAA,CAAmBY,OAAA,EAASG,UAAU;MACxC;IACF;EACF;AACF","ignoreList":[]}
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import { join } from "node:path";
|
1
|
+
import { dirname, join } from "node:path";
|
2
2
|
import { debounce } from "perfect-debounce";
|
3
3
|
import { generateRouteTypes } from "../../typed-routes/generateRouteTypes.native.js";
|
4
4
|
import { getRouterRootFromOneOptions } from "../../utils/getRouterRootFromOneOptions.native.js";
|
@@ -9,7 +9,9 @@ function generateFileSystemRouteTypesPlugin(options) {
|
|
9
9
|
apply: "serve",
|
10
10
|
configureServer(server) {
|
11
11
|
var appDir = join(process.cwd(), getRouterRootFromOneOptions(options)),
|
12
|
-
outFile =
|
12
|
+
outFile = function () {
|
13
|
+
return dirname(appDir) !== process.cwd() ? (console.warn("Seems that the router root has been customized and is in a nested folder. For now we will generate the routes.d.ts file beside the app folder. This behavior might be changed in the future."), join(dirname(appDir), "routes.d.ts")) : join(process.cwd(), "routes.d.ts");
|
14
|
+
}(),
|
13
15
|
routerRoot = getRouterRootFromOneOptions(options),
|
14
16
|
fileWatcherChangeListener = debounce(async function (type, path) {
|
15
17
|
(type === "add" || type === "delete") && path.startsWith(appDir) && generateRouteTypes(outFile, routerRoot);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["join","debounce","generateRouteTypes","getRouterRootFromOneOptions","generateFileSystemRouteTypesPlugin","options","name","enforce","apply","configureServer","server","appDir","process","cwd","outFile","routerRoot","fileWatcherChangeListener","type","path","startsWith","watcher","addListener"],"sources":["../../../../src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,IAAA,QAAY;
|
1
|
+
{"version":3,"names":["dirname","join","debounce","generateRouteTypes","getRouterRootFromOneOptions","generateFileSystemRouteTypesPlugin","options","name","enforce","apply","configureServer","server","appDir","process","cwd","outFile","console","warn","routerRoot","fileWatcherChangeListener","type","path","startsWith","watcher","addListener"],"sources":["../../../../src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,OAAA,EAASC,IAAA,QAAY;AAC9B,SAASC,QAAA,QAAgB;AAGzB,SAASC,kBAAA,QAA0B;AACnC,SAASC,2BAAA,QAAmC;AAErC,SAASC,mCAAmCC,OAAA,EAAoC;EACrF,OAAO;IACLC,IAAA,EAAM;IACNC,OAAA,EAAS;IACTC,KAAA,EAAO;IAEPC,gBAAgBC,MAAA,EAAQ;MACtB,IAAAC,MAAM,GAAAX,IAAS,CAAAY,OAAK,CAAAC,GAAQ,IAAIV,2BAAG,CAAAE,OAA4B,EAAO;QAACS,OACjE,eACQ;UAYZ,OAAIf,OAAS,CAAAY,MAAS,MAAAC,OAAS,CAAAC,GAAA,MACzBE,OAAK,CAAAC,IAAA,CAAW,8LAEoB,GAAAhB,IAAA,CAAAD,OAAA,CAAAY,MAAA,qBAAAX,IAAA,CAAAY,OAAA,CAAAC,GAAA;QAG5C,GAAG;QAAAI,UAAG,GAAAd,2BAAA,CAAAE,OAAA;QAAAa,yBAAA,GAAAjB,QAAA,iBAAAkB,IAAA,EAAAC,IAAA;UAEN,CAAAD,IAAA,UAAO,IAAAA,IAAQ,aAAY,KAAOC,IAAA,CAAAC,UAAA,CAAAV,MAAA,CAAyB,IAEpDT,kBAAM,CAAAY,OAAA,EAAAG,UAAA;QAGX;MACF,OAAAP,MAAA,CAAAY,OAAA,CAAAC,WAAA,QAAAL,yBAAA;QACFhB,kBAAA,CAAAY,OAAA,EAAAG,UAAA;MACF;IACF","ignoreList":[]}
|