Support for Webpack module loader

tur-nr · Aug 14, 2017 · 210041d · 210041d
1 parent de9e18c
commit 210041d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -3,6 +3,7 @@
   "version": "1.0.1",
   "description": "Polymer bindings for Redux.",
   "main": "lib/polymer-redux.js",
+  "module": "src/index.js",
   "jsnext:main": "src/index.js",
   "scripts": {
     "build": "gulp",

diff --git a/src/index.js b/src/index.js
@@ -106,7 +106,7 @@ export default function PolymerRedux(store) {
 	const collect = (what, which) => {
 		let res = {};
 		while (what) {
-			res = {...what[which], ...res}; // Respect prototype priority
+			res = Object.assign({}, what[which], res); // Respect prototype priority
 			what = Object.getPrototypeOf(what);
 		}
 		return res;