From a487def236afef3a8372b204d0f7709a4a0b5424 Mon Sep 17 00:00:00 2001 From: Alex Potsides Date: Fri, 6 Jan 2023 15:49:03 +0000 Subject: [PATCH] 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. --- .gitignore | 44 +++---------------- lerna.json | 13 ------ package.json | 31 +++++++------ packages/ipfs-repo-migrations/package.json | 14 +++--- .../src/migrations/migration-9/pin-set.js | 2 +- packages/ipfs-repo/package.json | 16 +++---- 6 files changed, 37 insertions(+), 83 deletions(-) delete mode 100644 lerna.json diff --git a/.gitignore b/.gitignore index 4208fdba..910f6339 100644 --- a/.gitignore +++ b/.gitignore @@ -1,40 +1,8 @@ -docs -yarn.lock -package-lock.json - -test-repo-for* -.vscode -.eslintrc -# Logs -logs -*.log - -coverage -.coverage - -# Runtime data -pids -*.pid -*.seed - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage -.nyc_output - -# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# node-waf configuration -.lock-wscript - -build - -# Dependency directory -# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git node_modules - +build dist -types +.docs +.coverage +node_modules +package-lock.json +yarn.lock diff --git a/lerna.json b/lerna.json deleted file mode 100644 index fe9f1a3a..00000000 --- a/lerna.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "lerna": "5.4.0", - "useWorkspaces": true, - "version": "independent", - "command": { - "run": { - "stream": true - } - }, - "packages": [ - "packages/*" - ] -} diff --git a/package.json b/package.json index 8fef1576..895bcbe5 100644 --- a/package.json +++ b/package.json @@ -17,24 +17,23 @@ }, "private": true, "scripts": { - "reset": "lerna run clean && rimraf ./node_modules ./package-lock.json packages/*/node_modules packages/*/package-lock.json packages/*/dist", - "test": "lerna run --concurrency 1 test -- --", - "test:node": "lerna run --concurrency 1 test:node -- --", - "test:chrome": "lerna run --concurrency 1 test:chrome -- --", - "test:chrome-webworker": "lerna --concurrency 1 run test:chrome-webworker -- --", - "test:firefox": "lerna run --concurrency 1 test:firefox -- --", - "test:firefox-webworker": "lerna run --concurrency 1 test:firefox-webworker -- --", - "test:electron-main": "lerna run --concurrency 1 test:electron-main -- --", - "test:electron-renderer": "lerna run --concurrency 1 test:electron-renderer -- --", - "clean": "lerna run clean", - "build": "lerna run build", - "lint": "lerna run lint", - "dep-check": "lerna run dep-check", - "release": "lerna run --concurrency 1 release -- --" + "reset": "aegir run clean && aegir clean ./node_modules ./package-lock.json packages/*/node_modules packages/*/package-lock.json packages/*/dist", + "test": "aegir run test", + "test:node": "aegir run test:node", + "test:chrome": "aegir run test:chrome", + "test:chrome-webworker": "aegir run test:chrome-webworker", + "test:firefox": "aegir run test:firefox", + "test:firefox-webworker": "aegir run test:firefox-webworker", + "test:electron-main": "aegir run test:electron-main", + "test:electron-renderer": "aegir run test:electron-renderer", + "clean": "aegir run clean", + "build": "aegir run build", + "lint": "aegir run lint", + "dep-check": "aegir run dep-check", + "release": "aegir run release" }, "dependencies": { - "lerna": "^6.0.0", - "rimraf": "^3.0.2" + "aegir": "^37.9.1" }, "workspaces": [ "packages/*" diff --git a/packages/ipfs-repo-migrations/package.json b/packages/ipfs-repo-migrations/package.json index eec7ef3b..025a847d 100644 --- a/packages/ipfs-repo-migrations/package.json +++ b/packages/ipfs-repo-migrations/package.json @@ -169,16 +169,16 @@ "dep-check": "aegir dep-check -i interface-blockstore -i npm-run-all" }, "dependencies": { - "@ipld/dag-pb": "^3.0.0", + "@ipld/dag-pb": "^4.0.0", "@multiformats/multiaddr": "^11.0.0", "cborg": "^1.3.4", "datastore-core": "^8.0.1", "debug": "^4.1.0", "fnv1a": "^1.0.1", - "interface-blockstore": "^3.0.0", + "interface-blockstore": "^4.0.0", "interface-datastore": "^7.0.0", "it-length": "^2.0.0", - "multiformats": "^10.0.1", + "multiformats": "^11.0.0", "protobufjs": "^7.0.0", "uint8arrays": "^4.0.2", "varint": "^6.0.0" @@ -187,10 +187,10 @@ "@ipld/car": "^5.0.0", "@types/debug": "^4.1.5", "@types/varint": "^6.0.0", - "aegir": "^37.5.0", + "aegir": "^37.9.1", "aws-sdk": "^2.884.0", - "blockstore-core": "^2.0.0", - "blockstore-datastore-adapter": "^4.0.0", + "blockstore-core": "^3.0.0", + "blockstore-datastore-adapter": "^5.0.0", "datastore-fs": "^8.0.0", "datastore-level": "^9.0.0", "datastore-s3": "^10.0.0", @@ -199,7 +199,7 @@ "level-6": "npm:level@^6.0.0", "npm-run-all": "^4.1.5", "protobufjs-cli": "^1.0.0", - "sinon": "^14.0.0" + "sinon": "^15.0.1" }, "browser": { "datastore-fs": "datastore-level" diff --git a/packages/ipfs-repo-migrations/src/migrations/migration-9/pin-set.js b/packages/ipfs-repo-migrations/src/migrations/migration-9/pin-set.js index 78c2947e..0950b4ab 100644 --- a/packages/ipfs-repo-migrations/src/migrations/migration-9/pin-set.js +++ b/packages/ipfs-repo-migrations/src/migrations/migration-9/pin-set.js @@ -37,7 +37,7 @@ function readHeader (rootNode) { } const hdrLength = varint.decode(rootData) - const vBytes = varint.decode.bytes + const vBytes = varint.decode.bytes ?? 0 if (vBytes <= 0) { throw new Error('Invalid Set header length') diff --git a/packages/ipfs-repo/package.json b/packages/ipfs-repo/package.json index e578fa60..0116b021 100644 --- a/packages/ipfs-repo/package.json +++ b/packages/ipfs-repo/package.json @@ -180,13 +180,13 @@ "dep-check": "aegir dep-check -i interface-blockstore" }, "dependencies": { - "@ipld/dag-pb": "^3.0.0", + "@ipld/dag-pb": "^4.0.0", "bytes": "^3.1.0", "cborg": "^1.3.4", "datastore-core": "^8.0.1", "debug": "^4.1.0", "err-code": "^3.0.1", - "interface-blockstore": "^3.0.0", + "interface-blockstore": "^4.0.0", "interface-datastore": "^7.0.0", "ipfs-repo-migrations": "^14.0.0", "it-drain": "^2.0.0", @@ -201,7 +201,7 @@ "just-safe-set": "^4.1.1", "merge-options": "^3.0.4", "mortice": "^3.0.0", - "multiformats": "^10.0.1", + "multiformats": "^11.0.0", "p-queue": "^7.3.0", "proper-lockfile": "^4.0.0", "quick-lru": "^6.1.1", @@ -209,19 +209,19 @@ "uint8arrays": "^4.0.2" }, "devDependencies": { - "@ipld/dag-cbor": "^8.0.0", + "@ipld/dag-cbor": "^9.0.0", "@types/bytes": "^3.1.0", "@types/debug": "^4.1.5", "@types/proper-lockfile": "^4.1.1", "@types/rimraf": "^3.0.2", - "aegir": "^37.5.0", - "blockstore-core": "^2.0.0", - "blockstore-datastore-adapter": "^4.0.0", + "aegir": "^37.9.1", + "blockstore-core": "^3.0.0", + "blockstore-datastore-adapter": "^5.0.0", "ipfs-utils": "^9.0.7", "it-all": "^2.0.0", "just-range": "^4.1.1", "rimraf": "^3.0.2", - "sinon": "^14.0.0" + "sinon": "^15.0.1" }, "browser": { "rimraf": false