Merge pull request #3346 from Vizzuality/fix/ie11

HOTFIX: ie11 not rendering with arrow functions
wri · Mar 22, 2018 · 10d600c · 10d600c
2 parents 6f55cd9 + 63bb8e2
commit 10d600c
Show file tree

Hide file tree

Showing 4 changed files with 100 additions and 95 deletions.
diff --git a/.babelrc b/.babelrc
@@ -32,6 +32,7 @@
       {
         "spec": true
       }
-    ]
+    ],
+    "transform-es2015-arrow-functions"
   ]
 }
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+8.10.0
diff --git a/app/javascript/utils/analytics.js b/app/javascript/utils/analytics.js
@@ -38,7 +38,10 @@ export const handleActionTrack = state => nextDispatch => action => {
     };
 
     // use condition to find correct action
-    let event = GAEvents.find(e => !e.condition);
+    let event =
+      GAEvents &&
+      GAEvents.length &&
+      (GAEvents.filter(e => !e.condition)[0] || []);
     GAEvents.forEach(e => {
       if (e.condition && e.condition(payload)) {
         event = e;

diff --git a/package.json b/package.json
@@ -4,9 +4,7 @@
   "description": "Global Forest Watch",
   "main": "Gruntfile.js",
   "engines": {
-    "node": "8.4.0",
-    "npm": "5.5.1",
-    "yarn": "0.27.5"
+    "node": "8.10.0"
   },
   "scripts": {
     "postinstall": "./node_modules/bower/bin/bower install",
@@ -30,111 +28,113 @@
   },
   "homepage": "https://github.com/Vizzuality/gfw",
   "devDependencies": {
-    "babel-core": "^6.26.0",
-    "babel-eslint": "^8.0.2",
-    "babel-loader": "7.x",
-    "babel-plugin-syntax-dynamic-import": "^6.18.0",
-    "babel-plugin-transform-class-properties": "^6.24.1",
-    "babel-plugin-transform-react-remove-prop-types": "^0.4.8",
-    "babel-polyfill": "^6.26.0",
-    "babel-preset-env": "^1.6.0",
-    "babel-preset-react": "^6.24.1",
-    "babel-preset-stage-3": "^6.24.1",
-    "compression-webpack-plugin": "^1.0.0",
-    "css-loader": "^0.28.5",
+    "babel-core": "6.26.0",
+    "babel-eslint": "8.0.2",
+    "babel-loader": "7.1.2",
+    "babel-plugin-syntax-dynamic-import": "6.18.0",
+    "babel-plugin-transform-class-properties": "6.24.1",
+    "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
+    "babel-plugin-transform-react-remove-prop-types": "0.4.8",
+    "babel-polyfill": "6.26.0",
+    "babel-preset-env": "1.6.0",
+    "babel-preset-react": "6.24.1",
+    "babel-preset-stage-3": "6.24.1",
+    "compression-webpack-plugin": "1.0.0",
+    "css-loader": "0.28.5",
     "eslint": "4.6.1",
     "eslint-config-prettier": "2.4.0",
     "eslint-config-vizzuality": "1.0.5",
     "eslint-import-resolver-webpack": "0.8.3",
-    "eslint-plugin-import": "^2.7.0",
-    "eslint-plugin-jsx-a11y": "^6.0.2",
+    "eslint-plugin-import": "2.7.0",
+    "eslint-plugin-jsx-a11y": "6.0.2",
     "eslint-plugin-prettier": "2.3.1",
-    "eslint-plugin-react": "^7.4.0",
-    "file-loader": "^0.11.2",
-    "grunt": "^0.4.5",
-    "grunt-contrib-connect": "^0.11.2",
-    "grunt-contrib-jasmine": "^1.0.0",
-    "grunt-contrib-watch": "^0.6.1",
-    "grunt-template-jasmine-requirejs": "^0.2.0",
-    "husky": "^0.14.3",
-    "lint-staged": "^4.3.0",
-    "load-grunt-tasks": "^0.6.0",
-    "node-sass": "^4.5.3",
-    "npm": "^5.6.0",
-    "npm-run-all": "^4.0.2",
-    "prettier": "^1.8.1",
-    "release": "github:vizzuality/release#4.0.0",
-    "resolve-url-loader": "^2.1.0",
-    "sass-loader": "^6.0.6",
-    "style-loader": "^0.18.2",
-    "stylelint-config-standard": "^17.0.0",
-    "stylelint-webpack-plugin": "^0.9.0",
-    "svg-sprite-loader": "^3.2.1",
-    "time-grunt": "^0.3.2",
-    "webpack": "^3.5.5",
-    "webpack-dev-server": "^2.7.1",
-    "webpack-merge": "^4.1.0"
+    "eslint-plugin-react": "7.4.0",
+    "file-loader": "0.11.2",
+    "grunt": "0.4.5",
+    "grunt-contrib-connect": "0.11.2",
+    "grunt-contrib-jasmine": "1.0.0",
+    "grunt-contrib-watch": "0.6.1",
+    "grunt-template-jasmine-requirejs": "0.2.0",
+    "husky": "0.14.3",
+    "lint-staged": "4.3.0",
+    "load-grunt-tasks": "0.6.0",
+    "node-sass": "4.5.3",
+    "npm": "5.7.1",
+    "npm-run-all": "4.0.2",
+    "prettier": "1.8.1",
+    "release": "3.1.6",
+    "resolve-url-loader": "2.1.0",
+    "sass-loader": "6.0.6",
+    "style-loader": "0.18.2",
+    "stylelint-config-standard": "17.0.0",
+    "stylelint-webpack-plugin": "0.9.0",
+    "svg-sprite-loader": "3.2.1",
+    "time-grunt": "0.3.2",
+    "webpack": "3.5.5",
+    "webpack-dev-server": "2.7.1",
+    "webpack-merge": "4.1.0"
   },
   "dependencies": {
-    "@rails/webpacker": "^3.0.1",
-    "autoprefixer": "^7.1.2",
-    "axios": "^0.16.2",
+    "@rails/webpacker": "3.0.1",
+    "autoprefixer": "7.1.2",
+    "aws-sdk": "2.210.0",
+    "axios": "0.16.2",
     "bower": "1.3.8",
-    "chroma-js": "^1.3.4",
-    "coffee-loader": "^0.7.3",
-    "coffee-script": "^1.12.7",
+    "chroma-js": "1.3.4",
+    "coffee-loader": "0.7.3",
+    "coffee-script": "1.12.7",
     "constants": "0.0.2",
-    "d3": "^4.11.0",
-    "d3-format": "^1.2.1",
-    "downshift": "^1.30.0",
-    "directory-named-webpack-plugin": "^2.2.3",
-    "dotenv": "^4.0.0",
-    "extract-text-webpack-plugin": "^3.0.0",
-    "fbjs": "^0.8.16",
-    "glob": "^7.1.2",
+    "d3": "4.11.0",
+    "d3-format": "1.2.1",
+    "directory-named-webpack-plugin": "2.2.3",
+    "dotenv": "4.0.0",
+    "downshift": "1.30.0",
+    "extract-text-webpack-plugin": "3.0.0",
+    "fbjs": "0.8.16",
+    "glob": "7.1.2",
     "history": "4.7.2",
-    "install": "^0.10.1",
-    "js-yaml": "^3.9.1",
-    "lodash": "^4.17.4",
-    "lory.js": "^2.3.3",
-    "moment": "^2.19.2",
-    "numeral": "^2.0.6",
-    "path-complete-extname": "^0.1.0",
-    "postcss-loader": "^2.0.6",
-    "postcss-smart-import": "^0.7.5",
-    "precss": "^2.0.0",
-    "query-string": "^5.0.1",
-    "rails-erb-loader": "^5.1.0",
-    "raw-loader": "^0.5.1",
-    "react": "^15.6.1",
-    "react-document-events": "^1.3.2",
-    "react-dom": "^15.6.1",
-    "react-dotdotdot": "^1.1.0",
-    "react-event-listener": "^0.5.1",
-    "react-ga": "^2.4.1",
-    "react-helmet": "^5.2.0",
-    "react-html-parser": "^2.0.2",
-    "react-list-scroll-bound": "^16.0.1",
+    "install": "0.10.1",
+    "js-yaml": "3.9.1",
+    "lodash": "4.17.4",
+    "lory.js": "2.3.3",
+    "moment": "2.19.2",
+    "numeral": "2.0.6",
+    "path-complete-extname": "0.1.0",
+    "postcss-loader": "2.0.6",
+    "postcss-smart-import": "0.7.5",
+    "precss": "2.0.0",
+    "query-string": "5.0.1",
+    "rails-erb-loader": "5.1.0",
+    "raw-loader": "0.5.1",
+    "react": "15.6.1",
+    "react-document-events": "1.3.2",
+    "react-dom": "15.6.1",
+    "react-dotdotdot": "1.1.0",
+    "react-event-listener": "0.5.1",
+    "react-ga": "2.4.1",
+    "react-helmet": "5.2.0",
+    "react-html-parser": "2.0.2",
+    "react-list-scroll-bound": "16.0.1",
     "react-load-script": "0.0.6",
     "react-modal": "3.1.2",
-    "react-onscroll": "^1.0.4",
-    "react-radio-group": "^3.0.2",
-    "react-redux": "^5.0.6",
-    "react-scroll": "^1.5.4",
-    "react-slick": "^0.18.1",
-    "react-stickynode": "^1.4.1",
+    "react-onscroll": "1.0.4",
+    "react-radio-group": "3.0.2",
+    "react-redux": "5.0.6",
+    "react-scroll": "1.5.4",
+    "react-slick": "0.18.1",
+    "react-stickynode": "1.4.1",
     "react-tippy": "1.2.2",
-    "recharts": "^1.0.0-beta.1",
-    "redux": "^3.7.2",
-    "redux-actions": "^2.2.1",
+    "recharts": "1.0.0-beta.1",
+    "redux": "3.7.2",
+    "redux-actions": "2.2.1",
     "redux-first-router": "0.0.16-next",
     "redux-first-router-link": "1.4.2",
-    "redux-form": "^7.1.1",
-    "redux-thunk": "^2.2.0",
+    "redux-form": "7.1.1",
+    "redux-thunk": "2.2.0",
     "reselect": "3.0.1",
-    "stylelint": "^8.3.1",
-    "three": "^0.87.1",
-    "three-orbit-controls": "^82.1.0",
-    "webpack-manifest-plugin": "^1.3.1"
+    "stylelint": "8.3.1",
+    "three": "0.87.1",
+    "three-orbit-controls": "82.1.0",
+    "webpack-manifest-plugin": "1.3.1"
   }
 }