refactor: cleanup legacy arch native module fallback

Author: mikehardy

jest.setup.ts

@@ -26,23 +26,8 @@ jest.doMock('react-native', () => {
   // make sure PlatformConstants is visible otherwise turbo modules default init fails
   ReactNative.NativeModules['PlatformConstants'] = {};
 
-  return Object.setPrototypeOf(
-    {
-      Platform: {
-        OS: 'android',
-        select: () => {},
-      },
-      TurboModuleRegistry: {
-        get: jest.fn(() => undefined),
-        getEnforcing: jest.fn(() => {
-          throw new Error('TurboModuleRegistry.getEnforcing: module not found');
-        }),
-      },
-      AppRegistry: {
-        registerHeadlessTask: jest.fn(),
-      },
-      NativeModules: {
-        ...ReactNative.NativeModules,
+  const turboModuleLookup: Record<string, unknown> = {
+    ...ReactNative.NativeModules,
         NativeRNFBTurboAnalytics: {
           logEvent: jest.fn(),
           setAnalyticsCollectionEnabled: jest.fn(),
@@ -646,7 +631,28 @@ jest.doMock('react-native', () => {
           list: jest.fn(() => Promise.resolve({ items: [], prefixes: [], pageToken: null })),
           listAll: jest.fn(() => Promise.resolve({ items: [], prefixes: [], pageToken: null })),
         },
+  };
+
+  return Object.setPrototypeOf(
+    {
+      Platform: {
+        OS: 'android',
+        select: () => {},
+      },
+      TurboModuleRegistry: {
+        get: jest.fn((moduleName: string) => turboModuleLookup[moduleName]),
+        getEnforcing: jest.fn((moduleName: string) => {
+          const mod = turboModuleLookup[moduleName];
+          if (!mod) {
+            throw new Error('TurboModuleRegistry.getEnforcing: module not found');
+          }
+          return mod;
+        }),
+      },
+      AppRegistry: {
+        registerHeadlessTask: jest.fn(),
       },
+      NativeModules: turboModuleLookup,
     },
     ReactNative,
   );

okf-bundle/new-architecture/migration-work-queue.md

@@ -8,7 +8,7 @@ timestamp: 2026-06-26T00:00:00Z
 
 # TurboModule migration — work queue
 
-> **IN PROGRESS (2026-07-02):** Phase **5** complete (P5pnv + auth fix committed). All native packages migrated except Phase **R** / **S** / **C**. Next: Phase **R** pre-merge validation or opportunistic docs.
+> **IN PROGRESS (2026-07-02):** Phase **R** — remove `NativeModules` fallback (PR-fallback). Phases 0–5 complete.
 > **Goal/order:** app foundation → hard probe → easy wins → remaining complex → sync conversion → coordinated break → cleanup (events, shared-state encapsulation). Decisions: [architecture-decisions.md](architecture-decisions.md). Links: [implementation workflow](turbomodule-implementation-workflow.md), [change authoring](../testing/change-authoring-workflow.md), [functions reference](../../../packages/functions/) ([PR #8603](https://github.com/invertase/react-native-firebase/pull/8603)).
 
 Ephemeral tracker; see [OKF policy](../documentation-policy.md).
@@ -169,15 +169,15 @@ Pick **one** of `firestore` or `auth` in Phase 1 (firestore = multi-module + pip
 | **1** | Hard probe | **done** | `firestore` (multi-module + pipelines; NewArch-AD-14a composite) |
 | **2** | Easy wins | **done** | `installations`, `perf`, `in-app-messaging`, `app-distribution`, `ml` |
 | **3** | Moderate | **done** | `app-check`, `remote-config`, `analytics`, `crashlytics`, `storage` |
-| **NB** | Interruption batch — JS infra/test/chore (standalone commits) | queued | `app` resolver refactor+perf, shared contract-test helper, harness snapshot; `compare-types` **S0** — [§ interruption batch](#interruption-batch-standalone-commits) |
-| **3.5** | Guardrails — spec↔native parity + codegen-drift CI (**gates 4**) | queued | all migrated packages — [§ Phase 3.5](#phase-35-guardrails) |
+| **NB** | Interruption batch — JS infra/test/chore (standalone commits) | **done** | `app` resolver refactor+perf, shared contract-test helper, harness snapshot; `compare-types` **S0** — [§ interruption batch](#interruption-batch-standalone-commits) |
+| **3.5** | Guardrails — spec↔native parity + codegen-drift CI (**gates 4**) | **done** | all migrated packages — [§ Phase 3.5](#phase-35-guardrails) |
 | **4a** | messaging event decision — gap-analysis (**gates 4**) | **done** | `messaging` — [§ Phase 4a](#phase-4a-messaging-event-decision) |
 | **Docs** | New-Architecture requirements + migration-doc consolidation | queued (opportunistic) | docs — [§ Phase Docs](#phase-docs-new-architecture-requirements-and-doc-consolidation) |
 | **PD** | Platform-divergence documentation | queued (opportunistic) | multi-package JSDoc/docs — [§ Phase PD](#phase-pd-platform-divergence-documentation) |
-| **4** | Remaining complex | queued | other Tier A/B + `messaging`, `database` |
-| **5** | Android-only / misc | queued | `phone-number-verification` |
+| **4** | Remaining complex | **done** | `firestore`, `messaging`, `database`, `auth` |
+| **5** | Android-only / misc | **done** | `phone-number-verification` |
 | **S** | Sync conversion (forced-async → sync) | queued (scope open — [NewArch-AD-16](architecture-decisions.md#newarch-ad-16--phase-s-asyncsync-conversion--open)); prereq **S0** ([interruption batch](#interruption-batch-standalone-commits)) | All migrated packages — [§ sync conversion](#phase-s-sync-conversion-forced-async--sync) |
-| **R** | Pre-merge full validation | queued | Revert harness narrowing; remove `NativeModules` fallback + throw test ([§ Phase R additions](#phase-r-additions)); [full tier](../testing/running-e2e.md#e2e-validation-tiers-unit-focused-area-focused-full) 3-platform before coordinated major |
+| **R** | Pre-merge full validation | **done** | Revert harness narrowing; remove `NativeModules` fallback + throw test ([§ Phase R additions](#phase-r-additions)); [full tier](../testing/running-e2e.md#e2e-validation-tiers-unit-focused-area-focused-full) 3-platform before coordinated major |
 | **C** | EventEmitter cleanup | deferred | All — [§ deferred cleanup](#deferred-cleanup-phase-eventemitter) |
 | **E** | Shared-state encapsulation | deferred (optional) | `app` + readers — [§ Phase E](#phase-e-shared-state-encapsulation-optional) |
 
@@ -322,11 +322,11 @@ Skip steps 1–2 when spec shape is known (most Tier D packages).
 
 ## Current snapshot
 
-**Label:** `phase-5-pnv` (2026-07-02); **harness:** full (implementer applies area narrowing for e2e)
+**Label:** `phase-r-fallback` (2026-07-02); **harness:** full (no narrowing for final review)
 
-**Next item:** Phase **R** pre-merge validation or opportunistic PDoc
+**Next item:** Phase **R** PR-fallback — remove `NativeModules` fallback
 
-**Current gates:** P5pnv all gates **closed** — committed 2026-07-02. Auth fix `fix(auth): rename delete turbo method for C++ codegen compatibility` committed separately.
+**Current gates:** PR-fallback all gates **closed** — committed as `refactor: cleanup legacy arch native module fallback`. Proof run + review green.
 
 **Host rule:** one `:test-cover` at a time — never parallel subagents with e2e.
 
@@ -358,11 +358,11 @@ Skip steps 1–2 when spec shape is known (most Tier D packages).
 | Phase 4a messaging event decision | P4a | n/a | n/a | n/a | done | `none` | none | **Defer** events to Phase C — [NewArch-AD-4 § messaging](architecture-decisions.md#messaging--defer-eventemitter-cutover-migrate-shell-only-in-phase-4). |
 | Phase 4 `messaging` TurboModules | P4m | **closed** | **closed** | **closed** | done | `area-focused` | `feat(messaging)!: migrate messaging to TurboModules` | Turbo shell only (AD-4 event path preserved). Jest 38/38 + parity 32/32; codegen:verify incl messaging; legacy Java removed. iOS/Android area e2e green on method-call + listener-registration scope. Foreground `onMessage` delivery test **left `xit`** — flaky FCM harness; re-enable in [Phase C](#deferred-cleanup-phase-eventemitter). |
 | Phase 4 `database` TurboModules | P4d | **closed** | **closed** | **closed** | done | `area-focused` | `feat(database)!: migrate database to TurboModules` | 5 Turbo specs/shells + committed codegen; Jest 49 + parity 38; area e2e macOS 213 / iOS 219 / Android 220 (delta logs `/tmp/rnfb-e2e-*-database-delta-review.log`). Remediation: invalidate/teardown parity (Reference+Transaction), onComplete guard, contract test 22 methods, jest mock cleanup. Orchestration: macOS/Android `:8090` pre-flight in `firebase.test.js` + OKF. **Deferred minor:** void spec vs Promise JS API; silent Query `RejectedExecutionException` post-invalidate. |
-| Phase 4 `auth` TurboModules | P4u | **closed** | **closed** | **closed** | done | `area-focused` | `feat(auth)!: migrate auth to TurboModules` | … **Follow-up (uncommitted):** spec `delete` → C++ keyword collision; rename + regen; `TaskExecutorService(TAG)` fix applied on disk. |
+| Phase 4 `auth` TurboModules | P4u | **closed** | **closed** | **closed** | done | `area-focused` | `feat(auth)!: migrate auth to TurboModules` | 60-method spec + shells; review e2e macOS 171 / iOS 185 / Android 192. Follow-up committed: `fix(auth): rename delete turbo method for C++ codegen compatibility`. |
 | Phase 5 `phone-number-verification` TurboModules | P5pnv | **closed** | **closed** | **closed** | done | `area-focused` | `feat(phone-number-verification)!: migrate phone-number-verification to TurboModules` | Android-only 6-method spec; review e2e Android 40/2 pending (log `/tmp/rnfb-e2e-android-pnv-review.log`). AD-18 E10 direct resolver. Parity registered. **Bundled auth fix:** separate commit `fix(auth): rename delete turbo method for C++ codegen compatibility`. |
 | Phase Docs — NA reqs + consolidation | PDoc | open | open | open | documentation | `none` | `docs: new-architecture requirements + migration consolidation` | Opportunistic; does not gate 4. |
 | Phase PD — platform divergence | PPD | open | open | open | documentation | `none` | `docs(<pkg>): …` per package | Opportunistic; gap-analysis first. |
-| Phase R — remove `NativeModules` fallback | PR-fallback | open | open | open | pre-merge-validation | `full` | (Phase R) | Decision B. Jest + `app` e2e "unknown module throws". |
+| Phase R — remove `NativeModules` fallback | PR-fallback | **closed** | **closed** | **closed** | done | `full` + RNFBDebug | `refactor: cleanup legacy arch native module fallback` | Proof 683/823/849 (`/tmp/rnfb-e2e-phaseR-proof-*.log`). Review 2026-07-03: no critical/serious. Android cold boot committed separately. |
 
 ---
 

packages/app/__tests__/nativeModuleResolver.test.ts

@@ -0,0 +1,14 @@
+import { describe, expect, it, jest } from '@jest/globals';
+import { TurboModuleRegistry } from 'react-native';
+import { getReactNativeModule } from '../lib/internal/nativeModuleAndroidIos';
+
+describe('getReactNativeModule (NewArch-AD-6 Phase R)', function () {
+  it('throws when TurboModuleRegistry has no module for the name', function () {
+    const unknownModule = 'NativeRNFBTurboNonExistentModule';
+    jest.mocked(TurboModuleRegistry.get).mockReturnValueOnce(null);
+
+    expect(() => getReactNativeModule(unknownModule)).toThrow(
+      `Native module ${unknownModule} is not registered.`,
+    );
+  });
+});

packages/app/e2e/nativeModuleResolver.e2e.js

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2016-present Invertase Limited & Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this library except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+import { getReactNativeModule } from '@react-native-firebase/app/dist/module/internal/nativeModule';
+
+describe('getReactNativeModule resolver', function () {
+  it('throws for an unknown module name', function () {
+    const unknownModule = 'NativeRNFBTurboNonExistentModule';
+
+    try {
+      getReactNativeModule(unknownModule);
+      throw new Error('did not throw for unknown module');
+    } catch (e) {
+      e.message.should.containEql(unknownModule);
+      e.message.should.containEql('not registered');
+    }
+  });
+});

packages/app/lib/internal/nativeModuleAndroidIos.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-import { NativeModules, TurboModuleRegistry } from 'react-native';
+import { TurboModuleRegistry } from 'react-native';
 
 const DYNAMIC_CONSTANT_KEYS = new Set(['androidPlayServices']);
 
@@ -42,16 +42,20 @@ function withTurboConstants(
 }
 
 /**
- * Unified native module resolver — TurboModule first, legacy NativeModules fallback.
+ * Unified native module resolver — TurboModule only (NewArch-AD-6 Phase R).
  */
-export function getReactNativeModule(moduleName: string): Record<string, unknown> | undefined {
+export function getReactNativeModule(moduleName: string): Record<string, unknown> {
   const turboModule = TurboModuleRegistry.get(moduleName);
+  if (!turboModule) {
+    throw new Error(`Native module ${moduleName} is not registered.`);
+  }
+
   const nativeModule = withTurboConstants(
     moduleName,
-    (turboModule ?? NativeModules[moduleName]) as Record<string, unknown> | undefined,
-  );
+    turboModule as Record<string, unknown>,
+  ) as Record<string, unknown>;
 
-  if (!globalThis.RNFBDebug || !nativeModule) {
+  if (!globalThis.RNFBDebug) {
     return nativeModule;
   }
 

tests/ios/Podfile.lock

@@ -2606,7 +2606,7 @@ SPEC CHECKSUMS:
   RNFBApp: 893629fc75425937059b0f64e58ec9d5a066aefc
   RNFBAppCheck: 8ba8648a565a2c9c5f057906323475bba79c1a6a
   RNFBAppDistribution: 5fa4b64e4e62ffca3af9851a293b64ac801d11c1
-  RNFBAuth: 6656cfdec1c2c7a238666ab46f00f37650ea4e86
+  RNFBAuth: e24099af4c7db560ecdc07817f8fafaecbf2fa92
   RNFBCrashlytics: 14eea95d1f7669287597f1e27602abecc5699a91
   RNFBDatabase: a74a6e18a24749fcdfdfd9234e494da996a22511
   RNFBFirestore: 7b2480c59acae62bb9607cdf28c1e0e157641288