Skip to content

Use Object.assign instead of xtend #616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 11, 2019
Merged

Use Object.assign instead of xtend #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
171875e
Use Object.assign instead of xtend
bates64 Jan 5, 2018
317f5ca
Merge remote-tracking branch 'upstream/master' into object-assign
bates64 Jun 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions index.js
View file
Open in desktop
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
View file
Open in desktop
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