diff --git a/app/src/global.scss b/app/src/global.scss index c4c59854..00339b81 100644 --- a/app/src/global.scss +++ b/app/src/global.scss @@ -53,6 +53,10 @@ a, button { &>.form-control, &>.input-group { width: 33%; } + + &>.form-check { + display: flex; + } } input[type=range] { @@ -175,19 +179,19 @@ ngb-typeahead-window { // Windows high contrast mode @media screen and (forced-colors: active) { - .custom-switch .custom-control-label::before { + .form-switch .form-check-label::before { background: buttonface; } - .custom-switch .custom-control-label::after { + .form-switch .form-check-label::after { background: buttontext; } - .custom-switch .custom-control-input:checked ~ .custom-control-label::before { + .form-switch .form-check-input:checked ~ .form-check-label::before { background: activetext; } - .custom-switch .custom-control-input:checked ~ .custom-control-label::after { + .form-switch .form-check-input:checked ~ .form-check-label::after { background: canvas; } diff --git a/package.json b/package.json index d63f498f..484f4971 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,6 @@ "ngx-sortablejs": "^11.1.0", "ngx-toastr": "^14.0.0", "node-abi": "^3.25.0", - "node-sass": "^7.0.3", "npmlog": "6.0.2", "npx": "^10.2.2", "patch-package": "^6.4.7", @@ -66,6 +65,7 @@ "pug-loader": "^2.4.0", "pug-static-loader": "2.0.0", "raw-loader": "4.0.2", + "sass": "^1.58.0", "sass-loader": "^12.6.0", "shell-quote": "^1.7.4", "shelljs": "0.8.5", diff --git a/tabby-core/package.json b/tabby-core/package.json index 36c3b5df..8be678a1 100644 --- a/tabby-core/package.json +++ b/tabby-core/package.json @@ -18,7 +18,7 @@ "license": "MIT", "devDependencies": { "@ngx-translate/core": "^14.0.0", - "bootstrap": "^4.1.3", + "bootstrap": "^5.3.0-alpha.1", "deepmerge": "^4.1.1", "fuzzy-search": "^3.2.1", "js-yaml": "^4.0.0", diff --git a/tabby-core/src/components/checkbox.component.ts b/tabby-core/src/components/checkbox.component.ts index 46a3d532..c0ac49d9 100644 --- a/tabby-core/src/components/checkbox.component.ts +++ b/tabby-core/src/components/checkbox.component.ts @@ -6,9 +6,9 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms' @Component({ selector: 'checkbox', template: ` -
- - +
+ +
`, providers: [ diff --git a/tabby-core/src/components/promptModal.component.pug b/tabby-core/src/components/promptModal.component.pug index a1176dca..9216818c 100644 --- a/tabby-core/src/components/promptModal.component.pug +++ b/tabby-core/src/components/promptModal.component.pug @@ -14,6 +14,6 @@ [(ngModel)]='remember', text='Remember' ) - button.btn.btn-primary.ml-auto( + button.btn.btn-primary.ms-auto( (click)='ok()', ) OK diff --git a/tabby-core/src/components/selectorModal.component.pug b/tabby-core/src/components/selectorModal.component.pug index c6fa6b6c..fd9c8b05 100644 --- a/tabby-core/src/components/selectorModal.component.pug +++ b/tabby-core/src/components/selectorModal.component.pug @@ -21,14 +21,14 @@ [icon]='option.icon', [color]='option.color' ) - .title.mr-2 {{getOptionText(option)}} + .title.me-2 {{getOptionText(option)}} .description.no-wrap.text-muted( *ngIf='option.description !== getOptionText(option)' ) {{option.description}} - .ml-auto - .no-wrap.badge.badge-secondary.text-muted.ml-2(*ngIf='selectedIndex == i && canEditSelected()') + .ms-auto + .no-wrap.badge.text-bg-secondary.text-muted.ms-2(*ngIf='selectedIndex == i && canEditSelected()') span Backspace - i.fas.fa-pencil.ml-1 - .no-wrap.badge.badge-secondary.text-muted.ml-2(*ngIf='selectedIndex == i') + i.fas.fa-pencil.ms-1 + .no-wrap.badge.text-bg-secondary.text-muted.ms-2(*ngIf='selectedIndex == i') span Enter - i.fas.fa-arrow-right.ml-1 + i.fas.fa-arrow-right.ms-1 diff --git a/tabby-core/src/components/splitTabPaneLabel.component.ts b/tabby-core/src/components/splitTabPaneLabel.component.ts index 21f308f3..c4bb2bdf 100644 --- a/tabby-core/src/components/splitTabPaneLabel.component.ts +++ b/tabby-core/src/components/splitTabPaneLabel.component.ts @@ -15,7 +15,7 @@ import { SelfPositioningComponent } from './selfPositioning.component' (cdkDragStarted)='onTabDragStart(tab)' (cdkDragEnded)='onTabDragEnd()' > - +
`, diff --git a/tabby-core/src/components/startPage.component.pug b/tabby-core/src/components/startPage.component.pug index 77b9546b..b7fe91f1 100644 --- a/tabby-core/src/components/startPage.component.pug +++ b/tabby-core/src/components/startPage.component.pug @@ -12,7 +12,7 @@ div span {{command.label}} footer.d-flex.align-items-center - .btn-group.mr-auto + .btn-group.me-auto button.btn.btn-dark((click)='homeBase.openGitHub()') i.fab.fa-github span GitHub diff --git a/tabby-core/src/components/toggle.component.ts b/tabby-core/src/components/toggle.component.ts index 3a3d915c..fe6b3b1a 100644 --- a/tabby-core/src/components/toggle.component.ts +++ b/tabby-core/src/components/toggle.component.ts @@ -6,9 +6,9 @@ import { CheckboxComponent } from './checkbox.component' @Component({ selector: 'toggle', template: ` -
- - +
+ +
`, styles: [require('./toggle.component.scss')], diff --git a/tabby-core/src/components/transfersMenu.component.pug b/tabby-core/src/components/transfersMenu.component.pug index 77b8cade..7ac952f1 100644 --- a/tabby-core/src/components/transfersMenu.component.pug +++ b/tabby-core/src/components/transfersMenu.component.pug @@ -1,6 +1,6 @@ .d-flex.align-items-center .dropdown-header(translate) File transfers - button.btn.btn-link.ml-auto((click)='removeAll(); $event.stopPropagation()') !{require('../icons/times.svg')} + button.btn.btn-link.ms-auto((click)='removeAll(); $event.stopPropagation()') !{require('../icons/times.svg')} .transfer(*ngFor='let transfer of transfers', (click)='showTransfer(transfer)') .icon(*ngIf='isDownload(transfer)') !{require('../icons/download.svg')} .icon(*ngIf='!isDownload(transfer)') !{require('../icons/upload.svg')} diff --git a/tabby-core/src/components/unlockVaultModal.component.pug b/tabby-core/src/components/unlockVaultModal.component.pug index 44620417..4943110e 100644 --- a/tabby-core/src/components/unlockVaultModal.component.pug +++ b/tabby-core/src/components/unlockVaultModal.component.pug @@ -1,7 +1,7 @@ .modal-body .d-flex.align-items-center.mb-3 h3.m-0(translate) Vault is locked - .ml-auto(ngbDropdown, placement='bottom-right') + .ms-auto(ngbDropdown, placement='bottom-right') button.btn.btn-link(ngbDropdownToggle, (click)='$event.stopPropagation()') span( *ngIf='rememberFor', @@ -29,6 +29,5 @@ (keyup.enter)='ok()', (keyup.esc)='cancel()', ) - .input-group-append - button.btn.btn-secondary((click)='ok()', *ngIf='passphrase') - i.fas.fa-check + button.btn.btn-secondary((click)='ok()', *ngIf='passphrase') + i.fas.fa-check diff --git a/tabby-core/src/theme.paper.scss b/tabby-core/src/theme.paper.scss index 0b088922..12380266 100644 --- a/tabby-core/src/theme.paper.scss +++ b/tabby-core/src/theme.paper.scss @@ -19,10 +19,9 @@ $tab-border-radius: 5px; $button-hover-bg: rgba(0, 0, 0, .125); $button-active-bg: rgba(0, 0, 0, .25); -$theme-colors: ( - "primary": $orange, - "secondary": $base0 -); + +$primary: #fd7e14; +$secondary: #495057; $content-bg: rgba($white, 0.65); $content-bg-solid: $white; @@ -257,8 +256,8 @@ multi-hotkey-input { } .item:has(.duplicate) { - background-color: theme-color('danger'); - border: 1px solid theme-color('danger'); + background-color: map-get($theme-colors, 'danger'); + border: 1px solid map-get($theme-colors, 'danger'); } .add { @@ -272,8 +271,8 @@ multi-hotkey-input { } .add:has(.duplicate), .item:has(.duplicate) .body, .item:has(.duplicate) .remove { - &:hover { background: darken(theme-color('danger'), 5%); } - &:active { background: darken(theme-color('danger'), 15%); } + &:hover { background: darken(map-get($theme-colors, 'danger'), 5%); } + &:active { background: darken(map-get($theme-colors, 'danger'), 15%); } } } @@ -303,7 +302,7 @@ hotkey-input-modal { } } -.form-group label { +.mb-3 label { margin-bottom: 2px; } @@ -370,7 +369,7 @@ toggle { } &.active .body .toggle { - background: theme-colors(primary) !important; + background: map-get($theme-colors, primary) !important; } } diff --git a/tabby-core/src/theme.scss b/tabby-core/src/theme.scss index 320eb3bc..a18e2afc 100644 --- a/tabby-core/src/theme.scss +++ b/tabby-core/src/theme.scss @@ -163,8 +163,8 @@ multi-hotkey-input { } .item:has(.duplicate) { - background-color: theme-color('danger'); - border: 1px solid theme-color('danger'); + background-color: map-get($theme-colors, 'danger'); + border: 1px solid map-get($theme-colors, 'danger'); } .add { @@ -178,8 +178,8 @@ multi-hotkey-input { } .add:has(.duplicate), .item:has(.duplicate) .body, .item:has(.duplicate) .remove { - &:hover { background: darken(theme-color('danger'), 5%); } - &:active { background: darken(theme-color('danger'), 15%); } + &:hover { background: darken(map-get($theme-colors, 'danger'), 5%); } + &:active { background: darken(map-get($theme-colors, 'danger'), 15%); } } } @@ -209,7 +209,7 @@ hotkey-input-modal { } } -.form-group label { +.mb-3 label { margin-bottom: 2px; } @@ -375,9 +375,9 @@ search-panel { font-size: 18px; } - @include hover-focus { - color: $nav-tabs-link-active-color; - } + // @include hover-focus { + // color: $nav-tabs-link-active-color; + // } &.disabled { color: $nav-link-disabled-color; diff --git a/tabby-core/src/theme.vars.scss b/tabby-core/src/theme.vars.scss index 320b533f..65c7fb3b 100644 --- a/tabby-core/src/theme.vars.scss +++ b/tabby-core/src/theme.vars.scss @@ -175,13 +175,12 @@ $badge-padding-y: 4px; $badge-padding-x: 6px; -$custom-control-indicator-size: 1.2rem; -$custom-control-indicator-bg: $body-bg; -$custom-control-indicator-border-color: lighten($body-bg, 25%); -$custom-control-indicator-checked-bg: theme-color("primary"); -$custom-control-indicator-checked-color: $body-bg; -$custom-control-indicator-checked-border-color: transparent; -$custom-control-indicator-active-bg: rgba(255, 255, 0, 0.5); +$form-check-input-border: lighten($body-bg, 25%); +$form-check-input-width: 1.4em; +$form-switch-width: 2.5em; +$form-switch-color: lighten($body-bg, 25%); +$form-switch-focus-color: lighten($body-bg, 40%); +$form-switch-checked-color: map-get($theme-colors, "primary"); $modal-content-bg: $content-bg-solid; diff --git a/tabby-core/yarn.lock b/tabby-core/yarn.lock index c90a5840..91568ad9 100644 --- a/tabby-core/yarn.lock +++ b/tabby-core/yarn.lock @@ -33,10 +33,10 @@ base64-js@^1.3.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -bootstrap@^4.1.3: - version "4.5.3" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.3.tgz#c6a72b355aaf323920be800246a6e4ef30997fe6" - integrity sha512-o9ppKQioXGqhw8Z7mah6KdTYpNQY//tipnkxppWhPbiSWdD+1raYsnhwEZjkTHYbGee4cVQ0Rx65EhOY/HNLcQ== +bootstrap@^5.3.0-alpha.1: + version "5.3.0-alpha1" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.0-alpha1.tgz#380629c4367893f02f7879a01ea3ae0f94e2e70e" + integrity sha512-ABZpKK4ObS3kKlIqH+ZVDqoy5t/bhFG0oHTAzByUdon7YIom0lpCeTqRniDzJmbtcWkNe800VVPBiJgxSYTYew== buffer@^6.0.3: version "6.0.3" diff --git a/tabby-local/src/components/commandLineEditor.component.pug b/tabby-local/src/components/commandLineEditor.component.pug index 1a8ef746..96d207be 100644 --- a/tabby-local/src/components/commandLineEditor.component.pug +++ b/tabby-local/src/components/commandLineEditor.component.pug @@ -1,5 +1,5 @@ ng-container(*ngIf='!argvMode') - .form-group + .mb-3 label(translate) Command line .input-group .input-group-prepend @@ -15,7 +15,7 @@ ng-container(*ngIf='!argvMode') ) ng-container(*ngIf='argvMode') - .form-group + .mb-3 label(translate) Program .input-group .input-group-prepend @@ -30,7 +30,7 @@ ng-container(*ngIf='argvMode') [(ngModel)]='_model.command', ) - .form-group + .mb-3 label(translate) Arguments .input-group( *ngFor='let arg of _model.args; index as i; trackBy: trackByIndex', @@ -45,5 +45,5 @@ ng-container(*ngIf='argvMode') .mt-2 button.btn.btn-secondary((click)='_model.args.push("")') - i.fas.fa-plus.mr-2 + i.fas.fa-plus.me-2 span(translate) Add diff --git a/tabby-local/src/components/environmentEditor.component.pug b/tabby-local/src/components/environmentEditor.component.pug index ac247150..2a6e8318 100644 --- a/tabby-local/src/components/environmentEditor.component.pug +++ b/tabby-local/src/components/environmentEditor.component.pug @@ -10,11 +10,11 @@ .d-flex button.btn.btn-secondary((click)='addEnvironmentVar()') - i.fas.fa-plus.mr-2 + i.fas.fa-plus.me-2 span(translate) Add - .ml-auto + .ms-auto .text-muted(translate) Substitutions allowed. - .d-flex.ml-1(*ngIf='shouldShowExample()') + .d-flex.ms-1(*ngIf='shouldShowExample()') .text-muted(translate) Example: - a.ml-1((click)='addExample()', href='#') extend PATH + a.ms-1((click)='addExample()', href='#') extend PATH diff --git a/tabby-local/src/components/localProfileSettings.component.pug b/tabby-local/src/components/localProfileSettings.component.pug index 00d5b23c..f66bfcb9 100644 --- a/tabby-local/src/components/localProfileSettings.component.pug +++ b/tabby-local/src/components/localProfileSettings.component.pug @@ -7,7 +7,7 @@ command-line-editor([model]='profile.options') [(ngModel)]='profile.options.runAsAdministrator', ) -.form-group +.mb-3 label(translate) Working directory .input-group @@ -20,7 +20,7 @@ command-line-editor([model]='profile.options') button.btn.btn-secondary((click)='pickWorkingDirectory()') i.fas.fa-folder-open -.form-group +.mb-3 label(translate) Environment environment-editor( type='text', diff --git a/tabby-local/src/components/shellSettingsTab.component.pug b/tabby-local/src/components/shellSettingsTab.component.pug index fd2da423..1b40149c 100644 --- a/tabby-local/src/components/shellSettingsTab.component.pug +++ b/tabby-local/src/components/shellSettingsTab.component.pug @@ -11,7 +11,7 @@ h3.mb-3(translate) Shell ) .alert.alert-info.d-flex.align-items-center(*ngIf='config.store.terminal.useConPTY && isConPTYAvailable && !isConPTYStable') - .mr-auto(translate) Windows 10 build 18309 or above is recommended for ConPTY + .me-auto(translate) Windows 10 build 18309 or above is recommended for ConPTY .alert.alert-info.d-flex.align-items-center(*ngIf='config.store.terminal.profile.startsWith("WSL") && (!config.store.terminal.useConPTY)') - .mr-auto(translate) WSL terminal only supports TrueColor with ConPTY + .me-auto(translate) WSL terminal only supports TrueColor with ConPTY diff --git a/tabby-plugin-manager/src/components/pluginsSettingsTab.component.pug b/tabby-plugin-manager/src/components/pluginsSettingsTab.component.pug index 4759a896..6b3cc292 100644 --- a/tabby-plugin-manager/src/components/pluginsSettingsTab.component.pug +++ b/tabby-plugin-manager/src/components/pluginsSettingsTab.component.pug @@ -1,6 +1,6 @@ .d-flex.mb-3 h3(translate) Plugins - button.btn.btn-secondary.btn-sm.ml-auto((click)='openPluginsFolder()') + button.btn.btn-secondary.btn-sm.ms-auto((click)='openPluginsFolder()') i.fas.fa-folder span(translate) Plugins folder @@ -43,14 +43,14 @@ ul.nav-tabs.mb-2(ngbNav, #nav='ngbNav') ) i.fas.fa-fw.fa-cloud-download(*ngIf='busy.get(plugin.name) != BusyState.Installing') i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='busy.get(plugin.name) == BusyState.Installing') - span.ml-2(translate) Get + span.ms-2(translate) Get button.btn.btn-secondary.btn-block.justify-content-center( *ngIf='plugin.homepage', (click)='showPluginHomepage(plugin)' ) i.fas.fa-fw.fa-external-link-alt - span.ml-2(translate) Homepage + span.ms-2(translate) Homepage .col-8 ng-container(*ngTemplateOutlet='pluginInfo; context: { plugin }') @@ -75,14 +75,14 @@ ul.nav-tabs.mb-2(ngbNav, #nav='ngbNav') ng-container(*ngFor='let plugin of installedPlugins$') ngb-panel ng-template(ngbPanelTitle) - .text-left.mr-auto + .text-left.me-auto div strong {{plugin.name}} - small.text-muted.ml-2(*ngIf='plugin.isBuiltin', translate) Built-in - small.text-warning.ml-2(*ngIf='!isPluginEnabled(plugin)', translate) Disabled + small.text-muted.ms-2(*ngIf='plugin.isBuiltin', translate) Built-in + small.text-warning.ms-2(*ngIf='!isPluginEnabled(plugin)', translate) Disabled small.d-block.text-muted {{plugin.description}} - button.btn.btn-primary.ml-2( + button.btn.btn-primary.ms-2( *ngIf='knownUpgrades[plugin.name]', (click)='upgradePlugin(plugin)', [disabled]='busy.has(plugin.name)' @@ -133,11 +133,11 @@ ng-template(#pluginInfo, let-plugin='plugin') .col-4 strong(translate) Author .col-8 - .badge.badge-success(*ngIf='plugin.isOfficial') + .badge.text-bg-success(*ngIf='plugin.isOfficial') i.fas.fa-check - span.ml-1(translate) Official + span.ms-1(translate) Official a.btn.btn-link.px-0.w-auto((click)='showPluginInfo(plugin)', *ngIf='!plugin.isOfficial') span {{plugin.author}} - i.fas.fa-fw.fa-external-link-alt.ml-2 + i.fas.fa-fw.fa-external-link-alt.ms-2 .mb-4([ngbNavOutlet]='nav') diff --git a/tabby-serial/src/components/serialProfileSettings.component.pug b/tabby-serial/src/components/serialProfileSettings.component.pug index 11e351bf..6e44ff12 100644 --- a/tabby-serial/src/components/serialProfileSettings.component.pug +++ b/tabby-serial/src/components/serialProfileSettings.component.pug @@ -4,7 +4,7 @@ ul.nav-tabs(ngbNav, #nav='ngbNav') ng-template(ngbNavContent) .row .col-6(ng:if='hostApp.platform !== Platform.Web') - .form-group + .mb-3 label(translate) Device input.form-control( type='text', @@ -15,7 +15,7 @@ ul.nav-tabs(ngbNav, #nav='ngbNav') ) .col-6 - .form-group + .mb-3 label(translate) Baud rate input.form-control( type='number', diff --git a/tabby-serial/src/components/serialTab.component.pug b/tabby-serial/src/components/serialTab.component.pug index f058409b..269f0e3f 100644 --- a/tabby-serial/src/components/serialTab.component.pug +++ b/tabby-serial/src/components/serialTab.component.pug @@ -1,11 +1,11 @@ terminal-toolbar([tab]='this') - i.fas.fa-xs.fa-circle.text-success.mr-2(*ngIf='session && session.open') - i.fas.fa-xs.fa-circle.text-danger.mr-2(*ngIf='!session || !session.open') + i.fas.fa-xs.fa-circle.text-success.me-2(*ngIf='session && session.open') + i.fas.fa-xs.fa-circle.text-danger.me-2(*ngIf='!session || !session.open') strong {{profile.options.port}} ({{profile.options.baudrate}}) - .mr-auto + .me-auto - button.btn.btn-sm.btn-link.mr-3((click)='changeBaudRate()', *ngIf='session && session.open && hostApp.platform !== Platform.Web') + button.btn.btn-sm.btn-link.me-3((click)='changeBaudRate()', *ngIf='session && session.open && hostApp.platform !== Platform.Web') span(translate) Change baud rate button.btn.btn-sm.btn-link((click)='reconnect()', *ngIf='!session || !session.open') diff --git a/tabby-settings/src/components/configSyncSettingsTab.component.pug b/tabby-settings/src/components/configSyncSettingsTab.component.pug index dfe5930c..016f94a4 100644 --- a/tabby-settings/src/components/configSyncSettingsTab.component.pug +++ b/tabby-settings/src/components/configSyncSettingsTab.component.pug @@ -38,7 +38,7 @@ ul.nav-tabs(ngbNav, #nav='ngbNav') ng-container(*ngIf='config.store.configSync.token') .alert.alert-danger(*ngIf='connectionSuccessful === false') i.fas.fa-exclamation-triangle - span.ml-2(translate='Connection failed: {error}', [translateParams]='{error: connectionError}') + span.ms-2(translate='Connection failed: {error}', [translateParams]='{error: connectionError}') ng-container(*ngIf='connectionSuccessful') .form-line @@ -47,7 +47,7 @@ ul.nav-tabs(ngbNav, #nav='ngbNav') div(*ngIf='configs === null') i.fas.fa-fw.fa-circle-notch.fa-spin - span.ml-2(translate) Loading configs... + span.ms-2(translate) Loading configs... ng-container(*ngIf='configs !== null') .list-group-light @@ -57,39 +57,39 @@ ul.nav-tabs(ngbNav, #nav='ngbNav') ) i.fas.fa-fw.text-success([class.fa-check]='isActiveConfig(cfg)') i.fas.fa-fw.fa-file - .ml-2.d-flex.flex-column.align-items-start + .ms-2.d-flex.flex-column.align-items-start div {{cfg.name}} small.text-muted( translate='Modified on {date}', [translateParams]='{date: cfg.modified_at|date:"medium"}' ) - .mr-auto - button.btn.btn-link.ml-1( + .me-auto + button.btn.btn-link.ms-1( (click)='uploadAndSync(cfg)', [class.hover-reveal]='!isActiveConfig(cfg)' ) i.fas.fa-arrow-up - span.ml-2(*ngIf='isActiveConfig(cfg)', translate) Upload - span.ml-2(*ngIf='!isActiveConfig(cfg)', translate) Replace - button.btn.btn-link.ml-1( + span.ms-2(*ngIf='isActiveConfig(cfg)', translate) Upload + span.ms-2(*ngIf='!isActiveConfig(cfg)', translate) Replace + button.btn.btn-link.ms-1( (click)='downloadAndSync(cfg)', [class.hover-reveal]='!isActiveConfig(cfg)' ) i.fas.fa-arrow-down - span.ml-2(translate) Download - button.btn.btn-link.ml-1( + span.ms-2(translate) Download + button.btn.btn-link.ms-1( (click)='delete(cfg)', [class.hover-reveal]='!isActiveConfig(cfg)' ) i.fas.fa-trash - span.ml-2(translate) Delete + span.ms-2(translate) Delete a.list-group-item.list-group-item-action.d-flex.align-items-center( href='#', (click)='uploadAsNew()' ) i.fas.fa-fw i.fas.fa-fw.fa-cloud-upload-alt - .ml-2(translate) Upload as a new config + .ms-2(translate) Upload as a new config ng-container(*ngIf='hasMatchingRemoteConfig()') .form-line diff --git a/tabby-settings/src/components/editProfileModal.component.pug b/tabby-settings/src/components/editProfileModal.component.pug index a81a5d28..fc736759 100644 --- a/tabby-settings/src/components/editProfileModal.component.pug +++ b/tabby-settings/src/components/editProfileModal.component.pug @@ -10,7 +10,7 @@ .modal-body .row .col-12.col-lg-4 - .form-group(*ngIf='!defaultsMode') + .mb-3(*ngIf='!defaultsMode') label(translate) Name input.form-control( type='text', @@ -18,7 +18,7 @@ [(ngModel)]='profile.name', ) - .form-group(*ngIf='!defaultsMode') + .mb-3(*ngIf='!defaultsMode') label(translate) Group input.form-control( type='text', @@ -28,7 +28,7 @@ [ngbTypeahead]='groupTypeahead', ) - .form-group(*ngIf='!defaultsMode') + .mb-3(*ngIf='!defaultsMode') label(translate) Icon .input-group input.form-control( @@ -47,7 +47,7 @@ ng-template(#rt,let-r='result',let-t='term') i([class]='"fa-fw " + r') - ngb-highlight.ml-2([result]='r', [term]='t') + ngb-highlight.ms-2([result]='r', [term]='t') .form-line .header diff --git a/tabby-settings/src/components/hotkeySettingsTab.component.pug b/tabby-settings/src/components/hotkeySettingsTab.component.pug index 20826acc..c0be7991 100644 --- a/tabby-settings/src/components/hotkeySettingsTab.component.pug +++ b/tabby-settings/src/components/hotkeySettingsTab.component.pug @@ -6,13 +6,13 @@ h3.mb-3(translate) Hotkeys i.fas.fa-fw.fa-search input.form-control(type='search', [placeholder]='"Search hotkeys"|translate', [(ngModel)]='hotkeyFilter') -.form-group.hotkeys-table +.mb-3.hotkeys-table ng-container(*ngFor='let hotkey of hotkeyDescriptions') .row.align-items-center(*ngIf='!hotkeyFilter || hotkeyFilterFn(hotkey, hotkeyFilter)') .col-8.py-2 span {{hotkey.name|translate}} - span.ml-2.text-muted ({{hotkey.id}}) - .col-4.pr-5 + span.ms-2.text-muted ({{hotkey.id}}) + .col-4.pe-5 multi-hotkey-input( [hotkeys]='getHotkeys(hotkey.id) || []', (hotkeysChange)='setHotkeys(hotkey.id, $event)' diff --git a/tabby-settings/src/components/profilesSettingsTab.component.pug b/tabby-settings/src/components/profilesSettingsTab.component.pug index 4c84ba90..b2b11455 100644 --- a/tabby-settings/src/components/profilesSettingsTab.component.pug +++ b/tabby-settings/src/components/profilesSettingsTab.component.pug @@ -23,12 +23,11 @@ ul.nav-tabs(ngbNav, #nav='ngbNav') .d-flex.mb-3 .input-group - .input-group-prepend - .input-group-text - i.fas.fa-fw.fa-search + .input-group-text + i.fas.fa-fw.fa-search input.form-control(type='search', [placeholder]='"Filter"|translate', [(ngModel)]='filter') - button.btn.btn-primary.flex-shrink-0.ml-3((click)='newProfile()') + button.btn.btn-primary.flex-shrink-0.ms-3((click)='newProfile()') i.fas.fa-fw.fa-plus span(translate) New profile @@ -40,20 +39,20 @@ ul.nav-tabs(ngbNav, #nav='ngbNav') ) .fa.fa-fw.fa-chevron-right(*ngIf='group.collapsed') .fa.fa-fw.fa-chevron-down(*ngIf='!group.collapsed') - span.ml-3.mr-auto {{group.name || ("Ungrouped"|translate)}} - button.btn.btn-sm.btn-link.hover-reveal.ml-2( + span.ms-3.me-auto {{group.name || ("Ungrouped"|translate)}} + button.btn.btn-sm.btn-link.hover-reveal.ms-2( *ngIf='group.editable && group.name', (click)='$event.stopPropagation(); editGroup(group)' ) i.fas.fa-pencil-alt - button.btn.btn-sm.btn-link.hover-reveal.ml-2( + button.btn.btn-sm.btn-link.hover-reveal.ms-2( *ngIf='group.editable && group.name', (click)='$event.stopPropagation(); deleteGroup(group)' ) i.fas.fa-trash-alt ng-container(*ngIf='!group.collapsed') ng-container(*ngFor='let profile of group.profiles') - .list-group-item.pl-5.d-flex.align-items-center( + .list-group-item.ps-5.d-flex.align-items-center( *ngIf='isProfileVisible(profile)', [class.list-group-item-action]='!profile.isBuiltin', (click)='profile.isBuiltin ? null : editProfile(profile)' @@ -64,23 +63,23 @@ ul.nav-tabs(ngbNav, #nav='ngbNav') ) .no-wrap {{profile.name}} - .text-muted.no-wrap.ml-2 {{getDescription(profile)}} + .text-muted.no-wrap.ms-2 {{getDescription(profile)}} - .mr-auto + .me-auto - button.btn.btn-link.hover-reveal.ml-1((click)='$event.stopPropagation(); launchProfile(profile)') + button.btn.btn-link.hover-reveal.ms-1((click)='$event.stopPropagation(); launchProfile(profile)') i.fas.fa-play - button.btn.btn-link.hover-reveal.ml-1((click)='$event.stopPropagation(); newProfile(profile)') + button.btn.btn-link.hover-reveal.ms-1((click)='$event.stopPropagation(); newProfile(profile)') i.fas.fa-copy - button.btn.btn-link.hover-reveal.ml-1( + button.btn.btn-link.hover-reveal.ms-1( *ngIf='!profile.isBuiltin', (click)='$event.stopPropagation(); deleteProfile(profile)' ) i.fas.fa-trash-alt - .ml-1(class='badge badge-{{getTypeColorClass(profile)}}') {{getTypeLabel(profile)}} + .ms-1(class='badge text-bg-{{getTypeColorClass(profile)}}') {{getTypeLabel(profile)}} li(ngbNavItem) a(ngbNavLink, translate) Advanced diff --git a/tabby-settings/src/components/settingsTab.component.pug b/tabby-settings/src/components/settingsTab.component.pug index eb05edbf..50cf2b4f 100644 --- a/tabby-settings/src/components/settingsTab.component.pug +++ b/tabby-settings/src/components/settingsTab.component.pug @@ -2,7 +2,7 @@ ul.nav-pills(ngbNav, #nav='ngbNav', [activeId]='activeTab', orientation='vertical') li(ngbNavItem='application') a(ngbNavLink) - i.fas.fa-fw.fa-window-maximize.mr-2 + i.fas.fa-fw.fa-window-maximize.me-2 span(translate) Application ng-template(ngbNavContent) .content-box @@ -71,7 +71,7 @@ .title(translate) Language a.description((click)='homeBase.openTranslations()') span(translate) Help translate Tabby - i.fas.fa-external-link-square-alt.ml-1 + i.fas.fa-external-link-square-alt.ms-1 select.form-control([(ngModel)]='config.store.language', (ngModelChange)='saveConfiguration(true)') option([ngValue]='null', translate) Automatic option( @@ -117,7 +117,7 @@ ng-container(*ngFor='let provider of settingsProviders') li(*ngIf='provider.prioritized', [ngbNavItem]='provider.id') a.d-flex.align-items-center(ngbNavLink) - i(class='fas fa-fw mr-2 fa-{{provider.icon}}') + i(class='fas fa-fw me-2 fa-{{provider.icon}}') span {{provider.title|translate}} ng-template(ngbNavContent) settings-tab-body([provider]='provider') @@ -127,14 +127,14 @@ ng-container(*ngFor='let provider of settingsProviders') li(*ngIf='!provider.prioritized', [ngbNavItem]='provider.id') a.d-flex.align-items-center(ngbNavLink) - i(class='fas fa-fw mr-2 fa-{{provider.icon || "puzzle-piece"}}') + i(class='fas fa-fw me-2 fa-{{provider.icon || "puzzle-piece"}}') span {{provider.title|translate}} ng-template(ngbNavContent) settings-tab-body([provider]='provider') li(ngbNavItem='config-file') a.d-flex.align-items-center(ngbNavLink) - i.fas.fa-fw.fa-code.mr-2 + i.fas.fa-fw.fa-code.me-2 span(translate) Config file ng-template.test(ngbNavContent) .d-flex.flex-column.w-100.h-100 @@ -152,20 +152,20 @@ ) .mt-3.d-flex button.btn.btn-primary((click)='saveConfigFile()', *ngIf='isConfigFileValid()') - i.fas.fa-check.mr-2 + i.fas.fa-check.me-2 span(translate) Save and apply button.btn.btn-primary(disabled, *ngIf='!isConfigFileValid()') - i.fas.fa-exclamation-triangle.mr-2 + i.fas.fa-exclamation-triangle.me-2 span(translate) Invalid syntax - button.btn.btn-secondary.ml-auto( + button.btn.btn-secondary.ms-auto( (click)='showConfigDefaults = !showConfigDefaults', translate ) Show defaults - button.btn.btn-secondary.ml-3( + button.btn.btn-secondary.ms-3( *ngIf='platform.getConfigPath()', (click)='showConfigFile()' ) - i.fas.fa-external-link-square-alt.mr-2 + i.fas.fa-external-link-square-alt.me-2 span(translate) Show config file div([ngbNavOutlet]='nav') diff --git a/tabby-settings/src/components/vaultSettingsTab.component.pug b/tabby-settings/src/components/vaultSettingsTab.component.pug index 945fd1d0..a2605c90 100644 --- a/tabby-settings/src/components/vaultSettingsTab.component.pug +++ b/tabby-settings/src/components/vaultSettingsTab.component.pug @@ -8,7 +8,7 @@ div(*ngIf='vault.isEnabled()') .d-flex.align-items-center.mb-3 h3.m-0(translate) Vault - .d-flex.ml-auto(ngbDropdown, *ngIf='vault.isEnabled()') + .d-flex.ms-auto(ngbDropdown, *ngIf='vault.isEnabled()') button.btn.btn-secondary(ngbDropdownToggle, translate) Options div(ngbDropdownMenu) a(ngbDropdownItem, (click)='changePassphrase()') @@ -24,9 +24,9 @@ div(*ngIf='vault.isEnabled()') h3.m-3(translate) Vault is empty .list-group - .list-group-item.d-flex.align-items-center.p-1.pl-3(*ngFor='let secret of vaultContents.secrets') + .list-group-item.d-flex.align-items-center.p-1.ps-3(*ngFor='let secret of vaultContents.secrets') i.fas.fa-key - .mr-auto {{getSecretLabel(secret)}} + .me-auto {{getSecretLabel(secret)}} .hover-reveal(ngbDropdown) button.btn.btn-link(ngbDropdownToggle) diff --git a/tabby-settings/src/components/windowSettingsTab.component.pug b/tabby-settings/src/components/windowSettingsTab.component.pug index 3d4ce111..81c391bc 100644 --- a/tabby-settings/src/components/windowSettingsTab.component.pug +++ b/tabby-settings/src/components/windowSettingsTab.component.pug @@ -146,7 +146,7 @@ h3.mt-4(translate) Docking ) span(translate) Bottom -.ml-5.form-line(*ngIf='docking && config.store.appearance.dock != "off"') +.ms-5.form-line(*ngIf='docking && config.store.appearance.dock != "off"') .header .title(translate) Display on .description(translate) Snaps the window to a side of the screen @@ -171,7 +171,7 @@ h3.mt-4(translate) Docking ) | {{screen.name}} -.ml-5.form-line(*ngIf='docking && config.store.appearance.dock != "off"') +.ms-5.form-line(*ngIf='docking && config.store.appearance.dock != "off"') .header .title(translate) Dock always on top .description(translate) Keep docked terminal always on top @@ -180,7 +180,7 @@ h3.mt-4(translate) Docking (ngModelChange)='saveConfiguration(); docking.dock()', ) -.ml-5.form-line(*ngIf='docking && config.store.appearance.dock != "off"') +.ms-5.form-line(*ngIf='docking && config.store.appearance.dock != "off"') .header .title(translate) Docked terminal size .description(translate) Window dimension away from the edge @@ -193,7 +193,7 @@ h3.mt-4(translate) Docking step='0.01' ) -.ml-5.form-line(*ngIf='docking && config.store.appearance.dock != "off"') +.ms-5.form-line(*ngIf='docking && config.store.appearance.dock != "off"') .header .title(translate) Docked terminal space .description(translate) Window dimension along the edge @@ -206,7 +206,7 @@ h3.mt-4(translate) Docking step='0.01' ) -.ml-5.form-line(*ngIf='docking && config.store.appearance.dock != "off"') +.ms-5.form-line(*ngIf='docking && config.store.appearance.dock != "off"') .header .title(translate) Hide window on focus loss .description(translate) Hides the docked terminal when you click away. diff --git a/tabby-ssh/src/components/hostKeyPromptModal.component.pug b/tabby-ssh/src/components/hostKeyPromptModal.component.pug index b71bb1fd..c471e747 100644 --- a/tabby-ssh/src/components/hostKeyPromptModal.component.pug +++ b/tabby-ssh/src/components/hostKeyPromptModal.component.pug @@ -6,16 +6,16 @@ strong(translate) Warning: remote host's key has suddenly changed! div(translate) You could be under a man-in-the-middle attack right now, or the host key could have just been changed. - .form-group(*ngIf='isMismatched') + .mb-3(*ngIf='isMismatched') .d-flex.align-items-center label(translate) Last known host key fingerprint - .badge.badge-danger.ml-auto {{ selector.type }} + .badge.text-bg-danger.ms-auto {{ selector.type }} code {{knownHost.digest}} - .form-group + .mb-3 .d-flex.align-items-center label(translate) Current host key fingerprint - .badge.badge-success.ml-auto {{ selector.type }} + .badge.text-bg-success.ms-auto {{ selector.type }} code {{digest}} .modal-footer diff --git a/tabby-ssh/src/components/keyboardInteractiveAuthPanel.component.pug b/tabby-ssh/src/components/keyboardInteractiveAuthPanel.component.pug index 4de32bc7..e203b26b 100644 --- a/tabby-ssh/src/components/keyboardInteractiveAuthPanel.component.pug +++ b/tabby-ssh/src/components/keyboardInteractiveAuthPanel.component.pug @@ -1,6 +1,6 @@ .d-flex strong(translate) Keyboard-interactive auth - .ml-2 {{prompt.name}} + .ms-2 {{prompt.name}} .prompt-text {{prompt.prompts[step].prompt}} @@ -18,7 +18,7 @@ input.form-control.mt-2( *ngIf='step > 0', (click)='previous()' ) - .ml-auto + .ms-auto button.btn.btn-primary( (click)='next()' ) diff --git a/tabby-ssh/src/components/sftpCreateDirectoryModal.component.pug b/tabby-ssh/src/components/sftpCreateDirectoryModal.component.pug index a559641c..a839af6b 100644 --- a/tabby-ssh/src/components/sftpCreateDirectoryModal.component.pug +++ b/tabby-ssh/src/components/sftpCreateDirectoryModal.component.pug @@ -1,6 +1,6 @@ .modal-body label(translate) Name for the new directory - .form-group.w-100.mr-2 + .mb-3.w-100.me-2 input.form-control( type='text', [(ngModel)]='directoryName', diff --git a/tabby-ssh/src/components/sftpPanel.component.pug b/tabby-ssh/src/components/sftpPanel.component.pug index c2f74171..387f7044 100644 --- a/tabby-ssh/src/components/sftpPanel.component.pug +++ b/tabby-ssh/src/components/sftpPanel.component.pug @@ -18,11 +18,11 @@ .breadcrumb-spacer.flex-grow-1.h-100((dblclick)='editPath()') button.btn.btn-link.btn-sm.d-flex((click)='openCreateDirectoryModal()') - i.fas.fa-plus.mr-1 + i.fas.fa-plus.me-1 div(translate) Create directory button.btn.btn-link.btn-sm.d-flex((click)='upload()') - i.fas.fa-upload.mr-1 + i.fas.fa-upload.me-1 div(translate) Upload button.btn.btn-link.btn-close((click)='close()') !{require('../../../tabby-core/src/icons/times.svg')} @@ -32,7 +32,7 @@ *ngIf='shouldShowCWDTip && !cwdDetectionAvailable', (click)='platform.openExternal("https://tabby.sh/go/cwd-detection")' ) - .mr-auto + .me-auto strong(translate) Working directory detection div(translate) Learn how to allow Tabby to detect remote shell's working directory. button.close((click)='dismissCWDTip()') @@ -55,7 +55,7 @@ ) i.fa-fw([class]='getIcon(item)') div {{item.name}} - .mr-auto + .me-auto .size(*ngIf='!item.isDirectory') {{item.size|filesize}} .date {{item.modified|date:'medium'}} .mode {{getModeString(item)}} diff --git a/tabby-ssh/src/components/sshPortForwardingConfig.component.pug b/tabby-ssh/src/components/sshPortForwardingConfig.component.pug index fbbfaf8e..b859220d 100644 --- a/tabby-ssh/src/components/sshPortForwardingConfig.component.pug +++ b/tabby-ssh/src/components/sshPortForwardingConfig.component.pug @@ -5,12 +5,12 @@ strong(*ngIf='fw.type === PortForwardType.Local', translate) Local strong(*ngIf='fw.type === PortForwardType.Remote', translate) Remote strong(*ngIf='fw.type === PortForwardType.Dynamic', translate, translateContext='[Dynamic] port forwarding') id.port-forwarding.dynamic - .ml-3 {{fw.host}}:{{fw.port}} - .ml-2 → - .ml-2(*ngIf='fw.type !== PortForwardType.Dynamic') {{fw.targetAddress}}:{{fw.targetPort}} - .ml-2(*ngIf='fw.type === PortForwardType.Dynamic', translate) SOCKS proxy + .ms-3 {{fw.host}}:{{fw.port}} + .ms-2 → + .ms-2(*ngIf='fw.type !== PortForwardType.Dynamic') {{fw.targetAddress}}:{{fw.targetPort}} + .ms-2(*ngIf='fw.type === PortForwardType.Dynamic', translate) SOCKS proxy div {{fw.description}} - button.btn.btn-link.hover-reveal.ml-auto((click)='remove(fw)') + button.btn.btn-link.hover-reveal.ms-auto((click)='remove(fw)') i.fas.fa-trash-alt h5(translate) Add a port forward @@ -40,7 +40,7 @@ h5(translate) Add a port forward input.form-control(type='text', placeholder='Description', [(ngModel)]='newForward.description') .d-flex - .btn-group.mr-auto( + .btn-group.me-auto( [(ngModel)]='newForward.type', ngbRadioGroup ) @@ -67,5 +67,5 @@ h5(translate) Add a port forward span(translate, translateContext='[Dynamic] port forwarding') id.port-forwarding.dynamic button.btn.btn-primary((click)='addForward()') - i.fas.fa-check.mr-2 + i.fas.fa-check.me-2 span(translate) Forward port diff --git a/tabby-ssh/src/components/sshProfileSettings.component.pug b/tabby-ssh/src/components/sshProfileSettings.component.pug index f1d7dbf4..b81b5c6e 100644 --- a/tabby-ssh/src/components/sshProfileSettings.component.pug +++ b/tabby-ssh/src/components/sshProfileSettings.component.pug @@ -3,7 +3,7 @@ ul.nav-tabs(ngbNav, #nav='ngbNav') a(ngbNavLink, translate) General ng-template(ngbNavContent) .d-flex.w-100.mt-3 - .form-group.mr-2( + .mb-3.me-2( ngbDropdown ) label(translate) Connection @@ -35,21 +35,21 @@ ul.nav-tabs(ngbNav, #nav='ngbNav') div(translate) HTTP proxy .text-muted(translate) Using CONNECT method - .form-group.w-100(*ngIf='connectionMode === "proxyCommand"') + .mb-3.w-100(*ngIf='connectionMode === "proxyCommand"') label(translate) Proxy command input.form-control( type='text', [(ngModel)]='profile.options.proxyCommand', ) - .form-group.w-100.mr-2(*ngIf='connectionMode !== "proxyCommand"') + .mb-3.w-100.me-2(*ngIf='connectionMode !== "proxyCommand"') label(translate) Host input.form-control( type='text', [(ngModel)]='profile.options.host', ) - .form-group(*ngIf='connectionMode !== "proxyCommand"') + .mb-3(*ngIf='connectionMode !== "proxyCommand"') label(translate) Port input.form-control( type='number', @@ -57,7 +57,7 @@ ul.nav-tabs(ngbNav, #nav='ngbNav') [(ngModel)]='profile.options.port', ) - .form-group(*ngIf='connectionMode === "jumpHost"') + .mb-3(*ngIf='connectionMode === "jumpHost"') label(translate) Jump host select.form-control([(ngModel)]='profile.options.jumpHost') option([ngValue]='null', translate) Select @@ -65,14 +65,14 @@ ul.nav-tabs(ngbNav, #nav='ngbNav') .d-flex.w-100(*ngIf='connectionMode === "socksProxy"') - .form-group.w-100.mr-2 + .mb-3.w-100.me-2 label(translate) SOCKS proxy host input.form-control( type='text', [(ngModel)]='profile.options.socksProxyHost', ) - .form-group + .mb-3 label(translate) SOCKS proxy port input.form-control( type='number', @@ -81,14 +81,14 @@ ul.nav-tabs(ngbNav, #nav='ngbNav') ) .d-flex.w-100(*ngIf='connectionMode === "httpProxy"') - .form-group.w-100.mr-2 + .mb-3.w-100.me-2 label(translate) HTTP proxy host input.form-control( type='text', [(ngModel)]='profile.options.httpProxyHost', ) - .form-group + .mb-3 label(translate) HTTP proxy port input.form-control( type='number', @@ -96,7 +96,7 @@ ul.nav-tabs(ngbNav, #nav='ngbNav') [(ngModel)]='profile.options.httpProxyPort', ) - .form-group + .mb-3 label(translate) Username input.form-control( type='text', @@ -104,7 +104,7 @@ ul.nav-tabs(ngbNav, #nav='ngbNav') [(ngModel)]='profile.options.user', ) - .form-group + .mb-3 label(translate) Authentication method .btn-group.mt-1.w-100( @@ -137,19 +137,19 @@ ul.nav-tabs(ngbNav, #nav='ngbNav') .title(translate) Password .description(*ngIf='!hasSavedPassword', translate) Save a password in the keychain .description(*ngIf='hasSavedPassword', translate) There is a saved password for this connection - button.btn.btn-success.ml-4(*ngIf='!hasSavedPassword', (click)='setPassword()') + button.btn.btn-success.ms-4(*ngIf='!hasSavedPassword', (click)='setPassword()') i.fas.fa-key span(translate) Set password - button.btn.btn-danger.ml-4(*ngIf='hasSavedPassword', (click)='clearSavedPassword()') + button.btn.btn-danger.ms-4(*ngIf='hasSavedPassword', (click)='clearSavedPassword()') i.fas.fa-trash-alt span(translate) Forget - .form-group(*ngIf='!profile.options.auth || profile.options.auth === "publicKey"') + .mb-3(*ngIf='!profile.options.auth || profile.options.auth === "publicKey"') label(translate) Private keys .list-group.mb-2 - .list-group-item.d-flex.align-items-center.p-1.pl-3(*ngFor='let path of profile.options.privateKeys') + .list-group-item.d-flex.align-items-center.p-1.ps-3(*ngFor='let path of profile.options.privateKeys') i.fas.fa-key - .no-wrap.mr-auto {{path}} + .no-wrap.me-auto {{path}} button.btn.btn-link((click)='removePrivateKey(path)') i.fas.fa-trash button.btn.btn-secondary((click)='addPrivateKey()') diff --git a/tabby-ssh/src/components/sshTab.component.pug b/tabby-ssh/src/components/sshTab.component.pug index 6faec0c3..b38ecb2d 100644 --- a/tabby-ssh/src/components/sshTab.component.pug +++ b/tabby-ssh/src/components/sshTab.component.pug @@ -1,9 +1,9 @@ terminal-toolbar([tab]='this') - i.fas.fa-xs.fa-circle.text-success.mr-2(*ngIf='session && session.open') - i.fas.fa-xs.fa-circle.text-danger.mr-2(*ngIf='!session || !session.open') - strong.mr-auto {{profile.options.user}}@{{profile.options.host}}:{{profile.options.port}} + i.fas.fa-xs.fa-circle.text-success.me-2(*ngIf='session && session.open') + i.fas.fa-xs.fa-circle.text-danger.me-2(*ngIf='!session || !session.open') + strong.me-auto {{profile.options.user}}@{{profile.options.host}}:{{profile.options.port}} - .mr-2( + .me-2( ngbDropdown, container='body', *ngIf='session && !session.supportsWorkingDirectory()', @@ -13,16 +13,16 @@ terminal-toolbar([tab]='this') i.far.fa-lightbulb.text-primary .bg-dark(ngbDropdownMenu) a.d-flex.align-items-center(ngbDropdownItem, (click)='platform.openExternal("https://tabby.sh/go/cwd-detection")') - .mr-auto + .me-auto strong(translate) Working directory detection div(translate) Learn how to allow Tabby to detect remote shell's working directory. - i.fas.fa-arrow-right.ml-4 + i.fas.fa-arrow-right.ms-4 - button.btn.btn-sm.btn-link.mr-2((click)='reconnect()') + button.btn.btn-sm.btn-link.me-2((click)='reconnect()') i.fas.fa-redo span(translate) Reconnect - button.btn.btn-sm.btn-link.mr-2((click)='openSFTP()', *ngIf='session && session.open') + button.btn.btn-sm.btn-link.me-2((click)='openSFTP()', *ngIf='session && session.open') i.far.fa-folder-open span SFTP diff --git a/tabby-telnet/src/components/telnetProfileSettings.component.pug b/tabby-telnet/src/components/telnetProfileSettings.component.pug index bbea7deb..ad1ed151 100644 --- a/tabby-telnet/src/components/telnetProfileSettings.component.pug +++ b/tabby-telnet/src/components/telnetProfileSettings.component.pug @@ -2,14 +2,14 @@ ul.nav-tabs(ngbNav, #nav='ngbNav') li(ngbNavItem) a(ngbNavLink, translate) General ng-template(ngbNavContent) - .form-group + .mb-3 label(translate) Host input.form-control( type='text', [(ngModel)]='profile.options.host', ) - .form-group + .mb-3 label(translate) Port input.form-control( type='number', diff --git a/tabby-telnet/src/components/telnetTab.component.pug b/tabby-telnet/src/components/telnetTab.component.pug index 50badf54..d06bb5fc 100644 --- a/tabby-telnet/src/components/telnetTab.component.pug +++ b/tabby-telnet/src/components/telnetTab.component.pug @@ -1,8 +1,8 @@ terminal-toolbar([tab]='this') - i.fas.fa-xs.fa-circle.text-success.mr-2(*ngIf='session && session.open') - i.fas.fa-xs.fa-circle.text-danger.mr-2(*ngIf='!session || !session.open') - strong.mr-auto {{profile.options.host}}:{{profile.options.port}} + i.fas.fa-xs.fa-circle.text-success.me-2(*ngIf='session && session.open') + i.fas.fa-xs.fa-circle.text-danger.me-2(*ngIf='!session || !session.open') + strong.me-auto {{profile.options.host}}:{{profile.options.port}} - button.btn.btn-sm.btn-link.mr-2((click)='reconnect()') + button.btn.btn-sm.btn-link.me-2((click)='reconnect()') i.fas.fa-redo span(translate) Reconnect diff --git a/tabby-terminal/src/components/colorSchemeSelector.component.pug b/tabby-terminal/src/components/colorSchemeSelector.component.pug index 6b634160..157d8cf0 100644 --- a/tabby-terminal/src/components/colorSchemeSelector.component.pug +++ b/tabby-terminal/src/components/colorSchemeSelector.component.pug @@ -2,7 +2,7 @@ .bg-dark.p-3.mb-4(*ngIf='model') .d-flex.align-items-center span {{model.name}} - .mr-auto + .me-auto a.btn-link((click)='selectScheme(null); $event.preventDefault()', href='#', translate) Clear color-scheme-preview([scheme]='model') @@ -24,8 +24,8 @@ .d-flex.w-100.align-items-center i.fas.fa-fw([class.fa-check]='model?.name === scheme.name') - .ml-2 + .ms-2 - .mr-auto {{scheme.name}} + .me-auto {{scheme.name}} color-scheme-preview([scheme]='scheme') diff --git a/tabby-terminal/src/components/colorSchemeSettingsTab.component.pug b/tabby-terminal/src/components/colorSchemeSettingsTab.component.pug index 1ea9abf5..8bddd5f2 100644 --- a/tabby-terminal/src/components/colorSchemeSettingsTab.component.pug +++ b/tabby-terminal/src/components/colorSchemeSettingsTab.component.pug @@ -3,12 +3,12 @@ .d-flex.align-items-center(*ngIf='!editing') span {{getCurrentSchemeName()}} - .mr-auto + .me-auto .btn-toolbar button.btn.btn-secondary((click)='editScheme()') i.fas.fa-pen span(translate) Edit - .mr-1 + .me-1 button.btn.btn-danger( (click)='deleteScheme(config.store.terminal.colorScheme)', *ngIf='currentCustomScheme' @@ -17,11 +17,11 @@ span(translate) Delete div(*ngIf='editing') - .form-group + .mb-3 label(translate) Name input.form-control(type='text', [(ngModel)]='config.store.terminal.colorScheme.name') - .form-group + .mb-3 color-picker( [(model)]='config.store.terminal.colorScheme.foreground', (modelChange)='config.save()', @@ -69,11 +69,11 @@ color-scheme-preview([scheme]='config.store.terminal.colorScheme') .btn-toolbar.d-flex.mt-2(*ngIf='editing') - .mr-auto + .me-auto button.btn.btn-primary((click)='saveScheme()') i.fas.fa-check span(translate) Save - .mr-1 + .me-1 button.btn.btn-secondary((click)='cancelEditing()') i.fas.fa-times span(translate) Cancel @@ -97,11 +97,11 @@ .d-flex.w-100.align-items-center i.fas.fa-fw([class.fa-check]='(currentCustomScheme || currentStockScheme) === scheme') - .ml-2 + .ms-2 - .mr-auto + .me-auto span {{scheme.name}} - .badge.badge-info.ml-2(*ngIf='customColorSchemes.includes(scheme)', translate) Custom + .badge.text-bg-info.ms-2(*ngIf='customColorSchemes.includes(scheme)', translate) Custom div .d-flex diff --git a/tabby-terminal/src/components/searchPanel.component.pug b/tabby-terminal/src/components/searchPanel.component.pug index 29922250..ae79d912 100644 --- a/tabby-terminal/src/components/searchPanel.component.pug +++ b/tabby-terminal/src/components/searchPanel.component.pug @@ -27,7 +27,7 @@ ng-container(*ngIf='state.resultCount > 0') [fastHtmlBind]='icons.arrowDown' ) -.mr-2 +.me-2 button.btn.btn-link( (click)='options.caseSensitive = !options.caseSensitive; saveSearchOptions()', @@ -53,7 +53,7 @@ button.btn.btn-link( [fastHtmlBind]='icons.wholeWord' ) -.mr-2 +.me-2 button.btn.btn-link( (click)='close.emit()', diff --git a/tabby-terminal/src/components/terminalSettingsTab.component.pug b/tabby-terminal/src/components/terminalSettingsTab.component.pug index 8a8d263d..04eb023b 100644 --- a/tabby-terminal/src/components/terminalSettingsTab.component.pug +++ b/tabby-terminal/src/components/terminalSettingsTab.component.pug @@ -196,7 +196,7 @@ div.mt-4 span(translate) Audible .alert.alert-info.d-flex.align-items-center(*ngIf='config.store.terminal.bell != "audible" && (config.store.terminal.profile || "").startsWith("wsl")') - .mr-auto(translate) WSL terminal bell can only be muted via Volume Mixer + .me-auto(translate) WSL terminal bell can only be muted via Volume Mixer button.btn.btn-secondary((click)='openWSLVolumeMixer()', translate) Show Mixer .mt-4 diff --git a/tabby-web/src/components/messageBoxModal.component.pug b/tabby-web/src/components/messageBoxModal.component.pug index 67ec43bd..cb418013 100644 --- a/tabby-web/src/components/messageBoxModal.component.pug +++ b/tabby-web/src/components/messageBoxModal.component.pug @@ -3,7 +3,7 @@ small {{options.detail}} .modal-footer - .ml-auto + .ms-auto button.btn( *ngFor='let button of options.buttons; index as i', [autofocus]='i === options.defaultId', diff --git a/yarn.lock b/yarn.lock index 3fc2d48a..9e40aa59 100644 --- a/yarn.lock +++ b/yarn.lock @@ -93,13 +93,6 @@ dependencies: tslib "^2.2.0" -"@babel/code-frame@^7.0.0": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb" - integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw== - dependencies: - "@babel/highlight" "^7.14.5" - "@babel/code-frame@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" @@ -207,11 +200,6 @@ dependencies: "@babel/types" "^7.16.7" -"@babel/helper-validator-identifier@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz#d0f0e277c512e0c938277faa85a3968c9a44c0e8" - integrity sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg== - "@babel/helper-validator-identifier@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad" @@ -231,15 +219,6 @@ "@babel/traverse" "^7.18.2" "@babel/types" "^7.18.2" -"@babel/highlight@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9" - integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg== - dependencies: - "@babel/helper-validator-identifier" "^7.14.5" - chalk "^2.0.0" - js-tokens "^4.0.0" - "@babel/highlight@^7.16.7": version "7.17.12" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.12.tgz#257de56ee5afbd20451ac0a75686b6b404257351" @@ -369,11 +348,6 @@ resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.0.tgz#ba3510825b332816fe7190f28827f8cb33a298b5" integrity sha512-CNR7qRIfCwWHNN7FnKUniva94edPdyQzil/zCwk3v6k4R6rR2Fr8i4s3PM7n/lyfPA6Zfko9z5WDzFxG9SW1uQ== -"@gar/promisify@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210" - integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw== - "@gar/promisify@^1.1.3": version "1.1.3" resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" @@ -503,14 +477,6 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@npmcli/fs@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.0.0.tgz#589612cfad3a6ea0feafcb901d29c63fd52db09f" - integrity sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ== - dependencies: - "@gar/promisify" "^1.0.1" - semver "^7.3.5" - "@npmcli/fs@^2.1.0": version "2.1.2" resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865" @@ -519,14 +485,6 @@ "@gar/promisify" "^1.1.3" semver "^7.3.5" -"@npmcli/move-file@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674" - integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg== - dependencies: - mkdirp "^1.0.4" - rimraf "^3.0.2" - "@npmcli/move-file@^2.0.0": version "2.0.1" resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4" @@ -687,11 +645,6 @@ dependencies: loader-utils "^1.0.0" -"@tootallnate/once@1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" - integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== - "@tootallnate/once@2": version "2.0.0" resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" @@ -818,11 +771,6 @@ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== -"@types/minimist@^1.2.0": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256" - integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg== - "@types/ms@*": version "0.7.31" resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" @@ -843,11 +791,6 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.26.tgz#63d204d136c9916fb4dcd1b50f9740fe86884e47" integrity sha512-GZ7bu5A6+4DtG7q9GsoHXy3ALcgeIHP4NnL0Vv2wu0uUB/yQex26v0tf6/na1mm0+bS9Uw+0DFex7aaKr2qawQ== -"@types/normalize-package-data@^2.4.0": - version "2.4.0" - resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" - integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== - "@types/parse5@^5": version "5.0.3" resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-5.0.3.tgz#e7b5aebbac150f8b5fdd4a46e7f0bd8e65e19109" @@ -1220,15 +1163,6 @@ agentkeepalive@^3.3.0: dependencies: humanize-ms "^1.2.1" -agentkeepalive@^4.1.3: - version "4.1.4" - resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.1.4.tgz#d928028a4862cb11718e55227872e842a44c945b" - integrity sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ== - dependencies: - debug "^4.1.0" - depd "^1.1.2" - humanize-ms "^1.2.1" - agentkeepalive@^4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717" @@ -1393,14 +1327,6 @@ archy@~1.0.0: resolved "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz" integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA= -are-we-there-yet@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c" - integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw== - dependencies: - delegates "^1.0.0" - readable-stream "^3.6.0" - are-we-there-yet@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz#ba20bd6b553e31d62fc8c31bd23d22b95734390d" @@ -1460,11 +1386,6 @@ array.prototype.flat@^1.2.5: es-abstract "^1.20.4" es-shim-unscopables "^1.0.0" -arrify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" - integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0= - asap@^2.0.0: version "2.0.5" resolved "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz" @@ -1541,11 +1462,6 @@ async-exit-hook@^2.0.1: resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3" integrity sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw== -async-foreach@^0.1.3: - version "0.1.3" - resolved "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz" - integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI= - async@^3.2.3: version "3.2.4" resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" @@ -1910,30 +1826,6 @@ builtins@^1.0.3: resolved "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz" integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og= -cacache@^15.2.0: - version "15.3.0" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb" - integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ== - dependencies: - "@npmcli/fs" "^1.0.0" - "@npmcli/move-file" "^1.0.1" - chownr "^2.0.0" - fs-minipass "^2.0.0" - glob "^7.1.4" - infer-owner "^1.0.4" - lru-cache "^6.0.0" - minipass "^3.1.1" - minipass-collect "^1.0.2" - minipass-flush "^1.0.5" - minipass-pipeline "^1.2.2" - mkdirp "^1.0.3" - p-map "^4.0.0" - promise-inflight "^1.0.1" - rimraf "^3.0.2" - ssri "^8.0.1" - tar "^6.0.2" - unique-filename "^1.1.1" - cacache@^16.1.0: version "16.1.3" resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e" @@ -2042,15 +1934,6 @@ camelcase-keys@^2.0.0: camelcase "^2.0.0" map-obj "^1.0.0" -camelcase-keys@^6.2.2: - version "6.2.2" - resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0" - integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg== - dependencies: - camelcase "^5.3.1" - map-obj "^4.0.0" - quick-lru "^4.0.1" - camelcase@^2.0.0: version "2.1.1" resolved "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz" @@ -2061,7 +1944,7 @@ camelcase@^4.0.0, camelcase@^4.1.0: resolved "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz" integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= -camelcase@^5.0.0, camelcase@^5.3.1: +camelcase@^5.0.0: version "5.3.1" resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== @@ -2111,7 +1994,7 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: +chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -2126,7 +2009,7 @@ character-parser@^2.1.1, character-parser@^2.2.0: dependencies: is-regex "^1.0.3" -chokidar@^3.0.0: +"chokidar@>=3.0.0 <4.0.0", chokidar@^3.0.0: version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -2316,7 +2199,7 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -color-support@^1.1.2, color-support@^1.1.3: +color-support@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== @@ -2693,15 +2576,7 @@ debuglog@^1.0.1: resolved "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz" integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= -decamelize-keys@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9" - integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk= - dependencies: - decamelize "^1.1.0" - map-obj "^1.0.0" - -decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0: +decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= @@ -3178,7 +3053,7 @@ encoding@^0.1.11: dependencies: iconv-lite "~0.4.13" -encoding@^0.1.12, encoding@^0.1.13: +encoding@^0.1.13: version "0.1.13" resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== @@ -3252,7 +3127,7 @@ err-code@^2.0.2: dependencies: prr "~0.0.0" -error-ex@^1.2.0, error-ex@^1.3.1: +error-ex@^1.2.0: version "1.3.2" resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz" integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== @@ -3959,20 +3834,6 @@ functions-have-names@^1.2.2: resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== -gauge@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.0.tgz#2313d52e067a797356c8214907828ff1a097cde4" - integrity sha512-VSxauaaCsLOTerAyzunAYGgK3iaWZvOL1BCvBvf/IhDWrczPAf1tUqn05DOCJOOe4k3vOdX6fHhJIvF2UtCMhw== - dependencies: - aproba "^1.0.3 || ^2.0.0" - color-support "^1.1.2" - console-control-strings "^1.0.0" - has-unicode "^2.0.1" - signal-exit "^3.0.0" - string-width "^1.0.1 || ^2.0.0" - strip-ansi "^3.0.1 || ^4.0.0" - wide-align "^1.1.2" - gauge@^4.0.3: version "4.0.4" resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce" @@ -4001,13 +3862,6 @@ gauge@~2.7.3: strip-ansi "^3.0.1" wide-align "^1.1.0" -gaze@^1.0.0: - version "1.1.3" - resolved "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz" - integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g== - dependencies: - globule "^1.0.0" - genfun@^4.0.1: version "4.0.1" resolved "https://registry.npmjs.org/genfun/-/genfun-4.0.1.tgz" @@ -4155,7 +4009,7 @@ glob@^8.0.1, glob@^8.0.3: minimatch "^5.0.1" once "^1.3.0" -glob@~7.1.1, glob@~7.1.2: +glob@~7.1.2: version "7.1.7" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== @@ -4248,15 +4102,6 @@ globrex@^0.1.2: resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098" integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg== -globule@^1.0.0: - version "1.3.2" - resolved "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz" - integrity sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA== - dependencies: - glob "~7.1.1" - lodash "~4.17.10" - minimatch "~3.0.2" - got@^11.7.0: version "11.8.1" resolved "https://registry.npmjs.org/got/-/got-11.8.1.tgz" @@ -4356,11 +4201,6 @@ har-validator@~5.1.3: ajv "^6.12.3" har-schema "^2.0.0" -hard-rejection@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883" - integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA== - has-ansi@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz" @@ -4490,13 +4330,6 @@ hosted-git-info@^2.7.1: resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz" integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg== -hosted-git-info@^3.0.6: - version "3.0.7" - resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.7.tgz" - integrity sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ== - dependencies: - lru-cache "^6.0.0" - hosted-git-info@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" @@ -4543,15 +4376,6 @@ http-proxy-agent@^2.0.0: agent-base "4" debug "3.1.0" -http-proxy-agent@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" - integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== - dependencies: - "@tootallnate/once" "1" - agent-base "6" - debug "4" - http-proxy-agent@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" @@ -4650,6 +4474,11 @@ ignore@^5.2.0: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.1.tgz#c2b1f76cb999ede1502f3a226a9310fdfe88d46c" integrity sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA== +immutable@^4.0.0: + version "4.2.3" + resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.2.3.tgz#a203cdda37a5a30bc351b982a1794c1930198815" + integrity sha512-IHpmvaOIX4VLJwPOuQr1NpeBr2ZG6vpIj3blsLVxXRWJscLioaJRStqC+NcBsLeCDsnGlPpXd5/WZmnE7MbsKA== + import-fresh@^3.0.0, import-fresh@^3.2.1: version "3.3.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" @@ -4749,7 +4578,7 @@ invert-kv@^2.0.0: resolved "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz" integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA== -ip@^1.1.4, ip@^1.1.5: +ip@^1.1.4: version "1.1.5" resolved "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz" integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= @@ -4989,11 +4818,6 @@ is-path-inside@^3.0.3: resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== -is-plain-obj@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" - integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4= - is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz" @@ -5193,11 +5017,6 @@ joi@^10.6.0: items "2.x.x" topo "2.x.x" -js-base64@^2.4.9: - version "2.6.4" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4" - integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ== - js-sdsl@^4.1.4: version "4.2.0" resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.2.0.tgz#278e98b7bea589b8baaf048c20aeb19eb7ad09d0" @@ -5253,7 +5072,7 @@ json-loader@^0.5.7: resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d" integrity sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w== -json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1: +json-parse-even-better-errors@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== @@ -5389,7 +5208,7 @@ keyv@^4.0.0: dependencies: json-buffer "3.0.1" -kind-of@^6.0.2, kind-of@^6.0.3: +kind-of@^6.0.2: version "6.0.3" resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== @@ -5452,11 +5271,6 @@ libnpx@10.2.2: y18n "^4.0.0" yargs "^11.0.0" -lines-and-columns@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" - integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= - load-json-file@^1.0.0: version "1.1.0" resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz" @@ -5571,7 +5385,7 @@ lodash.without@~4.4.0: resolved "https://registry.npmjs.org/lodash.without/-/lodash.without-4.4.0.tgz" integrity sha1-PNRXSgC2e643OpS3SHcmQFB7eqw= -lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.4, lodash@~4.17.10: +lodash@^4.17.10, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.4: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -5713,28 +5527,6 @@ make-fetch-happen@^2.4.13: socks-proxy-agent "^3.0.0" ssri "^4.1.6" -make-fetch-happen@^9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968" - integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg== - dependencies: - agentkeepalive "^4.1.3" - cacache "^15.2.0" - http-cache-semantics "^4.1.0" - http-proxy-agent "^4.0.1" - https-proxy-agent "^5.0.0" - is-lambda "^1.0.1" - lru-cache "^6.0.0" - minipass "^3.1.3" - minipass-collect "^1.0.2" - minipass-fetch "^1.3.2" - minipass-flush "^1.0.5" - minipass-pipeline "^1.2.4" - negotiator "^0.6.2" - promise-retry "^2.0.1" - socks-proxy-agent "^6.0.0" - ssri "^8.0.0" - map-age-cleaner@^0.1.1: version "0.1.3" resolved "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz" @@ -5747,11 +5539,6 @@ map-obj@^1.0.0, map-obj@^1.0.1: resolved "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz" integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= -map-obj@^4.0.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.2.1.tgz#e4ea399dbc979ae735c83c863dd31bdf364277b7" - integrity sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ== - marked@^4.0.16: version "4.1.1" resolved "https://registry.yarnpkg.com/marked/-/marked-4.1.1.tgz#2f709a4462abf65a283f2453dc1c42ab177d302e" @@ -5798,24 +5585,6 @@ meow@^3.1.0: redent "^1.0.0" trim-newlines "^1.0.0" -meow@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364" - integrity sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ== - dependencies: - "@types/minimist" "^1.2.0" - camelcase-keys "^6.2.2" - decamelize "^1.2.0" - decamelize-keys "^1.1.0" - hard-rejection "^2.1.0" - minimist-options "4.1.0" - normalize-package-data "^3.0.0" - read-pkg-up "^7.0.1" - redent "^3.0.0" - trim-newlines "^3.0.0" - type-fest "^0.18.0" - yargs-parser "^20.2.3" - merge-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" @@ -5878,11 +5647,6 @@ mimic-response@^3.1.0: resolved "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz" integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== -min-indent@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" - integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== - minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" @@ -5893,7 +5657,7 @@ minimalistic-crypto-utils@^1.0.1: resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= -minimatch@3.0.4, minimatch@~3.0.2: +minimatch@3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== @@ -5914,15 +5678,6 @@ minimatch@^5.0.1, minimatch@^5.1.0: dependencies: brace-expansion "^2.0.1" -minimist-options@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" - integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A== - dependencies: - arrify "^1.0.1" - is-plain-obj "^1.1.0" - kind-of "^6.0.3" - minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5: version "1.2.6" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" @@ -5940,17 +5695,6 @@ minipass-collect@^1.0.2: dependencies: minipass "^3.0.0" -minipass-fetch@^1.3.2: - version "1.3.4" - resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.3.4.tgz#63f5af868a38746ca7b33b03393ddf8c291244fe" - integrity sha512-TielGogIzbUEtd1LsjZFs47RWuHHfhl6TiCx1InVxApBAmQ8bL0dL5ilkLGcRvuyW/A9nE+Lvn855Ewz8S0PnQ== - dependencies: - minipass "^3.1.0" - minipass-sized "^1.0.3" - minizlib "^2.0.0" - optionalDependencies: - encoding "^0.1.12" - minipass-fetch@^2.0.3: version "2.1.2" resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add" @@ -5969,7 +5713,7 @@ minipass-flush@^1.0.5: dependencies: minipass "^3.0.0" -minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4: +minipass-pipeline@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== @@ -5990,14 +5734,14 @@ minipass@^3.0.0, minipass@^3.1.6: dependencies: yallist "^4.0.0" -minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3: +minipass@^3.1.1: version "3.1.3" resolved "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz" integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg== dependencies: yallist "^4.0.0" -minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2: +minizlib@^2.1.1, minizlib@^2.1.2: version "2.1.2" resolved "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz" integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== @@ -6075,7 +5819,7 @@ mute-stream@~0.0.4: resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz" integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= -nan@^2.13.2, nan@^2.15.0, nan@^2.16.0: +nan@^2.15.0, nan@^2.16.0: version "2.16.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.16.0.tgz#664f43e45460fb98faf00edca0bb0d7b8dce7916" integrity sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA== @@ -6095,11 +5839,6 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= -negotiator@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" - integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== - negotiator@^0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" @@ -6182,22 +5921,6 @@ node-gyp-build@^4.2.1: resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.2.3.tgz#ce6277f853835f718829efb47db20f3e4d9c4739" integrity sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg== -node-gyp@^8.4.1: - version "8.4.1" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937" - integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w== - dependencies: - env-paths "^2.2.0" - glob "^7.1.4" - graceful-fs "^4.2.6" - make-fetch-happen "^9.1.0" - nopt "^5.0.0" - npmlog "^6.0.0" - rimraf "^3.0.2" - semver "^7.3.5" - tar "^6.1.2" - which "^2.0.2" - node-gyp@^9.0.0: version "9.1.0" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.1.0.tgz#c8d8e590678ea1f7b8097511dedf41fc126648f8" @@ -6243,27 +5966,6 @@ node-releases@^2.0.6: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503" integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg== -node-sass@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-7.0.3.tgz#7620bcd5559c2bf125c4fbb9087ba75cd2df2ab2" - integrity sha512-8MIlsY/4dXUkJDYht9pIWBhMil3uHmE8b/AdJPjmFn1nBx9X9BASzfzmsCy0uCCb8eqI3SYYzVPDswWqSx7gjw== - dependencies: - async-foreach "^0.1.3" - chalk "^4.1.2" - cross-spawn "^7.0.3" - gaze "^1.0.0" - get-stdin "^4.0.1" - glob "^7.0.3" - lodash "^4.17.15" - meow "^9.0.0" - nan "^2.13.2" - node-gyp "^8.4.1" - npmlog "^5.0.0" - request "^2.88.0" - sass-graph "^4.0.1" - stdout-stream "^1.4.0" - "true-case-path" "^1.0.2" - "nopt@2 || 3": version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" @@ -6296,7 +5998,7 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.4.0, "normalize-package semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" -normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.5.0: +normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: version "2.5.0" resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz" integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== @@ -6306,16 +6008,6 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package- semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" -normalize-package-data@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.0.tgz" - integrity sha512-6lUjEI0d3v6kFrtgA/lOx4zHCWULXsFNIjHolnZCKCTLA6m/G625cdn3O7eNmT0iD3jfo6HZ9cdImGZwf21prw== - dependencies: - hosted-git-info "^3.0.6" - resolve "^1.17.0" - semver "^7.3.2" - validate-npm-package-license "^3.0.1" - normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" @@ -6523,16 +6215,6 @@ npmlog@6.0.2, npmlog@^6.0.0: gauge "^4.0.3" set-blocking "^2.0.0" -npmlog@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0" - integrity sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw== - dependencies: - are-we-there-yet "^2.0.0" - console-control-strings "^1.1.0" - gauge "^3.0.0" - set-blocking "^2.0.0" - npx@^10.2.2: version "10.2.2" resolved "https://registry.npmjs.org/npx/-/npx-10.2.2.tgz" @@ -6902,16 +6584,6 @@ parse-json@^2.2.0: dependencies: error-ex "^1.2.0" -parse-json@^5.0.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" - integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== - dependencies: - "@babel/code-frame" "^7.0.0" - error-ex "^1.3.1" - json-parse-even-better-errors "^2.3.0" - lines-and-columns "^1.1.6" - "parse5@5 - 6": version "6.0.1" resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" @@ -7517,11 +7189,6 @@ queue-microtask@^1.2.2: resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== -quick-lru@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f" - integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g== - quick-lru@^5.1.1: version "5.1.1" resolved "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz" @@ -7615,15 +7282,6 @@ read-pkg-up@^1.0.1: find-up "^1.0.0" read-pkg "^1.0.0" -read-pkg-up@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" - integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg== - dependencies: - find-up "^4.1.0" - read-pkg "^5.2.0" - type-fest "^0.8.1" - read-pkg@^1.0.0: version "1.1.0" resolved "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz" @@ -7633,16 +7291,6 @@ read-pkg@^1.0.0: normalize-package-data "^2.3.2" path-type "^1.0.0" -read-pkg@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" - integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg== - dependencies: - "@types/normalize-package-data" "^2.4.0" - normalize-package-data "^2.5.0" - parse-json "^5.0.0" - type-fest "^0.6.0" - read@1, read@~1.0.1, read@~1.0.7: version "1.0.7" resolved "https://registry.npmjs.org/read/-/read-1.0.7.tgz" @@ -7650,7 +7298,7 @@ read@1, read@~1.0.1, read@~1.0.7: dependencies: mute-stream "~0.0.4" -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@~2.3.2: +"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@~2.3.2: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -7721,14 +7369,6 @@ redent@^1.0.0: indent-string "^2.1.0" strip-indent "^1.0.1" -redent@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" - integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg== - dependencies: - indent-string "^4.0.0" - strip-indent "^3.0.0" - reflect-metadata@^0.1.2: version "0.1.13" resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08" @@ -7816,7 +7456,7 @@ repeating@^2.0.0: tunnel-agent "^0.6.0" uuid "^3.0.0" -request@^2.45.0, request@^2.74.0, request@^2.88.0: +request@^2.45.0, request@^2.74.0: version "2.88.2" resolved "https://registry.npmjs.org/request/-/request-2.88.2.tgz" integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== @@ -7879,7 +7519,7 @@ resolve-from@^5.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== -resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.17.0: +resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -8028,16 +7668,6 @@ sanitize-filename@^1.6.3: dependencies: truncate-utf8-bytes "^1.0.0" -sass-graph@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-4.0.1.tgz#2ff8ca477224d694055bf4093f414cf6cfad1d2e" - integrity sha512-5YCfmGBmxoIRYHnKK2AKzrAkCoQ8ozO+iumT8K4tXJXRVCPf+7s1/9KxTSW3Rbvf+7Y7b4FR3mWyLnQr3PHocA== - dependencies: - glob "^7.0.0" - lodash "^4.17.11" - scss-tokenizer "^0.4.3" - yargs "^17.2.1" - sass-loader@^12.6.0: version "12.6.0" resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-12.6.0.tgz#5148362c8e2cdd4b950f3c63ac5d16dbfed37bcb" @@ -8046,6 +7676,15 @@ sass-loader@^12.6.0: klona "^2.0.4" neo-async "^2.6.2" +sass@^1.58.0: + version "1.58.0" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.58.0.tgz#ee8aea3ad5ea5c485c26b3096e2df6087d0bb1cc" + integrity sha512-PiMJcP33DdKtZ/1jSjjqVIKihoDc6yWmYr9K/4r3fVVIEDAluD0q7XZiRKrNJcPK3qkLRF/79DND1H5q1LBjgg== + dependencies: + chokidar ">=3.0.0 <4.0.0" + immutable "^4.0.0" + source-map-js ">=0.6.2 <2.0.0" + sax@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" @@ -8060,14 +7699,6 @@ schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: ajv "^6.12.5" ajv-keywords "^3.5.2" -scss-tokenizer@^0.4.3: - version "0.4.3" - resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.4.3.tgz#1058400ee7d814d71049c29923d2b25e61dc026c" - integrity sha512-raKLgf1LI5QMQnG+RxHz6oK0sL3x3I4FN2UDLqgLOGO8hodECNnNh5BXn7fAyBxrA8zVzdQizQ6XjNJQ+uBwMw== - dependencies: - js-base64 "^2.4.9" - source-map "^0.7.3" - semver-compare@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz" @@ -8282,7 +7913,7 @@ smart-buffer@^1.0.13: resolved "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.1.15.tgz" integrity sha1-fxFLW2X6s+KjWqd1uxLw0cZJvxY= -smart-buffer@^4.0.2, smart-buffer@^4.1.0, smart-buffer@^4.2.0: +smart-buffer@^4.0.2, smart-buffer@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== @@ -8302,15 +7933,6 @@ socks-proxy-agent@^3.0.0: agent-base "^4.0.1" socks "^1.1.10" -socks-proxy-agent@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.1.0.tgz#869cf2d7bd10fea96c7ad3111e81726855e285c3" - integrity sha512-57e7lwCN4Tzt3mXz25VxOErJKXlPfXmkMLnk310v/jwW20jWRVcgsOit+xNkN3eIEdB47GwnfAEBLacZ/wVIKg== - dependencies: - agent-base "^6.0.2" - debug "^4.3.1" - socks "^2.6.1" - socks-proxy-agent@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6" @@ -8328,14 +7950,6 @@ socks@^1.1.10: ip "^1.1.4" smart-buffer "^1.0.13" -socks@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz#989e6534a07cf337deb1b1c94aaa44296520d30e" - integrity sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA== - dependencies: - ip "^1.1.5" - smart-buffer "^4.1.0" - socks@^2.6.2: version "2.7.1" resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55" @@ -8367,16 +7981,16 @@ source-code-pro@^2.38.0: resolved "https://registry.yarnpkg.com/source-code-pro/-/source-code-pro-2.38.0.tgz#85c57689f7386bb9d0515fb00ba4845bfb7b485b" integrity sha512-JMXu7l3XrLREG17eEwY66ANG9716WTu6OeNvZfRKQKANEvbSERDZjk5AYTHeV6owQNPQTeiiW3ri2Ou93XFGvg== +"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" + integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== + source-map-js@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf" integrity sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA== -source-map-js@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" - integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== - source-map-loader@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-3.0.1.tgz#9ae5edc7c2d42570934be4c95d1ccc6352eba52d" @@ -8399,11 +8013,6 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@^0.7.3: - version "0.7.4" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" - integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== - source-sans-pro@3.6.0: version "3.6.0" resolved "https://registry.npmjs.org/source-sans-pro/-/source-sans-pro-3.6.0.tgz" @@ -8487,13 +8096,6 @@ ssri@^4.1.2, ssri@^4.1.6, ssri@~4.1.6: dependencies: safe-buffer "^5.1.0" -ssri@^8.0.0, ssri@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" - integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ== - dependencies: - minipass "^3.1.1" - ssri@^9.0.0: version "9.0.1" resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057" @@ -8506,13 +8108,6 @@ stat-mode@^1.0.0: resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465" integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg== -stdout-stream@^1.4.0: - version "1.4.1" - resolved "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz" - integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA== - dependencies: - readable-stream "^2.0.1" - stream-each@^1.1.0: version "1.2.0" resolved "https://registry.npmjs.org/stream-each/-/stream-each-1.2.0.tgz" @@ -8543,7 +8138,7 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -"string-width@^1.0.1 || ^2.0.0", "string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1: +"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -8625,7 +8220,7 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1: dependencies: ansi-regex "^2.0.0" -"strip-ansi@^3.0.1 || ^4.0.0", strip-ansi@^4.0.0, strip-ansi@~4.0.0: +strip-ansi@^4.0.0, strip-ansi@~4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= @@ -8663,13 +8258,6 @@ strip-indent@^1.0.1: dependencies: get-stdin "^4.0.1" -strip-indent@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001" - integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ== - dependencies: - min-indent "^1.0.0" - strip-json-comments@^2.0.1, strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" @@ -8784,7 +8372,7 @@ tar@^2.0.0, tar@~2.2.1: fstream "^1.0.12" inherits "2" -tar@^6.0.2, tar@^6.0.5, tar@^6.1.11, tar@^6.1.2: +tar@^6.0.5, tar@^6.1.11, tar@^6.1.2: version "6.1.11" resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== @@ -8997,18 +8585,6 @@ trim-newlines@^1.0.0: resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz" integrity sha1-WIeWa7WCpFA6QetST301ARgVphM= -trim-newlines@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" - integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw== - -"true-case-path@^1.0.2": - version "1.0.3" - resolved "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz" - integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew== - dependencies: - glob "^7.1.2" - truncate-utf8-bytes@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b" @@ -9082,26 +8658,11 @@ type-fest@^0.13.1: resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz" integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg== -type-fest@^0.18.0: - version "0.18.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f" - integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw== - type-fest@^0.20.2: version "0.20.2" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== -type-fest@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" - integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== - -type-fest@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" - integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== - typedarray@^0.0.6: version "0.0.6" resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz" @@ -9165,13 +8726,6 @@ unique-filename@^1.1.0, unique-filename@~1.1.0: dependencies: unique-slug "^2.0.0" -unique-filename@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" - integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ== - dependencies: - unique-slug "^2.0.0" - unique-filename@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2" @@ -9541,7 +9095,7 @@ which@~1.2.14: dependencies: isexe "^2.0.0" -wide-align@^1.1.0, wide-align@^1.1.2: +wide-align@^1.1.0: version "1.1.3" resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== @@ -9724,11 +9278,6 @@ yargs-parser@^18.1.2: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^20.2.3: - version "20.2.9" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" - integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== - yargs-parser@^21.0.0: version "21.1.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" @@ -9776,7 +9325,7 @@ yargs@^15.0.1: y18n "^4.0.0" yargs-parser "^18.1.2" -yargs@^17.0.0, yargs@^17.0.1, yargs@^17.2.1, yargs@^17.5.1: +yargs@^17.0.0, yargs@^17.0.1, yargs@^17.5.1: version "17.6.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.0.tgz#e134900fc1f218bc230192bdec06a0a5f973e46c" integrity sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==