From 8bd9a0d4bc389ee0509f731a6a257102dc175a48 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2019 04:31:34 +0000 Subject: [PATCH 1/3] Bump sass-loader from 7.2.0 to 7.3.1 Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 7.2.0 to 7.3.1. - [Release notes](https://github.com/webpack-contrib/sass-loader/releases) - [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/sass-loader/compare/v7.2.0...v7.3.1) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 2d217cfb..d1bf0238 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "pug-static-loader": "2.0.0", "raven-js": "3.27.2", "raw-loader": "3.1.0", - "sass-loader": "^7.2.0", + "sass-loader": "^7.3.1", "shelljs": "0.8.3", "source-code-pro": "^2.30.1", "source-sans-pro": "2.45.0", diff --git a/yarn.lock b/yarn.lock index c6edabd5..02238c8f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5798,16 +5798,16 @@ sass-graph@^2.2.4: scss-tokenizer "^0.2.3" yargs "^7.0.0" -sass-loader@^7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.2.0.tgz#e34115239309d15b2527cb62b5dfefb62a96ff7f" - integrity sha512-h8yUWaWtsbuIiOCgR9fd9c2lRXZ2uG+h8Dzg/AGNj+Hg/3TO8+BBAW9mEP+mh8ei+qBKqSJ0F1FLlYjNBc61OA== +sass-loader@^7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.3.1.tgz#a5bf68a04bcea1c13ff842d747150f7ab7d0d23f" + integrity sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA== dependencies: clone-deep "^4.0.1" loader-utils "^1.0.1" neo-async "^2.5.0" pify "^4.0.1" - semver "^5.5.0" + semver "^6.3.0" sax@^1.2.4: version "1.2.4" @@ -5860,10 +5860,10 @@ semver@5.5.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA== -semver@^6.0.0, semver@^6.1.0, semver@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.2.0.tgz#4d813d9590aaf8a9192693d6c85b9344de5901db" - integrity sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A== +semver@^6.0.0, semver@^6.1.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" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== semver@~5.3.0: version "5.3.0" From 7b9a6f10550c50e17025fa559edd6c42469d035a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2019 04:46:59 +0000 Subject: [PATCH 2/3] Bump @fortawesome/fontawesome-free from 5.10.1 to 5.10.2 Bumps [@fortawesome/fontawesome-free](https://github.com/FortAwesome/Font-Awesome) from 5.10.1 to 5.10.2. - [Release notes](https://github.com/FortAwesome/Font-Awesome/releases) - [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/master/CHANGELOG.md) - [Commits](https://github.com/FortAwesome/Font-Awesome/compare/5.10.1...5.10.2) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 2d217cfb..024d1192 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "devDependencies": { - "@fortawesome/fontawesome-free": "^5.10.1", + "@fortawesome/fontawesome-free": "^5.10.2", "@types/electron-config": "^3.2.2", "@types/electron-debug": "^2.1.0", "@types/fs-promise": "1.0.3", diff --git a/yarn.lock b/yarn.lock index c6edabd5..72925b2f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22,10 +22,10 @@ esutils "^2.0.2" js-tokens "^4.0.0" -"@fortawesome/fontawesome-free@^5.10.1": - version "5.10.1" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.10.1.tgz#dec28ee02c3fc51da46d53ce4da9d5787312fbd7" - integrity sha512-PYncBhgN1l02mwHmczukexmu4yRTjRDAAdcK62jdWSAW8epcnZ9K2win/7rMrffiv/c7XLVDA8vD+yi6WyvbGQ== +"@fortawesome/fontawesome-free@^5.10.2": + version "5.10.2" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.10.2.tgz#27e02da1e34b50c9869179d364fb46627b521130" + integrity sha512-9pw+Nsnunl9unstGEHQ+u41wBEQue6XPBsILXtJF/4fNN1L3avJcMF/gGF86rIjeTAgfLjTY9ndm68/X4f4idQ== "@sindresorhus/is@^0.14.0": version "0.14.0" From 4bf2963d1e36e80d65923929404771a6bd611610 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Tue, 27 Aug 2019 12:21:48 +0200 Subject: [PATCH 3/3] proper background when copying as HTML --- terminus-terminal/src/frontends/xtermFrontend.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/terminus-terminal/src/frontends/xtermFrontend.ts b/terminus-terminal/src/frontends/xtermFrontend.ts index 17b37f97..1a9a6f84 100644 --- a/terminus-terminal/src/frontends/xtermFrontend.ts +++ b/terminus-terminal/src/frontends/xtermFrontend.ts @@ -267,7 +267,7 @@ export class XTermFrontend extends Frontend { return html } - private getHexColor (mode: number, color: number): string { + private getHexColor (mode: number, color: number, def: string): string { if (mode === Attributes.CM_RGB) { const rgb = AttributeData.toColorRGB(color) return rgb.map(x => x.toString(16).padStart(2, '0')).join('') @@ -275,7 +275,7 @@ export class XTermFrontend extends Frontend { if (mode === Attributes.CM_P16 || mode === Attributes.CM_P256) { return this.configService.store.terminal.colorScheme.colors[color] } - return 'transparent' + return def } private getLineAsHTML (y: number, start: number, end: number): string { @@ -285,8 +285,8 @@ export class XTermFrontend extends Frontend { const cell = new CellData() for (let i = start; i < end; i++) { line.loadCell(i, cell) - const fg = this.getHexColor(cell.getFgColorMode(), cell.getFgColor()) - const bg = this.getHexColor(cell.getBgColorMode(), cell.getBgColor()) + const fg = this.getHexColor(cell.getFgColorMode(), cell.getFgColor(), this.configService.store.terminal.colorScheme.foreground) + const bg = this.getHexColor(cell.getBgColorMode(), cell.getBgColor(), this.configService.store.terminal.colorScheme.background) const style = `color: ${fg}; background: ${bg}; font-weight: ${cell.isBold() ? 'bold' : 'normal'}; font-style: ${cell.isItalic() ? 'italic' : 'normal'}; text-decoration: ${cell.isUnderline() ? 'underline' : 'none'}` if (style !== lastStyle) { if (lastStyle !== null) {