Skip to content

Commit 846a1ea

Browse files
committed
Merge branch 'tlg/ubrn-qol' into 'develop'
ubrn Developer Experience See merge request polycentric/polycentric!512
2 parents 3416483 + e5818e6 commit 846a1ea

8 files changed

Lines changed: 35 additions & 4 deletions

File tree

.prettierignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ apps/polycentric/ios
1313
packages/react-native/android
1414
packages/react-native/ios
1515
packages/react-native/lib
16+
packages/react-native/src/Native*
17+
packages/react-native/src/uniffi-init.tsx
18+
apps/polycentric/.expo
19+
apps/polycentric/expo-env.d.ts
1620
packages/rs-core
1721
packages/rs-core-wasm-browser
1822
packages/rs-core-wasm-node

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"run:web": "pnpm -C apps/polycentric run web",
1616
"ubrn:android": "pnpm -C packages/react-native ubrn:android",
1717
"ubrn:ios": "sh -c 'if [ \"$(uname -s)\" = Darwin ]; then pnpm -C packages/react-native ubrn:ios; else echo Skipping ubrn:ios: macOS-only build; fi'",
18-
"ubrn": "pnpm ubrn:android && pnpm ubrn:ios"
18+
"ubrn": "pnpm ubrn:android && pnpm ubrn:ios",
19+
"ubrn:clean": "pnpm -C packages/react-native ubrn:clean && pnpm -C packages/rs-core-uniffi-web clean"
1920
},
2021
"devDependencies": {
2122
"@types/react": "~19.2.10",
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Normalize ubrn output to be unformatted
2+
DisableFormat: true
3+
SortIncludes: Never

packages/react-native/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"scripts": {
3939
"ubrn:ios": "ubrn build ios --and-generate",
4040
"ubrn:android": "ubrn build android --and-generate",
41-
"ubrn:clean": "rm -rfv cpp/ android/CMakeLists.txt android/src/main/java android/*.cpp ios/ src/Native* src/index.*ts* src/generated/rn",
41+
"ubrn:clean": "rm -rfv cpp/ android/CMakeLists.txt android/src/main/java android/*.cpp ios/ src/Native* src/uniffi-init.tsx src/generated/rn",
4242
"dev": "bob build --watch",
4343
"clean": "del-cli android/build lib",
4444
"build": "bob build",

packages/react-native/src/NativeReactNative.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ export interface Spec extends TurboModule {
77
cleanupRustCrate(): boolean;
88
}
99

10-
export default TurboModuleRegistry.getEnforcing<Spec>('ReactNative');
10+
export default TurboModuleRegistry.getEnforcing<Spec>('ReactNative');

packages/react-native/src/uniffi-init.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,4 @@ export async function uniffiInitAsync() {
3838
export default {
3939
polycentric_core,
4040
};
41+

packages/rs-core-uniffi-web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
],
2323
"scripts": {
2424
"build": "ubrn build web",
25-
"clean": "rm -rfv dist/"
25+
"clean": "rm -rfv dist/ rust_modules/"
2626
},
2727
"dependencies": {
2828
"uniffi-bindgen-react-native": "0.31.0-2"
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"$schema": "https://turbo.build/schema.json",
3+
"extends": ["//"],
4+
"tasks": {
5+
"build": {
6+
"inputs": [
7+
"package.json",
8+
"ubrn.config.yaml",
9+
"ubrn-wasm-patch.toml",
10+
"$TURBO_ROOT$/packages/rs-core/src/**",
11+
"$TURBO_ROOT$/packages/rs-core/Cargo.toml",
12+
"$TURBO_ROOT$/packages/rs-core/build.rs",
13+
"$TURBO_ROOT$/packages/rs-common/src/**",
14+
"$TURBO_ROOT$/packages/rs-common/Cargo.toml",
15+
"$TURBO_ROOT$/packages/rs-common/build.rs",
16+
"$TURBO_ROOT$/Cargo.toml",
17+
"$TURBO_ROOT$/Cargo.lock"
18+
],
19+
"outputs": ["dist/**", "rust_modules/**"]
20+
}
21+
}
22+
}

0 commit comments

Comments
 (0)