From 2c6cf0502b5d6cc5bf972310232f71ec543847ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 6 May 2021 06:55:00 +0000 Subject: build(deps): Bump bootstrap from 4.6.0 to 5.0.0 in /FrontEnd Bumps [bootstrap](https://github.com/twbs/bootstrap) from 4.6.0 to 5.0.0. - [Release notes](https://github.com/twbs/bootstrap/releases) - [Commits](https://github.com/twbs/bootstrap/compare/v4.6.0...v5.0.0) Signed-off-by: dependabot[bot] --- FrontEnd/package-lock.json | 46 ++++++++-------------------------------------- 1 file changed, 8 insertions(+), 38 deletions(-) (limited to 'FrontEnd/package-lock.json') diff --git a/FrontEnd/package-lock.json b/FrontEnd/package-lock.json index dc971384..43cd2ac6 100644 --- a/FrontEnd/package-lock.json +++ b/FrontEnd/package-lock.json @@ -9,7 +9,7 @@ "version": "0.3.0", "dependencies": { "axios": "^0.21.1", - "bootstrap": "^4.5.3", + "bootstrap": "^5.0.0", "bootstrap-icons": "^1.4.1", "classnames": "^2.3.1", "core-js": "^3.11.2", @@ -3754,16 +3754,15 @@ "dev": true }, "node_modules/bootstrap": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.0.tgz", - "integrity": "sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.0.tgz", + "integrity": "sha512-tmhPET9B9qCl8dCofvHeiIhi49iBt0EehmIsziZib65k1erBW1rHhj2s/2JsuQh5Pq+xz2E9bEbzp9B7xHG+VA==", "funding": { "type": "opencollective", "url": "https://opencollective.com/bootstrap" }, "peerDependencies": { - "jquery": "1.9.1 - 3", - "popper.js": "^1.16.1" + "@popperjs/core": "^2.9.2" } }, "node_modules/bootstrap-icons": { @@ -7492,12 +7491,6 @@ "node": ">=8" } }, - "node_modules/jquery": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", - "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==", - "peer": true - }, "node_modules/js-base64": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.6.0.tgz", @@ -8802,17 +8795,6 @@ "node": ">=4" } }, - "node_modules/popper.js": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", - "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==", - "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1", - "peer": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/popperjs" - } - }, "node_modules/portfinder": { "version": "1.0.28", "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", @@ -16736,9 +16718,9 @@ "dev": true }, "bootstrap": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.0.tgz", - "integrity": "sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.0.tgz", + "integrity": "sha512-tmhPET9B9qCl8dCofvHeiIhi49iBt0EehmIsziZib65k1erBW1rHhj2s/2JsuQh5Pq+xz2E9bEbzp9B7xHG+VA==", "requires": {} }, "bootstrap-icons": { @@ -19592,12 +19574,6 @@ } } }, - "jquery": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", - "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==", - "peer": true - }, "js-base64": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.6.0.tgz", @@ -20608,12 +20584,6 @@ "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==", "dev": true }, - "popper.js": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", - "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==", - "peer": true - }, "portfinder": { "version": "1.0.28", "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", -- cgit v1.2.3 From ffbc90d0c9b9dc15d0c2f327a669d9385fce9590 Mon Sep 17 00:00:00 2001 From: crupest Date: Thu, 6 May 2021 15:32:02 +0800 Subject: ... --- FrontEnd/package-lock.json | 22 +++++++++++----------- FrontEnd/package.json | 2 +- FrontEnd/src/app/views/center/TimelineBoard.tsx | 2 +- FrontEnd/src/app/views/center/center.sass | 2 +- FrontEnd/src/app/views/common/AppBar.tsx | 6 +++--- FrontEnd/src/app/views/common/FullPage.tsx | 2 +- FrontEnd/src/app/views/common/LoadingButton.tsx | 2 +- FrontEnd/src/app/views/common/SearchInput.tsx | 6 +++--- FrontEnd/src/app/views/common/TabPages.tsx | 2 +- FrontEnd/src/app/views/home/TimelineListView.tsx | 2 +- FrontEnd/src/app/views/search/index.tsx | 6 +++--- FrontEnd/src/app/views/settings/index.tsx | 2 +- .../app/views/timeline-common/MarkdownPostEdit.tsx | 2 +- .../timeline-common/TimelinePageCardTemplate.tsx | 6 +++--- .../app/views/timeline-common/TimelinePostView.tsx | 6 +++--- FrontEnd/src/app/views/timeline/TimelineCard.tsx | 6 +++--- FrontEnd/src/app/views/user/UserCard.tsx | 4 ++-- 17 files changed, 40 insertions(+), 40 deletions(-) (limited to 'FrontEnd/package-lock.json') diff --git a/FrontEnd/package-lock.json b/FrontEnd/package-lock.json index 43cd2ac6..c58f8eef 100644 --- a/FrontEnd/package-lock.json +++ b/FrontEnd/package-lock.json @@ -19,7 +19,7 @@ "lodash": "^4.17.21", "pepjs": "^0.5.3", "react": "^17.0.1", - "react-bootstrap": "^1.5.2", + "react-bootstrap": "^2.0.0-alpha.1", "react-dom": "^17.0.2", "react-i18next": "^11.8.15", "react-inlinesvg": "^2.3.0", @@ -10910,9 +10910,9 @@ } }, "node_modules/react-bootstrap": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-1.5.2.tgz", - "integrity": "sha512-mGKPY5+lLd7Vtkx2VFivoRkPT4xAHazuFfIhJLTEgHlDfIUSePn7qrmpZe5gXH9zvHV0RsBaQ9cLfXjxnZrOpA==", + "version": "2.0.0-alpha.1", + "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.0.0-alpha.1.tgz", + "integrity": "sha512-zoIGDzgcBoGiKd/0Rgh5SRyvqgH5OJPMEtXp+1v4Ek8gZDVSPZf58Oy4yhXs30pw4HKBS0s4yzJZcGMFKq3Yuw==", "dependencies": { "@babel/runtime": "^7.13.8", "@restart/context": "^2.1.4", @@ -10920,7 +10920,7 @@ "@types/classnames": "^2.2.10", "@types/invariant": "^2.2.33", "@types/prop-types": "^15.7.3", - "@types/react": ">=16.9.35", + "@types/react": ">=16.14.4", "@types/react-transition-group": "^4.4.1", "@types/warning": "^3.0.0", "classnames": "^2.2.6", @@ -10934,8 +10934,8 @@ "warning": "^4.0.3" }, "peerDependencies": { - "react": ">=16.8.0", - "react-dom": ">=16.8.0" + "react": ">=16.14.0", + "react-dom": ">=16.14.0" } }, "node_modules/react-dom": { @@ -22135,9 +22135,9 @@ } }, "react-bootstrap": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-1.5.2.tgz", - "integrity": "sha512-mGKPY5+lLd7Vtkx2VFivoRkPT4xAHazuFfIhJLTEgHlDfIUSePn7qrmpZe5gXH9zvHV0RsBaQ9cLfXjxnZrOpA==", + "version": "2.0.0-alpha.1", + "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.0.0-alpha.1.tgz", + "integrity": "sha512-zoIGDzgcBoGiKd/0Rgh5SRyvqgH5OJPMEtXp+1v4Ek8gZDVSPZf58Oy4yhXs30pw4HKBS0s4yzJZcGMFKq3Yuw==", "requires": { "@babel/runtime": "^7.13.8", "@restart/context": "^2.1.4", @@ -22145,7 +22145,7 @@ "@types/classnames": "^2.2.10", "@types/invariant": "^2.2.33", "@types/prop-types": "^15.7.3", - "@types/react": ">=16.9.35", + "@types/react": ">=16.14.4", "@types/react-transition-group": "^4.4.1", "@types/warning": "^3.0.0", "classnames": "^2.2.6", diff --git a/FrontEnd/package.json b/FrontEnd/package.json index eb851d3a..dd1fb6c0 100644 --- a/FrontEnd/package.json +++ b/FrontEnd/package.json @@ -17,7 +17,7 @@ "lodash": "^4.17.21", "pepjs": "^0.5.3", "react": "^17.0.1", - "react-bootstrap": "^1.5.2", + "react-bootstrap": "^2.0.0-alpha.1", "react-dom": "^17.0.2", "react-i18next": "^11.8.15", "react-inlinesvg": "^2.3.0", diff --git a/FrontEnd/src/app/views/center/TimelineBoard.tsx b/FrontEnd/src/app/views/center/TimelineBoard.tsx index e0511422..35249f66 100644 --- a/FrontEnd/src/app/views/center/TimelineBoard.tsx +++ b/FrontEnd/src/app/views/center/TimelineBoard.tsx @@ -47,7 +47,7 @@ const TimelineBoardItem: React.FC = ({ )} {title} - {name} + {name} {actions != null ? (
diff --git a/FrontEnd/src/app/views/center/center.sass b/FrontEnd/src/app/views/center/center.sass index 4b86f241..c0dfb9c0 100644 --- a/FrontEnd/src/app/views/center/center.sass +++ b/FrontEnd/src/app/views/center/center.sass @@ -23,7 +23,7 @@ .icon height: 1.3em color: black - @extend .mr-2 + @extend .me-2 &:hover background: $gray-300 .right diff --git a/FrontEnd/src/app/views/common/AppBar.tsx b/FrontEnd/src/app/views/common/AppBar.tsx index 4b165427..939f0175 100644 --- a/FrontEnd/src/app/views/common/AppBar.tsx +++ b/FrontEnd/src/app/views/common/AppBar.tsx @@ -38,7 +38,7 @@ const AppBar: React.FC = (_) => { -
- + ); diff --git a/FrontEnd/src/app/views/search/index.tsx b/FrontEnd/src/app/views/search/index.tsx index 8401f26c..966ca666 100644 --- a/FrontEnd/src/app/views/search/index.tsx +++ b/FrontEnd/src/app/views/search/index.tsx @@ -23,16 +23,16 @@ const TimelineSearchResultItemView: React.FC<{

{timeline.title} - {timeline.name} + {timeline.name}

{timeline.owner.nickname} - + @{timeline.owner.username}
diff --git a/FrontEnd/src/app/views/settings/index.tsx b/FrontEnd/src/app/views/settings/index.tsx index bc3b55a4..04a2777a 100644 --- a/FrontEnd/src/app/views/settings/index.tsx +++ b/FrontEnd/src/app/views/settings/index.tsx @@ -93,7 +93,7 @@ const SettingsPage: React.FC = (_) => { {t("settings.languageSecondary")} - + = ({ ) : ( <> { if (canLeave) { diff --git a/FrontEnd/src/app/views/timeline-common/TimelinePageCardTemplate.tsx b/FrontEnd/src/app/views/timeline-common/TimelinePageCardTemplate.tsx index ad9b7ede..be0c536b 100644 --- a/FrontEnd/src/app/views/timeline-common/TimelinePageCardTemplate.tsx +++ b/FrontEnd/src/app/views/timeline-common/TimelinePageCardTemplate.tsx @@ -54,7 +54,7 @@ const TimelinePageCardTemplate: React.FC = ({ = ({ { getHttpBookmarkClient() @@ -94,7 +94,7 @@ const TimelinePageCardTemplate: React.FC = ({ /> ) : null} setDialog("member")} /> {manageItems != null ? ( diff --git a/FrontEnd/src/app/views/timeline-common/TimelinePostView.tsx b/FrontEnd/src/app/views/timeline-common/TimelinePostView.tsx index 295ee3b9..e9c75de7 100644 --- a/FrontEnd/src/app/views/timeline-common/TimelinePostView.tsx +++ b/FrontEnd/src/app/views/timeline-common/TimelinePostView.tsx @@ -63,15 +63,15 @@ const TimelinePostView: React.FC = (props) => { /> ) : null}
- + - {post.author.nickname} + {post.author.nickname} {new Date(post.time).toLocaleTimeString()} diff --git a/FrontEnd/src/app/views/timeline/TimelineCard.tsx b/FrontEnd/src/app/views/timeline/TimelineCard.tsx index 2a9bcfc8..f2aca579 100644 --- a/FrontEnd/src/app/views/timeline/TimelineCard.tsx +++ b/FrontEnd/src/app/views/timeline/TimelineCard.tsx @@ -20,15 +20,15 @@ const TimelineCard: React.FC = (props) => { <>

{timeline.title} - {timeline.name} + {timeline.name}

{timeline.owner.nickname} - + @{timeline.owner.username}
diff --git a/FrontEnd/src/app/views/user/UserCard.tsx b/FrontEnd/src/app/views/user/UserCard.tsx index 552f5ced..067366e0 100644 --- a/FrontEnd/src/app/views/user/UserCard.tsx +++ b/FrontEnd/src/app/views/user/UserCard.tsx @@ -18,12 +18,12 @@ const UserCard: React.FC = (props) => { <>

{timeline.title} - {timeline.name} + {timeline.name}

{timeline.owner.nickname}
-- cgit v1.2.3