From 706ee3ad5ab47a407f49de626f316af07a5443c2 Mon Sep 17 00:00:00 2001
From: seotts <sotts@scratch.mit.edu>
Date: Tue, 10 Nov 2020 16:39:11 -0500
Subject: [PATCH 1/4] update eslint, babel-eslint, and eslint-config-scratch

---
 package.json             | 6 +++---
 src/.eslintrc.js         | 2 ++
 src/helper/style-path.js | 3 +--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index d802624c..02cf459d 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "autoprefixer": "9.7.4",
     "babel-cli": "6.26.0",
     "babel-core": "^6.23.1",
-    "babel-eslint": "^8.2.1",
+    "babel-eslint": "^10.1.0",
     "babel-jest": "^23.0.1",
     "babel-loader": "^7.1.4",
     "babel-plugin-react-intl": "3.0.1",
@@ -60,9 +60,9 @@
     "css-loader": "3.4.0",
     "enzyme": "^3.6.0",
     "enzyme-adapter-react-16": "^1.5.0",
-    "eslint": "^4.4.1",
+    "eslint": "^7.13.0",
     "eslint-config-import": "^0.13.0",
-    "eslint-config-scratch": "^5.0.0",
+    "eslint-config-scratch": "^6.0.0",
     "eslint-plugin-import": "^2.18.2",
     "eslint-plugin-react": "7.20.3",
     "gh-pages": "github:rschamp/gh-pages#publish-branch-to-subfolder",
diff --git a/src/.eslintrc.js b/src/.eslintrc.js
index e78b8104..a337b4a9 100644
--- a/src/.eslintrc.js
+++ b/src/.eslintrc.js
@@ -1,4 +1,6 @@
+/* eslint-disable import/no-commonjs */
 module.exports = {
+/* eslint-enable import/no-commonjs */
     root: true,
     extends: ['scratch', 'scratch/es6', 'scratch/react', 'import'],
     env: {
diff --git a/src/helper/style-path.js b/src/helper/style-path.js
index 839a5a07..bf30b43d 100644
--- a/src/helper/style-path.js
+++ b/src/helper/style-path.js
@@ -634,8 +634,7 @@ const styleShape = function (path, options) {
             );
         }
     }
-
-    if (options.hasOwnProperty('strokeWidth')) path.strokeWidth = options.strokeWidth;
+    if (Object.prototype.hasOwnProperty.call(options, 'strokeWidth')) path.strokeWidth = options.strokeWidth;
 };
 
 export {

From c336405db95b0cd92bc68cf3d7fe48d43733fd6b Mon Sep 17 00:00:00 2001
From: seotts <sotts@scratch.mit.edu>
Date: Tue, 10 Nov 2020 16:51:01 -0500
Subject: [PATCH 2/4] set eslint-config-scratch back to v 5.0.0

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

diff --git a/package.json b/package.json
index 02cf459d..aa5c2eb6 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "enzyme-adapter-react-16": "^1.5.0",
     "eslint": "^7.13.0",
     "eslint-config-import": "^0.13.0",
-    "eslint-config-scratch": "^6.0.0",
+    "eslint-config-scratch": "^5.0.0",
     "eslint-plugin-import": "^2.18.2",
     "eslint-plugin-react": "7.20.3",
     "gh-pages": "github:rschamp/gh-pages#publish-branch-to-subfolder",

From 8b402e3ac7d36d80e25efa1acaf81bd73b750896 Mon Sep 17 00:00:00 2001
From: seotts <sotts@scratch.mit.edu>
Date: Mon, 8 Mar 2021 14:44:30 -0500
Subject: [PATCH 3/4] meaningless commit to trigger travis build

---
 test/unit/blob-mode-reducer.test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/unit/blob-mode-reducer.test.js b/test/unit/blob-mode-reducer.test.js
index ab297fd9..f1d1807c 100644
--- a/test/unit/blob-mode-reducer.test.js
+++ b/test/unit/blob-mode-reducer.test.js
@@ -14,6 +14,7 @@ test('initialState', () => {
 
 test('changeBrushSize', () => {
     let defaultState;
+    
     const newBrushSize = 8078;
 
     expect(brushReducer(defaultState /* state */, changeBrushSize(newBrushSize) /* action */))

From 8d258cce387be5fde70fec38734a32c2b4ffe044 Mon Sep 17 00:00:00 2001
From: seotts <sotts@scratch.mit.edu>
Date: Mon, 8 Mar 2021 15:13:55 -0500
Subject: [PATCH 4/4] update node version used by travis to 12

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cec43b8e..85fe1278 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-- 8
+- 12
 env:
   global:
   - NODE_ENV=production