aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2021-04-15 16:32:48 +0800
committercrupest <crupest@outlook.com>2021-04-15 16:32:48 +0800
commit885908b88fc3dc573bcf15a72087b2c48ec75cf1 (patch)
tree583afd9dc824b5e289ccba179ea70b6ee45cc959
parent3bfc6012eb2b66ce33e85440e24a595c677dd842 (diff)
parent2a6d238e4f974d7b92db4eedb3db7e4a0d2a5e41 (diff)
downloadtimeline-885908b88fc3dc573bcf15a72087b2c48ec75cf1.tar.gz
timeline-885908b88fc3dc573bcf15a72087b2c48ec75cf1.tar.bz2
timeline-885908b88fc3dc573bcf15a72087b2c48ec75cf1.zip
Merge branch 'master' of https://github.com/crupest/Timeline
-rw-r--r--FrontEnd/package-lock.json14
-rw-r--r--FrontEnd/package.json2
2 files changed, 8 insertions, 8 deletions
diff --git a/FrontEnd/package-lock.json b/FrontEnd/package-lock.json
index 37b28aab..f6253531 100644
--- a/FrontEnd/package-lock.json
+++ b/FrontEnd/package-lock.json
@@ -70,7 +70,7 @@
"copy-webpack-plugin": "^8.1.1",
"css-loader": "^5.2.1",
"eslint": "^7.24.0",
- "eslint-config-prettier": "^8.1.0",
+ "eslint-config-prettier": "^8.2.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-react": "^7.23.2",
@@ -5736,9 +5736,9 @@
}
},
"node_modules/eslint-config-prettier": {
- "version": "8.1.0",
- "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.1.0.tgz",
- "integrity": "sha512-oKMhGv3ihGbCIimCAjqkdzx2Q+jthoqnXSP+d86M9tptwugycmTFdVR4IpLgq2c4SHifbwO90z2fQ8/Aio73yw==",
+ "version": "8.2.0",
+ "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.2.0.tgz",
+ "integrity": "sha512-dWV9EVeSo2qodOPi1iBYU/x6F6diHv8uujxbxr77xExs3zTAlNXvVZKiyLsQGNz7yPV2K49JY5WjPzNIuDc2Bw==",
"dev": true,
"bin": {
"eslint-config-prettier": "bin/cli.js"
@@ -20750,9 +20750,9 @@
}
},
"eslint-config-prettier": {
- "version": "8.1.0",
- "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.1.0.tgz",
- "integrity": "sha512-oKMhGv3ihGbCIimCAjqkdzx2Q+jthoqnXSP+d86M9tptwugycmTFdVR4IpLgq2c4SHifbwO90z2fQ8/Aio73yw==",
+ "version": "8.2.0",
+ "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.2.0.tgz",
+ "integrity": "sha512-dWV9EVeSo2qodOPi1iBYU/x6F6diHv8uujxbxr77xExs3zTAlNXvVZKiyLsQGNz7yPV2K49JY5WjPzNIuDc2Bw==",
"dev": true,
"requires": {}
},
diff --git a/FrontEnd/package.json b/FrontEnd/package.json
index 03606c47..cafc0b69 100644
--- a/FrontEnd/package.json
+++ b/FrontEnd/package.json
@@ -85,7 +85,7 @@
"copy-webpack-plugin": "^8.1.1",
"css-loader": "^5.2.1",
"eslint": "^7.24.0",
- "eslint-config-prettier": "^8.1.0",
+ "eslint-config-prettier": "^8.2.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-react": "^7.23.2",