Merge pull request #2051 from LLK/update-eslint-smore

Update eslint and babel-eslint, and fix resulting errors

package.json

@@ -50,7 +50,7 @@
     "autoprefixer": "9.7.4",
     "babel-cli": "6.26.0",
     "babel-core": "6.26.3",
-    "babel-eslint": "8.2.6",
+    "babel-eslint": "^10.1.0",
     "babel-jest": "23.6.0",
     "babel-loader": "7.1.5",
     "babel-plugin-react-intl": "3.0.1",
@@ -60,7 +60,7 @@
     "css-loader": "3.4.0",
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.6",
-    "eslint": "5.16.0",
+    "eslint": "^7.13.0",
     "eslint-config-import": "0.13.0",
     "eslint-config-scratch": "7.0.0",
     "eslint-plugin-import": "2.26.0",

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: {

src/containers/stroke-width-indicator.jsx

@@ -7,8 +7,9 @@ import {changeStrokeColor, changeStrokeColor2, changeStrokeGradientType} from '.
 import {changeStrokeWidth} from '../reducers/stroke-width';
 import StrokeWidthIndicatorComponent from '../components/stroke-width-indicator.jsx';
 import {getSelectedLeafItems} from '../helper/selection';
-import {applyColorToSelection, applyStrokeWidthToSelection, getColorsFromSelection, MIXED}
+import {
-    from '../helper/style-path';
+    applyColorToSelection, applyStrokeWidthToSelection, getColorsFromSelection, MIXED
+} from '../helper/style-path';
 import GradientTypes from '../lib/gradient-types';
 import Modes from '../lib/modes';
 import Formats, {isBitmap} from '../lib/format';

src/helper/selection-tools/move-tool.js

@@ -4,8 +4,9 @@ import {isGroup} from '../group';
 import {isCompoundPathItem, getRootItem} from '../item';
 import {checkPointsClose, snapDeltaToAngle} from '../math';
 import {getActionBounds, CENTER} from '../view';
-import {clearSelection, cloneSelection, getSelectedLeafItems, getSelectedRootItems, setItemSelection}
+import {
-    from '../selection';
+    clearSelection, cloneSelection, getSelectedLeafItems, getSelectedRootItems, setItemSelection
+} from '../selection';
 import {getDragCrosshairLayer, CROSSHAIR_FULL_OPACITY} from '../layer';
 
 /** Snap to align selection center to rotation center within this distance */

src/helper/style-path.js

@@ -633,8 +633,7 @@ const styleShape = function (path, options) {
             );
         }
     }
-
+    if (Object.prototype.hasOwnProperty.call(options, 'strokeWidth')) path.strokeWidth = options.strokeWidth;
-    if (options.hasOwnProperty('strokeWidth')) path.strokeWidth = options.strokeWidth;
 };
 
 export {

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 */))