From d1b864ddfdea956e90fe42458c3f6417bdd8ef92 Mon Sep 17 00:00:00 2001 From: Tomas Tuzikas Date: Mon, 17 Oct 2022 00:46:09 +0300 Subject: [PATCH] react-bootstrap api changes (#1051) --- src/components/PullRequestItem.tsx | 2 +- src/components/PullRequestStatus.tsx | 24 ++++++++++++------------ webpack.config.js | 6 ++++-- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/components/PullRequestItem.tsx b/src/components/PullRequestItem.tsx index 0aa0eede..7f595964 100644 --- a/src/components/PullRequestItem.tsx +++ b/src/components/PullRequestItem.tsx @@ -155,7 +155,7 @@ export const PullRequestItem = observer((props: PullRequestItemProps) => { {props.pullRequest.title} {props.mutingConfiguration === "allow-muting" && ( - <InlineDropdown onClick={preventDefault} alignRight> + <InlineDropdown onClick={preventDefault} align="end"> <Dropdown.Toggle as={SmallButton} id={`mute-dropdown-${props.pullRequest.nodeId}`} diff --git a/src/components/PullRequestStatus.tsx b/src/components/PullRequestStatus.tsx index 9e493c61..a8b1d8bd 100644 --- a/src/components/PullRequestStatus.tsx +++ b/src/components/PullRequestStatus.tsx @@ -19,71 +19,71 @@ const SpacedBadge = styled(Badge)` `; const UNREVIEWED = ( - <SpacedBadge pill variant="danger" key="unreviewed"> + <SpacedBadge pill bg="danger" key="unreviewed"> Unreviewed </SpacedBadge> ); const AUTHOR_REPLIED = ( - <SpacedBadge pill variant="secondary" key="author-replied"> + <SpacedBadge pill bg="secondary" key="author-replied"> Author replied </SpacedBadge> ); const NEW_COMMIT = ( - <SpacedBadge pill variant="primary" key="new-commit"> + <SpacedBadge pill bg="primary" key="new-commit"> New commit </SpacedBadge> ); const DRAFT = ( - <SpacedBadge pill variant="dark" key="draft"> + <SpacedBadge pill bg="dark" key="draft"> Draft </SpacedBadge> ); const MERGEABLE = ( - <SpacedBadge pill variant="success" key="mergeable"> + <SpacedBadge pill bg="success" key="mergeable"> Mergeable </SpacedBadge> ); const APPROVED_BY_EVERONE = ( - <SpacedBadge pill variant="success" key="approved-by-everyone"> + <SpacedBadge pill bg="success" key="approved-by-everyone"> Approved by everyone </SpacedBadge> ); const CHECK_STATUS_PASSED = ( - <SpacedBadge pill variant="success" key="check-status-passed"> + <SpacedBadge pill bg="success" key="check-status-passed"> Checks Pass </SpacedBadge> ); const CHECK_STATUS_FAILED = ( - <SpacedBadge pill variant="danger" key="check-status-passed"> + <SpacedBadge pill bg="danger" key="check-status-passed"> Checks Fail </SpacedBadge> ); const CHECK_STATUS_PENDING = ( - <SpacedBadge pill variant="warning" key="check-status-passed"> + <SpacedBadge pill bg="warning" key="check-status-passed"> Checks Pending </SpacedBadge> ); const CHANGES_REQUESTED = ( - <SpacedBadge pill variant="warning" key="changes-requested"> + <SpacedBadge pill bg="warning" key="changes-requested"> Changes requested </SpacedBadge> ); const WAITING_FOR_REVIEW = ( - <SpacedBadge pill variant="info" key="waiting-for-review"> + <SpacedBadge pill bg="info" key="waiting-for-review"> Waiting for review </SpacedBadge> ); const NO_REVIEWER_ASSIGNED = ( - <SpacedBadge pill variant="light" key="no-reviewer-assigned"> + <SpacedBadge pill bg="light" key="no-reviewer-assigned"> No reviewer assigned </SpacedBadge> ); diff --git a/webpack.config.js b/webpack.config.js index e046225d..4527dcd7 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -44,9 +44,11 @@ module.exports = { }, mode: "development", devServer: { - contentBase: path.join(__dirname, "public"), + static: { + directory: path.join(__dirname, 'public'), + watch: true, + }, compress: true, - watchContentBase: true, hot: true, port: 9000, },