Skip to content
This repository has been archived by the owner on Mar 10, 2020. It is now read-only.

fix: prepare for aegir release #1021

Merged
merged 10 commits into from
Jun 9, 2019
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
18 changes: 17 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ stages:

node_js:
- '10'
- '8'
- '12'

os:
- linux
Expand All @@ -17,10 +17,16 @@ script: npx nyc -s npm run test:node -- --bail
after_success: npx nyc report --reporter=text-lcov > coverage.lcov && npx codecov

jobs:
allow_failures:
- name: electron-renderer

fast_finish: true

include:
- os: windows
filter_secrets: false
cache: false


- stage: check
script:
Expand All @@ -39,6 +45,16 @@ jobs:
addons:
firefox: latest
script: npx aegir test -t browser -t webworker -- --browsers FirefoxHeadless

- stage: test
name: electron-main
script:
- xvfb-run npx aegir test -t electron-main -- --bail

- stage: test
name: electron-renderer
script:
- xvfb-run npx aegir test -t electron-renderer -- --bail

notifications:
email: false
41 changes: 18 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,24 @@
"name": "ipfs-http-client",
"version": "32.0.1",
"description": "A client library for the IPFS HTTP API",
"keywords": [
"ipfs"
],
"homepage": "https://github.com/ipfs/js-ipfs-http-client",
"bugs": "https://github.com/ipfs/js-ipfs-http-client/issues",
"license": "MIT",
"leadMaintainer": "Alan Shaw <alan@tableflip.io>",
"files": [
"src",
"dist"
],
"main": "src/index.js",
"browser": {
"glob": false,
"fs": false,
"stream": "readable-stream"
},
"files": [
"src",
"dist"
],
"repository": "github:ipfs/js-ipfs-http-client",
"scripts": {
"test": "aegir test",
"test:node": "aegir test -t node",
Expand Down Expand Up @@ -40,14 +47,14 @@
"flatmap": "0.0.3",
"glob": "^7.1.3",
"ipfs-block": "~0.8.1",
"ipfs-utils": "~0.0.3",
"ipld-dag-cbor": "~0.15.0",
"ipld-dag-pb": "~0.17.3",
"is-ipfs": "~0.6.1",
"is-pull-stream": "0.0.0",
"is-stream": "^2.0.0",
"iso-stream-http": "~0.1.2",
"iso-url": "~0.4.6",
"ipfs-utils": "~0.0.3",
"just-kebab-case": "^1.1.0",
"just-map-keys": "^1.1.0",
"kind-of": "^6.0.2",
Expand All @@ -71,16 +78,8 @@
"tar-stream": "^2.0.1",
"through2": "^3.0.1"
},
"engines": {
"node": ">=8.3.0",
"npm": ">=3.0.0"
},
"repository": {
"type": "git",
"url": "https://github.com/ipfs/js-ipfs-http-client"
},
"devDependencies": {
"aegir": "^18.2.2",
"aegir": "^19.0.3",
"browser-process-platform": "~0.1.1",
"chai": "^4.2.0",
"cross-env": "^5.2.0",
Expand All @@ -91,9 +90,10 @@
"nock": "^10.0.2",
"stream-equal": "^1.1.1"
},
"keywords": [
"ipfs"
],
"engines": {
"node": ">=8.3.0",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be >=10?

"npm": ">=3.0.0"
},
"contributors": [
"Alan Shaw <alan.shaw@protocol.ai>",
"Alan Shaw <alan@tableflip.io>",
Expand Down Expand Up @@ -184,10 +184,5 @@
"victorbjelkholm <victorbjelkholm@gmail.com>",
"Łukasz Magiera <magik6k@users.noreply.github.com>",
"Łukasz Magiera <magik6k@gmail.com>"
],
"license": "MIT",
"bugs": {
"url": "https://github.com/ipfs/js-ipfs-http-client/issues"
},
"homepage": "https://github.com/ipfs/js-ipfs-http-client"
]
}
4 changes: 2 additions & 2 deletions test/constructor.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ function clientWorks (client, done) {

function expectConfig (ipfs, { host, port, protocol, apiPath }) {
const conf = ipfs.getEndpointConfig()
expect(conf.host).to.equal(host || 'localhost')
expect(conf.port).to.equal(port || '5001')
expect(conf.host).to.be.oneOf([host, 'localhost', ''])
expect(conf.port).to.be.oneOf([port, '5001', 80])
expect(conf.protocol).to.equal(protocol || 'http')
expect(conf['api-path']).to.equal(apiPath || '/api/v0/')
}