Merge pull request #39 from eventials/master

Germano Fronza · Germano Fronza · commit 866711c221fb · 2016-02-22T16:50:12.000-03:00
Fix build with new version of babel
diff --git a/package.json b/package.json
@@ -28,8 +28,10 @@
     "clappr": "latest"
   },
   "devDependencies": {
-    "babel-core": "^5.8.25",
-    "babel-loader": "^5.3.2",
+    "babel-core": "^6.5.1",
+    "babel-loader": "^6.2.2",
+    "babel-plugin-add-module-exports": "^0.1.2",
+    "babel-preset-es2015": "^6.5.0",
     "transfer-webpack-plugin": "^0.1.4",
     "html-loader": "^0.3.0",
     "sass-loader": "^3.1.1",
diff --git a/webpack.config.js b/webpack.config.js
@@ -25,6 +25,7 @@ module.exports = {
                 loader: 'babel',
                 query: {
                     compact: true,
+                    presets: ['es2015'],
                 }
             },
             { test: /\.(png|woff|eot|ttf|swf)/, loader: 'file-loader' }

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ module.exports = {`
`25`	`25`	`loader: 'babel',`
`26`	`26`	`query: {`
`27`	`27`	`compact: true,`
	`28`	`+ presets: ['es2015'],`
`28`	`29`	`}`
`29`	`30`	`},`
`30`	`31`	`{ test: /\.(png\|woff\|eot\|ttf\|swf)/, loader: 'file-loader' }`