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

chore: update deps and fix nohoist config #3248

Merged
merged 6 commits into from
Aug 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ stages:

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

os:
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
name: examples
script:
- npx json -I -f ./lerna.json -e "this.packages.push('examples/*')"
- npx json -I -f ./lerna.json -e "this.command.bootstrap.nohoist.push('ipfs-css', 'tachyons')"
- npx json -I -f ./lerna.json -e "this.command.bootstrap.nohoist = ['ipfs-css', 'tachyons']"
- npm run reset
- npm install
- npm run build -- --scope={ipfs,ipfs-http-client}
Expand Down
2 changes: 1 addition & 1 deletion examples/browser-add-readable-stream/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"keywords": [],
"license": "MIT",
"devDependencies": {
"ipfs": "^0.49.0",
"ipfs": "^0.49.1",
"test-ipfs-example": "^2.0.3"
}
}
2 changes: 1 addition & 1 deletion examples/browser-browserify/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"concat-stream": "^2.0.0",
"execa": "^4.0.0",
"http-server": "^0.11.1",
"ipfs": "^0.49.0",
"ipfs": "^0.49.1",
"test-ipfs-example": "^2.0.3"
},
"browser": {
Expand Down
2 changes: 1 addition & 1 deletion examples/browser-create-react-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"dependencies": {
"dot-prop": "^5.0.0",
"ipfs": "^0.49.0",
"ipfs": "^0.49.1",
"ipfs-css": "^0.13.1",
"react": "^16.8.6",
"react-dom": "^16.8.6",
Expand Down
4 changes: 2 additions & 2 deletions examples/browser-exchange-files/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
"browserify": "^16.2.3",
"execa": "^4.0.0",
"http-server": "^0.11.1",
"ipfs-http-client": "^46.0.0",
"ipfs-http-client": "^46.0.1",
"uint8arrays": "^1.1.0"
},
"dependencies": {
"ipfs": "^0.49.0",
"ipfs": "^0.49.1",
"it-all": "^1.0.1",
"test-ipfs-example": "^2.0.3"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/browser-http-client-upload-file/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
],
"license": "MIT",
"dependencies": {
"ipfs-http-client": "^46.0.0"
"ipfs-http-client": "^46.0.1"
},
"devDependencies": {
"ipfs": "^0.49.0",
"ipfs": "^0.49.1",
"parcel-bundler": "^1.12.4",
"react": "^16.8.6",
"react-dom": "^16.8.6",
Expand Down
2 changes: 1 addition & 1 deletion examples/browser-mfs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"webpack-cli": "^3.3.11"
},
"dependencies": {
"ipfs": "^0.49.0",
"ipfs": "^0.49.1",
"mime-sniffer": "~0.0.3"
}
}
2 changes: 1 addition & 1 deletion examples/browser-parceljs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"ipfs": "^0.49.0"
"ipfs": "^0.49.1"
},
"devDependencies": {
"@babel/cli": "^7.1.5",
Expand Down
2 changes: 1 addition & 1 deletion examples/browser-readablestream/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"webpack": "^4.43.0"
},
"dependencies": {
"ipfs": "^0.49.0",
"ipfs": "^0.49.1",
"it-to-stream": "^0.1.1",
"videostream": "^3.2.0"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/browser-script-tag/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
"test-ipfs-example": "^2.0.3"
},
"dependencies": {
"ipfs": "^0.49.0"
"ipfs": "^0.49.1"
}
}
2 changes: 1 addition & 1 deletion examples/browser-sharing-node-across-tabs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"worker-plugin": "4.0.3"
},
"dependencies": {
"ipfs": "^0.49.0",
"ipfs": "^0.49.1",
"ipfs-message-port-client": "^0.1.0",
"ipfs-message-port-server": "^0.1.0"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/browser-video-streaming/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
"test-ipfs-example": "^2.0.3"
},
"dependencies": {
"ipfs": "^0.49.0"
"ipfs": "^0.49.1"
}
}
2 changes: 1 addition & 1 deletion examples/browser-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"dependencies": {
"core-js": "^3.6.4",
"ipfs": "^0.49.0",
"ipfs": "^0.49.1",
"vue": "^2.6.11"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/browser-webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"webpack-dev-server": "^3.11.0"
},
"dependencies": {
"ipfs": "^0.49.0"
"ipfs": "^0.49.1"
},
"browserslist": [
">1%",
Expand Down
4 changes: 2 additions & 2 deletions examples/circuit-relaying/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
"license": "MIT",
"dependencies": {
"delay": "^4.3.0",
"ipfs": "^0.49.0",
"ipfs": "^0.49.1",
"ipfs-pubsub-room": "^2.0.1",
"uint8arrays": "^1.1.0"
},
"devDependencies": {
"execa": "^4.0.0",
"ipfs-css": "^0.13.1",
"ipfs-http-client": "^46.0.0",
"ipfs-http-client": "^46.0.1",
"parcel-bundler": "^1.12.4",
"tachyons": "^4.11.1",
"test-ipfs-example": "^2.0.3"
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-ipfs-repo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"license": "MIT",
"dependencies": {
"datastore-fs": "^2.0.0",
"ipfs": "^0.49.0",
"ipfs": "^0.49.1",
"ipfs-repo": "^6.0.3",
"it-all": "^1.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-libp2p/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"license": "MIT",
"dependencies": {
"ipfs": "^0.49.0",
"ipfs": "^0.49.1",
"libp2p": "libp2p/js-libp2p#0.29.x",
"libp2p-bootstrap": "^0.12.0",
"libp2p-kad-dht": "^0.20.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/explore-ethereum-blockchain/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"keywords": [],
"license": "MIT",
"devDependencies": {
"ipfs": "^0.49.0",
"ipfs-http-client": "^46.0.0",
"ipfs": "^0.49.1",
"ipfs-http-client": "^46.0.1",
"ipfsd-ctl": "^7.0.0",
"test-ipfs-example": "^2.0.3"
}
Expand Down
4 changes: 2 additions & 2 deletions examples/http-client-browser-pubsub/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
"author": "Alan Shaw",
"license": "MIT",
"dependencies": {
"ipfs-http-client": "^46.0.0"
"ipfs-http-client": "^46.0.1"
},
"browserslist": [
"last 2 versions and not dead and > 2%"
],
"devDependencies": {
"execa": "^4.0.0",
"go-ipfs": "^0.6.0",
"ipfs": "^0.49.0",
"ipfs": "^0.49.1",
"ipfsd-ctl": "^7.0.0",
"parcel-bundler": "^1.12.4",
"test-ipfs-example": "^2.0.3"
Expand Down
4 changes: 2 additions & 2 deletions examples/http-client-bundle-webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"license": "MIT",
"keywords": [],
"dependencies": {
"ipfs-http-client": "^46.0.0",
"ipfs-http-client": "^46.0.1",
"react": "^16.8.6",
"react-dom": "^16.8.6"
},
Expand All @@ -23,7 +23,7 @@
"babel-loader": "^8.0.5",
"copy-webpack-plugin": "^5.0.4",
"execa": "^4.0.0",
"ipfs": "^0.49.0",
"ipfs": "^0.49.1",
"ipfsd-ctl": "^7.0.0",
"react-hot-loader": "^4.12.21",
"test-ipfs-example": "^2.0.3",
Expand Down
2 changes: 1 addition & 1 deletion examples/http-client-name-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"author": "Tara Vancil <tbvanc@gmail.com>",
"license": "MIT",
"dependencies": {
"ipfs-http-client": "^46.0.0"
"ipfs-http-client": "^46.0.1"
},
"devDependencies": {
"execa": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/ipfs-101/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"author": "David Dias <daviddias@ipfs.io>",
"license": "MIT",
"dependencies": {
"ipfs": "^0.49.0",
"ipfs": "^0.49.1",
"it-all": "^1.0.1",
"uint8arrays": "^1.1.0"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/run-in-electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"devDependencies": {
"electron": "^6.0.0",
"electron-rebuild": "^1.8.4",
"ipfs": "^0.49.0",
"ipfs": "^0.49.1",
"test-ipfs-example": "^2.0.3"
},
"greenkeeper": {
Expand Down
2 changes: 1 addition & 1 deletion examples/running-multiple-nodes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"test-ipfs-example": "^2.0.3"
},
"dependencies": {
"ipfs": "^0.49.0"
"ipfs": "^0.49.1"
}
}
6 changes: 3 additions & 3 deletions examples/test-ipfs-example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
},
"license": "MIT",
"dependencies": {
"chromedriver": "^83.0.0",
"chromedriver": "^84.0.1",
"execa": "^4.0.0",
"fs-extra": "^8.1.0",
"http-server": "^0.11.1",
"fs-extra": "^9.0.1",
"http-server": "^0.12.3",
"nightwatch": "^1.2.4",
"which": "^2.0.1",
"uint8arrays": "^1.1.0"
Expand Down
13 changes: 3 additions & 10 deletions examples/test-ipfs-example/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,18 @@ async function startServer (dir) {
async function serveFrom (appDir) {
return new Promise((resolve, reject) => {
let output = ''
const port = ephemeralPort()

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

const line = uint8ArrayToString(data)
output += line
output += uint8ArrayToString(data)

if (output.includes('Hit CTRL-C to stop the server')) {
// find the port
const port = output.match(/http:\/\/127.0.0.1:(\d+)/)[1]

if (!port) {
throw new Error(`Could not find port in ${output}`)
}

resolve({
stop: () => {
console.info('Stopping server')
Expand Down
2 changes: 1 addition & 1 deletion examples/traverse-ipld-graphs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"dependencies": {
"cids": "^1.0.0",
"ipfs": "^0.49.0",
"ipfs": "^0.49.1",
"ipld-block": "^0.10.0",
"ipld-dag-pb": "^0.20.0",
"multihashing-async": "^2.0.1"
Expand Down
6 changes: 1 addition & 5 deletions lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@
"version": "independent",
"command": {
"bootstrap": {
"hoist": true,
"nohoist": [
"libp2p-delegated-content-routing",
"libp2p-delegated-peer-routing"
]
"hoist": true
},
"run": {
"stream": true
Expand Down
2 changes: 1 addition & 1 deletion packages/interface-ipfs-core/src/files/chmod.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = (common, options) => {
const it = getIt(options)

describe('.files.chmod', function () {
this.timeout(40 * 1000)
this.timeout(120 * 1000)

let ipfs

Expand Down
2 changes: 1 addition & 1 deletion packages/interface-ipfs-core/src/files/cp.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ module.exports = (common, options) => {
const it = getIt(options)

describe('.files.cp', function () {
this.timeout(40 * 1000)
this.timeout(120 * 1000)

let ipfs

Expand Down
2 changes: 1 addition & 1 deletion packages/interface-ipfs-core/src/files/flush.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module.exports = (common, options) => {
const it = getIt(options)

describe('.files.flush', function () {
this.timeout(40 * 1000)
this.timeout(120 * 1000)

let ipfs

Expand Down
2 changes: 1 addition & 1 deletion packages/interface-ipfs-core/src/files/ls.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ module.exports = (common, options) => {
const largeFile = randomBytes(490668)

describe('.files.ls', function () {
this.timeout(40 * 1000)
this.timeout(120 * 1000)

let ipfs

Expand Down
2 changes: 1 addition & 1 deletion packages/interface-ipfs-core/src/files/mkdir.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ module.exports = (common, options) => {
const it = getIt(options)

describe('.files.mkdir', function () {
this.timeout(40 * 1000)
this.timeout(120 * 1000)

let ipfs

Expand Down
2 changes: 1 addition & 1 deletion packages/interface-ipfs-core/src/files/mv.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module.exports = (common, options) => {
const it = getIt(options)

describe('.files.mv', function () {
this.timeout(40 * 1000)
this.timeout(120 * 1000)

let ipfs

Expand Down
2 changes: 1 addition & 1 deletion packages/interface-ipfs-core/src/files/read.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ module.exports = (common, options) => {
const smallFile = randomBytes(13)

describe('.files.read', function () {
this.timeout(40 * 1000)
this.timeout(120 * 1000)

let ipfs

Expand Down
Loading