one 1.17.4 → 1.17.6
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/metro-config/withOne.test.cjs +8 -0
- package/dist/cjs/metro-config/withOne.test.native.js +8 -0
- package/dist/cjs/metro-config/withOne.test.native.js.map +1 -1
- package/dist/cjs/router/router.cjs +8 -3
- package/dist/cjs/router/router.native.js +8 -3
- package/dist/cjs/router/router.native.js.map +1 -1
- package/dist/cjs/router/useScreens.cjs +1 -1
- package/dist/cjs/router/useScreens.native.js +3 -1
- package/dist/cjs/router/useScreens.native.js.map +1 -1
- package/dist/cjs/views/Navigator.cjs +1 -1
- package/dist/cjs/views/Navigator.native.js +1 -1
- package/dist/cjs/views/Navigator.native.js.map +1 -1
- package/dist/esm/metro-config/withOne.test.mjs +8 -0
- package/dist/esm/metro-config/withOne.test.mjs.map +1 -1
- package/dist/esm/metro-config/withOne.test.native.js +8 -0
- package/dist/esm/metro-config/withOne.test.native.js.map +1 -1
- package/dist/esm/router/router.mjs +8 -4
- package/dist/esm/router/router.mjs.map +1 -1
- package/dist/esm/router/router.native.js +8 -4
- package/dist/esm/router/router.native.js.map +1 -1
- package/dist/esm/router/useScreens.mjs +1 -1
- package/dist/esm/router/useScreens.mjs.map +1 -1
- package/dist/esm/router/useScreens.native.js +3 -1
- package/dist/esm/router/useScreens.native.js.map +1 -1
- package/dist/esm/views/Navigator.mjs +2 -2
- package/dist/esm/views/Navigator.mjs.map +1 -1
- package/dist/esm/views/Navigator.native.js +2 -2
- package/dist/esm/views/Navigator.native.js.map +1 -1
- package/package.json +9 -9
- package/src/metro-config/withOne.test.ts +14 -0
- package/src/router/router.ts +17 -5
- package/src/router/useScreens.tsx +3 -1
- package/src/views/Navigator.tsx +2 -4
- package/types/router/router.d.ts +1 -0
- package/types/router/router.d.ts.map +1 -1
- package/types/router/useScreens.d.ts.map +1 -1
- package/types/views/Navigator.d.ts.map +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["StackRouter","useNavigationBuilder","NavigationRouteContext","React","SafeAreaView","useFilterScreenChildren","findNearestNotFoundRoute","findRouteNodeByPath","useNotFoundState","useContextKey","getResolvedLinking","routeNode","globalRouteNode","initialPathname","lastIntendedPathname","registerProtectedRoutes","unregisterProtectedRoutes","useSortedScreens","getQualifiedRouteComponent","Screen","registerClearSlotStates","registerSetSlotState","Fragment","jsx","SLOT_STATIC_KEY","resolveInitialRouteFromLinking","contextKey","browserPath","linking","getStateFromPath","current","config","segments","split","filter","Boolean","i","length","routes","idx2","index","focused","name","state","nameSegments","expected","slice","join","idx","globalSlotState","Map","slotStateListeners","Set","getSlotState","slotName","get","setSlotState","delete","set","forEach","listener","clearAllSlotStates","clear","useSlotStateSubscription","forceUpdate","useReducer","x","useEffect","add","NavigatorContext","createContext","process","env","NODE_ENV","displayName","Navigator","initialRouteName","screenOptions","children","router","screens","otherSlot","protectedScreens","isCustomNavigator","sorted","console","warn","QualifiedNavigator","parentRoute","useContext","screenFromParent","params","screen","resolvedInitialRouteName","useMemo","hasScreen2","some","s","props","
|
|
1
|
+
{"version":3,"names":["StackRouter","useNavigationBuilder","NavigationRouteContext","React","SafeAreaView","useFilterScreenChildren","findNearestNotFoundRoute","findRouteNodeByPath","useNotFoundState","useContextKey","getResolvedLinking","routeNode","globalRouteNode","getSafeWindowPathname","initialPathname","lastIntendedPathname","registerProtectedRoutes","unregisterProtectedRoutes","useSortedScreens","getQualifiedRouteComponent","Screen","registerClearSlotStates","registerSetSlotState","Fragment","jsx","SLOT_STATIC_KEY","resolveInitialRouteFromLinking","contextKey","browserPath","linking","getStateFromPath","current","config","segments","split","filter","Boolean","i","length","routes","idx2","index","focused","name","state","nameSegments","expected","slice","join","idx","globalSlotState","Map","slotStateListeners","Set","getSlotState","slotName","get","setSlotState","delete","set","forEach","listener","clearAllSlotStates","clear","useSlotStateSubscription","forceUpdate","useReducer","x","useEffect","add","NavigatorContext","createContext","process","env","NODE_ENV","displayName","Navigator","initialRouteName","screenOptions","children","router","screens","otherSlot","protectedScreens","isCustomNavigator","sorted","console","warn","QualifiedNavigator","parentRoute","useContext","screenFromParent","params","screen","resolvedInitialRouteName","useMemo","hasScreen2","some","s","props","resolved","hasScreen","navigation","descriptors","NavigationContent","id","descriptorsRef","useRef","value","Provider","useNavigatorContext","context","Error","useSlot","notFoundState","notFoundRouteNode","notFoundPath","originalPath","NotFoundComponent","route","renderedElement","key","render","cloneElement","Slot","memo","Slot2","QualifiedSlot","DefaultNavigator","style","flex","getScopedSlotKey","layoutContextKey","useNamedSlot","scopedKey","slotState","activeRouteKey","isIntercepted","activeRouteNode","Component","NamedSlot","slotContent"],"sources":["../../../src/views/Navigator.tsx"],"sourcesContent":[null],"mappings":"AACA,SAEEA,WAAA,EACAC,oBAAA,QACK;AACP,SAASC,sBAAA,QAA8B;AACvC,YAAYC,KAAA,MAAW;AACvB,SAASC,YAAA,QAAoB;AAC7B,SAASC,uBAAA,QAA+B;AACxC,SACEC,wBAAA,EACAC,mBAAA,EACAC,gBAAA,QACK;AACP,SAASC,aAAA,QAAqB;AAC9B,SAASC,kBAAA,QAA0B;AACnC,SACEC,SAAA,IAAaC,eAAA,EACbC,qBAAA,EACAC,eAAA,EACAC,oBAAA,QACK;AACP,SAASC,uBAAA,EAAyBC,yBAAA,QAAiC;AACnE,SAASC,gBAAA,EAAkBC,0BAAA,QAAkC;AAC7D,SAASC,MAAA,QAAc;AAmDvB,SAASC,uBAAA,EAAyBC,oBAAA,QAA4B;AA4H1D,SA2SOC,QAAA,EA3SPC,GAAA;AA1KJ,MAAMC,eAAA,GAAkB;AAcxB,SAASC,+BACPC,UAAA,EACAC,WAAA,EACoB;EACpB,MAAMC,OAAA,GAAUnB,kBAAA,CAAmB;EACnC,IAAI,CAACmB,OAAA,EAASC,gBAAA,EAAkB,OAAO;EAEvC,IAAIC,OAAA,GAAUF,OAAA,CAAQC,gBAAA,CAAiBF,WAAA,EAAaC,OAAA,CAAQG,MAAM;EAClE,MAAMC,QAAA,GAAWN,UAAA,CAAWO,KAAA,CAAM,GAAG,EAAEC,MAAA,CAAOC,OAAO;EAErD,IAAIC,CAAA,GAAI;EACR,OAAOA,CAAA,GAAIJ,QAAA,CAASK,MAAA,EAAQ;IAC1B,IAAI,CAACP,OAAA,EAASQ,MAAA,EAAQD,MAAA,EAAQ,OAAO;IACrC,MAAME,IAAA,GAAMT,OAAA,CAAQU,KAAA,IAASV,OAAA,CAAQQ,MAAA,CAAOD,MAAA,GAAS;IACrD,MAAMI,OAAA,GAAUX,OAAA,CAAQQ,MAAA,CAAOC,IAAG;IAClC,IAAI,CAACE,OAAA,EAASC,IAAA,IAAQ,CAACD,OAAA,CAAQE,KAAA,EAAO,OAAO;IAC7C,MAAMC,YAAA,GAAeH,OAAA,CAAQC,IAAA,CAAKT,KAAA,CAAM,GAAG,EAAEC,MAAA,CAAOC,OAAO;IAC3D,MAAMU,QAAA,GAAWb,QAAA,CAASc,KAAA,CAAMV,CAAA,EAAGA,CAAA,GAAIQ,YAAA,CAAaP,MAAM,EAAEU,IAAA,CAAK,GAAG;IACpE,IAAIN,OAAA,CAAQC,IAAA,KAASG,QAAA,EAAU,OAAO;IACtCf,OAAA,GAAUW,OAAA,CAAQE,KAAA;IAClBP,CAAA,IAAKQ,YAAA,CAAaP,MAAA;EACpB;EAEA,IAAI,CAACP,OAAA,EAASQ,MAAA,EAAQD,MAAA,EAAQ,OAAO;EACrC,MAAMW,GAAA,GAAMlB,OAAA,CAAQU,KAAA,IAASV,OAAA,CAAQQ,MAAA,CAAOD,MAAA,GAAS;EACrD,OAAOP,OAAA,CAAQQ,MAAA,CAAOU,GAAG,GAAGN,IAAA;AAC9B;AAqBA,MAAMO,eAAA,GAAkB,mBAAIC,GAAA,CAAuB;AACnD,MAAMC,kBAAA,GAAqB,mBAAIC,GAAA,CAAgB;AAExC,SAASC,aAAaC,QAAA,EAAyC;EACpE,OAAOL,eAAA,CAAgBM,GAAA,CAAID,QAAQ;AACrC;AAEO,SAASE,aAAaF,QAAA,EAAkBX,KAAA,EAAyB;EACtE,IAAIA,KAAA,KAAU,MAAM;IAClBM,eAAA,CAAgBQ,MAAA,CAAOH,QAAQ;EACjC,OAAO;IACLL,eAAA,CAAgBS,GAAA,CAAIJ,QAAA,EAAUX,KAAK;EACrC;EAEAQ,kBAAA,CAAmBQ,OAAA,CAASC,QAAA,IAAaA,QAAA,CAAS,CAAC;AACrD;AAEO,SAASC,mBAAA,EAAqB;EACnCZ,eAAA,CAAgBa,KAAA,CAAM;EACtBX,kBAAA,CAAmBQ,OAAA,CAASC,QAAA,IAAaA,QAAA,CAAS,CAAC;AACrD;AAGAxC,uBAAA,CAAwByC,kBAAkB;AAC1CxC,oBAAA,CAAqBmC,YAAY;AAEjC,SAASO,yBAAA,EAA2B;EAClC,MAAM,GAAGC,WAAW,IAAI9D,KAAA,CAAM+D,UAAA,CAAYC,CAAA,IAAMA,CAAA,GAAI,GAAG,CAAC;EAExDhE,KAAA,CAAMiE,SAAA,CAAU,MAAM;IACpBhB,kBAAA,CAAmBiB,GAAA,CAAIJ,WAAW;IAClC,OAAO,MAAM;MACXb,kBAAA,CAAmBM,MAAA,CAAOO,WAAW;IACvC;EACF,GAAG,EAAE;AACP;AAGO,MAAMK,gBAAA,GAAmBnE,KAAA,CAAMoE,aAAA,CAM5B,IAAI;AAEd,IAAIC,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,cAAc;EACzCJ,gBAAA,CAAiBK,WAAA,GAAc;AACjC;AAwBO,SAASC,UAAU;EACxBC,gBAAA;EACAC,aAAA;EACAC,QAAA;EACAC;AACF,GAAmB;EACjB,MAAMrD,UAAA,GAAalB,aAAA,CAAc;EAGjC,MAAM;IACJwE,OAAA;IACAF,QAAA,EAAUG,SAAA;IACVC;EACF,IAAI9E,uBAAA,CAAwB0E,QAAA,EAAU;IACpCK,iBAAA,EAAmB;IACnBzD;EACF,CAAC;EAIDX,uBAAA,CAAwBW,UAAA,EAAYwD,gBAAgB;EAEpDhF,KAAA,CAAMiE,SAAA,CAAU,MAAM;IACpBpD,uBAAA,CAAwBW,UAAA,EAAYwD,gBAAgB;IACpD,OAAO,MAAM;MACXlE,yBAAA,CAA0BU,UAAU;IACtC;EACF,GAAG,CAACA,UAAA,EAAYwD,gBAAgB,CAAC;EAEjC,MAAME,MAAA,GAASnE,gBAAA,CAAiB+D,OAAA,IAAW,EAAC,EAAG;IAAEE;EAAiB,CAAC;EAEnE,IAAI,CAACE,MAAA,CAAO/C,MAAA,EAAQ;IAClBgD,OAAA,CAAQC,IAAA,CAAK,iBAAiB5D,UAAU,oBAAoB;IAC5D,OAAO;EACT;EAEA,OACE,eAAAH,GAAA,CAACgE,kBAAA;IACCX,gBAAA;IACAC,aAAA;IACAG,OAAA,EAASI,MAAA;IACT1D,UAAA;IACAqD,MAAA;IAECD,QAAA,EAAAG;EAAA,CACH;AAEJ;AAEA,SAASM,mBAAmB;EAC1BX,gBAAA;EACAC,aAAA;EACAC,QAAA;EACAE,OAAA;EACAtD,UAAA;EACAqD,MAAA,GAAShF;AACX,GAAwE;EAoCtE,MAAMyF,WAAA,GAActF,KAAA,CAAMuF,UAAA,CAAWxF,sBAAsB;EAC3D,MAAMyF,gBAAA,GACJF,WAAA,IACA,OAAOA,WAAA,CAAYG,MAAA,KAAW,YAC9BH,WAAA,CAAYG,MAAA,KAAW,QACvB,OAAQH,WAAA,CAAYG,MAAA,CAAeC,MAAA,KAAW,WACzCJ,WAAA,CAAYG,MAAA,CAAeC,MAAA,GAC5B;EAEN,MAAMC,wBAAA,GAA2B3F,KAAA,CAAM4F,OAAA,CAAQ,MAAM;IACnD,IAAIlB,gBAAA,EAAkB,OAAOA,gBAAA;IAE7B,IAAIc,gBAAA,EAAkB;MACpB,MAAMK,UAAA,GAAYf,OAAA,CAAQgB,IAAA,CAAMC,CAAA,IAAOA,CAAA,EAAWC,KAAA,EAAOxD,IAAA,KAASgD,gBAAgB;MAClF,IAAIK,UAAA,EAAW,OAAOL,gBAAA;IACxB;IAEA,MAAM/D,WAAA,GAAcb,oBAAA,IAAwBD,eAAA,IAAmBD,qBAAA,CAAsB;IACrF,IAAI,CAACe,WAAA,EAAa,OAAO;IAEzB,MAAMwE,QAAA,GAAW1E,8BAAA,CAA+BC,UAAA,EAAYC,WAAW;IACvE,IAAI,CAACwE,QAAA,EAAU,OAAO;IAMtB,MAAMC,SAAA,GAAYpB,OAAA,CAAQgB,IAAA,CAAMC,CAAA,IAAOA,CAAA,EAAWC,KAAA,EAAOxD,IAAA,KAASyD,QAAQ;IAC1E,OAAOC,SAAA,GAAYD,QAAA,GAAW;EAChC,GAAG,CAACvB,gBAAA,EAAkBI,OAAA,EAAStD,UAAA,EAAYgE,gBAAgB,CAAC;EAE5D,MAAM;IAAE/C,KAAA;IAAO0D,UAAA;IAAYC,WAAA;IAAaC;EAAkB,IAAIvG,oBAAA,CAC5D+E,MAAA,EACA;IAAA;IAEEyB,EAAA,EAAI9E,UAAA;IACJoD,QAAA,EAAUE,OAAA;IACVH,aAAA;IACAD,gBAAA,EAAkBiB;EACpB,CACF;EAMA,MAAMY,cAAA,GAAiBvG,KAAA,CAAMwG,MAAA,CAAOJ,WAAW;EAC/CG,cAAA,CAAe3E,OAAA,GAAUwE,WAAA;EAEzB,MAAMK,KAAA,GAAQzG,KAAA,CAAM4F,OAAA,CAAQ,MAAM;IAChC,OAAO;MACLpE,UAAA;MACAiB,KAAA;MACA0D,UAAA;MACAI,cAAA;MACA1B;IACF;EACF,GAAG,CAACrD,UAAA,EAAYiB,KAAA,EAAO0D,UAAA,EAAYtB,MAAM,CAAC;EAE1C,OACE,eAAAxD,GAAA,CAAC8C,gBAAA,CAAiBuC,QAAA,EAAjB;IAA0BD,KAAA;IACzB7B,QAAA,iBAAAvD,GAAA,CAACgF,iBAAA;MAAmBzB;IAAA,CAAS;EAAA,CAC/B;AAEJ;AAEO,SAAS+B,oBAAA,EAAsB;EACpC,MAAMC,OAAA,GAAU5G,KAAA,CAAMuF,UAAA,CAAWpB,gBAAgB;EACjD,IAAI,CAACyC,OAAA,EAAS;IACZ,MAAM,IAAIC,KAAA,CAAM,yDAAyD;EAC3E;EACA,OAAOD,OAAA;AACT;AAEO,SAASE,QAAA,EAAU;EACxB,MAAMF,OAAA,GAAUD,mBAAA,CAAoB;EACpC,MAAM;IAAElE,KAAA;IAAO8D;EAAe,IAAIK,OAAA;EAClC,MAAMG,aAAA,GAAgB1G,gBAAA,CAAiB;EAGvC,IAAI0G,aAAA,EAAe;IAKjB,MAAMC,iBAAA,GACJD,aAAA,CAAcC,iBAAA,IACd5G,mBAAA,CAAoB2G,aAAA,CAAcE,YAAA,EAAcxG,eAAe,KAC/DN,wBAAA,CAAyB4G,aAAA,CAAcG,YAAA,EAAczG,eAAe;IAEtE,IAAIuG,iBAAA,EAAmB;MACrB,MAAMG,iBAAA,GAAoBnG,0BAAA,CAA2BgG,iBAAiB;MACtE,OAAO,eAAA3F,GAAA,CAAC8F,iBAAA;QAA6CC,KAAA,EAAO;UAAE3B,MAAA,EAAQ,CAAC;QAAE;MAAA,GAA3C,sBAA8C;IAC9E;IAIA,OAAO;EACT;EAEA,IAAI,CAAChD,KAAA,CAAML,MAAA,EAAQ;IACjB,OAAO;EACT;EAEA,MAAMR,OAAA,GAAUa,KAAA,CAAML,MAAA,CAAOK,KAAA,CAAMH,KAAK;EAExC,IAAI,CAACV,OAAA,EAAS;IACZ,OAAO;EACT;EAEA,MAAMyF,eAAA,GAAkBd,cAAA,CAAe3E,OAAA,CAAQA,OAAA,CAAQ0F,GAAG,GAAGC,MAAA,CAAO,KAAK;EAKzE,IAAIF,eAAA,KAAoB,MAAM;IAC5B,OAAOrH,KAAA,CAAMwH,YAAA,CAAaH,eAAA,EAAiB;MACzCC,GAAA,EAAK,GAAGhG,eAAe,IAAIM,OAAA,CAAQY,IAAI;IACzC,CAAC;EACH;EAEA,OAAO6E,eAAA;AACT;AAGO,MAAMI,IAAA,GAAOzH,KAAA,CAAM0H,IAAA,CAAK,SAASC,MAAK3B,KAAA,EAAyC;EACpF,MAAMxE,UAAA,GAAalB,aAAA,CAAc;EACjC,MAAMsG,OAAA,GAAU5G,KAAA,CAAMuF,UAAA,CAAWpB,gBAAgB;EAGjD,IAAIyC,OAAA,EAASpF,UAAA,KAAeA,UAAA,EAAY;IAEtC,OACE,eAAAH,GAAA,CAACoD,SAAA;MAAW,GAAGuB,KAAA;MACbpB,QAAA,iBAAAvD,GAAA,CAACuG,aAAA,IAAc;IAAA,CACjB;EAEJ;EAEA,OAAO,eAAAvG,GAAA,CAACuG,aAAA,IAAc;AACxB,CAAC;AAEM,SAASA,cAAA,EAAgB;EAC9B,OAAOd,OAAA,CAAQ;AACjB;AAEO,SAASe,iBAAA,EAAmB;EACjC,OACE,eAAAxG,GAAA,CAACpB,YAAA;IAAa6H,KAAA,EAAO;MAAEC,IAAA,EAAM;IAAE;IAC7BnD,QAAA,iBAAAvD,GAAA,CAACoD,SAAA;MACCG,QAAA,iBAAAvD,GAAA,CAACuG,aAAA,IAAc;IAAA,CACjB;EAAA,CACF;AAEJ;AAEAnD,SAAA,CAAUgD,IAAA,GAAOA,IAAA;AACjBhD,SAAA,CAAUc,UAAA,GAAaoB,mBAAA;AAGvBlC,SAAA,CAAUxD,MAAA,GAASA,MAAA;AAUZ,SAAS+G,iBAAiB5E,QAAA,EAAkB6E,gBAAA,EAAmC;EACpF,IAAI,CAACA,gBAAA,EAAkB,OAAO7E,QAAA;EAC9B,OAAO,GAAG6E,gBAAgB,IAAI7E,QAAQ;AACxC;AASO,SAAS8E,aACd9E,QAAA,EACA6E,gBAAA,EACwB;EAExBpE,wBAAA,CAAyB;EAEzB,MAAMsE,SAAA,GAAYH,gBAAA,CAAiB5E,QAAA,EAAU6E,gBAAgB;EAC7D,MAAMG,SAAA,GAAYjF,YAAA,CAAagF,SAAS;EAExC,IAAI,CAACC,SAAA,EAAWC,cAAA,IAAkB,CAACD,SAAA,CAAUE,aAAA,EAAe;IAE1D,OAAO;EACT;EAGA,IAAIF,SAAA,CAAUG,eAAA,EAAiB;IAC7B,MAAMC,SAAA,GAAYxH,0BAAA,CAA2BoH,SAAA,CAAUG,eAAe;IAEtE,OACE,eAAAlH,GAAA,CAACmH,SAAA;MAECpB,KAAA,EAAO;QAAE3B,MAAA,EAAQ2C,SAAA,CAAU3C,MAAA,IAAU,CAAC;MAAE;IAAA,GADnC2C,SAAA,CAAUC,cAEjB;EAEJ;EAEA,OAAO;AACT;AAmBO,SAASI,UAAU;EACxBjG,IAAA;EACAyF,gBAAA;EACArD;AACF,GAOG;EACD,MAAM8D,WAAA,GAAcR,YAAA,CAAa1F,IAAA,EAAMyF,gBAAgB;EAEvD,IAAIS,WAAA,EAAa;IACf,OAAO,eAAArH,GAAA,CAAAD,QAAA;MAAGwD,QAAA,EAAA8D;IAAA,CAAY;EACxB;EAGA,OAAO,eAAArH,GAAA,CAAAD,QAAA;IAAGwD;EAAA,CAAS;AACrB","ignoreList":[]}
|
|
@@ -7,7 +7,7 @@ import { useFilterScreenChildren } from "../layouts/withLayoutContext.native.js"
|
|
|
7
7
|
import { findNearestNotFoundRoute, findRouteNodeByPath, useNotFoundState } from "../notFoundState.native.js";
|
|
8
8
|
import { useContextKey } from "../router/Route.native.js";
|
|
9
9
|
import { getResolvedLinking } from "../router/linkingConfig.native.js";
|
|
10
|
-
import { routeNode as globalRouteNode, initialPathname, lastIntendedPathname } from "../router/router.native.js";
|
|
10
|
+
import { routeNode as globalRouteNode, getSafeWindowPathname, initialPathname, lastIntendedPathname } from "../router/router.native.js";
|
|
11
11
|
import { registerProtectedRoutes, unregisterProtectedRoutes } from "../router/router.native.js";
|
|
12
12
|
import { useSortedScreens, getQualifiedRouteComponent } from "../router/useScreens.native.js";
|
|
13
13
|
import { Screen } from "./Screen.native.js";
|
|
@@ -141,7 +141,7 @@ function QualifiedNavigator(param) {
|
|
|
141
141
|
});
|
|
142
142
|
if (hasScreen) return screenFromParent;
|
|
143
143
|
}
|
|
144
|
-
var browserPath = (_ref = lastIntendedPathname !== null && lastIntendedPathname !== void 0 ? lastIntendedPathname : initialPathname) !== null && _ref !== void 0 ? _ref :
|
|
144
|
+
var browserPath = (_ref = lastIntendedPathname !== null && lastIntendedPathname !== void 0 ? lastIntendedPathname : initialPathname) !== null && _ref !== void 0 ? _ref : getSafeWindowPathname();
|
|
145
145
|
if (!browserPath) return void 0;
|
|
146
146
|
var resolved = resolveInitialRouteFromLinking(contextKey, browserPath);
|
|
147
147
|
if (!resolved) return void 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["jsx","_jsx","Fragment","_Fragment","StackRouter","useNavigationBuilder","NavigationRouteContext","React","SafeAreaView","useFilterScreenChildren","findNearestNotFoundRoute","findRouteNodeByPath","useNotFoundState","useContextKey","getResolvedLinking","routeNode","globalRouteNode","initialPathname","lastIntendedPathname","registerProtectedRoutes","unregisterProtectedRoutes","useSortedScreens","getQualifiedRouteComponent","Screen","registerClearSlotStates","registerSetSlotState","_type_of","obj","Symbol","constructor","SLOT_STATIC_KEY","resolveInitialRouteFromLinking","contextKey","browserPath","_current_index","_current_routes","_current_routes_idx","linking","getStateFromPath","current","config","segments","split","filter","Boolean","i","length","_current_index1","_current_routes1","routes","idx","index","focused","name","state","nameSegments","expected","slice","join","idx1","globalSlotState","Map","slotStateListeners","Set","getSlotState","slotName","get","setSlotState","delete","set","forEach","listener","clearAllSlotStates","clear","useSlotStateSubscription","forceUpdate","useReducer","x","useEffect","add","NavigatorContext","createContext","process","env","NODE_ENV","displayName","Navigator","param","initialRouteName","screenOptions","children","router","screens","otherSlot","protectedScreens","isCustomNavigator","sorted","console","warn","QualifiedNavigator","parentRoute","useContext","screenFromParent","params","screen","resolvedInitialRouteName","useMemo","_ref","hasScreen","some","s","_s_props","props","
|
|
1
|
+
{"version":3,"names":["jsx","_jsx","Fragment","_Fragment","StackRouter","useNavigationBuilder","NavigationRouteContext","React","SafeAreaView","useFilterScreenChildren","findNearestNotFoundRoute","findRouteNodeByPath","useNotFoundState","useContextKey","getResolvedLinking","routeNode","globalRouteNode","getSafeWindowPathname","initialPathname","lastIntendedPathname","registerProtectedRoutes","unregisterProtectedRoutes","useSortedScreens","getQualifiedRouteComponent","Screen","registerClearSlotStates","registerSetSlotState","_type_of","obj","Symbol","constructor","SLOT_STATIC_KEY","resolveInitialRouteFromLinking","contextKey","browserPath","_current_index","_current_routes","_current_routes_idx","linking","getStateFromPath","current","config","segments","split","filter","Boolean","i","length","_current_index1","_current_routes1","routes","idx","index","focused","name","state","nameSegments","expected","slice","join","idx1","globalSlotState","Map","slotStateListeners","Set","getSlotState","slotName","get","setSlotState","delete","set","forEach","listener","clearAllSlotStates","clear","useSlotStateSubscription","forceUpdate","useReducer","x","useEffect","add","NavigatorContext","createContext","process","env","NODE_ENV","displayName","Navigator","param","initialRouteName","screenOptions","children","router","screens","otherSlot","protectedScreens","isCustomNavigator","sorted","console","warn","QualifiedNavigator","parentRoute","useContext","screenFromParent","params","screen","resolvedInitialRouteName","useMemo","_ref","hasScreen","some","s","_s_props","props","resolved","hasScreen1","navigation","descriptors","NavigationContent","id","descriptorsRef","useRef","value","Provider","useNavigatorContext","context","Error","useSlot","_descriptorsRef_current_current_key","notFoundState","notFoundRouteNode","notFoundPath","originalPath","NotFoundComponent","route","renderedElement","key","render","cloneElement","Slot","memo","Slot2","QualifiedSlot","DefaultNavigator","style","flex","getScopedSlotKey","layoutContextKey","useNamedSlot","scopedKey","slotState","activeRouteKey","isIntercepted"],"sources":["../../../src/views/Navigator.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "one",
|
|
3
|
-
"version": "1.17.
|
|
3
|
+
"version": "1.17.6",
|
|
4
4
|
"license": "BSD-3-Clause",
|
|
5
5
|
"sideEffects": [
|
|
6
6
|
"setup.mjs",
|
|
@@ -180,18 +180,18 @@
|
|
|
180
180
|
"@cloudflare/vite-plugin": "^1.33.1",
|
|
181
181
|
"@swc/core": "^1.14.0",
|
|
182
182
|
"@ungap/structured-clone": "^1.2.0",
|
|
183
|
-
"@vxrn/color-scheme": "1.17.
|
|
184
|
-
"@vxrn/compiler": "1.17.
|
|
185
|
-
"@vxrn/resolve": "1.17.
|
|
186
|
-
"@vxrn/tslib-lite": "1.17.
|
|
187
|
-
"@vxrn/use-isomorphic-layout-effect": "1.17.
|
|
188
|
-
"@vxrn/vite-plugin-metro": "1.17.
|
|
183
|
+
"@vxrn/color-scheme": "1.17.6",
|
|
184
|
+
"@vxrn/compiler": "1.17.6",
|
|
185
|
+
"@vxrn/resolve": "1.17.6",
|
|
186
|
+
"@vxrn/tslib-lite": "1.17.6",
|
|
187
|
+
"@vxrn/use-isomorphic-layout-effect": "1.17.6",
|
|
188
|
+
"@vxrn/vite-plugin-metro": "1.17.6",
|
|
189
189
|
"babel-dead-code-elimination": "1.0.10",
|
|
190
190
|
"babel-plugin-module-resolver": "^5.0.2",
|
|
191
191
|
"babel-preset-expo": "*",
|
|
192
192
|
"citty": "^0.1.6",
|
|
193
193
|
"core-js": "^3.38.1",
|
|
194
|
-
"create-vxrn": "1.17.
|
|
194
|
+
"create-vxrn": "1.17.6",
|
|
195
195
|
"escape-string-regexp": "^5.0.0",
|
|
196
196
|
"expo-linking": "~55.0.7",
|
|
197
197
|
"expo-modules-core": "~55.0.16",
|
|
@@ -211,7 +211,7 @@
|
|
|
211
211
|
"tsconfig-paths": "^4",
|
|
212
212
|
"use-latest-callback": "^0.2.3",
|
|
213
213
|
"vite": "^8.0.13",
|
|
214
|
-
"vxrn": "1.17.
|
|
214
|
+
"vxrn": "1.17.6",
|
|
215
215
|
"ws": "^8.18.0",
|
|
216
216
|
"xxhashjs": "^0.2.2"
|
|
217
217
|
},
|
|
@@ -115,4 +115,18 @@ describe('withOne', () => {
|
|
|
115
115
|
expect(config.resolver.extraNodeModules['fixture-singleton']).toBe(fixtureRoot)
|
|
116
116
|
expect(config.watchFolders).toContain(path.join(fixtureRoot, 'shared'))
|
|
117
117
|
})
|
|
118
|
+
|
|
119
|
+
it('rewrites native default index bundle requests to the One entry', async () => {
|
|
120
|
+
const config = (await withOne(projectRoot, { loadViteConfig: false })) as any
|
|
121
|
+
const rewriteRequestUrl = config.server.rewriteRequestUrl
|
|
122
|
+
|
|
123
|
+
expect(
|
|
124
|
+
rewriteRequestUrl('/.expo/.virtual-metro-entry.bundle?platform=ios&dev=true')
|
|
125
|
+
).toContain('/packages/one/metro-entry.bundle?platform=ios&dev=true')
|
|
126
|
+
expect(
|
|
127
|
+
rewriteRequestUrl('/index.bundle?platform=ios&dev=true&hot=true&minify=false')
|
|
128
|
+
).toContain(
|
|
129
|
+
'/packages/one/metro-entry.bundle?platform=ios&dev=true&hot=true&minify=false'
|
|
130
|
+
)
|
|
131
|
+
})
|
|
118
132
|
})
|
package/src/router/router.ts
CHANGED
|
@@ -311,9 +311,7 @@ function setupLinkingAndRouteInfo(initialLocation?: URL, linking?: OneLinkingCon
|
|
|
311
311
|
initialState = setupLinking(routeNode, initialLocation, linking)
|
|
312
312
|
|
|
313
313
|
// capture the original pathname before React Navigation's linking can modify it
|
|
314
|
-
initialPathname =
|
|
315
|
-
initialLocation?.pathname ??
|
|
316
|
-
(typeof document !== 'undefined' ? window.location.pathname : undefined)
|
|
314
|
+
initialPathname = initialLocation?.pathname ?? getSafeWindowPathname()
|
|
317
315
|
|
|
318
316
|
if (initialState) {
|
|
319
317
|
rootState = initialState
|
|
@@ -598,9 +596,23 @@ function normalizePathname(pathname: string) {
|
|
|
598
596
|
return pathname.length > 1 && pathname.endsWith('/') ? pathname.slice(0, -1) : pathname
|
|
599
597
|
}
|
|
600
598
|
|
|
599
|
+
// RN runtimes (Expo/Hermes) can polyfill `document` while leaving
|
|
600
|
+
// `window.location` undefined, so `typeof document` is not a safe web check.
|
|
601
|
+
// the only reliable signal is an actual string pathname on window.location.
|
|
602
|
+
export function getSafeWindowPathname(): string | undefined {
|
|
603
|
+
if (
|
|
604
|
+
typeof window === 'undefined' ||
|
|
605
|
+
!window.location ||
|
|
606
|
+
typeof window.location.pathname !== 'string'
|
|
607
|
+
) {
|
|
608
|
+
return undefined
|
|
609
|
+
}
|
|
610
|
+
return window.location.pathname
|
|
611
|
+
}
|
|
612
|
+
|
|
601
613
|
function getBrowserPathname() {
|
|
602
|
-
|
|
603
|
-
return normalizePathname(
|
|
614
|
+
const pathname = getSafeWindowPathname()
|
|
615
|
+
return pathname === undefined ? undefined : normalizePathname(pathname)
|
|
604
616
|
}
|
|
605
617
|
|
|
606
618
|
function shouldKeepPendingNavigationState(currentState: OneRouter.ResultState) {
|
|
@@ -78,7 +78,9 @@ export const { Screen, Group } = createNavigatorFactory({} as any)()
|
|
|
78
78
|
// so hydration sees identical content without 100KB+ JSON payload.
|
|
79
79
|
// Also captures <link> stylesheet elements for mixed inline/link CSS mode.
|
|
80
80
|
const cachedInlineCSSElements: React.ReactNode[] =
|
|
81
|
-
|
|
81
|
+
// require a real DOM query API, not just a (possibly polyfilled on
|
|
82
|
+
// Expo/Hermes) `document` global — see getSafeWindowPathname in router.ts
|
|
83
|
+
typeof document !== 'undefined' && typeof document.querySelectorAll === 'function'
|
|
82
84
|
? (() => {
|
|
83
85
|
const elements: React.ReactNode[] = []
|
|
84
86
|
// collect all SSR CSS elements in order (both inline <style> and <link>)
|
package/src/views/Navigator.tsx
CHANGED
|
@@ -17,6 +17,7 @@ import { useContextKey } from '../router/Route'
|
|
|
17
17
|
import { getResolvedLinking } from '../router/linkingConfig'
|
|
18
18
|
import {
|
|
19
19
|
routeNode as globalRouteNode,
|
|
20
|
+
getSafeWindowPathname,
|
|
20
21
|
initialPathname,
|
|
21
22
|
lastIntendedPathname,
|
|
22
23
|
} from '../router/router'
|
|
@@ -269,10 +270,7 @@ function QualifiedNavigator({
|
|
|
269
270
|
if (hasScreen) return screenFromParent
|
|
270
271
|
}
|
|
271
272
|
|
|
272
|
-
const browserPath =
|
|
273
|
-
lastIntendedPathname ??
|
|
274
|
-
initialPathname ??
|
|
275
|
-
(typeof window !== 'undefined' ? window.location.pathname : undefined)
|
|
273
|
+
const browserPath = lastIntendedPathname ?? initialPathname ?? getSafeWindowPathname()
|
|
276
274
|
if (!browserPath) return undefined
|
|
277
275
|
|
|
278
276
|
const resolved = resolveInitialRouteFromLinking(contextKey, browserPath)
|
package/types/router/router.d.ts
CHANGED
|
@@ -85,6 +85,7 @@ export declare function snapshot(): {
|
|
|
85
85
|
};
|
|
86
86
|
export declare function rootStateSnapshot(): OneRouter.ResultState;
|
|
87
87
|
export declare function routeInfoSnapshot(): UrlObject;
|
|
88
|
+
export declare function getSafeWindowPathname(): string | undefined;
|
|
88
89
|
export declare function useOneRouter(): {
|
|
89
90
|
linkTo: typeof linkTo;
|
|
90
91
|
routeNode: RouteNode | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/router/router.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,KAAK,iCAAiC,EACtC,KAAK,eAAe,EAErB,MAAM,0BAA0B,CAAA;AACjC,OAAO,EACL,KAAK,aAAa,EAKnB,MAAM,OAAO,CAAA;AAGd,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAErD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAc1D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAQxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAA;AAKzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAMxC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAe/C,eAAO,IAAI,SAAS,EAAE,SAAS,GAAG,IAAW,CAAA;AAC7C,eAAO,IAAI,aAAa,EAAE,aAAa,CAAA;AAMvC;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,MAAM,EAClB,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,QAO9B;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,QAE3D;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAyBtD;AAED,eAAO,IAAI,wBAAwB,SAAQ,CAAA;AAC3C,eAAO,IAAI,YAAY,EAAE,SAAS,CAAC,WAAW,GAAG,SAAS,CAAA;AAC1D,eAAO,IAAI,SAAS,EAAE,SAAS,CAAC,WAAW,GAAG,SAAS,CAAA;AAIvD,eAAO,IAAI,eAAe,EAAE,MAAM,GAAG,SAAS,CAAA;AAK9C,eAAO,IAAI,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAA;AAGnD,eAAO,IAAI,SAAS,EAAE,SAAS,GAAG,SAAS,CAAA;AAM3C,eAAO,IAAI,aAAa,EAAE,SAAS,CAAC,aAA2B,CAAA;AAU/D,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,OAAO,GAAG,OAAO,CAAA;IACjD,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B,CAAA;AAKD,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,iBAGtF;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,eAAe,QAyBxD;AAED,wBAAgB,kBAAkB,IAAI,eAAe,CAEpD;AAED,wBAAgB,kBAAkB,oBAMjC;AAQD,wBAAgB,UAAU,CACxB,OAAO,EAAE,GAAG,CAAC,YAAY,EACzB,GAAG,EAAE,iCAAiC,CAAC,eAAe,CAAC,aAAa,CAAC,EACrE,eAAe,CAAC,EAAE,GAAG,EACrB,OAAO,CAAC,EAAE,gBAAgB,QAqE3B;
|
|
1
|
+
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/router/router.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,KAA0D,MAAM,OAAO,CAAA;AAW9E,OAAO,EAIL,KAAK,SAAS,EAEf,MAAM,SAAS,CAAA;AA+ChB,eAAO,MAAQ,MAAM,OAAE,KAAK,KAAwC,CAAA;
|
|
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,KAA0D,MAAM,OAAO,CAAA;AAW9E,OAAO,EAIL,KAAK,SAAS,EAEf,MAAM,SAAS,CAAA;AA+ChB,eAAO,MAAQ,MAAM,OAAE,KAAK,KAAwC,CAAA;AA8IpE,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;AAkED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,WAAW,EAAE,EACpB,OAAO,CAAC,EAAE;IACR,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,2EAA2E;IAC3E,gBAAgB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CAC/B,GACA,KAAK,CAAC,SAAS,EAAE,CAqBnB;AA4BD,mFAAmF;AACnF,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,SAAS,0GAkJ1D;AAED,oGAAoG;AACpG,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,GAAG,YAAY,GAAG,UAAU,CAAC,IAU/D;aAAmC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;CAAE,YAoBjE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Navigator.d.ts","sourceRoot":"","sources":["../../src/views/Navigator.tsx"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,aAAa,EAElB,oBAAoB,EACrB,MAAM,0BAA0B,CAAA;AAEjC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"Navigator.d.ts","sourceRoot":"","sources":["../../src/views/Navigator.tsx"],"names":[],"mappings":"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"}
|