one 1.18.3 → 1.18.4

package/src/layouts/NativeTabs.tsx

@@ -1,7 +1,8 @@
 import type { ParamListBase, TabNavigationState } from '@react-navigation/native'
-import type React from 'react'
+import React from 'react'
 
 import { Protected } from '../views/Protected'
+import { Screen } from '../views/Screen'
 import { withLayoutContext } from './withLayoutContext'
 
 let NativeBottomTabNavigator: React.ComponentType<any> | null = null
@@ -17,12 +18,20 @@ type NativeTabsType = ReturnType<typeof withLayoutContext> & {
   Protected: typeof Protected
 }
 
+const missingNativeTabsMessage =
+  'NativeTabs requires @bottom-tabs/react-navigation and react-native-bottom-tabs.\n' +
+  'Install: npx expo install @bottom-tabs/react-navigation react-native-bottom-tabs'
+
+const MissingNativeTabs = React.forwardRef<unknown, any>(function MissingNativeTabs(): never {
+  throw new Error(missingNativeTabsMessage)
+})
+
 function createNativeTabs(): NativeTabsType {
   if (!NativeBottomTabNavigator) {
-    throw new Error(
-      'NativeTabs requires @bottom-tabs/react-navigation and react-native-bottom-tabs.\n' +
-        'Install: npx expo install @bottom-tabs/react-navigation react-native-bottom-tabs'
-    )
+    return Object.assign(MissingNativeTabs, {
+      Protected,
+      Screen,
+    }) as NativeTabsType
   }
 
   return Object.assign(withLayoutContext(NativeBottomTabNavigator), {
@@ -30,17 +39,6 @@ function createNativeTabs(): NativeTabsType {
   }) as NativeTabsType
 }
 
-let _nativeTabs: NativeTabsType | null = null
-
-export const NativeTabs = new Proxy({} as NativeTabsType, {
-  get(_, prop) {
-    if (!_nativeTabs) _nativeTabs = createNativeTabs()
-    return (_nativeTabs as any)[prop]
-  },
-  apply(_, thisArg, args) {
-    if (!_nativeTabs) _nativeTabs = createNativeTabs()
-    return (_nativeTabs as any).apply(thisArg, args)
-  },
-})
+export const NativeTabs = createNativeTabs()
 
 export default NativeTabs

package/src/useLoader.ts

@@ -13,6 +13,7 @@ import {
   updateMatchLoaderData,
 } from './useMatches'
 import { getLoaderPath } from './utils/cleanUrl'
+import { getURL } from './getURL'
 import { LOADER_JS_POSTFIX_UNCACHED } from './constants'
 import { dynamicImport } from './utils/dynamicImport'
 import { weakKey } from './utils/weakKey'
@@ -509,8 +510,10 @@ export function useLoaderState<
               nativeLoaderJSUrl = `${getLoaderPath(currentPath, true)}?platform=native`
             } else {
               // prod: request the .native.js static file directly
-              // use uncached postfix since metro can't inline ONE_CACHE_KEY
-              const { getURL } = require('./getURL')
+              // use uncached postfix since metro can't inline ONE_CACHE_KEY.
+              // must use the static import — a dynamic require('./getURL') is
+              // left as a runtime string require by metro and resolves to
+              // undefined in the prod native bundle (crashes the route).
               const base = getURL()
               const cleanedPath = currentPath
                 .slice(1)

package/types/layouts/NativeTabs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NativeTabs.d.ts","sourceRoot":"","sources":["../../src/layouts/NativeTabs.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAWvD,KAAK,cAAc,GAAG,UAAU,CAAC,OAAO,iBAAiB,CAAC,GAAG;IAC3D,SAAS,EAAE,OAAO,SAAS,CAAA;CAC5B,CAAA;AAiBD,eAAO,MAAM,UAAU,gBASrB,CAAA;AAEF,eAAe,UAAU,CAAA"}
+{"version":3,"file":"NativeTabs.d.ts","sourceRoot":"","sources":["../../src/layouts/NativeTabs.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAE9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAWvD,KAAK,cAAc,GAAG,UAAU,CAAC,OAAO,iBAAiB,CAAC,GAAG;IAC3D,SAAS,EAAE,OAAO,SAAS,CAAA;CAC5B,CAAA;AAuBD,eAAO,MAAM,UAAU,gBAAqB,CAAA;AAE5C,eAAe,UAAU,CAAA"}

package/types/layouts/NativeTabs.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=NativeTabs.test.d.ts.map

package/types/layouts/NativeTabs.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"NativeTabs.test.d.ts","sourceRoot":"","sources":["../../src/layouts/NativeTabs.test.ts"],"names":[],"mappings":""}

package/types/useLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useLoader.d.ts","sourceRoot":"","sources":["../src/useLoader.ts"],"names":[],"mappings":"AA8BA,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS,CAAA;CAC1C,CAAA;AA2CD,wBAAgB,sBAAsB,IAAI,iBAAiB,EAAE,CAE5D;AAqDD;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAoHnE;AAOD;;;;;;;;GAQG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC,CAWf;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,cAAc,CAC5B,MAAM,SAAS,QAAQ,GAAG,GAAG,EAC7B,QAAQ,GAAG,MAAM,SAAS,CAAC,CAAC,EAAE,GAAG,KAAK,GAAG,GAAG,UAAU,CAAC,MAAM,CAAC,GAAG,OAAO,EAExE,MAAM,CAAC,EAAE,MAAM,GACd,MAAM,SAAS,SAAS,GACvB;IAAE,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GAC3D;IACE,IAAI,EAAE,QAAQ,SAAS,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAA;IAClE,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC5B,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1B,CAmaJ;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,SAAS,CACvB,MAAM,SAAS,QAAQ,EACvB,QAAQ,GAAG,MAAM,SAAS,CAAC,CAAC,EAAE,GAAG,KAAK,GAAG,GAAG,UAAU,CAAC,MAAM,CAAC,GAAG,OAAO,EACxE,MAAM,EAAE,MAAM,GAAG,QAAQ,SAAS,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAG9E;AAwBD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAEzD,wBAAgB,gBAAgB,SAG/B"}
+{"version":3,"file":"useLoader.d.ts","sourceRoot":"","sources":["../src/useLoader.ts"],"names":[],"mappings":"AA+BA,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS,CAAA;CAC1C,CAAA;AA2CD,wBAAgB,sBAAsB,IAAI,iBAAiB,EAAE,CAE5D;AAqDD;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAoHnE;AAOD;;;;;;;;GAQG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC,CAWf;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,cAAc,CAC5B,MAAM,SAAS,QAAQ,GAAG,GAAG,EAC7B,QAAQ,GAAG,MAAM,SAAS,CAAC,CAAC,EAAE,GAAG,KAAK,GAAG,GAAG,UAAU,CAAC,MAAM,CAAC,GAAG,OAAO,EAExE,MAAM,CAAC,EAAE,MAAM,GACd,MAAM,SAAS,SAAS,GACvB;IAAE,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GAC3D;IACE,IAAI,EAAE,QAAQ,SAAS,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAA;IAClE,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC5B,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1B,CAqaJ;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,SAAS,CACvB,MAAM,SAAS,QAAQ,EACvB,QAAQ,GAAG,MAAM,SAAS,CAAC,CAAC,EAAE,GAAG,KAAK,GAAG,GAAG,UAAU,CAAC,MAAM,CAAC,GAAG,OAAO,EACxE,MAAM,EAAE,MAAM,GAAG,QAAQ,SAAS,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAG9E;AAwBD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAEzD,wBAAgB,gBAAgB,SAG/B"}