Merge pull request #166 from SupahNickie/ie-fixes

IE hotfix

Author: SupahNickie

package-lock.json

@@ -54,12 +54,14 @@
     "autoprefixer": "^7.0.1",
     "babel": "^6.5.2",
     "babel-core": "^6.24.0",
+    "babel-engine-plugin": "^0.2.1",
     "babel-eslint": "^8.2.1",
     "babel-jest": "^22.2.0",
     "babel-loader": "^7.0.0",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "babel-plugin-transform-object-assign": "^6.22.0",
     "babel-plugin-transform-react-jsx": "^6.8.0",
+    "babel-preset-env": "^1.7.0",
     "babel-preset-es2015": "^6.24.0",
     "babel-preset-stage-0": "^6.5.0",
     "babel-register": "^6.24.0",

package.json

@@ -3,6 +3,8 @@ import 'core-js/fn/array/fill';
 import 'core-js/fn/array/map';
 import 'core-js/fn/array/for-each';
 import 'core-js/fn/array/filter';
+import 'core-js/fn/array/from';
+
 import { init } from './lib/init';
 import { CMP_GLOBAL_NAME } from "./lib/cmp";
 

src/complete.js

@@ -2,6 +2,7 @@
 
 .container {
 	display: flex;
+	flex: 1;
 	flex-direction: column;
 
 	.disclaimer {

src/components/popup/details/purposes/purposes.less

@@ -3,10 +3,8 @@
 }
 
 div.intro {
-	display: flex;
 	align-items: center;
 	padding: 0 4em;
-	flex: 1;
 	max-height: 100%;
 
 	.top {

src/components/popup/intro/intro.less

@@ -5,7 +5,7 @@ import 'core-js/fn/array/for-each';
 import 'core-js/fn/array/filter';
 import 'core-js/fn/array/from';
 
-import {init} from './lib/init';
+import { init } from './lib/init';
 import { CMP_GLOBAL_NAME } from './lib/cmp';
 
 function start() {

src/index.js

@@ -3,6 +3,7 @@ import HtmlWebpackPlugin from 'html-webpack-plugin';
 import CopyWebpackPlugin from 'copy-webpack-plugin';
 import autoprefixer from 'autoprefixer';
 import path from 'path';
+const BabelEnginePlugin = require('babel-engine-plugin');
 
 const ENV = process.env.NODE_ENV || 'development';
 
@@ -195,7 +196,10 @@ module.exports = [
 			// Static assets copy
 			new CopyWebpackPlugin([
 				{ from: './geoip.json' }
-			])
+			]),
+			new BabelEnginePlugin({
+				presets: ['env']
+			})
 		]).concat(ENV === 'production' ? uglifyPlugin : []),
 	},
 	// Docs config