aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>2021-02-22 15:05:24 +0000
committerGitHub <noreply@github.com>2021-02-22 15:05:24 +0000
commitd03b5e2da5912a5fc4156701a5dbeeddfb53df29 (patch)
tree38e973eb30797441c2ecea4649dca85768558643
parenta11fbeea4e836fa02ab2c66ca2395e3455b10d4b (diff)
parent5fe13b0cca511995fb6fec33c0af5f600f63ee7d (diff)
downloadtimeline-d03b5e2da5912a5fc4156701a5dbeeddfb53df29.tar.gz
timeline-d03b5e2da5912a5fc4156701a5dbeeddfb53df29.tar.bz2
timeline-d03b5e2da5912a5fc4156701a5dbeeddfb53df29.zip
Merge pull request #297 from crupest/dependabot/npm_and_yarn/FrontEnd/eslint-config-prettier-8.0.0
-rw-r--r--FrontEnd/.eslintrc.js2
-rw-r--r--FrontEnd/package-lock.json14
-rw-r--r--FrontEnd/package.json2
3 files changed, 8 insertions, 10 deletions
diff --git a/FrontEnd/.eslintrc.js b/FrontEnd/.eslintrc.js
index 900489ed..9bb22216 100644
--- a/FrontEnd/.eslintrc.js
+++ b/FrontEnd/.eslintrc.js
@@ -10,8 +10,6 @@ module.exports = {
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/recommended-requiring-type-checking",
"plugin:prettier/recommended",
- "prettier/react",
- "prettier/@typescript-eslint",
"plugin:react-hooks/recommended",
],
globals: {
diff --git a/FrontEnd/package-lock.json b/FrontEnd/package-lock.json
index 35e7f9dd..1b1576c1 100644
--- a/FrontEnd/package-lock.json
+++ b/FrontEnd/package-lock.json
@@ -69,7 +69,7 @@
"copy-webpack-plugin": "^7.0.0",
"css-loader": "^5.0.2",
"eslint": "^7.20.0",
- "eslint-config-prettier": "^7.2.0",
+ "eslint-config-prettier": "^8.0.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-react": "^7.22.0",
@@ -5609,9 +5609,9 @@
}
},
"node_modules/eslint-config-prettier": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-7.2.0.tgz",
- "integrity": "sha512-rV4Qu0C3nfJKPOAhFujFxB7RMP+URFyQqqOZW9DMRD7ZDTFyjaIlETU3xzHELt++4ugC0+Jm084HQYkkJe+Ivg==",
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.0.0.tgz",
+ "integrity": "sha512-5EaAVPsIHu+grmm5WKjxUia4yHgRrbkd8I0ffqUSwixCPMVBrbS97UnzlEY/Q7OWo584vgixefM0kJnUfo/VjA==",
"dev": true,
"bin": {
"eslint-config-prettier": "bin/cli.js"
@@ -20494,9 +20494,9 @@
}
},
"eslint-config-prettier": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-7.2.0.tgz",
- "integrity": "sha512-rV4Qu0C3nfJKPOAhFujFxB7RMP+URFyQqqOZW9DMRD7ZDTFyjaIlETU3xzHELt++4ugC0+Jm084HQYkkJe+Ivg==",
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.0.0.tgz",
+ "integrity": "sha512-5EaAVPsIHu+grmm5WKjxUia4yHgRrbkd8I0ffqUSwixCPMVBrbS97UnzlEY/Q7OWo584vgixefM0kJnUfo/VjA==",
"dev": true,
"requires": {}
},
diff --git a/FrontEnd/package.json b/FrontEnd/package.json
index d618bc9f..3f2aaa52 100644
--- a/FrontEnd/package.json
+++ b/FrontEnd/package.json
@@ -84,7 +84,7 @@
"copy-webpack-plugin": "^7.0.0",
"css-loader": "^5.0.2",
"eslint": "^7.20.0",
- "eslint-config-prettier": "^7.2.0",
+ "eslint-config-prettier": "^8.0.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-react": "^7.22.0",