aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2021-06-03 18:56:12 +0800
committercrupest <crupest@outlook.com>2021-06-03 18:56:12 +0800
commit9c27a8454e1f7b2d00d01092156268bf902452cf (patch)
treec7b7407022ed805eb4e3144648345ed0bb6dbdce
parent496b4f480248ba1c8cda86b1033470f09322cf9c (diff)
parent92c4dbac261787e1867fe210d1a57a77279e5abb (diff)
downloadtimeline-9c27a8454e1f7b2d00d01092156268bf902452cf.tar.gz
timeline-9c27a8454e1f7b2d00d01092156268bf902452cf.tar.bz2
timeline-9c27a8454e1f7b2d00d01092156268bf902452cf.zip
Merge branch 'master' of https://github.com/crupest/Timelinev0.4.1
Diffstat
-rw-r--r--FrontEnd/package-lock.json95
-rw-r--r--FrontEnd/package.json8
2 files changed, 42 insertions, 61 deletions
diff --git a/FrontEnd/package-lock.json b/FrontEnd/package-lock.json
index 6b6d8a93..664eff6d 100644
--- a/FrontEnd/package-lock.json
+++ b/FrontEnd/package-lock.json
@@ -21,7 +21,7 @@
"lodash": "^4.17.21",
"pepjs": "^0.5.3",
"react": "^17.0.1",
- "react-bootstrap": "^2.0.0-alpha.2",
+ "react-bootstrap": "^2.0.0-beta.0",
"react-color": "^2.19.3",
"react-dom": "^17.0.2",
"react-i18next": "^11.10.0",
@@ -44,7 +44,7 @@
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.0-beta.9",
"@types/color": "^3.0.1",
"@types/lodash": "^4.14.170",
- "@types/node": "^15.6.1",
+ "@types/node": "^15.9.0",
"@types/react": "^17.0.9",
"@types/react-color": "^3.0.4",
"@types/react-dom": "^17.0.6",
@@ -52,7 +52,7 @@
"@types/react-router": "^5.1.13",
"@types/react-router-bootstrap": "^0.24.5",
"@types/react-router-dom": "^5.1.7",
- "@types/remarkable": "^2.0.1",
+ "@types/remarkable": "^2.0.2",
"@types/webpack-env": "^1.16.0",
"@types/xregexp": "^4.4.0",
"@typescript-eslint/eslint-plugin": "^4.26.0",
@@ -74,7 +74,7 @@
"prettier": "^2.3.0",
"react-refresh": "^0.10.0",
"react-refresh-typescript": "^2.0.1",
- "sass": "^1.34.0",
+ "sass": "^1.34.1",
"sass-loader": "^12.0.0",
"style-loader": "^2.0.0",
"ts-loader": "^9.2.2",
@@ -1731,15 +1731,6 @@
"integrity": "sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==",
"dev": true
},
- "node_modules/@types/classnames": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.3.1.tgz",
- "integrity": "sha512-zeOWb0JGBoVmlQoznvqXbE0tEC/HONsnoUNH19Hc96NFsTAwTXbTqb8FMYkru1F/iqp7a18Ws3nWJvtA1sHD1A==",
- "deprecated": "This is a stub types definition. classnames provides its own type definitions, so you do not need this installed.",
- "dependencies": {
- "classnames": "*"
- }
- },
"node_modules/@types/color": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/@types/color/-/color-3.0.1.tgz",
@@ -1851,9 +1842,9 @@
"dev": true
},
"node_modules/@types/node": {
- "version": "15.6.1",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-15.6.1.tgz",
- "integrity": "sha512-7EIraBEyRHEe7CH+Fm1XvgqU6uwZN8Q7jppJGcqjROMT29qhAuuOxYB1uEY5UMYQKEmA5D+5tBnhdaPXSsLONA==",
+ "version": "15.9.0",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-15.9.0.tgz",
+ "integrity": "sha512-AR1Vq1Ei1GaA5FjKL5PBqblTZsL5M+monvGSZwe6sSIdGiuu7Xr/pNwWJY+0ZQuN8AapD/XMB5IzBAyYRFbocA==",
"dev": true
},
"node_modules/@types/parse-json": {
@@ -1954,9 +1945,9 @@
}
},
"node_modules/@types/remarkable": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/@types/remarkable/-/remarkable-2.0.1.tgz",
- "integrity": "sha512-4KTpW8aVjVkTgaWlEOAuorBAdlUrvlzzPlVrt9vsAAM6nB/nUln7j0bcIRLdUH0Sf2g6ZPVBfibm4+8y1glFwQ==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/@types/remarkable/-/remarkable-2.0.2.tgz",
+ "integrity": "sha512-z5JSTrZfEluIlTLWC9jiDojfWReaKpRDRj0pHSgNPlmhe5H0V/hJZIb8zeGxq0Zc0lDMKU1Rhr6cjkeabP7a6Q==",
"dev": true,
"dependencies": {
"@types/highlight.js": "^9.7.0",
@@ -9310,25 +9301,24 @@
}
},
"node_modules/react-bootstrap": {
- "version": "2.0.0-alpha.2",
- "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.0.0-alpha.2.tgz",
- "integrity": "sha512-Sjaq/EwI0ZJaN+yja4FLeJczvXuoYDxwNQsJsuzdpTAFCtCvTAh0P/PUA8n1CTxePfjbPzcnSLhKGN0k0FGdAg==",
+ "version": "2.0.0-beta.0",
+ "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.0.0-beta.0.tgz",
+ "integrity": "sha512-9grXyFdznG7r7HT7etkiKHkgqVVgasDFjkTtNCAx9xAQllAjKl6vuBGBVc3F+KLNpdTzrxrx5RWNIgd8ZpascA==",
"dependencies": {
- "@babel/runtime": "^7.13.8",
+ "@babel/runtime": "^7.14.0",
"@restart/context": "^2.1.4",
"@restart/hooks": "^0.3.26",
- "@types/classnames": "^2.2.10",
"@types/invariant": "^2.2.33",
"@types/prop-types": "^15.7.3",
- "@types/react": ">=16.14.4",
+ "@types/react": ">=16.14.8",
"@types/react-transition-group": "^4.4.1",
"@types/warning": "^3.0.0",
- "classnames": "^2.2.6",
- "dom-helpers": "^5.1.2",
+ "classnames": "^2.3.1",
+ "dom-helpers": "^5.2.1",
"invariant": "^2.2.4",
"prop-types": "^15.7.2",
"prop-types-extra": "^1.1.0",
- "react-overlays": "^5.0.0",
+ "react-overlays": "^5.0.1",
"react-transition-group": "^4.4.1",
"uncontrollable": "^7.2.1",
"warning": "^4.0.3"
@@ -9931,9 +9921,9 @@
"dev": true
},
"node_modules/sass": {
- "version": "1.34.0",
- "resolved": "https://registry.npmjs.org/sass/-/sass-1.34.0.tgz",
- "integrity": "sha512-rHEN0BscqjUYuomUEaqq3BMgsXqQfkcMVR7UhscsAVub0/spUrZGBMxQXFS2kfiDsPLZw5yuU9iJEFNC2x38Qw==",
+ "version": "1.34.1",
+ "resolved": "https://registry.npmjs.org/sass/-/sass-1.34.1.tgz",
+ "integrity": "sha512-scLA7EIZM+MmYlej6sdVr0HRbZX5caX5ofDT9asWnUJj21oqgsC+1LuNfm0eg+vM0fCTZHhwImTiCU0sx9h9CQ==",
"dev": true,
"dependencies": {
"chokidar": ">=3.0.0 <4.0.0"
@@ -13357,14 +13347,6 @@
"integrity": "sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==",
"dev": true
},
- "@types/classnames": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.3.1.tgz",
- "integrity": "sha512-zeOWb0JGBoVmlQoznvqXbE0tEC/HONsnoUNH19Hc96NFsTAwTXbTqb8FMYkru1F/iqp7a18Ws3nWJvtA1sHD1A==",
- "requires": {
- "classnames": "*"
- }
- },
"@types/color": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/@types/color/-/color-3.0.1.tgz",
@@ -13476,9 +13458,9 @@
"dev": true
},
"@types/node": {
- "version": "15.6.1",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-15.6.1.tgz",
- "integrity": "sha512-7EIraBEyRHEe7CH+Fm1XvgqU6uwZN8Q7jppJGcqjROMT29qhAuuOxYB1uEY5UMYQKEmA5D+5tBnhdaPXSsLONA==",
+ "version": "15.9.0",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-15.9.0.tgz",
+ "integrity": "sha512-AR1Vq1Ei1GaA5FjKL5PBqblTZsL5M+monvGSZwe6sSIdGiuu7Xr/pNwWJY+0ZQuN8AapD/XMB5IzBAyYRFbocA==",
"dev": true
},
"@types/parse-json": {
@@ -13579,9 +13561,9 @@
}
},
"@types/remarkable": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/@types/remarkable/-/remarkable-2.0.1.tgz",
- "integrity": "sha512-4KTpW8aVjVkTgaWlEOAuorBAdlUrvlzzPlVrt9vsAAM6nB/nUln7j0bcIRLdUH0Sf2g6ZPVBfibm4+8y1glFwQ==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/@types/remarkable/-/remarkable-2.0.2.tgz",
+ "integrity": "sha512-z5JSTrZfEluIlTLWC9jiDojfWReaKpRDRj0pHSgNPlmhe5H0V/hJZIb8zeGxq0Zc0lDMKU1Rhr6cjkeabP7a6Q==",
"dev": true,
"requires": {
"@types/highlight.js": "^9.7.0",
@@ -19174,25 +19156,24 @@
}
},
"react-bootstrap": {
- "version": "2.0.0-alpha.2",
- "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.0.0-alpha.2.tgz",
- "integrity": "sha512-Sjaq/EwI0ZJaN+yja4FLeJczvXuoYDxwNQsJsuzdpTAFCtCvTAh0P/PUA8n1CTxePfjbPzcnSLhKGN0k0FGdAg==",
+ "version": "2.0.0-beta.0",
+ "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.0.0-beta.0.tgz",
+ "integrity": "sha512-9grXyFdznG7r7HT7etkiKHkgqVVgasDFjkTtNCAx9xAQllAjKl6vuBGBVc3F+KLNpdTzrxrx5RWNIgd8ZpascA==",
"requires": {
- "@babel/runtime": "^7.13.8",
+ "@babel/runtime": "^7.14.0",
"@restart/context": "^2.1.4",
"@restart/hooks": "^0.3.26",
- "@types/classnames": "^2.2.10",
"@types/invariant": "^2.2.33",
"@types/prop-types": "^15.7.3",
- "@types/react": ">=16.14.4",
+ "@types/react": ">=16.14.8",
"@types/react-transition-group": "^4.4.1",
"@types/warning": "^3.0.0",
- "classnames": "^2.2.6",
- "dom-helpers": "^5.1.2",
+ "classnames": "^2.3.1",
+ "dom-helpers": "^5.2.1",
"invariant": "^2.2.4",
"prop-types": "^15.7.2",
"prop-types-extra": "^1.1.0",
- "react-overlays": "^5.0.0",
+ "react-overlays": "^5.0.1",
"react-transition-group": "^4.4.1",
"uncontrollable": "^7.2.1",
"warning": "^4.0.3"
@@ -19656,9 +19637,9 @@
"dev": true
},
"sass": {
- "version": "1.34.0",
- "resolved": "https://registry.npmjs.org/sass/-/sass-1.34.0.tgz",
- "integrity": "sha512-rHEN0BscqjUYuomUEaqq3BMgsXqQfkcMVR7UhscsAVub0/spUrZGBMxQXFS2kfiDsPLZw5yuU9iJEFNC2x38Qw==",
+ "version": "1.34.1",
+ "resolved": "https://registry.npmjs.org/sass/-/sass-1.34.1.tgz",
+ "integrity": "sha512-scLA7EIZM+MmYlej6sdVr0HRbZX5caX5ofDT9asWnUJj21oqgsC+1LuNfm0eg+vM0fCTZHhwImTiCU0sx9h9CQ==",
"dev": true,
"requires": {
"chokidar": ">=3.0.0 <4.0.0"
diff --git a/FrontEnd/package.json b/FrontEnd/package.json
index 089e3341..f00a86e7 100644
--- a/FrontEnd/package.json
+++ b/FrontEnd/package.json
@@ -19,7 +19,7 @@
"lodash": "^4.17.21",
"pepjs": "^0.5.3",
"react": "^17.0.1",
- "react-bootstrap": "^2.0.0-alpha.2",
+ "react-bootstrap": "^2.0.0-beta.0",
"react-color": "^2.19.3",
"react-dom": "^17.0.2",
"react-i18next": "^11.10.0",
@@ -60,7 +60,7 @@
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.0-beta.9",
"@types/color": "^3.0.1",
"@types/lodash": "^4.14.170",
- "@types/node": "^15.6.1",
+ "@types/node": "^15.9.0",
"@types/react": "^17.0.9",
"@types/react-color": "^3.0.4",
"@types/react-dom": "^17.0.6",
@@ -68,7 +68,7 @@
"@types/react-router": "^5.1.13",
"@types/react-router-bootstrap": "^0.24.5",
"@types/react-router-dom": "^5.1.7",
- "@types/remarkable": "^2.0.1",
+ "@types/remarkable": "^2.0.2",
"@types/webpack-env": "^1.16.0",
"@types/xregexp": "^4.4.0",
"@typescript-eslint/eslint-plugin": "^4.26.0",
@@ -90,7 +90,7 @@
"prettier": "^2.3.0",
"react-refresh": "^0.10.0",
"react-refresh-typescript": "^2.0.1",
- "sass": "^1.34.0",
+ "sass": "^1.34.1",
"sass-loader": "^12.0.0",
"style-loader": "^2.0.0",
"ts-loader": "^9.2.2",
generated by cgit v1.2.3 (git 2.46.0) at 2025-09-28 19:18:04 +0000