one 1.1.435 → 1.1.437
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/Root.cjs +19 -19
- package/dist/cjs/Root.js +3 -3
- package/dist/cjs/Root.js.map +1 -1
- package/dist/cjs/Root.native.js +39 -39
- package/dist/cjs/Root.native.js.map +2 -2
- package/dist/cjs/fork/getPathFromState.js.map +1 -1
- package/dist/cjs/fork/getPathFromState.native.js.map +1 -1
- package/dist/cjs/router/useScreens.cjs +51 -52
- package/dist/cjs/router/useScreens.js +9 -10
- package/dist/cjs/router/useScreens.js.map +2 -2
- package/dist/cjs/router/useScreens.native.js +10 -13
- package/dist/cjs/router/useScreens.native.js.map +2 -2
- package/dist/cjs/views/RootErrorBoundary.cjs +1 -1
- package/dist/cjs/views/RootErrorBoundary.js +1 -1
- package/dist/cjs/views/RootErrorBoundary.js.map +1 -1
- package/dist/cjs/views/RootErrorBoundary.native.js +1 -1
- package/dist/cjs/views/RootErrorBoundary.native.js.map +1 -1
- package/dist/esm/Root.js +3 -3
- package/dist/esm/Root.js.map +1 -1
- package/dist/esm/Root.mjs +19 -19
- package/dist/esm/Root.mjs.map +1 -1
- package/dist/esm/Root.native.js +39 -39
- package/dist/esm/Root.native.js.map +1 -1
- package/dist/esm/fork/getPathFromState.js.map +1 -1
- package/dist/esm/fork/getPathFromState.mjs.map +1 -1
- package/dist/esm/fork/getPathFromState.native.js.map +1 -1
- package/dist/esm/router/useScreens.js +9 -11
- package/dist/esm/router/useScreens.js.map +2 -2
- package/dist/esm/router/useScreens.mjs +52 -53
- package/dist/esm/router/useScreens.mjs.map +1 -1
- package/dist/esm/router/useScreens.native.js +10 -14
- package/dist/esm/router/useScreens.native.js.map +2 -2
- package/dist/esm/views/RootErrorBoundary.js +1 -1
- package/dist/esm/views/RootErrorBoundary.js.map +1 -1
- package/dist/esm/views/RootErrorBoundary.mjs +1 -1
- package/dist/esm/views/RootErrorBoundary.mjs.map +1 -1
- package/dist/esm/views/RootErrorBoundary.native.js +1 -1
- package/dist/esm/views/RootErrorBoundary.native.js.map +1 -1
- package/package.json +9 -9
- package/src/Root.tsx +33 -33
- package/src/fork/getPathFromState.ts +1 -0
- package/src/router/useScreens.tsx +52 -63
- package/src/views/RootErrorBoundary.tsx +1 -1
- package/types/fork/getPathFromState.d.ts.map +1 -1
- package/types/router/useScreens.d.ts.map +1 -1
- package/types/views/RootErrorBoundary.d.ts.map +1 -1
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["createNavigatorFactory","SafeAreaProviderCompat","React","
|
1
|
+
{"version":3,"names":["createNavigatorFactory","SafeAreaProviderCompat","React","memo","ServerContextScript","getPageExport","EmptyRoute","Try","DevHead","useServerContext","filterRootHTML","Route","useRouteNode","sortRoutesWithInitial","Fragment","jsx","jsxs","createElement","Screen","Group","getSortedChildren","children","order","initialRouteName","options","length","sort","map","route","props","entries","ordered","name","redirect","initialParams","listeners","options2","getId","console","warn","matchIndex","findIndex","child","match","splice","Error","filter","Boolean","onlyMatching","push","useSortedScreens","node","useMemo","value","routeToScreen","fromImport","ErrorBoundary","component","default","forwardRef","ref","catch","process","env","NODE_ENV","exported","Object","keys","qualifiedStore","WeakMap","getQualifiedRouteComponent","has","get","ScreenComponent","res","loadRoute","Component","DEBUG","groupCollapsed","key","segment","info","groupEnd","out","bodyProps","head","htmlProps","headChildren","headProps","serverContext","finalChildren","dangerouslySetInnerHTML","__html","css","file","rel","href","suppressHydrationWarning","lang","wrapSuspense","QualifiedRoute","navigation","displayName","set","createGetIdForRoute","include","Map","dynamic","params","segments","values","Array","isArray","join","deep","contextKey","args","staticOptions","generated","getNavOptions","staticResult","dynamicResult","output","tabBarButton","drawerItemStyle","height","display","getComponent"],"sources":["../../../src/router/useScreens.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
@@ -2,11 +2,10 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
|
|
2
2
|
import { createElement as _createElement } from "react";
|
3
3
|
import { createNavigatorFactory } from "@react-navigation/core";
|
4
4
|
import { SafeAreaProviderCompat } from "@react-navigation/elements";
|
5
|
-
import React, {
|
5
|
+
import React, { memo, Suspense } from "react";
|
6
6
|
import { ServerContextScript } from "../server/ServerContextScript";
|
7
7
|
import { getPageExport } from "../utils/getPageExport";
|
8
8
|
import { EmptyRoute } from "../views/EmptyRoute";
|
9
|
-
import { RootErrorBoundary } from "../views/RootErrorBoundary";
|
10
9
|
import { Try } from "../views/Try";
|
11
10
|
import { DevHead } from "../vite/DevHead";
|
12
11
|
import { useServerContext } from "../vite/one-server-only";
|
@@ -102,20 +101,17 @@ var qualifiedStore = /* @__PURE__ */ new WeakMap();
|
|
102
101
|
function getQualifiedRouteComponent(value) {
|
103
102
|
if (value && qualifiedStore.has(value))
|
104
103
|
return qualifiedStore.get(value);
|
105
|
-
var ScreenComponent,
|
106
|
-
|
107
|
-
|
108
|
-
var
|
109
|
-
return
|
110
|
-
|
111
|
-
|
112
|
-
}) : BaseComponent;
|
113
|
-
}()), process.env.NODE_ENV === "development" && process.env.DEBUG === "one" && (console.groupCollapsed(`Render ${props.key} ${props.segment}`), console.info("value", value), console.info("Component", Component), console.groupEnd()), /* @__PURE__ */ _jsx(Component, {
|
104
|
+
var ScreenComponent = /* @__PURE__ */ React.forwardRef(function(props, ref) {
|
105
|
+
var res = value.loadRoute(), Component = getPageExport(fromImport(res));
|
106
|
+
if (process.env.NODE_ENV === "development" && process.env.DEBUG === "one" && (console.groupCollapsed(`Render ${props.key} ${props.segment}`), console.info("value", value), console.info("Component", Component), console.groupEnd()), props.segment === "") {
|
107
|
+
var _serverContext_css, out = Component(props, ref), { children, bodyProps, head, htmlProps } = filterRootHTML(out), { children: headChildren, ...headProps } = head?.props || {}, serverContext = useServerContext(), finalChildren = children;
|
108
|
+
return finalChildren;
|
109
|
+
}
|
110
|
+
return /* @__PURE__ */ _jsx(Component, {
|
114
111
|
...props,
|
115
112
|
ref
|
116
113
|
});
|
117
|
-
})
|
118
|
-
var wrapSuspense = function(children) {
|
114
|
+
}), wrapSuspense = function(children) {
|
119
115
|
return /* @__PURE__ */ _jsx(Suspense, {
|
120
116
|
fallback: null,
|
121
117
|
children
|
@@ -132,7 +128,7 @@ function getQualifiedRouteComponent(value) {
|
|
132
128
|
return /* @__PURE__ */ _jsx(Route, {
|
133
129
|
route,
|
134
130
|
node: value,
|
135
|
-
children: /* @__PURE__ */ _jsx(
|
131
|
+
children: /* @__PURE__ */ _jsx(_Fragment, {
|
136
132
|
children: wrapSuspense(/* @__PURE__ */ _jsx(ScreenComponent, {
|
137
133
|
...props,
|
138
134
|
ref,
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../src/router/Users/n8/one/packages/one/src/router/useScreens.tsx"],
|
4
|
-
"mappings": ";;AAAA,SAASA,8BAA8B;AACvC,SAASC,8BAA8B;AAQvC,OAAOC,SAASC,
|
5
|
-
"names": ["createNavigatorFactory", "SafeAreaProviderCompat", "React", "
|
4
|
+
"mappings": ";;AAAA,SAASA,8BAA8B;AACvC,SAASC,8BAA8B;AAQvC,OAAOC,SAASC,MAAMC,gBAAgB;AACtC,SAASC,2BAA2B;AACpC,SAASC,qBAAqB;AAC9B,SAASC,kBAAkB;AAC3B,SAASC,WAAW;AACpB,SAASC,eAAe;AACxB,SAASC,wBAAwB;AACjC,SAASC,sBAAsB;AAC/B,SACEC,OACAC,oBAIK;AACP,SAASC,6BAA6B;AAI/B,IAAM,EAAEC,QAAQC,MAAK,IAAKhB,uBAAuB,CAAC,CAAA,EAAA;AA2BzD,SAASiB,kBACPC,UACAC,OACAC,kBACAC,SAAoC;AAEpC,MAAI,CAACF,OAAOG;AACV,WAAOJ,SACJK,KAAKT,sBAAsBM,gBAAAA,CAAAA,EAC3BI,IAAI,SAACC,OAAAA;aAAW;QAAEA;QAAOC,OAAO,CAAC;MAAE;;AAGxC,MAAMC,UAAU;OAAIT;KAEdU,UAAUT,MACbK,IAAI,SAAA,OAAA;QAAC,EAAEK,MAAMC,UAAUC,eAAeC,WAAWX,SAAAA,WAASY,MAAK,IAAE;AAChE,QAAI,CAACN,QAAQL;AACXY,qBAAQC,KAAK,uDAAuDN,IAAAA,kBAAsB,GACnF;AAET,QAAMO,aAAaT,QAAQU,UAAU,SAACC,OAAAA;aAAUA,MAAMb,UAAUI;;AAChE,QAAIO,eAAe;AACjBF,qBAAQC,KACN,sCAAsCN,IAAAA,gCACtCX,SAASM,IAAI,SAAAe,QAAA;YAAC,EAAEd,MAAK,IAAEc;eAAKd;WAEvB;AAGT,QAAMe,QAAQb,QAAQS,UAAAA;AAItB,QAHAT,QAAQc,OAAOL,YAAY,CAAA,GAGvBN,UAAU;AACZ,UAAI,OAAOA,YAAa;AACtB,cAAM,IAAIY,MAAM,uDAAuD;AAEzE,aAAO;IACT;AAEA,WAAO;MACLjB,OAAOe;MACPd,OAAO;QAAEK;QAAeC;QAAWX,SAAAA;QAASY;MAAM;IACpD;EACF,CAAA,EACCU,OAAOC,OAAAA;AAMV,SAAKvB,SAASwB,gBACZjB,QAAQkB,KAAI,GACPnB,QACAJ,KAAKT,sBAAsBM,gBAAAA,CAAAA,EAC3BI,IAAI,SAACC,OAAAA;WAAW;MAAEA;MAAOC,OAAO,CAAC;IAAE;OAInCE;AACT;AAKO,SAASmB,iBACd5B,OACAE,SAAoC;AAEpC,MAAM2B,OAAOnC,aAAAA,GAEPoC,gBAAgB/C,MAAMgD,QAAQ,WAAA;QACnBF,gBAATG,SAASH,UAAAA,SAAAA,iBAAAA,KAAM9B,cAAQ,QAAd8B,mBAAAA,WAAAA,eAAgB1B,SAC3BL,kBAAkB+B,KAAK9B,UAAUC,OAAO6B,KAAK5B,kBAAkBC,OAAAA,IAC/D,CAAA;AAEJ,WAAO8B,OAAO3B,IAAI,SAAC4B,OAAAA;aAAUC,cAAcD,MAAM3B,OAAO2B,MAAM1B,KAAK;;EACrE,GAAG;IAACsB,MAAM9B;IAAU8B,MAAM5B;IAAkBD;GAAM;AAElD,SAAO8B;AACT;AAEA,SAASK,WAAW,OAA4C;MAA5C,EAAEC,eAAe,GAAGC,UAAAA,IAApB;AAClB,MAAID;AACF,WAAO;MACLE,SAASvD,sBAAMwD,WAAW,SAAChC,OAAYiC,KAAAA;AACrC,YAAMzC,WAAWhB,sBAAM0D,cAActD,cAAckD,SAAAA,KAAcjD,YAAY;UAC3E,GAAGmB;UACHiC;QACF,CAAA;AACA,eAAO,qBAACnD,KAAAA;UAAIqD,OAAON;;;MACrB,CAAA;IACF;AAEF,MAAIO,QAAQC,IAAIC,aAAa,cAAc;AACzC,QAAMC,WAAW3D,cAAckD,SAAAA;AAC/B,QAAIS,YAAY,OAAOA,YAAa,YAAYC,OAAOC,KAAKF,QAAAA,EAAU3C,WAAW;AAC/E,aAAO;QAAEmC,SAASlD;MAAW;EAEjC;AAEA,SAAO;IAAEkD,SAASnD,cAAckD,SAAAA;EAAW;AAC7C;AAIA,IAAMY,iBAAiB,oBAAIC,QAAAA;AAGpB,SAASC,2BAA2BlB,OAAgB;AACzD,MAAIA,SAASgB,eAAeG,IAAInB,KAAAA;AAC9B,WAAOgB,eAAeI,IAAIpB,KAAAA;AAG5B,MAAMqB,kBAAkBvE,sBAAMwD,WAAW,SAAChC,OAAYiC,KAAAA;AACpD,QAAMe,MAAMtB,MAAMuB,UAAS,GACrBC,YAAYtE,cAAcgD,WAAWoB,GAAAA,CAAAA;AAS3C,QAPIZ,QAAQC,IAAIC,aAAa,iBAAiBF,QAAQC,IAAIc,UAAU,UAClE3C,QAAQ4C,eAAe,UAAUpD,MAAMqD,GAAG,IAAIrD,MAAMsD,OAAO,EAAE,GAC7D9C,QAAQ+C,KAAK,SAAS7B,KAAAA,GACtBlB,QAAQ+C,KAAK,aAAaL,SAAAA,GAC1B1C,QAAQgD,SAAQ,IAGdxD,MAAMsD,YAAY,IAAI;UAyBjBG,oBAvBDC,MAAMR,UAAUlD,OAAOiC,GAAAA,GAEvB,EAAEzC,UAAUmE,WAAWC,MAAMC,UAAS,IAAK5E,eAAeyE,GAAAA,GAC1D,EAAElE,UAAUsE,cAAc,GAAGC,UAAAA,IAAcH,MAAM5D,SAAS,CAAC,GAC3DyD,gBAAgBzE,iBAAAA,GAGlBgF,gBAAgBxE;AAIlB,aAAOwE;IA+BX;AAEA,WAAO,qBAACd,WAAAA;MAAW,GAAGlD;MAAOiC;;EAC/B,CAAA,GAEMgC,eAAe,SAACzE,UAAAA;AAOlB,WAAO,qBAACd,UAAAA;MAASwF,UAAU;;;EAG/B,GAEMC,iBAAiB3F,sBAAMwD,WAC3B,SAAA,OAUEC,KAAAA;QATA;;;MAGElC;MACAqE;;MAGA,GAAGpE;IAAAA,IACC;AAGN,WACE,qBAACd,OAAAA;MAAMa;MAAcuB,MAAMI;gBACzB,qBAAA,WAAA;kBACGuC,aACC,qBAAClB,iBAAAA;UAEG,GAAG/C;UACHiC;;;UAGAqB,SAAS5B,MAAM3B;;;;EAO7B,CAAA;AAGFoE,wBAAeE,cAAc,SAAS3C,MAAM3B,KAAK,KAEjD2C,eAAe4B,IAAI5C,OAAOyC,cAAAA,GACnB1F,qBAAK0F,cAAAA;AACd;AAGO,SAASI,oBACdxE,OAAuE;AAEvE,MAAMyE,UAAU,oBAAIC,IAAAA;AAEpB,MAAI1E,MAAM2E,SAAS;QACZ,4BAAA,IAAA,oBAAA,IAAA,iBAAA;;AAAL,eAAK,YAAiB3E,MAAM2E,QAAO,OAAA,QAAA,EAAA,GAA9B,OAAA,EAAA,6BAAA,QAAA,UAAA,KAAA,GAAA,OAAA,4BAAA,IAAgC;AAAhC,YAAMpB,UAAN,MAAA;AACHkB,gBAAQF,IAAIhB,QAAQnD,MAAMmD,OAAAA;MAC5B;;AAFK,0BAAA,IAAA,iBAAA;;;SAAA,6BAAA,UAAA,UAAA,QAAA,UAAA,OAAA;;YAAA;gBAAA;;;EAGP;AAEA,SAAO,WAAA;QAAC,EAAEqB,SAAS,CAAC,EAAC,IAAE,UAAA,SAAA,KAAA,UAAA,CAAA,MAAA,SAAA,UAAA,CAAA,IAAG,CAAC,GACnBC,WAAqB,CAAA,GAEtBC,6BAAA,IAAAC,qBAAA,IAAAC,kBAAA;;AAAL,eAAKC,aAAiBR,QAAQS,OAAM,EAAA,OAAA,QAAA,EAAA,GAA/BC,QAAA,EAAAL,8BAAAK,SAAAF,WAAA,KAAA,GAAA,OAAAH,6BAAA,IAAmC;AAAnC,YAAMH,UAANQ,OAAA,OACGxD,QAAQiD,SAASD,QAAQvE,IAAI;AACnC,QAAIgF,MAAMC,QAAQ1D,KAAAA,KAAUA,MAAM9B,SAAS,IAEzCgF,SAASxD,KAAKM,MAAM2D,KAAK,GAAA,CAAA,IAChB3D,SAAS,CAACyD,MAAMC,QAAQ1D,KAAAA,IAEjCkD,SAASxD,KAAKM,KAAAA,IACLgD,QAAQY,OACjBV,SAASxD,KAAK,OAAOsD,QAAQvE,IAAI,GAAG,IAEpCyE,SAASxD,KAAK,IAAIsD,QAAQvE,IAAI,GAAG;MAErC;;AAbK,MAAA2E,qBAAA,IAAAC,kBAAA;;;SAAAF,8BAAAG,WAAA,UAAA,QAAAA,WAAA,OAAA;;YAAAF;gBAAAC;;;QAeEH;AAAP,YAAOA,iBAAAA,SAASS,KAAK,GAAA,OAAA,QAAdT,mBAAAA,SAAAA,iBAAsB7E,MAAMwF;EACrC;AACF;AAEA,SAAS5D,cAAc5B,OAAgB;MAAE,EAAEJ,SAAS,GAAGK,MAAAA,IAAd,UAAA,SAAA,KAAA,UAAA,CAAA,MAAA,SAAA,UAAA,CAAA,IAA8C,CAAC;AACtF,SACE,+BAACX,QAAAA;;IAECkB,OAAOgE,oBAAoBxE,KAAAA;IAC1B,GAAGC;IACJG,MAAMJ,MAAMA;IACZsD,KAAKtD,MAAMA;IACXJ,SAAS,SAAC6F,MAAAA;UAEgCzF,kBAAlC0F,gBAAgB1F,MAAM2F,aAAY3F,mBAAAA,MAAMkD,UAAS,OAAA,QAAflD,qBAAAA,SAAAA,SAAAA,iBAAmB4F,gBAAgB,MACrEC,eACJ,OAAOH,iBAAkB,aAAaA,cAAcD,IAAAA,IAAQC,eACxDI,gBAAgB,OAAOlG,WAAY,aAAaA,UAAU6F,IAAAA,IAAQ7F,SAClEmG,SAAS;QACb,GAAGF;QACH,GAAGC;MACL;AAGA,aAAI9F,MAAM2F,cACRI,OAAOC,eAAe,WAAA;eAAM;SAE5BD,OAAOE,kBAAkB;QAAEC,QAAQ;QAAGC,SAAS;MAAO,IAGjDJ;IACT;;;;;;;;;;;;;;IAeAK,cAAc,WAAA;AAGZ,aAAOvD,2BAA2B7C,KAAAA;IACpC;;AAGN;",
|
5
|
+
"names": ["createNavigatorFactory", "SafeAreaProviderCompat", "React", "memo", "Suspense", "ServerContextScript", "getPageExport", "EmptyRoute", "Try", "DevHead", "useServerContext", "filterRootHTML", "Route", "useRouteNode", "sortRoutesWithInitial", "Screen", "Group", "getSortedChildren", "children", "order", "initialRouteName", "options", "length", "sort", "map", "route", "props", "entries", "ordered", "name", "redirect", "initialParams", "listeners", "getId", "console", "warn", "matchIndex", "findIndex", "child", "param", "match", "splice", "Error", "filter", "Boolean", "onlyMatching", "push", "useSortedScreens", "node", "sortedScreens", "useMemo", "sorted", "value", "routeToScreen", "fromImport", "ErrorBoundary", "component", "default", "forwardRef", "ref", "createElement", "catch", "process", "env", "NODE_ENV", "exported", "Object", "keys", "qualifiedStore", "WeakMap", "getQualifiedRouteComponent", "has", "get", "ScreenComponent", "res", "loadRoute", "Component", "DEBUG", "groupCollapsed", "key", "segment", "info", "groupEnd", "serverContext", "out", "bodyProps", "head", "htmlProps", "headChildren", "headProps", "finalChildren", "wrapSuspense", "fallback", "QualifiedRoute", "navigation", "displayName", "set", "createGetIdForRoute", "include", "Map", "dynamic", "params", "segments", "_iteratorNormalCompletion", "_didIteratorError", "_iteratorError", "_iterator", "values", "_step", "Array", "isArray", "join", "deep", "contextKey", "args", "staticOptions", "generated", "getNavOptions", "staticResult", "dynamicResult", "output", "tabBarButton", "drawerItemStyle", "height", "display", "getComponent"]
|
6
6
|
}
|
@@ -2,7 +2,7 @@ import React from "react";
|
|
2
2
|
class RootErrorBoundary extends React.Component {
|
3
3
|
state = { hasError: !1 };
|
4
4
|
static getDerivedStateFromError(error) {
|
5
|
-
return
|
5
|
+
return { hasError: !0 };
|
6
6
|
}
|
7
7
|
componentDidCatch(error, info) {
|
8
8
|
console.error(`RootErrorBoundary.error:
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../src/views/RootErrorBoundary.tsx"],
|
4
|
-
"mappings": "AAAA,OAAO,WAAW;
|
4
|
+
"mappings": "AAAA,OAAO,WAAW;AAGX,MAAM,0BAA0B,MAAM,UAA6B;AAAA,EACxE,QAAQ,EAAE,UAAU,GAAM;AAAA,EAE1B,OAAO,yBAAyB,OAAO;AAErC,WAAO,EAAE,UAAU,GAAK;AAAA,EAC1B;AAAA,EAEA,kBAAkB,OAAO,MAAM;AAM7B,YAAQ,MAAM;AAAA,EAA6B,WAAW,KAAK,CAAC;AAAA,EAAK,KAAK,cAAc,EAAE;AAAA,EACxF;AAAA,EAEA,SAAS;AACP,WAAI,KAAK,MAAM,WAEN,OAGF,KAAK,MAAM;AAAA,EACpB;AACF;AAEA,SAAS,WAAW,KAAK;AACvB,SAAO,GAAG,eAAe,QAAQ,GAAG,IAAI,OAAO;AAAA,EAAK,IAAI,KAAK,KAAK,GAAG;AACvE;",
|
5
5
|
"names": []
|
6
6
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["React","RootErrorBoundary","Component","state","hasError","getDerivedStateFromError","error","
|
1
|
+
{"version":3,"names":["React","RootErrorBoundary","Component","state","hasError","getDerivedStateFromError","error","componentDidCatch","info","console","printError","componentStack","render","props","children","err","Error","message","stack"],"sources":["../../../src/views/RootErrorBoundary.tsx"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,KAAA,MAAW;AAGX,MAAMC,iBAAA,SAA0BD,KAAA,CAAME,SAAA,CAA6B;EACxEC,KAAA,GAAQ;IAAEC,QAAA,EAAU;EAAM;EAE1B,OAAOC,yBAAyBC,KAAA,EAAO;IAErC,OAAO;MAAEF,QAAA,EAAU;IAAK;EAC1B;EAEAG,kBAAkBD,KAAA,EAAOE,IAAA,EAAM;IAM7BC,OAAA,CAAQH,KAAA,CAAM;AAAA,EAA6BI,UAAA,CAAWJ,KAAK,CAAC;AAAA,EAAKE,IAAA,CAAKG,cAAc,EAAE;EACxF;EAEAC,OAAA,EAAS;IACP,OAAI,KAAKT,KAAA,CAAMC,QAAA,GAEN,OAGF,KAAKS,KAAA,CAAMC,QAAA;EACpB;AACF;AAEA,SAASJ,WAAWK,GAAA,EAAK;EACvB,OAAO,GAAGA,GAAA,YAAeC,KAAA,GAAQ,GAAGD,GAAA,CAAIE,OAAO;AAAA,EAAKF,GAAA,CAAIG,KAAK,KAAKH,GAAG;AACvE","ignoreList":[]}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../src/views/Users/n8/one/packages/one/src/views/RootErrorBoundary.tsx"],
|
4
|
-
"mappings": "AAAA,OAAOA,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
4
|
+
"mappings": "AAAA,OAAOA,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGX,IAAMC,oBAAN,yBAAA,kBAAA;;YAAMA,oBAAAA,gBAAAA;WAAAA,qBAAAA;4BAAAA,kBAAAA;;mBAAN,YAAA,MAAMA,oBAAAA,SAAAA,GACXC,iBAAAA,OAAAA,SAAQ;MAAEC,UAAU;IAAM,CAAA;;uBADfF,oBAAAA;;MAQXG,KAAAA;aAAAA,SAAkBC,OAAOC,MAAI;AAM3BC,gBAAQF,MAAM;EAA6BG,WAAWH,KAAAA,CAAAA;EAAWC,KAAKG,cAAc,EAAE;MACxF;;;MAEAC,KAAAA;aAAAA,WAAAA;AACE,eAAI,KAAKR,MAAMC,WAEN,OAGF,KAAKQ,MAAMC;MACpB;;;;MArBOC,KAAAA;aAAP,SAAgCR,OAAK;AAEnC,eAAO;UAAEF,UAAU;QAAK;MAC1B;;MANWF;EAA0BD,MAAMc,SAAS;AA2BtD,SAASN,WAAWO,KAAG;AACrB,SAAO,GAAGA,eAAeC,QAAQ,GAAGD,IAAIE,OAAO;EAAKF,IAAIG,KAAK,KAAKH,GAAAA;AACpE;",
|
5
5
|
"names": ["React", "RootErrorBoundary", "state", "hasError", "componentDidCatch", "error", "info", "console", "printError", "componentStack", "render", "props", "children", "getDerivedStateFromError", "Component", "err", "Error", "message", "stack"]
|
6
6
|
}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "one",
|
3
|
-
"version": "1.1.
|
3
|
+
"version": "1.1.437",
|
4
4
|
"license": "BSD-3-Clause",
|
5
5
|
"sideEffects": [
|
6
6
|
"setup.mjs",
|
@@ -94,15 +94,15 @@
|
|
94
94
|
"@react-navigation/routers": "~7",
|
95
95
|
"@swc/core": "^1.10.4",
|
96
96
|
"@ungap/structured-clone": "^1.2.0",
|
97
|
-
"@vxrn/compiler": "1.1.
|
98
|
-
"@vxrn/resolve": "1.1.
|
99
|
-
"@vxrn/tslib-lite": "1.1.
|
100
|
-
"@vxrn/universal-color-scheme": "1.1.
|
101
|
-
"@vxrn/use-isomorphic-layout-effect": "1.1.
|
97
|
+
"@vxrn/compiler": "1.1.437",
|
98
|
+
"@vxrn/resolve": "1.1.437",
|
99
|
+
"@vxrn/tslib-lite": "1.1.437",
|
100
|
+
"@vxrn/universal-color-scheme": "1.1.437",
|
101
|
+
"@vxrn/use-isomorphic-layout-effect": "1.1.437",
|
102
102
|
"babel-dead-code-elimination": "^1.0.6",
|
103
103
|
"citty": "^0.1.6",
|
104
104
|
"core-js": "^3.38.1",
|
105
|
-
"create-vxrn": "1.1.
|
105
|
+
"create-vxrn": "1.1.437",
|
106
106
|
"escape-string-regexp": "^5.0.0",
|
107
107
|
"expo-linking": "~6.3.1",
|
108
108
|
"expo-modules-core": "2.1.2",
|
@@ -129,12 +129,12 @@
|
|
129
129
|
"vite": "^6.1.0",
|
130
130
|
"vite-plugin-barrel": "^0.4.1",
|
131
131
|
"vite-tsconfig-paths": "^5.0.1",
|
132
|
-
"vxrn": "1.1.
|
132
|
+
"vxrn": "1.1.437",
|
133
133
|
"ws": "^8.18.0",
|
134
134
|
"xxhashjs": "^0.2.2"
|
135
135
|
},
|
136
136
|
"devDependencies": {
|
137
|
-
"@tamagui/build": "^1.
|
137
|
+
"@tamagui/build": "^1.124.1",
|
138
138
|
"@types/node": "^22.1.0",
|
139
139
|
"@types/react-dom": "^18.2.25",
|
140
140
|
"@types/xxhashjs": "^0.2.4",
|
package/src/Root.tsx
CHANGED
@@ -90,40 +90,40 @@ export function Root(props: RootProps) {
|
|
90
90
|
<StrictMode>
|
91
91
|
<ServerAsyncLocalIDContext.Provider value={value}>
|
92
92
|
<ServerRenderID.Provider value={id}>
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
>
|
106
|
-
<
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
93
|
+
{/* for some reason warning if no key here */}
|
94
|
+
<UpstreamNavigationContainer
|
95
|
+
ref={store.navigationRef}
|
96
|
+
initialState={store.initialState}
|
97
|
+
linking={store.linking}
|
98
|
+
onUnhandledAction={onUnhandledAction}
|
99
|
+
theme={colorScheme === 'dark' ? DarkTheme : DefaultTheme}
|
100
|
+
documentTitle={{
|
101
|
+
enabled: false,
|
102
|
+
}}
|
103
|
+
{...navigationContainerProps}
|
104
|
+
>
|
105
|
+
<ServerLocationContext.Provider value={location}>
|
106
|
+
{/* <GestureHandlerRootView> */}
|
107
|
+
{/*
|
108
|
+
* Due to static rendering we need to wrap these top level views in second wrapper
|
109
|
+
* View's like <GestureHandlerRootView /> generate a <div> so if the parent wrapper
|
110
|
+
* is a HTML document, we need to ensure its inside the <body>
|
111
|
+
*/}
|
112
|
+
<>
|
113
|
+
{/* default scroll restoration to on, but users can configure it by importing and using themselves */}
|
114
|
+
<ScrollBehavior />
|
115
|
+
|
116
|
+
<RootErrorBoundary>
|
117
117
|
<Component />
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
</
|
124
|
-
</
|
125
|
-
|
126
|
-
|
118
|
+
</RootErrorBoundary>
|
119
|
+
|
120
|
+
{/* Users can override this by adding another StatusBar element anywhere higher in the component tree. */}
|
121
|
+
</>
|
122
|
+
{/* {!hasViewControllerBasedStatusBarAppearance && <StatusBar style="auto" />} */}
|
123
|
+
{/* </GestureHandlerRootView> */}
|
124
|
+
</ServerLocationContext.Provider>
|
125
|
+
</UpstreamNavigationContainer>
|
126
|
+
<PreloadLinks key="preload-links" />
|
127
127
|
</ServerRenderID.Provider>
|
128
128
|
</ServerAsyncLocalIDContext.Provider>
|
129
129
|
</StrictMode>
|
@@ -7,11 +7,10 @@ import type {
|
|
7
7
|
RouteProp,
|
8
8
|
ScreenListeners,
|
9
9
|
} from '@react-navigation/native'
|
10
|
-
import React, {
|
10
|
+
import React, { memo, Suspense } from 'react'
|
11
11
|
import { ServerContextScript } from '../server/ServerContextScript'
|
12
12
|
import { getPageExport } from '../utils/getPageExport'
|
13
13
|
import { EmptyRoute } from '../views/EmptyRoute'
|
14
|
-
import { RootErrorBoundary } from '../views/RootErrorBoundary'
|
15
14
|
import { Try } from '../views/Try'
|
16
15
|
import { DevHead } from '../vite/DevHead'
|
17
16
|
import { useServerContext } from '../vite/one-server-only'
|
@@ -168,65 +167,9 @@ export function getQualifiedRouteComponent(value: RouteNode) {
|
|
168
167
|
return qualifiedStore.get(value)!
|
169
168
|
}
|
170
169
|
|
171
|
-
|
172
|
-
|
173
|
-
|
174
|
-
|
175
|
-
ScreenComponent = React.forwardRef((props, ref) => {
|
176
|
-
Component ||= (() => {
|
177
|
-
const res = value.loadRoute()
|
178
|
-
const BaseComponent = getPageExport(fromImport(res)) as React.ComponentType<any>
|
179
|
-
|
180
|
-
// root layout do special html handling only
|
181
|
-
if (props.segment === '') {
|
182
|
-
return forwardRef((props, ref) => {
|
183
|
-
// @ts-expect-error
|
184
|
-
const out = BaseComponent(props, ref)
|
185
|
-
const { children, bodyProps, head, htmlProps } = filterRootHTML(out)
|
186
|
-
const { children: headChildren, ...headProps } = head?.props || {}
|
187
|
-
const serverContext = useServerContext()
|
188
|
-
|
189
|
-
// let finalChildren = <Suspense fallback={null}>{children}</Suspense>
|
190
|
-
let finalChildren = children
|
191
|
-
|
192
|
-
if (process.env.TAMAGUI_TARGET === 'native') {
|
193
|
-
// on native we just ignore all html/body/head
|
194
|
-
return finalChildren
|
195
|
-
}
|
196
|
-
|
197
|
-
finalChildren = (
|
198
|
-
<>
|
199
|
-
<head key="head" {...headProps}>
|
200
|
-
<DevHead />
|
201
|
-
<script
|
202
|
-
dangerouslySetInnerHTML={{
|
203
|
-
__html: `globalThis['global'] = globalThis`,
|
204
|
-
}}
|
205
|
-
/>
|
206
|
-
{serverContext?.css?.map((file) => {
|
207
|
-
return <link key={file} rel="stylesheet" href={file} />
|
208
|
-
})}
|
209
|
-
<ServerContextScript />
|
210
|
-
{headChildren}
|
211
|
-
</head>
|
212
|
-
<body key="body" suppressHydrationWarning {...bodyProps}>
|
213
|
-
<SafeAreaProviderCompat>{finalChildren}</SafeAreaProviderCompat>
|
214
|
-
</body>
|
215
|
-
</>
|
216
|
-
)
|
217
|
-
|
218
|
-
return (
|
219
|
-
// tamagui and libraries can add className on hydration to have ssr safe styling
|
220
|
-
// so supress hydration warnings here
|
221
|
-
<html suppressHydrationWarning lang="en-US" {...htmlProps}>
|
222
|
-
{finalChildren}
|
223
|
-
</html>
|
224
|
-
)
|
225
|
-
})
|
226
|
-
}
|
227
|
-
|
228
|
-
return BaseComponent
|
229
|
-
})()
|
170
|
+
const ScreenComponent = React.forwardRef((props: any, ref) => {
|
171
|
+
const res = value.loadRoute()
|
172
|
+
const Component = getPageExport(fromImport(res)) as React.ComponentType<any>
|
230
173
|
|
231
174
|
if (process.env.NODE_ENV === 'development' && process.env.DEBUG === 'one') {
|
232
175
|
console.groupCollapsed(`Render ${props.key} ${props.segment}`)
|
@@ -235,6 +178,52 @@ export function getQualifiedRouteComponent(value: RouteNode) {
|
|
235
178
|
console.groupEnd()
|
236
179
|
}
|
237
180
|
|
181
|
+
if (props.segment === '') {
|
182
|
+
// @ts-expect-error
|
183
|
+
const out = Component(props, ref)
|
184
|
+
|
185
|
+
const { children, bodyProps, head, htmlProps } = filterRootHTML(out)
|
186
|
+
const { children: headChildren, ...headProps } = head?.props || {}
|
187
|
+
const serverContext = useServerContext()
|
188
|
+
|
189
|
+
// let finalChildren = <Suspense fallback={null}>{children}</Suspense>
|
190
|
+
let finalChildren = children
|
191
|
+
|
192
|
+
if (process.env.TAMAGUI_TARGET === 'native') {
|
193
|
+
// on native we just ignore all html/body/head
|
194
|
+
return finalChildren
|
195
|
+
}
|
196
|
+
|
197
|
+
finalChildren = (
|
198
|
+
<>
|
199
|
+
<head key="head" {...headProps}>
|
200
|
+
<DevHead />
|
201
|
+
<script
|
202
|
+
dangerouslySetInnerHTML={{
|
203
|
+
__html: `globalThis['global'] = globalThis`,
|
204
|
+
}}
|
205
|
+
/>
|
206
|
+
{serverContext?.css?.map((file) => {
|
207
|
+
return <link key={file} rel="stylesheet" href={file} />
|
208
|
+
})}
|
209
|
+
<ServerContextScript />
|
210
|
+
{headChildren}
|
211
|
+
</head>
|
212
|
+
<body key="body" suppressHydrationWarning {...bodyProps}>
|
213
|
+
<SafeAreaProviderCompat>{finalChildren}</SafeAreaProviderCompat>
|
214
|
+
</body>
|
215
|
+
</>
|
216
|
+
)
|
217
|
+
|
218
|
+
return (
|
219
|
+
// tamagui and libraries can add className on hydration to have ssr safe styling
|
220
|
+
// so supress hydration warnings here
|
221
|
+
<html suppressHydrationWarning lang="en-US" {...htmlProps}>
|
222
|
+
{finalChildren}
|
223
|
+
</html>
|
224
|
+
)
|
225
|
+
}
|
226
|
+
|
238
227
|
return <Component {...props} ref={ref} />
|
239
228
|
})
|
240
229
|
|
@@ -265,7 +254,7 @@ export function getQualifiedRouteComponent(value: RouteNode) {
|
|
265
254
|
) => {
|
266
255
|
return (
|
267
256
|
<Route route={route} node={value}>
|
268
|
-
|
257
|
+
<>
|
269
258
|
{wrapSuspense(
|
270
259
|
<ScreenComponent
|
271
260
|
{...{
|
@@ -277,7 +266,7 @@ export function getQualifiedRouteComponent(value: RouteNode) {
|
|
277
266
|
}}
|
278
267
|
/>
|
279
268
|
)}
|
280
|
-
|
269
|
+
</>
|
281
270
|
</Route>
|
282
271
|
)
|
283
272
|
}
|
@@ -1,10 +1,10 @@
|
|
1
1
|
import React from 'react'
|
2
|
+
import { Text, View } from 'react-native'
|
2
3
|
|
3
4
|
export class RootErrorBoundary extends React.Component<{ children: any }> {
|
4
5
|
state = { hasError: false }
|
5
6
|
|
6
7
|
static getDerivedStateFromError(error) {
|
7
|
-
console.error('RootErrorBoundary.error', error)
|
8
8
|
// Update state so the next render will show the fallback UI.
|
9
9
|
return { hasError: true }
|
10
10
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getPathFromState.d.ts","sourceRoot":"","sources":["../../src/fork/getPathFromState.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,yBAAyB,CAAA;AAIhC,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAS,MAAM,2BAA2B,CAAA;AAGrF,OAAO,KAAK,EAAc,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAGvE,KAAK,OAAO,CAAC,SAAS,SAAS,EAAE,IAAI;IACnC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,OAAO,EAAE,aAAa,CAAC,SAAS,CAAC,CAAA;CAClC,GAAG,iBAAiB,CAAA;AAErB,MAAM,MAAM,KAAK,GAAG,eAAe,GAAG,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC,CAAA;AAwClF;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,SAAS,EAAE,EACnD,KAAK,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,GAC3B,MAAM,CAER;AAED,wBAAgB,oBAAoB,CAAC,SAAS,SAAS,EAAE,EACvD,KAAK,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC;;;
|
1
|
+
{"version":3,"file":"getPathFromState.d.ts","sourceRoot":"","sources":["../../src/fork/getPathFromState.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,yBAAyB,CAAA;AAIhC,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAS,MAAM,2BAA2B,CAAA;AAGrF,OAAO,KAAK,EAAc,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAGvE,KAAK,OAAO,CAAC,SAAS,SAAS,EAAE,IAAI;IACnC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,OAAO,EAAE,aAAa,CAAC,SAAS,CAAC,CAAA;CAClC,GAAG,iBAAiB,CAAA;AAErB,MAAM,MAAM,KAAK,GAAG,eAAe,GAAG,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC,CAAA;AAwClF;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,SAAS,EAAE,EACnD,KAAK,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,GAC3B,MAAM,CAER;AAED,wBAAgB,oBAAoB,CAAC,SAAS,SAAS,EAAE,EACvD,KAAK,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC;;;EAgQ7B;AAuDD,eAAe,gBAAgB,CAAA"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"useScreens.d.ts","sourceRoot":"","sources":["../../src/router/useScreens.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,YAAY,EACZ,eAAe,EACf,aAAa,EACb,SAAS,EACT,eAAe,EAChB,MAAM,0BAA0B,CAAA;AACjC,OAAO,
|
1
|
+
{"version":3,"file":"useScreens.d.ts","sourceRoot":"","sources":["../../src/router/useScreens.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,YAAY,EACZ,eAAe,EACf,aAAa,EACb,SAAS,EACT,eAAe,EAChB,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAyB,MAAM,OAAO,CAAA;AAQ7C,OAAO,EAKL,KAAK,SAAS,EACf,MAAM,SAAS,CAAA;AAKhB,eAAO,MAAQ,MAAM,OAAE,KAAK,KAAwC,CAAA;AAEpE,MAAM,MAAM,WAAW,CACrB,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1D,KAAK,SAAS,eAAe,GAAG,eAAe,EAC/C,QAAQ,SAAS,YAAY,GAAG,YAAY,IAC1C;IACF,4DAA4D;IAC5D,IAAI,CAAC,EAAE,MAAM,CAAA;IACb;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACnC,OAAO,CAAC,EAAE,QAAQ,CAAA;IAElB,SAAS,CAAC,EACN,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,GAChC,CAAC,CAAC,IAAI,EAAE;QACN,KAAK,EAAE,SAAS,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;QACvC,UAAU,EAAE,GAAG,CAAA;KAChB,KAAK,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAA;IAE3C,KAAK,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KAAE,KAAK,MAAM,GAAG,SAAS,CAAA;CAC7E,CAAA;AAgED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,WAAW,EAAE,EACpB,OAAO,CAAC,EAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAA;CAAE,GACnC,KAAK,CAAC,SAAS,EAAE,CAYnB;AA4BD,mFAAmF;AACnF,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,SAAS,0IAkH1D;AAED,oGAAoG;AACpG,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,GAAG,YAAY,GAAG,UAAU,CAAC;aAU5B,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;aAoB/D"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"RootErrorBoundary.d.ts","sourceRoot":"","sources":["../../src/views/RootErrorBoundary.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;
|
1
|
+
{"version":3,"file":"RootErrorBoundary.d.ts","sourceRoot":"","sources":["../../src/views/RootErrorBoundary.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,qBAAa,iBAAkB,SAAQ,KAAK,CAAC,SAAS,CAAC;IAAE,QAAQ,EAAE,GAAG,CAAA;CAAE,CAAC;IACvE,KAAK;;MAAsB;IAE3B,MAAM,CAAC,wBAAwB,CAAC,KAAK,KAAA;;;IAKrC,iBAAiB,CAAC,KAAK,KAAA,EAAE,IAAI,KAAA;IAS7B,MAAM;CAQP"}
|