Skip to content

Commit

Permalink
Use Object.assign instead of xtend (#616)
Browse files Browse the repository at this point in the history
As described by #563:

> https://polyfill.io provides a fallback for browsers that don't support it, so for most people this will be a strict improvement.
  • Loading branch information
alex authored and tornqvist committed Jun 11, 2019
1 parent 3d3b228 commit 555ab4b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
5 changes: 2 additions & 3 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ var nanohref = require('nanohref')
var nanoraf = require('nanoraf')
var nanobus = require('nanobus')
var assert = require('assert')
var xtend = require('xtend')

var Cache = require('./component/cache')

Expand Down Expand Up @@ -52,7 +51,7 @@ function Choo (opts) {
}
if (this._hasWindow) {
this.state = window.initialState
? xtend(window.initialState, _state)
? Object.assign({}, window.initialState, _state)
: _state
delete window.initialState
} else {
Expand Down Expand Up @@ -204,7 +203,7 @@ Choo.prototype.mount = function mount (selector) {
}

Choo.prototype.toString = function (location, state) {
this.state = xtend(this.state, state || {})
Object.assign(this.state, state || {})

assert.notEqual(typeof window, 'object', 'choo.mount: window was found. .toString() must be called in Node, use .start() or .mount() if running in the browser')
assert.equal(typeof location, 'string', 'choo.toString: location should be type string')
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@
"nanoraf": "^3.0.0",
"nanorouter": "^3.0.1",
"nanotiming": "^7.0.0",
"scroll-to-anchor": "^1.0.0",
"xtend": "^4.0.1"
"scroll-to-anchor": "^1.0.0"
},
"devDependencies": {
"@tap-format/spec": "^0.2.0",
Expand Down

0 comments on commit 555ab4b

Please sign in to comment.