From 555ab4b5f9266a72f825b6e5ce38f65d9a1f18b4 Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 11 Jun 2019 21:50:34 +0100 Subject: [PATCH] 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. --- index.js | 5 ++--- package.json | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/index.js b/index.js index 45effedc..3a329f32 100644 --- a/index.js +++ b/index.js @@ -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') diff --git a/package.json b/package.json index 76a9b746..a58efa72 100644 --- a/package.json +++ b/package.json @@ -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",