Use Object.assign instead of xtend (#616)
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.
This commit is contained in:
@@ -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')
|
||||
|
||||
@@ -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 {
|
||||
@@ -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')
|
||||
|
||||
Reference in New Issue
Block a user