using ES6 object merge instead of Object.assign

Author: mattboldt

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "typed.js",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "homepage": "https://github.com/mattboldt/typed.js",
   "authors": [
     "Matt Boldt <[email protected]>"

gulpfile.js

@@ -47,7 +47,7 @@ gulp.task('html-docs', () => {
   return gulp.src('./src/*.js')
     .pipe(gulpDocumentation('html'), {}, {
       name: 'Typed.js Docs',
-      version: '2.0.3'
+      version: '2.0.4'
     })
     .pipe(gulp.dest('docs'));
 });

lib/typed.js

@@ -568,6 +568,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	  value: true
 	});
 
+	var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+	
 	var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
 
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
@@ -606,8 +608,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        self.el = elementId;
 	      }
 
-	      self.options = {};
-	      Object.assign(self.options, _defaultsJs2['default'], options);
+	      self.options = _extends({}, _defaultsJs2['default'], options);
 
 	      // attribute to type into
 	      self.isInput = self.el.tagName.toLowerCase() === 'input';

lib/typed.min.js

@@ -1,6 +1,6 @@
 {
   "name": "typed.js",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "homepage": "https://github.com/mattboldt/typed.js",
   "repository": "https://github.com/mattboldt/typed.js",
   "license": "MIT",

lib/typed.min.js.map

@@ -20,8 +20,7 @@ export default class Initializer {
       self.el = elementId;
     }
 
-    self.options = {};
-    Object.assign(self.options, defaults, options);
+    self.options = {...defaults, ...options};
 
     // attribute to type into
     self.isInput = self.el.tagName.toLowerCase() === 'input';