Merge remote-tracking branch 'origin/vupirov/modules' into modules

Valodya · Valodya · commit 0ad80920c744 · 2017-10-17T13:47:24.000+02:00
diff --git a/.babelrc b/.babelrc
@@ -4,6 +4,7 @@
     "stage-1"
   ],
   "plugins": [
+    "transform-object-assign",
     "transform-decorators-legacy"
   ]
 }
diff --git a/package.json b/package.json
@@ -57,6 +57,7 @@
     "babel-eslint": "^7.1.1",
     "babel-loader": "^7.1.2",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
+    "babel-plugin-transform-object-assign": "^6.22.0",
     "babel-polyfill": "^6.20.0",
     "babel-preset-es2015": "^6.18.0",
     "babel-preset-stage-1": "^6.24.1",

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`"stage-1"`
`5`	`5`	`],`
`6`	`6`	`"plugins": [`
	`7`	`+ "transform-object-assign",`
`7`	`8`	`"transform-decorators-legacy"`
`8`	`9`	`]`
`9`	`10`	`}`