Merge remote-tracking branch 'origin/master' into add-listing-config-profiles

Author: achingbrain

CHANGELOG.md

@@ -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)
 

package.json

@@ -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"

src/add-from-fs/index.js

@@ -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)
-})
+}

src/add-from-url.js

@@ -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 || {}
@@ -19,4 +18,4 @@ module.exports = configure(({ ky }) => {
 
     yield * add(input, options)
   })()
-})
+}

src/pubsub/subscribe.js

@@ -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 || {}