Merge pull request #5 from babolivier/develop

Minify build and add Babel to the Webpack config

package-lock.json

@@ -749,6 +749,38 @@
         "semver": "5.4.1"
       }
     },
+    "babel-preset-es2015": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz",
+      "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-check-es2015-constants": "6.22.0",
+        "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
+        "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
+        "babel-plugin-transform-es2015-block-scoping": "6.26.0",
+        "babel-plugin-transform-es2015-classes": "6.24.1",
+        "babel-plugin-transform-es2015-computed-properties": "6.24.1",
+        "babel-plugin-transform-es2015-destructuring": "6.23.0",
+        "babel-plugin-transform-es2015-duplicate-keys": "6.24.1",
+        "babel-plugin-transform-es2015-for-of": "6.23.0",
+        "babel-plugin-transform-es2015-function-name": "6.24.1",
+        "babel-plugin-transform-es2015-literals": "6.22.0",
+        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
+        "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
+        "babel-plugin-transform-es2015-modules-systemjs": "6.24.1",
+        "babel-plugin-transform-es2015-modules-umd": "6.24.1",
+        "babel-plugin-transform-es2015-object-super": "6.24.1",
+        "babel-plugin-transform-es2015-parameters": "6.24.1",
+        "babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
+        "babel-plugin-transform-es2015-spread": "6.22.0",
+        "babel-plugin-transform-es2015-sticky-regex": "6.24.1",
+        "babel-plugin-transform-es2015-template-literals": "6.22.0",
+        "babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
+        "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
+        "babel-plugin-transform-regenerator": "6.26.0"
+      }
+    },
     "babel-preset-flow": {
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz",

package.json

@@ -1,32 +1,33 @@
 {
-  "name": "sparrow",
-  "version": "0.0.1",
-  "description": "Sparrow is a libre front-end forum software powered by the Matrix protocol and using a Matrix homeserver as its back-end",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "webpack"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/babolivier/sparrow.git"
-  },
-  "author": "Brendan Abolivier <sparrow@brendanabolivier.com>",
-  "license": "AGPL-3.0",
-  "bugs": {
-    "url": "https://github.com/babolivier/sparrow/issues"
-  },
-  "homepage": "https://github.com/babolivier/sparrow",
-  "devDependencies": {
-    "babel-core": "6.26.0",
-    "babel-loader": "7.1.2",
-    "babel-polyfill": "6.26.0",
-    "babel-preset-env": "1.6.0",
-    "babel-preset-flow": "6.23.0",
-    "flow-bin": "0.55.0",
-    "html-webpack-plugin": "^2.30.1",
-    "webpack": "3.6.0"
-  },
-  "dependencies": {
-    "matrix-js-sdk": "^0.8.4"
-  }
+	"name": "sparrow",
+	"version": "0.0.1",
+	"description": "Sparrow is a libre front-end forum software powered by the Matrix protocol and using a Matrix homeserver as its back-end",
+	"scripts": {
+		"test": "echo \"Error: no test specified\" && exit 1",
+		"build": "webpack"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/babolivier/sparrow.git"
+	},
+	"author": "Brendan Abolivier <sparrow@brendanabolivier.com>",
+	"license": "AGPL-3.0",
+	"bugs": {
+		"url": "https://github.com/babolivier/sparrow/issues"
+	},
+	"homepage": "https://github.com/babolivier/sparrow",
+	"devDependencies": {
+		"babel-core": "6.26.0",
+		"babel-loader": "7.1.2",
+		"babel-preset-env": "1.6.0",
+		"babel-preset-flow": "6.23.0",
+		"flow-bin": "0.55.0",
+		"html-webpack-plugin": "2.30.1",
+		"uglifyjs-webpack-plugin": "^0.4.6",
+		"webpack": "3.6.0"
+	},
+	"dependencies": {
+		"babel-polyfill": "6.26.0",
+		"matrix-js-sdk": "0.8.4"
+	}
 }

webpack.config.js

@@ -1,13 +1,30 @@
-const path				= require('path');
+const path = require('path');
+const UglifyJSPlugin = require('uglifyjs-webpack-plugin')
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 
 module.exports = {
-	entry: './src/index.js',
+	entry: ['babel-polyfill', './src/index.js'],
+	devtool: 'source-map',
+	module: {
+		rules: [
+			{
+				test: /\.js$/,
+				exclude: /node_modules/,
+				use: {
+					loader: 'babel-loader',
+					options: {
+						presets: ['env', 'flow']
+					}
+				}
+			}
+		]
+	},
  	output: {
 		filename: 'sparrow.js',
 		path: path.resolve(__dirname, 'dist')
 	},
 	plugins: [
+		new UglifyJSPlugin(),
 		new HtmlWebpackPlugin({
 			template: './src/index.html'
 		})