Skip to content

Commit 98421a4

Browse files
committed
register turbomodules and fix config issues
1 parent a9b5632 commit 98421a4

File tree

11 files changed

+191
-45915
lines changed

11 files changed

+191
-45915
lines changed

package-lock.json

Lines changed: 0 additions & 45748 deletions
This file was deleted.

package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"release:publish": "./.github/scripts/setup-ci-git-user.sh && changeset publish"
2121
},
2222
"devDependencies": {
23+
"@babel/plugin-transform-runtime": "^7.24.7",
2324
"@changesets/cli": "^2.27.7",
2425
"concurrently": "^8.2.2",
2526
"eslint": "^8.54.0",
@@ -41,5 +42,8 @@
4142
"ts-node": "^10.9.1",
4243
"recursive-readdir/minimatch": "^3.0.5",
4344
"serve-handler/minimatch": "^3.0.5"
45+
},
46+
"dependencies": {
47+
"@babel/runtime": "^7.25.0"
4448
}
4549
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
module.exports = {
22
presets: ["module:@react-native/babel-preset"],
3+
plugins: ["@babel/plugin-transform-runtime"]
34
};
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
module.exports = {
22
presets: ["module:@react-native/babel-preset"],
3+
plugins: ["@babel/plugin-transform-runtime"]
34
};

packages/default-storage/example/examples/Functional.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
ScrollView,
99
StyleSheet,
1010
Text,
11+
TurboModuleRegistry,
1112
View,
1213
} from "react-native";
1314
import type { TestStep, TestValue } from "./tests";
@@ -130,7 +131,7 @@ function Functional(): JSX.Element {
130131
})
131132
.then(async () => {
132133
const AsyncStorageTestSupport =
133-
NativeModules["AsyncStorageTestSupport"];
134+
TurboModuleRegistry.get("AsyncStorageTestSupport");
134135

135136
for (const [currentName, test] of Object.entries(tests)) {
136137
const name = currentName + " with delegate";

packages/default-storage/example/examples/MergeItem.tsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import {
1414
StyleSheet,
1515
Text,
1616
TextInput,
17+
TurboModuleRegistry,
1718
View,
1819
} from "react-native";
1920

@@ -175,22 +176,22 @@ function Merge(): JSX.Element {
175176
testID="setDelegate_button"
176177
title="Set native delegate"
177178
disabled={
178-
!NativeModules["AsyncStorageTestSupport"] ||
179-
!NativeModules["AsyncStorageTestSupport"].test_setDelegate
179+
!TurboModuleRegistry.get('AsyncStorageTestSupport') ||
180+
!TurboModuleRegistry.get('AsyncStorageTestSupport')?.test_setDelegate
180181
}
181182
onPress={() =>
182-
NativeModules["AsyncStorageTestSupport"].test_setDelegate(() => {})
183+
TurboModuleRegistry.get('AsyncStorageTestSupport')?.test_setDelegate(() => {})
183184
}
184185
/>
185186
<Button
186187
testID="unsetDelegate_button"
187188
title="Unset native delegate"
188189
disabled={
189-
!NativeModules["AsyncStorageTestSupport"] ||
190-
!NativeModules["AsyncStorageTestSupport"].test_unsetDelegate
190+
TurboModuleRegistry.get('AsyncStorageTestSupport') ||
191+
TurboModuleRegistry.get('AsyncStorageTestSupport')?.test_unsetDelegate
191192
}
192193
onPress={() =>
193-
NativeModules["AsyncStorageTestSupport"].test_unsetDelegate(
194+
TurboModuleRegistry.get('AsyncStorageTestSupport')?.test_unsetDelegate(
194195
() => {}
195196
)
196197
}

packages/default-storage/metro.config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ const config = {
3232
/.*\.ProjectImports\.zip/,
3333
]),
3434
//
35+
extraNodeModules: {
36+
"@react-native-async-storage/async-storage": __dirname,
37+
},
3538
},
3639
transformer: {
3740
getTransformOptions: async () => ({

packages/default-storage/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,13 @@
7373
},
7474
"devDependencies": {
7575
"@babel/core": "^7.20.0",
76+
"@babel/plugin-transform-runtime": "^7.24.7",
7677
"@babel/preset-env": "^7.20.0",
7778
"@react-native/babel-preset": "^0.74.1",
7879
"@react-native/metro-config": "^0.73.3",
7980
"@rnx-kit/jest-preset": "^0.1.16",
8081
"@rnx-kit/metro-config": "^1.3.15",
82+
"@types/babel__plugin-transform-runtime": "^7",
8183
"@types/lodash": "^4.14.184",
8284
"@types/mocha": "^10.0.1",
8385
"@types/react": "^18.0.0",

packages/default-storage/src/shouldFallbackToLegacyNativeModule.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { NativeModules } from "react-native";
1+
import { NativeModules, TurboModuleRegistry } from "react-native";
22

33
export function shouldFallbackToLegacyNativeModule(): boolean {
44
const expoConstants =
5-
NativeModules["NativeUnimoduleProxy"]?.modulesConstants?.ExponentConstants;
5+
TurboModuleRegistry.get('NativeUnimoduleProxy')?.getConstants()?.modulesConstants?.ExponentConstants;
66

77
if (expoConstants) {
88
/**

packages/default-storage/windows/code/ReactPackageProvider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace winrt::ReactNativeAsyncStorage::implementation
1414

1515
void ReactPackageProvider::CreatePackage(IReactPackageBuilder const &packageBuilder) noexcept
1616
{
17-
AddAttributedModules(packageBuilder);
17+
AddAttributedModules(packageBuilder, true);
1818
}
1919

2020
} // namespace winrt::ReactNativeAsyncStorage::implementation

0 commit comments

Comments
 (0)