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

Commit 15f1cbf

Browse files
committed
Merge pull request #196 from ipfs/chore/updates
Chore/updates
2 parents 9aee6db + d9039de commit 15f1cbf

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
test/test-folder/ipfs-add.js

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
},
2525
"devDependencies": {
2626
"babel-core": "^6.1.21",
27-
"babel-eslint": "^4.1.6",
27+
"babel-eslint": "^5.0.0-beta6",
2828
"babel-loader": "^6.2.0",
2929
"babel-plugin-transform-runtime": "^6.1.18",
3030
"babel-preset-es2015": "^6.0.15",
31-
"babel-runtime": "^5.8.34",
31+
"babel-runtime": "^6.3.19",
3232
"chai": "^3.4.1",
3333
"concurrently": "^1.0.0",
3434
"eslint-config-standard": "^4.4.0",
@@ -45,7 +45,7 @@
4545
"gulp-tag-version": "^1.3.0",
4646
"gulp-util": "^3.0.7",
4747
"https-browserify": "0.0.1",
48-
"ipfsd-ctl": "^0.7.1",
48+
"ipfsd-ctl": "^0.8.0",
4949
"json-loader": "^0.5.3",
5050
"karma": "^0.13.11",
5151
"karma-chrome-launcher": "^0.2.1",

tasks/daemons.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,7 @@ function startDisposableDaemons (callback) {
5959

6060
const headers = {
6161
HTTPHeaders: {
62-
'Access-Control-Allow-Origin': ['*'],
63-
// TODO: When ipfs/go-ipfs#1979 is merged drop these
64-
'Access-Control-Allow-Headers': ['X-Stream-Output, X-Chunked-Output'],
65-
'Access-Control-Expose-Headers': ['X-Stream-Output, X-Chunked-Output']
62+
'Access-Control-Allow-Origin': ['*']
6663
}
6764
}
6865
ipfsNodes[key].setConfig('API', JSON.stringify(headers), err => {

0 commit comments

Comments
 (0)