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

Commit

Permalink
Merge remote-tracking branch 'origin/master' into add-listing-config-…
Browse files Browse the repository at this point in the history
…profiles
  • Loading branch information
achingbrain committed Oct 4, 2019
2 parents e11190b + aca704b commit 08561d0
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 11 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
<a name="38.0.1"></a>
## [38.0.1](https://github.com/ipfs/js-ipfs-http-client/compare/v38.0.0...v38.0.1) (2019-10-04)


### Bug Fixes

* pull in preconfigured chai from interface tests ([6a7eb8a](https://github.com/ipfs/js-ipfs-http-client/commit/6a7eb8a))



<a name="38.0.0"></a>
# [38.0.0](https://github.com/ipfs/js-ipfs-http-client/compare/v37.0.3...v38.0.0) (2019-09-25)

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ipfs-http-client",
"version": "38.0.0",
"version": "38.0.1",
"description": "A client library for the IPFS HTTP API",
"keywords": [
"ipfs"
Expand Down
7 changes: 3 additions & 4 deletions src/add-from-fs/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
'use strict'

const configure = require('../lib/configure')
const globSource = require('ipfs-utils/src/files/glob-source')

module.exports = configure(({ ky }) => {
const add = require('../add')({ ky })
module.exports = (config) => {
const add = require('../add')(config)
return (path, options) => add(globSource(path, options), options)
})
}
7 changes: 3 additions & 4 deletions src/add-from-url.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
'use strict'

const kyDefault = require('ky-universal').default
const configure = require('./lib/configure')
const toIterable = require('./lib/stream-to-iterable')

module.exports = configure(({ ky }) => {
const add = require('./add')({ ky })
module.exports = (config) => {
const add = require('./add')(config)

return (url, options) => (async function * () {
options = options || {}
Expand All @@ -19,4 +18,4 @@ module.exports = configure(({ ky }) => {

yield * add(input, options)
})()
})
}
5 changes: 3 additions & 2 deletions src/pubsub/subscribe.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ const configure = require('../lib/configure')
const toIterable = require('../lib/stream-to-iterable')
const SubscriptionTracker = require('./subscription-tracker')

module.exports = configure(({ ky }) => {
module.exports = configure((config) => {
const ky = config.ky
const subsTracker = SubscriptionTracker.singleton()
const publish = require('./publish')({ ky })
const publish = require('./publish')(config)

return async (topic, handler, options) => {
options = options || {}
Expand Down

0 comments on commit 08561d0

Please sign in to comment.