Merge branch 'develop' of https://github.com/futo-org/polycentric into develop

Author: markharding

.cirrus.yml

@@ -1,41 +1,20 @@
-build_ios_device_task:
-  name: buildRsCoreIOSDevice
+build_ios_task:
+  name: buildReactNativeIOS
   macos_instance:
     image: ghcr.io/cirruslabs/macos-sequoia-xcode:26.2
-  buildRsCoreIOSDevice_script:
+  build_script:
     - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
     - source "$HOME/.cargo/env"
-    - cd packages/rs-core
-    - brew install just protobuf llvm
-    - just build-ffi-ios
-    - cp ../../target/aarch64-apple-ios/release-rs-core/libpolycentric_core.a ../../libpolycentric_core-ios-device.a
+    - brew install just protobuf cmake ninja clang-format pnpm
+    - cd packages/react-native
+    - |
+      rustup target add \
+        aarch64-apple-ios \
+        aarch64-apple-ios-sim \
+        x86_64-apple-ios
+    - pnpm i
+    - pnpm ubrn:ios
   binary_artifacts:
-    path: 'libpolycentric_core-ios-device.a'
-
-build_ios_sim_arm64_task:
-  name: buildRsCoreIOSSimArm64
-  macos_instance:
-    image: ghcr.io/cirruslabs/macos-sequoia-xcode:26.2
-  buildRsCoreIOSSimArm64_script:
-    - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-    - source "$HOME/.cargo/env"
-    - cd packages/rs-core
-    - brew install just protobuf llvm
-    - just build-ffi-ios-sim
-    - cp ../../target/aarch64-apple-ios-sim/release-rs-core/libpolycentric_core.a ../../libpolycentric_core-ios-sim-arm64.a
-  binary_artifacts:
-    path: 'libpolycentric_core-ios-sim-arm64.a'
-
-build_ios_sim_x86_task:
-  name: buildRsCoreIOSSimX86
-  macos_instance:
-    image: ghcr.io/cirruslabs/macos-sequoia-xcode:26.2
-  buildRsCoreIOSSimX86_script:
-    - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-    - source "$HOME/.cargo/env"
-    - cd packages/rs-core
-    - brew install just protobuf llvm
-    - just build-ffi-ios-sim-x86
-    - cp ../../target/x86_64-apple-ios/release-rs-core/libpolycentric_core.a ../../libpolycentric_core-ios-sim-x86_64.a
-  binary_artifacts:
-    path: 'libpolycentric_core-ios-sim-x86_64.a'
+    path: 'packages/react-native/ios/**/*'
+  xcframework_artifacts:
+    path: 'packages/react-native/PolycentricReactNativeFramework.xcframework/**/*'

.dockerignore

@@ -2,3 +2,8 @@
 **/node_modules
 apps/polycentric/dist
 **/.git
+
+# iOS-only artifacts produced by rn-ios-build — not used by the web image,
+# and the xcframework alone is ~hundreds of MB.
+packages/react-native/PolycentricReactNativeFramework.xcframework
+**/*.a

.gitlab-ci.yml

@@ -1,4 +1,5 @@
 include:
+  - local: '.gitlab/ci/setup_images.yml'
   - local: '.gitlab/ci/build_rs_core.yml'
   - local: '.gitlab/ci/build_js_sdks.yml'
   - local: '.gitlab/ci/build_rn_sdk.yml'

.gitlab/ci/build_app.yml

@@ -5,15 +5,13 @@
       when: always
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       changes:
-        - packages/**/*
         - apps/**/*
         - .gitlab/ci/build_app.yml
         - .gitlab/ci/deploy_app.yml
     - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
       when: never
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       changes:
-        - packages/**/*
         - apps/**/*
         - .gitlab/ci/build_app.yml
         - .gitlab/ci/deploy_app.yml
@@ -25,7 +23,7 @@
       artifacts: true
     - job: js-sdks-build
       artifacts: true
-    - job: rs-sdk-build-wasm-browser
+    - job: rs-core-uniffi-web-build
       artifacts: true
 
 app-web-image:
@@ -52,7 +50,7 @@ app-web-image:
   stage: build
   image: node:24-slim
   before_script:
-    - npm install -g pnpm@9.5.0
+    - npm install -g pnpm@10.19.0
     - pnpm config set @polycentric:registry https://${CI_SERVER_HOST}/api/v4/projects/${CI_PROJECT_ID}/packages/npm/
     - pnpm install
     - apt-get update && apt-get install -y --no-install-recommends git

.gitlab/ci/build_js_sdks.yml

@@ -5,42 +5,46 @@
       when: always
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       changes:
-        - packages/**/*
-        - apps/**/*
+        - packages/js-*/**/*
         - .gitlab/ci/build_js_sdks.yml
     - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
       when: never
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       changes:
-        - packages/**/*
-        - apps/**/*
+        - packages/js-*/**/*
         - .gitlab/ci/build_js_sdks.yml
 
 .js-sdks-base:
   extends: .js-sdk-workflow
   before_script:
-    - npm install -g pnpm@9.5.0
+    - npm install -g pnpm@10.19.0
     - pnpm config set @polycentric:registry https://${CI_SERVER_HOST}/api/v4/projects/${CI_PROJECT_ID}/packages/npm/
     - pnpm install
-  needs:
-    - job: rs-sdk-build-wasm-browser
-      artifacts: true
 
 js-sdks-format-check:
   extends: .js-sdks-base
-  stage: build
+  stage: check
   script:
     - pnpm format
+  allow_failure: true
 
 js-sdks-build:
   extends: .js-sdks-base
   stage: build
   script:
-    - pnpm build
+    - pnpm --filter='./packages/js-*' run build
   artifacts:
     paths:
       - packages/js-*/dist
     expire_in: 1 week
+  needs:
+    - job: rs-core-uniffi-web-build
+      artifacts: true
+  rules:
+    - !reference [.js-sdk-workflow, rules]
+    - !reference [.rs-core-workflow, rules]
+    - !reference [.rn-sdk-workflow, rules]
+    - !reference [.app-workflow, rules]
 
 .js-sdks-publish-npm:
   rules:

.gitlab/ci/build_rn_sdk.yml

@@ -1,62 +1,117 @@
 .rn-sdk-workflow:
-  image: node:24-slim
   rules:
     - if: $CI_COMMIT_TAG =~ /^rn-sdk-/
       when: always
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       changes:
-        - packages/**/*
-        - apps/**/*
+        - packages/react-native/**/*
         - .gitlab/ci/build_rn_sdk.yml
     - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
       when: never
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       changes:
-        - packages/**/*
-        - apps/**/*
+        - packages/react-native/**/*
         - .gitlab/ci/build_rn_sdk.yml
 
+rn-android-build:
+  extends: .rn-sdk-workflow
+  image: $RUST_IMAGE
+  stage: build
+  rules:
+    - !reference [.rn-sdk-workflow, rules]
+    - !reference [.rs-core-workflow, rules]
+    - !reference [.app-workflow, rules]
+  cache:
+    - key:
+        files:
+          - pnpm-lock.yaml
+        prefix: ubrn-target
+      paths:
+        - node_modules/.pnpm/uniffi-bindgen-react-native@*/node_modules/uniffi-bindgen-react-native/target
+  script:
+    - cd packages/react-native
+    - |
+      rustup target add \
+        aarch64-linux-android \
+        armv7-linux-androideabi \
+        i686-linux-android \
+        x86_64-linux-android
+    - pnpm i
+    - pnpm ubrn:android --release
+  artifacts:
+    paths:
+      - packages/react-native/android/src/main/jniLibs
+    expire_in: 1 week
+
+.rn-sdk-ios-build:
+  extends: .rn-sdk-workflow
+  stage: build
+  rules:
+    - !reference [.rn-sdk-workflow, rules]
+    - !reference [.rs-core-workflow, rules]
+    - !reference [.app-workflow, rules]
+  tags:
+    - macscript
+  variables:
+    GIT_STRATEGY: clone
+  before_script:
+    - env | grep '^CI_' > .cienv
+  artifacts:
+    expire_in: 1 week
+
+rn-ios-build:
+  extends: .rn-sdk-ios-build
+  script:
+    - |
+      cirrus run buildReactNativeIOS \
+        --artifacts-dir . \
+        --env-file .cienv
+    - mkdir -p packages/react-native/ios
+    - cp -R buildReactNativeIOS/binary/packages/react-native/ios/. packages/react-native/ios/
+    - cp -R buildReactNativeIOS/xcframework/packages/react-native/PolycentricReactNativeFramework.xcframework packages/react-native/
+  artifacts:
+    paths:
+      - packages/react-native/ios
+      - packages/react-native/PolycentricReactNativeFramework.xcframework
+    expire_in: 1 week
+
+rn-ios-tart-prune:
+  extends: .rn-sdk-ios-build
+  needs:
+    - job: rn-ios-build
+      artifacts: false
+  before_script: []
+  script:
+    - tart prune --entries vms --older-than 2
+
 .rn-sdk-base:
   extends: .rn-sdk-workflow
+  image: node:24-slim
   before_script:
-    - npm install -g pnpm@9.5.0
+    - npm install -g pnpm@10.19.0
     - pnpm config set @polycentric:registry https://${CI_SERVER_HOST}/api/v4/projects/${CI_PROJECT_ID}/packages/npm/
     - pnpm install
   needs:
     - job: js-sdks-build
       artifacts: true
-    - job: rs-sdk-build-android-arm64
-      artifacts: true
-    - job: rs-sdk-build-android-armv7
+    - job: rn-android-build
       artifacts: true
-    - job: rs-sdk-build-android-x86
+    - job: rn-ios-build
       artifacts: true
-    - job: rs-sdk-build-android-x86_64
-      artifacts: true
-    - job: rs-sdk-build-ios-device
-      artifacts: true
-    - job: rs-sdk-build-wasm-browser
+    - job: rs-core-uniffi-web-build
       artifacts: true
 
 rn-sdk-build:
   extends: .rn-sdk-base
   stage: build
   script:
-    - mkdir -p packages/react-native/android/libs/arm64-v8a
-    - cp target/aarch64-linux-android/release-rs-core/libpolycentric_core.a packages/react-native/android/libs/arm64-v8a/
-    - mkdir -p packages/react-native/android/libs/armeabi-v7a
-    - cp target/armv7-linux-androideabi/release-rs-core/libpolycentric_core.a packages/react-native/android/libs/armeabi-v7a/
-    - mkdir -p packages/react-native/android/libs/x86
-    - cp target/i686-linux-android/release-rs-core/libpolycentric_core.a packages/react-native/android/libs/x86/
-    - mkdir -p packages/react-native/android/libs/x86_64
-    - cp target/x86_64-linux-android/release-rs-core/libpolycentric_core.a packages/react-native/android/libs/x86_64/
-    - mkdir -p packages/react-native/ios/libs/aarch64-apple-ios
-    - cp buildRsCoreIOSDevice/binary/libpolycentric_core-ios-device.a packages/react-native/ios/libs/aarch64-apple-ios/libpolycentric_core.a
     - cd packages/react-native
     - pnpm build
   artifacts:
     paths:
-      - packages/react-native/lib
-      - packages/react-native/android/libs
-      - packages/react-native/ios/libs
+      - packages/react-native
     expire_in: 1 week
+  rules:
+    - !reference [.rn-sdk-workflow, rules]
+    - !reference [.rs-core-workflow, rules]
+    - !reference [.app-workflow, rules]