Skip to content
This repository was archived by the owner on Feb 12, 2024. It is now read-only.

Commit 997508d

Browse files
achingbrainachingbrain
authored
chore: update deps and fix nohoist config (#3248)
1 parent b3ead64 commit 997508d

File tree

46 files changed

+120
-113
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+120
-113
lines changed

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ stages:
1717

1818
node_js:
1919
- 'lts/*'
20-
# cannot support node 14 until hapi > 19.1.1 is released
20+
# blocked by https://github.com/hapijs/hapi/issues/4149
2121
# - 'node'
2222

2323
os:
@@ -132,7 +132,7 @@ jobs:
132132
name: examples
133133
script:
134134
- npx json -I -f ./lerna.json -e "this.packages.push('examples/*')"
135-
- npx json -I -f ./lerna.json -e "this.command.bootstrap.nohoist.push('ipfs-css', 'tachyons')"
135+
- npx json -I -f ./lerna.json -e "this.command.bootstrap.nohoist = ['ipfs-css', 'tachyons']"
136136
- npm run reset
137137
- npm install
138138
- npm run build -- --scope={ipfs,ipfs-http-client}

‎examples/browser-add-readable-stream/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"keywords": [],
1313
"license": "MIT",
1414
"devDependencies": {
15-
"ipfs": "^0.49.0",
15+
"ipfs": "^0.49.1",
1616
"test-ipfs-example": "^2.0.3"
1717
}
1818
}

‎examples/browser-browserify/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"concat-stream": "^2.0.0",
1919
"execa": "^4.0.0",
2020
"http-server": "^0.11.1",
21-
"ipfs": "^0.49.0",
21+
"ipfs": "^0.49.1",
2222
"test-ipfs-example": "^2.0.3"
2323
},
2424
"browser": {

‎examples/browser-create-react-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"dependencies": {
66
"dot-prop": "^5.0.0",
7-
"ipfs": "^0.49.0",
7+
"ipfs": "^0.49.1",
88
"ipfs-css": "^0.13.1",
99
"react": "^16.8.6",
1010
"react-dom": "^16.8.6",

‎examples/browser-exchange-files/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
"browserify": "^16.2.3",
1515
"execa": "^4.0.0",
1616
"http-server": "^0.11.1",
17-
"ipfs-http-client": "^46.0.0",
17+
"ipfs-http-client": "^46.0.1",
1818
"uint8arrays": "^1.1.0"
1919
},
2020
"dependencies": {
21-
"ipfs": "^0.49.0",
21+
"ipfs": "^0.49.1",
2222
"it-all": "^1.0.1",
2323
"test-ipfs-example": "^2.0.3"
2424
},

‎examples/browser-http-client-upload-file/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
],
1515
"license": "MIT",
1616
"dependencies": {
17-
"ipfs-http-client": "^46.0.0"
17+
"ipfs-http-client": "^46.0.1"
1818
},
1919
"devDependencies": {
20-
"ipfs": "^0.49.0",
20+
"ipfs": "^0.49.1",
2121
"parcel-bundler": "^1.12.4",
2222
"react": "^16.8.6",
2323
"react-dom": "^16.8.6",

‎examples/browser-mfs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"webpack-cli": "^3.3.11"
2222
},
2323
"dependencies": {
24-
"ipfs": "^0.49.0",
24+
"ipfs": "^0.49.1",
2525
"mime-sniffer": "~0.0.3"
2626
}
2727
}

‎examples/browser-parceljs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"author": "",
1919
"license": "ISC",
2020
"dependencies": {
21-
"ipfs": "^0.49.0"
21+
"ipfs": "^0.49.1"
2222
},
2323
"devDependencies": {
2424
"@babel/cli": "^7.1.5",

‎examples/browser-readablestream/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"webpack": "^4.43.0"
2121
},
2222
"dependencies": {
23-
"ipfs": "^0.49.0",
23+
"ipfs": "^0.49.1",
2424
"it-to-stream": "^0.1.1",
2525
"videostream": "^3.2.0"
2626
}

‎examples/browser-script-tag/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
"test-ipfs-example": "^2.0.3"
1717
},
1818
"dependencies": {
19-
"ipfs": "^0.49.0"
19+
"ipfs": "^0.49.1"
2020
}
2121
}

‎examples/browser-sharing-node-across-tabs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"worker-plugin": "4.0.3"
2424
},
2525
"dependencies": {
26-
"ipfs": "^0.49.0",
26+
"ipfs": "^0.49.1",
2727
"ipfs-message-port-client": "^0.1.0",
2828
"ipfs-message-port-server": "^0.1.0"
2929
},

‎examples/browser-video-streaming/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
"test-ipfs-example": "^2.0.3"
1717
},
1818
"dependencies": {
19-
"ipfs": "^0.49.0"
19+
"ipfs": "^0.49.1"
2020
}
2121
}

‎examples/browser-vue/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"dependencies": {
1313
"core-js": "^3.6.4",
14-
"ipfs": "^0.49.0",
14+
"ipfs": "^0.49.1",
1515
"vue": "^2.6.11"
1616
},
1717
"devDependencies": {

‎examples/browser-webpack/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"webpack-dev-server": "^3.11.0"
2727
},
2828
"dependencies": {
29-
"ipfs": "^0.49.0"
29+
"ipfs": "^0.49.1"
3030
},
3131
"browserslist": [
3232
">1%",

‎examples/circuit-relaying/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
"license": "MIT",
1616
"dependencies": {
1717
"delay": "^4.3.0",
18-
"ipfs": "^0.49.0",
18+
"ipfs": "^0.49.1",
1919
"ipfs-pubsub-room": "^2.0.1",
2020
"uint8arrays": "^1.1.0"
2121
},
2222
"devDependencies": {
2323
"execa": "^4.0.0",
2424
"ipfs-css": "^0.13.1",
25-
"ipfs-http-client": "^46.0.0",
25+
"ipfs-http-client": "^46.0.1",
2626
"parcel-bundler": "^1.12.4",
2727
"tachyons": "^4.11.1",
2828
"test-ipfs-example": "^2.0.3"

‎examples/custom-ipfs-repo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"license": "MIT",
1212
"dependencies": {
1313
"datastore-fs": "^2.0.0",
14-
"ipfs": "^0.49.0",
14+
"ipfs": "^0.49.1",
1515
"ipfs-repo": "^6.0.3",
1616
"it-all": "^1.0.1"
1717
},

‎examples/custom-libp2p/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"license": "MIT",
1212
"dependencies": {
13-
"ipfs": "^0.49.0",
13+
"ipfs": "^0.49.1",
1414
"libp2p": "libp2p/js-libp2p#0.29.x",
1515
"libp2p-bootstrap": "^0.12.0",
1616
"libp2p-kad-dht": "^0.20.0",

‎examples/explore-ethereum-blockchain/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"keywords": [],
1111
"license": "MIT",
1212
"devDependencies": {
13-
"ipfs": "^0.49.0",
14-
"ipfs-http-client": "^46.0.0",
13+
"ipfs": "^0.49.1",
14+
"ipfs-http-client": "^46.0.1",
1515
"ipfsd-ctl": "^7.0.0",
1616
"test-ipfs-example": "^2.0.3"
1717
}

‎examples/http-client-browser-pubsub/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
"author": "Alan Shaw",
1313
"license": "MIT",
1414
"dependencies": {
15-
"ipfs-http-client": "^46.0.0"
15+
"ipfs-http-client": "^46.0.1"
1616
},
1717
"browserslist": [
1818
"last 2 versions and not dead and > 2%"
1919
],
2020
"devDependencies": {
2121
"execa": "^4.0.0",
2222
"go-ipfs": "^0.6.0",
23-
"ipfs": "^0.49.0",
23+
"ipfs": "^0.49.1",
2424
"ipfsd-ctl": "^7.0.0",
2525
"parcel-bundler": "^1.12.4",
2626
"test-ipfs-example": "^2.0.3"

‎examples/http-client-bundle-webpack/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"license": "MIT",
1313
"keywords": [],
1414
"dependencies": {
15-
"ipfs-http-client": "^46.0.0",
15+
"ipfs-http-client": "^46.0.1",
1616
"react": "^16.8.6",
1717
"react-dom": "^16.8.6"
1818
},
@@ -23,7 +23,7 @@
2323
"babel-loader": "^8.0.5",
2424
"copy-webpack-plugin": "^5.0.4",
2525
"execa": "^4.0.0",
26-
"ipfs": "^0.49.0",
26+
"ipfs": "^0.49.1",
2727
"ipfsd-ctl": "^7.0.0",
2828
"react-hot-loader": "^4.12.21",
2929
"test-ipfs-example": "^2.0.3",

‎examples/http-client-name-api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"author": "Tara Vancil <[email protected]>",
1313
"license": "MIT",
1414
"dependencies": {
15-
"ipfs-http-client": "^46.0.0"
15+
"ipfs-http-client": "^46.0.1"
1616
},
1717
"devDependencies": {
1818
"execa": "^4.0.0",

‎examples/ipfs-101/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"author": "David Dias <[email protected]>",
1111
"license": "MIT",
1212
"dependencies": {
13-
"ipfs": "^0.49.0",
13+
"ipfs": "^0.49.1",
1414
"it-all": "^1.0.1",
1515
"uint8arrays": "^1.1.0"
1616
},

‎examples/run-in-electron/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"devDependencies": {
1919
"electron": "^6.0.0",
2020
"electron-rebuild": "^1.8.4",
21-
"ipfs": "^0.49.0",
21+
"ipfs": "^0.49.1",
2222
"test-ipfs-example": "^2.0.3"
2323
},
2424
"greenkeeper": {

‎examples/running-multiple-nodes/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
"test-ipfs-example": "^2.0.3"
1414
},
1515
"dependencies": {
16-
"ipfs": "^0.49.0"
16+
"ipfs": "^0.49.1"
1717
}
1818
}

‎examples/test-ipfs-example/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
},
88
"license": "MIT",
99
"dependencies": {
10-
"chromedriver": "^83.0.0",
10+
"chromedriver": "^84.0.1",
1111
"execa": "^4.0.0",
12-
"fs-extra": "^8.1.0",
13-
"http-server": "^0.11.1",
12+
"fs-extra": "^9.0.1",
13+
"http-server": "^0.12.3",
1414
"nightwatch": "^1.2.4",
1515
"which": "^2.0.1",
1616
"uint8arrays": "^1.1.0"

‎examples/test-ipfs-example/utils.js

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,18 @@ async function startServer (dir) {
1010
async function serveFrom (appDir) {
1111
return new Promise((resolve, reject) => {
1212
let output = ''
13+
const port = ephemeralPort()
1314

14-
const proc = execa.command(`${path.resolve(__dirname, 'node_modules/.bin/http-server')} ${appDir} -a 127.0.0.1`, {
15+
const proc = execa.command(`${path.resolve(__dirname, 'node_modules/.bin/http-server')} ${appDir} -a 127.0.0.1 -p ${port}`, {
1516
cwd: __dirname,
1617
all: true
1718
})
1819
proc.all.on('data', (data) => {
1920
process.stdout.write(data)
2021

21-
const line = uint8ArrayToString(data)
22-
output += line
22+
output += uint8ArrayToString(data)
2323

2424
if (output.includes('Hit CTRL-C to stop the server')) {
25-
// find the port
26-
const port = output.match(/http:\/\/127.0.0.1:(\d+)/)[1]
27-
28-
if (!port) {
29-
throw new Error(`Could not find port in ${output}`)
30-
}
31-
3225
resolve({
3326
stop: () => {
3427
console.info('Stopping server')

‎examples/traverse-ipld-graphs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"dependencies": {
1616
"cids": "^1.0.0",
17-
"ipfs": "^0.49.0",
17+
"ipfs": "^0.49.1",
1818
"ipld-block": "^0.10.0",
1919
"ipld-dag-pb": "^0.20.0",
2020
"multihashing-async": "^2.0.1"

‎lerna.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
"version": "independent",
77
"command": {
88
"bootstrap": {
9-
"hoist": true,
10-
"nohoist": [
11-
"libp2p-delegated-content-routing",
12-
"libp2p-delegated-peer-routing"
13-
]
9+
"hoist": true
1410
},
1511
"run": {
1612
"stream": true

‎packages/interface-ipfs-core/src/files/chmod.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module.exports = (common, options) => {
1212
const it = getIt(options)
1313

1414
describe('.files.chmod', function () {
15-
this.timeout(40 * 1000)
15+
this.timeout(120 * 1000)
1616

1717
let ipfs
1818

‎packages/interface-ipfs-core/src/files/cp.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ module.exports = (common, options) => {
2525
const it = getIt(options)
2626

2727
describe('.files.cp', function () {
28-
this.timeout(40 * 1000)
28+
this.timeout(120 * 1000)
2929

3030
let ipfs
3131

‎packages/interface-ipfs-core/src/files/flush.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module.exports = (common, options) => {
1515
const it = getIt(options)
1616

1717
describe('.files.flush', function () {
18-
this.timeout(40 * 1000)
18+
this.timeout(120 * 1000)
1919

2020
let ipfs
2121

‎packages/interface-ipfs-core/src/files/ls.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ module.exports = (common, options) => {
2727
const largeFile = randomBytes(490668)
2828

2929
describe('.files.ls', function () {
30-
this.timeout(40 * 1000)
30+
this.timeout(120 * 1000)
3131

3232
let ipfs
3333

‎packages/interface-ipfs-core/src/files/mkdir.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ module.exports = (common, options) => {
1919
const it = getIt(options)
2020

2121
describe('.files.mkdir', function () {
22-
this.timeout(40 * 1000)
22+
this.timeout(120 * 1000)
2323

2424
let ipfs
2525

‎packages/interface-ipfs-core/src/files/mv.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ module.exports = (common, options) => {
2020
const it = getIt(options)
2121

2222
describe('.files.mv', function () {
23-
this.timeout(40 * 1000)
23+
this.timeout(120 * 1000)
2424

2525
let ipfs
2626

‎packages/interface-ipfs-core/src/files/read.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ module.exports = (common, options) => {
2121
const smallFile = randomBytes(13)
2222

2323
describe('.files.read', function () {
24-
this.timeout(40 * 1000)
24+
this.timeout(120 * 1000)
2525

2626
let ipfs
2727

0 commit comments

Comments
 (0)