Skip to content

refactor: simplify build-backend.ts; rollup writes directly to native asset trees#34

Merged
achou11 merged 8 commits into
mainfrom
refactor/build-backend-cleanup
Apr 29, 2026
Merged

refactor: simplify build-backend.ts; rollup writes directly to native asset trees#34
achou11 merged 8 commits into
mainfrom
refactor/build-backend-cleanup

Conversation

@gmaclennan

@gmaclennan gmaclennan commented Apr 28, 2026

Copy link
Copy Markdown
Member

Summary

  • Collapses three layers of intermediate staging in scripts/build-backend.ts into one direct rollup write. Rollup outputs straight into android/src/main/assets/nodejs-project/ and ios/nodejs-project/ via OUTPUT_DIR_ANDROID / OUTPUT_DIR_IOS env vars; a new copyStaticAssetsPlugin in backend/rollup.config.js handles the static asset copies (drizzle SQL, default config, native module package.json/binding.gyp) that the script used to do post-bundle.
  • The orchestrator drops from ~580 lines to ~115 and reads top-to-bottom as five labeled phases. Per-domain helpers move out into scripts/lib/ modules: native-modules.ts, prebuilds.ts, android-jni.ts, ios-frameworks.ts, node-versions.ts.
  • NATIVE_MODULES is now a single source of truth at backend/native-modules.js, imported by both rollup and the build script (no more duplicate hand-maintained list).
  • npm ci moves out of the build script into a prebackend:build npm hook (npm run backend:install → npm ci --ignore-scripts --prefix backend). Build script assumes backend/node_modules is current; the hook handles the install.

Standalone cd backend && npm run build still works for debugging — OUTPUT_DIR_* env vars fall back to backend/dist/<platform>/.

Test plan

  • npm run backend:build from clean state: rollup produces both bundles, prebuilds download, Android jniLibs and iOS xcframeworks emit, scratch dir cleaned up
  • iOS: xcodebuild test against booted iPhone 16 simulator — 4/4 tests pass (ComapeoCoreModuleTests, CoreManagerSmokeTest, ServiceLifecycleTest)
  • Android: ./e2e/run-instrumented-tests.sh against booted emulator — 16/16 instrumented tests pass
  • CI: ios-tests and android-tests workflows green

🤖 Generated with Claude Code

gmaclennan and others added 7 commits April 28, 2026 23:05
@gmaclennan @claude
refactor: simplify build-backend.ts and let rollup write directly
83c722d 
Collapses three layers of intermediate staging into one direct write:
rollup now outputs straight into android/src/main/assets/nodejs-project
and ios/nodejs-project via OUTPUT_DIR_ANDROID / OUTPUT_DIR_IOS env vars,
with a copyStaticAssetsPlugin in rollup.config.js handling the static
asset copies (drizzle SQL, default config, native module package.json,
etc.) that build-backend.ts used to do post-bundle.

The orchestrator drops from ~580 lines to ~115 and reads top-to-bottom
as five labeled phases. Per-domain helpers move into scripts/lib/:
native-modules, prebuilds, android-jni, ios-frameworks, node-versions.
NATIVE_MODULES is now a shared backend/native-modules.js so both rollup
and build-backend.ts import the same source of truth.

`npm ci` moves out of the build script into a `prebackend:build` npm
hook. Build script assumes node_modules is current; the hook handles
the install.

Validated locally: iOS xctest (4 tests, including CoreManagerSmokeTest
and ServiceLifecycleTest) and Android instrumented suite (16 tests)
both pass on a real simulator/emulator after a clean rebuild.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@gmaclennan @claude
chore: drop native module package.json/binding.gyp from bundle
3789e24 
Every loader callsite (`require('bindings')`, `require('node-gyp-build')`,
`require.addon()`) is rewritten to `__loadAddon(name, version)` at
bundle time by rollup-plugin-addon-loader.js. Bare's addon resolver —
the only thing that ever consulted these metadata files — never runs
at runtime, so shipping them in the unpacked nodejs-project tree is
dead weight.

Validated against the same iOS xctest suite (4/4 pass, including
better-sqlite3 + sodium-native via CoreManagerSmokeTest) and Android
instrumented suite (16/16 pass) used in the parent commit. Confirmed
the rebuilt APK contains zero `node_modules/<native-module>/{package.json,binding.gyp}`
entries.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@gmaclennan @claude
chore: review feedback — relocate native-modules, prune NativePair, a…
845347f 
…sync cp

- Move NATIVE_MODULES from backend/native-modules.js into
  scripts/lib/native-modules.ts (only consumer after the metadata-
  copy deletion). Drops the cross-directory .js↔.ts re-export.
- Slim NativePair to { name, version, usesNapi }; drop unused
  packageDir + isTopLevel fields. findNativeModuleVersions now
  returns just versions.
- Switch rollup copyStaticAssetsPlugin from sync cpSync to async cp
  with Promise.all over the asset list.
- Drop the stale "native module package.json" reference from the
  phase-3 comment in build-backend.ts.

Local validation: backend:build green, iOS xctest 4/4 pass.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@achou11
convert rollup config to ts
6f2a78b
@gmaclennan
don't cleanup scratch after build
55a4c2b
@gmaclennan
update bundleId for frameworks
509c77d
@achou11
build backend for android debug
3c04030 
outputs backend assets to android/src/debug/... with the main
difference being that the bundled JS is not minified.

bundled JS is minified for android main and ios outputs.
@socket-security

socket-security Bot commented Apr 29, 2026 •
edited
Loading

Copy link
Copy Markdown

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff Package Supply Chain
Security		 Vulnerability Quality Maintenance License
Addedreact-native-safe-area-context@​5.6.21001007886100
Addedtypescript@​5.9.3100100909990
Addedreact-native@​0.83.69110099100100

View full report

@achou11 achou11 merged commit 1f10a8a into main Apr 29, 2026
7 checks passed
@achou11 achou11 deleted the refactor/build-backend-cleanup branch April 29, 2026 11:52
@optic-release-automation optic-release-automation Bot mentioned this pull request Jun 22, 2026
Merged
gmaclennan added a commit that referenced this pull request Jun 22, 2026
@gmaclennan
[OPTIC-RELEASE-AUTOMATION] release/v1.0.0-pre.2 (#112)
15131a5 
## Optic Release Automation

This **draft** PR is opened by Github action
[optic-release-automation-action](https://github.com/nearform-actions/optic-release-automation-action).

A new **draft** GitHub release
[v1.0.0-pre.2](https://github.com/digidem/comapeo-core-react-native/releases/tag/untagged-c499977757c9745e56b2)
has been created.

Release author: @gmaclennan

#### If you want to go ahead with the release, please merge this PR.
When you merge:

- The GitHub release will be published

- The npm package with tag pre will be published according to the
publishing rules you have configured



- No major or minor tags will be updated as configured


#### If you close the PR

- The new draft release will be deleted and nothing will change

## What's Changed
* Android Testing Infrastructure & Bug Fixes by @gmaclennan in
#3
* chore: prebuild example/android; harden instrumented tests by
@gmaclennan in
#10
* Integrate @comapeo/core via IPC over Unix sockets by @gmaclennan in
#5
* chore: adjust repo setup by @achou11 in
#12
* chore: minor fixes based on expo-doctor by @achou11 in
#13
* Add iOS support & test infrastructure by @gmaclennan in
#6
* chore: add architecture docs & plans by @gmaclennan in
#11
* update some native deps used in backend by @achou11 in
#14
* iOS Phase 1: unified JS bundle + smoke test (simulator-only) by
@gmaclennan in
#15
* iOS Phase 2: xcframework Embed & Sign for native addons by @gmaclennan
in #16
* Phase 2 Android: jniLibs packaging + unified rollup loader plugin by
@gmaclennan in
#17
* chore: post-Phase-2 cleanup — comments, plan docs, agents.md by
@gmaclennan in
#33
* android: read abiFilters from reactNativeArchitectures (#30) by
@gmaclennan in
#35
* refactor: simplify build-backend.ts; rollup writes directly to native
asset trees by @gmaclennan in
#34
* chore: fix eslint configuration by @achou11 in
#41
* android: audit 16 KB page alignment on every shipped .so by
@gmaclennan in
#43
* Add rootkey persistence and lifecycle state management by @gmaclennan
in #36
* chore: move example app into apps directory by @achou11 in
#18
* refactor: per-component lifecycle state with derived ComapeoState by
@gmaclennan in
#47
* android: fold waitForFile into connect retry loop by @gmaclennan in
#52
* chore: add e2e testing app by @achou11 in
#49
* fix(android): drop setUnlockedDeviceRequired from rootkey wrapper key
by @gmaclennan in
#57
* fix(backend): cache stopping/error frames for late joiners by
@gmaclennan in
#58
* fix(ios-tests): wait for STOPPING before signalling node exit by
@gmaclennan in
#59
* fix(android): drain JNI stdio pumps before returning from node::Start
by @gmaclennan in
#60
* Sentry integration: Phase 1 + Phase 2a + Phase 2b by @gmaclennan in
#54
* feat(backend): polywasm-backed undici on iOS, re-enable maps plugin by
@gmaclennan in
#62
* ci: drop unreliable Android emulator snapshot caching by @gmaclennan
in #64
* feat(sentry): land Phase 3 — backend loader + RPC tracing by
@gmaclennan in
#63
* fix(ios-tests): serialise STOPPING/STOPPED observers in
testFullLifecycleStateTransitions by @gmaclennan in
#71
* use npm list instead of custom traversal to get native module versions
by @achou11 in
#70
* feat(sentry): land Phases 6 + 7a — Android exit reasons & iOS
MetricKit app-exit telemetry by @gmaclennan in
#72
* fix(sentry): make exit telemetry lossless and stop cross-process
clobbering by @gmaclennan in
#84
* chore(e2e): add e2e tests on browserstack via Maestro by @achou11 in
#56
* feat(sentry): migrate to @sentry/react-native v8; exit telemetry as
Application Metrics by @gmaclennan in
#73
* Map server integration by @gmaclennan in
#86
* chore(deps): upgrade to Expo SDK 56 (React Native 0.85) by @gmaclennan
in #87
* chore(ci): add release workflow by @gmaclennan in
#90
* chore: fix npm script and release build script by @gmaclennan in
#91
* chore(pack): don't try to package build files by @gmaclennan in
#92
* fix: start fastify listening by @gmaclennan in
#93
* perf(backend): switch bundler from rollup to rolldown by @gmaclennan
in #94
* fix(ci): ignore-scripts in ios npm installs by @gmaclennan in
#96
* fix(ci): replace --ignore-scripts with npm strict-allow-scripts
allowlist by @gmaclennan in
#106
* feat(config): let the consuming app supply the default project config
by @gmaclennan in
#95
* chore(release): merge prerelease branch. by @gmaclennan in
#110

## New Contributors
* @achou11 made their first contribution in
#12

**Full Changelog**:
https://github.com/digidem/comapeo-core-react-native/commits/v1.0.0-pre.2

<!--

<release-meta>{"id":342868678,"version":"v1.0.0-pre.2","npmTag":"pre","opticUrl":"https://optic-zf3votdk5a-ew.a.run.app/api/generate/"}</release-meta>
-->
@gmaclennan gmaclennan added the maintenance Refactor / test / chore / ci / build (changelog) label Jun 22, 2026
@optic-release-automation optic-release-automation Bot mentioned this pull request Jun 22, 2026
Merged
gmaclennan added a commit that referenced this pull request Jun 22, 2026
@gmaclennan
[OPTIC-RELEASE-AUTOMATION] release/v1.0.0-pre.2 (#133)
20a3454 
## Optic Release Automation

This **draft** PR is opened by Github action
[optic-release-automation-action](https://github.com/nearform-actions/optic-release-automation-action).

A new **draft** GitHub release
[v1.0.0-pre.2](https://github.com/digidem/comapeo-core-react-native/releases/tag/untagged-352a6c41c12fd02dec37)
has been created.

Release author: @gmaclennan

#### If you want to go ahead with the release, please merge this PR.
When you merge:

- The GitHub release will be published

- The npm package with tag pre will be published according to the
publishing rules you have configured



- No major or minor tags will be updated as configured


#### If you close the PR

- The new draft release will be deleted and nothing will change

<!-- Release notes generated using configuration in .github/release.yml
at 7fe80b4 -->

## What's Changed
### 🚀 Features
* Integrate @comapeo/core via IPC over Unix sockets by @gmaclennan in
#5
* Add iOS support & test infrastructure by @gmaclennan in
#6
* iOS Phase 1: unified JS bundle + smoke test (simulator-only) by
@gmaclennan in
#15
* iOS Phase 2: xcframework Embed & Sign for native addons by @gmaclennan
in #16
* Phase 2 Android: jniLibs packaging + unified rollup loader plugin by
@gmaclennan in
#17
* android: read abiFilters from reactNativeArchitectures (#30) by
@gmaclennan in
#35
* Add rootkey persistence and lifecycle state management by @gmaclennan
in #36
* Sentry integration: Phase 1 + Phase 2a + Phase 2b by @gmaclennan in
#54
* feat(backend): polywasm-backed undici on iOS, re-enable maps plugin by
@gmaclennan in
#62
* feat(sentry): land Phase 3 — backend loader + RPC tracing by
@gmaclennan in
#63
* feat(sentry): land Phases 6 + 7a — Android exit reasons & iOS
MetricKit app-exit telemetry by @gmaclennan in
#72
* feat(sentry): migrate to @sentry/react-native v8; exit telemetry as
Application Metrics by @gmaclennan in
#73
* Map server integration by @gmaclennan in
#86
* feat(config): let the consuming app supply the default project config
by @gmaclennan in
#95
### 🐛 Bug Fixes
* fix(android): drop setUnlockedDeviceRequired from rootkey wrapper key
by @gmaclennan in
#57
* fix(backend): cache stopping/error frames for late joiners by
@gmaclennan in
#58
* fix(ios-tests): wait for STOPPING before signalling node exit by
@gmaclennan in
#59
* fix(android): drain JNI stdio pumps before returning from node::Start
by @gmaclennan in
#60
* fix(ios-tests): serialise STOPPING/STOPPED observers in
testFullLifecycleStateTransitions by @gmaclennan in
#71
* fix(sentry): make exit telemetry lossless and stop cross-process
clobbering by @gmaclennan in
#84
* fix: start fastify listening by @gmaclennan in
#93
* fix(ci): ignore-scripts in ios npm installs by @gmaclennan in
#96
* fix(ci): replace --ignore-scripts with npm strict-allow-scripts
allowlist by @gmaclennan in
#106
* fix(release): stop `npm pack --dry-run` leaking dry-run into backend
install by @gmaclennan in
#129
### ⚡ Performance
* perf(backend): switch bundler from rollup to rolldown by @gmaclennan
in #94
### ⬆️ Dependencies
* update some native deps used in backend by @achou11 in
#14
* chore(deps): upgrade to Expo SDK 56 (React Native 0.85) by @gmaclennan
in #87
### 🏗️ Maintenance
* Android Testing Infrastructure & Bug Fixes by @gmaclennan in
#3
* chore: prebuild example/android; harden instrumented tests by
@gmaclennan in
#10
* chore: adjust repo setup by @achou11 in
#12
* chore: minor fixes based on expo-doctor by @achou11 in
#13
* chore: add architecture docs & plans by @gmaclennan in
#11
* chore: post-Phase-2 cleanup — comments, plan docs, agents.md by
@gmaclennan in
#33
* refactor: simplify build-backend.ts; rollup writes directly to native
asset trees by @gmaclennan in
#34
* chore: fix eslint configuration by @achou11 in
#41
* android: audit 16 KB page alignment on every shipped .so by
@gmaclennan in
#43
* chore: move example app into apps directory by @achou11 in
#18
* refactor: per-component lifecycle state with derived ComapeoState by
@gmaclennan in
#47
* android: fold waitForFile into connect retry loop by @gmaclennan in
#52
* chore: add e2e testing app by @achou11 in
#49
* ci: drop unreliable Android emulator snapshot caching by @gmaclennan
in #64
* use npm list instead of custom traversal to get native module versions
by @achou11 in
#70
* chore(e2e): add e2e tests on browserstack via Maestro by @achou11 in
#56
* chore(ci): add release workflow by @gmaclennan in
#90
* chore: fix npm script and release build script by @gmaclennan in
#91
* chore(pack): don't try to package build files by @gmaclennan in
#92
* chore(release): merge prerelease branch. by @gmaclennan in
#110
* ci(e2e): retry BrowserStack builds on infra-class flakes by
@gmaclennan in
#113
### Other Changes
* ci: derive changelog labels from PR titles + add Dependabot by
@gmaclennan in
#114

## New Contributors
* @achou11 made their first contribution in
#12
* @optic-release-automation[bot] made their first contribution in
#112

**Full Changelog**:
https://github.com/digidem/comapeo-core-react-native/commits/v1.0.0-pre.2

<!--

<release-meta>{"id":342970724,"version":"v1.0.0-pre.2","npmTag":"pre","opticUrl":"https://optic-zf3votdk5a-ew.a.run.app/api/generate/"}</release-meta>
-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@achou11 achou11 achou11 approved these changes

Assignees

No one assigned

Labels

maintenance Refactor / test / chore / ci / build (changelog)

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@gmaclennan @achou11