Skip to content

Commit a487def

Browse files
authored
fix!: update multiformats to v11.x.x (#435)
The CID class in multiformats 11 has a breaking change so update all deps and project config to use the new version. Also remove lerna as now aegir has run and exec commands.
1 parent 6ec3b4c commit a487def

File tree

6 files changed

+37
-83
lines changed

6 files changed

+37
-83
lines changed

.gitignore

+6-38
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,8 @@
1-
docs
2-
yarn.lock
3-
package-lock.json
4-
5-
test-repo-for*
6-
.vscode
7-
.eslintrc
8-
# Logs
9-
logs
10-
*.log
11-
12-
coverage
13-
.coverage
14-
15-
# Runtime data
16-
pids
17-
*.pid
18-
*.seed
19-
20-
# Directory for instrumented libs generated by jscoverage/JSCover
21-
lib-cov
22-
23-
# Coverage directory used by tools like istanbul
24-
coverage
25-
.nyc_output
26-
27-
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
28-
.grunt
29-
30-
# node-waf configuration
31-
.lock-wscript
32-
33-
build
34-
35-
# Dependency directory
36-
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
371
node_modules
38-
2+
build
393
dist
40-
types
4+
.docs
5+
.coverage
6+
node_modules
7+
package-lock.json
8+
yarn.lock

lerna.json

-13
This file was deleted.

package.json

+15-16
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,23 @@
1717
},
1818
"private": true,
1919
"scripts": {
20-
"reset": "lerna run clean && rimraf ./node_modules ./package-lock.json packages/*/node_modules packages/*/package-lock.json packages/*/dist",
21-
"test": "lerna run --concurrency 1 test -- --",
22-
"test:node": "lerna run --concurrency 1 test:node -- --",
23-
"test:chrome": "lerna run --concurrency 1 test:chrome -- --",
24-
"test:chrome-webworker": "lerna --concurrency 1 run test:chrome-webworker -- --",
25-
"test:firefox": "lerna run --concurrency 1 test:firefox -- --",
26-
"test:firefox-webworker": "lerna run --concurrency 1 test:firefox-webworker -- --",
27-
"test:electron-main": "lerna run --concurrency 1 test:electron-main -- --",
28-
"test:electron-renderer": "lerna run --concurrency 1 test:electron-renderer -- --",
29-
"clean": "lerna run clean",
30-
"build": "lerna run build",
31-
"lint": "lerna run lint",
32-
"dep-check": "lerna run dep-check",
33-
"release": "lerna run --concurrency 1 release -- --"
20+
"reset": "aegir run clean && aegir clean ./node_modules ./package-lock.json packages/*/node_modules packages/*/package-lock.json packages/*/dist",
21+
"test": "aegir run test",
22+
"test:node": "aegir run test:node",
23+
"test:chrome": "aegir run test:chrome",
24+
"test:chrome-webworker": "aegir run test:chrome-webworker",
25+
"test:firefox": "aegir run test:firefox",
26+
"test:firefox-webworker": "aegir run test:firefox-webworker",
27+
"test:electron-main": "aegir run test:electron-main",
28+
"test:electron-renderer": "aegir run test:electron-renderer",
29+
"clean": "aegir run clean",
30+
"build": "aegir run build",
31+
"lint": "aegir run lint",
32+
"dep-check": "aegir run dep-check",
33+
"release": "aegir run release"
3434
},
3535
"dependencies": {
36-
"lerna": "^6.0.0",
37-
"rimraf": "^3.0.2"
36+
"aegir": "^37.9.1"
3837
},
3938
"workspaces": [
4039
"packages/*"

packages/ipfs-repo-migrations/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -169,16 +169,16 @@
169169
"dep-check": "aegir dep-check -i interface-blockstore -i npm-run-all"
170170
},
171171
"dependencies": {
172-
"@ipld/dag-pb": "^3.0.0",
172+
"@ipld/dag-pb": "^4.0.0",
173173
"@multiformats/multiaddr": "^11.0.0",
174174
"cborg": "^1.3.4",
175175
"datastore-core": "^8.0.1",
176176
"debug": "^4.1.0",
177177
"fnv1a": "^1.0.1",
178-
"interface-blockstore": "^3.0.0",
178+
"interface-blockstore": "^4.0.0",
179179
"interface-datastore": "^7.0.0",
180180
"it-length": "^2.0.0",
181-
"multiformats": "^10.0.1",
181+
"multiformats": "^11.0.0",
182182
"protobufjs": "^7.0.0",
183183
"uint8arrays": "^4.0.2",
184184
"varint": "^6.0.0"
@@ -187,10 +187,10 @@
187187
"@ipld/car": "^5.0.0",
188188
"@types/debug": "^4.1.5",
189189
"@types/varint": "^6.0.0",
190-
"aegir": "^37.5.0",
190+
"aegir": "^37.9.1",
191191
"aws-sdk": "^2.884.0",
192-
"blockstore-core": "^2.0.0",
193-
"blockstore-datastore-adapter": "^4.0.0",
192+
"blockstore-core": "^3.0.0",
193+
"blockstore-datastore-adapter": "^5.0.0",
194194
"datastore-fs": "^8.0.0",
195195
"datastore-level": "^9.0.0",
196196
"datastore-s3": "^10.0.0",
@@ -199,7 +199,7 @@
199199
"level-6": "npm:level@^6.0.0",
200200
"npm-run-all": "^4.1.5",
201201
"protobufjs-cli": "^1.0.0",
202-
"sinon": "^14.0.0"
202+
"sinon": "^15.0.1"
203203
},
204204
"browser": {
205205
"datastore-fs": "datastore-level"

packages/ipfs-repo-migrations/src/migrations/migration-9/pin-set.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function readHeader (rootNode) {
3737
}
3838

3939
const hdrLength = varint.decode(rootData)
40-
const vBytes = varint.decode.bytes
40+
const vBytes = varint.decode.bytes ?? 0
4141

4242
if (vBytes <= 0) {
4343
throw new Error('Invalid Set header length')

packages/ipfs-repo/package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -180,13 +180,13 @@
180180
"dep-check": "aegir dep-check -i interface-blockstore"
181181
},
182182
"dependencies": {
183-
"@ipld/dag-pb": "^3.0.0",
183+
"@ipld/dag-pb": "^4.0.0",
184184
"bytes": "^3.1.0",
185185
"cborg": "^1.3.4",
186186
"datastore-core": "^8.0.1",
187187
"debug": "^4.1.0",
188188
"err-code": "^3.0.1",
189-
"interface-blockstore": "^3.0.0",
189+
"interface-blockstore": "^4.0.0",
190190
"interface-datastore": "^7.0.0",
191191
"ipfs-repo-migrations": "^14.0.0",
192192
"it-drain": "^2.0.0",
@@ -201,27 +201,27 @@
201201
"just-safe-set": "^4.1.1",
202202
"merge-options": "^3.0.4",
203203
"mortice": "^3.0.0",
204-
"multiformats": "^10.0.1",
204+
"multiformats": "^11.0.0",
205205
"p-queue": "^7.3.0",
206206
"proper-lockfile": "^4.0.0",
207207
"quick-lru": "^6.1.1",
208208
"sort-keys": "^5.0.0",
209209
"uint8arrays": "^4.0.2"
210210
},
211211
"devDependencies": {
212-
"@ipld/dag-cbor": "^8.0.0",
212+
"@ipld/dag-cbor": "^9.0.0",
213213
"@types/bytes": "^3.1.0",
214214
"@types/debug": "^4.1.5",
215215
"@types/proper-lockfile": "^4.1.1",
216216
"@types/rimraf": "^3.0.2",
217-
"aegir": "^37.5.0",
218-
"blockstore-core": "^2.0.0",
219-
"blockstore-datastore-adapter": "^4.0.0",
217+
"aegir": "^37.9.1",
218+
"blockstore-core": "^3.0.0",
219+
"blockstore-datastore-adapter": "^5.0.0",
220220
"ipfs-utils": "^9.0.7",
221221
"it-all": "^2.0.0",
222222
"just-range": "^4.1.1",
223223
"rimraf": "^3.0.2",
224-
"sinon": "^14.0.0"
224+
"sinon": "^15.0.1"
225225
},
226226
"browser": {
227227
"rimraf": false

0 commit comments

Comments
 (0)