remove xtend

Author: joehand

.gitignore

@@ -4,4 +4,5 @@ tmp
 coverage/
 npm-debug.log*
 .nyc_output/
-yarn.lock
+yarn.lock
+package-lock.json

dat.js

@@ -1,6 +1,5 @@
 var assert = require('assert')
 var path = require('path')
-var xtend = require('xtend')
 var untildify = require('untildify')
 var importFiles = require('./lib/import-files')
 var createNetwork = require('./lib/network')
@@ -32,7 +31,7 @@ function Dat (archive, opts) {
   var self = this
 
   this.archive = archive
-  this.options = xtend(opts)
+  this.options = Object.assign({}, opts)
   if (opts.dir) {
     this.path = path.resolve(untildify(opts.dir))
   }
@@ -91,7 +90,7 @@ Dat.prototype.join = function (opts, cb) {
   else opts = opts || {}
   cb = cb || noop
 
-  var netOpts = xtend({
+  var netOpts = Object.assign({}, {
     stream: function (peer) {
       var stream = self.archive.replicate({
         upload: !(opts.upload === false),
@@ -157,7 +156,7 @@ Dat.prototype.resume = function () {
  * @type {Function}
  */
 Dat.prototype.trackStats = function (opts) {
-  opts = xtend({}, opts)
+  opts = Object.assign({}, opts)
   this.stats = stats(this.archive, opts)
   return this.stats
 }
@@ -177,7 +176,7 @@ Dat.prototype.importFiles = function (src, opts, cb) {
 
   var self = this
   src = src && src.length ? src : self.path
-  opts = xtend({
+  opts = Object.assign({
     indexing: (opts && opts.indexing) || (src === self.path)
   }, opts)
 

index.js

@@ -1,7 +1,6 @@
 var assert = require('assert')
 var fs = require('fs')
 var path = require('path')
-var xtend = require('xtend')
 var hyperdrive = require('hyperdrive')
 var resolveDatLink = require('dat-link-resolve')
 var debug = require('debug')('dat-node')
@@ -37,7 +36,7 @@ function createDat (dirOrStorage, opts, cb) {
   var createIfMissing = !(opts.createIfMissing === false)
   var errorIfExists = opts.errorIfExists || false
   var hasDat = false
-  opts = xtend({
+  opts = Object.assign({
     // TODO: make sure opts.dir is a directory, not file
     dir: dir,
     latest: true

lib/import-files.js

@@ -3,7 +3,6 @@ var path = require('path')
 var mirror = require('mirror-folder')
 var datIgnore = require('dat-ignore')
 var speed = require('speedometer')
-var xtend = require('xtend')
 var debug = require('debug')('dat-node')
 
 module.exports = importer
@@ -20,7 +19,7 @@ function importer (archive, src, opts, cb) {
   var ignoreDirs = !(opts.ignoreDirs === false)
   src = path.normalize(src)
 
-  opts = xtend({
+  opts = Object.assign({
     watch: false,
     dereference: true,
     count: true
@@ -36,7 +35,7 @@ function importer (archive, src, opts, cb) {
   if (opts.count) {
     // Dry Run Import to get initial import size
     importCount = { files: 0, bytes: 0 }
-    var dryRunOpts = xtend(opts, { dryRun: true, watch: false }) // force right side opts
+    var dryRunOpts = Object.assign({}, opts, { dryRun: true, watch: false }) // force right side opts
     var dryRun = mirror(src, { name: '/', fs: archive }, dryRunOpts, function (err) {
       if (err) return cb(err)
       progress.emit('count', importCount)

lib/network.js

@@ -1,14 +1,13 @@
 var assert = require('assert')
 var swarmDefaults = require('dat-swarm-defaults')
 var disc = require('discovery-swarm')
-var xtend = require('xtend')
 
 module.exports = function (archive, opts, cb) {
   assert.ok(archive, 'dat-node: lib/network archive required')
   assert.ok(opts, 'dat-node: lib/network opts required')
 
   var DEFAULT_PORT = 3282
-  var swarmOpts = xtend({
+  var swarmOpts = Object.assign({
     hash: false,
     stream: opts.stream
   }, opts)

lib/serve.js

@@ -1,12 +1,11 @@
 var assert = require('assert')
 var http = require('http')
 var serve = require('hyperdrive-http')
-var xtend = require('xtend')
 var debug = require('debug')('dat-node')
 
 module.exports = function (archive, opts) {
   assert.ok(archive, 'lib/serve: archive required')
-  opts = xtend({
+  opts = Object.assign({
     port: 8080,
     live: true,
     footer: 'Served via Dat.'

package.json

@@ -22,20 +22,19 @@
     "dat-ignore": "^2.1.1",
     "dat-link-resolve": "^2.2.0",
     "dat-storage": "^1.1.1",
-    "dat-swarm-defaults": "^1.0.0",
+    "dat-swarm-defaults": "^1.0.2",
     "debug": "^4.1.0",
     "discovery-swarm": "^5.1.2",
     "hyperdrive": "^9.14.2",
     "hyperdrive-http": "^4.3.3",
     "hyperdrive-network-speed": "^2.1.0",
     "mirror-folder": "^3.0.0",
     "random-access-file": "^2.0.1",
-    "random-access-memory": "^3.0.0",
+    "random-access-memory": "^3.1.1",
     "sparse-bitfield": "^3.0.3",
     "speedometer": "^1.1.0",
     "stream-each": "^1.2.3",
-    "untildify": "^3.0.2",
-    "xtend": "^4.0.1"
+    "untildify": "^3.0.2"
   },
   "devDependencies": {
     "count-files": "^2.6.2",
@@ -45,7 +44,7 @@
     "memdown": "^3.0.0",
     "mkdirp": "^0.5.1",
     "nyc": "^13.1.0",
-    "rimraf": "^2.5.4",
+    "rimraf": "^2.6.3",
     "standard": "^12.0.1",
     "tape": "^4.9.1",
     "temporary-directory": "^1.0.2"