From 24a829935c6b05addf7dacb729415d9381d9e6ce Mon Sep 17 00:00:00 2001 From: aryanshridhar Date: Thu, 11 Aug 2022 19:58:42 +0530 Subject: [PATCH] build(deps): upgrade to blueprintjs@4 --- package.json | 6 +- src/less/blueprint.less | 26 +- src/less/components/commands.less | 8 +- src/less/components/dialogs.less | 8 +- src/less/components/settings.less | 14 +- src/less/components/show-me.less | 2 +- src/less/components/sidebar.less | 14 +- src/less/components/version-select.less | 2 +- src/renderer/app.tsx | 4 +- .../components/commands-action-button.tsx | 21 +- src/renderer/components/dialog-add-theme.tsx | 6 +- .../components/dialog-add-version.tsx | 6 +- src/renderer/components/dialog-bisect.tsx | 8 +- src/renderer/components/dialog-token.tsx | 6 +- .../components/editors-toolbar-button.tsx | 4 +- src/renderer/components/settings-electron.tsx | 27 +- .../settings-general-appearance.tsx | 21 +- src/renderer/components/settings.tsx | 5 +- src/renderer/components/sidebar-file-tree.tsx | 11 +- .../components/sidebar-package-manager.tsx | 11 +- src/renderer/components/version-select.tsx | 98 ++-- tests/renderer/app-spec.tsx | 4 +- .../commands-publish-button-spec.tsx.snap | 31 +- .../commands-runner-spec.tsx.snap | 30 +- .../__snapshots__/commands-spec.tsx.snap | 32 +- .../commands-version-chooser-spec.tsx.snap | 4 +- .../dialog-add-theme-spec.tsx.snap | 16 +- .../dialog-add-version-spec.tsx.snap | 84 ++-- .../__snapshots__/dialog-bisect-spec.tsx.snap | 296 ++++++------ .../dialog-generic-spec.tsx.snap | 24 +- .../__snapshots__/dialog-token-spec.tsx.snap | 16 +- .../editors-non-ideal-state-spec.tsx.snap | 6 +- .../__snapshots__/editors-spec.tsx.snap | 135 +++--- .../settings-credits-spec.tsx.snap | 20 +- .../settings-electron-spec.tsx.snap | 92 ++-- .../settings-execution-spec.tsx.snap | 80 ++-- .../settings-general-appearance-spec.tsx.snap | 25 +- ...s-general-block-accelerators-spec.tsx.snap | 12 +- .../settings-general-console-spec.tsx.snap | 10 +- .../settings-general-font-spec.tsx.snap | 18 +- .../settings-general-github-spec.tsx.snap | 32 +- .../settings-general-mirror-spec.tsx.snap | 18 +- ...tings-general-package-author-spec.tsx.snap | 10 +- .../settings-general-spec.tsx.snap | 12 +- .../__snapshots__/settings-spec.tsx.snap | 60 +-- .../sidebar-file-tree-spec.tsx.snap | 437 ++++++++++-------- .../sidebar-package-manager-spec.tsx.snap | 7 +- .../__snapshots__/tour-spec.tsx.snap | 18 +- .../__snapshots__/tour-welcome-spec.tsx.snap | 18 +- .../version-select-spec.tsx.snap | 141 +++--- .../components/settings-electron-spec.tsx | 6 +- tests/renderer/components/tour-spec.tsx | 3 +- yarn.lock | 233 ++++++---- 53 files changed, 1182 insertions(+), 1056 deletions(-) diff --git a/package.json b/package.json index b2ed4dabdd..3495b2a211 100644 --- a/package.json +++ b/package.json @@ -35,9 +35,9 @@ "forge": "./forge.config.js" }, "dependencies": { - "@blueprintjs/core": "^3.36.0", - "@blueprintjs/popover2": "^0.12.2", - "@blueprintjs/select": "^3.15.0", + "@blueprintjs/core": "^4.8.0", + "@blueprintjs/popover2": "^1.5.1", + "@blueprintjs/select": "^4.5.3", "@octokit/rest": "^16.43.1", "@sentry/electron": "^2.5.3", "@vertedinde/fiddle-core": "^1.0.3", diff --git a/src/less/blueprint.less b/src/less/blueprint.less index c0b9d29fd0..39219ba771 100644 --- a/src/less/blueprint.less +++ b/src/less/blueprint.less @@ -5,46 +5,46 @@ @import "~@blueprintjs/core/lib/less/variables.less"; // Override some of the colors -.fiddle.bp3-dark { - .bp3-menu, - .bp3-popover .bp3-popover-content { +.fiddle.bp4-dark { + .bp4-menu, + .bp4-popover2 .bp4-popover2-content { background-color: @background-1; } - .bp3-popover .bp3-popover-arrow-fill { + .bp4-popover2 .bp4-popover2-arrow-fill { fill: @background-1; } - .bp3-button:not([class*="bp3-intent-"]) { + .bp4-button:not([class*="bp4-intent-"]) { background-color: @background-1; } - .bp3-button.bp3-minimal { + .bp4-button.bp4-minimal { background-color: unset; } - .bp3-button:hover, - .bp3-button.bp3-minimal:hover { + .bp4-button:hover, + .bp4-button.bp4-minimal:hover { background-color: rgba(138, 155, 168, 0.15); } - .bp3-menu-item.bp3-active.bp3-intent-primary { + .bp4-menu-item.bp4-active.bp4-intent-primary { background-color: @foreground-3; } - .bp3-dialog { + .bp4-dialog { background-color: @background-4; - .bp3-dialog-header { + .bp4-dialog-header { background-color: @background-3; } } - .bp3-running-text { + .bp4-running-text { font-size: 14px; } - .bp3-alert-contents { + .bp4-alert-contents { width: 100%; } } diff --git a/src/less/components/commands.less b/src/less/components/commands.less index 7029d3e5ed..518814a6b5 100644 --- a/src/less/components/commands.less +++ b/src/less/components/commands.less @@ -10,8 +10,8 @@ header { display: flex; width: 100%; - .bp3-popover-target { - width: 100%; + .bp4-popover2-target { + width: 10%; } } @@ -58,13 +58,13 @@ header { &:last-of-type { margin-right: 10px; - .bp3-button-group { + .bp4-button-group { margin-left: 5px; } } } - .bp3-control-group { + .bp4-control-group { margin-right: 0.5rem; } diff --git a/src/less/components/dialogs.less b/src/less/components/dialogs.less index cee3b0f970..8520e372e2 100644 --- a/src/less/components/dialogs.less +++ b/src/less/components/dialogs.less @@ -178,11 +178,15 @@ } .dialog-add-version { - .bp3-file-input { + .dialog-bisect-popover .bp4-button-group { + display: block; + } + + .bp4-file-input { width: 100%; } - .bp3-callout { + .bp4-callout { margin-top: 1rem; } } diff --git a/src/less/components/settings.less b/src/less/components/settings.less index 8b9f502de5..f754515f0c 100644 --- a/src/less/components/settings.less +++ b/src/less/components/settings.less @@ -35,18 +35,18 @@ width: 250px; } - .bp3-input-group { + .bp4-input-group { margin-bottom: 15px; } - .bp3-divider { + .bp4-divider { margin-top: 1rem; margin-bottom: 1rem; margin-left: 0; margin-right: 0; } - .bp3-callout { + .bp4-callout { max-width: 850px; } @@ -55,6 +55,10 @@ .action { text-align: right; + + .bp4-popover2-target { + display: block; + } } } @@ -85,10 +89,6 @@ } } - .bp3-popover-target { - display: inherit; - } - .disabled-version { width: 100%; } diff --git a/src/less/components/show-me.less b/src/less/components/show-me.less index 09bd008729..a7ebba094b 100644 --- a/src/less/components/show-me.less +++ b/src/less/components/show-me.less @@ -6,7 +6,7 @@ margin-top: 0; }; - .bp3-callout { + .bp4-callout { margin-bottom: 10px; } } diff --git a/src/less/components/sidebar.less b/src/less/components/sidebar.less index c240ad0a12..66ad8146dc 100644 --- a/src/less/components/sidebar.less +++ b/src/less/components/sidebar.less @@ -5,15 +5,15 @@ font-size: 14px; } -.add-file-input .bp3-tree-node-label { +.add-file-input .bp4-tree-node-label { overflow: visible; } -.bp3-tree-node-caret-none { +.bp4-tree-node-caret-none { min-width: 8px; } -.bp3-tree-node-content-1 { +.bp4-tree-node-content-1 { padding-left: 0; } @@ -28,13 +28,13 @@ } .package-tree { - .bp3-tree-node-content { - .bp3-tree-node-secondary-label { + .bp4-tree-node-content { + .bp4-tree-node-secondary-label { min-width: 100px; } } - .bp3-tree-node-list { + .bp4-tree-node-list { margin: 5px 0; } } @@ -46,7 +46,7 @@ background: @background-1; color: @dark-gray1; - .bp3-dark & { + .bp4-dark & { color: @white; } } diff --git a/src/less/components/version-select.less b/src/less/components/version-select.less index d8d7cc0dac..c10fca699e 100644 --- a/src/less/components/version-select.less +++ b/src/less/components/version-select.less @@ -1,4 +1,4 @@ -.bp3-fill { +.bp4-fill { .version-chooser { width: 100%; } diff --git a/src/renderer/app.tsx b/src/renderer/app.tsx index 87d63e48ea..6e6264009a 100644 --- a/src/renderer/app.tsx +++ b/src/renderer/app.tsx @@ -221,9 +221,9 @@ export class App { } if (theme.isDark || theme.name.includes('dark')) { - document.body.classList.add('bp3-dark'); + document.body.classList.add('bp4-dark'); } else { - document.body.classList.remove('bp3-dark'); + document.body.classList.remove('bp4-dark'); } } diff --git a/src/renderer/components/commands-action-button.tsx b/src/renderer/components/commands-action-button.tsx index 6bd96a00e6..0ea5c26c1b 100644 --- a/src/renderer/components/commands-action-button.tsx +++ b/src/renderer/components/commands-action-button.tsx @@ -5,11 +5,10 @@ import { ButtonGroup, IToastProps, Menu, - MenuItem, - Popover, Position, Toaster, } from '@blueprintjs/core'; +import { MenuItem2, Popover2 } from '@blueprintjs/popover2'; import { clipboard } from 'electron'; import { when } from 'mobx'; import { observer } from 'mobx-react'; @@ -395,17 +394,17 @@ export const GistActionButton = observer( const menu = ( - this.setActionType(GistActionType.publish)} /> - this.setActionType(GistActionType.update)} /> - this.setActionType(GistActionType.delete)} @@ -414,9 +413,9 @@ export const GistActionButton = observer( ); return ( - +