Removed Object.assign in favor o rest spread.

grommet · Feb 12, 2016 · e51be26 · e51be26
1 parent 73b1d87
commit e51be26
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,4 +1,4 @@
 {
   "presets": [ "es2015", "react" ],
-  "plugins": [ "add-module-exports", "transform-object-assign" ]
+  "plugins": [ "add-module-exports", "transform-object-rest-spread" ]
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jsx-to-string",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "description": "Parse your React JSX component to string",
   "main": "lib/index.js",
   "scripts": {
@@ -32,7 +32,7 @@
     "babel-cli": "^6.1.18",
     "babel-core": "^6.1.18",
     "babel-plugin-add-module-exports": "^0.1.2",
-    "babel-plugin-transform-object-assign": "^6.3.13",
+    "babel-plugin-transform-object-rest-spread": "^6.3.13",
     "babel-preset-es2015": "^6.1.18",
     "babel-preset-react": "^6.1.18",
     "tape": "^4.0.0"

diff --git a/src/index.js b/src/index.js
@@ -10,19 +10,21 @@ function isDefaultProp(defaultProps, key, value) {
 
 function jsxToString(component, options) {
 
-  let opts = Object.assign({
+  const baseOpts = {
     displayName: component.type.displayName || component.type.name || component.type,
     ignoreProps: [],
     keyValueOverride: {},
-    spacing: 0,
-  }, options);
+    spacing: 0
+  };
+
+  let opts = {...baseOpts, ...options};
 
   let componentData = {
     name: opts.displayName
   };
 
   delete opts.displayName;
-  
+
   if (component.props) {
     componentData.props = Object.keys(component.props).map(
       (key) => {