From e3e7a47aea5f742ab26a82d80148a6eb307ba895 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 28 Jan 2020 12:48:27 +0000
Subject: [PATCH 1/3] Update babel targets

---
 babel.config.js | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/babel.config.js b/babel.config.js
index 8f40b20c8a..be25c5fe48 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,25 +1,25 @@
 module.exports = {
-  "sourceMaps": true,
-  "presets": [
-    ["@babel/preset-env", {
-      "targets": {
-        "browsers": [
-          "last 2 versions"
-        ]
-      }
-    }],
-    "@babel/preset-typescript",
-    "@babel/preset-flow",
-    "@babel/preset-react"
-  ],
-  "plugins": [
-    ["@babel/plugin-proposal-decorators", {"legacy": true}],
-    "@babel/plugin-proposal-export-default-from",
-    "@babel/plugin-proposal-numeric-separator",
-    "@babel/plugin-proposal-class-properties",
-    "@babel/plugin-proposal-object-rest-spread",
-    "@babel/plugin-transform-flow-comments",
-    "@babel/plugin-syntax-dynamic-import",
-    "@babel/plugin-transform-runtime"
-  ]
+    "sourceMaps": true,
+    "presets": [
+        ["@babel/preset-env", {
+            "targets": {
+                "browsers": [
+                    "last 2 Chrome versions", "last 2 Firefox versions", "last 2 Safari versions"
+                ]
+            },
+        }],
+        "@babel/preset-typescript",
+        "@babel/preset-flow",
+        "@babel/preset-react"
+    ],
+    "plugins": [
+        ["@babel/plugin-proposal-decorators", {"legacy": false, decoratorsBeforeExport: true}],
+        "@babel/plugin-proposal-export-default-from",
+        "@babel/plugin-proposal-numeric-separator",
+        "@babel/plugin-proposal-class-properties",
+        "@babel/plugin-proposal-object-rest-spread",
+        "@babel/plugin-transform-flow-comments",
+        "@babel/plugin-syntax-dynamic-import",
+        "@babel/plugin-transform-runtime"
+    ]
 };

From cff4ad9e8273d3560485b8e459d689088a629d9d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 28 Jan 2020 14:21:26 +0000
Subject: [PATCH 2/3] Remove legacy and stop using deprecated things

---
 babel.config.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/babel.config.js b/babel.config.js
index be25c5fe48..5974609885 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -2,18 +2,16 @@ module.exports = {
     "sourceMaps": true,
     "presets": [
         ["@babel/preset-env", {
-            "targets": {
-                "browsers": [
-                    "last 2 Chrome versions", "last 2 Firefox versions", "last 2 Safari versions"
-                ]
-            },
+            "targets": [
+                "last 2 Chrome versions", "last 2 Firefox versions", "last 2 Safari versions"
+            ],
         }],
         "@babel/preset-typescript",
         "@babel/preset-flow",
         "@babel/preset-react"
     ],
     "plugins": [
-        ["@babel/plugin-proposal-decorators", {"legacy": false, decoratorsBeforeExport: true}],
+        ["@babel/plugin-proposal-decorators", {decoratorsBeforeExport: true}],
         "@babel/plugin-proposal-export-default-from",
         "@babel/plugin-proposal-numeric-separator",
         "@babel/plugin-proposal-class-properties",

From d50b52cdc5488f9edfe877c84e3c6e730b86cfaa Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 28 Jan 2020 14:31:09 +0000
Subject: [PATCH 3/3] Try to fix Jest

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 31c8614b8f..004d6d7cc1 100644
--- a/package.json
+++ b/package.json
@@ -193,6 +193,7 @@
     "afterSign": "scripts/electron_afterSign.js"
   },
   "jest": {
+    "modulePathIgnorePatterns": ["<rootDir>/electron_app"],
     "testEnvironment": "jest-environment-jsdom-fourteen",
     "testMatch": [
       "<rootDir>/test/**/*-test.js"