Merge pull request #81 from tutorcruncher/dependabot/npm_and_yarn/react-scripts-and-react-app-rewired-3.3.0

Bump react-scripts and react-app-rewired

Author: samuelcolvin

config-overrides.js

@@ -4,13 +4,19 @@ const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPl
 
 module.exports = function override (config, env) {
   // remove the css loader to simplify things
-  config.module.rules[1].oneOf = config.module.rules[1].oneOf.filter(function (l) {
+  config.module.rules[2].oneOf = config.module.rules[2].oneOf.filter(function (l) {
     const test = l.test && l.test.toString()
     return test !== /\.css$/
   })
+  config.optimization.runtimeChunk = false;
+  config.optimization.splitChunks = {
+    cacheGroups: {
+      default: false
+    }
+  };
   // compile sass, this comes first and compresses css as well as loading sass/scss
   // https://github.com/facebookincubator/create-react-app/issues/2498
-  config.module.rules[1].oneOf.splice(0, 0,
+  config.module.rules[2].oneOf.splice(0, 0,
     {
       test: /\.(sass|scss|css)$/,
       use: [

package.json

@@ -43,16 +43,29 @@
     "pretty": "^2.0.0",
     "raven-js": "^3.27.2",
     "react": "^16.12.0",
-    "react-app-rewired": "^1.6.2",
+    "react-app-rewired": "^2.1.5",
     "react-dom": "^16.12.0",
     "react-router-dom": "^5.1.2",
-    "react-scripts": "1.1.5",
+    "react-scripts": "3.3.0",
     "react-select": "^3.0.8",
     "react-tooltip": "^3.11.1",
     "sass-loader": "^7.3.1",
     "shelljs": "0.8.3",
     "sshpk": "^1.16.1",
     "tunnel-agent": "^0.6.0",
     "webpack-bundle-analyzer": "^3.6.0"
+  },
+  "browserslist": {
+    "production": [
+      ">1%",
+      "last 4 versions",
+      "Firefox ESR",
+      "not ie < 11"
+    ],
+    "development": [
+      "last 2 chrome versions",
+      "last 2 firefox versions",
+      "last 2 edge versions"
+    ]
   }
 }

src/components/shared/EnquiryForm.js

@@ -131,7 +131,7 @@ class EnquiryForm extends Component {
                      enquiry_data={this.state.enquiry_data}
                      set_enquiry_data={this.set_enquiry_data}>
                 {get_text('terms_help')} 
-                <a href={this.props.config.terms_link} target="_blank">
+                <a href={this.props.config.terms_link} target="_blank" rel="noopener noreferrer">
                   {get_text('terms_link')}
                 </a>.
               </Input>}

src/utils.js

@@ -69,18 +69,6 @@ export const google_analytics = (history, config) => {
   return ga_prefixes
 }
 
-const clean = obj => {
-  let new_obj = {}
-  for (let [k, v] of Object.entries(obj)) {
-    if (typeof v === 'object') {
-      new_obj[k] = clean(v)
-    } else if (v !== null && v !== undefined && v !== '') {
-      new_obj[k] = v
-    }
-  }
-  return new_obj
-}
-
 export function get_company_options (public_key, config) {
   const url = `${config.api_root}/${public_key}/options`