From d2f04357aa4d0215e0a1056bd10a548a13da0610 Mon Sep 17 00:00:00 2001 From: zhongwuzw Date: Mon, 23 Dec 2024 22:38:58 +0800 Subject: [PATCH 1/2] [iOS] RNTester: Fixes turbo module examples error in bridgeless mode --- .../js/examples/TurboModule/NativeCxxModuleExampleExample.js | 2 +- .../js/examples/TurboModule/SampleTurboModuleExample.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/rn-tester/js/examples/TurboModule/NativeCxxModuleExampleExample.js b/packages/rn-tester/js/examples/TurboModule/NativeCxxModuleExampleExample.js index e4cb37f89dacd1..488990be7fbf6b 100644 --- a/packages/rn-tester/js/examples/TurboModule/NativeCxxModuleExampleExample.js +++ b/packages/rn-tester/js/examples/TurboModule/NativeCxxModuleExampleExample.js @@ -261,7 +261,7 @@ class NativeCxxModuleExampleExample extends React.Component<{||}, State> { } componentDidMount(): void { - if (global.__turboModuleProxy == null) { + if (global.nativeModuleProxy == null) { throw new Error( 'Cannot load this example because TurboModule is not configured.', ); diff --git a/packages/rn-tester/js/examples/TurboModule/SampleTurboModuleExample.js b/packages/rn-tester/js/examples/TurboModule/SampleTurboModuleExample.js index b017895e9c1be7..b3bfbcd1ca579a 100644 --- a/packages/rn-tester/js/examples/TurboModule/SampleTurboModuleExample.js +++ b/packages/rn-tester/js/examples/TurboModule/SampleTurboModuleExample.js @@ -204,7 +204,7 @@ class SampleTurboModuleExample extends React.Component<{||}, State> { } componentDidMount(): void { - if (global.__turboModuleProxy == null) { + if (global.nativeModuleProxy == null) { throw new Error( 'Cannot load this example because TurboModule is not configured.', ); From e95378bf43d146ca0c0070767679056329b52eab Mon Sep 17 00:00:00 2001 From: zhongwuzw Date: Fri, 3 Jan 2025 10:12:58 +0800 Subject: [PATCH 2/2] update --- .../js/examples/TurboModule/NativeCxxModuleExampleExample.js | 2 +- .../js/examples/TurboModule/SampleTurboModuleExample.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/rn-tester/js/examples/TurboModule/NativeCxxModuleExampleExample.js b/packages/rn-tester/js/examples/TurboModule/NativeCxxModuleExampleExample.js index 488990be7fbf6b..df77a26021259a 100644 --- a/packages/rn-tester/js/examples/TurboModule/NativeCxxModuleExampleExample.js +++ b/packages/rn-tester/js/examples/TurboModule/NativeCxxModuleExampleExample.js @@ -261,7 +261,7 @@ class NativeCxxModuleExampleExample extends React.Component<{||}, State> { } componentDidMount(): void { - if (global.nativeModuleProxy == null) { + if (global.__turboModuleProxy == null && global.RN$Bridgeless == null) { throw new Error( 'Cannot load this example because TurboModule is not configured.', ); diff --git a/packages/rn-tester/js/examples/TurboModule/SampleTurboModuleExample.js b/packages/rn-tester/js/examples/TurboModule/SampleTurboModuleExample.js index b3bfbcd1ca579a..54af1f0f4d17f5 100644 --- a/packages/rn-tester/js/examples/TurboModule/SampleTurboModuleExample.js +++ b/packages/rn-tester/js/examples/TurboModule/SampleTurboModuleExample.js @@ -204,7 +204,7 @@ class SampleTurboModuleExample extends React.Component<{||}, State> { } componentDidMount(): void { - if (global.nativeModuleProxy == null) { + if (global.__turboModuleProxy == null && global.RN$Bridgeless == null) { throw new Error( 'Cannot load this example because TurboModule is not configured.', );