From c2ed983baa35bd953493b05862197f2e0767fd4b Mon Sep 17 00:00:00 2001 From: Hugo Dias Date: Wed, 17 Mar 2021 12:10:19 +0000 Subject: [PATCH 1/2] fix: remove hacks from build and test --- .aegir.js | 12 ------------ package.json | 8 +++----- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/.aegir.js b/.aegir.js index 20c3e3e..47a415a 100644 --- a/.aegir.js +++ b/.aegir.js @@ -12,18 +12,6 @@ const esbuild = { build.onResolve({ filter: /^stream$/ }, () => { return { path: require.resolve('readable-stream') } }) - build.onResolve({ filter: /^multiformats\/hashes\/digest$/ }, () => { - // remove when https://github.com/evanw/esbuild/issues/187 is fixed - return { path: require.resolve('multiformats/hashes/digest') } - }) - build.onResolve({ filter: /^multiformats$/ }, () => { - // remove when https://github.com/evanw/esbuild/issues/187 is fixed - return { path: require.resolve('multiformats') } - }) - build.onResolve({ filter: /^cborg$/ }, () => { - // remove when https://github.com/evanw/esbuild/issues/187 is fixed - return { path: require.resolve('cborg') } - }) } } ] diff --git a/package.json b/package.json index 638b2c9..7ebd7d3 100644 --- a/package.json +++ b/package.json @@ -21,9 +21,7 @@ "main": "src/index.js", "browser": { "./src/repo/lock.js": "./src/repo/lock-memory.js", - "datastore-fs": "datastore-level", - "@ipld/car": "@ipld/car/esm/car-browser.js", - "cborg": "cborg/esm/cborg.js" + "datastore-fs": "datastore-level" }, "repository": { "type": "git", @@ -65,10 +63,10 @@ "varint": "^6.0.0" }, "devDependencies": { - "@ipld/car": "^0.1.2", + "@ipld/car": "ipld/js-car#rvagg/browser", "@types/debug": "^4.1.5", "@types/varint": "^6.0.0", - "aegir": "^31.0.0", + "aegir": "^32.1.0", "assert": "^2.0.0", "datastore-fs": "^3.0.0", "datastore-level": "^4.0.0", From a8022978e51ad68aa32745e5e1cf7a5165b3e6ce Mon Sep 17 00:00:00 2001 From: Hugo Dias Date: Sun, 21 Mar 2021 17:44:00 +0000 Subject: [PATCH 2/2] fix: update ipld/car --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7ebd7d3..eee1cfd 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "varint": "^6.0.0" }, "devDependencies": { - "@ipld/car": "ipld/js-car#rvagg/browser", + "@ipld/car": "^0.1.3", "@types/debug": "^4.1.5", "@types/varint": "^6.0.0", "aegir": "^32.1.0",