aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2021-04-15 18:15:45 +0800
committercrupest <crupest@outlook.com>2021-04-15 18:15:45 +0800
commit224c9b6d07f28fab7b86019d97ba847a7ca54454 (patch)
tree12963033940d291e8293182c6cc331eafb095968
parent9d687b6672dc06fc587fa82c8dc052919fb2dd93 (diff)
parentc64247f89a44f0638ec6c6261b1267a9e2f2c447 (diff)
downloadtimeline-224c9b6d07f28fab7b86019d97ba847a7ca54454.tar.gz
timeline-224c9b6d07f28fab7b86019d97ba847a7ca54454.tar.bz2
timeline-224c9b6d07f28fab7b86019d97ba847a7ca54454.zip
Merge branch 'master' of https://github.com/crupest/Timeline
-rw-r--r--FrontEnd/package-lock.json42
-rw-r--r--FrontEnd/package.json6
2 files changed, 24 insertions, 24 deletions
diff --git a/FrontEnd/package-lock.json b/FrontEnd/package-lock.json
index f6253531..06798a09 100644
--- a/FrontEnd/package-lock.json
+++ b/FrontEnd/package-lock.json
@@ -51,7 +51,7 @@
"@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
"@types/classnames": "^2.2.11",
"@types/lodash": "^4.14.168",
- "@types/node": "^14.14.37",
+ "@types/node": "^14.14.39",
"@types/react": "^17.0.3",
"@types/react-dom": "^17.0.3",
"@types/react-responsive": "^8.0.2",
@@ -72,7 +72,7 @@
"eslint": "^7.24.0",
"eslint-config-prettier": "^8.2.0",
"eslint-plugin-import": "^2.22.1",
- "eslint-plugin-prettier": "^3.3.1",
+ "eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-react": "^7.23.2",
"eslint-plugin-react-hooks": "^4.2.0",
"file-loader": "^6.2.0",
@@ -91,7 +91,7 @@
"ts-loader": "^8.1.0",
"typescript": "^4.2.4",
"url-loader": "^4.1.1",
- "webpack": "^5.32.0",
+ "webpack": "^5.33.2",
"webpack-chain": "^6.5.1",
"webpack-cli": "^4.6.0",
"webpack-dev-server": "^3.11.2",
@@ -2003,9 +2003,9 @@
"dev": true
},
"node_modules/@types/node": {
- "version": "14.14.37",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.37.tgz",
- "integrity": "sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw==",
+ "version": "14.14.39",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.39.tgz",
+ "integrity": "sha512-Qipn7rfTxGEDqZiezH+wxqWYR8vcXq5LRpZrETD19Gs4o8LbklbmqotSUsMU+s5G3PJwMRDfNEYoxrcBwIxOuw==",
"dev": true
},
"node_modules/@types/parse-json": {
@@ -5862,9 +5862,9 @@
"dev": true
},
"node_modules/eslint-plugin-prettier": {
- "version": "3.3.1",
- "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz",
- "integrity": "sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ==",
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0.tgz",
+ "integrity": "sha512-UDK6rJT6INSfcOo545jiaOwB701uAIt2/dR7WnFQoGCVl1/EMqdANBmwUaqqQ45aXprsTGzSa39LI1PyuRBxxw==",
"dev": true,
"dependencies": {
"prettier-linter-helpers": "^1.0.0"
@@ -14886,9 +14886,9 @@
"dev": true
},
"node_modules/webpack": {
- "version": "5.32.0",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.32.0.tgz",
- "integrity": "sha512-jB9PrNMFnPRiZGnm/j3qfNqJmP3ViRzkuQMIf8za0dgOYvSLi/cgA+UEEGvik9EQHX1KYyGng5PgBTTzGrH9xg==",
+ "version": "5.33.2",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.33.2.tgz",
+ "integrity": "sha512-X4b7F1sYBmJx8mlh2B7mV5szEkE0jYNJ2y3akgAP0ERi0vLCG1VvdsIxt8lFd4st6SUy0lf7W0CCQS566MBpJg==",
"dev": true,
"dependencies": {
"@types/eslint-scope": "^3.7.0",
@@ -17736,9 +17736,9 @@
"dev": true
},
"@types/node": {
- "version": "14.14.37",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.37.tgz",
- "integrity": "sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw==",
+ "version": "14.14.39",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.39.tgz",
+ "integrity": "sha512-Qipn7rfTxGEDqZiezH+wxqWYR8vcXq5LRpZrETD19Gs4o8LbklbmqotSUsMU+s5G3PJwMRDfNEYoxrcBwIxOuw==",
"dev": true
},
"@types/parse-json": {
@@ -20865,9 +20865,9 @@
}
},
"eslint-plugin-prettier": {
- "version": "3.3.1",
- "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz",
- "integrity": "sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ==",
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0.tgz",
+ "integrity": "sha512-UDK6rJT6INSfcOo545jiaOwB701uAIt2/dR7WnFQoGCVl1/EMqdANBmwUaqqQ45aXprsTGzSa39LI1PyuRBxxw==",
"dev": true,
"requires": {
"prettier-linter-helpers": "^1.0.0"
@@ -27734,9 +27734,9 @@
"dev": true
},
"webpack": {
- "version": "5.32.0",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.32.0.tgz",
- "integrity": "sha512-jB9PrNMFnPRiZGnm/j3qfNqJmP3ViRzkuQMIf8za0dgOYvSLi/cgA+UEEGvik9EQHX1KYyGng5PgBTTzGrH9xg==",
+ "version": "5.33.2",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.33.2.tgz",
+ "integrity": "sha512-X4b7F1sYBmJx8mlh2B7mV5szEkE0jYNJ2y3akgAP0ERi0vLCG1VvdsIxt8lFd4st6SUy0lf7W0CCQS566MBpJg==",
"dev": true,
"requires": {
"@types/eslint-scope": "^3.7.0",
diff --git a/FrontEnd/package.json b/FrontEnd/package.json
index cafc0b69..156a7789 100644
--- a/FrontEnd/package.json
+++ b/FrontEnd/package.json
@@ -66,7 +66,7 @@
"@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
"@types/classnames": "^2.2.11",
"@types/lodash": "^4.14.168",
- "@types/node": "^14.14.37",
+ "@types/node": "^14.14.39",
"@types/react": "^17.0.3",
"@types/react-dom": "^17.0.3",
"@types/react-responsive": "^8.0.2",
@@ -87,7 +87,7 @@
"eslint": "^7.24.0",
"eslint-config-prettier": "^8.2.0",
"eslint-plugin-import": "^2.22.1",
- "eslint-plugin-prettier": "^3.3.1",
+ "eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-react": "^7.23.2",
"eslint-plugin-react-hooks": "^4.2.0",
"file-loader": "^6.2.0",
@@ -106,7 +106,7 @@
"ts-loader": "^8.1.0",
"typescript": "^4.2.4",
"url-loader": "^4.1.1",
- "webpack": "^5.32.0",
+ "webpack": "^5.33.2",
"webpack-chain": "^6.5.1",
"webpack-cli": "^4.6.0",
"webpack-dev-server": "^3.11.2",