Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@
],
"dependencies": {
"@automerge/automerge": "3.3.0-fragments.1",
"@automerge/automerge-repo": "2.6.0-subduction.29",
"@automerge/automerge-repo": "github:automerge/automerge-repo#feed-macrotasks&path:packages/automerge-repo",
"@automerge/automerge-repo-network-websocket": "2.6.0-subduction.29",
"@automerge/automerge-repo-storage-nodefs": "2.6.0-subduction.29",
"@automerge/automerge-repo-storage-nodefs": "github:automerge/automerge-repo#feed-macrotasks&path:packages/automerge-repo-storage-nodefs",
"@automerge/automerge-subduction": "0.15.0",
"@commander-js/extra-typings": "^14.0.0",
"chalk": "^5.3.0",
Expand All @@ -71,10 +71,5 @@
"tsx": "^4.19.2",
"typescript": "^5.2.0",
"vitest": "^2.1.0"
},
"pnpm": {
"overrides": {
"@automerge/automerge": "3.3.0-fragments.1"
}
}
}
29 changes: 17 additions & 12 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 26 additions & 3 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
allowBuilds:
cbor-extract: true
esbuild: true
# pnpm settings live here: pnpm >=10.3x silently ignores the package.json
# "pnpm" field.

# Force a single @automerge/automerge so the CJS and ESM module graphs share
# one Wasm instance. Two copies = two Wasm heaps = documents can't be shared
# across them.
overrides:
"@automerge/automerge": 3.3.0-fragments.1
# storage-nodefs's git dependency declares its automerge-repo dep by version
# (rewritten from workspace:*); redirect it to the same git ref the top-level
# dependency uses so there is exactly one automerge-repo copy.
"@automerge/automerge-repo": github:automerge/automerge-repo#feed-macrotasks&path:packages/automerge-repo

# The am-repo git dependencies build themselves on install (their `prepare:
# tsc`; dist/ is gitignored upstream). pnpm blocks dependency build scripts
# unless allowlisted.
onlyBuiltDependencies:
- "@automerge/automerge-repo"
- "@automerge/automerge-repo-storage-nodefs"
- cbor-extract
- esbuild

# The automerge-repo override above surfaces a git URL as a *sub*dependency
# (storage-nodefs -> automerge-repo), which pnpm's supply-chain guard blocks by
# default. We trust this monorepo.
blockExoticSubdeps: false
Loading