From e446b33ede07e486fb4cad5cabbdc1e55473da36 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Mon, 4 Apr 2022 08:05:34 +0100 Subject: [PATCH 1/8] fix: fix build We used to have 'fs' in our dep tree via ora via mock-ipfs-pinning-service but that seems to have changed. We only want to import 'fs' during node tests but esbuild tries to resolve it, so make the import dynamic. --- .../test/files/normalise-input-multiple.spec.js | 3 ++- .../ipfs-core-utils/test/files/normalise-input-single.spec.js | 3 ++- packages/ipfs-http-server/package.json | 1 + packages/ipfs/package.json | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/ipfs-core-utils/test/files/normalise-input-multiple.spec.js b/packages/ipfs-core-utils/test/files/normalise-input-multiple.spec.js index 21614201e4..d0fd03883d 100644 --- a/packages/ipfs-core-utils/test/files/normalise-input-multiple.spec.js +++ b/packages/ipfs-core-utils/test/files/normalise-input-multiple.spec.js @@ -262,7 +262,8 @@ describe('normalise-input-multiple', function () { let fs before(async () => { - fs = await import('fs') + // otherwise esbuild tries to resolve 'fs' + fs = await import('node-fs'.substring(5)) }) describe('Node fs.ReadStream', () => { diff --git a/packages/ipfs-core-utils/test/files/normalise-input-single.spec.js b/packages/ipfs-core-utils/test/files/normalise-input-single.spec.js index 6113e1db67..8a534a9447 100644 --- a/packages/ipfs-core-utils/test/files/normalise-input-single.spec.js +++ b/packages/ipfs-core-utils/test/files/normalise-input-single.spec.js @@ -255,7 +255,8 @@ describe('normalise-input-single', function () { let fs before(async () => { - fs = await import('fs') + // otherwise esbuild tries to resolve 'fs' + fs = await import('node-fs'.substring(5)) }) describe('Node fs.ReadStream', () => { diff --git a/packages/ipfs-http-server/package.json b/packages/ipfs-http-server/package.json index 0ce7d014b5..d79afda973 100644 --- a/packages/ipfs-http-server/package.json +++ b/packages/ipfs-http-server/package.json @@ -81,6 +81,7 @@ "devDependencies": { "@types/hapi-pino": "^8.0.1", "@types/hapi__hapi": "^20.0.5", + "@types/node": "^17.0.23", "aegir": "^36.0.1", "form-data": "^4.0.0", "ipfs-http-client": "^56.0.2", diff --git a/packages/ipfs/package.json b/packages/ipfs/package.json index 0d71c0bdd4..7fbc5da775 100644 --- a/packages/ipfs/package.json +++ b/packages/ipfs/package.json @@ -94,7 +94,7 @@ "iso-url": "^1.0.0", "libp2p-webrtc-star-signalling-server": "^0.1.1", "merge-options": "^3.0.4", - "mock-ipfs-pinning-service": "^0.1.2", + "mock-ipfs-pinning-service": "^0.4.1", "npm-run-all": "^4.1.5", "rimraf": "^3.0.2", "url": "^0.11.0", From 158f95d6426c722b3d91fb6f1ba7c487dfbe9cbe Mon Sep 17 00:00:00 2001 From: achingbrain Date: Mon, 4 Apr 2022 08:46:45 +0100 Subject: [PATCH 2/8] fix: pin gossipsub version --- packages/ipfs-core-config/package.json | 2 +- packages/ipfs-core/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ipfs-core-config/package.json b/packages/ipfs-core-config/package.json index 403807cf2f..eda930cb04 100644 --- a/packages/ipfs-core-config/package.json +++ b/packages/ipfs-core-config/package.json @@ -95,7 +95,7 @@ "it-foreach": "^0.1.1", "it-drain": "^1.0.3", "libp2p-floodsub": "^0.29.0", - "libp2p-gossipsub": "^0.13.0", + "libp2p-gossipsub": "0.13.0", "libp2p-kad-dht": "^0.28.5", "libp2p-mdns": "^0.18.0", "libp2p-mplex": "^0.10.2", diff --git a/packages/ipfs-core/package.json b/packages/ipfs-core/package.json index 09ba7f322a..b8ecf54f27 100644 --- a/packages/ipfs-core/package.json +++ b/packages/ipfs-core/package.json @@ -142,7 +142,7 @@ "interface-ipfs-core": "^0.154.2", "ipfsd-ctl": "^10.0.4", "iso-url": "^1.0.0", - "libp2p-gossipsub": "^0.13.0", + "libp2p-gossipsub": "0.13.0", "nanoid": "^3.1.23", "npm-run-all": "^4.1.5", "p-defer": "^3.0.0", From 295d8eb6903441f017cd4dcf255248234f774727 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Mon, 4 Apr 2022 08:58:54 +0100 Subject: [PATCH 3/8] chore: revert pinning service upgrade --- packages/ipfs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ipfs/package.json b/packages/ipfs/package.json index 7fbc5da775..0d71c0bdd4 100644 --- a/packages/ipfs/package.json +++ b/packages/ipfs/package.json @@ -94,7 +94,7 @@ "iso-url": "^1.0.0", "libp2p-webrtc-star-signalling-server": "^0.1.1", "merge-options": "^3.0.4", - "mock-ipfs-pinning-service": "^0.4.1", + "mock-ipfs-pinning-service": "^0.1.2", "npm-run-all": "^4.1.5", "rimraf": "^3.0.2", "url": "^0.11.0", From 3f3aaefcd3dbf5f959023f82c17b53ab1fee4ff7 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Mon, 4 Apr 2022 09:08:57 +0100 Subject: [PATCH 4/8] chore: add dummy fs package --- packages/ipfs-core-utils/package.json | 1 + .../test/files/normalise-input-multiple.spec.js | 3 +-- .../ipfs-core-utils/test/files/normalise-input-single.spec.js | 3 +-- packages/ipfs/package.json | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/ipfs-core-utils/package.json b/packages/ipfs-core-utils/package.json index d15f863947..0a6b1de9d2 100644 --- a/packages/ipfs-core-utils/package.json +++ b/packages/ipfs-core-utils/package.json @@ -138,6 +138,7 @@ "devDependencies": { "@web-std/file": "^1.1.2", "aegir": "^36.0.1", + "fs": "^0.0.1-security", "rimraf": "^3.0.2" } } diff --git a/packages/ipfs-core-utils/test/files/normalise-input-multiple.spec.js b/packages/ipfs-core-utils/test/files/normalise-input-multiple.spec.js index d0fd03883d..21614201e4 100644 --- a/packages/ipfs-core-utils/test/files/normalise-input-multiple.spec.js +++ b/packages/ipfs-core-utils/test/files/normalise-input-multiple.spec.js @@ -262,8 +262,7 @@ describe('normalise-input-multiple', function () { let fs before(async () => { - // otherwise esbuild tries to resolve 'fs' - fs = await import('node-fs'.substring(5)) + fs = await import('fs') }) describe('Node fs.ReadStream', () => { diff --git a/packages/ipfs-core-utils/test/files/normalise-input-single.spec.js b/packages/ipfs-core-utils/test/files/normalise-input-single.spec.js index 8a534a9447..6113e1db67 100644 --- a/packages/ipfs-core-utils/test/files/normalise-input-single.spec.js +++ b/packages/ipfs-core-utils/test/files/normalise-input-single.spec.js @@ -255,8 +255,7 @@ describe('normalise-input-single', function () { let fs before(async () => { - // otherwise esbuild tries to resolve 'fs' - fs = await import('node-fs'.substring(5)) + fs = await import('fs') }) describe('Node fs.ReadStream', () => { diff --git a/packages/ipfs/package.json b/packages/ipfs/package.json index 0d71c0bdd4..5472342249 100644 --- a/packages/ipfs/package.json +++ b/packages/ipfs/package.json @@ -83,6 +83,7 @@ "copyfiles": "^2.4.1", "cross-env": "^7.0.0", "electron-webrtc": "^0.3.0", + "fs": "^0.0.1-security", "go-ipfs": "0.11.0", "interface-ipfs-core": "^0.154.2", "ipfs-client": "^0.7.8", From 36c31c95dce4e4686a9db8c3379e26941c4942ee Mon Sep 17 00:00:00 2001 From: achingbrain Date: Mon, 4 Apr 2022 09:36:59 +0100 Subject: [PATCH 5/8] chore: use browser field insteaed --- packages/ipfs-core-utils/package.json | 4 +++- packages/ipfs/package.json | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/ipfs-core-utils/package.json b/packages/ipfs-core-utils/package.json index 0a6b1de9d2..6e1e5d1bef 100644 --- a/packages/ipfs-core-utils/package.json +++ b/packages/ipfs-core-utils/package.json @@ -138,7 +138,9 @@ "devDependencies": { "@web-std/file": "^1.1.2", "aegir": "^36.0.1", - "fs": "^0.0.1-security", "rimraf": "^3.0.2" + }, + "browser": { + "fs": false } } diff --git a/packages/ipfs/package.json b/packages/ipfs/package.json index 5472342249..0d71c0bdd4 100644 --- a/packages/ipfs/package.json +++ b/packages/ipfs/package.json @@ -83,7 +83,6 @@ "copyfiles": "^2.4.1", "cross-env": "^7.0.0", "electron-webrtc": "^0.3.0", - "fs": "^0.0.1-security", "go-ipfs": "0.11.0", "interface-ipfs-core": "^0.154.2", "ipfs-client": "^0.7.8", From 48430c73d0ae166cd97d5873212a2862df7867b7 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Mon, 4 Apr 2022 10:35:38 +0100 Subject: [PATCH 6/8] chore: update interop --- packages/ipfs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ipfs/package.json b/packages/ipfs/package.json index 0d71c0bdd4..051fd05527 100644 --- a/packages/ipfs/package.json +++ b/packages/ipfs/package.json @@ -88,7 +88,7 @@ "ipfs-client": "^0.7.8", "ipfs-core-types": "^0.10.2", "ipfs-http-client": "^56.0.2", - "ipfs-interop": "^8.0.8", + "ipfs-interop": "^8.0.9", "ipfs-utils": "^9.0.2", "ipfsd-ctl": "^10.0.4", "iso-url": "^1.0.0", From 6f0f64d776fb3545f582ccd5552f2a6fc170f4b9 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Mon, 4 Apr 2022 11:08:44 +0100 Subject: [PATCH 7/8] chore: update pinning service --- packages/ipfs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ipfs/package.json b/packages/ipfs/package.json index 051fd05527..1f9476400a 100644 --- a/packages/ipfs/package.json +++ b/packages/ipfs/package.json @@ -94,7 +94,7 @@ "iso-url": "^1.0.0", "libp2p-webrtc-star-signalling-server": "^0.1.1", "merge-options": "^3.0.4", - "mock-ipfs-pinning-service": "^0.1.2", + "mock-ipfs-pinning-service": "^0.4.1", "npm-run-all": "^4.1.5", "rimraf": "^3.0.2", "url": "^0.11.0", From 19142a5c7926ba32b2fdb1cb2278c4747f2317dc Mon Sep 17 00:00:00 2001 From: achingbrain Date: Mon, 4 Apr 2022 16:21:50 +0100 Subject: [PATCH 8/8] chore: update deps --- packages/ipfs-core/package.json | 2 +- packages/ipfs-http-client/package.json | 2 +- packages/ipfs/package.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/ipfs-core/package.json b/packages/ipfs-core/package.json index b8ecf54f27..5fa1bfcd65 100644 --- a/packages/ipfs-core/package.json +++ b/packages/ipfs-core/package.json @@ -137,7 +137,7 @@ "@types/rimraf": "^3.0.1", "aegir": "^36.0.1", "delay": "^5.0.0", - "go-ipfs": "0.11.0", + "go-ipfs": "0.12.1", "interface-blockstore-tests": "^2.0.2", "interface-ipfs-core": "^0.154.2", "ipfsd-ctl": "^10.0.4", diff --git a/packages/ipfs-http-client/package.json b/packages/ipfs-http-client/package.json index c922bf02aa..81a6de3218 100644 --- a/packages/ipfs-http-client/package.json +++ b/packages/ipfs-http-client/package.json @@ -76,7 +76,7 @@ "devDependencies": { "aegir": "^36.0.1", "delay": "^5.0.0", - "go-ipfs": "0.11.0", + "go-ipfs": "0.12.1", "ipfsd-ctl": "^10.0.4", "it-all": "^1.0.4", "it-first": "^1.0.4", diff --git a/packages/ipfs/package.json b/packages/ipfs/package.json index 1f9476400a..5760554539 100644 --- a/packages/ipfs/package.json +++ b/packages/ipfs/package.json @@ -83,7 +83,7 @@ "copyfiles": "^2.4.1", "cross-env": "^7.0.0", "electron-webrtc": "^0.3.0", - "go-ipfs": "0.11.0", + "go-ipfs": "0.12.1", "interface-ipfs-core": "^0.154.2", "ipfs-client": "^0.7.8", "ipfs-core-types": "^0.10.2", @@ -94,7 +94,7 @@ "iso-url": "^1.0.0", "libp2p-webrtc-star-signalling-server": "^0.1.1", "merge-options": "^3.0.4", - "mock-ipfs-pinning-service": "^0.4.1", + "mock-ipfs-pinning-service": "^0.4.2", "npm-run-all": "^4.1.5", "rimraf": "^3.0.2", "url": "^0.11.0",