From 0a66c2c06acd296fc0e1cb848956dc99c9daeffb Mon Sep 17 00:00:00 2001 From: Mattia Astorino Date: Thu, 27 Jun 2019 16:31:28 +0200 Subject: [PATCH] fix: Fix search highlight matched result color Close #358 --- defaults.json | 4 + package.json | 1 + src/themes/settings/specific/darker-hc.json | 3 + src/themes/settings/specific/darker.json | 3 + src/themes/settings/specific/default-hc.json | 3 + src/themes/settings/specific/default.json | 3 + src/themes/settings/specific/lighter-hc.json | 3 + src/themes/settings/specific/lighter.json | 3 + src/themes/settings/specific/ocean-hc.json | 3 + src/themes/settings/specific/ocean.json | 3 + .../settings/specific/palenight-hc.json | 3 + src/themes/settings/specific/palenight.json | 3 + src/themes/theme-template-color-theme.json | 60 ++++++++-- yarn.lock | 112 +++++++++++++++++- 14 files changed, 193 insertions(+), 14 deletions(-) diff --git a/defaults.json b/defaults.json index 2c23ec6..b6da331 100644 --- a/defaults.json +++ b/defaults.json @@ -93,6 +93,10 @@ "menubar.selectionForeground": { "alpha": 100, "value": null + }, + "editor.findMatchBorder": { + "alpha": 100, + "value": null } }, "changelog": { diff --git a/package.json b/package.json index 8e2d8bb..d9a2b5c 100644 --- a/package.json +++ b/package.json @@ -158,6 +158,7 @@ } ], "devDependencies": { + "@babel/register": "7.4.4", "@types/gulp": "4.0.5", "@types/gulp-if": "0.0.33", "@types/gulp-util": "3.0.34", diff --git a/src/themes/settings/specific/darker-hc.json b/src/themes/settings/specific/darker-hc.json index a3202e0..9ab3c65 100644 --- a/src/themes/settings/specific/darker-hc.json +++ b/src/themes/settings/specific/darker-hc.json @@ -27,6 +27,9 @@ "listHoverForeground": "#FFFFFF", "tabActiveForeground": "#FFFFFF", "inactiveSelectionBackground": "#00000030", + "findMatchBackground": "#000000", + "findMatchHighlightBackground": "#00000050", + "findMatchHighlightBorder": "#ffffff50", "base": { "white": "#ffffff", "black": "#000000", diff --git a/src/themes/settings/specific/darker.json b/src/themes/settings/specific/darker.json index 467215b..9ba5367 100644 --- a/src/themes/settings/specific/darker.json +++ b/src/themes/settings/specific/darker.json @@ -29,6 +29,9 @@ "listHoverBackground": "#212121", "tabActiveForeground": "#FFFFFF", "inactiveSelectionBackground": "#00000030", + "findMatchBackground": "#000000", + "findMatchHighlightBackground": "#00000050", + "findMatchHighlightBorder": "#ffffff30", "base": { "white": "#ffffff", "black": "#000000", diff --git a/src/themes/settings/specific/default-hc.json b/src/themes/settings/specific/default-hc.json index c51ce38..a769650 100644 --- a/src/themes/settings/specific/default-hc.json +++ b/src/themes/settings/specific/default-hc.json @@ -29,6 +29,9 @@ "listHoverBackground": "#263238", "tabActiveForeground": "#FFFFFF", "inactiveSelectionBackground": "#00000030", + "findMatchBackground": "#000000", + "findMatchHighlightBackground": "#00000050", + "findMatchHighlightBorder": "#ffffff50", "base": { "white": "#ffffff", "black": "#000000", diff --git a/src/themes/settings/specific/default.json b/src/themes/settings/specific/default.json index 20e6a2a..5879ae4 100644 --- a/src/themes/settings/specific/default.json +++ b/src/themes/settings/specific/default.json @@ -29,6 +29,9 @@ "listHoverBackground": "#263238", "tabActiveForeground": "#FFFFFF", "inactiveSelectionBackground": "#00000030", + "findMatchBackground": "#000000", + "findMatchHighlightBackground": "#00000050", + "findMatchHighlightBorder": "#ffffff30", "base": { "white": "#ffffff", "black": "#000000", diff --git a/src/themes/settings/specific/lighter-hc.json b/src/themes/settings/specific/lighter-hc.json index 0b50c68..eabe27e 100644 --- a/src/themes/settings/specific/lighter-hc.json +++ b/src/themes/settings/specific/lighter-hc.json @@ -29,6 +29,9 @@ "listHoverBackground": "#FAFAFA", "tabActiveForeground": "#000000", "inactiveSelectionBackground": "#CCD7DA50", + "findMatchBackground": "#00000040", + "findMatchHighlightBackground": "#00000010", + "findMatchHighlightBorder": "#00000060", "base": { "white": "#FFFFFF", "black": "#000000", diff --git a/src/themes/settings/specific/lighter.json b/src/themes/settings/specific/lighter.json index 28be4e5..3200e75 100644 --- a/src/themes/settings/specific/lighter.json +++ b/src/themes/settings/specific/lighter.json @@ -29,6 +29,9 @@ "listHoverBackground": "#FAFAFA", "tabActiveForeground": "#000000", "inactiveSelectionBackground": "#CCD7DA50", + "findMatchBackground": "#00000020", + "findMatchHighlightBackground": "#00000010", + "findMatchHighlightBorder": "#00000030", "base": { "white": "#FFFFFF", "black": "#000000", diff --git a/src/themes/settings/specific/ocean-hc.json b/src/themes/settings/specific/ocean-hc.json index a463eff..efbd0c8 100644 --- a/src/themes/settings/specific/ocean-hc.json +++ b/src/themes/settings/specific/ocean-hc.json @@ -29,6 +29,9 @@ "listHoverBackground": "#292D3E", "tabActiveForeground": "#FFFFFF", "inactiveSelectionBackground": "#00000030", + "findMatchBackground": "#000000", + "findMatchHighlightBackground": "#00000050", + "findMatchHighlightBorder": "#ffffff50", "base": { "white": "#ffffff", "black": "#000000", diff --git a/src/themes/settings/specific/ocean.json b/src/themes/settings/specific/ocean.json index 327cc1d..07dbca2 100644 --- a/src/themes/settings/specific/ocean.json +++ b/src/themes/settings/specific/ocean.json @@ -29,6 +29,9 @@ "listHoverBackground": "#292D3E", "tabActiveForeground": "#FFFFFF", "inactiveSelectionBackground": "#00000030", + "findMatchBackground": "#000000", + "findMatchHighlightBackground": "#00000050", + "findMatchHighlightBorder": "#ffffff30", "base": { "white": "#ffffff", "black": "#000000", diff --git a/src/themes/settings/specific/palenight-hc.json b/src/themes/settings/specific/palenight-hc.json index ca390d6..f97496d 100644 --- a/src/themes/settings/specific/palenight-hc.json +++ b/src/themes/settings/specific/palenight-hc.json @@ -29,6 +29,9 @@ "listHoverBackground": "#292D3E", "tabActiveForeground": "#FFFFFF", "inactiveSelectionBackground": "#00000030", + "findMatchBackground": "#000000", + "findMatchHighlightBackground": "#00000050", + "findMatchHighlightBorder": "#ffffff50", "base": { "white": "#ffffff", "black": "#000000", diff --git a/src/themes/settings/specific/palenight.json b/src/themes/settings/specific/palenight.json index 30bd8df..2c0ebca 100644 --- a/src/themes/settings/specific/palenight.json +++ b/src/themes/settings/specific/palenight.json @@ -29,6 +29,9 @@ "listHoverBackground": "#292D3E", "tabActiveForeground": "#FFFFFF", "inactiveSelectionBackground": "#00000030", + "findMatchBackground": "#000000", + "findMatchHighlightBackground": "#00000050", + "findMatchHighlightBorder": "#ffffff30", "base": { "white": "#ffffff", "black": "#000000", diff --git a/src/themes/theme-template-color-theme.json b/src/themes/theme-template-color-theme.json index c592d51..3abd863 100644 --- a/src/themes/theme-template-color-theme.json +++ b/src/themes/theme-template-color-theme.json @@ -682,19 +682,18 @@ "progressBar.background": "{{commons.accents.Teal}}", "textLink.foreground": "{{commons.accents.Teal}}", "textLink.activeForeground": "{{variant.scheme.foreground}}", + "widget.shadow": "{{variant.scheme.shadow}}", + "button.background": "{{variant.scheme.selection}}", + "debugToolBar.background": "{{variant.scheme.background}}", + "pickerGroup.foreground": "{{commons.accents.Teal}}", + + "editorLineNumber.foreground": "{{variant.scheme.lineNumbers}}", "editorLineNumber.activeForeground": "{{variant.scheme.sidebarForeground}}", "editorBracketMatch.border": "{{variant.scheme.caret}}50", "editorBracketMatch.background": "{{variant.scheme.background}}", "editorWhitespace.foreground": "{{variant.scheme.foreground}}40", - "editor.background": "{{variant.scheme.background}}", - "editor.foreground": "{{variant.scheme.foreground}}", - "editor.lineHighlightBackground": "{{variant.scheme.lineHighlight}}50", - "editor.selectionBackground": "{{variant.scheme.selection}}", - "editor.selectionHighlightBackground": "{{variant.scheme.caret}}20", - "editor.findMatchBackground": "{{variant.scheme.base.pink}}", - "editorOverviewRuler.findMatchForeground": "{{variant.scheme.base.pink}}60", - "editor.findMatchHighlightBackground": "{{variant.scheme.base.pink}}60", + "editorOverviewRuler.findMatchForeground": "{{commons.accents.Teal}}", "editorOverviewRuler.border": "{{variant.scheme.background}}", "editorOverviewRuler.errorForeground": "{{variant.scheme.base.red}}40", "editorOverviewRuler.infoForeground": "{{variant.scheme.base.blue}}40", @@ -711,6 +710,18 @@ "editorGutter.modifiedBackground": "{{variant.scheme.base.blue}}60", "editorGutter.addedBackground": "{{variant.scheme.base.green}}60", "editorGutter.deletedBackground": "{{variant.scheme.base.red}}60", + + "editor.background": "{{variant.scheme.background}}", + "editor.foreground": "{{variant.scheme.foreground}}", + "editor.lineHighlightBackground": "{{variant.scheme.lineHighlight}}50", + "editor.selectionBackground": "{{variant.scheme.selection}}", + "editor.selectionHighlightBackground": "{{variant.scheme.caret}}20", + + "editor.findMatchBackground": "{{variant.scheme.findMatchBackground}}", + "editor.findMatchHighlightBackground": "{{variant.scheme.findMatchHighlightBackground}}", + "editor.findMatchBorder": "{{commons.accents.Teal}}", + "editor.findMatchHighlightBorder": "{{variant.scheme.findMatchHighlightBorder}}", + "tab.activeBorder": "{{commons.accents.Teal}}", "tab.activeModifiedBorder": "{{variant.scheme.sidebarForeground}}", "tab.unfocusedActiveBorder": "{{variant.scheme.comments}}", @@ -719,40 +730,51 @@ "tab.inactiveBackground": "{{variant.scheme.background}}", "tab.unfocusedActiveForeground": "{{variant.scheme.foreground}}", "tab.border": "{{variant.scheme.background}}", + "statusBar.noFolderBackground": "{{variant.scheme.background}}", "statusBar.border": "{{variant.scheme.contrastBorder}}60", "statusBar.background": "{{variant.scheme.backgroundAlt}}", "statusBar.foreground": "{{variant.scheme.statusbarForeground}}", "statusBar.debuggingBackground": "{{variant.scheme.base.purple}}", "statusBar.debuggingForeground": "{{variant.scheme.base.white}}", + "statusBarItem.hoverBackground": "{{variant.scheme.comments}}20", "statusBarItem.remoteForeground": "{{variant.scheme.base.black}}", "statusBarItem.remoteBackground": "{{commons.accents.Teal}}", + "activityBar.background": "{{variant.scheme.backgroundAlt}}", "activityBar.border": "{{variant.scheme.contrastBorder}}60", "activityBar.foreground": "{{variant.scheme.foreground}}", + "activityBarBadge.background": "{{commons.accents.Teal}}", "activityBarBadge.foreground": "{{variant.scheme.base.black}}", + "titleBar.activeBackground": "{{variant.scheme.backgroundAlt}}", "titleBar.activeForeground": "{{variant.scheme.foreground}}", "titleBar.inactiveBackground": "{{variant.scheme.backgroundAlt}}", "titleBar.inactiveForeground": "{{variant.scheme.sidebarForeground}}", + "titleBar.border": "{{variant.scheme.contrastBorder}}60", + "sideBar.background": "{{variant.scheme.backgroundAlt}}", "sideBar.foreground": "{{variant.scheme.sidebarForeground}}", "sideBar.border": "{{variant.scheme.contrastBorder}}60", - "titleBar.border": "{{variant.scheme.contrastBorder}}60", + "sideBarTitle.foreground": "{{variant.scheme.foreground}}", "sideBarSectionHeader.background": "{{variant.scheme.backgroundAlt}}", "sideBarSectionHeader.border": "{{variant.scheme.contrastBorder}}60", + "input.background": "{{variant.scheme.inputBackground}}", "input.foreground": "{{variant.scheme.inputForeground}}", "input.placeholderForeground": "{{variant.scheme.foreground}}60", "input.border": "{{variant.scheme.inputBorder}}", + "inputValidation.errorBorder": "{{variant.scheme.base.red}}50", "inputValidation.infoBorder": "{{variant.scheme.base.blue}}50", "inputValidation.warningBorder": "{{variant.scheme.base.yellow}}50", + "dropdown.background": "{{variant.scheme.background}}", "dropdown.border": "{{variant.scheme.inputBorder}}", + "list.hoverForeground": "{{variant.scheme.listHoverForeground}}", "list.hoverBackground": "{{variant.scheme.backgroundAlt}}", "list.activeSelectionBackground": "{{variant.scheme.backgroundAlt}}", @@ -762,6 +784,7 @@ "list.focusBackground": "{{variant.scheme.foreground}}20", "list.focusForeground": "{{variant.scheme.foreground}}", "list.highlightForeground": "{{commons.accents.Teal}}", + "terminal.ansiWhite": "{{variant.scheme.base.white}}", "terminal.ansiBlack": "{{variant.scheme.base.black}}", "terminal.ansiBlue": "{{variant.scheme.base.blue}}", @@ -778,9 +801,11 @@ "terminal.ansiBrightMagenta": "{{variant.scheme.base.purple}}", "terminal.ansiBrightRed": "{{variant.scheme.base.red}}", "terminal.ansiBrightYellow": "{{variant.scheme.base.yellow}}", + "scrollbarSlider.background": "{{variant.scheme.scrollbars}}", "scrollbarSlider.hoverBackground": "{{variant.scheme.scrollbarsHover}}", "scrollbarSlider.activeBackground": "{{commons.accents.Teal}}", + "editorSuggestWidget.background": "{{variant.scheme.background}}", "editorSuggestWidget.foreground": "{{variant.scheme.foreground}}", "editorSuggestWidget.highlightForeground": "{{commons.accents.Teal}}", @@ -790,23 +815,27 @@ "editorWidget.resizeBorder": "{{commons.accents.Teal}}", "editorWidget.border": "{{variant.scheme.base.Teal}}", "editorMarkerNavigation.background": "{{variant.scheme.foreground}}05", - "widget.shadow": "{{variant.scheme.shadow}}", + "panel.border": "{{variant.scheme.contrastBorder}}60", "panel.background": "{{variant.scheme.backgroundAlt}}", "panel.dropBackground": "{{variant.scheme.foreground}}", "panelTitle.inactiveForeground": "{{variant.scheme.foreground}}", "panelTitle.activeForeground": "{{variant.scheme.tabActiveForeground}}", "panelTitle.activeBorder": "{{commons.accents.Teal}}", + "diffEditor.insertedTextBackground": "{{variant.scheme.base.green}}15", "diffEditor.removedTextBackground": "{{variant.scheme.base.red}}20", + "notifications.background": "{{variant.scheme.background}}", "notifications.foreground": "{{variant.scheme.foreground}}", "notificationLink.foreground": "{{commons.accents.Teal}}", + "badge.background": "{{variant.scheme.lineHighlight}}30", "badge.foreground": "{{variant.scheme.comments}}", - "button.background": "{{variant.scheme.selection}}", + "extensionButton.prominentBackground": "{{variant.scheme.base.green}}90", "extensionButton.prominentHoverBackground": "{{variant.scheme.base.green}}", + "peekView.border": "{{variant.scheme.shadow}}", "peekViewEditor.background": "{{variant.scheme.foreground}}05", "peekViewTitle.background": "{{variant.scheme.foreground}}05", @@ -815,28 +844,32 @@ "peekViewTitleDescription.foreground": "{{variant.scheme.foreground}}60", "peekViewResult.matchHighlightBackground": "{{variant.scheme.selection}}", "peekViewEditor.matchHighlightBackground": "{{variant.scheme.selection}}", - "debugToolBar.background": "{{variant.scheme.background}}", - "pickerGroup.foreground": "{{commons.accents.Teal}}", + "gitDecoration.deletedResourceForeground": "{{variant.scheme.base.red}}90", "gitDecoration.conflictingResourceForeground": "{{variant.scheme.base.yellow}}90", "gitDecoration.modifiedResourceForeground": "{{variant.scheme.base.blue}}90", "gitDecoration.untrackedResourceForeground": "{{variant.scheme.base.green}}90", "gitDecoration.ignoredResourceForeground": "{{variant.scheme.sidebarForeground}}90", + "peekViewResult.selectionBackground": "{{variant.scheme.sidebarForeground}}70", + "breadcrumb.background": "{{variant.scheme.background}}", "breadcrumb.foreground": "{{variant.scheme.sidebarForeground}}", "breadcrumb.focusForeground": "{{variant.scheme.foreground}}", "breadcrumb.activeSelectionForeground": "{{commons.accents.Teal}}", "breadcrumbPicker.background": "{{variant.scheme.backgroundAlt}}", + "menu.background": "{{variant.scheme.background}}", "menu.foreground": "{{variant.scheme.foreground}}", "menu.selectionBackground": "{{variant.scheme.lineHighlight}}50", "menu.selectionForeground": "{{commons.accents.Teal}}", "menu.selectionBorder": "{{variant.scheme.inactiveSelectionBackground}}", "menu.separatorBackground": "{{variant.scheme.foreground}}", + "menubar.selectionBackground": "{{variant.scheme.inactiveSelectionBackground}}", "menubar.selectionForeground": "{{commons.accents.Teal}}", "menubar.selectionBorder": "{{variant.scheme.inactiveSelectionBackground}}", + "settings.dropdownForeground": "{{variant.scheme.foreground}}", "settings.dropdownBackground": "{{variant.scheme.backgroundAlt}}", "settings.numberInputForeground": "{{variant.scheme.foreground}}", @@ -847,6 +880,7 @@ "settings.modifiedItemIndicator": "{{commons.accents.Teal}}", "settings.checkboxBackground": "{{variant.scheme.backgroundAlt}}", "settings.checkboxForeground": "{{variant.scheme.foreground}}", + "listFilterWidget.background": "{{variant.scheme.inactiveSelectionBackground}}", "listFilterWidget.outline": "{{variant.scheme.inactiveSelectionBackground}}", "listFilterWidget.noMatchesOutline": "{{variant.scheme.inactiveSelectionBackground}}" diff --git a/yarn.lock b/yarn.lock index e5a7e04..c7c059a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,18 @@ # yarn lockfile v1 +"@babel/register@7.4.4": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.4.4.tgz#370a68ba36f08f015a8b35d4864176c6b65d7a23" + integrity sha512-sn51H88GRa00+ZoMqCVgOphmswG4b7mhf9VOB0LUBAieykq2GnRFerlN+JQkO/ntT7wz4jaHNSRPg9IdMPEUkA== + dependencies: + core-js "^3.0.0" + find-cache-dir "^2.0.0" + lodash "^4.17.11" + mkdirp "^0.5.1" + pirates "^4.0.0" + source-map-support "^0.5.9" + "@fimbul/bifrost@^0.17.0": version "0.17.0" resolved "https://registry.yarnpkg.com/@fimbul/bifrost/-/bifrost-0.17.0.tgz#f0383ba7e40992e3193dc87e2ddfde2ad62a9cf4" @@ -1316,6 +1328,11 @@ commander@~2.17.1: version "2.17.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" +commondir@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" + integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= + compare-func@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648" @@ -1496,6 +1513,11 @@ core-js@^2.4.0, core-js@^2.5.0: version "2.6.4" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.4.tgz#b8897c062c4d769dd30a0ac5c73976c47f92ea0d" +core-js@^3.0.0: + version "3.1.4" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.4.tgz#3a2837fc48e582e1ae25907afcd6cf03b0cc7a07" + integrity sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ== + core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -2035,6 +2057,15 @@ fill-range@^4.0.0: repeat-string "^1.6.1" to-regex-range "^2.1.0" +find-cache-dir@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7" + integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ== + dependencies: + commondir "^1.0.1" + make-dir "^2.0.0" + pkg-dir "^3.0.0" + find-index@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4" @@ -2052,6 +2083,13 @@ find-up@^2.0.0, find-up@^2.1.0: dependencies: locate-path "^2.0.0" +find-up@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" + integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== + dependencies: + locate-path "^3.0.0" + findup-sync@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc" @@ -3275,6 +3313,14 @@ locate-path@^2.0.0: p-locate "^2.0.0" path-exists "^3.0.0" +locate-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" + integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== + dependencies: + p-locate "^3.0.0" + path-exists "^3.0.0" + lodash._basecopy@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36" @@ -3379,7 +3425,7 @@ lodash.templatesettings@^4.0.0: dependencies: lodash._reinterpolate "~3.0.0" -lodash@^4.17.10, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.3.0: +lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.3.0: version "4.17.11" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" @@ -3411,6 +3457,14 @@ lru-cache@^4.0.1: pseudomap "^1.0.2" yallist "^2.1.2" +make-dir@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" + integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA== + dependencies: + pify "^4.0.1" + semver "^5.6.0" + make-error@^1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8" @@ -3717,6 +3771,11 @@ node-fetch@1.6.3: encoding "^0.1.11" is-stream "^1.0.1" +node-modules-regexp@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" + integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= + node.extend@^1.1.2: version "1.1.8" resolved "https://registry.yarnpkg.com/node.extend/-/node.extend-1.1.8.tgz#0aab3e63789f4e6d68b42bc00073ad1881243cf0" @@ -3931,16 +3990,35 @@ p-limit@^1.1.0: dependencies: p-try "^1.0.0" +p-limit@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2" + integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ== + dependencies: + p-try "^2.0.0" + p-locate@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" dependencies: p-limit "^1.1.0" +p-locate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" + integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== + dependencies: + p-limit "^2.0.0" + p-try@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== + pako@~1.0.5: version "1.0.8" resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.8.tgz#6844890aab9c635af868ad5fecc62e8acbba3ea4" @@ -4105,6 +4183,11 @@ pify@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" +pify@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" + integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== + pinkie-promise@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" @@ -4115,6 +4198,20 @@ pinkie@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" +pirates@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87" + integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA== + dependencies: + node-modules-regexp "^1.0.0" + +pkg-dir@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" + integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw== + dependencies: + find-up "^3.0.0" + plugin-error@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace" @@ -4595,6 +4692,11 @@ semver@^4.1.0: version "4.3.6" resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" +semver@^5.6.0: + version "5.7.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b" + integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA== + sequencify@~0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/sequencify/-/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c" @@ -4720,6 +4822,14 @@ source-map-support@^0.5.0: buffer-from "^1.0.0" source-map "^0.6.0" +source-map-support@^0.5.9: + version "0.5.12" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599" + integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + source-map-url@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"