From 116de3e353fe90eb8c9b9b401799ec867c673b2f Mon Sep 17 00:00:00 2001
From: Ace Pace <acepace@gmail.com>
Date: Thu, 30 Apr 2020 00:21:53 +0300
Subject: [PATCH] Actually use the eslint plugins we install. Use react plugin
for eslint
---
monkey/monkey_island/cc/ui/.eslintrc | 11 +-
monkey/monkey_island/cc/ui/package-lock.json | 194 +------------------
monkey/monkey_island/cc/ui/package.json | 2 +-
3 files changed, 20 insertions(+), 187 deletions(-)
diff --git a/monkey/monkey_island/cc/ui/.eslintrc b/monkey/monkey_island/cc/ui/.eslintrc
index 6b5cd85f9..61e6aa4e1 100644
--- a/monkey/monkey_island/cc/ui/.eslintrc
+++ b/monkey/monkey_island/cc/ui/.eslintrc
@@ -3,11 +3,20 @@
"plugins": [
"react"
],
+ "extends": [
+ "eslint:recommended",
+ "plugin:react/recommended"
+ ],
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module",
+ "allowImportExportEverywhere": false,
"ecmaFeatures": {
- "jsx": true
+ "jsx": true,
+ "globalReturn": false
+ },
+ "babelOptions": {
+ "configFile": ".babelrc"
}
},
"env": {
diff --git a/monkey/monkey_island/cc/ui/package-lock.json b/monkey/monkey_island/cc/ui/package-lock.json
index 010921988..19a3fd3f5 100644
--- a/monkey/monkey_island/cc/ui/package-lock.json
+++ b/monkey/monkey_island/cc/ui/package-lock.json
@@ -1917,143 +1917,17 @@
}
},
"babel-eslint": {
- "version": "8.2.6",
- "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-8.2.6.tgz",
- "integrity": "sha512-aCdHjhzcILdP8c9lej7hvXKvQieyRt20SF102SIGyY4cUIiw6UaAtK4j2o3dXX74jEmy0TJ0CEhv4fTIM3SzcA==",
+ "version": "10.1.0",
+ "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz",
+ "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
"dev": true,
"requires": {
- "@babel/code-frame": "7.0.0-beta.44",
- "@babel/traverse": "7.0.0-beta.44",
- "@babel/types": "7.0.0-beta.44",
- "babylon": "7.0.0-beta.44",
- "eslint-scope": "3.7.1",
- "eslint-visitor-keys": "^1.0.0"
- },
- "dependencies": {
- "@babel/code-frame": {
- "version": "7.0.0-beta.44",
- "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.44.tgz",
- "integrity": "sha512-cuAuTTIQ9RqcFRJ/Y8PvTh+paepNcaGxwQwjIDRWPXmzzyAeCO4KqS9ikMvq0MCbRk6GlYKwfzStrcP3/jSL8g==",
- "dev": true,
- "requires": {
- "@babel/highlight": "7.0.0-beta.44"
- }
- },
- "@babel/generator": {
- "version": "7.0.0-beta.44",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.0.0-beta.44.tgz",
- "integrity": "sha512-5xVb7hlhjGcdkKpMXgicAVgx8syK5VJz193k0i/0sLP6DzE6lRrU1K3B/rFefgdo9LPGMAOOOAWW4jycj07ShQ==",
- "dev": true,
- "requires": {
- "@babel/types": "7.0.0-beta.44",
- "jsesc": "^2.5.1",
- "lodash": "^4.2.0",
- "source-map": "^0.5.0",
- "trim-right": "^1.0.1"
- }
- },
- "@babel/helper-function-name": {
- "version": "7.0.0-beta.44",
- "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.44.tgz",
- "integrity": "sha512-MHRG2qZMKMFaBavX0LWpfZ2e+hLloT++N7rfM3DYOMUOGCD8cVjqZpwiL8a0bOX3IYcQev1ruciT0gdFFRTxzg==",
- "dev": true,
- "requires": {
- "@babel/helper-get-function-arity": "7.0.0-beta.44",
- "@babel/template": "7.0.0-beta.44",
- "@babel/types": "7.0.0-beta.44"
- }
- },
- "@babel/helper-get-function-arity": {
- "version": "7.0.0-beta.44",
- "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.44.tgz",
- "integrity": "sha512-w0YjWVwrM2HwP6/H3sEgrSQdkCaxppqFeJtAnB23pRiJB5E/O9Yp7JAAeWBl+gGEgmBFinnTyOv2RN7rcSmMiw==",
- "dev": true,
- "requires": {
- "@babel/types": "7.0.0-beta.44"
- }
- },
- "@babel/helper-split-export-declaration": {
- "version": "7.0.0-beta.44",
- "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.44.tgz",
- "integrity": "sha512-aQ7QowtkgKKzPGf0j6u77kBMdUFVBKNHw2p/3HX/POt5/oz8ec5cs0GwlgM8Hz7ui5EwJnzyfRmkNF1Nx1N7aA==",
- "dev": true,
- "requires": {
- "@babel/types": "7.0.0-beta.44"
- }
- },
- "@babel/highlight": {
- "version": "7.0.0-beta.44",
- "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0-beta.44.tgz",
- "integrity": "sha512-Il19yJvy7vMFm8AVAh6OZzaFoAd0hbkeMZiX3P5HGD+z7dyI7RzndHB0dg6Urh/VAFfHtpOIzDUSxmY6coyZWQ==",
- "dev": true,
- "requires": {
- "chalk": "^2.0.0",
- "esutils": "^2.0.2",
- "js-tokens": "^3.0.0"
- }
- },
- "@babel/template": {
- "version": "7.0.0-beta.44",
- "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.44.tgz",
- "integrity": "sha512-w750Sloq0UNifLx1rUqwfbnC6uSUk0mfwwgGRfdLiaUzfAOiH0tHJE6ILQIUi3KYkjiCDTskoIsnfqZvWLBDng==",
- "dev": true,
- "requires": {
- "@babel/code-frame": "7.0.0-beta.44",
- "@babel/types": "7.0.0-beta.44",
- "babylon": "7.0.0-beta.44",
- "lodash": "^4.2.0"
- }
- },
- "@babel/traverse": {
- "version": "7.0.0-beta.44",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.0.0-beta.44.tgz",
- "integrity": "sha512-UHuDz8ukQkJCDASKHf+oDt3FVUzFd+QYfuBIsiNu/4+/ix6pP/C+uQZJ6K1oEfbCMv/IKWbgDEh7fcsnIE5AtA==",
- "dev": true,
- "requires": {
- "@babel/code-frame": "7.0.0-beta.44",
- "@babel/generator": "7.0.0-beta.44",
- "@babel/helper-function-name": "7.0.0-beta.44",
- "@babel/helper-split-export-declaration": "7.0.0-beta.44",
- "@babel/types": "7.0.0-beta.44",
- "babylon": "7.0.0-beta.44",
- "debug": "^3.1.0",
- "globals": "^11.1.0",
- "invariant": "^2.2.0",
- "lodash": "^4.2.0"
- }
- },
- "@babel/types": {
- "version": "7.0.0-beta.44",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.44.tgz",
- "integrity": "sha512-5eTV4WRmqbaFM3v9gHAIljEQJU4Ssc6fxL61JN+Oe2ga/BwyjzjamwkCVVAQjHGuAX8i0BWo42dshL8eO5KfLQ==",
- "dev": true,
- "requires": {
- "esutils": "^2.0.2",
- "lodash": "^4.2.0",
- "to-fast-properties": "^2.0.0"
- }
- },
- "debug": {
- "version": "3.2.6",
- "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
- "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
- "dev": true,
- "requires": {
- "ms": "^2.1.1"
- }
- },
- "js-tokens": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
- "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
- "dev": true
- },
- "ms": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
- "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
- "dev": true
- }
+ "@babel/code-frame": "^7.0.0",
+ "@babel/parser": "^7.7.0",
+ "@babel/traverse": "^7.7.0",
+ "@babel/types": "^7.7.0",
+ "eslint-visitor-keys": "^1.0.0",
+ "resolve": "^1.12.0"
}
},
"babel-loader": {
@@ -2103,19 +1977,6 @@
"source-map": "^0.5.7"
}
},
- "babel-plugin-lodash": {
- "version": "3.3.4",
- "resolved": "https://registry.npmjs.org/babel-plugin-lodash/-/babel-plugin-lodash-3.3.4.tgz",
- "integrity": "sha512-yDZLjK7TCkWl1gpBeBGmuaDIFhZKmkoL+Cu2MUUjv5VxUZx/z7tBGBCBcQs5RI1Bkz5LLmNdjx7paOyQtMovyg==",
- "dev": true,
- "requires": {
- "@babel/helper-module-imports": "^7.0.0-beta.49",
- "@babel/types": "^7.0.0-beta.49",
- "glob": "^7.1.1",
- "lodash": "^4.17.10",
- "require-package-name": "^2.0.1"
- }
- },
"babel-plugin-macros": {
"version": "2.8.0",
"resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz",
@@ -2152,12 +2013,6 @@
}
}
},
- "babylon": {
- "version": "7.0.0-beta.44",
- "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.44.tgz",
- "integrity": "sha512-5Hlm13BJVAioCHpImtFqNOF2H3ieTOHd0fmFGMxOJ9jgeFqeAwsv3u5P5cR7CSeFrkgHsT19DgFJkHV0/Mcd8g==",
- "dev": true
- },
"backo2": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
@@ -4707,16 +4562,6 @@
}
}
},
- "eslint-scope": {
- "version": "3.7.1",
- "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz",
- "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
- "dev": true,
- "requires": {
- "esrecurse": "^4.1.0",
- "estraverse": "^4.1.1"
- }
- },
"eslint-utils": {
"version": "1.4.3",
"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
@@ -7794,15 +7639,6 @@
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
},
- "lodash-webpack-plugin": {
- "version": "0.11.5",
- "resolved": "https://registry.npmjs.org/lodash-webpack-plugin/-/lodash-webpack-plugin-0.11.5.tgz",
- "integrity": "sha512-QWfEIYxpixOdbd6KBe5g6MDWcyTgP3trDXwKHFqTlXrWiLcs/67fGQ0IWeRyhWlTITQIgMpJAYd2oeIztuV5VA==",
- "dev": true,
- "requires": {
- "lodash": "^4.17.4"
- }
- },
"lodash.curry": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/lodash.curry/-/lodash.curry-4.1.1.tgz",
@@ -13353,12 +13189,6 @@
"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
"integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
},
- "require-package-name": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/require-package-name/-/require-package-name-2.0.1.tgz",
- "integrity": "sha1-wR6XJ2tluOKSP3Xav1+y7ww4Qbk=",
- "dev": true
- },
"requires-port": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
@@ -14884,12 +14714,6 @@
"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM="
},
- "trim-right": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
- "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
- "dev": true
- },
"true-case-path": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
diff --git a/monkey/monkey_island/cc/ui/package.json b/monkey/monkey_island/cc/ui/package.json
index 518706ea2..43b4cf6c9 100644
--- a/monkey/monkey_island/cc/ui/package.json
+++ b/monkey/monkey_island/cc/ui/package.json
@@ -30,7 +30,7 @@
"@babel/preset-env": "^7.9.6",
"@babel/preset-react": "^7.9.0",
"@babel/runtime": "^7.9.6",
- "babel-eslint": "^8.2.6",
+ "babel-eslint": "^10.1.0",
"babel-loader": "^8.0.0",
"chai": "^4.2.0",
"copyfiles": "^2.2.0",