From cbe603a99f9527550688fe73aa5568ee72f73949 Mon Sep 17 00:00:00 2001 From: Jan Bicker Date: Fri, 10 Jan 2020 11:48:21 +0000 Subject: [PATCH 1/4] Updated Arduino App to new theming system Signed-off-by: Jan Bicker --- .../browser/arduino-frontend-contribution.tsx | 189 ++++++++- .../src/browser/arduino-frontend-module.ts | 15 +- .../src/browser/arduino-theme.ts | 29 -- .../src/browser/boards/boards-config.tsx | 2 +- .../src/browser/components/arduino-select.tsx | 4 +- .../component-list/list-item-renderer.tsx | 1 + .../components/component-list/search-bar.tsx | 2 +- .../src/browser/data/arduino.color-theme.json | 37 +- .../src/browser/monitor/monitor-widget.tsx | 2 +- .../src/browser/style/arduino-select.css | 26 +- .../src/browser/style/arduino.useable.css | 240 ----------- .../src/browser/style/board-select-dialog.css | 42 +- .../src/browser/style/browser-menu.css | 2 +- .../src/browser/style/index.css | 36 +- .../src/browser/style/list-widget.css | 60 +-- .../src/browser/style/main.css | 42 +- .../src/browser/style/monitor.css | 5 +- yarn.lock | 399 +++++++++--------- 18 files changed, 522 insertions(+), 611 deletions(-) delete mode 100644 arduino-ide-extension/src/browser/arduino-theme.ts delete mode 100644 arduino-ide-extension/src/browser/style/arduino.useable.css diff --git a/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx b/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx index d8d68b95..bf9da38b 100644 --- a/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx +++ b/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx @@ -42,6 +42,8 @@ import { ScmContribution } from '@theia/scm/lib/browser/scm-contribution'; import { SearchInWorkspaceFrontendContribution } from '@theia/search-in-workspace/lib/browser/search-in-workspace-frontend-contribution'; import { FileNavigatorCommands } from '@theia/navigator/lib/browser/navigator-contribution'; import { EditorMode } from './editor-mode'; +import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution'; +import { ColorRegistry } from '@theia/core/lib/browser/color-registry'; export namespace ArduinoMenus { export const SKETCH = [...MAIN_MENU_BAR, '3_sketch']; @@ -57,7 +59,7 @@ export namespace ArduinoToolbarContextMenu { @injectable() export class ArduinoFrontendContribution implements FrontendApplicationContribution, - TabBarToolbarContribution, CommandContribution, MenuContribution, KeybindingContribution { + TabBarToolbarContribution, CommandContribution, MenuContribution, KeybindingContribution, ColorContribution { @inject(MessageService) protected readonly messageService: MessageService; @@ -577,4 +579,189 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut return undefined; } + registerColors(colors: ColorRegistry): void { + colors.register( + { + id: 'arduino.base', + defaults: { + dark: '#616161', + light: '#616161', + hc: '#FFFFFF' + }, + description: 'Base layout color.' + }, + { + id: 'arduino.toolbarTooltip', + defaults: { + dark: '#616161', + light: '#616161', + hc: '#FFFFFF' + }, + description: 'The color of the toolbar tooltip (shown next to the buttons).' + }, + { + id: 'arduino.editorMargin', + defaults: { + dark: '#2e2e2e', + light: '#EEEEEE', + hc: 'contrastBorder' + }, + description: 'The color of the border which separates line numbers from code area.' + }, + { + id: 'arduino.dialogTitle', + defaults: { + dark: 'foreground', + light: 'foreground', + hc: 'contrastBorder' + }, + description: 'The color of a dialog title (e.g. in board selector dialog).' + }, + { + id: 'arduino.select', + defaults: { + + }, + description: 'Color of background and border of select component (in serial monitor).' + }, + { + id: 'arduino.selectItemHoverBackground', + defaults: { + light: '#d7eaf8', + dark: '#24455e' + }, + description: 'Color of background of hovered Item in select component (in serial monitor).' + }, + { + id: 'arduino.dialogSecondaryTitle', + defaults: { + dark: '#7f8c8d', + light: '#7f8c8d' + }, + description: 'Color of secondary titles in Arduino Dialogs.' + }, + { + id: 'arduino.secondaryButtonShadow', + defaults: { + dark: '#95a5a6', + light: '#95a5a6' + }, + description: 'Color of secondary button shadow.' + }, + { + id: 'arduino.buttonShadow', + defaults: { + dark: '#006468', + light: '#006468' + }, + description: 'Color of button shadow.' + }, + { + id: 'arduino.toolbarItemForeground', + defaults: { + dark: 'button.foreground', + light: 'button.foreground' + }, + description: 'Foreground color of toolbar items.' + }, + { + id: 'arduino.boardSelectorBackground', + defaults: { + dark: 'editorWidget.background', + light: 'editorWidget.background', + hc: 'editorWidget.background' + }, + description: 'Background color of board selector toolbar item.' + }, + { + id: 'arduino.boardSelectorHoverBackground', + defaults: { + dark: '#383838', + light: '#dae2e4' + }, + description: 'Background color of board selector toolbar item.' + }, + { + id: 'arduino.boardSelectorBorder', + defaults: { + dark: '#757575', + light: '#e0e0e0' + }, + description: 'Border color of board selector toolbar item.' + }, + { + id: 'arduino.boardSelectorCheck', + defaults: { + dark: '#259fd8', + light: '#2b75c0' + }, + description: 'Color of board selector toolbar check item.' + }, + { + id: 'arduino.listOddItem', + defaults: { + dark: '#1d1d1d', + light: '#ffffff' + }, + description: 'Backgroundcolor of item with odd number in list widget' + }, + { + id: 'arduino.listEvenItem', + defaults: { + dark: '#252526', + light: '#f7f9f9' + }, + description: 'Backgroundcolor of item with even number in list widget' + }, + { + id: 'arduino.listItemHoverBackground', + defaults: { + dark: '#333333', + light: '#ececec' + }, + description: 'Backgroundcolor of hovered item in list widget' + }, + { + id: 'arduino.listItemSecondaryForeground', + defaults: { + dark: '#9e9e9e', + light: '#9e9e9e' + }, + description: 'Backgroundcolor of hovered item in list widget' + }, + { + id: 'arduino.listItemInstalledBadge', + defaults: { + dark: '#259fd8', + light: '#2b75c0' + }, + description: 'Color of badge for installed list items.' + }, + { + id: 'arduino.listItemInfoLinkForeground', + defaults: { + dark: '#2196f3', + light: '#2196f3' + }, + description: 'Color of info link in list items.' + }, + { + id: 'arduino.bottomPanelTabBackground', + defaults: { + dark: 'editorGroupHeader.tabsBackground', + light: 'editorGroupHeader.tabsBackground' + }, + description: 'Color of info link in list items.' + }, + { + id: 'arduino.toolbarToggleBackground', + defaults: { + dark: '#757575', + light: '#9e9e9e' + }, + description: 'Color of active toggles (as in serial monitor toolbar).' + } + ); + } + } diff --git a/arduino-ide-extension/src/browser/arduino-frontend-module.ts b/arduino-ide-extension/src/browser/arduino-frontend-module.ts index 227ab89c..b577659a 100644 --- a/arduino-ide-extension/src/browser/arduino-frontend-module.ts +++ b/arduino-ide-extension/src/browser/arduino-frontend-module.ts @@ -26,8 +26,6 @@ import { ToolOutputServiceClientImpl } from './tool-output/client-service-impl'; import { BoardsServiceClientImpl } from './boards/boards-service-client-impl'; import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service'; import { ArduinoWorkspaceService } from './arduino-workspace-service'; -import { ThemeService } from '@theia/core/lib/browser/theming'; -import { ArduinoTheme } from './arduino-theme'; import { OutlineViewContribution } from '@theia/outline-view/lib/browser/outline-view-contribution'; import { ArduinoOutlineViewContribution } from './customization/arduino-outline-contribution'; import { ProblemContribution } from '@theia/markers/lib/browser/problem/problem-contribution'; @@ -71,9 +69,18 @@ import { ArduinoAboutDialog } from './customization/arduino-about-dialog'; import { ArduinoShellLayoutRestorer } from './shell/arduino-shell-layout-restorer'; import { EditorMode } from './editor-mode'; import { ListItemRenderer } from './components/component-list/list-item-renderer'; +import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution'; +import { MonacoThemingService } from '@theia/monaco/lib/browser/monaco-theming-service'; const ElementQueries = require('css-element-queries/src/ElementQueries'); +MonacoThemingService.register({ + id: 'arduinoTheme', + label: 'Arduino Light Theme', + uiTheme: 'vs', + json: require('../../src/browser/data/arduino.color-theme.json') +}); + export default new ContainerModule((bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: interfaces.IsBound, rebind: interfaces.Rebind) => { ElementQueries.listen(); ElementQueries.init(); @@ -85,6 +92,7 @@ export default new ContainerModule((bind: interfaces.Bind, unbind: interfaces.Un bind(TabBarToolbarContribution).toService(ArduinoFrontendContribution); bind(KeybindingContribution).toService(ArduinoFrontendContribution); bind(FrontendApplicationContribution).toService(ArduinoFrontendContribution); + bind(ColorContribution).toService(ArduinoFrontendContribution); bind(ArduinoToolbarContribution).toSelf().inSingletonScope(); bind(FrontendApplicationContribution).toService(ArduinoToolbarContribution); @@ -200,9 +208,6 @@ export default new ContainerModule((bind: interfaces.Bind, unbind: interfaces.Un bind(ArduinoWorkspaceService).toSelf().inSingletonScope(); rebind(WorkspaceService).to(ArduinoWorkspaceService).inSingletonScope(); - const themeService = ThemeService.get(); - themeService.register(...ArduinoTheme.themes); - // Customizing default Theia layout based on the editor mode: `pro-mode` or `classic`. bind(EditorMode).toSelf().inSingletonScope(); bind(FrontendApplicationContribution).toService(EditorMode); diff --git a/arduino-ide-extension/src/browser/arduino-theme.ts b/arduino-ide-extension/src/browser/arduino-theme.ts deleted file mode 100644 index a0198e0a..00000000 --- a/arduino-ide-extension/src/browser/arduino-theme.ts +++ /dev/null @@ -1,29 +0,0 @@ - -import { Theme } from '@theia/core/lib/browser/theming'; -import { MonacoThemeRegistry } from '@theia/monaco/lib/browser/textmate/monaco-theme-registry'; - -const ARDUINO_CSS = require('../../src/browser/style/arduino.useable.css'); -const ARDUINO_JSON = MonacoThemeRegistry.SINGLETON.register( - require('../../src/browser/data/arduino.color-theme.json'), {}, 'arduino', 'vs').name!; - -export class ArduinoTheme { - - static readonly arduino: Theme = { - type: 'light', - id: 'arduino-theme', - label: 'Arduino Light Theme', - description: 'Arduino Light Theme', - editorTheme: ARDUINO_JSON, - activate() { - ARDUINO_CSS.use(); - }, - deactivate() { - ARDUINO_CSS.unuse(); - } - }; - - static readonly themes: Theme[] = [ - ArduinoTheme.arduino - ]; - -} diff --git a/arduino-ide-extension/src/browser/boards/boards-config.tsx b/arduino-ide-extension/src/browser/boards/boards-config.tsx index fef02883..ec5e375a 100644 --- a/arduino-ide-extension/src/browser/boards/boards-config.tsx +++ b/arduino-ide-extension/src/browser/boards/boards-config.tsx @@ -207,7 +207,7 @@ export class BoardsConfig extends React.Component
- +
diff --git a/arduino-ide-extension/src/browser/components/arduino-select.tsx b/arduino-ide-extension/src/browser/components/arduino-select.tsx index d9f80a8f..402e9b6e 100644 --- a/arduino-ide-extension/src/browser/components/arduino-select.tsx +++ b/arduino-ide-extension/src/browser/components/arduino-select.tsx @@ -16,7 +16,7 @@ export class ArduinoSelect extends Select { control: styles => ({ ...styles, minWidth: 120, - color: 'var(--theia-ui-font-color1)' + color: 'var(--theia-foreground)' }), dropdownIndicator: styles => ({ ...styles, @@ -45,7 +45,7 @@ export class ArduinoSelect extends Select { // `primary50`??? it's crazy but apparently, without this, we would get a light-blueish // color when selecting an option in the select by clicking and then not releasing the button. // https://react-select.com/styles#overriding-the-theme - primary50: 'var(--theia-accent-color4)', + primary50: 'var(--theia-arduino-selectItemHoverBackground)', } }); const DropdownIndicator = () => ; diff --git a/arduino-ide-extension/src/browser/components/component-list/list-item-renderer.tsx b/arduino-ide-extension/src/browser/components/component-list/list-item-renderer.tsx index 124b9474..50a6baaf 100644 --- a/arduino-ide-extension/src/browser/components/component-list/list-item-renderer.tsx +++ b/arduino-ide-extension/src/browser/components/component-list/list-item-renderer.tsx @@ -68,6 +68,7 @@ export class ListItemRenderer { return } else { return div.head .title { font-weight: 400; letter-spacing: .02em; font-size: 1.2em; - color: #00979d; + color: var(--theia-arduino-dialogTitle); margin: 17px 0; } @@ -24,18 +24,18 @@ div#select-board-dialog .selectBoardContainer .head .text { } div#select-board-dialog .selectBoardContainer .body .list .item.selected { - background: var(--theia-ui-button-color-secondary-hover); + background: var(--theia-secondaryButton-hoverBackground); } div#select-board-dialog .selectBoardContainer .body .list .item.selected i{ - color: var(--theia-arduino-light); + color: var(--theia-arduino-base); } #select-board-dialog .selectBoardContainer .search, #select-board-dialog .selectBoardContainer .search input, #select-board-dialog .selectBoardContainer .list, #select-board-dialog .selectBoardContainer .list { - background: var(--theia-layout-color0); + background: var(--theia-editor-background); } #select-board-dialog .selectBoardContainer .body .search input { @@ -47,7 +47,7 @@ div#select-board-dialog .selectBoardContainer .body .list .item.selected i{ margin: 0; vertical-align: top; display: flex; - color: var(--theia-content-font-color0); + color: var(--theia-editor-foreground); } #select-board-dialog .selectBoardContainer .body .search input:focus { @@ -79,7 +79,7 @@ div#select-board-dialog .selectBoardContainer .body .list .item.selected i{ #select-board-dialog .selectBoardContainer .body .container .content .loading { font-size: var(--theia-ui-font-size1); - color: #7f8c8d; + color: var(--theia-arduino-dialogSecondaryTitle); padding: 10px 5px 10px 10px; text-transform: uppercase; /* The max, min-height comes from `.body .list` 265px + 47px top padding - 2 * 10px top padding */ @@ -99,7 +99,7 @@ div#select-board-dialog .selectBoardContainer .body .list .item.selected i{ #select-board-dialog .selectBoardContainer .body .list .item .detail { font-size: var(--theia-ui-font-size1); - color: var(--theia-disabled-color0); + color: var(--theia-mod-disabled-opacity); width: 155px; /* used heuristics for the calculation */ white-space: pre; overflow: hidden; @@ -107,11 +107,11 @@ div#select-board-dialog .selectBoardContainer .body .list .item.selected i{ } #select-board-dialog .selectBoardContainer .body .list .item.missing { - color: var(--theia-disabled-color0); + color: var(--theia-mod-disabled-opacity); } #select-board-dialog .selectBoardContainer .body .list .item:hover { - background: var(--theia-ui-button-color-secondary-hover); + background: var(--theia-secondaryButton-hoverBackground); } #select-board-dialog .selectBoardContainer .body .list { @@ -140,15 +140,14 @@ button.theia-button { } button.theia-button.secondary { - background-color: #b5c8c9; - color: #000; - box-shadow: 0 4px #95a5a6; + background-color: var(--theia-secondaryButton-background); + color: var(--theia-foreground); + box-shadow: 0 4px var(--theia-arduino-secondaryButtonShadow); } button.theia-button.main { - color: #fff; - /* background-color: #00979c; */ - box-shadow: 0 4px var(--theia-accent-color0); + color: var(--theia-button-foreground); + box-shadow: 0 4px var(--theia-arduino-buttonShadow); } .dialogControl { @@ -192,7 +191,8 @@ button.theia-button.main { } .arduino-boards-toolbar-item { - background: var(--theia-layout-color1); + background: var(--theia-arduino-boardSelectorBackground); + color: var(--theia-foreground); height: 22px; display: flex; width: 100%; @@ -200,7 +200,7 @@ button.theia-button.main { } .arduino-boards-dropdown-list { - border: 3px solid var(--theia-border-color2); + border: 3px solid var(--theia-arduino-boardSelectorBorder); margin: -3px; z-index: 1; } @@ -210,16 +210,16 @@ button.theia-button.main { display: flex; padding: 10px; cursor: pointer; - color: var(--theia-ui-font-color1); - background: var(--theia-layout-color1); + color: var(--theia-foreground); + background: var(--theia-arduino-boardSelectorBackground); } .arduino-boards-dropdown-item .fa-check { - color: var(--theia-accent-color1); + color: var(--theia-arduino-boardSelectorCheck); align-self: center; } .arduino-boards-dropdown-item.selected, .arduino-boards-dropdown-item:hover { - background: var(--theia-layout-color3); + background: var(--theia-arduino-boardSelectorHoverBackground); } diff --git a/arduino-ide-extension/src/browser/style/browser-menu.css b/arduino-ide-extension/src/browser/style/browser-menu.css index eed004c9..b5ecc530 100644 --- a/arduino-ide-extension/src/browser/style/browser-menu.css +++ b/arduino-ide-extension/src/browser/style/browser-menu.css @@ -11,5 +11,5 @@ } .p-MenuBar-item.p-mod-active { - color: var(--theia-ui-bar-font-color0); + color: var(--theia-menubar-selectionForeground); } \ No newline at end of file diff --git a/arduino-ide-extension/src/browser/style/index.css b/arduino-ide-extension/src/browser/style/index.css index 4f76caeb..e8690b51 100644 --- a/arduino-ide-extension/src/browser/style/index.css +++ b/arduino-ide-extension/src/browser/style/index.css @@ -5,39 +5,31 @@ @import './monitor.css'; @import './arduino-select.css'; -input:focus { +.theia-input.warning:focus { outline-width: 1px; outline-style: solid; outline-offset: -1px; opacity: 1 !important; - outline-color: var(--theia-accent-color3); + color: var(--theia-foreground); + background-color: var(--theia-inputValidation-warningBackground); } -input.warning:focus { - outline-width: 1px; - outline-style: solid; - outline-offset: -1px; - opacity: 1 !important; - color: var(--theia-warn-font-color0); - background-color: var(--theia-warn-color0); +.theia-input.warning { + background-color: var(--theia-inputValidation-warningBackground); } -input.warning { - background-color: var(--theia-warn-color0); -} - -input.warning::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */ - color: var(--theia-warn-font-color0); - background-color: var(--theia-warn-color0); +.theia-input.warning::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */ + color: var(--theia-foreground); + background-color: var(--theia-inputValidation-warningBackground); opacity: 1; /* Firefox */ } -input.warning:-ms-input-placeholder { /* Internet Explorer 10-11 */ - color: var(--theia-warn-font-color0); - background-color: var(--theia-warn-color0); +.theia-input.warning:-ms-input-placeholder { /* Internet Explorer 10-11 */ + color: var(--theia-foreground); + background-color: var(--theia-inputValidation-warningBackground); } -input.warning::-ms-input-placeholder { /* Microsoft Edge */ - color: var(--theia-warn-font-color0); - background-color: var(--theia-warn-color0); +.theia-input.warning::-ms-input-placeholder { /* Microsoft Edge */ + color: var(--theia-foreground); + background-color: var(--theia-inputValidation-warningBackground); } diff --git a/arduino-ide-extension/src/browser/style/list-widget.css b/arduino-ide-extension/src/browser/style/list-widget.css index 1a887171..4f85aeb8 100644 --- a/arduino-ide-extension/src/browser/style/list-widget.css +++ b/arduino-ide-extension/src/browser/style/list-widget.css @@ -4,36 +4,15 @@ } .arduino-list-widget { - color: var(--theia-ui-font-color1); + color: var(--theia-foreground); } .arduino-list-widget .search-bar { margin: 0px 10px 10px 15px; } -.arduino-list-widget .search-filters { - margin: 0px 10px 0px 15px; - border-color: var(--theia-border-color3); -} - .arduino-list-widget .search-bar:focus { - border-color: var(--theia-accent-color3); -} - -.arduino-list-widget .filterable-list-container .search-filters .filter { - margin: 0px 0px 10px 0px; - display: flex; -} - -.arduino-list-widget .filterable-list-container .search-filters .filter .title { - margin: 0px 10px 0px 0px; - align-self: center; - text-transform: uppercase; - font-size: var(--theia-ui-font-size0); -} - -.arduino-list-widget .filterable-list-container .search-filters .filter > select { - width: 100%; + border-color: var(--theia-focusBorder); } .filterable-list-container { @@ -49,15 +28,15 @@ } .filterable-list-container .items-container > div:nth-child(odd) { - background-color: var(--theia-layout-color0); + background-color: var(--theia-arduino-listOddItem); } .filterable-list-container .items-container > div:nth-child(even) { - background-color: var(--theia-layout-color1); + background-color: var(--theia-arduino-listEvenItem); } .filterable-list-container .items-container > div:hover { - background-color: var(--theia-layout-color2); + background-color: var(--theia-arduino-listItemHoverBackground); } /* Perfect scrollbar does not like if we explicitly set the `background-color` of the contained elements. @@ -74,18 +53,9 @@ https://github.com/arduino/arduino-pro-ide/issues/82 */ } .component-list-item:hover { - background: var(--theia-accent-color4); cursor: pointer; } -.component-list-item:hover .meta-info { - color: var(--theia-ui-font-color1); -} - -.component-list-item .meta-info { - color: var(--theia-ui-font-color3); -} - .component-list-item .header { padding-bottom: 2px; display: flex; @@ -104,33 +74,33 @@ https://github.com/arduino/arduino-pro-ide/issues/82 */ .component-list-item .header .author { font-weight: bold; - color: var(--theia-ui-font-color2); + color: var(--theia-arduino-listItemSecondaryForeground); } .component-list-item:hover .header .author { - color: var(--theia-ui-font-color1); + color: var(--theia-foreground); } .component-list-item .header .version { - color: var(--theia-ui-font-color2); + color: var(--theia-arduino-listItemSecondaryForeground); } .component-list-item .header .installed:before { margin-left: 4px; display: inline-block; justify-self: end; - background-color: var(--theia-accent-color1); + background-color: var(--theia-arduino-listItemInstalledBadge); padding: 2px 4px 2px 4px; font-size: 10px; font-weight: bold; max-height: calc(1em + 4px); - color: var(--theia-inverse-ui-font-color0); + color: var(--theia-button-foreground); content: 'INSTALLED'; } .component-list-item .header .installed:hover:before { - background-color: var(--theia-inverse-ui-font-color0); - color: var(--theia-accent-color1); + background-color: var(--theia-button-foreground); + color: var(--theia-arduino-listItemInstalledBadge); content: 'UNINSTALL'; } @@ -161,14 +131,10 @@ https://github.com/arduino/arduino-pro-ide/issues/82 */ } .component-list-item .info a { - color: var(--theia-brand-color1); + color: var(--theia-arduino-listItemInfoLinkForeground); text-decoration: none; } .component-list-item a:hover { text-decoration: underline; } - -.component-list-item strong.installed { - color: rgb(0, 151, 157) -} diff --git a/arduino-ide-extension/src/browser/style/main.css b/arduino-ide-extension/src/browser/style/main.css index 00628233..a99fdbff 100644 --- a/arduino-ide-extension/src/browser/style/main.css +++ b/arduino-ide-extension/src/browser/style/main.css @@ -1,9 +1,14 @@ -.p-TabBar[data-orientation='horizontal'].theia-app-bottom { - background: var(--theia-layout-color1); +#theia-bottom-content-panel .p-TabBar[data-orientation='horizontal'].theia-app-bottom { + background: var(--theia-editorGroupHeader-tabsBackground); +} + +#theia-bottom-content-panel .p-TabBar-tab { + background: var(--theia-arduino-bottomPanelTabBackground); } .theia-output { - background: var(--theia-arduino-terminal); + background: var(--theia-terminal-background); + color: var(--theia-terminal-foreground); } #outputView { @@ -20,11 +25,11 @@ align-items: center; height: 24px; width: 24px; - background: var(--theia-ui-button-color); + background: var(--theia-button-background); } .p-TabBar-toolbar .item.arduino-tool-item > div:hover { - background: var(--theia-ui-button-color-hover); + background: var(--theia-button-hoverBackground); } .arduino-verify, .arduino-upload { @@ -34,7 +39,8 @@ .arduino-tool-icon { height: 24px; width: 24px; - background: var(--theia-ui-button-font-color); + color: var(--theia-arduino-toolbarItemForeground); + background: var(--theia-arduino-toolbarItemForeground); -webkit-mask: url(../icons/mask-buttons.svg); mask: url(../icons/mask-buttons.svg); -webkit-mask-size: 800%; @@ -86,29 +92,11 @@ justify-content: flex-end; } -.arduino-tool-item.item.connected-boards { - opacity: 1; -} - -.arduino-tool-item.item.connected-boards select { - line-height: var(--theia-content-line-height); - font-size: var(--theia-ui-font-size1); - color: var(--theia-ui-font-color1); - -webkit-appearance: none; - -moz-appearance: none; - background-image: linear-gradient(45deg, transparent 50%, var(--theia-ui-font-color1) 50%), linear-gradient(135deg, var(--theia-ui-font-color1) 50%, transparent 50%); - background-position: calc(100% - 6px) 8px, calc(100% - 2px) 8px, 100% 0; - background-size: 4px 5px; - background-repeat: no-repeat; - padding-left: 3px; - padding-right: 15px; -} - .arduino-toolbar-tooltip { margin-left: 10px; display: flex; align-items: center; - color: var(--theia-ui-font-color3); + color: var(--theia-arduino-toolbarTooltip); } .p-TabBar-toolbar .item > div.arduino-toggle-advanced-mode { @@ -126,11 +114,11 @@ display: flex; justify-content: center; align-items: center; - color: var(--theia-ui-button-font-color); + color: var(--theia-arduino-toolbarItemForeground); } .monaco-editor .margin { - border-right: 2px solid var(--theia-border-color1); + border-right: 2px solid var(--theia-arduino-editorMargin); box-sizing: border-box; } diff --git a/arduino-ide-extension/src/browser/style/monitor.css b/arduino-ide-extension/src/browser/style/monitor.css index f3bc3674..fcb73978 100644 --- a/arduino-ide-extension/src/browser/style/monitor.css +++ b/arduino-ide-extension/src/browser/style/monitor.css @@ -14,7 +14,6 @@ .serial-monitor .head { display: flex; padding: 5px; - background: var(--theia-layout-color0); height: 27px; } @@ -30,7 +29,7 @@ } .serial-monitor .head .send > input:focus { - border-color: var(--theia-accent-color3); + border-color: var(--theia-focusBorder); } .serial-monitor .head .config { @@ -55,7 +54,7 @@ } .p-TabBar-toolbar .item.arduino-monitor.toggled { - background: var(--theia-secondary-brand-color1); + background: var(--theia-arduino-toolbarToggleBackground); } .p-TabBar-toolbar .item .clear-all { diff --git a/yarn.lock b/yarn.lock index e9b397db..70849190 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1687,16 +1687,16 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd" integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow== -"@theia/application-manager@0.14.0-next.0159cd5b": - version "0.14.0-next.0159cd5b" - resolved "https://registry.yarnpkg.com/@theia/application-manager/-/application-manager-0.14.0-next.0159cd5b.tgz#4e57bd5eda4d2710332d1a77151767dec9a8693a" - integrity sha512-KgxMZxQZR/LtId6hQFJXpQ5aVDKfYy0+eX1GG4ClJI9pIHoIa3Kllfl3EEN2lsSeFRQq+UtSdSUbvNQqvUv6Pg== +"@theia/application-manager@0.15.0-next.183ba3e5": + version "0.15.0-next.183ba3e5" + resolved "https://registry.yarnpkg.com/@theia/application-manager/-/application-manager-0.15.0-next.183ba3e5.tgz#6ee416d7dfa8fe3309dc0b47402ff7efd99a1cda" + integrity sha512-8MjrYnVXtCTbna8W/mcXdgOlQJjHMZXC9Cxu0oL5DWHwZhE/qgdz9uousiBGrdSJ8DT+WQ/I+SgTkS6cFuhUPQ== dependencies: "@babel/core" "^7.5.5" "@babel/plugin-transform-classes" "^7.5.5" "@babel/plugin-transform-runtime" "^7.5.5" "@babel/preset-env" "^7.5.5" - "@theia/application-package" "0.14.0-next.0159cd5b" + "@theia/application-package" "0.15.0-next.183ba3e5" "@theia/compression-webpack-plugin" "^3.0.0" "@types/fs-extra" "^4.0.2" babel-loader "^8.0.6" @@ -1718,10 +1718,10 @@ webpack-cli "2.0.12" worker-loader "^1.1.1" -"@theia/application-package@0.14.0-next.0159cd5b", "@theia/application-package@next": - version "0.14.0-next.0159cd5b" - resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-0.14.0-next.0159cd5b.tgz#888061bfaea245462b50b512829efcd5f2ae32ee" - integrity sha512-ck0ttkgSJFzRfEZEhOC0FUh8aBz7SRFOEKw4yLgwO+RIFJLGJup5F//W2NFsBas8eHR9Ky/bcSYdxi0emEdaQg== +"@theia/application-package@0.15.0-next.183ba3e5", "@theia/application-package@next": + version "0.15.0-next.183ba3e5" + resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-0.15.0-next.183ba3e5.tgz#50e66311c9447abe1eea52fb5e1110780d35fe6b" + integrity sha512-/XmOt/ZG8BcxjMfreV9trTJFaKI/iezhzRLRLvw3J8anT3cxqiktE+jeDtYpQ1fbpElQZiLUz8RKLl+xqDVY+g== dependencies: "@types/fs-extra" "^4.0.2" "@types/request" "^2.0.3" @@ -1735,12 +1735,12 @@ write-json-file "^2.2.0" "@theia/cli@next": - version "0.14.0-next.0159cd5b" - resolved "https://registry.yarnpkg.com/@theia/cli/-/cli-0.14.0-next.0159cd5b.tgz#84ad3d65f7db7a004daabf954bba3164cc399138" - integrity sha512-bLdRHYqK0WxMGf+SoUQkima1fnmY1obb2dYgo5cvSLOK4mXik1oOik4ZSLv+11oKDi3qJeT6D6hEFDLkD9KadA== + version "0.15.0-next.183ba3e5" + resolved "https://registry.yarnpkg.com/@theia/cli/-/cli-0.15.0-next.183ba3e5.tgz#a8d495c73861f4e893efcdbaf585faf23ff27685" + integrity sha512-xX/jGib2eO/+uLEwQYLKFkwr5RRzTl7g9ZjCgqGz/Yw4pKsnWJ0jP25Xrni5x2f5dqXtyB8415YWCa/cH8b4ng== dependencies: - "@theia/application-manager" "0.14.0-next.0159cd5b" - "@theia/application-package" "0.14.0-next.0159cd5b" + "@theia/application-manager" "0.15.0-next.183ba3e5" + "@theia/application-package" "0.15.0-next.183ba3e5" yargs "^11.1.0" "@theia/compression-webpack-plugin@^3.0.0": @@ -1755,15 +1755,15 @@ serialize-javascript "^1.4.0" webpack-sources "^1.0.1" -"@theia/core@0.14.0-next.0159cd5b", "@theia/core@next": - version "0.14.0-next.0159cd5b" - resolved "https://registry.yarnpkg.com/@theia/core/-/core-0.14.0-next.0159cd5b.tgz#06f8080680d9195c8a1d148dbaa2d2396e4ff503" - integrity sha512-GZS++3J3TmP0xdb57CvSj/ryVaXeAaZsrQaEGR9w8tNoDk8Aq+bfSi72mqLBesnH5HuqHkniDLtxoox+spF+zg== +"@theia/core@0.15.0-next.183ba3e5", "@theia/core@next": + version "0.15.0-next.183ba3e5" + resolved "https://registry.yarnpkg.com/@theia/core/-/core-0.15.0-next.183ba3e5.tgz#b65552acf3d1ed62e09771d9af617b4f6be09177" + integrity sha512-p5Tr/rgrjYN7m0CR1L4ARs/n0bZNB0ltVjyMnJ98A8WSy9DYEZrui/Iohb6kB7/AmgYg2PofUloVE7FTCCbsVQ== dependencies: "@babel/runtime" "^7.5.5" "@phosphor/widgets" "^1.9.3" "@primer/octicons-react" "^9.0.0" - "@theia/application-package" "0.14.0-next.0159cd5b" + "@theia/application-package" "0.15.0-next.183ba3e5" "@types/body-parser" "^1.16.4" "@types/express" "^4.16.0" "@types/fs-extra" "^4.0.2" @@ -1801,9 +1801,9 @@ yargs "^11.1.0" "@theia/cpp@next": - version "0.14.0-next.032512b0" - resolved "https://registry.yarnpkg.com/@theia/cpp/-/cpp-0.14.0-next.032512b0.tgz#c2a376896862ab860b3801ed931263a773edac49" - integrity sha512-eCqoI7btbJsqhAUlROod8TcXTwmZj8V74VpF0ADgTdePkovixKhOOKs7zlpMiiYOB6NdER8H8OIwDJl6acDzYA== + version "0.15.0-next.2818a5a2" + resolved "https://registry.yarnpkg.com/@theia/cpp/-/cpp-0.15.0-next.2818a5a2.tgz#5cc72adc3c75ffbcb8e5712c500400ff91632631" + integrity sha512-mr3K+YGWOtz/nj2O2770ik0pH5oZuzd2Ya9Euk0hAyJ4Mq82TD5jcyXWLMVxvU+mZtHOxumziD2okNfbH7xWuQ== dependencies: "@theia/core" next "@theia/editor" next @@ -1817,21 +1817,21 @@ "@theia/workspace" next string-argv "^0.1.1" -"@theia/editor@0.14.0-next.0159cd5b", "@theia/editor@next": - version "0.14.0-next.0159cd5b" - resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-0.14.0-next.0159cd5b.tgz#9ede3a38f4cf8be0eac26e9f963ec47e66b488f8" - integrity sha512-4GriyFNDSt4DoGPuUR3f0FnVdI+RYTtlN3R2dF4bDmaDy6FsPs40slFypW9LmiqqZ6mCOEHjFj6YVGzZ5dK4jw== +"@theia/editor@0.15.0-next.183ba3e5", "@theia/editor@next": + version "0.15.0-next.183ba3e5" + resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-0.15.0-next.183ba3e5.tgz#185753c8e673318f2e7825b545055f2254332fdb" + integrity sha512-g0QwBFCN0PHuCw8TegQ4aQhWuY5uVFe0hjcdz26ptl/pnIG8UgcjR0DFsJDYve0OmjHv/9q94PLKj6JynvxDEw== dependencies: - "@theia/core" "0.14.0-next.0159cd5b" - "@theia/languages" "0.14.0-next.0159cd5b" - "@theia/variable-resolver" "0.14.0-next.0159cd5b" + "@theia/core" "0.15.0-next.183ba3e5" + "@theia/languages" "0.15.0-next.183ba3e5" + "@theia/variable-resolver" "0.15.0-next.183ba3e5" "@types/base64-arraybuffer" "0.1.0" base64-arraybuffer "^0.1.5" "@theia/electron@next": - version "0.14.0-next.0159cd5b" - resolved "https://registry.yarnpkg.com/@theia/electron/-/electron-0.14.0-next.0159cd5b.tgz#56a48f794a71b1f95e4cd046e69fa4faa4f80902" - integrity sha512-+IJyeWy3lc4KZ9iA7I92fLQA9BbDN9k5KjjdA22+rCJUdPt916ejs2jPf3C5qmK0W8IBFqqA/TlKr/VLV6boqQ== + version "0.15.0-next.183ba3e5" + resolved "https://registry.yarnpkg.com/@theia/electron/-/electron-0.15.0-next.183ba3e5.tgz#94fdcceb9d5a92fe3518b15773af7df8adee2c3d" + integrity sha512-ct5Nx3s4viJ+Sja2t18CuSqocO3GgpSZUg7BEF5FlHgRfO/U3gaZE2HRng3TgW2XF6ki+LsvQ2rdLaXQW10NLw== dependencies: electron "^4.2.11" electron-download "^4.1.1" @@ -1843,25 +1843,25 @@ yargs "^11.1.0" "@theia/file-search@next": - version "0.14.0-next.0159cd5b" - resolved "https://registry.yarnpkg.com/@theia/file-search/-/file-search-0.14.0-next.0159cd5b.tgz#287a5d96b4d8a24f5fc7d7b080fa9c369a96cc4a" - integrity sha512-GwrFUXQYPOCXlVT+4DLsiNP8wUJ7uQR3Fbr2H0A+1RFTCwxYhZr09XuYw9ITqCDow7IPcky8LwnBDmmo95BcZw== + version "0.15.0-next.183ba3e5" + resolved "https://registry.yarnpkg.com/@theia/file-search/-/file-search-0.15.0-next.183ba3e5.tgz#5a86464489ee0a18030b99ffb78b67950811f658" + integrity sha512-qJ4wfwh9pmSqOpqC91jo3DDtsaPsvwY4MYXJiLEyntPNwzoRxQyhmlCo8X2mxJYnjl/fAB4xTm0GLvg+FWx1uA== dependencies: - "@theia/core" "0.14.0-next.0159cd5b" - "@theia/editor" "0.14.0-next.0159cd5b" - "@theia/filesystem" "0.14.0-next.0159cd5b" - "@theia/process" "0.14.0-next.0159cd5b" - "@theia/workspace" "0.14.0-next.0159cd5b" + "@theia/core" "0.15.0-next.183ba3e5" + "@theia/editor" "0.15.0-next.183ba3e5" + "@theia/filesystem" "0.15.0-next.183ba3e5" + "@theia/process" "0.15.0-next.183ba3e5" + "@theia/workspace" "0.15.0-next.183ba3e5" fuzzy "^0.1.3" vscode-ripgrep "^1.2.4" -"@theia/filesystem@0.14.0-next.0159cd5b", "@theia/filesystem@next": - version "0.14.0-next.0159cd5b" - resolved "https://registry.yarnpkg.com/@theia/filesystem/-/filesystem-0.14.0-next.0159cd5b.tgz#e188e978e88cd9c7ff011e428d35ce1cb18f2e2b" - integrity sha512-liYx841kEKtJMla1CB6S6PKrc1Phg+wfVf/NZUicOkLMtYIj2ShiI0o5QrHFwii0okZQdoL4ZQUudpHySdzfBQ== +"@theia/filesystem@0.15.0-next.183ba3e5", "@theia/filesystem@next": + version "0.15.0-next.183ba3e5" + resolved "https://registry.yarnpkg.com/@theia/filesystem/-/filesystem-0.15.0-next.183ba3e5.tgz#e3a877f8a54f32f24cdeb1cfad3f3e136b935a82" + integrity sha512-e+3TcEDM+HrM16kSKfTyYBDKzE/C0S94EPpLIrVTdvJx3yNk2nixkmiP+VHtrWtSKKWf5p5ONyBpSKZK3WXxNQ== dependencies: - "@theia/application-package" "0.14.0-next.0159cd5b" - "@theia/core" "0.14.0-next.0159cd5b" + "@theia/application-package" "0.15.0-next.183ba3e5" + "@theia/core" "0.15.0-next.183ba3e5" "@types/body-parser" "^1.17.0" "@types/rimraf" "^2.0.2" "@types/tar-fs" "^1.16.1" @@ -1882,102 +1882,104 @@ zip-dir "^1.0.2" "@theia/git@next": - version "0.14.0-next.0159cd5b" - resolved "https://registry.yarnpkg.com/@theia/git/-/git-0.14.0-next.0159cd5b.tgz#6e8971e74114ccb391bb43f25ff3ef19289c66a4" - integrity sha512-GHOlIaZCGKuGOJWgd4/IBzlzHVe5iLZWbaHgAdoBGe/iObIA6f3qTZfNmS0UEHear798VjtjmCXGkioPFAfhlA== + version "0.15.0-next.183ba3e5" + resolved "https://registry.yarnpkg.com/@theia/git/-/git-0.15.0-next.183ba3e5.tgz#d9ff1d5f506a1738d906d294863330e8e79745af" + integrity sha512-WPTWicpG7OQWkkXdf7yHNNAaB7Gk2Omg46DmDCIZSh6P3WGn3Fo12tkWPKF3aRs4rbU9WMgl9S3zmwxJ/bFG9w== dependencies: - "@theia/core" "0.14.0-next.0159cd5b" - "@theia/editor" "0.14.0-next.0159cd5b" - "@theia/filesystem" "0.14.0-next.0159cd5b" - "@theia/languages" "0.14.0-next.0159cd5b" - "@theia/navigator" "0.14.0-next.0159cd5b" - "@theia/scm" "0.14.0-next.0159cd5b" - "@theia/workspace" "0.14.0-next.0159cd5b" + "@theia/core" "0.15.0-next.183ba3e5" + "@theia/editor" "0.15.0-next.183ba3e5" + "@theia/filesystem" "0.15.0-next.183ba3e5" + "@theia/languages" "0.15.0-next.183ba3e5" + "@theia/navigator" "0.15.0-next.183ba3e5" + "@theia/scm" "0.15.0-next.183ba3e5" + "@theia/workspace" "0.15.0-next.183ba3e5" "@types/diff" "^3.2.2" "@types/p-queue" "^2.3.1" diff "^3.4.0" dugite-extra "0.1.12" find-git-exec "^0.0.2" - find-git-repositories "^0.1.0" + find-git-repositories "^0.1.1" moment "^2.21.0" octicons "^7.1.0" p-queue "^2.4.2" ts-md5 "^1.2.2" -"@theia/json@0.14.0-next.0159cd5b": - version "0.14.0-next.0159cd5b" - resolved "https://registry.yarnpkg.com/@theia/json/-/json-0.14.0-next.0159cd5b.tgz#61efa83a4e5c54d9981fefd24d372a7b199bfd68" - integrity sha512-n183rU2BdwYn7zXGPLS9sYomgBJbUmQetFg4lj+oMgdGqOev1TiJa8T+WpkCA5gqVnIJLe/qEnhvsrfF7X827w== +"@theia/json@0.15.0-next.183ba3e5": + version "0.15.0-next.183ba3e5" + resolved "https://registry.yarnpkg.com/@theia/json/-/json-0.15.0-next.183ba3e5.tgz#e11c38bd85410b229320e43379d38250c5db1687" + integrity sha512-jUDn+/pkUh+hb6aE/ToL7BljoWTIOsjwNv0cPJbvU+0JXSEb4e1poZE9RU6aYo21AfQqp6vFstEzzaLqEKaTWQ== dependencies: - "@theia/application-package" "0.14.0-next.0159cd5b" - "@theia/core" "0.14.0-next.0159cd5b" - "@theia/languages" "0.14.0-next.0159cd5b" - "@theia/monaco" "0.14.0-next.0159cd5b" + "@theia/application-package" "0.15.0-next.183ba3e5" + "@theia/core" "0.15.0-next.183ba3e5" + "@theia/languages" "0.15.0-next.183ba3e5" + "@theia/monaco" "0.15.0-next.183ba3e5" vscode-json-languageserver "^1.2.1" -"@theia/languages@0.14.0-next.0159cd5b", "@theia/languages@next": - version "0.14.0-next.0159cd5b" - resolved "https://registry.yarnpkg.com/@theia/languages/-/languages-0.14.0-next.0159cd5b.tgz#7d8d95428f0b2e8403aa294ae986585b69f01888" - integrity sha512-gw6LFLg6BKTzwrMu8zhtswMJ34IRyOtMZj3LBG8KpByBOgmms8c5AgLH6ZKaeqXV8N5iqugXlc20v6qEyyrDmA== +"@theia/languages@0.15.0-next.183ba3e5", "@theia/languages@next": + version "0.15.0-next.183ba3e5" + resolved "https://registry.yarnpkg.com/@theia/languages/-/languages-0.15.0-next.183ba3e5.tgz#b6a5391c44bd299bfb4a8ec1af163fdf3079e201" + integrity sha512-M2x1zgvHyOLQVX7CGtk6rNxVpUsNbt8JlALv8RL+EbYRn1UvEu247+cV8uGkuuGLD22H7Drbkm0SQnXNcOH9Bw== dependencies: - "@theia/application-package" "0.14.0-next.0159cd5b" - "@theia/core" "0.14.0-next.0159cd5b" - "@theia/output" "0.14.0-next.0159cd5b" - "@theia/process" "0.14.0-next.0159cd5b" - "@theia/workspace" "0.14.0-next.0159cd5b" + "@theia/application-package" "0.15.0-next.183ba3e5" + "@theia/core" "0.15.0-next.183ba3e5" + "@theia/output" "0.15.0-next.183ba3e5" + "@theia/process" "0.15.0-next.183ba3e5" + "@theia/workspace" "0.15.0-next.183ba3e5" "@typefox/monaco-editor-core" "^0.18.0-next" "@types/uuid" "^3.4.3" monaco-languageclient "^0.10.2" uuid "^3.2.1" -"@theia/markers@0.14.0-next.0159cd5b", "@theia/markers@next": - version "0.14.0-next.0159cd5b" - resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-0.14.0-next.0159cd5b.tgz#8875c5e8bf1d06744ae05c1ed89d760cf295965d" - integrity sha512-KuKU/1Twg25cWNMpspitWgKrkp33+3Hkq55dgI6ShlXKHQ4YGZmCqTvPdx/M+V39FGy222oo6fBXAmB6x8zD4w== +"@theia/markers@0.15.0-next.183ba3e5", "@theia/markers@next": + version "0.15.0-next.183ba3e5" + resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-0.15.0-next.183ba3e5.tgz#4a51c30b71a415693dcd231e7982453c064b38b1" + integrity sha512-pRCiSi7+O5BwJddWVrrNuEFaOSHyJ+tekSH1TrBkVrb5WrEZ7xOyyUzVYxLlogTt4JZiezCPd4Rqdf0x0tUmIg== dependencies: - "@theia/core" "0.14.0-next.0159cd5b" - "@theia/filesystem" "0.14.0-next.0159cd5b" - "@theia/navigator" "0.14.0-next.0159cd5b" - "@theia/workspace" "0.14.0-next.0159cd5b" + "@theia/core" "0.15.0-next.183ba3e5" + "@theia/filesystem" "0.15.0-next.183ba3e5" + "@theia/navigator" "0.15.0-next.183ba3e5" + "@theia/workspace" "0.15.0-next.183ba3e5" "@theia/messages@next": - version "0.14.0-next.0159cd5b" - resolved "https://registry.yarnpkg.com/@theia/messages/-/messages-0.14.0-next.0159cd5b.tgz#aa8efd81f7055e7dd8768c547394072b92e8826a" - integrity sha512-cj3N6/GMWOW5G5oP3jL2z5n1fLaXulh0FAC5geC1x2xjyUl6HcajQIA3sJVXbYEM7ci7+lGzRgvoWZkwhv7njg== + version "0.15.0-next.183ba3e5" + resolved "https://registry.yarnpkg.com/@theia/messages/-/messages-0.15.0-next.183ba3e5.tgz#e29cb5e62c4adfa478589f1109a43341dbc685b9" + integrity sha512-Tsj+uox6sXYl1rxDkS50MCjQpNFT/ye1KbyN/08Z5nJLNUYZ926zKPnKA1ACmKLM9DhUtrstq8gogeGlixh9kQ== dependencies: - "@theia/core" "0.14.0-next.0159cd5b" + "@theia/core" "0.15.0-next.183ba3e5" lodash.throttle "^4.1.1" markdown-it "^8.4.0" react-perfect-scrollbar "^1.5.3" ts-md5 "^1.2.2" -"@theia/monaco@0.14.0-next.0159cd5b", "@theia/monaco@next": - version "0.14.0-next.0159cd5b" - resolved "https://registry.yarnpkg.com/@theia/monaco/-/monaco-0.14.0-next.0159cd5b.tgz#c1d0a7780baec9987c03a0494f6e5f8c59477196" - integrity sha512-zSrodn1WwCrP+ln5LQo4uat2nxZsJ8HrLNiSOGETbIwkQV8bx8NS02gSrg/p+EwivK3Whq6QSI76S89P3916Jw== +"@theia/monaco@0.15.0-next.183ba3e5", "@theia/monaco@next": + version "0.15.0-next.183ba3e5" + resolved "https://registry.yarnpkg.com/@theia/monaco/-/monaco-0.15.0-next.183ba3e5.tgz#8be196311418e3c9fc0da3f78535695dcf8751d6" + integrity sha512-yv3LN98k06OeLIMTojp6ppby/SQwHS2TDY8czq6wtU3dUVL2K2AnErZyZSgFIB/OvOewAJ0ULXPTzffyaARkUw== dependencies: - "@theia/core" "0.14.0-next.0159cd5b" - "@theia/editor" "0.14.0-next.0159cd5b" - "@theia/filesystem" "0.14.0-next.0159cd5b" - "@theia/languages" "0.14.0-next.0159cd5b" - "@theia/markers" "0.14.0-next.0159cd5b" - "@theia/outline-view" "0.14.0-next.0159cd5b" - "@theia/workspace" "0.14.0-next.0159cd5b" + "@theia/core" "0.15.0-next.183ba3e5" + "@theia/editor" "0.15.0-next.183ba3e5" + "@theia/filesystem" "0.15.0-next.183ba3e5" + "@theia/languages" "0.15.0-next.183ba3e5" + "@theia/markers" "0.15.0-next.183ba3e5" + "@theia/outline-view" "0.15.0-next.183ba3e5" + "@theia/workspace" "0.15.0-next.183ba3e5" deepmerge "2.0.1" + fast-plist "^0.1.2" + idb "^4.0.5" jsonc-parser "^2.0.2" monaco-css "^2.5.0" monaco-html "^2.5.2" onigasm "2.2.1" vscode-textmate "^4.0.1" -"@theia/navigator@0.14.0-next.0159cd5b", "@theia/navigator@next": - version "0.14.0-next.0159cd5b" - resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-0.14.0-next.0159cd5b.tgz#a068109aa37c6b87ae7e58cafba6378045975c0a" - integrity sha512-AWP+tpmM9IR26Pf/kSj+PMBPrMKODVdPA/4fxHECgcF7QTsigaBscLPxPApwO9tpVS70vDy0+n7n9Px9dgeUcg== +"@theia/navigator@0.15.0-next.183ba3e5", "@theia/navigator@next": + version "0.15.0-next.183ba3e5" + resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-0.15.0-next.183ba3e5.tgz#503b935ae7b1f6a9e450cbcd8402546558a1a25f" + integrity sha512-vb2jvrENps/wqNO+tTC4rzfHJzewwXeYqx3eyr2SVQcEHHLCA1HlaB0uQUJl4jGs8DYwyG0Fy1VlANgINI4DAw== dependencies: - "@theia/core" "0.14.0-next.0159cd5b" - "@theia/filesystem" "0.14.0-next.0159cd5b" - "@theia/workspace" "0.14.0-next.0159cd5b" + "@theia/core" "0.15.0-next.183ba3e5" + "@theia/filesystem" "0.15.0-next.183ba3e5" + "@theia/workspace" "0.15.0-next.183ba3e5" fuzzy "^0.1.3" minimatch "^3.0.4" @@ -1988,52 +1990,52 @@ dependencies: nan "2.10.0" -"@theia/outline-view@0.14.0-next.0159cd5b", "@theia/outline-view@next": - version "0.14.0-next.0159cd5b" - resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-0.14.0-next.0159cd5b.tgz#9b6320d29457c75faf5259d0cc2b5ee4e1a93675" - integrity sha512-Go0NzzDACpHJervpxvLey7MBPajcdFMV93bfSH9Ur9rhaYqlOHiYZ6THtVuh9aqCW8rIZHZvf7x41L2y0fp0yA== +"@theia/outline-view@0.15.0-next.183ba3e5", "@theia/outline-view@next": + version "0.15.0-next.183ba3e5" + resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-0.15.0-next.183ba3e5.tgz#9b27679bee377e7851d6c41fde54cd73cff002c7" + integrity sha512-Fts/F9PjOnkBhfAZYjlmzab5OiJLK8s02KuYWoKp7UdjaZ5qlP/JLCcLeT2GGuwHJhjPdc+MnXSkKYxjhGZ3bw== dependencies: - "@theia/core" "0.14.0-next.0159cd5b" + "@theia/core" "0.15.0-next.183ba3e5" -"@theia/output@0.14.0-next.0159cd5b": - version "0.14.0-next.0159cd5b" - resolved "https://registry.yarnpkg.com/@theia/output/-/output-0.14.0-next.0159cd5b.tgz#d365ea6281141d9c04261389cb94863947f98cb2" - integrity sha512-NzVAZ4R5VWtfXeLBnPh15tRQN1yRy6TyoNwijklnV55cStOiVMboNi/+bZ0CuEphJFRJV4D2b1hZ+C0U3GXtWg== +"@theia/output@0.15.0-next.183ba3e5": + version "0.15.0-next.183ba3e5" + resolved "https://registry.yarnpkg.com/@theia/output/-/output-0.15.0-next.183ba3e5.tgz#3dec9eca696e703d0a5b0efaac9d00ff96eba2d9" + integrity sha512-yXkRZnbZ2mo3/lPYyXCfZTgalRL+B1j89u/4hnAcjBRAiYgtpJ7DOMhBi24C21N7Sk7G0hF06iNjTkr9Kuvxxg== dependencies: - "@theia/core" "0.14.0-next.0159cd5b" + "@theia/core" "0.15.0-next.183ba3e5" -"@theia/preferences@0.14.0-next.0159cd5b", "@theia/preferences@next": - version "0.14.0-next.0159cd5b" - resolved "https://registry.yarnpkg.com/@theia/preferences/-/preferences-0.14.0-next.0159cd5b.tgz#002271ddf9028c938e71d0344e16b6ded9adb520" - integrity sha512-QLTOHAp5Z74e+exDs1Cfb1x7Bb57l7OQhSQCjWItlhHI2/gXo0mHMNncwxAfG1IyerN9DTJxgYQpfYxICcThww== +"@theia/preferences@0.15.0-next.183ba3e5", "@theia/preferences@next": + version "0.15.0-next.183ba3e5" + resolved "https://registry.yarnpkg.com/@theia/preferences/-/preferences-0.15.0-next.183ba3e5.tgz#e78f6119b854bca4227929b876468353e4265962" + integrity sha512-4KEMxvF6PmUNtJ8OWK4Yg8kjvueAFc+nuoZ1/t745haSoX91X0zfp08uUL+yTNjO8nFJP1lJXGL73wBfDlXFJw== dependencies: - "@theia/core" "0.14.0-next.0159cd5b" - "@theia/editor" "0.14.0-next.0159cd5b" - "@theia/filesystem" "0.14.0-next.0159cd5b" - "@theia/json" "0.14.0-next.0159cd5b" - "@theia/monaco" "0.14.0-next.0159cd5b" - "@theia/userstorage" "0.14.0-next.0159cd5b" - "@theia/workspace" "0.14.0-next.0159cd5b" + "@theia/core" "0.15.0-next.183ba3e5" + "@theia/editor" "0.15.0-next.183ba3e5" + "@theia/filesystem" "0.15.0-next.183ba3e5" + "@theia/json" "0.15.0-next.183ba3e5" + "@theia/monaco" "0.15.0-next.183ba3e5" + "@theia/userstorage" "0.15.0-next.183ba3e5" + "@theia/workspace" "0.15.0-next.183ba3e5" jsonc-parser "^2.0.2" -"@theia/process@0.14.0-next.0159cd5b", "@theia/process@next": - version "0.14.0-next.0159cd5b" - resolved "https://registry.yarnpkg.com/@theia/process/-/process-0.14.0-next.0159cd5b.tgz#07da1525432da46178d2b6d9651cd500056d32c8" - integrity sha512-eCe4HwQ3sQ+Lndp0LwGSloXgg4D1+WsP0+TvbI+s2MPrWBwHEscYoM2Icstp9mI4il3oJ5eVzf5f9lbQlpDmzw== +"@theia/process@0.15.0-next.183ba3e5", "@theia/process@next": + version "0.15.0-next.183ba3e5" + resolved "https://registry.yarnpkg.com/@theia/process/-/process-0.15.0-next.183ba3e5.tgz#0acbef020b02389781bc633c55051b6498f85e93" + integrity sha512-aJsu332NMN/++Gg573kZIwuR8PMuL+PCUEULxPOV5emTW52CiCyR0xpKKcNRWlawo3eHdPBlX+zXZnV8oa6xwA== dependencies: - "@theia/core" "0.14.0-next.0159cd5b" + "@theia/core" "0.15.0-next.183ba3e5" "@theia/node-pty" "0.7.8-theia004" string-argv "^0.1.1" -"@theia/scm@0.14.0-next.0159cd5b": - version "0.14.0-next.0159cd5b" - resolved "https://registry.yarnpkg.com/@theia/scm/-/scm-0.14.0-next.0159cd5b.tgz#6575a0579d67e3ae5add4b83eaeb9325b34b24a8" - integrity sha512-8435H84woUbod2+AREbSGCeBefxLgnjn8a7epNw4pJR+f1xE7O0FwR51ieCntcuoS5mOXvVfWHpkYR89vQesoQ== +"@theia/scm@0.15.0-next.183ba3e5": + version "0.15.0-next.183ba3e5" + resolved "https://registry.yarnpkg.com/@theia/scm/-/scm-0.15.0-next.183ba3e5.tgz#ea4910cb2ae9d30023fb69a4980fe8df5999f4c9" + integrity sha512-ioKrUl5A7Dq7/5Uj9DcUIdHWf0KLPSJrs/G3OBGxub8rX0luVV/jcDRhl3/j4/zARoTMqH6+aMPbymPNmVzpEA== dependencies: - "@theia/core" "0.14.0-next.0159cd5b" - "@theia/editor" "0.14.0-next.0159cd5b" - "@theia/filesystem" "0.14.0-next.0159cd5b" - "@theia/navigator" "0.14.0-next.0159cd5b" + "@theia/core" "0.15.0-next.183ba3e5" + "@theia/editor" "0.15.0-next.183ba3e5" + "@theia/filesystem" "0.15.0-next.183ba3e5" + "@theia/navigator" "0.15.0-next.183ba3e5" "@types/diff" "^3.2.2" "@types/p-debounce" "^1.0.1" diff "^3.4.0" @@ -2042,81 +2044,81 @@ ts-md5 "^1.2.2" "@theia/search-in-workspace@next": - version "0.14.0-next.0159cd5b" - resolved "https://registry.yarnpkg.com/@theia/search-in-workspace/-/search-in-workspace-0.14.0-next.0159cd5b.tgz#46bcb8a401ba7c12fd8c02832e1241b19d9d05cd" - integrity sha512-VES+EehGHvk7tE0gNzxBy4nBqW7t3SjWZRa5O0JbDU9rQw7SITMvM5Qu8tl4houkqqX5uNxlAepl2NOw+hiUew== + version "0.15.0-next.183ba3e5" + resolved "https://registry.yarnpkg.com/@theia/search-in-workspace/-/search-in-workspace-0.15.0-next.183ba3e5.tgz#381f9830c3b63ecfc571ff446a057b576c95c21a" + integrity sha512-QTRA9UvW58h5/0B9mTofuLh/HHtQsn4nVjmmR0YCBeFbJbRTTAAb7dGFKA8vmBZsgidV34auGwhKJg6msQqMHw== dependencies: - "@theia/core" "0.14.0-next.0159cd5b" - "@theia/editor" "0.14.0-next.0159cd5b" - "@theia/filesystem" "0.14.0-next.0159cd5b" - "@theia/navigator" "0.14.0-next.0159cd5b" - "@theia/process" "0.14.0-next.0159cd5b" - "@theia/workspace" "0.14.0-next.0159cd5b" + "@theia/core" "0.15.0-next.183ba3e5" + "@theia/editor" "0.15.0-next.183ba3e5" + "@theia/filesystem" "0.15.0-next.183ba3e5" + "@theia/navigator" "0.15.0-next.183ba3e5" + "@theia/process" "0.15.0-next.183ba3e5" + "@theia/workspace" "0.15.0-next.183ba3e5" vscode-ripgrep "^1.2.4" "@theia/task@next": - version "0.14.0-next.0159cd5b" - resolved "https://registry.yarnpkg.com/@theia/task/-/task-0.14.0-next.0159cd5b.tgz#832484a26849e566645a1e5994bbdf7caf9e49c1" - integrity sha512-37eGfsSeYmoaqIZD5rbhMnoMpij8vvjUd8ABxCTqTVEntomOQwMApQgElh5ptWRH1rPAPPzmdIFsmjuFhGQQmw== + version "0.15.0-next.183ba3e5" + resolved "https://registry.yarnpkg.com/@theia/task/-/task-0.15.0-next.183ba3e5.tgz#90bfdb525d9d3b4a390ce4db6864ec0516729cd0" + integrity sha512-IoZuaTmR/qaLJ3ZU9y0NeAYGwIwokbUmDtbyBlCu3EdZ+qjA1cVJ1ScQkASSLW0ttzmoetCseJBM/UYsQU0Aow== dependencies: - "@theia/core" "0.14.0-next.0159cd5b" - "@theia/editor" "0.14.0-next.0159cd5b" - "@theia/filesystem" "0.14.0-next.0159cd5b" - "@theia/markers" "0.14.0-next.0159cd5b" - "@theia/monaco" "0.14.0-next.0159cd5b" - "@theia/preferences" "0.14.0-next.0159cd5b" - "@theia/process" "0.14.0-next.0159cd5b" - "@theia/terminal" "0.14.0-next.0159cd5b" - "@theia/variable-resolver" "0.14.0-next.0159cd5b" - "@theia/workspace" "0.14.0-next.0159cd5b" + "@theia/core" "0.15.0-next.183ba3e5" + "@theia/editor" "0.15.0-next.183ba3e5" + "@theia/filesystem" "0.15.0-next.183ba3e5" + "@theia/markers" "0.15.0-next.183ba3e5" + "@theia/monaco" "0.15.0-next.183ba3e5" + "@theia/preferences" "0.15.0-next.183ba3e5" + "@theia/process" "0.15.0-next.183ba3e5" + "@theia/terminal" "0.15.0-next.183ba3e5" + "@theia/variable-resolver" "0.15.0-next.183ba3e5" + "@theia/workspace" "0.15.0-next.183ba3e5" ajv "^6.5.3" jsonc-parser "^2.0.2" p-debounce "^2.1.0" vscode-uri "^1.0.8" -"@theia/terminal@0.14.0-next.0159cd5b", "@theia/terminal@next": - version "0.14.0-next.0159cd5b" - resolved "https://registry.yarnpkg.com/@theia/terminal/-/terminal-0.14.0-next.0159cd5b.tgz#3f7cf2c12a02c8304168cdb4f94a72ea88fbf6c8" - integrity sha512-YBkSVNrrPEtH0dXDb0lXAYndJqBMdLGYRmL1MjDrGbg/yBFUbh7cmqiMzOTwJsdKpTCkqbj1mMQUPLVPcGqhYw== +"@theia/terminal@0.15.0-next.183ba3e5", "@theia/terminal@next": + version "0.15.0-next.183ba3e5" + resolved "https://registry.yarnpkg.com/@theia/terminal/-/terminal-0.15.0-next.183ba3e5.tgz#5e30a2f5c6a17ff504c03442108bd4f18ea02002" + integrity sha512-TjOMI1Xu4/psPFqRKVvsDWdSeO2vHnirP+aduqnK+9rZlATLqCyS8cnAi1MqMBDKFar1zDPQVVI3944doWUusA== dependencies: - "@theia/core" "0.14.0-next.0159cd5b" - "@theia/editor" "0.14.0-next.0159cd5b" - "@theia/filesystem" "0.14.0-next.0159cd5b" - "@theia/process" "0.14.0-next.0159cd5b" - "@theia/workspace" "0.14.0-next.0159cd5b" + "@theia/core" "0.15.0-next.183ba3e5" + "@theia/editor" "0.15.0-next.183ba3e5" + "@theia/filesystem" "0.15.0-next.183ba3e5" + "@theia/process" "0.15.0-next.183ba3e5" + "@theia/workspace" "0.15.0-next.183ba3e5" xterm "3.13.0" "@theia/textmate-grammars@next": - version "0.14.0-next.0159cd5b" - resolved "https://registry.yarnpkg.com/@theia/textmate-grammars/-/textmate-grammars-0.14.0-next.0159cd5b.tgz#96dd8704ccf1a79877ad830cbcabaa6f37e741e7" - integrity sha512-yJERT3mDZ0sYN6KbWWn4e9fAXFuAgUrYHwd6ofN6VS7RH377gRIQLNaplmWUByfaKMgzsJ0za3e0kt8JfsQMtg== + version "0.15.0-next.183ba3e5" + resolved "https://registry.yarnpkg.com/@theia/textmate-grammars/-/textmate-grammars-0.15.0-next.183ba3e5.tgz#4f1c1b15863c7c4d67442e75ceb9bdb12ea10137" + integrity sha512-3+l67XWK8tVFc8lV0bZLZvuxxEpz3VWG4ZChdlhYZQIZp3Ezv6DhfjjY5tah+NqtRqK6kqKX8vVtpbnDGt2zcA== dependencies: - "@theia/monaco" "0.14.0-next.0159cd5b" + "@theia/monaco" "0.15.0-next.183ba3e5" vscode-textmate "^4.0.1" -"@theia/userstorage@0.14.0-next.0159cd5b": - version "0.14.0-next.0159cd5b" - resolved "https://registry.yarnpkg.com/@theia/userstorage/-/userstorage-0.14.0-next.0159cd5b.tgz#532a02ca38d6dc97af37733d140ab7e69c5c10a1" - integrity sha512-MlaALLqvZQt5akZJY5JNWo+tf6u4eKLqzkfPv6BYE+rqiRA2CH8vqXQuWtQyFgd7upzSSLDRENw8yNTPW/hW8Q== +"@theia/userstorage@0.15.0-next.183ba3e5": + version "0.15.0-next.183ba3e5" + resolved "https://registry.yarnpkg.com/@theia/userstorage/-/userstorage-0.15.0-next.183ba3e5.tgz#aebf84b840e3c90379d79be99ebbe6ca0ec8887b" + integrity sha512-6pw1EvkD8SzH96d2NwC2UacK0fLNpOAoYcNLylw+EFcDhxe70ChUE2b8deQfPvyLqG0uyKJWBFbruFpmQ1SF2A== dependencies: - "@theia/core" "0.14.0-next.0159cd5b" - "@theia/filesystem" "0.14.0-next.0159cd5b" + "@theia/core" "0.15.0-next.183ba3e5" + "@theia/filesystem" "0.15.0-next.183ba3e5" -"@theia/variable-resolver@0.14.0-next.0159cd5b", "@theia/variable-resolver@next": - version "0.14.0-next.0159cd5b" - resolved "https://registry.yarnpkg.com/@theia/variable-resolver/-/variable-resolver-0.14.0-next.0159cd5b.tgz#59071299163868195ca6d745f1235e8189fd8539" - integrity sha512-OhoaqTkqNkjCQ3MBhm8R6ZzGHEYJTsLrUooNodxvnpDLgRxAgWwlG296zwxg7+MAV4pDHPD1rq5hbZA0eWuumA== +"@theia/variable-resolver@0.15.0-next.183ba3e5", "@theia/variable-resolver@next": + version "0.15.0-next.183ba3e5" + resolved "https://registry.yarnpkg.com/@theia/variable-resolver/-/variable-resolver-0.15.0-next.183ba3e5.tgz#c64f9c8b9ba9150f617487367839de719910aebb" + integrity sha512-9fC3CcfYZnpyJKvLDiVo9PeAKITZ+OOKyUww5B0GJkHPRSqGPa8f2wB9GVDT5tt7Wn2qWGCQUPV5Ojb7hQk+0A== dependencies: - "@theia/core" "0.14.0-next.0159cd5b" + "@theia/core" "0.15.0-next.183ba3e5" -"@theia/workspace@0.14.0-next.0159cd5b", "@theia/workspace@next": - version "0.14.0-next.0159cd5b" - resolved "https://registry.yarnpkg.com/@theia/workspace/-/workspace-0.14.0-next.0159cd5b.tgz#2894ca601c2a59449e48ea5b8b36f84402b88870" - integrity sha512-b+qSnC1jIWUHlS5pwI7TUb8coKjXBnnBPt4QyOUGiQfm858IqiO8zEPHPo8VHaudGLd4LRuTYfLi9kjjEqeOeA== +"@theia/workspace@0.15.0-next.183ba3e5", "@theia/workspace@next": + version "0.15.0-next.183ba3e5" + resolved "https://registry.yarnpkg.com/@theia/workspace/-/workspace-0.15.0-next.183ba3e5.tgz#b750202bfd06abd958df6adce9395073713fa53f" + integrity sha512-7k1zgMDngCAO8H+oguk9JMAhTSI/20omZ/EBaZ67edl3/moe0MDSsPMPmPWhqkOn+jnwrWmkl4NcGJuUzM2rPw== dependencies: - "@theia/core" "0.14.0-next.0159cd5b" - "@theia/filesystem" "0.14.0-next.0159cd5b" - "@theia/variable-resolver" "0.14.0-next.0159cd5b" + "@theia/core" "0.15.0-next.183ba3e5" + "@theia/filesystem" "0.15.0-next.183ba3e5" + "@theia/variable-resolver" "0.15.0-next.183ba3e5" ajv "^6.5.3" jsonc-parser "^2.0.2" moment "^2.21.0" @@ -6514,12 +6516,12 @@ find-git-exec@^0.0.2: "@types/which" "^1.3.2" which "^2.0.1" -find-git-repositories@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/find-git-repositories/-/find-git-repositories-0.1.1.tgz#2ba3374cbf6d6a8aadeb0370b86fdbb88a90e43c" - integrity sha512-v3Z6lE2+6Kat5ujOLucCGyijJ6yfv1/V7uauRYQshlSjv9177Rk3Eg8J6x2C/zAsQHJym4HHHLuOoy3Sl5KqzQ== +find-git-repositories@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/find-git-repositories/-/find-git-repositories-0.1.2.tgz#401349f543c1000d1bf5e83f12a52ecc047b6e5d" + integrity sha512-HY5YSB/COXlr1v1qA/q0FyNg80yR5aH6vUEZtEnEhXQhkPcmXpvm/GLsAcCDcfNSay1ggUCScKcUwBXy+NSgQA== dependencies: - nan "^2.0.0" + nan "^2.14.0" find-root@^1.1.0: version "1.1.0" @@ -7565,6 +7567,11 @@ icss-utils@^2.1.0: dependencies: postcss "^6.0.1" +idb@^4.0.5: + version "4.0.5" + resolved "https://registry.yarnpkg.com/idb/-/idb-4.0.5.tgz#23b930fbb0abce391e939c35b7b31a669e74041f" + integrity sha512-P+Fk9HT2h1DhXoE1YNK183SY+CRh2GHNh28de94sGwhe0bUA75JJeVJWt3SenE5p0BXK7maflIq29dl6UZHrFw== + ieee754@^1.1.4: version "1.1.13" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" From 403fdbfdc0746b817ba637cef86c9f8c09979854 Mon Sep 17 00:00:00 2001 From: Akos Kitta Date: Tue, 28 Jan 2020 10:21:46 +0100 Subject: [PATCH 2/4] Removed a few custom colors and derived them from existing ones. Fixed the color for the: - selected items in the Explorer, - warning `input`s, - set custom dialog background for the Arduino theme, - the query term matches in the command palette, and - react-select. Signed-off-by: Akos Kitta --- .gitignore | 4 +- .../browser/arduino-frontend-contribution.tsx | 175 +- .../src/browser/arduino-frontend-module.ts | 2 +- .../src/browser/components/arduino-select.tsx | 2 +- .../component-list/list-item-renderer.tsx | 2 +- .../src/browser/data/arduino.color-theme.json | 205 +- .../src/browser/style/arduino-select.css | 22 +- .../src/browser/style/board-select-dialog.css | 25 +- .../src/browser/style/index.css | 18 +- .../src/browser/style/list-widget.css | 23 +- .../src/browser/style/main.css | 27 +- .../src/browser/style/monitor.css | 3 +- .../src/browser/toolbar/arduino-toolbar.tsx | 4 +- yarn.lock | 2634 +++++++++-------- 14 files changed, 1627 insertions(+), 1519 deletions(-) diff --git a/.gitignore b/.gitignore index e5552666..45be90d0 100644 --- a/.gitignore +++ b/.gitignore @@ -6,8 +6,8 @@ downloads/ build/ !electron/build/ src-gen/ -browser-app/webpack.config.js -electron-app/webpack.config.js +*-app/*webpack.config.js +.DS_Store /workspace/static .DS_Store # switching from `electron` to `browser` in dev mode. diff --git a/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx b/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx index bf9da38b..bcdd133a 100644 --- a/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx +++ b/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx @@ -582,184 +582,29 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut registerColors(colors: ColorRegistry): void { colors.register( { - id: 'arduino.base', + id: 'arduino.branding.primary', defaults: { - dark: '#616161', - light: '#616161', - hc: '#FFFFFF' + dark: 'statusBar.background', + light: 'statusBar.background' }, - description: 'Base layout color.' + description: 'The primary branding color, such as dialog titles, library, and board manager list labels.' }, { - id: 'arduino.toolbarTooltip', + id: 'arduino.branding.secondary', defaults: { - dark: '#616161', - light: '#616161', - hc: '#FFFFFF' + dark: 'statusBar.background', + light: 'statusBar.background' }, - description: 'The color of the toolbar tooltip (shown next to the buttons).' + description: 'Secondary branding color for list selections, dropdowns, and widget borders.' }, { - id: 'arduino.editorMargin', - defaults: { - dark: '#2e2e2e', - light: '#EEEEEE', - hc: 'contrastBorder' - }, - description: 'The color of the border which separates line numbers from code area.' - }, - { - id: 'arduino.dialogTitle', - defaults: { - dark: 'foreground', - light: 'foreground', - hc: 'contrastBorder' - }, - description: 'The color of a dialog title (e.g. in board selector dialog).' - }, - { - id: 'arduino.select', - defaults: { - - }, - description: 'Color of background and border of select component (in serial monitor).' - }, - { - id: 'arduino.selectItemHoverBackground', - defaults: { - light: '#d7eaf8', - dark: '#24455e' - }, - description: 'Color of background of hovered Item in select component (in serial monitor).' - }, - { - id: 'arduino.dialogSecondaryTitle', - defaults: { - dark: '#7f8c8d', - light: '#7f8c8d' - }, - description: 'Color of secondary titles in Arduino Dialogs.' - }, - { - id: 'arduino.secondaryButtonShadow', - defaults: { - dark: '#95a5a6', - light: '#95a5a6' - }, - description: 'Color of secondary button shadow.' - }, - { - id: 'arduino.buttonShadow', - defaults: { - dark: '#006468', - light: '#006468' - }, - description: 'Color of button shadow.' - }, - { - id: 'arduino.toolbarItemForeground', - defaults: { - dark: 'button.foreground', - light: 'button.foreground' - }, - description: 'Foreground color of toolbar items.' - }, - { - id: 'arduino.boardSelectorBackground', + id: 'arduino.foreground', defaults: { dark: 'editorWidget.background', light: 'editorWidget.background', hc: 'editorWidget.background' }, - description: 'Background color of board selector toolbar item.' - }, - { - id: 'arduino.boardSelectorHoverBackground', - defaults: { - dark: '#383838', - light: '#dae2e4' - }, - description: 'Background color of board selector toolbar item.' - }, - { - id: 'arduino.boardSelectorBorder', - defaults: { - dark: '#757575', - light: '#e0e0e0' - }, - description: 'Border color of board selector toolbar item.' - }, - { - id: 'arduino.boardSelectorCheck', - defaults: { - dark: '#259fd8', - light: '#2b75c0' - }, - description: 'Color of board selector toolbar check item.' - }, - { - id: 'arduino.listOddItem', - defaults: { - dark: '#1d1d1d', - light: '#ffffff' - }, - description: 'Backgroundcolor of item with odd number in list widget' - }, - { - id: 'arduino.listEvenItem', - defaults: { - dark: '#252526', - light: '#f7f9f9' - }, - description: 'Backgroundcolor of item with even number in list widget' - }, - { - id: 'arduino.listItemHoverBackground', - defaults: { - dark: '#333333', - light: '#ececec' - }, - description: 'Backgroundcolor of hovered item in list widget' - }, - { - id: 'arduino.listItemSecondaryForeground', - defaults: { - dark: '#9e9e9e', - light: '#9e9e9e' - }, - description: 'Backgroundcolor of hovered item in list widget' - }, - { - id: 'arduino.listItemInstalledBadge', - defaults: { - dark: '#259fd8', - light: '#2b75c0' - }, - description: 'Color of badge for installed list items.' - }, - { - id: 'arduino.listItemInfoLinkForeground', - defaults: { - dark: '#2196f3', - light: '#2196f3' - }, - description: 'Color of info link in list items.' - }, - { - id: 'arduino.bottomPanelTabBackground', - defaults: { - dark: 'editorGroupHeader.tabsBackground', - light: 'editorGroupHeader.tabsBackground' - }, - description: 'Color of info link in list items.' - }, - { - id: 'arduino.toolbarToggleBackground', - defaults: { - dark: '#757575', - light: '#9e9e9e' - }, - description: 'Color of active toggles (as in serial monitor toolbar).' + description: 'Color of the Arduino Pro IDE foreground which is used for dialogs, such as the Select Board dialog.' } ); } diff --git a/arduino-ide-extension/src/browser/arduino-frontend-module.ts b/arduino-ide-extension/src/browser/arduino-frontend-module.ts index b577659a..413c9358 100644 --- a/arduino-ide-extension/src/browser/arduino-frontend-module.ts +++ b/arduino-ide-extension/src/browser/arduino-frontend-module.ts @@ -76,7 +76,7 @@ const ElementQueries = require('css-element-queries/src/ElementQueries'); MonacoThemingService.register({ id: 'arduinoTheme', - label: 'Arduino Light Theme', + label: 'Light (Arduino)', uiTheme: 'vs', json: require('../../src/browser/data/arduino.color-theme.json') }); diff --git a/arduino-ide-extension/src/browser/components/arduino-select.tsx b/arduino-ide-extension/src/browser/components/arduino-select.tsx index 402e9b6e..61078ad5 100644 --- a/arduino-ide-extension/src/browser/components/arduino-select.tsx +++ b/arduino-ide-extension/src/browser/components/arduino-select.tsx @@ -45,7 +45,7 @@ export class ArduinoSelect extends Select { // `primary50`??? it's crazy but apparently, without this, we would get a light-blueish // color when selecting an option in the select by clicking and then not releasing the button. // https://react-select.com/styles#overriding-the-theme - primary50: 'var(--theia-arduino-selectItemHoverBackground)', + primary50: 'var(--theia-list-activeSelectionBackground)', } }); const DropdownIndicator = () => ; diff --git a/arduino-ide-extension/src/browser/components/component-list/list-item-renderer.tsx b/arduino-ide-extension/src/browser/components/component-list/list-item-renderer.tsx index 50a6baaf..5f928cec 100644 --- a/arduino-ide-extension/src/browser/components/component-list/list-item-renderer.tsx +++ b/arduino-ide-extension/src/browser/components/component-list/list-item-renderer.tsx @@ -51,7 +51,7 @@ export class ListItemRenderer { const moreInfo = !!item.moreInfoLink && More info; const onClickInstall = () => install(item); const installButton = item.installable && - ; + ; const onSelectChange = (event: React.ChangeEvent) => { const version = event.target.value; diff --git a/arduino-ide-extension/src/browser/data/arduino.color-theme.json b/arduino-ide-extension/src/browser/data/arduino.color-theme.json index 87e28467..3e5078c3 100644 --- a/arduino-ide-extension/src/browser/data/arduino.color-theme.json +++ b/arduino-ide-extension/src/browser/data/arduino.color-theme.json @@ -1,91 +1,93 @@ { - "tokenColors": [ - { - "settings": { - "foreground": "#434f54" - } - }, - { - "name": "Comments", - "scope": "comment", - "settings": { - "foreground": "#95a5a6cc" - } - }, - { - "name": "Keywords Attributes", - "scope": [ - "storage", - "support", - "string.quoted.single.c" - ], - "settings": { - "foreground": "#00979D" - } - }, - { - "name": "literal", - "scope": [ - "meta.function.c", - "entity.name.function", - "meta.function-call.c" - ], - "settings": { - "foreground": "#D35400" - } - }, - { - "name": "punctuation", - "scope": [ - "punctuation.section", - "meta.function-call.c", - "meta.block.c", - "meta.function.c", - "entity.name.function.preprocessor.c", - "meta.preprocessor.macro.c" - ], - "settings": { - "foreground": "#434f54" - } - }, - { - "name": "strings", - "scope": [ - "string.quoted.double" - ], - "settings": { - "foreground": "#005C5F" - } - }, - { - "name": "meta keywords", - "scope": [ - "keyword.control", - "meta.preprocessor.c" - ], - "settings": { - "foreground": "#728E00" - } - }, - { - "name": "numeric preprocessor", - "scope": [ - "meta.preprocessor.macro.c", - "constant.numeric.preprocessor.c", - "meta.preprocessor.c" - ], - "settings": { - "foreground": "#434f54" - } - } - ], - "colors": { - "editor.background": "#FFFFFF", - "editorCursor.foreground": "#434f54", - "editor.foreground": "#434f54", - "editorWhitespace.foreground": "#BFBFBF", - "editor.lineHighlightBackground": "#434f5410", - "editor.selectionBackground": "#ffcb00", + "tokenColors": [ + { + "settings": { + "foreground": "#434f54" + } + }, + { + "name": "Comments", + "scope": "comment", + "settings": { + "foreground": "#95a5a6cc" + } + }, + { + "name": "Keywords Attributes", + "scope": [ + "storage", + "support", + "string.quoted.single.c" + ], + "settings": { + "foreground": "#00979D" + } + }, + { + "name": "literal", + "scope": [ + "meta.function.c", + "entity.name.function", + "meta.function-call.c" + ], + "settings": { + "foreground": "#D35400" + } + }, + { + "name": "punctuation", + "scope": [ + "punctuation.section", + "meta.function-call.c", + "meta.block.c", + "meta.function.c", + "entity.name.function.preprocessor.c", + "meta.preprocessor.macro.c" + ], + "settings": { + "foreground": "#434f54" + } + }, + { + "name": "strings", + "scope": [ + "string.quoted.double" + ], + "settings": { + "foreground": "#005C5F" + } + }, + { + "name": "meta keywords", + "scope": [ + "keyword.control", + "meta.preprocessor.c" + ], + "settings": { + "foreground": "#728E00" + } + }, + { + "name": "numeric preprocessor", + "scope": [ + "meta.preprocessor.macro.c", + "constant.numeric.preprocessor.c", + "meta.preprocessor.c" + ], + "settings": { + "foreground": "#434f54" + } + } + ], + "colors": { + "list.highlightForeground": "#006468", + "list.activeSelectionBackground": "#006468", + "editor.background": "#ffffff", + "editorCursor.foreground": "#434f54", + "editor.foreground": "#434f54", + "editorWhitespace.foreground": "#bfbfbf", + "editor.lineHighlightBackground": "#434f5410", + "editor.selectionBackground": "#ffcb00", "focusBorder": "#4db7bb99", "menubar.selectionBackground": "#ffffff", "menubar.selectionForeground": "#212121", @@ -95,32 +97,19 @@ "button.background": "#4db7bb", "titleBar.activeBackground": "#006468", "titleBar.activeForeground": "#ffffff", - "secondaryButton.background": "#b5c8c9", - "secondaryButton.hoverBackground": "#dae3e3", "terminal.background": "#000000", "terminal.foreground": "#e0e0e0", "dropdown.border": "#ececec", "dropdown.background": "#ececec", - "warningForeground": "#434f54", "activityBar.background": "#ececec", "activityBar.foreground": "#616161", "statusBar.background": "#006468", - "arduino.base": "#006468", - "arduino.dialogTitle": "#00979d", - "arduino.select": "#ececec", - "arduino.selectItemHoverBackground": "#4db7bb66", - "list.hoverBackground": "#ececec", - "arduino.secondaryButtonShadow": "#95a5a6", - "arduino.buttonShadow": "#006468", - "arduino.boardSelectorCheck": "#4db7bb", - "arduino.listItemInstalledBadge": "#4db7bb", - "inputValidation.warningBackground": "#ffb300", - "arduino.listItemInfoLinkForeground": "#17a1a5", - "arduino.toolbarItemForeground": "#006468", - "arduino.toolbarTooltip": "#e0e0e0", - "arduino.bottomPanelTabBackground": "#ffffff", - "arduino.toolbarToggleBackground": "#b5c8c9" - }, + "secondaryButton.background": "#b5c8c9", + "secondaryButton.hoverBackground": "#dae3e3", + "arduino.branding.primary": "#00979d", + "arduino.branding.secondary": "#b5c8c9", + "arduino.foreground": "#edf1f1" + }, "type": "light", - "name": "Arduino" -} \ No newline at end of file + "name": "Arduino" +} diff --git a/arduino-ide-extension/src/browser/style/arduino-select.css b/arduino-ide-extension/src/browser/style/arduino-select.css index 85b2fedb..25b4989b 100644 --- a/arduino-ide-extension/src/browser/style/arduino-select.css +++ b/arduino-ide-extension/src/browser/style/arduino-select.css @@ -1,10 +1,10 @@ .arduino-select__control { - border: var(--theia-arduino-select) var(--theia-border-width) solid !important; - background: var(--theia-arduino-select) !important; + border: var(--theia-sideBar-background) var(--theia-border-width) solid !important; + background: var(--theia-sideBar-background) !important; } .arduino-select__control:hover { - border: var(--theia-arduino-select) var(--theia-border-width) solid !important; + border: var(--theia-focusBorder) var(--theia-border-width) solid !important; } .arduino-select__control--is-focused { @@ -12,18 +12,24 @@ } .arduino-select__option--is-selected { - background-color: var(--theia-focusBorder) !important; - color: var(--theia-editor-foreground) !important; + background-color: var(--theia-list-activeSelectionBackground) !important; + color: var(--theia-list-activeSelectionForeground) !important; border-color: var(--theia-focusBorder) !important; } .arduino-select__option--is-focused { - background-color: var(--theia-arduino-selectItemHoverBackground) !important; + background-color: var(--theia-list-hoverBackground) !important; + border-color: var(--theia-focusBorder) !important; +} + +.arduino-select__option--is-focused.arduino-select__option--is-selected { + background-color: var(--theia-list-activeSelectionBackground) !important; + color: var(--theia-list-activeSelectionForeground) !important; border-color: var(--theia-focusBorder) !important; } .arduino-select__menu { - background-color: var(--theia-arduino-select) !important; + background-color: var(--theia-sideBar-background) !important; border: 1px solid var(--theia-focusBorder) !important; top: auto !important; /* to align the top of the menu with the bottom of the control */ box-shadow: none !important; @@ -32,7 +38,7 @@ .arduino-select__control.arduino-select__control--menu-is-open { border: 1px solid !important; border-color: var(--theia-focusBorder) !important; - border-bottom-color: var(--theia-arduino-select) !important; /* if the bottom border color has the same color as the background of the control, we make the border "invisible" */ + border-bottom-color: var(--theia-sideBar-background) !important; /* if the bottom border color has the same color as the background of the control, we make the border "invisible" */ } .arduino-select__value-container .arduino-select__single-value { diff --git a/arduino-ide-extension/src/browser/style/board-select-dialog.css b/arduino-ide-extension/src/browser/style/board-select-dialog.css index 60c24157..9833fb62 100644 --- a/arduino-ide-extension/src/browser/style/board-select-dialog.css +++ b/arduino-ide-extension/src/browser/style/board-select-dialog.css @@ -15,7 +15,7 @@ div.dialogContent.select-board-dialog > div.head .title { font-weight: 400; letter-spacing: .02em; font-size: 1.2em; - color: var(--theia-arduino-dialogTitle); + color: var(--theia-arduino-branding-primary); margin: 17px 0; } @@ -27,8 +27,8 @@ div#select-board-dialog .selectBoardContainer .body .list .item.selected { background: var(--theia-secondaryButton-hoverBackground); } -div#select-board-dialog .selectBoardContainer .body .list .item.selected i{ - color: var(--theia-arduino-base); +div#select-board-dialog .selectBoardContainer .body .list .item.selected i { + color: var(--theia-arduino-branding-primary); } #select-board-dialog .selectBoardContainer .search, @@ -79,7 +79,7 @@ div#select-board-dialog .selectBoardContainer .body .list .item.selected i{ #select-board-dialog .selectBoardContainer .body .container .content .loading { font-size: var(--theia-ui-font-size1); - color: var(--theia-arduino-dialogSecondaryTitle); + color: var(--theia-arduino-branding-secondary); padding: 10px 5px 10px 10px; text-transform: uppercase; /* The max, min-height comes from `.body .list` 265px + 47px top padding - 2 * 10px top padding */ @@ -99,7 +99,7 @@ div#select-board-dialog .selectBoardContainer .body .list .item.selected i{ #select-board-dialog .selectBoardContainer .body .list .item .detail { font-size: var(--theia-ui-font-size1); - color: var(--theia-mod-disabled-opacity); + opacity: var(--theia-mod-disabled-opacity); width: 155px; /* used heuristics for the calculation */ white-space: pre; overflow: hidden; @@ -107,7 +107,7 @@ div#select-board-dialog .selectBoardContainer .body .list .item.selected i{ } #select-board-dialog .selectBoardContainer .body .list .item.missing { - color: var(--theia-mod-disabled-opacity); + opacity: var(--theia-mod-disabled-opacity); } #select-board-dialog .selectBoardContainer .body .list .item:hover { @@ -142,12 +142,10 @@ button.theia-button { button.theia-button.secondary { background-color: var(--theia-secondaryButton-background); color: var(--theia-foreground); - box-shadow: 0 4px var(--theia-arduino-secondaryButtonShadow); } button.theia-button.main { color: var(--theia-button-foreground); - box-shadow: 0 4px var(--theia-arduino-buttonShadow); } .dialogControl { @@ -191,16 +189,17 @@ button.theia-button.main { } .arduino-boards-toolbar-item { - background: var(--theia-arduino-boardSelectorBackground); + background: var(--theia-tab-unfocusedActiveBackground); color: var(--theia-foreground); height: 22px; display: flex; width: 100%; overflow: hidden; + margin: 0px 3px 0px 3px; } .arduino-boards-dropdown-list { - border: 3px solid var(--theia-arduino-boardSelectorBorder); + border: 3px solid var(--theia-activityBar-background); margin: -3px; z-index: 1; } @@ -211,15 +210,15 @@ button.theia-button.main { padding: 10px; cursor: pointer; color: var(--theia-foreground); - background: var(--theia-arduino-boardSelectorBackground); + background: var(--theia-tab-unfocusedActiveBackground); } .arduino-boards-dropdown-item .fa-check { - color: var(--theia-arduino-boardSelectorCheck); + color: var(--theia-arduino-branding-primary); align-self: center; } .arduino-boards-dropdown-item.selected, .arduino-boards-dropdown-item:hover { - background: var(--theia-arduino-boardSelectorHoverBackground); + background: var(--theia-list-hoverBackground); } diff --git a/arduino-ide-extension/src/browser/style/index.css b/arduino-ide-extension/src/browser/style/index.css index e8690b51..2540171a 100644 --- a/arduino-ide-extension/src/browser/style/index.css +++ b/arduino-ide-extension/src/browser/style/index.css @@ -10,26 +10,26 @@ outline-style: solid; outline-offset: -1px; opacity: 1 !important; - color: var(--theia-foreground); - background-color: var(--theia-inputValidation-warningBackground); + color: var(--theia-warningForeground); + background-color: var(--theia-warningBackground); } .theia-input.warning { - background-color: var(--theia-inputValidation-warningBackground); + background-color: var(--theia-warningBackground); } .theia-input.warning::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */ - color: var(--theia-foreground); - background-color: var(--theia-inputValidation-warningBackground); + color: var(--theia-warningForeground); + background-color: var(--theia-warningBackground); opacity: 1; /* Firefox */ } .theia-input.warning:-ms-input-placeholder { /* Internet Explorer 10-11 */ - color: var(--theia-foreground); - background-color: var(--theia-inputValidation-warningBackground); + color: var(--theia-warningForeground); + background-color: var(--theia-warningBackground); } .theia-input.warning::-ms-input-placeholder { /* Microsoft Edge */ - color: var(--theia-foreground); - background-color: var(--theia-inputValidation-warningBackground); + color: var(--theia-warningForeground); + background-color: var(--theia-warningBackground); } diff --git a/arduino-ide-extension/src/browser/style/list-widget.css b/arduino-ide-extension/src/browser/style/list-widget.css index 4f85aeb8..3bc39438 100644 --- a/arduino-ide-extension/src/browser/style/list-widget.css +++ b/arduino-ide-extension/src/browser/style/list-widget.css @@ -28,15 +28,18 @@ } .filterable-list-container .items-container > div:nth-child(odd) { - background-color: var(--theia-arduino-listOddItem); + background-color: var(--theia-sideBar-background); + filter: contrast(105%); } .filterable-list-container .items-container > div:nth-child(even) { - background-color: var(--theia-arduino-listEvenItem); + background-color: var(--theia-sideBar-background); + filter: contrast(95%); } .filterable-list-container .items-container > div:hover { - background-color: var(--theia-arduino-listItemHoverBackground); + background-color: var(--theia-sideBar-background); + filter: contrast(90%); } /* Perfect scrollbar does not like if we explicitly set the `background-color` of the contained elements. @@ -74,7 +77,7 @@ https://github.com/arduino/arduino-pro-ide/issues/82 */ .component-list-item .header .author { font-weight: bold; - color: var(--theia-arduino-listItemSecondaryForeground); + color: var(--theia-panelTitle-inactiveForeground); } .component-list-item:hover .header .author { @@ -82,14 +85,18 @@ https://github.com/arduino/arduino-pro-ide/issues/82 */ } .component-list-item .header .version { - color: var(--theia-arduino-listItemSecondaryForeground); + color: var(--theia-panelTitle-inactiveForeground); +} + +.component-list-item .footer .theia-button.install { + height: auto; /* resets the default Theia button height in the filterable list widget */ } .component-list-item .header .installed:before { margin-left: 4px; display: inline-block; justify-self: end; - background-color: var(--theia-arduino-listItemInstalledBadge); + background-color: var(--theia-button-background); padding: 2px 4px 2px 4px; font-size: 10px; font-weight: bold; @@ -100,7 +107,7 @@ https://github.com/arduino/arduino-pro-ide/issues/82 */ .component-list-item .header .installed:hover:before { background-color: var(--theia-button-foreground); - color: var(--theia-arduino-listItemInstalledBadge); + color: var(--theia-button-background); content: 'UNINSTALL'; } @@ -131,7 +138,7 @@ https://github.com/arduino/arduino-pro-ide/issues/82 */ } .component-list-item .info a { - color: var(--theia-arduino-listItemInfoLinkForeground); + color: var(--theia-button-background); text-decoration: none; } diff --git a/arduino-ide-extension/src/browser/style/main.css b/arduino-ide-extension/src/browser/style/main.css index a99fdbff..1f62e515 100644 --- a/arduino-ide-extension/src/browser/style/main.css +++ b/arduino-ide-extension/src/browser/style/main.css @@ -2,10 +2,6 @@ background: var(--theia-editorGroupHeader-tabsBackground); } -#theia-bottom-content-panel .p-TabBar-tab { - background: var(--theia-arduino-bottomPanelTabBackground); -} - .theia-output { background: var(--theia-terminal-background); color: var(--theia-terminal-foreground); @@ -39,8 +35,7 @@ .arduino-tool-icon { height: 24px; width: 24px; - color: var(--theia-arduino-toolbarItemForeground); - background: var(--theia-arduino-toolbarItemForeground); + background-color: var(--theia-titleBar-activeBackground); -webkit-mask: url(../icons/mask-buttons.svg); mask: url(../icons/mask-buttons.svg); -webkit-mask-size: 800%; @@ -82,6 +77,14 @@ z-index: 0; } +#theia-top-panel .p-TabBar-toolbar { + padding-left: 4px !important; /* moves the `verify`, upload and other toolbar items to the left */ +} + +.p-Widget .p-MenuBar { + padding-left: 1px !important; /* moves the menubar: `File`, `Edit`, etc to the left */ +} + #theia-top-panel .p-TabBar-toolbar.theia-arduino-toolbar.right { justify-content: flex-start; min-width: 190px; @@ -96,7 +99,7 @@ margin-left: 10px; display: flex; align-items: center; - color: var(--theia-arduino-toolbarTooltip); + color: var(--theia-titleBar-activeForeground); } .p-TabBar-toolbar .item > div.arduino-toggle-advanced-mode { @@ -114,11 +117,11 @@ display: flex; justify-content: center; align-items: center; - color: var(--theia-arduino-toolbarItemForeground); + color: var(--theia-titleBar-activeBackground);; } .monaco-editor .margin { - border-right: 2px solid var(--theia-arduino-editorMargin); + border-right: 2px solid var(--theia-sideBar-background); box-sizing: border-box; } @@ -130,4 +133,8 @@ .theia-sidepanel-toolbar .theia-sidepanel-title { margin-left: 10px; -} \ No newline at end of file +} + +.p-Widget.dialogOverlay .dialogBlock { + background-color: var(--theia-arduino-foreground); +} diff --git a/arduino-ide-extension/src/browser/style/monitor.css b/arduino-ide-extension/src/browser/style/monitor.css index fcb73978..f17afa98 100644 --- a/arduino-ide-extension/src/browser/style/monitor.css +++ b/arduino-ide-extension/src/browser/style/monitor.css @@ -54,7 +54,8 @@ } .p-TabBar-toolbar .item.arduino-monitor.toggled { - background: var(--theia-arduino-toolbarToggleBackground); + background: var(--theia-sideBarSectionHeader-background); + filter: contrast(80%); } .p-TabBar-toolbar .item .clear-all { diff --git a/arduino-ide-extension/src/browser/toolbar/arduino-toolbar.tsx b/arduino-ide-extension/src/browser/toolbar/arduino-toolbar.tsx index 91fbadc9..88a6ed3a 100644 --- a/arduino-ide-extension/src/browser/toolbar/arduino-toolbar.tsx +++ b/arduino-ide-extension/src/browser/toolbar/arduino-toolbar.tsx @@ -39,7 +39,7 @@ export class ArduinoToolbarComponent extends React.Component
= 8" @@ -1687,18 +1797,19 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd" integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow== -"@theia/application-manager@0.15.0-next.183ba3e5": - version "0.15.0-next.183ba3e5" - resolved "https://registry.yarnpkg.com/@theia/application-manager/-/application-manager-0.15.0-next.183ba3e5.tgz#6ee416d7dfa8fe3309dc0b47402ff7efd99a1cda" - integrity sha512-8MjrYnVXtCTbna8W/mcXdgOlQJjHMZXC9Cxu0oL5DWHwZhE/qgdz9uousiBGrdSJ8DT+WQ/I+SgTkS6cFuhUPQ== +"@theia/application-manager@0.15.0-next.9a2bc81e": + version "0.15.0-next.9a2bc81e" + resolved "https://registry.yarnpkg.com/@theia/application-manager/-/application-manager-0.15.0-next.9a2bc81e.tgz#6fa4c08a27e525f24a5f7a99b2ef321d0f37f053" + integrity sha512-AK/Uo6OJMcyc1vrvjr12MIcXZVMIsdSnnHUQxDR0DDbShDIm39bi/0aHo1ZYl7vn8A/heumnLcAEoVNJhaiJbQ== dependencies: "@babel/core" "^7.5.5" "@babel/plugin-transform-classes" "^7.5.5" "@babel/plugin-transform-runtime" "^7.5.5" "@babel/preset-env" "^7.5.5" - "@theia/application-package" "0.15.0-next.183ba3e5" + "@theia/application-package" "0.15.0-next.9a2bc81e" "@theia/compression-webpack-plugin" "^3.0.0" "@types/fs-extra" "^4.0.2" + "@types/webpack" "^4.41.2" babel-loader "^8.0.6" circular-dependency-plugin "^5.0.0" copy-webpack-plugin "^4.5.0" @@ -1718,10 +1829,10 @@ webpack-cli "2.0.12" worker-loader "^1.1.1" -"@theia/application-package@0.15.0-next.183ba3e5", "@theia/application-package@next": - version "0.15.0-next.183ba3e5" - resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-0.15.0-next.183ba3e5.tgz#50e66311c9447abe1eea52fb5e1110780d35fe6b" - integrity sha512-/XmOt/ZG8BcxjMfreV9trTJFaKI/iezhzRLRLvw3J8anT3cxqiktE+jeDtYpQ1fbpElQZiLUz8RKLl+xqDVY+g== +"@theia/application-package@0.15.0-next.9a2bc81e", "@theia/application-package@next": + version "0.15.0-next.9a2bc81e" + resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-0.15.0-next.9a2bc81e.tgz#922a676fb2d2bc8d57ea003f79f2cb236f27f386" + integrity sha512-6Zdt3c1utzGNoJ03N6BOjZ7VsD+EMiW12GsYpOsN1Y2nNKZ+hHFBB7Y2EH9rLv8VicvTOWhU5XGBW3nR9f3nJA== dependencies: "@types/fs-extra" "^4.0.2" "@types/request" "^2.0.3" @@ -1735,12 +1846,26 @@ write-json-file "^2.2.0" "@theia/cli@next": - version "0.15.0-next.183ba3e5" - resolved "https://registry.yarnpkg.com/@theia/cli/-/cli-0.15.0-next.183ba3e5.tgz#a8d495c73861f4e893efcdbaf585faf23ff27685" - integrity sha512-xX/jGib2eO/+uLEwQYLKFkwr5RRzTl7g9ZjCgqGz/Yw4pKsnWJ0jP25Xrni5x2f5dqXtyB8415YWCa/cH8b4ng== + version "0.15.0-next.9a2bc81e" + resolved "https://registry.yarnpkg.com/@theia/cli/-/cli-0.15.0-next.9a2bc81e.tgz#419eccd315c0e370b2af13e14a977957b9a0db3f" + integrity sha512-Hvk6ATsu6JlXj/6sNgeTrDGj3C+ecBNP4huWkXtFH4uqQlcqKHO+O1/+ALuVwymNqRP0f5nPPlGH7RBgbs/kDg== dependencies: - "@theia/application-manager" "0.15.0-next.183ba3e5" - "@theia/application-package" "0.15.0-next.183ba3e5" + "@theia/application-manager" "0.15.0-next.9a2bc81e" + "@theia/application-package" "0.15.0-next.9a2bc81e" + "@types/chai" "^4.2.7" + "@types/mkdirp" "^0.5.2" + "@types/mocha" "^5.2.7" + "@types/puppeteer" "^2.0.0" + "@types/requestretry" "^1.12.3" + "@types/tar" "^4.0.3" + chai "^4.2.0" + mkdirp "^0.5.0" + mocha "^7.0.0" + puppeteer "^2.0.0" + puppeteer-to-istanbul "^1.2.2" + requestretry "^3.1.0" + tar "^4.0.0" + unzip-stream "^0.3.0" yargs "^11.1.0" "@theia/compression-webpack-plugin@^3.0.0": @@ -1755,15 +1880,15 @@ serialize-javascript "^1.4.0" webpack-sources "^1.0.1" -"@theia/core@0.15.0-next.183ba3e5", "@theia/core@next": - version "0.15.0-next.183ba3e5" - resolved "https://registry.yarnpkg.com/@theia/core/-/core-0.15.0-next.183ba3e5.tgz#b65552acf3d1ed62e09771d9af617b4f6be09177" - integrity sha512-p5Tr/rgrjYN7m0CR1L4ARs/n0bZNB0ltVjyMnJ98A8WSy9DYEZrui/Iohb6kB7/AmgYg2PofUloVE7FTCCbsVQ== +"@theia/core@0.15.0-next.9a2bc81e", "@theia/core@next": + version "0.15.0-next.9a2bc81e" + resolved "https://registry.yarnpkg.com/@theia/core/-/core-0.15.0-next.9a2bc81e.tgz#05a09cc3abd79be4e7894f5787e3f3c61ab9aa01" + integrity sha512-zKqLiKTn19GyYwfMQ22mxBTdQt2CRQUoMTVazcCdxvAt2FZ08Eakb6ZWVxvcBS8qxflDR2bf//TIjQgNaIwqrA== dependencies: "@babel/runtime" "^7.5.5" "@phosphor/widgets" "^1.9.3" "@primer/octicons-react" "^9.0.0" - "@theia/application-package" "0.15.0-next.183ba3e5" + "@theia/application-package" "0.15.0-next.9a2bc81e" "@types/body-parser" "^1.16.4" "@types/express" "^4.16.0" "@types/fs-extra" "^4.0.2" @@ -1817,21 +1942,21 @@ "@theia/workspace" next string-argv "^0.1.1" -"@theia/editor@0.15.0-next.183ba3e5", "@theia/editor@next": - version "0.15.0-next.183ba3e5" - resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-0.15.0-next.183ba3e5.tgz#185753c8e673318f2e7825b545055f2254332fdb" - integrity sha512-g0QwBFCN0PHuCw8TegQ4aQhWuY5uVFe0hjcdz26ptl/pnIG8UgcjR0DFsJDYve0OmjHv/9q94PLKj6JynvxDEw== +"@theia/editor@0.15.0-next.9a2bc81e", "@theia/editor@next": + version "0.15.0-next.9a2bc81e" + resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-0.15.0-next.9a2bc81e.tgz#8d7e8b966ef41a30602b02e0e84d95bcc419d1ed" + integrity sha512-5hDazrTkOSRwdtZuHdWaaGF8OJ2K/J8CAsZzpk2/y+nR3mvMLJRj2EQ5LYBWs3ErSo17onPep7W8zxEtOdmQoQ== dependencies: - "@theia/core" "0.15.0-next.183ba3e5" - "@theia/languages" "0.15.0-next.183ba3e5" - "@theia/variable-resolver" "0.15.0-next.183ba3e5" + "@theia/core" "0.15.0-next.9a2bc81e" + "@theia/languages" "0.15.0-next.9a2bc81e" + "@theia/variable-resolver" "0.15.0-next.9a2bc81e" "@types/base64-arraybuffer" "0.1.0" base64-arraybuffer "^0.1.5" "@theia/electron@next": - version "0.15.0-next.183ba3e5" - resolved "https://registry.yarnpkg.com/@theia/electron/-/electron-0.15.0-next.183ba3e5.tgz#94fdcceb9d5a92fe3518b15773af7df8adee2c3d" - integrity sha512-ct5Nx3s4viJ+Sja2t18CuSqocO3GgpSZUg7BEF5FlHgRfO/U3gaZE2HRng3TgW2XF6ki+LsvQ2rdLaXQW10NLw== + version "0.15.0-next.9a2bc81e" + resolved "https://registry.yarnpkg.com/@theia/electron/-/electron-0.15.0-next.9a2bc81e.tgz#b8f1271b19fd14986903e7f27e5fd6b14c2a09b6" + integrity sha512-H7PtimxXYYAM50nRYUbxfQDl/zN3xip32FTmJgSBH+UjOEfiJGVm24U31MFlqkakqXBhA7RJEtCFWyHEclmo6Q== dependencies: electron "^4.2.11" electron-download "^4.1.1" @@ -1843,25 +1968,25 @@ yargs "^11.1.0" "@theia/file-search@next": - version "0.15.0-next.183ba3e5" - resolved "https://registry.yarnpkg.com/@theia/file-search/-/file-search-0.15.0-next.183ba3e5.tgz#5a86464489ee0a18030b99ffb78b67950811f658" - integrity sha512-qJ4wfwh9pmSqOpqC91jo3DDtsaPsvwY4MYXJiLEyntPNwzoRxQyhmlCo8X2mxJYnjl/fAB4xTm0GLvg+FWx1uA== + version "0.15.0-next.9a2bc81e" + resolved "https://registry.yarnpkg.com/@theia/file-search/-/file-search-0.15.0-next.9a2bc81e.tgz#56a683b73e05a8171753d1c116d8b4b660852c63" + integrity sha512-/+upUXm9Qb75LynKKoIgU44jOgWfbjb4DSa6qRSAcT/0cfcXyJgBTB+HtHT7a/mvjsULBGJhnIkcRNVZ1x0+IQ== dependencies: - "@theia/core" "0.15.0-next.183ba3e5" - "@theia/editor" "0.15.0-next.183ba3e5" - "@theia/filesystem" "0.15.0-next.183ba3e5" - "@theia/process" "0.15.0-next.183ba3e5" - "@theia/workspace" "0.15.0-next.183ba3e5" + "@theia/core" "0.15.0-next.9a2bc81e" + "@theia/editor" "0.15.0-next.9a2bc81e" + "@theia/filesystem" "0.15.0-next.9a2bc81e" + "@theia/process" "0.15.0-next.9a2bc81e" + "@theia/workspace" "0.15.0-next.9a2bc81e" fuzzy "^0.1.3" vscode-ripgrep "^1.2.4" -"@theia/filesystem@0.15.0-next.183ba3e5", "@theia/filesystem@next": - version "0.15.0-next.183ba3e5" - resolved "https://registry.yarnpkg.com/@theia/filesystem/-/filesystem-0.15.0-next.183ba3e5.tgz#e3a877f8a54f32f24cdeb1cfad3f3e136b935a82" - integrity sha512-e+3TcEDM+HrM16kSKfTyYBDKzE/C0S94EPpLIrVTdvJx3yNk2nixkmiP+VHtrWtSKKWf5p5ONyBpSKZK3WXxNQ== +"@theia/filesystem@0.15.0-next.9a2bc81e", "@theia/filesystem@next": + version "0.15.0-next.9a2bc81e" + resolved "https://registry.yarnpkg.com/@theia/filesystem/-/filesystem-0.15.0-next.9a2bc81e.tgz#d4562a35d3ab3cf145c8f43c32e95d16519259f1" + integrity sha512-eofVfU8/IeF8+1ZLUHkn05xmB5RMMIUYyxLzfznCiaIvruBT10dT/UvYpgTlyMUxXzytgSodxVwVwu0vZJeC1A== dependencies: - "@theia/application-package" "0.15.0-next.183ba3e5" - "@theia/core" "0.15.0-next.183ba3e5" + "@theia/application-package" "0.15.0-next.9a2bc81e" + "@theia/core" "0.15.0-next.9a2bc81e" "@types/body-parser" "^1.17.0" "@types/rimraf" "^2.0.2" "@types/tar-fs" "^1.16.1" @@ -1882,17 +2007,17 @@ zip-dir "^1.0.2" "@theia/git@next": - version "0.15.0-next.183ba3e5" - resolved "https://registry.yarnpkg.com/@theia/git/-/git-0.15.0-next.183ba3e5.tgz#d9ff1d5f506a1738d906d294863330e8e79745af" - integrity sha512-WPTWicpG7OQWkkXdf7yHNNAaB7Gk2Omg46DmDCIZSh6P3WGn3Fo12tkWPKF3aRs4rbU9WMgl9S3zmwxJ/bFG9w== + version "0.15.0-next.9a2bc81e" + resolved "https://registry.yarnpkg.com/@theia/git/-/git-0.15.0-next.9a2bc81e.tgz#4e02d2454c903913b51364306a380c82e0484f6f" + integrity sha512-ydLE1H+pCzyTXv8dYQdkcRh6wCCBX14U7Lfsj+wjpzrQX77N8N+86XAkG679Zvp65mUGSZmaikMNpC7CnQtMSw== dependencies: - "@theia/core" "0.15.0-next.183ba3e5" - "@theia/editor" "0.15.0-next.183ba3e5" - "@theia/filesystem" "0.15.0-next.183ba3e5" - "@theia/languages" "0.15.0-next.183ba3e5" - "@theia/navigator" "0.15.0-next.183ba3e5" - "@theia/scm" "0.15.0-next.183ba3e5" - "@theia/workspace" "0.15.0-next.183ba3e5" + "@theia/core" "0.15.0-next.9a2bc81e" + "@theia/editor" "0.15.0-next.9a2bc81e" + "@theia/filesystem" "0.15.0-next.9a2bc81e" + "@theia/languages" "0.15.0-next.9a2bc81e" + "@theia/navigator" "0.15.0-next.9a2bc81e" + "@theia/scm" "0.15.0-next.9a2bc81e" + "@theia/workspace" "0.15.0-next.9a2bc81e" "@types/diff" "^3.2.2" "@types/p-queue" "^2.3.1" diff "^3.4.0" @@ -1904,65 +2029,54 @@ p-queue "^2.4.2" ts-md5 "^1.2.2" -"@theia/json@0.15.0-next.183ba3e5": - version "0.15.0-next.183ba3e5" - resolved "https://registry.yarnpkg.com/@theia/json/-/json-0.15.0-next.183ba3e5.tgz#e11c38bd85410b229320e43379d38250c5db1687" - integrity sha512-jUDn+/pkUh+hb6aE/ToL7BljoWTIOsjwNv0cPJbvU+0JXSEb4e1poZE9RU6aYo21AfQqp6vFstEzzaLqEKaTWQ== +"@theia/languages@0.15.0-next.9a2bc81e", "@theia/languages@next": + version "0.15.0-next.9a2bc81e" + resolved "https://registry.yarnpkg.com/@theia/languages/-/languages-0.15.0-next.9a2bc81e.tgz#83ae99e3b1352782b8c99a31e5de0eb290fcdec7" + integrity sha512-seVgHk6ZUt1EeH3teaCcV7tCj40L+MJup7nWa/dSlbC2BJgIbW1XEjIS4VhqBlglbRjSUbqBt552LEJSJrRwFg== dependencies: - "@theia/application-package" "0.15.0-next.183ba3e5" - "@theia/core" "0.15.0-next.183ba3e5" - "@theia/languages" "0.15.0-next.183ba3e5" - "@theia/monaco" "0.15.0-next.183ba3e5" - vscode-json-languageserver "^1.2.1" - -"@theia/languages@0.15.0-next.183ba3e5", "@theia/languages@next": - version "0.15.0-next.183ba3e5" - resolved "https://registry.yarnpkg.com/@theia/languages/-/languages-0.15.0-next.183ba3e5.tgz#b6a5391c44bd299bfb4a8ec1af163fdf3079e201" - integrity sha512-M2x1zgvHyOLQVX7CGtk6rNxVpUsNbt8JlALv8RL+EbYRn1UvEu247+cV8uGkuuGLD22H7Drbkm0SQnXNcOH9Bw== - dependencies: - "@theia/application-package" "0.15.0-next.183ba3e5" - "@theia/core" "0.15.0-next.183ba3e5" - "@theia/output" "0.15.0-next.183ba3e5" - "@theia/process" "0.15.0-next.183ba3e5" - "@theia/workspace" "0.15.0-next.183ba3e5" + "@theia/application-package" "0.15.0-next.9a2bc81e" + "@theia/core" "0.15.0-next.9a2bc81e" + "@theia/output" "0.15.0-next.9a2bc81e" + "@theia/process" "0.15.0-next.9a2bc81e" + "@theia/workspace" "0.15.0-next.9a2bc81e" "@typefox/monaco-editor-core" "^0.18.0-next" "@types/uuid" "^3.4.3" monaco-languageclient "^0.10.2" uuid "^3.2.1" -"@theia/markers@0.15.0-next.183ba3e5", "@theia/markers@next": - version "0.15.0-next.183ba3e5" - resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-0.15.0-next.183ba3e5.tgz#4a51c30b71a415693dcd231e7982453c064b38b1" - integrity sha512-pRCiSi7+O5BwJddWVrrNuEFaOSHyJ+tekSH1TrBkVrb5WrEZ7xOyyUzVYxLlogTt4JZiezCPd4Rqdf0x0tUmIg== +"@theia/markers@0.15.0-next.9a2bc81e", "@theia/markers@next": + version "0.15.0-next.9a2bc81e" + resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-0.15.0-next.9a2bc81e.tgz#94b867404bd93d79d6f84bfeaed458e1821515ce" + integrity sha512-V3ob6/nN9tJ6DIKSM6RLdvRAVCfUfq7Gk8pb+E0rQzM5nAUEWUFFvTqRCUjGb0/sGoH9ZcPkwV6Gr5bN4XoZVA== dependencies: - "@theia/core" "0.15.0-next.183ba3e5" - "@theia/filesystem" "0.15.0-next.183ba3e5" - "@theia/navigator" "0.15.0-next.183ba3e5" - "@theia/workspace" "0.15.0-next.183ba3e5" + "@theia/core" "0.15.0-next.9a2bc81e" + "@theia/filesystem" "0.15.0-next.9a2bc81e" + "@theia/navigator" "0.15.0-next.9a2bc81e" + "@theia/workspace" "0.15.0-next.9a2bc81e" "@theia/messages@next": - version "0.15.0-next.183ba3e5" - resolved "https://registry.yarnpkg.com/@theia/messages/-/messages-0.15.0-next.183ba3e5.tgz#e29cb5e62c4adfa478589f1109a43341dbc685b9" - integrity sha512-Tsj+uox6sXYl1rxDkS50MCjQpNFT/ye1KbyN/08Z5nJLNUYZ926zKPnKA1ACmKLM9DhUtrstq8gogeGlixh9kQ== + version "0.15.0-next.9a2bc81e" + resolved "https://registry.yarnpkg.com/@theia/messages/-/messages-0.15.0-next.9a2bc81e.tgz#3a114f15a00336e2a2c9ecdc48691851880d7add" + integrity sha512-zV02O2bScEZDuQGSgEJneVCa7ua2yxeJUlR0kmR5trfa47hVr8rk/X9eIstSNncxPXIFLN+cw6bs8MuYJqW6uQ== dependencies: - "@theia/core" "0.15.0-next.183ba3e5" + "@theia/core" "0.15.0-next.9a2bc81e" lodash.throttle "^4.1.1" markdown-it "^8.4.0" react-perfect-scrollbar "^1.5.3" ts-md5 "^1.2.2" -"@theia/monaco@0.15.0-next.183ba3e5", "@theia/monaco@next": - version "0.15.0-next.183ba3e5" - resolved "https://registry.yarnpkg.com/@theia/monaco/-/monaco-0.15.0-next.183ba3e5.tgz#8be196311418e3c9fc0da3f78535695dcf8751d6" - integrity sha512-yv3LN98k06OeLIMTojp6ppby/SQwHS2TDY8czq6wtU3dUVL2K2AnErZyZSgFIB/OvOewAJ0ULXPTzffyaARkUw== +"@theia/monaco@0.15.0-next.9a2bc81e", "@theia/monaco@next": + version "0.15.0-next.9a2bc81e" + resolved "https://registry.yarnpkg.com/@theia/monaco/-/monaco-0.15.0-next.9a2bc81e.tgz#c5e49f4dc2c2a8c205e33e367201acf8eb18e9a0" + integrity sha512-DAGu0h5Et1dNS2ywW5EhAbjXFUNNC3G27pIeKYnKX+xQIEUtWV7fZQoz50vYJ+8L0bh4ufQFCOWVdzgzteUBGw== dependencies: - "@theia/core" "0.15.0-next.183ba3e5" - "@theia/editor" "0.15.0-next.183ba3e5" - "@theia/filesystem" "0.15.0-next.183ba3e5" - "@theia/languages" "0.15.0-next.183ba3e5" - "@theia/markers" "0.15.0-next.183ba3e5" - "@theia/outline-view" "0.15.0-next.183ba3e5" - "@theia/workspace" "0.15.0-next.183ba3e5" + "@theia/core" "0.15.0-next.9a2bc81e" + "@theia/editor" "0.15.0-next.9a2bc81e" + "@theia/filesystem" "0.15.0-next.9a2bc81e" + "@theia/languages" "0.15.0-next.9a2bc81e" + "@theia/markers" "0.15.0-next.9a2bc81e" + "@theia/outline-view" "0.15.0-next.9a2bc81e" + "@theia/workspace" "0.15.0-next.9a2bc81e" deepmerge "2.0.1" fast-plist "^0.1.2" idb "^4.0.5" @@ -1972,14 +2086,14 @@ onigasm "2.2.1" vscode-textmate "^4.0.1" -"@theia/navigator@0.15.0-next.183ba3e5", "@theia/navigator@next": - version "0.15.0-next.183ba3e5" - resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-0.15.0-next.183ba3e5.tgz#503b935ae7b1f6a9e450cbcd8402546558a1a25f" - integrity sha512-vb2jvrENps/wqNO+tTC4rzfHJzewwXeYqx3eyr2SVQcEHHLCA1HlaB0uQUJl4jGs8DYwyG0Fy1VlANgINI4DAw== +"@theia/navigator@0.15.0-next.9a2bc81e", "@theia/navigator@next": + version "0.15.0-next.9a2bc81e" + resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-0.15.0-next.9a2bc81e.tgz#852342d737bb9a8e519feac2c47c2526f9212cce" + integrity sha512-629wC/1Kj2ji45i11sS1kGh6CNORMJmdVgzCqM5zFTARRgx/cb8wBUqjXCMYT/csmor4OGeaeLzxRvjQ3Nq8FA== dependencies: - "@theia/core" "0.15.0-next.183ba3e5" - "@theia/filesystem" "0.15.0-next.183ba3e5" - "@theia/workspace" "0.15.0-next.183ba3e5" + "@theia/core" "0.15.0-next.9a2bc81e" + "@theia/filesystem" "0.15.0-next.9a2bc81e" + "@theia/workspace" "0.15.0-next.9a2bc81e" fuzzy "^0.1.3" minimatch "^3.0.4" @@ -1990,52 +2104,51 @@ dependencies: nan "2.10.0" -"@theia/outline-view@0.15.0-next.183ba3e5", "@theia/outline-view@next": - version "0.15.0-next.183ba3e5" - resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-0.15.0-next.183ba3e5.tgz#9b27679bee377e7851d6c41fde54cd73cff002c7" - integrity sha512-Fts/F9PjOnkBhfAZYjlmzab5OiJLK8s02KuYWoKp7UdjaZ5qlP/JLCcLeT2GGuwHJhjPdc+MnXSkKYxjhGZ3bw== +"@theia/outline-view@0.15.0-next.9a2bc81e", "@theia/outline-view@next": + version "0.15.0-next.9a2bc81e" + resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-0.15.0-next.9a2bc81e.tgz#a423f3d877f0149b0b14a3e7ba5659d56a58e900" + integrity sha512-xtjQe4eXaA+bUMRVRqqJ3Tvt6JfekfIg2LALUqY/TltyleSY/IYlt52cQFSIHnqWBaPWcarvLJug/esTvvtEaQ== dependencies: - "@theia/core" "0.15.0-next.183ba3e5" + "@theia/core" "0.15.0-next.9a2bc81e" -"@theia/output@0.15.0-next.183ba3e5": - version "0.15.0-next.183ba3e5" - resolved "https://registry.yarnpkg.com/@theia/output/-/output-0.15.0-next.183ba3e5.tgz#3dec9eca696e703d0a5b0efaac9d00ff96eba2d9" - integrity sha512-yXkRZnbZ2mo3/lPYyXCfZTgalRL+B1j89u/4hnAcjBRAiYgtpJ7DOMhBi24C21N7Sk7G0hF06iNjTkr9Kuvxxg== +"@theia/output@0.15.0-next.9a2bc81e": + version "0.15.0-next.9a2bc81e" + resolved "https://registry.yarnpkg.com/@theia/output/-/output-0.15.0-next.9a2bc81e.tgz#e7d979a80b5481106c8f1c13e4f01b1a8cdfac59" + integrity sha512-eib6ol6n3bNCWcd2of0EyJdvNmlYKgXu+pjJhi6D8mpWHXuiEnUOOBr8DlGOuBG/5TpA+je7pLa0L9xPqEXvsg== dependencies: - "@theia/core" "0.15.0-next.183ba3e5" + "@theia/core" "0.15.0-next.9a2bc81e" -"@theia/preferences@0.15.0-next.183ba3e5", "@theia/preferences@next": - version "0.15.0-next.183ba3e5" - resolved "https://registry.yarnpkg.com/@theia/preferences/-/preferences-0.15.0-next.183ba3e5.tgz#e78f6119b854bca4227929b876468353e4265962" - integrity sha512-4KEMxvF6PmUNtJ8OWK4Yg8kjvueAFc+nuoZ1/t745haSoX91X0zfp08uUL+yTNjO8nFJP1lJXGL73wBfDlXFJw== +"@theia/preferences@0.15.0-next.9a2bc81e", "@theia/preferences@next": + version "0.15.0-next.9a2bc81e" + resolved "https://registry.yarnpkg.com/@theia/preferences/-/preferences-0.15.0-next.9a2bc81e.tgz#f9bb3f24f38518b320e4edb510d1ad8b40fc0b2c" + integrity sha512-1CknZsBrB9MVcVrK/IoM02upegp3FX3MxanOvDSJVQaL6kRa/8TnRhhxh1HdxruscU2udOtXDL0sXG7vP9kZ8Q== dependencies: - "@theia/core" "0.15.0-next.183ba3e5" - "@theia/editor" "0.15.0-next.183ba3e5" - "@theia/filesystem" "0.15.0-next.183ba3e5" - "@theia/json" "0.15.0-next.183ba3e5" - "@theia/monaco" "0.15.0-next.183ba3e5" - "@theia/userstorage" "0.15.0-next.183ba3e5" - "@theia/workspace" "0.15.0-next.183ba3e5" + "@theia/core" "0.15.0-next.9a2bc81e" + "@theia/editor" "0.15.0-next.9a2bc81e" + "@theia/filesystem" "0.15.0-next.9a2bc81e" + "@theia/monaco" "0.15.0-next.9a2bc81e" + "@theia/userstorage" "0.15.0-next.9a2bc81e" + "@theia/workspace" "0.15.0-next.9a2bc81e" jsonc-parser "^2.0.2" -"@theia/process@0.15.0-next.183ba3e5", "@theia/process@next": - version "0.15.0-next.183ba3e5" - resolved "https://registry.yarnpkg.com/@theia/process/-/process-0.15.0-next.183ba3e5.tgz#0acbef020b02389781bc633c55051b6498f85e93" - integrity sha512-aJsu332NMN/++Gg573kZIwuR8PMuL+PCUEULxPOV5emTW52CiCyR0xpKKcNRWlawo3eHdPBlX+zXZnV8oa6xwA== +"@theia/process@0.15.0-next.9a2bc81e", "@theia/process@next": + version "0.15.0-next.9a2bc81e" + resolved "https://registry.yarnpkg.com/@theia/process/-/process-0.15.0-next.9a2bc81e.tgz#fa95798c209e8f240fd416aba94cdff3f5679a92" + integrity sha512-vsM+AfxcvY8mwPeGUtITnsTQmY7c4GAbf9hnPM7WGaZFe3cUJaeve9AOkozaRDDyww7QmKH4XYmL4U8ECYjztw== dependencies: - "@theia/core" "0.15.0-next.183ba3e5" + "@theia/core" "0.15.0-next.9a2bc81e" "@theia/node-pty" "0.7.8-theia004" string-argv "^0.1.1" -"@theia/scm@0.15.0-next.183ba3e5": - version "0.15.0-next.183ba3e5" - resolved "https://registry.yarnpkg.com/@theia/scm/-/scm-0.15.0-next.183ba3e5.tgz#ea4910cb2ae9d30023fb69a4980fe8df5999f4c9" - integrity sha512-ioKrUl5A7Dq7/5Uj9DcUIdHWf0KLPSJrs/G3OBGxub8rX0luVV/jcDRhl3/j4/zARoTMqH6+aMPbymPNmVzpEA== +"@theia/scm@0.15.0-next.9a2bc81e": + version "0.15.0-next.9a2bc81e" + resolved "https://registry.yarnpkg.com/@theia/scm/-/scm-0.15.0-next.9a2bc81e.tgz#3bdc92c21af3a6f9dd7855fcc002f6b4d404966b" + integrity sha512-GdNueXXbzS2zZMhhhDM8eHW9ViP7h2OPLNL54yv54pxbZFM+4tiTqdYBrAYkK1GPH6yWgAkLsw0zzI90yQFr2g== dependencies: - "@theia/core" "0.15.0-next.183ba3e5" - "@theia/editor" "0.15.0-next.183ba3e5" - "@theia/filesystem" "0.15.0-next.183ba3e5" - "@theia/navigator" "0.15.0-next.183ba3e5" + "@theia/core" "0.15.0-next.9a2bc81e" + "@theia/editor" "0.15.0-next.9a2bc81e" + "@theia/filesystem" "0.15.0-next.9a2bc81e" + "@theia/navigator" "0.15.0-next.9a2bc81e" "@types/diff" "^3.2.2" "@types/p-debounce" "^1.0.1" diff "^3.4.0" @@ -2044,81 +2157,81 @@ ts-md5 "^1.2.2" "@theia/search-in-workspace@next": - version "0.15.0-next.183ba3e5" - resolved "https://registry.yarnpkg.com/@theia/search-in-workspace/-/search-in-workspace-0.15.0-next.183ba3e5.tgz#381f9830c3b63ecfc571ff446a057b576c95c21a" - integrity sha512-QTRA9UvW58h5/0B9mTofuLh/HHtQsn4nVjmmR0YCBeFbJbRTTAAb7dGFKA8vmBZsgidV34auGwhKJg6msQqMHw== + version "0.15.0-next.9a2bc81e" + resolved "https://registry.yarnpkg.com/@theia/search-in-workspace/-/search-in-workspace-0.15.0-next.9a2bc81e.tgz#99d33319ac9d29ad537942a0a185e2c888f97e19" + integrity sha512-GxWg/GJO/ZHd5KbLL6xlHw67m9sfHPdd3wkCWvhordvxKoSeuJqd/Wr/zmkAPN1eANMFuzMnx6HGIE8UKeLQIg== dependencies: - "@theia/core" "0.15.0-next.183ba3e5" - "@theia/editor" "0.15.0-next.183ba3e5" - "@theia/filesystem" "0.15.0-next.183ba3e5" - "@theia/navigator" "0.15.0-next.183ba3e5" - "@theia/process" "0.15.0-next.183ba3e5" - "@theia/workspace" "0.15.0-next.183ba3e5" + "@theia/core" "0.15.0-next.9a2bc81e" + "@theia/editor" "0.15.0-next.9a2bc81e" + "@theia/filesystem" "0.15.0-next.9a2bc81e" + "@theia/navigator" "0.15.0-next.9a2bc81e" + "@theia/process" "0.15.0-next.9a2bc81e" + "@theia/workspace" "0.15.0-next.9a2bc81e" vscode-ripgrep "^1.2.4" "@theia/task@next": - version "0.15.0-next.183ba3e5" - resolved "https://registry.yarnpkg.com/@theia/task/-/task-0.15.0-next.183ba3e5.tgz#90bfdb525d9d3b4a390ce4db6864ec0516729cd0" - integrity sha512-IoZuaTmR/qaLJ3ZU9y0NeAYGwIwokbUmDtbyBlCu3EdZ+qjA1cVJ1ScQkASSLW0ttzmoetCseJBM/UYsQU0Aow== + version "0.15.0-next.9a2bc81e" + resolved "https://registry.yarnpkg.com/@theia/task/-/task-0.15.0-next.9a2bc81e.tgz#a1f6a4dbd7abb0cd8ad5ce310ecc0c7fce13f83a" + integrity sha512-WMahbLUQp3GwGwjQmzb4OgAh6/h7wbSQPSVGGD06IuG+8iCFOZNZ8bA3O2nMHrIC4KMzrYWl4ls6ETKpMk5ThQ== dependencies: - "@theia/core" "0.15.0-next.183ba3e5" - "@theia/editor" "0.15.0-next.183ba3e5" - "@theia/filesystem" "0.15.0-next.183ba3e5" - "@theia/markers" "0.15.0-next.183ba3e5" - "@theia/monaco" "0.15.0-next.183ba3e5" - "@theia/preferences" "0.15.0-next.183ba3e5" - "@theia/process" "0.15.0-next.183ba3e5" - "@theia/terminal" "0.15.0-next.183ba3e5" - "@theia/variable-resolver" "0.15.0-next.183ba3e5" - "@theia/workspace" "0.15.0-next.183ba3e5" + "@theia/core" "0.15.0-next.9a2bc81e" + "@theia/editor" "0.15.0-next.9a2bc81e" + "@theia/filesystem" "0.15.0-next.9a2bc81e" + "@theia/markers" "0.15.0-next.9a2bc81e" + "@theia/monaco" "0.15.0-next.9a2bc81e" + "@theia/preferences" "0.15.0-next.9a2bc81e" + "@theia/process" "0.15.0-next.9a2bc81e" + "@theia/terminal" "0.15.0-next.9a2bc81e" + "@theia/variable-resolver" "0.15.0-next.9a2bc81e" + "@theia/workspace" "0.15.0-next.9a2bc81e" ajv "^6.5.3" jsonc-parser "^2.0.2" p-debounce "^2.1.0" vscode-uri "^1.0.8" -"@theia/terminal@0.15.0-next.183ba3e5", "@theia/terminal@next": - version "0.15.0-next.183ba3e5" - resolved "https://registry.yarnpkg.com/@theia/terminal/-/terminal-0.15.0-next.183ba3e5.tgz#5e30a2f5c6a17ff504c03442108bd4f18ea02002" - integrity sha512-TjOMI1Xu4/psPFqRKVvsDWdSeO2vHnirP+aduqnK+9rZlATLqCyS8cnAi1MqMBDKFar1zDPQVVI3944doWUusA== +"@theia/terminal@0.15.0-next.9a2bc81e", "@theia/terminal@next": + version "0.15.0-next.9a2bc81e" + resolved "https://registry.yarnpkg.com/@theia/terminal/-/terminal-0.15.0-next.9a2bc81e.tgz#25d24c19fe7ab22ef629647af36611c2b86c1dbd" + integrity sha512-DYjkqIu1XJrsItjAoHOIYxDd/A/TTabgyC17Y+QkKMVLZJr9jyjBqPrHEUxTDW4jLFHJBoW5eAl4Nri7Wx5isQ== dependencies: - "@theia/core" "0.15.0-next.183ba3e5" - "@theia/editor" "0.15.0-next.183ba3e5" - "@theia/filesystem" "0.15.0-next.183ba3e5" - "@theia/process" "0.15.0-next.183ba3e5" - "@theia/workspace" "0.15.0-next.183ba3e5" + "@theia/core" "0.15.0-next.9a2bc81e" + "@theia/editor" "0.15.0-next.9a2bc81e" + "@theia/filesystem" "0.15.0-next.9a2bc81e" + "@theia/process" "0.15.0-next.9a2bc81e" + "@theia/workspace" "0.15.0-next.9a2bc81e" xterm "3.13.0" "@theia/textmate-grammars@next": - version "0.15.0-next.183ba3e5" - resolved "https://registry.yarnpkg.com/@theia/textmate-grammars/-/textmate-grammars-0.15.0-next.183ba3e5.tgz#4f1c1b15863c7c4d67442e75ceb9bdb12ea10137" - integrity sha512-3+l67XWK8tVFc8lV0bZLZvuxxEpz3VWG4ZChdlhYZQIZp3Ezv6DhfjjY5tah+NqtRqK6kqKX8vVtpbnDGt2zcA== + version "0.15.0-next.9a2bc81e" + resolved "https://registry.yarnpkg.com/@theia/textmate-grammars/-/textmate-grammars-0.15.0-next.9a2bc81e.tgz#c5388d731f85efa0cb38b31652c3b014ee74c4ae" + integrity sha512-CjfCMcm1O0xopwntYQU/WRIq5N9sL8+1iq4E5VOwqni/bpVg3Io/SZ0O/9oCnMC+TFXFgtLbNKUG4dy+SvZByw== dependencies: - "@theia/monaco" "0.15.0-next.183ba3e5" + "@theia/monaco" "0.15.0-next.9a2bc81e" vscode-textmate "^4.0.1" -"@theia/userstorage@0.15.0-next.183ba3e5": - version "0.15.0-next.183ba3e5" - resolved "https://registry.yarnpkg.com/@theia/userstorage/-/userstorage-0.15.0-next.183ba3e5.tgz#aebf84b840e3c90379d79be99ebbe6ca0ec8887b" - integrity sha512-6pw1EvkD8SzH96d2NwC2UacK0fLNpOAoYcNLylw+EFcDhxe70ChUE2b8deQfPvyLqG0uyKJWBFbruFpmQ1SF2A== +"@theia/userstorage@0.15.0-next.9a2bc81e": + version "0.15.0-next.9a2bc81e" + resolved "https://registry.yarnpkg.com/@theia/userstorage/-/userstorage-0.15.0-next.9a2bc81e.tgz#b80e1af6769b8ea2127b8c207f03d0b862d50559" + integrity sha512-3cifj4HEkCnrR0FEkw4f4ijVjX93XTanc0qyyyranuWu5p1dE8Xhlc8mGn0ws4eI97pl+HcEbT1k+Brg8bGSYg== dependencies: - "@theia/core" "0.15.0-next.183ba3e5" - "@theia/filesystem" "0.15.0-next.183ba3e5" + "@theia/core" "0.15.0-next.9a2bc81e" + "@theia/filesystem" "0.15.0-next.9a2bc81e" -"@theia/variable-resolver@0.15.0-next.183ba3e5", "@theia/variable-resolver@next": - version "0.15.0-next.183ba3e5" - resolved "https://registry.yarnpkg.com/@theia/variable-resolver/-/variable-resolver-0.15.0-next.183ba3e5.tgz#c64f9c8b9ba9150f617487367839de719910aebb" - integrity sha512-9fC3CcfYZnpyJKvLDiVo9PeAKITZ+OOKyUww5B0GJkHPRSqGPa8f2wB9GVDT5tt7Wn2qWGCQUPV5Ojb7hQk+0A== +"@theia/variable-resolver@0.15.0-next.9a2bc81e", "@theia/variable-resolver@next": + version "0.15.0-next.9a2bc81e" + resolved "https://registry.yarnpkg.com/@theia/variable-resolver/-/variable-resolver-0.15.0-next.9a2bc81e.tgz#a85baef9a785b46fe35ea6cda6c2e7bb3d8f745f" + integrity sha512-qv98bTh9N4+LbgSBbgERlfSfoGzn9kYDzxCxUQAs4FEgD1HJQBzN3OmeooEDxT59mom5WZl271/2g95EDPdE4g== dependencies: - "@theia/core" "0.15.0-next.183ba3e5" + "@theia/core" "0.15.0-next.9a2bc81e" -"@theia/workspace@0.15.0-next.183ba3e5", "@theia/workspace@next": - version "0.15.0-next.183ba3e5" - resolved "https://registry.yarnpkg.com/@theia/workspace/-/workspace-0.15.0-next.183ba3e5.tgz#b750202bfd06abd958df6adce9395073713fa53f" - integrity sha512-7k1zgMDngCAO8H+oguk9JMAhTSI/20omZ/EBaZ67edl3/moe0MDSsPMPmPWhqkOn+jnwrWmkl4NcGJuUzM2rPw== +"@theia/workspace@0.15.0-next.9a2bc81e", "@theia/workspace@next": + version "0.15.0-next.9a2bc81e" + resolved "https://registry.yarnpkg.com/@theia/workspace/-/workspace-0.15.0-next.9a2bc81e.tgz#b49115a6ae4654699a7b4bde2aaeff8bc6a365f9" + integrity sha512-altiRroI1/ecfmusxB8FkUru/cm+YvD87GY3aeKYWwQTONcblZ8efK2+3ODZrT4sspTWQBrCfx5TmK/6jF5JwQ== dependencies: - "@theia/core" "0.15.0-next.183ba3e5" - "@theia/filesystem" "0.15.0-next.183ba3e5" - "@theia/variable-resolver" "0.15.0-next.183ba3e5" + "@theia/core" "0.15.0-next.9a2bc81e" + "@theia/filesystem" "0.15.0-next.9a2bc81e" + "@theia/variable-resolver" "0.15.0-next.9a2bc81e" ajv "^6.5.3" jsonc-parser "^2.0.2" moment "^2.21.0" @@ -2129,6 +2242,11 @@ resolved "https://registry.yarnpkg.com/@typefox/monaco-editor-core/-/monaco-editor-core-0.18.0-next.1.tgz#c31d3361215703b524065f460e1b4b6b714699db" integrity sha512-l7uZbyLfXwh5b5YHv1U2T5KQAVrPTnUqklRd1HEI6ZBWGqw5ukXa5L17ATaVYRpCsy7ZtqyOQS2viWSS/goNFA== +"@types/anymatch@*": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a" + integrity sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA== + "@types/base64-arraybuffer@0.1.0": version "0.1.0" resolved "https://registry.yarnpkg.com/@types/base64-arraybuffer/-/base64-arraybuffer-0.1.0.tgz#739eea0a974d13ae831f96d97d882ceb0b187543" @@ -2160,9 +2278,9 @@ integrity sha512-luq8meHGYwvky0O7u0eQZdA7B4Wd9owUCqvbw2m3XCrCU8mplYOujMBbvyS547AxJkC+pGnd0Cm15eNxEUNU8g== "@types/connect@*": - version "3.4.32" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.32.tgz#aa0e9616b9435ccad02bc52b5b454ffc2c70ba28" - integrity sha512-4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg== + version "3.4.33" + resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.33.tgz#31610c901eca573b8713c3330abc6e6b9f588546" + integrity sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A== dependencies: "@types/node" "*" @@ -2182,9 +2300,9 @@ integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g== "@types/express-serve-static-core@*": - version "4.17.0" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.0.tgz#e80c25903df5800e926402b7e8267a675c54a281" - integrity sha512-Xnub7w57uvcBqFdIGoRg1KhNOeEj0vB6ykUM7uFWyxvbdE89GFyqgmUcanAriMr4YOxNFZBAWkfcWIb4WBPt3g== + version "4.17.2" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.2.tgz#f6f41fa35d42e79dbf6610eccbb2637e6008a0cf" + integrity sha512-El9yMpctM6tORDAiBwZVLMcxoTMcqqRO9dVyYcn7ycLWbvR8klrDn8CAOwRfZujZtWD7yS/mshTdz43jMOejbg== dependencies: "@types/node" "*" "@types/range-parser" "*" @@ -2238,6 +2356,11 @@ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.149.tgz#1342d63d948c6062838fbf961012f74d4e638440" integrity sha512-ijGqzZt/b7BfzcK9vTrS6MFljQRPn5BFWOx8oE0GYxribu6uV+aA9zZuXI1zc/etK9E8nrgdoF2+LgUw7+9tJQ== +"@types/mime-types@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@types/mime-types/-/mime-types-2.1.0.tgz#9ca52cda363f699c69466c2a6ccdaad913ea7a73" + integrity sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM= + "@types/mime@*": version "2.0.1" resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz#dc488842312a7f075149312905b5e3c0b054c79d" @@ -2248,20 +2371,34 @@ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== +"@types/minipass@*": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@types/minipass/-/minipass-2.2.0.tgz#51ad404e8eb1fa961f75ec61205796807b6f9651" + integrity sha512-wuzZksN4w4kyfoOv/dlpov4NOunwutLA/q7uc00xU02ZyUY+aoM5PWIXEKBMnm0NHd4a+N71BMjq+x7+2Af1fg== + dependencies: + "@types/node" "*" + +"@types/mkdirp@^0.5.2": + version "0.5.2" + resolved "https://registry.yarnpkg.com/@types/mkdirp/-/mkdirp-0.5.2.tgz#503aacfe5cc2703d5484326b1b27efa67a339c1f" + integrity sha512-U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg== + dependencies: + "@types/node" "*" + "@types/mocha@^5.2.7": version "5.2.7" resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.2.7.tgz#315d570ccb56c53452ff8638738df60726d5b6ea" integrity sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ== "@types/node@*", "@types/node@>= 8": - version "12.12.16" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.16.tgz#3ebcbd7bf978fa4c5120fee8be57083271a8b3ac" - integrity sha512-vRuMyoOr5yfNf8QWxXegOjeyjpWJxFePzHzmBOIzDIzo+rSqF94RW0PkS6y4T2+VjAWLXHWrfbIJY3E3aS7lUw== + version "13.5.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.5.1.tgz#6fae50892d1841f4b38b298e2f78fb68c5960cb9" + integrity sha512-Jj2W7VWQ2uM83f8Ls5ON9adxN98MvyJsMSASYFuSvrov8RMRY64Ayay7KV35ph1TSGIJ2gG9ZVDdEq3c3zaydA== "@types/node@^10.12.18", "@types/node@^10.14.22": - version "10.17.8" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.8.tgz#07c0819207b4bb46e5a509fe25f3232e76fa6683" - integrity sha512-FeTtEwXbQa187ABpeEQoO7pq3dHgE85FmAUExx2sKO6U1/MYrLTYv+BIMcgVbQ66WjI4w+Ni+5HJtY+gHgWnPg== + version "10.17.14" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.14.tgz#b6c60ebf2fb5e4229fdd751ff9ddfae0f5f31541" + integrity sha512-G0UmX5uKEmW+ZAhmZ6PLTQ5eu/VPaT+d/tdLd5IFsKRPcbe6lPxocBtcYBFSaLaCW8O60AX90e91Nsp8lVHCNw== "@types/p-debounce@^1.0.1": version "1.0.1" @@ -2290,22 +2427,29 @@ resolved "https://registry.yarnpkg.com/@types/ps-tree/-/ps-tree-1.1.0.tgz#7e2034e8ccdc16f6b0ced7a88529ebcb3b1dc424" integrity sha512-rm5GU5sefQpg2d/DQ+fMDZnl9aPiJjJ9FYA12isIocNTZqu9VDZRgCRBx3oYFEdmDpmPmY4hxxmY/+1a84Rtzg== +"@types/puppeteer@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@types/puppeteer/-/puppeteer-2.0.0.tgz#82c04f93367e2d3396e371a71be1167332148838" + integrity sha512-QPHXIcaPcijMbvizoM7PRL97Rm+aM8J2DmgTz2tt79b15PqbyeaCppYonvPLHQ/Q5ea92BUHDpv4bsqtiTy8kQ== + dependencies: + "@types/node" "*" + "@types/range-parser@*": version "1.2.3" resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c" integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA== "@types/react-dom@*", "@types/react-dom@^16.0.6": - version "16.9.4" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.4.tgz#0b58df09a60961dcb77f62d4f1832427513420df" - integrity sha512-fya9xteU/n90tda0s+FtN5Ym4tbgxpq/hb/Af24dvs6uYnYn+fspaxw5USlw0R8apDNwxsqumdRoCoKitckQqw== + version "16.9.5" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.5.tgz#5de610b04a35d07ffd8f44edad93a71032d9aaa7" + integrity sha512-BX6RQ8s9D+2/gDhxrj8OW+YD4R+8hj7FEM/OJHGNR0KipE1h1mSsf39YeyC81qafkq+N3rU3h3RFbLSwE5VqUg== dependencies: "@types/react" "*" "@types/react-select@^3.0.0": - version "3.0.8" - resolved "https://registry.yarnpkg.com/@types/react-select/-/react-select-3.0.8.tgz#b824a12d438dd493c30ffff49a805f797602a837" - integrity sha512-0763TXYZc8bTiHM+DUnWoy9Rg5mk6PxYWBrEe6Fkjgc0Kv0r1RqjZk9/BrK4wdM0RNjYjixlFPnUhOJb76sMGg== + version "3.0.10" + resolved "https://registry.yarnpkg.com/@types/react-select/-/react-select-3.0.10.tgz#c32e0832d368756e6db53ccedf64f767728545d4" + integrity sha512-oUHXqvbkRhC07q5JjeY6hE+NUqgUM6CyaRXEKYPvMCBqUOuLnYltyhiNx6Jpb+iFpYtNHSQtF4dNJfMdMooKoQ== dependencies: "@types/react" "*" "@types/react-dom" "*" @@ -2319,31 +2463,39 @@ "@types/react" "*" "@types/react-virtualized@^9.18.3": - version "9.21.6" - resolved "https://registry.yarnpkg.com/@types/react-virtualized/-/react-virtualized-9.21.6.tgz#97697724aaa1b5d920b73f1e6b4f0075d6cfd996" - integrity sha512-DPio1ItmcK6osHINiWYsvaGWZW47dOQ2ABNwxavYoFyJ3PXKlw4r+1/+Swu2DDG7LmkI72Q/RzAQsXrTAOO0Gw== + version "9.21.7" + resolved "https://registry.yarnpkg.com/@types/react-virtualized/-/react-virtualized-9.21.7.tgz#2a35b660c396e916fbf3fb5279a577187e85af05" + integrity sha512-Go+r3xz6TLUHwmRsyEHfo7UvikVbR0L1HUxe/otBgFEUx8aLrTQeblY8r9UbnSmAsynU0KtJTQErS907GM4lQw== dependencies: "@types/prop-types" "*" "@types/react" "*" "@types/react@*", "@types/react@^16.4.1": - version "16.9.16" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.16.tgz#4f12515707148b1f53a8eaa4341dae5dfefb066d" - integrity sha512-dQ3wlehuBbYlfvRXfF5G+5TbZF3xqgkikK7DWAsQXe2KnzV+kjD4W2ea+ThCrKASZn9h98bjjPzoTYzfRqyBkw== + version "16.9.19" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.19.tgz#c842aa83ea490007d29938146ff2e4d9e4360c40" + integrity sha512-LJV97//H+zqKWMms0kvxaKYJDG05U2TtQB3chRLF8MPNs+MQh/H1aGlyDUxjaHvu08EAGerdX2z4LTBc7ns77A== dependencies: "@types/prop-types" "*" csstype "^2.2.0" -"@types/request@^2.0.3": - version "2.48.3" - resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.3.tgz#970b8ed2317568c390361d29c555a95e74bd6135" - integrity sha512-3Wo2jNYwqgXcIz/rrq18AdOZUQB8cQ34CXZo+LUwPJNpvRAL86+Kc2wwI8mqpz9Cr1V+enIox5v+WZhy/p3h8w== +"@types/request@*", "@types/request@^2.0.3": + version "2.48.4" + resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.4.tgz#df3d43d7b9ed3550feaa1286c6eabf0738e6cf7e" + integrity sha512-W1t1MTKYR8PxICH+A4HgEIPuAC3sbljoEVfyZbeFJJDbr30guDspJri2XOaM2E+Un7ZjrihaDi7cf6fPa2tbgw== dependencies: "@types/caseless" "*" "@types/node" "*" "@types/tough-cookie" "*" form-data "^2.5.0" +"@types/requestretry@^1.12.3": + version "1.12.5" + resolved "https://registry.yarnpkg.com/@types/requestretry/-/requestretry-1.12.5.tgz#c8abf9eb173a9c61d7099ca378acca3e8a483007" + integrity sha512-iEs/MpRq8E+4V4wu9OseeHI0AtgLns4a+/jukKOjUJmVh36Ai+r4E5603pQwRx6mQrS0dhuq319crz8Q9lyBkA== + dependencies: + "@types/node" "*" + "@types/request" "*" + "@types/rimraf@^2.0.2": version "2.0.3" resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.3.tgz#0199a46af106729ba14213fda7b981278d8c84f2" @@ -2370,12 +2522,38 @@ "@types/express-serve-static-core" "*" "@types/mime" "*" +"@types/source-list-map@*": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9" + integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA== + +"@types/tapable@*": + version "1.0.5" + resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.5.tgz#9adbc12950582aa65ead76bffdf39fe0c27a3c02" + integrity sha512-/gG2M/Imw7cQFp8PGvz/SwocNrmKFjFsm5Pb8HdbHkZ1K8pmuPzOX4VeVoiEecFCVf4CsN1r3/BRvx+6sNqwtQ== + "@types/tar-fs@^1.16.1": - version "1.16.1" - resolved "https://registry.yarnpkg.com/@types/tar-fs/-/tar-fs-1.16.1.tgz#6e3fba276c173e365ae91e55f7b797a0e64298e5" - integrity sha512-uQQIaa8ukcKf/1yy2kzfP1PF+7jEZghFDKpDvgtsYo/mbqM1g4Qza1Y5oAw6kJMa7eLA/HkmxUsDqb2sWKVF9g== + version "1.16.2" + resolved "https://registry.yarnpkg.com/@types/tar-fs/-/tar-fs-1.16.2.tgz#6f5acea15d3b7777b8bf3f1c6d4e80ce71288f34" + integrity sha512-eds/pbRf0Fe0EKmrHDbs8mRkfbjz2upAdoUfREw14dPboZaHqqZ1Y+uVeoakoPavpZMpj22nhUTAYkX5bz3DXA== dependencies: "@types/node" "*" + "@types/tar-stream" "*" + +"@types/tar-stream@*": + version "1.6.1" + resolved "https://registry.yarnpkg.com/@types/tar-stream/-/tar-stream-1.6.1.tgz#67d759068ff781d976cad978893bb7a334ec8809" + integrity sha512-pYCDOPuRE+4tXFk1rSMYiuI+kSrXiJ4av1bboQbkcEBA2rqwEWfIn9kdMSH+5nYu58WksHuxwx+7kVbtg0Le7w== + dependencies: + "@types/node" "*" + +"@types/tar@^4.0.3": + version "4.0.3" + resolved "https://registry.yarnpkg.com/@types/tar/-/tar-4.0.3.tgz#e2cce0b8ff4f285293243f5971bd7199176ac489" + integrity sha512-Z7AVMMlkI8NTWF0qGhC4QIX0zkV/+y0J8x7b/RsHrN0310+YNjoJd8UrApCiGBCWtKjxS9QhNqLi2UJNToh5hA== + dependencies: + "@types/minipass" "*" + "@types/node" "*" "@types/touch@0.0.1": version "0.0.1" @@ -2387,12 +2565,38 @@ resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-2.3.6.tgz#c880579e087d7a0db13777ff8af689f4ffc7b0d5" integrity sha512-wHNBMnkoEBiRAd3s8KTKwIuO9biFtTf0LehITzBhSco+HQI0xkXZbLOD55SW3Aqw3oUkHstkm5SPv58yaAdFPQ== +"@types/uglify-js@*": + version "3.0.4" + resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.0.4.tgz#96beae23df6f561862a830b4288a49e86baac082" + integrity sha512-SudIN9TRJ+v8g5pTG8RRCqfqTMNqgWCKKd3vtynhGzkIIjxaicNAMuY5TRadJ6tzDu3Dotf3ngaMILtmOdmWEQ== + dependencies: + source-map "^0.6.1" + "@types/uuid@^3.4.3": - version "3.4.6" - resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.4.6.tgz#d2c4c48eb85a757bf2927f75f939942d521e3016" - integrity sha512-cCdlC/1kGEZdEglzOieLDYBxHsvEOIg7kp/2FYyVR9Pxakq+Qf/inL3RKQ+PA8gOlI/NnL+fXmQH12nwcGzsHw== + version "3.4.7" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.4.7.tgz#51d42247473bc00e38cc8dfaf70d936842a36c03" + integrity sha512-C2j2FWgQkF1ru12SjZJyMaTPxs/f6n90+5G5qNakBxKXjTBc/YTSelHh4Pz1HUDwxFXD9WvpQhOGCDC+/Y4mIQ== + +"@types/webpack-sources@*": + version "0.1.6" + resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-0.1.6.tgz#3d21dfc2ec0ad0c77758e79362426a9ba7d7cbcb" + integrity sha512-FtAWR7wR5ocJ9+nP137DV81tveD/ZgB1sadnJ/axUGM3BUVfRPx8oQNMtv3JNfTeHx3VP7cXiyfR/jmtEsVHsQ== dependencies: "@types/node" "*" + "@types/source-list-map" "*" + source-map "^0.6.1" + +"@types/webpack@^4.41.2": + version "4.41.3" + resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.3.tgz#30c2251db1d69a45bbffd79c0577dd9baf50e7ba" + integrity sha512-dH+BZ6pHBZFrXpnif0YU/PbmUq3lQrvRPnqkxsciSIzvG/DE+Vm/Wrjn56T7V3+B5ryQa5fw0oGnHL8tk4ll6w== + dependencies: + "@types/anymatch" "*" + "@types/node" "*" + "@types/tapable" "*" + "@types/uglify-js" "*" + "@types/webpack-sources" "*" + source-map "^0.6.0" "@types/which@^1.3.1", "@types/which@^1.3.2": version "1.3.2" @@ -2413,9 +2617,9 @@ "@types/node" "*" "@types/yargs@^11.1.0": - version "11.1.3" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-11.1.3.tgz#33c8ebf05f78f1edeb249c1cde1a42ae57f5664e" - integrity sha512-moBUF6X8JsK5MbLZGP3vCfG/TVHZHsaePj3EimlLKp8+ESUjGjpXalxyn90a2L9fTM2ZGtW4swb6Am1DvVRNGA== + version "11.1.4" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-11.1.4.tgz#695d875cfd8010dfd9e292903bc3adf87e2cf514" + integrity sha512-dZKaZg9KW6XSTg73rbPR6ClfF623VCTxQ+HFc4IPQ+OJB+AmaPnYR/nObnQ8fXW9oziXlOiX+Z+24u6X/Peq7Q== "@webassemblyjs/ast@1.8.5": version "1.8.5" @@ -2615,6 +2819,11 @@ agent-base@4, agent-base@^4.3.0: dependencies: es6-promisify "^5.0.0" +agent-base@5: + version "5.1.1" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c" + integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g== + agent-base@~4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9" @@ -2640,11 +2849,11 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1: integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ== ajv@^6.1.0, ajv@^6.10.2, ajv@^6.5.3, ajv@^6.5.5: - version "6.10.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52" - integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw== + version "6.11.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz#c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9" + integrity sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA== dependencies: - fast-deep-equal "^2.0.1" + fast-deep-equal "^3.1.1" fast-json-stable-stringify "^2.0.0" json-schema-traverse "^0.4.1" uri-js "^4.2.2" @@ -3136,7 +3345,7 @@ async-each@^1.0.1: resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== -async-limiter@^1.0.0: +async-limiter@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== @@ -3163,7 +3372,7 @@ atob-lite@^2.0.0: resolved "https://registry.yarnpkg.com/atob-lite/-/atob-lite-2.0.0.tgz#0fef5ad46f1bd7a8502c65727f0367d5ee43d696" integrity sha1-D+9a1G8b16hQLGVyfwNn1e5D1pY= -atob@^2.1.1: +atob@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== @@ -3198,9 +3407,9 @@ aws-sign2@~0.7.0: integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= aws4@^1.8.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.0.tgz#24390e6ad61386b0a747265754d2a17219de862c" - integrity sha512-Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A== + version "1.9.1" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e" + integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug== babel-code-frame@^6.11.0, babel-code-frame@^6.26.0: version "6.26.0" @@ -3413,15 +3622,15 @@ babel-plugin-dynamic-import-node@^2.3.0: dependencies: object.assign "^4.1.0" -babel-plugin-emotion@^10.0.22: - version "10.0.23" - resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.0.23.tgz#040d40bf61dcab6d31dd6043d10e180240b8515b" - integrity sha512-1JiCyXU0t5S2xCbItejCduLGGcKmF3POT0Ujbexog2MI4IlRcIn/kWjkYwCUZlxpON0O5FC635yPl/3slr7cKQ== +babel-plugin-emotion@^10.0.27: + version "10.0.27" + resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.0.27.tgz#59001cf5de847c1d61f2079cd906a90a00d3184f" + integrity sha512-SUNYcT4FqhOqvwv0z1oeYhqgheU8qrceLojuHyX17ngo7WtWqN5I9l3IGHzf21Xraj465CVzF4IvOlAF+3ed0A== dependencies: "@babel/helper-module-imports" "^7.0.0" - "@emotion/hash" "0.7.3" - "@emotion/memoize" "0.7.3" - "@emotion/serialize" "^0.11.14" + "@emotion/hash" "0.7.4" + "@emotion/memoize" "0.7.4" + "@emotion/serialize" "^0.11.15" babel-plugin-macros "^2.0.0" babel-plugin-syntax-jsx "^6.18.0" convert-source-map "^1.5.0" @@ -3986,7 +4195,7 @@ binary-extensions@^2.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c" integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow== -binary@~0.3.0: +binary@^0.3.0, binary@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79" integrity sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk= @@ -3999,7 +4208,7 @@ binaryextensions@^2.1.2: resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.2.0.tgz#e7c6ba82d4f5f5758c26078fe8eea28881233311" integrity sha512-bHhs98rj/7i/RZpCSJ3uk55pLXOItjIrh2sRQZSM6OoktScX+LxJzvlU+FELp9j3TdcddTmmYArLSGptCTwjuw== -bindings@^1.3.0: +bindings@^1.3.0, bindings@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== @@ -4169,14 +4378,14 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: caniuse-db "^1.0.30000639" electron-to-chromium "^1.2.7" -browserslist@^4.6.0, browserslist@^4.8.2: - version "4.8.2" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.2.tgz#b45720ad5fbc8713b7253c20766f701c9a694289" - integrity sha512-+M4oeaTplPm/f1pXDw84YohEv7B1i/2Aisei8s4s6k3QsoSHa7i5sz8u/cGQkkatCPxMASKxPualR4wwYgVboA== +browserslist@^4.8.2, browserslist@^4.8.3: + version "4.8.5" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.5.tgz#691af4e327ac877b25e7a3f7ee869c4ef36cdea3" + integrity sha512-4LMHuicxkabIB+n9874jZX/az1IaZ5a+EUuvD7KFOu9x/Bd5YHyO0DIz2ls/Kl8g0ItS4X/ilEgf4T1Br0lgSg== dependencies: - caniuse-lite "^1.0.30001015" - electron-to-chromium "^1.3.322" - node-releases "^1.1.42" + caniuse-lite "^1.0.30001022" + electron-to-chromium "^1.3.338" + node-releases "^1.1.46" btoa-lite@^1.0.0: version "1.0.0" @@ -4433,14 +4642,14 @@ caniuse-api@^1.5.2: lodash.uniq "^4.5.0" caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: - version "1.0.30001015" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001015.tgz#9f1b4fa158c747dcc04b15f9c5359ddcf0390d90" - integrity sha512-+Fqdu7tOxSD0HDs922QPxseHlwnUzdjLC1Oq32HZ1/LWrMfYNt8JaUWnoiIAR+G4fRzM3tdgc4Lrqo5Nx76UsQ== + version "1.0.30001023" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001023.tgz#f856f71af16a5a44e81f1fcefc1673912a43da72" + integrity sha512-EnlshvE6oAum+wWwKmJNVaoqJMjIc0bLUy4Dj77VVnz1o6bzSPr1Ze9iPy6g5ycg1xD6jGU6vBmo7pLEz2MbCQ== -caniuse-lite@^1.0.30001015: - version "1.0.30001015" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001015.tgz#15a7ddf66aba786a71d99626bc8f2b91c6f0f5f0" - integrity sha512-/xL2AbW/XWHNu1gnIrO8UitBGoFthcsDgU9VLK1/dpsoxbaD5LscHozKze05R6WLsBvLhqv78dAPozMFQBYLbQ== +caniuse-lite@^1.0.30001022: + version "1.0.30001023" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001023.tgz#b82155827f3f5009077bdd2df3d8968bcbcc6fc4" + integrity sha512-C5TDMiYG11EOhVOA62W1p3UsJ2z4DsHtMBQtjzp3ZsUglcQn62WOUgW0y795c7A5uZ+GCEIvzkMatLIlAsbNTA== caseless@~0.12.0: version "0.12.0" @@ -5076,13 +5285,13 @@ copy-webpack-plugin@^4.5.0: p-limit "^1.0.0" serialize-javascript "^1.4.0" -core-js-compat@^3.4.7: - version "3.4.8" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.4.8.tgz#f72e6a4ed76437ea710928f44615f926a81607d5" - integrity sha512-l3WTmnXHV2Sfu5VuD7EHE2w7y+K68+kULKt5RJg8ZJk3YhHF1qLD4O8v8AmNq+8vbOwnPFFDvds25/AoEvMqlQ== +core-js-compat@^3.6.2: + version "3.6.4" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.4.tgz#938476569ebb6cda80d339bcf199fae4f16fff17" + integrity sha512-zAa3IZPvsJ0slViBQ2z+vgyyTuhd3MFn1rBQjZSKVEgB0UMYhUkCj9jJUVPgGTGqWvsBVmfnruXgTcNyTlEiSA== dependencies: - browserslist "^4.8.2" - semver "^6.3.0" + browserslist "^4.8.3" + semver "7.0.0" core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0: version "2.6.11" @@ -5206,9 +5415,9 @@ css-color-names@0.0.4: integrity sha1-gIrcLnnPhHOAabZGyyDsJ762KeA= css-element-queries@^1.2.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/css-element-queries/-/css-element-queries-1.2.2.tgz#e80ce4c523e41079152b1a3a8ec5b7afb0b45c96" - integrity sha512-mpzx/1w9qqu5WLrxvX/wRP+ZwU2ZZ0yRiBkQ9jf4QjStaNuiDbejw9KcvfW3me5f4MZRAnAsctGRECrSf1PBYw== + version "1.2.3" + resolved "https://registry.yarnpkg.com/css-element-queries/-/css-element-queries-1.2.3.tgz#e14940b1fcd4bf0da60ea4145d05742d7172e516" + integrity sha512-QK9uovYmKTsV2GXWQiMOByVNrLn2qz6m3P7vWpOR4IdD6I3iXoDw5qtgJEN3Xq7gIbdHVKvzHjdAtcl+4Arc4Q== css-loader@^0.28.1: version "0.28.11" @@ -5309,9 +5518,9 @@ csso@~2.3.1: source-map "^0.5.3" csstype@^2.2.0, csstype@^2.5.7, csstype@^2.6.7: - version "2.6.7" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.7.tgz#20b0024c20b6718f4eda3853a1f5a1cce7f5e4a5" - integrity sha512-9Mcn9sFbGBAdmimWb2gLVDtFJzeKtDGIr76TUqmjZrw9LFXBMSU70lcs+C0/7fyCd6iBDqmksUcCOUIkisPHsQ== + version "2.6.8" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.8.tgz#0fb6fc2417ffd2816a418c9336da74d7f07db431" + integrity sha512-msVS9qTuMT5zwAGCVm4mxfrZ18BNc6Csd0oJAtiFMZ1FAx1CCvy2+5MDmYoix63LM/6NDbNtodCiGYGmFgO0dA== currently-unhandled@^0.4.1: version "0.4.1" @@ -5382,7 +5591,7 @@ debug@3.2.6, debug@^3.0.0, debug@^3.1.0, debug@^3.2.6: dependencies: ms "^2.1.1" -debug@^4.1.0, debug@^4.1.1: +debug@4, debug@^4.1.0, debug@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== @@ -5567,7 +5776,7 @@ depd@~1.1.2: resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= -deprecation@^2.0.0: +deprecation@^2.0.0, deprecation@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919" integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ== @@ -5621,9 +5830,9 @@ diff@3.5.0, diff@^3.4.0, diff@^3.5.0: integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA== diff@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff" - integrity sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q== + version "4.0.2" + resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" + integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== diffie-hellman@^5.0.0: version "5.0.3" @@ -5770,11 +5979,11 @@ ecc-jsbn@~0.1.1: safer-buffer "^2.1.0" editions@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/editions/-/editions-2.2.0.tgz#dacd0c2a9441ebef592bba316a6264febb337f35" - integrity sha512-RYg3iEA2BDLCNVe8PUkD+ox5vAKxB9XS/mAhx1bdxGCF0CpX077C0pyTA9t5D6idCYA3avl5/XDHKPsHFrygfw== + version "2.3.0" + resolved "https://registry.yarnpkg.com/editions/-/editions-2.3.0.tgz#47f2d5309340bce93ab5eb6ad755b9e90ff825e4" + integrity sha512-jeXYwHPKbitU1l14dWlsl5Nm+b1Hsm7VX73BsrQ4RVwEcAQQIPFHTZAbVtuIGxZBrpdT2FXd8lbtrNBrzZxIsA== dependencies: - errlop "^1.1.2" + errlop "^2.0.0" semver "^6.3.0" ee-first@1.1.1: @@ -5803,14 +6012,14 @@ electron-download@^4.1.0, electron-download@^4.1.1: sumchecker "^2.0.2" electron-rebuild@^1.8.6: - version "1.8.8" - resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-1.8.8.tgz#412c1b846e944de6ff022aab3f5afd0f5e637f35" - integrity sha512-9a/VGbVpTJcuBaZa8yMcegqJ5flGPYDo363AxXDMxY4ZHPtFMLedGzQW9+720SIS1cvjX8B0zC+vMHO75ncOiA== + version "1.9.0" + resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-1.9.0.tgz#4ad9d9bc0816b7e52eaffd6520ff62e1d9376d0f" + integrity sha512-lnHW+gJIhukqVhME2v+LRDldafWwP0kGOPEpPuj59+F4NHEfu/vOjk8OLBcgDGt72CSWZm7zFUDE07oZxQJbHw== dependencies: colors "^1.3.3" debug "^4.1.1" detect-libc "^1.0.3" - fs-extra "^7.0.1" + fs-extra "^8.1.0" node-abi "^2.11.0" node-gyp "^6.0.1" ora "^3.4.0" @@ -5824,10 +6033,10 @@ electron-store@^2.0.0: dependencies: conf "^2.0.0" -electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.322: - version "1.3.322" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.322.tgz#a6f7e1c79025c2b05838e8e344f6e89eb83213a8" - integrity sha512-Tc8JQEfGQ1MzfSzI/bTlSr7btJv/FFO7Yh6tanqVmIWOuNCu6/D1MilIEgLtmWqIrsv+o4IjpLAhgMBr/ncNAA== +electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.338: + version "1.3.341" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.341.tgz#ad4c039bf621715a12dd814a95a7d89ec80b092c" + integrity sha512-iezlV55/tan1rvdvt7yg7VHRSkt+sKfzQ16wTDqTbQqtl4+pSUkKPXpQHDvEt0c7gKcUHHwUbffOgXz6bn096g== electron@^4.2.11: version "4.2.12" @@ -5914,17 +6123,20 @@ env-paths@^2.2.0: resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43" integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA== +envinfo@^7.3.1: + version "7.5.0" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.5.0.tgz#91410bb6db262fb4f1409bd506e9ff57e91023f4" + integrity sha512-jDgnJaF/Btomk+m3PZDTTCb5XIIIX3zYItnCRfF73zVgvinLoRomuhi75Y4su0PtQxWz4v66XnLLckyvyJTOIQ== + err-code@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960" integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA= -errlop@^1.1.2: - version "1.7.0" - resolved "https://registry.yarnpkg.com/errlop/-/errlop-1.7.0.tgz#6b1b35528f3056002ea560906617191fcf6d9fea" - integrity sha512-JisgQc08Ry4ZzN4cTYL7wdmLMoiwv97Kj/xSXObOE9Be+ZDxAewq0kKRqR5WFVUhglym3fQc++sZSMvdgLalBw== - dependencies: - editions "^2.2.0" +errlop@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/errlop/-/errlop-2.0.0.tgz#52b97d35da1b0795e2647b5d2d3a46d17776f55a" + integrity sha512-z00WIrQhtOMUnjdTG0O4f6hMG64EVccVDBy2WwgjcF8S4UB1exGYuc2OFwmdQmsJwLQVEIHWHPCz/omXXgAZHw== errno@^0.1.1, errno@^0.1.3, errno@~0.1.7: version "0.1.7" @@ -5952,21 +6164,22 @@ error@^7.0.2: dependencies: string-template "~0.2.1" -es-abstract@^1.5.1: - version "1.16.3" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.3.tgz#52490d978f96ff9f89ec15b5cf244304a5bca161" - integrity sha512-WtY7Fx5LiOnSYgF5eg/1T+GONaGmpvpPdCpSnYij+U2gDTL0UPfWrhDw7b2IYb+9NQJsYpCA0wOQvZfsd6YwRw== +es-abstract@^1.17.0-next.1: + version "1.17.4" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz#e3aedf19706b20e7c2594c35fc0d57605a79e184" + integrity sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ== dependencies: es-to-primitive "^1.2.1" function-bind "^1.1.1" has "^1.0.3" has-symbols "^1.0.1" - is-callable "^1.1.4" - is-regex "^1.0.4" + is-callable "^1.1.5" + is-regex "^1.0.5" object-inspect "^1.7.0" object-keys "^1.1.1" - string.prototype.trimleft "^2.1.0" - string.prototype.trimright "^2.1.0" + object.assign "^4.1.0" + string.prototype.trimleft "^2.1.1" + string.prototype.trimright "^2.1.1" es-to-primitive@^1.2.1: version "1.2.1" @@ -6068,9 +6281,9 @@ eventemitter3@^3.1.0: integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q== events@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88" - integrity sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA== + version "3.1.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59" + integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg== evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: version "1.0.3" @@ -6240,7 +6453,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2: assign-symbols "^1.0.0" is-extendable "^1.0.1" -extend@~3.0.2: +extend@^3.0.2, extend@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== @@ -6284,7 +6497,7 @@ extglob@^2.0.4: snapdragon "^0.8.1" to-regex "^3.0.1" -extract-zip@^1.0.3: +extract-zip@^1.0.3, extract-zip@^1.6.6: version "1.6.7" resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz#a840b4b8af6403264c8db57f4f1a74333ef81fe9" integrity sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k= @@ -6311,10 +6524,10 @@ extsprintf@^1.2.0: dependencies: kind-of "^5.0.2" -fast-deep-equal@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" - integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk= +fast-deep-equal@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4" + integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA== fast-glob@^2.0.2, fast-glob@^2.2.6: version "2.2.7" @@ -6329,9 +6542,9 @@ fast-glob@^2.0.2, fast-glob@^2.2.6: micromatch "^3.1.10" fast-json-stable-stringify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" - integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== fast-plist@^0.1.2: version "0.1.2" @@ -6499,9 +6712,9 @@ find-cache-dir@^2.0.0, find-cache-dir@^2.1.0: pkg-dir "^3.0.0" find-cache-dir@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.1.0.tgz#9935894999debef4cf9f677fdf646d002c4cdecb" - integrity sha512-zw+EFiNBNPgI2NTrKkDd1xd7q0cs6wr/iWnr/oUkI0yF9K9GqQ+riIt4aiyFaaqpaWbxPrJXHI+QvmNUQbX+0Q== + version "3.2.0" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.2.0.tgz#e7fe44c1abc1299f516146e563108fd1006c1874" + integrity sha512-1JKclkYYsf1q9WIJKLZa9S9muC+08RIjzAlLrK4QcYLJMS6mk9yombQ9qf+zJ7H9LS800k0s44L4sDq9VYzqyg== dependencies: commondir "^1.0.1" make-dir "^3.0.0" @@ -6517,9 +6730,9 @@ find-git-exec@^0.0.2: which "^2.0.1" find-git-repositories@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/find-git-repositories/-/find-git-repositories-0.1.2.tgz#401349f543c1000d1bf5e83f12a52ecc047b6e5d" - integrity sha512-HY5YSB/COXlr1v1qA/q0FyNg80yR5aH6vUEZtEnEhXQhkPcmXpvm/GLsAcCDcfNSay1ggUCScKcUwBXy+NSgQA== + version "0.1.3" + resolved "https://registry.yarnpkg.com/find-git-repositories/-/find-git-repositories-0.1.3.tgz#4e83e085b20cb3e393c1e091adc3a3eec50b6dda" + integrity sha512-6q8ZIQ7loe0eWbz1O79J0gQ2wVpQ1ajsjV64HC2iJ7gOOqlEuDlG/T0xYr5gDYBFSHlS8dah1KGbndiWWdJ0PA== dependencies: nan "^2.14.0" @@ -6585,9 +6798,9 @@ flatten@^1.0.2: integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg== flow-parser@^0.*: - version "0.113.0" - resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.113.0.tgz#5b5913c54833918d0c3136ba69f6cf0cdd85fc20" - integrity sha512-+hRyEB1sVLNMTMniDdM1JIS8BJ3HUL7IFIJaxX+t/JUy0GNYdI0Tg1QLx8DJmOF8HeoCrUDcREpnDAc/pPta3w== + version "0.117.0" + resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.117.0.tgz#0a8925c8d00959081e6a1547aa3ce015d88f3ab9" + integrity sha512-B9wlFfFtE9R9+lvhfShHIuE1eGLfTmMDUxIBU3NfbVynVzB2LNT38A5xBUURW5AYlkJveIlCcEsouOsro/DNWg== flush-write-stream@^1.0.0: version "1.1.1" @@ -6713,7 +6926,7 @@ fs-extra@^4.0.1, fs-extra@^4.0.2: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^7.0.0, fs-extra@^7.0.1: +fs-extra@^7.0.0: version "7.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== @@ -6754,12 +6967,12 @@ fs.realpath@^1.0.0: integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= fsevents@^1.2.7: - version "1.2.9" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f" - integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw== + version "1.2.11" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz#67bf57f4758f02ede88fb2a1712fef4d15358be3" + integrity sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw== dependencies: + bindings "^1.5.0" nan "^2.12.1" - node-pre-gyp "^0.12.0" fsevents@~2.1.1: version "2.1.2" @@ -6805,6 +7018,11 @@ genfun@^5.0.0: resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537" integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA== +gensync@^1.0.0-beta.1: + version "1.0.0-beta.1" + resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269" + integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg== + get-caller-file@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" @@ -7110,9 +7328,9 @@ google-protobuf@3.5.0: integrity sha1-uMxjx02DRXvYqakEUDyO+ya8ozk= google-protobuf@^3.11.0: - version "3.11.1" - resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.11.1.tgz#c1319e5fc8579394758c8a41699f0a2e3e950c38" - integrity sha512-1fdyssLSa7Dip+MDdluLl0uK+2rspgU1PrbdPJKt7hywqSl3+R27TkLYKuBn9dvOyr0VQ0cliQWlfMheW5WKqA== + version "3.11.2" + resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.11.2.tgz#43272974521a5cec35a21f62730cf517a5a8e38c" + integrity sha512-T4fin7lcYLUPj2ChUZ4DvfuuHtg3xi1621qeRZt2J7SvOQusOzq+sDT4vbotWTCjUXJoR36CA016LlhtPy80uQ== got@^7.0.0: version "7.1.0" @@ -7180,19 +7398,19 @@ growl@1.10.5: integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA== grpc-tools@^1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/grpc-tools/-/grpc-tools-1.8.0.tgz#db438dbd0cfb43d412dc02a767d5fb2193636847" - integrity sha512-GzYHjPQ/sbV/DmnNRksapMlLj26Tvq2Qppmzjmd+lHYZNeWM1feiGsYCduzJLyy295P+3uYIPy2/w/1thAnOow== + version "1.8.1" + resolved "https://registry.yarnpkg.com/grpc-tools/-/grpc-tools-1.8.1.tgz#8b2e8bf42028d94c85817d954685c46a7bfbc31a" + integrity sha512-CvZLshEDbum8ZtB8r3bn6JsrHs3L7S1jf7PTa02nZSLmcLTKbiXH5UYrte06Kh7SdzFmkxPMaOsys2rCs+HRjA== dependencies: node-pre-gyp "^0.12.0" grpc_tools_node_protoc_ts@^2.5.8: - version "2.5.8" - resolved "https://registry.yarnpkg.com/grpc_tools_node_protoc_ts/-/grpc_tools_node_protoc_ts-2.5.8.tgz#8b920fbc3ad7e39540199c7ab5326ecce785888c" - integrity sha512-3fJ/PXsMkgUg6LWcrEfDV6MGouh219qnBMxIpS9lFIT7l7SteV8DqqlfSBThA2dgi3OPusxRUfeHABC3pzvFUg== + version "2.5.10" + resolved "https://registry.yarnpkg.com/grpc_tools_node_protoc_ts/-/grpc_tools_node_protoc_ts-2.5.10.tgz#85f825f22e2103c70bfc8fc46bb9e45d5faa9b22" + integrity sha512-oPiY3+7ZlZWiuZ00liGH97R0UdWr7v2ioKuUQIil9kKFEDB8vezvW5gL2My3DrU+TZSL3fnwdydJX9uiD1KzQg== dependencies: google-protobuf "3.5.0" - handlebars "4.5.2" + handlebars "4.5.3" handlebars-helpers "0.10.0" gulp-header@^1.7.1: @@ -7254,10 +7472,10 @@ handlebars-utils@^1.0.2, handlebars-utils@^1.0.4, handlebars-utils@^1.0.6: kind-of "^6.0.0" typeof-article "^0.1.1" -handlebars@4.5.2: - version "4.5.2" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.2.tgz#5a4eb92ab5962ca3415ac188c86dc7f784f76a0f" - integrity sha512-29Zxv/cynYB7mkT1rVWQnV7mGX6v7H/miQ6dbEpYTKq5eJBN7PsRB+ViYJlcT6JINTSu4dVB9kOqEun78h6Exg== +handlebars@4.5.3: + version "4.5.3" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482" + integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA== dependencies: neo-async "^2.6.0" optimist "^0.6.1" @@ -7266,9 +7484,9 @@ handlebars@4.5.2: uglify-js "^3.1.4" handlebars@^4.0.11, handlebars@^4.4.0: - version "4.5.3" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482" - integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA== + version "4.7.2" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.2.tgz#01127b3840156a0927058779482031afe0e730d7" + integrity sha512-4PwqDL2laXtTWZghzzCtunQUTLbo31pcCJrd/B/9JP8XbhVzpS5ZXuKqlOzsd1rtcaLo4KqAn8nl8mkknS4MHw== dependencies: neo-async "^2.6.0" optimist "^0.6.1" @@ -7421,9 +7639,9 @@ helper-md@^0.2.2: remarkable "^1.6.2" highlight.js@^9.12.0: - version "9.16.2" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.16.2.tgz#68368d039ffe1c6211bcc07e483daf95de3e403e" - integrity sha512-feMUrVLZvjy0oC7FVJQcSQRqbBq9kwqnYE4+Kj9ZjbHh3g+BisiPgF49NyQbVLNdrL/qqZr3Ca9yOKwgn2i/tw== + version "9.18.0" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.0.tgz#6b1763cfcd53744313bd3f31f1210f7beb962c79" + integrity sha512-A97kI1KAUzKoAiEoaGcf2O9YPS8nbDTCRFokaaeBhnqjQTvbAuAJrQMm21zw8s8xzaMtCQBtgbyGXLGxdxQyqQ== hmac-drbg@^1.0.0: version "1.0.1" @@ -7534,6 +7752,14 @@ https-proxy-agent@^2.2.3: agent-base "^4.3.0" debug "^3.1.0" +https-proxy-agent@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz#702b71fb5520a132a66de1f67541d9e62154d82b" + integrity sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg== + dependencies: + agent-base "5" + debug "4" + humanize-ms@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" @@ -7758,7 +7984,7 @@ into-stream@^3.1.0: from2 "^2.1.1" p-is-promise "^1.1.0" -invariant@^2.2.2: +invariant@^2.2.2, invariant@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== @@ -7833,10 +8059,10 @@ is-buffer@~2.0.3: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623" integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A== -is-callable@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" - integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA== +is-callable@^1.1.4, is-callable@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab" + integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q== is-ci@^2.0.0: version "2.0.0" @@ -7860,9 +8086,9 @@ is-data-descriptor@^1.0.0: kind-of "^6.0.0" is-date-object@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16" - integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY= + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" + integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== is-descriptor@^0.1.0: version "0.1.6" @@ -8060,12 +8286,12 @@ is-promise@^2.1.0: resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= -is-regex@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" - integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE= +is-regex@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae" + integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ== dependencies: - has "^1.0.1" + has "^1.0.3" is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0: version "1.2.0" @@ -8210,11 +8436,6 @@ js-base64@^2.1.9: resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121" integrity sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw== -js-levenshtein@^1.1.3: - version "1.1.6" - resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d" - integrity sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g== - "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" @@ -8352,7 +8573,7 @@ json5@^2.1.0: dependencies: minimist "^1.2.0" -jsonc-parser@^2.0.2, jsonc-parser@^2.1.1, jsonc-parser@^2.2.0: +jsonc-parser@^2.0.2: version "2.2.0" resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.2.0.tgz#f206f87f9d49d644b7502052c04e82dd6392e9ef" integrity sha512-4fLQxW1j/5fWj6p78vAlAafoCKtuBm6ghv+Ij5W2DrDx0qE+ZdEl2c6Ko1mgJNF5ftX1iEWQQ4Ap7+3GlhjkOA== @@ -8420,9 +8641,9 @@ kind-of@^5.0.0, kind-of@^5.0.2: integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== kind-of@^6.0.0, kind-of@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" - integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA== + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== klaw@^1.0.0: version "1.3.1" @@ -8446,25 +8667,26 @@ lcid@^2.0.0: invert-kv "^2.0.0" lerna@^3.13.3: - version "3.19.0" - resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.19.0.tgz#6d53b613eca7da426ab1e97c01ce6fb39754da6c" - integrity sha512-YtMmwEqzWHQCh7Ynk7BvjrZri3EkSeVqTAcwZIqWlv9V/dCfvFPyRqp+2NIjPB5nj1FWXLRH6F05VT/qvzuuOA== + version "3.20.2" + resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.20.2.tgz#abf84e73055fe84ee21b46e64baf37b496c24864" + integrity sha512-bjdL7hPLpU3Y8CBnw/1ys3ynQMUjiK6l9iDWnEGwFtDy48Xh5JboR9ZJwmKGCz9A/sarVVIGwf1tlRNKUG9etA== dependencies: - "@lerna/add" "3.19.0" - "@lerna/bootstrap" "3.18.5" - "@lerna/changed" "3.18.5" - "@lerna/clean" "3.18.5" + "@lerna/add" "3.20.0" + "@lerna/bootstrap" "3.20.0" + "@lerna/changed" "3.20.0" + "@lerna/clean" "3.20.0" "@lerna/cli" "3.18.5" "@lerna/create" "3.18.5" "@lerna/diff" "3.18.5" - "@lerna/exec" "3.18.5" + "@lerna/exec" "3.20.0" "@lerna/import" "3.18.5" + "@lerna/info" "3.20.0" "@lerna/init" "3.18.5" "@lerna/link" "3.18.5" - "@lerna/list" "3.18.5" - "@lerna/publish" "3.18.5" - "@lerna/run" "3.18.5" - "@lerna/version" "3.18.5" + "@lerna/list" "3.20.0" + "@lerna/publish" "3.20.2" + "@lerna/run" "3.20.0" + "@lerna/version" "3.20.2" import-local "^2.0.0" npmlog "^4.1.2" @@ -8491,6 +8713,18 @@ less@^3.0.3: request "^2.83.0" source-map "~0.6.0" +leven@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" + integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== + +levenary@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz#842a9ee98d2075aa7faeedbe32679e9205f46f77" + integrity sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ== + dependencies: + leven "^3.1.0" + line-height@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/line-height/-/line-height-0.3.1.tgz#4b1205edde182872a5efa3c8f620b3187a9c54c9" @@ -8927,9 +9161,9 @@ markdown-it@^8.4.0: uc.micro "^1.0.5" math-expression-evaluator@^1.2.14: - version "1.2.17" - resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac" - integrity sha1-3oGf282E3M2PrlnGrreWFbnSZqw= + version "1.2.22" + resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.22.tgz#c14dcb3d8b4d150e5dcea9c68c8dad80309b0d5e" + integrity sha512-L0j0tFVZBQQLeEjmWOvDLoRciIY8gQGWahvkztXUal8jH8R5Rlqo9GCvgqvXcy9LQhEWdQCVvzqAbxgYNt4blQ== math-random@^1.0.1: version "1.0.4" @@ -9118,17 +9352,17 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.42.0, mime-db@^1.28.0: - version "1.42.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz#3e252907b4c7adb906597b4b65636272cf9e7bac" - integrity sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ== +mime-db@1.43.0, mime-db@^1.28.0: + version "1.43.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58" + integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ== -mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24: - version "2.1.25" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.25.tgz#39772d46621f93e2a80a856c53b86a62156a6437" - integrity sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg== +mime-types@^2.1.12, mime-types@^2.1.25, mime-types@~2.1.19, mime-types@~2.1.24: + version "2.1.26" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06" + integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ== dependencies: - mime-db "1.42.0" + mime-db "1.43.0" mime@1.6.0, mime@^1.4.1: version "1.6.0" @@ -9262,7 +9496,12 @@ mkdirp-promise@^5.0.1: dependencies: mkdirp "*" -mkdirp@*, mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1: +mkdirp@*: + version "1.0.3" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.3.tgz#4cf2e30ad45959dddea53ad97d518b6c8205e1ea" + integrity sha512-6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g== + +mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= @@ -9270,9 +9509,9 @@ mkdirp@*, mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~ minimist "0.0.8" mocha@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.0.0.tgz#c60d14bf3de9601f549b3ff5be657eb8381c54bf" - integrity sha512-CirsOPbO3jU86YKjjMzFLcXIb5YiGLUrjrXFHoJ3e2z9vWiaZVCZQ2+gtRGMPWF+nFhN6AWwLM/juzAQ6KRkbA== + version "7.0.1" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.0.1.tgz#276186d35a4852f6249808c6dd4a1376cbf6c6ce" + integrity sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg== dependencies: ansi-colors "3.2.3" browser-stdout "1.3.1" @@ -9310,14 +9549,14 @@ moment@^2.18.1, moment@^2.21.0, moment@^2.24.0: integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg== monaco-css@^2.5.0: - version "2.5.1" - resolved "https://registry.yarnpkg.com/monaco-css/-/monaco-css-2.5.1.tgz#c67598a9f82e53d4e4b93fe2deebed0ea113c73b" - integrity sha512-oIQGRFs+eqT8Zq7edPmfFkyxTi6hcN691e3xzGuPtMH6pW5vGW2+1krtLMdh6MlqNMQ5EnF5GCny/t65MyhXLQ== + version "2.6.0" + resolved "https://registry.yarnpkg.com/monaco-css/-/monaco-css-2.6.0.tgz#40f1291e01ff297b99a92806f5cc12a0394715d7" + integrity sha512-p+qZxteFlSkWx2pXnK9k11FKvC8q3qt1gL2yH4F3bLjKs1ngD65XncVxC5fuKdMhH23im9dv/ZF6rKP93+04tg== monaco-html@^2.5.2: - version "2.5.3" - resolved "https://registry.yarnpkg.com/monaco-html/-/monaco-html-2.5.3.tgz#e77aa15199643f3700723a06a8ed8c2d7103cf00" - integrity sha512-q6t7xi8iK3o81GxZVXChoN8NPsJOQ0Dm2vZjpOAEIWpeOVdxELcTDnkcvQBahhVMRoJjhj+jSn1+F4HZBO6kvQ== + version "2.6.0" + resolved "https://registry.yarnpkg.com/monaco-html/-/monaco-html-2.6.0.tgz#42d4441b9ba3e023d8895e5a1569d1df623c1691" + integrity sha512-UVvgqFFuzCjwsfINKmc2nm4qvQhBsu1luw4lUz+YF3CxAcVQBmscWiz5fb6/MFRG77K0h+7uADseNmc9APzEgA== monaco-languageclient@^0.10.2: version "0.10.2" @@ -9527,26 +9766,26 @@ node-gyp@^3.6.0: which "1" node-gyp@^5.0.2: - version "5.0.5" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.0.5.tgz#f6cf1da246eb8c42b097d7cd4d6c3ce23a4163af" - integrity sha512-WABl9s4/mqQdZneZHVWVG4TVr6QQJZUC6PAx47ITSk9lreZ1n+7Z9mMAIbA3vnO4J9W20P7LhCxtzfWsAD/KDw== + version "5.0.7" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.0.7.tgz#dd4225e735e840cf2870e4037c2ed9c28a31719e" + integrity sha512-K8aByl8OJD51V0VbUURTKsmdswkQQusIvlvmTyhHlIT1hBvaSxzdxpSle857XuXa7uc02UEZx9OR5aDxSWS5Qw== dependencies: - env-paths "^1.0.0" - glob "^7.0.3" - graceful-fs "^4.1.2" - mkdirp "^0.5.0" - nopt "2 || 3" - npmlog "0 || 1 || 2 || 3 || 4" - request "^2.87.0" - rimraf "2" - semver "~5.3.0" + env-paths "^2.2.0" + glob "^7.1.4" + graceful-fs "^4.2.2" + mkdirp "^0.5.1" + nopt "^4.0.1" + npmlog "^4.1.2" + request "^2.88.0" + rimraf "^2.6.3" + semver "^5.7.1" tar "^4.4.12" - which "1" + which "^1.3.1" node-gyp@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-6.0.1.tgz#d59c4247df61bb343f56e2c41d9c8dc2bc361470" - integrity sha512-udHG4hGe3Ji97AYJbJhaRwuSOuQO7KHnE4ZPH3Sox3tjRZ+bkBsDvfZ7eYA1qwD8eLWr//193x806ss3HFTPRw== + version "6.1.0" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-6.1.0.tgz#64e31c61a4695ad304c1d5b82cf6b7c79cc79f3f" + integrity sha512-h4A2zDlOujeeaaTx06r4Vy+8MZ1679lU+wbCKDS4ZtvY2A37DESo37oejIw0mtmR3+rvNwts5B6Kpt1KrNYdNw== dependencies: env-paths "^2.2.0" glob "^7.1.4" @@ -9605,10 +9844,10 @@ node-pre-gyp@^0.12.0: semver "^5.3.0" tar "^4" -node-releases@^1.1.42: - version "1.1.42" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.42.tgz#a999f6a62f8746981f6da90627a8d2fc090bbad7" - integrity sha512-OQ/ESmUqGawI2PRX+XIRao44qWYBBfN54ImQYdWVTQqUckuejOg76ysSqDBK8NG3zwySRVnX36JwDQ6x+9GxzA== +node-releases@^1.1.46: + version "1.1.47" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.47.tgz#c59ef739a1fd7ecbd9f0b7cf5b7871e8a8b591e4" + integrity sha512-k4xjVPx5FpwBUj0Gw7uvFOTF4Ep8Hok1I6qjwL3pLfwe7Y0REQSAqOwwv9TWBCUtMHxcXfY4PgRLRozcChvTcA== dependencies: semver "^6.3.0" @@ -9743,12 +9982,13 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1: validate-npm-package-name "^3.0.0" npm-packlist@^1.1.6, npm-packlist@^1.4.4: - version "1.4.7" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.7.tgz#9e954365a06b80b18111ea900945af4f88ed4848" - integrity sha512-vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ== + version "1.4.8" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" + integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== dependencies: ignore-walk "^3.0.1" npm-bundled "^1.0.1" + npm-normalize-package-bin "^1.0.1" npm-pick-manifest@^3.0.0: version "3.0.2" @@ -9784,9 +10024,9 @@ npm-run-path@^2.0.0: set-blocking "~2.0.0" nsfw@^1.2.2: - version "1.2.5" - resolved "https://registry.yarnpkg.com/nsfw/-/nsfw-1.2.5.tgz#febe581af616f7b042f89df133abe62416c4c803" - integrity sha512-m3mwZUKXiCR69PDMLfAmKmiNzy0Oe9LhFE0DYZC5cc1htNj5Hyb1sAgglXhuaDkibFy22AVvPC5cCFB3A6mYIw== + version "1.2.7" + resolved "https://registry.yarnpkg.com/nsfw/-/nsfw-1.2.7.tgz#e8579c107cdecba13d6dad0e2be10ae1ae1a6f3e" + integrity sha512-pc/bYZVnlzwE3mIu8C68OhAUhmme6AAyTTYYncx/7lrjgFNq4cZF1J5xFix3S/n++rrqtKBF39Bkm61LA2L6GQ== dependencies: fs-extra "^7.0.0" lodash.isinteger "^4.0.4" @@ -9868,12 +10108,12 @@ object.assign@4.1.0, object.assign@^4.1.0: object-keys "^1.0.11" object.getownpropertydescriptors@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16" - integrity sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY= + version "2.1.0" + resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649" + integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg== dependencies: - define-properties "^1.1.2" - es-abstract "^1.5.1" + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" object.omit@^2.0.0: version "2.0.1" @@ -10081,9 +10321,9 @@ p-limit@^1.0.0, p-limit@^1.1.0: p-try "^1.0.0" p-limit@^2.0.0, p-limit@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537" - integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg== + version "2.2.2" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e" + integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ== dependencies: p-try "^2.0.0" @@ -10186,9 +10426,9 @@ p-waterfall@^1.0.0: p-reduce "^1.0.0" pako@~1.0.2, pako@~1.0.5: - version "1.0.10" - resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732" - integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw== + version "1.0.11" + resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" + integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw== parallel-transform@^1.1.0: version "1.2.0" @@ -10392,10 +10632,10 @@ pend@~1.2.0: resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= -perfect-scrollbar@^1.3.0, perfect-scrollbar@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/perfect-scrollbar/-/perfect-scrollbar-1.4.0.tgz#5d014ef9775e1f43058a1dbae9ed1daf0e7091f1" - integrity sha512-/2Sk/khljhdrsamjJYS5NjrH+GKEHEwh7zFSiYyxROyYKagkE4kSn2zDQDRTOMo8mpT2jikxx6yI1dG7lNP/hw== +perfect-scrollbar@^1.3.0, perfect-scrollbar@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/perfect-scrollbar/-/perfect-scrollbar-1.5.0.tgz#821d224ed8ff61990c23f26db63048cdc75b6b83" + integrity sha512-NrNHJn5mUGupSiheBTy6x+6SXCFbLlm8fVZh9moIzw/LgqElN5q4ncR4pbCBCYuCJ8Kcl9mYM0NgDxvW+b4LxA== performance-now@^2.1.0: version "2.1.0" @@ -10823,7 +11063,7 @@ progress-stream@^1.1.0: speedometer "~0.1.2" through2 "~0.2.3" -progress@^2.0.0: +progress@^2.0.0, progress@^2.0.1: version "2.0.3" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== @@ -10889,6 +11129,11 @@ proxy-addr@~2.0.5: forwarded "~0.1.2" ipaddr.js "1.9.0" +proxy-from-env@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee" + integrity sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4= + prr@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" @@ -10907,9 +11152,9 @@ pseudomap@^1.0.2: integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= psl@^1.1.24: - version "1.6.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.6.0.tgz#60557582ee23b6c43719d9890fb4170ecd91e110" - integrity sha512-SYKKmVel98NCOYXpkwUqZqh0ahZeeKfmisiLIcEZdsb+WbLv02g/dI5BUmZnIyOe7RzZtLax81nnb2HbvC2tzA== + version "1.7.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c" + integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ== public-encrypt@^4.0.0: version "4.0.3" @@ -10971,6 +11216,32 @@ punycode@^2.1.0: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== +puppeteer-to-istanbul@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/puppeteer-to-istanbul/-/puppeteer-to-istanbul-1.2.2.tgz#e25d89b2ebe772ca731d8306b9a04e9c0a006bfa" + integrity sha512-uXj2WKvcrszD0BHBp6Ht3FDed4Kfzvzn1fP4IdrYLjZ9Gbxc/YRhT1JBdTz1TMHZVs+HHT/Bbwz3KwSLLK4UBg== + dependencies: + clone "^2.1.1" + mkdirp "^0.5.1" + v8-to-istanbul "^1.2.0" + yargs "^11.0.0" + +puppeteer@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-2.1.0.tgz#c10cabc5525f57c6766eed4f3006b6e10afcafc1" + integrity sha512-PC4oKMtwAElo8YtS/cYnk2/dew/3TonsGKKzjpFLWwkhBCteFsOZCVOXTt2QlP6w53mH0YsJE+fPLPzOW+DCug== + dependencies: + "@types/mime-types" "^2.1.0" + debug "^4.1.0" + extract-zip "^1.6.6" + https-proxy-agent "^4.0.0" + mime "^2.0.3" + mime-types "^2.1.25" + progress "^2.0.1" + proxy-from-env "^1.0.0" + rimraf "^2.6.1" + ws "^6.1.0" + q@^1.1.2, q@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" @@ -11104,11 +11375,11 @@ react-lifecycles-compat@^3.0.4: integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== react-perfect-scrollbar@^1.5.3: - version "1.5.3" - resolved "https://registry.yarnpkg.com/react-perfect-scrollbar/-/react-perfect-scrollbar-1.5.3.tgz#a8a0051a5f737801d4f73d48af5369724c595787" - integrity sha512-2fVqbDJgOb1siCCJozGbv22cAHnh6TI9HFHRpM0lBJTPPM0ajgmsU75mBnI3k0ndryo+JiwUbLKACrurx1BjBw== + version "1.5.5" + resolved "https://registry.yarnpkg.com/react-perfect-scrollbar/-/react-perfect-scrollbar-1.5.5.tgz#20696bdcc9ec052078e76f2229f3fcfbf87ad5c8" + integrity sha512-EDJxB57iGF1d3bhMtO9YKTYEutiSEM2RdQRA3bm9fNxG5W5oR7nFtmMaCzsWwW72VMuRufpyLkcgdm2D2gejSQ== dependencies: - perfect-scrollbar "^1.4.0" + perfect-scrollbar "^1.5.0" prop-types "^15.6.1" react-select@^3.0.4: @@ -11234,9 +11505,9 @@ read@1, read@~1.0.1: 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.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: - version "2.3.6" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" - integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw== + 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== dependencies: core-util-is "~1.0.0" inherits "~2.0.3" @@ -11257,9 +11528,9 @@ readable-stream@1.0.x: string_decoder "~0.10.x" "readable-stream@2 || 3", readable-stream@^3.0.2: - version "3.4.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc" - integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ== + version "3.5.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.5.0.tgz#465d70e6d1087f6162d079cd0b5db7fbebfd1606" + integrity sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA== dependencies: inherits "^2.0.3" string_decoder "^1.1.1" @@ -11482,9 +11753,9 @@ regjsparser@^0.1.4: jsesc "~0.5.0" regjsparser@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz#f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c" - integrity sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ== + version "0.6.2" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.2.tgz#fd62c753991467d9d1ffe0a9f67f27a529024b96" + integrity sha512-E9ghzUtoLwDekPT0DYCp+c4h+bvuUpe6rRHCTYn6eGoqj1LgKXxT6I0Il4WbjhQkOghzi/V+y03bPKvbllL93Q== dependencies: jsesc "~0.5.0" @@ -11535,15 +11806,6 @@ replace-ext@^1.0.0: resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb" integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs= -request-light@^0.2.4: - version "0.2.5" - resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.2.5.tgz#38a3da7b2e56f7af8cbba57e8a94930ee2380746" - integrity sha512-eBEh+GzJAftUnex6tcL6eV2JCifY0+sZMIUpUPOVXbs2nV5hla4ZMmO3icYKGuGVuQ2zHE9evh4OrRcH4iyYYw== - dependencies: - http-proxy-agent "^2.1.0" - https-proxy-agent "^2.2.3" - vscode-nls "^4.1.1" - request@^2.45.0, request@^2.82.0, request@^2.83.0, request@^2.86.0, request@^2.87.0, request@^2.88.0: version "2.88.0" resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" @@ -11570,6 +11832,15 @@ request@^2.45.0, request@^2.82.0, request@^2.83.0, request@^2.86.0, request@^2.8 tunnel-agent "^0.6.0" uuid "^3.3.2" +requestretry@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/requestretry/-/requestretry-3.1.0.tgz#c8e1976bb946f14889d3604bbad56a01d191c10d" + integrity sha512-DkvCPK6qvwxIuVA5TRCvi626WHC2rWjF/n7SCQvVHAr2JX9i1/cmIpSEZlmHAo+c1bj9rjaKoZ9IsKwCpTkoXA== + dependencies: + extend "^3.0.2" + lodash "^4.17.10" + when "^3.7.7" + require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" @@ -11616,9 +11887,9 @@ resolve-url@^0.2.1: integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.3.2, resolve@^1.8.1: - version "1.13.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.13.1.tgz#be0aa4c06acd53083505abb35f4d66932ab35d16" - integrity sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w== + version "1.15.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.0.tgz#1b7ca96073ebb52e741ffd799f6b39ea462c67f5" + integrity sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw== dependencies: path-parse "^1.0.6" @@ -11718,9 +11989,9 @@ rxjs@^5.4.2, rxjs@^5.5.2: symbol-observable "1.0.1" rxjs@^6.3.1, rxjs@^6.4.0: - version "6.5.3" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a" - integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA== + version "6.5.4" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c" + integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q== dependencies: tslib "^1.9.0" @@ -11798,6 +12069,11 @@ self-closing-tags@^1.0.1: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== +semver@7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" + integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== + semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" @@ -11832,7 +12108,7 @@ serialize-javascript@^1.4.0: resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.1.tgz#cfc200aef77b600c47da9bb8149c943e798c2fdb" integrity sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A== -serialize-javascript@^2.1.1: +serialize-javascript@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61" integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ== @@ -12068,11 +12344,11 @@ source-map-loader@^0.2.1: loader-utils "^1.1.0" source-map-resolve@^0.5.0: - version "0.5.2" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259" - integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA== + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" + integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== dependencies: - atob "^2.1.1" + atob "^2.1.2" decode-uri-component "^0.2.0" resolve-url "^0.2.1" source-map-url "^0.4.0" @@ -12258,9 +12534,9 @@ stream-http@^2.7.2: xtend "^4.0.0" stream-shift@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952" - integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI= + version "1.0.1" + resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" + integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== stream-to-observable@^0.2.0: version "0.2.0" @@ -12315,18 +12591,18 @@ string-width@^3.0.0, string-width@^3.1.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^5.1.0" -string.prototype.trimleft@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634" - integrity sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw== +string.prototype.trimleft@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74" + integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag== dependencies: define-properties "^1.1.3" function-bind "^1.1.1" -string.prototype.trimright@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz#669d164be9df9b6f7559fa8e89945b168a5a6c58" - integrity sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg== +string.prototype.trimright@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9" + integrity sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g== dependencies: define-properties "^1.1.3" function-bind "^1.1.1" @@ -12559,7 +12835,7 @@ tar@^2.0.0: fstream "^1.0.12" inherits "2" -tar@^4, tar@^4.0.2, tar@^4.4.10, tar@^4.4.12, tar@^4.4.8: +tar@^4, tar@^4.0.0, tar@^4.0.2, tar@^4.4.10, tar@^4.4.12, tar@^4.4.8: version "4.4.13" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== @@ -12596,25 +12872,25 @@ temp@^0.8.1: dependencies: rimraf "~2.6.2" -terser-webpack-plugin@^1.4.1: - version "1.4.2" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.2.tgz#e23c0d554587d1f473bd0cf68627720e733890a4" - integrity sha512-fdEb91kR2l+BVgES77N/NTXWZlpX6vX+pYPjnX5grcDYBF2CMnzJiXX4NNlna4l04lvCW39lZ+O/jSvUhHH/ew== +terser-webpack-plugin@^1.4.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c" + integrity sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA== dependencies: cacache "^12.0.2" find-cache-dir "^2.1.0" is-wsl "^1.1.0" schema-utils "^1.0.0" - serialize-javascript "^2.1.1" + serialize-javascript "^2.1.2" source-map "^0.6.1" terser "^4.1.2" webpack-sources "^1.4.0" worker-farm "^1.7.0" terser@^4.1.2: - version "4.4.2" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.4.2.tgz#448fffad0245f4c8a277ce89788b458bfd7706e8" - integrity sha512-Uufrsvhj9O1ikwgITGsZ5EZS6qPokUOkCegS7fYOdGTv+OA90vndUbU6PEjr5ePqHfNUbGyMO7xyIZv2MhsALQ== + version "4.6.3" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.3.tgz#e33aa42461ced5238d352d2df2a67f21921f8d87" + integrity sha512-Lw+ieAXmY69d09IIc/yqeBqXpEQIpDGZqT34ui1QWXIUpR2RjbqEkT8X7Lgex19hslSqcWM5iMN2kM11eMsESQ== dependencies: commander "^2.20.0" source-map "~0.6.1" @@ -12811,9 +13087,9 @@ trash@^4.0.1: integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk= tree-kill@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.1.tgz#5398f374e2f292b9dcc7b2e71e30a5c3bb6c743a" - integrity sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q== + version "1.2.2" + resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc" + integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A== trim-newlines@^1.0.0: version "1.0.0" @@ -12947,9 +13223,9 @@ uc.micro@^1.0.1, uc.micro@^1.0.5: integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA== uglify-js@^3.1.4: - version "3.7.2" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.2.tgz#cb1a601e67536e9ed094a92dd1e333459643d3f9" - integrity sha512-uhRwZcANNWVLrxLfNFEdltoPNhECUR3lc+UdJoG9CBpMcSnKyWA94tc3eAujB1GcMY5Uwq8ZMp4qWpxWYDQmaA== + version "3.7.6" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.6.tgz#0783daa867d4bc962a37cc92f67f6e3238c47485" + integrity sha512-yYqjArOYSxvqeeiYH2VGjZOqq6SVmhxzaPjJC1W2F9e+bqvFL9QXQ2osQuKUFjM2hGjKG2YclQnRKWQSt/nOTQ== dependencies: commander "~2.20.3" source-map "~0.6.1" @@ -13073,6 +13349,14 @@ untildify@^3.0.3: resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.3.tgz#1e7b42b140bcfd922b22e70ca1265bfe3634c7c9" integrity sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA== +unzip-stream@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/unzip-stream/-/unzip-stream-0.3.0.tgz#c30c054cd6b0d64b13a23cd3ece911eb0b2b52d8" + integrity sha512-NG1h/MdGIX3HzyqMjyj1laBCmlPYhcO4xEy7gEqqzGiSLw7XqDQCnY4nYSn5XSaH8mQ6TFkaujrO8d/PIZN85A== + dependencies: + binary "^0.3.0" + mkdirp "^0.5.1" + unzipper@^0.9.11: version "0.9.15" resolved "https://registry.yarnpkg.com/unzipper/-/unzipper-0.9.15.tgz#97d99203dad17698ee39882483c14e4845c7549c" @@ -13088,7 +13372,7 @@ unzipper@^0.9.11: readable-stream "~2.3.6" setimmediate "~1.0.4" -upath@^1.0.0, upath@^1.1.1, upath@^1.1.2: +upath@^1.0.0, upath@^1.1.1, upath@^1.1.2, upath@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== @@ -13185,15 +13469,20 @@ utils-merge@1.0.1: integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= uuid@^3.0.1, uuid@^3.1.0, uuid@^3.2.1, uuid@^3.3.2: - version "3.3.3" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866" - integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ== + version "3.4.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" + integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== v8-compile-cache@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-1.1.2.tgz#8d32e4f16974654657e676e0e467a348e89b0dc4" integrity sha512-ejdrifsIydN1XDH7EuR2hn8ZrkRKUYF7tUcBjBy/lhrCvs2K+zRlbW9UHc0IQ9RsYFZJFqJrieoIHfkCa0DBRA== +v8-to-istanbul@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-1.2.1.tgz#8f63a94b7f91243f5dcc6a495540b5653beb1279" + integrity sha512-NglPycIwSQeSJj7VJ6L8vTsPKC9MG5Lcx4n3SvYqNHzklbMI4dGcLJnkLPEPJ3uB8UyTdWviMhM0Ptq+xD5UFQ== + valid-filename@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/valid-filename/-/valid-filename-2.0.1.tgz#0768d6f364b1ed3bdf68f0d15abffb0d9d6cecaf" @@ -13222,9 +13511,9 @@ vary@~1.1.2: integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= vendors@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.3.tgz#a6467781abd366217c050f8202e7e50cc9eef8c0" - integrity sha512-fOi47nsJP5Wqefa43kyWSg80qF+Q3XA6MUkgi7Hp1HQaKDQW4cQrK2D0P7mmbFtsV1N89am55Yru/nyEwRubcw== + version "1.0.4" + resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e" + integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w== verror@1.10.0: version "1.10.0" @@ -13273,38 +13562,15 @@ vm-browserify@^1.0.1: resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== -vscode-json-languageserver@^1.2.1: - version "1.2.2" - resolved "https://registry.yarnpkg.com/vscode-json-languageserver/-/vscode-json-languageserver-1.2.2.tgz#d07c27a7fe95be9a6a3174f4792dc884b3430e9c" - integrity sha512-oHOFcYJrWFTpS8fz6yRywHw7qNzuOvwhe4ocpwGxTWFvvTZWCXeGhpX6XO6OXh53Aad69qIKWEflza3/N/0h2A== - dependencies: - jsonc-parser "^2.1.1" - request-light "^0.2.4" - vscode-json-languageservice "^3.3.5" - vscode-languageserver "^6.0.0-next.1" - vscode-nls "^4.1.1" - vscode-uri "^2.0.3" - -vscode-json-languageservice@^3.3.5: - version "3.4.9" - resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.4.9.tgz#7ce485bb0f9a07b4d879c988baac9be2222909ad" - integrity sha512-4VCpZ9ooea/Zc/MTnj1ccc9C7rqcoinKVQLhLoi6jw6yueSf4y4tg/YIUiPPVMlEAG7ZCPS+NVmqxisQ+mOsSw== - dependencies: - jsonc-parser "^2.2.0" - vscode-languageserver-textdocument "^1.0.0-next.4" - vscode-languageserver-types "^3.15.0-next.6" - vscode-nls "^4.1.1" - vscode-uri "^2.1.0" - vscode-jsonrpc@^4.1.0-next: version "4.1.0-next.3" resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.1.0-next.3.tgz#05fe742959a2726020d4d0bfbc3d3c97873c7fde" integrity sha512-Z6oxBiMks2+UADV1QHXVooSakjyhI+eHTnXzDyVvVMmegvSfkXk2w6mPEdSkaNHFBdtWW7n20H1yw2nA3A17mg== -vscode-jsonrpc@^5.0.0-next.5: - version "5.0.0-next.5" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-5.0.0-next.5.tgz#43284da590b86320e427c3256bbe6849d8c6a6bd" - integrity sha512-k9akfglxWgr0dtLNscq2uBq48XJwnhf4EaDxn05KQowRwR0DkNML0zeYqFRLtXZe6x5vpL5ppyu4o6GqL+23YQ== +vscode-jsonrpc@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz#9bab9c330d89f43fc8c1e8702b5c36e058a01794" + integrity sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A== vscode-languageclient@^5.3.0-next: version "5.3.0-next.9" @@ -13314,35 +13580,18 @@ vscode-languageclient@^5.3.0-next: semver "^6.3.0" vscode-languageserver-protocol "^3.15.0-next.8" -vscode-languageserver-protocol@^3.15.0-next.14, vscode-languageserver-protocol@^3.15.0-next.8: - version "3.15.0-next.14" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.14.tgz#e7eb337f1adb50b4a41c05d436ce03c8df1f4d14" - integrity sha512-xUwwno6Q6RFd2Z2EWV9D3dQlsKPnHyiZMNWq+EC7JJdp2WH1gRlD+KPX4UGRCnJK0WI5omqHV313IESPwRY5xA== +vscode-languageserver-protocol@^3.15.0-next.8: + version "3.15.2" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.2.tgz#e52c62923140b2655ad2472f6f29cfb83bacf5b8" + integrity sha512-GdL05JKOgZ76RDg3suiGCl9enESM7iQgGw4x93ibTh4sldvZmakHmTeZ4iUApPPGKf6O3OVBtrsksBXnHYaxNg== dependencies: - vscode-jsonrpc "^5.0.0-next.5" - vscode-languageserver-types "^3.15.0-next.9" + vscode-jsonrpc "^5.0.1" + vscode-languageserver-types "3.15.1" -vscode-languageserver-textdocument@^1.0.0-next.4: - version "1.0.0-next.5" - resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.0-next.5.tgz#dbb7a45dd973a19261a7c57ab9a439c40f3799ee" - integrity sha512-1jp/zAidN/bF/sqPimhBX1orH5G4rzRw63k75TesukJDuxm8yW79ECStWbDSy41BHGOwSGN4M69QFvhancSr5A== - -vscode-languageserver-types@^3.15.0-next, vscode-languageserver-types@^3.15.0-next.6, vscode-languageserver-types@^3.15.0-next.9: - version "3.15.0-next.9" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.9.tgz#957a9d1d5998a02edf62298fb7e37d9efcc6c157" - integrity sha512-Rl/8qJ6932nrHCdPn+9y0x08uLVQaSLRG+U4JzhyKpWU4eJbVaDRoAcz1Llj7CErJGbPr6kdBvShPy5fRfR+Uw== - -vscode-languageserver@^6.0.0-next.1: - version "6.0.0-next.8" - resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-6.0.0-next.8.tgz#39e22ebb9abecfc5f0e45104ed9bfae562257ca1" - integrity sha512-NsRKThaAZ6DMX/sHDGxOQ6H4Hjt/GeDSybbFdGc3oCRov4t3gVFnF3kxZ3y5jlvYNYYDdYXfpr8oRzXImBXHwQ== - dependencies: - vscode-languageserver-protocol "^3.15.0-next.14" - -vscode-nls@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.1.tgz#f9916b64e4947b20322defb1e676a495861f133c" - integrity sha512-4R+2UoUUU/LdnMnFjePxfLqNhBS8lrAFyX7pjb2ud/lqDkrUavFUTcG7wR0HBZFakae0Q6KLBFjMS6W93F403A== +vscode-languageserver-types@3.15.1, vscode-languageserver-types@^3.15.0-next: + version "3.15.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz#17be71d78d2f6236d414f0001ce1ef4d23e6b6de" + integrity sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ== vscode-ripgrep@^1.2.4: version "1.5.7" @@ -13361,11 +13610,6 @@ vscode-uri@^1.0.5, vscode-uri@^1.0.8: resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz#9769aaececae4026fb6e22359cb38946580ded59" integrity sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ== -vscode-uri@^2.0.3, vscode-uri@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.1.1.tgz#5aa1803391b6ebdd17d047f51365cf62c38f6e90" - integrity sha512-eY9jmGoEnVf8VE8xr5znSah7Qt1P/xsCdErz+g8HYZtJ7bZqKH5E3d+6oVNm1AC/c6IHUDokbmVXKOi4qPAC9A== - vscode-ws-jsonrpc@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/vscode-ws-jsonrpc/-/vscode-ws-jsonrpc-0.1.1.tgz#163ff05662635b4fd161ed132e112cec4d83f126" @@ -13446,9 +13690,9 @@ webpack-sources@^1.0.1, webpack-sources@^1.4.0, webpack-sources@^1.4.1: source-map "~0.6.1" webpack@^4.0.0: - version "4.41.2" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.2.tgz#c34ec76daa3a8468c9b61a50336d8e3303dce74e" - integrity sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A== + version "4.41.5" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.5.tgz#3210f1886bce5310e62bb97204d18c263341b77c" + integrity sha512-wp0Co4vpyumnp3KlkmpM5LWuzvZYayDwM2n17EHFr4qxBBbRokC7DJawPJC7TfSFZ9HZ6GsdH40EBj4UV0nmpw== dependencies: "@webassemblyjs/ast" "1.8.5" "@webassemblyjs/helper-module-context" "1.8.5" @@ -13470,7 +13714,7 @@ webpack@^4.0.0: node-libs-browser "^2.2.1" schema-utils "^1.0.0" tapable "^1.1.3" - terser-webpack-plugin "^1.4.1" + terser-webpack-plugin "^1.4.3" watchpack "^1.6.0" webpack-sources "^1.4.1" @@ -13483,6 +13727,11 @@ whatwg-url@^7.0.0: tr46 "^1.0.1" webidl-conversions "^4.0.2" +when@^3.7.7: + version "3.7.8" + resolved "https://registry.yarnpkg.com/when/-/when-3.7.8.tgz#c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82" + integrity sha1-xxMLan6gRpPoQs3J56Hyqjmjn4I= + whet.extend@~0.9.9: version "0.9.9" resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1" @@ -13618,12 +13867,17 @@ write-pkg@^3.1.0: sort-keys "^2.0.0" write-json-file "^2.2.0" -ws@^7.1.2: - version "7.2.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.0.tgz#422eda8c02a4b5dba7744ba66eebbd84bcef0ec7" - integrity sha512-+SqNqFbwTm/0DC18KYzIsMTnEWpLwJsiasW/O17la4iDRRIO9uaHbvKiAS3AHgTiuuWerK/brj4O6MYZkei9xg== +ws@^6.1.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb" + integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA== dependencies: - async-limiter "^1.0.0" + async-limiter "~1.0.0" + +ws@^7.1.2: + version "7.2.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.1.tgz#03ed52423cd744084b2cf42ed197c8b65a936b8e" + integrity sha512-sucePNSafamSKoOqoNfBd8V0StlkzJKL2ZAhGQinCfNQ+oacw+Pk7lcdAElecBF2VkLNZRiIb5Oi1Q5lVUVt2A== xdg-basedir@^2.0.0: version "2.0.0" @@ -13805,9 +14059,9 @@ year@^0.2.1: integrity sha1-QIOuUgoxiyPshgN/MADLiSvfm7A= yeoman-environment@^2.0.0, yeoman-environment@^2.0.5: - version "2.6.0" - resolved "https://registry.yarnpkg.com/yeoman-environment/-/yeoman-environment-2.6.0.tgz#db884c778946fec9a41e8980a6b3aa94fe41302d" - integrity sha512-Hl0LBs9/mKun8XyJ6gFiUNhZwjN/eezn+E9IFWz6KtXg/3wsnztF2lgtE8eIjfhWYtvY4yMq9iizi1Ei5JJ+7A== + version "2.7.0" + resolved "https://registry.yarnpkg.com/yeoman-environment/-/yeoman-environment-2.7.0.tgz#d1b6679de883ce14a68b869c4b19d55a0d66f477" + integrity sha512-YNzSUWgJVSgnm0qgLON4Gb2nTm+kywBiWjK4MbvosjUP2YJJ30lNhEx7ukyzKRPUlsavd5IsuALtF6QaVrq81A== dependencies: chalk "^2.4.1" cross-spawn "^6.0.5" From d53d474243a6cd9f6d8a3060f2683eb64ae42884 Mon Sep 17 00:00:00 2001 From: Akos Kitta Date: Wed, 29 Jan 2020 11:42:49 +0100 Subject: [PATCH 3/4] Disabled the window reload in the bundled app. This change is a NOOP for the electron application started in dev mode. Closes arduino/arduino-pro-ide#187 Signed-off-by: Akos Kitta --- .gitignore | 2 +- electron/build/template-package.json | 8 ++++++++ electron/packager/index.js | 4 ++++ electron/packager/package.json | 1 + electron/packager/yarn.lock | 5 +++++ 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 45be90d0..e622e8e7 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ downloads/ build/ !electron/build/ src-gen/ -*-app/*webpack.config.js +*webpack.config.js .DS_Store /workspace/static .DS_Store diff --git a/electron/build/template-package.json b/electron/build/template-package.json index d433c809..66c3ffe3 100644 --- a/electron/build/template-package.json +++ b/electron/build/template-package.json @@ -28,6 +28,14 @@ "// Notes:": [ "The resolution for `fs-extra` was required due to this: https://spectrum.chat/theia/general/our-theia-electron-builder-app-no-longer-starts~f5cf09a0-6d88-448b-8818-24ad0ec2ee7c" ], + "theia": { + "target": "electron", + "frontend": { + "config": { + "disallowReloadKeybinding": true + } + } + }, "build": { "productName": "Arduino Pro IDE", "appId": "arduino.ProIDE", diff --git a/electron/packager/index.js b/electron/packager/index.js index 6daf4644..974a2438 100644 --- a/electron/packager/index.js +++ b/electron/packager/index.js @@ -8,6 +8,7 @@ shell.env.THEIA_ELECTRON_SKIP_REPLACE_FFMPEG = '1'; // Do not run the ffmpeg validation for the packager. shell.env.NODE_OPTIONS = '--max_old_space_size=4096'; // Increase heap size for the CI const utils = require('./utils'); + const merge = require('deepmerge'); const { version, release } = utils.versionInfo(); echo(`📦 Building ${release ? 'release ' : ''}version '${version}'...`); @@ -81,9 +82,12 @@ template.build.files = [...template.build.files, ...unusedDependencies.map(name => `!node_modules/${name}`)]; pkg.dependencies = { ...pkg.dependencies, ...template.dependencies }; pkg.devDependencies = { ...pkg.devDependencies, ...template.devDependencies }; + // Deep-merging the Theia application configuration. We enable the electron window reload in dev mode but not for the final product. (arduino/arduino-pro-ide#187) + const theia = merge((pkg.theia || {}), (template.theia || {})); fs.writeFileSync(path('..', 'build', 'package.json'), JSON.stringify({ ...pkg, ...template, + theia, dependencies: pkg.dependencies, devDependencies: pkg.devDependencies }, null, 2)); diff --git a/electron/packager/package.json b/electron/packager/package.json index c65617b1..a122eb5d 100644 --- a/electron/packager/package.json +++ b/electron/packager/package.json @@ -12,6 +12,7 @@ "author": "Arduino SA", "license": "MIT", "dependencies": { + "deepmerge": "4.2.2", "depcheck": "^0.7.1", "shelljs": "^0.8.3", "yargs": "^12.0.5" diff --git a/electron/packager/yarn.lock b/electron/packager/yarn.lock index 05520728..40643eab 100644 --- a/electron/packager/yarn.lock +++ b/electron/packager/yarn.lock @@ -200,6 +200,11 @@ decamelize@^1.2.0: resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= +deepmerge@4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" + integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== + depcheck@^0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/depcheck/-/depcheck-0.7.1.tgz#d4ef8511620fc5c783dafe27887cfdab533b1215" From 4b859c2db9540773a6515e42ed46a878697ed817 Mon Sep 17 00:00:00 2001 From: Akos Kitta Date: Wed, 29 Jan 2020 17:19:19 +0100 Subject: [PATCH 4/4] Added a workaround for a memory leak. eclipse-theia/theia#7008 Signed-off-by: Akos Kitta --- .../src/browser/tool-output/client-service-impl.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arduino-ide-extension/src/browser/tool-output/client-service-impl.ts b/arduino-ide-extension/src/browser/tool-output/client-service-impl.ts index 81ad0a85..85140d97 100644 --- a/arduino-ide-extension/src/browser/tool-output/client-service-impl.ts +++ b/arduino-ide-extension/src/browser/tool-output/client-service-impl.ts @@ -13,7 +13,7 @@ export class ToolOutputServiceClientImpl implements ToolOutputServiceClient { protected readonly outputContribution: OutputContribution; onNewOutput(tool: string, chunk: string): void { - this.outputContribution.openView({ activate: true }).then(() => { + this.outputContribution.openView({ reveal: true }).then(() => { const channel = this.outputChannelManager.getChannel(`Arduino: ${tool}`); channel.setVisibility(true); channel.append(chunk);