diff --git a/app/package.json b/app/package.json index c9d65fd4..bbbc7e90 100644 --- a/app/package.json +++ b/app/package.json @@ -31,7 +31,7 @@ "keytar": "4.13.0", "mz": "^2.7.0", "ngx-toastr": "^10.2.0", - "node-pty": "^0.9.0-beta25", + "node-pty": "^0.10.0-beta2", "npm": "6.9.0", "path": "0.12.7", "rxjs": "^6.5.3", @@ -49,6 +49,6 @@ "devDependencies": { "@types/mz": "0.0.32", "@types/node": "12.7.12", - "node-abi": "^2.11.0" + "node-abi": "^2.12.0" } } diff --git a/app/yarn.lock b/app/yarn.lock index 69eb034d..0e2bb4a7 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -1892,10 +1892,10 @@ ngx-toastr@^10.2.0: dependencies: tslib "^1.9.0" -node-abi@^2.11.0, node-abi@^2.7.0: - version "2.11.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.11.0.tgz#b7dce18815057544a049be5ae75cd1fdc2e9ea59" - integrity sha512-kuy/aEg75u40v378WRllQ4ZexaXJiCvB68D2scDXclp/I4cRq6togpbOoKhmN07tns9Zldu51NNERo0wehfX9g== +node-abi@^2.12.0, node-abi@^2.7.0: + version "2.12.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.12.0.tgz#40e9cfabdda1837863fa825e7dfa0b15686adf6f" + integrity sha512-VhPBXCIcvmo/5K8HPmnWJyyhvgKxnHTUMXR/XwGHV68+wrgkzST4UmQrY/XszSWA5dtnXpNp528zkcyJ/pzVcw== dependencies: semver "^5.4.1" @@ -1943,10 +1943,10 @@ node-gyp@^4.0.0: tar "^4.4.8" which "1" -node-pty@^0.9.0-beta25: - version "0.9.0-beta25" - resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.9.0-beta25.tgz#9a6f28f9f32e74c73ee8153e6a929d071d984ea3" - integrity sha512-oEs1BmGm6erVSqwZRLCl5u46SA23pB7yUpL1H197Yunz5IzDFFLa0C53mxrkI2O/ORIbwMZZwa0LMKaN1u4THw== +node-pty@^0.10.0-beta2: + version "0.10.0-beta2" + resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.10.0-beta2.tgz#6fd0d2fbbe881869e4e19795a05c557ac958da81" + integrity sha512-IU2lzlPUZ+gKG7pHJjzBHpnuwPTxWGgT3iyQicZfdL7dwLvP5cm00QxavAXCInBmRkOMhvM4aBSKvfzqQnCDBA== dependencies: nan "^2.14.0" @@ -2792,12 +2792,7 @@ semver-diff@^2.0.0: dependencies: semver "^5.0.3" -"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1: - version "5.7.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b" - integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA== - -semver@^5.6.0: +"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== diff --git a/package.json b/package.json index 2e8f2d22..6d3287f9 100644 --- a/package.json +++ b/package.json @@ -5,12 +5,12 @@ "@types/electron-debug": "^2.1.0", "@types/js-yaml": "^3.12.1", "@types/node": "12.7.12", - "@types/webpack-env": "1.13.9", + "@types/webpack-env": "1.14.1", "@typescript-eslint/eslint-plugin": "^2.3.1", "@typescript-eslint/parser": "^2.3.1", "apply-loader": "2.0.0", "awesome-typescript-loader": "^5.0.0", - "core-js": "^3.3.2", + "core-js": "^3.3.3", "cross-env": "6.0.3", "css-loader": "3.2.0", "electron": "^6.0.12", @@ -23,9 +23,9 @@ "graceful-fs": "^4.2.2", "html-loader": "0.5.5", "json-loader": "0.5.7", - "node-abi": "^2.11.0", + "node-abi": "^2.12.0", "node-gyp": "^6.0.0", - "node-sass": "^4.12.0", + "node-sass": "^4.13.0", "npmlog": "4.1.2", "npx": "^10.2.0", "pug": "^2.0.4", @@ -47,7 +47,7 @@ "typescript": "^3.6.4", "url-loader": "^2.2.0", "val-loader": "1.1.1", - "webpack": "^4.41.1", + "webpack": "^4.41.2", "webpack-cli": "^3.3.9", "yaml-loader": "0.5.0" }, diff --git a/terminus-core/yarn.lock b/terminus-core/yarn.lock index 9fab672d..f1752808 100644 --- a/terminus-core/yarn.lock +++ b/terminus-core/yarn.lock @@ -118,9 +118,9 @@ colorspace@1.1.x: text-hex "1.0.x" core-js@^3.1.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.3.2.tgz#cd42da1d7b0bb33ef11326be3a721934277ceb42" - integrity sha512-S1FfZpeBchkhyoY76YAdFzKS4zz9aOK7EeFaNA2aJlyXyA+sgqz6xdxmLPGXEAf0nF44MVN1kSjrA9Kt3ATDQg== + version "3.3.3" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.3.3.tgz#b7048d3c6c1a52b5fe55a729c1d4ccdffe0891bb" + integrity sha512-0xmD4vUJRY8nfLyV9zcpC17FtSie5STXzw+HyYw2t8IIvmDnbq7RJUULECCo+NstpJtwK9kx8S+898iyqgeUow== core-util-is@~1.0.0: version "1.0.2" @@ -149,9 +149,9 @@ debug@^4.1.1: ms "^2.1.1" deepmerge@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.1.1.tgz#ee0866e4019fe62c1276b9062d4c4803d9aea14c" - integrity sha512-+qO5WbNBKBaZez95TffdUDnGIo4+r5kmsX8aOb7PDHvXsTbghAmleuxjs6ytNaf5Eg4FGBXDS5vqO61TRi6BMg== + version "4.2.1" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.1.tgz#018a3e5dfe82b95e35e36a9a29ba15ddb194e40f" + integrity sha512-32P7FIV6JKt0hPMFNlWFytzVGpppYHFKdnhFUEMXheWc8Lw4HnHEzJa5yxhaQedDAXv2SI6zD7+UbqnC5k9g9Q== diagnostics@^1.1.1: version "1.1.1" diff --git a/terminus-terminal/src/services/sessions.service.ts b/terminus-terminal/src/services/sessions.service.ts index c200e726..38af203e 100644 --- a/terminus-terminal/src/services/sessions.service.ts +++ b/terminus-terminal/src/services/sessions.service.ts @@ -132,7 +132,7 @@ export class Session extends BaseSession { cwd, env: env, // `1` instead of `true` forces ConPTY even if unstable - experimentalUseConpty: (isWindowsBuild(WIN_BUILD_CONPTY_SUPPORTED) && this.config.store.terminal.useConPTY ? 1 : false) as any, + useConpty: (isWindowsBuild(WIN_BUILD_CONPTY_SUPPORTED) && this.config.store.terminal.useConPTY ? 1 : false) as any, }) this.guessedCWD = cwd || null diff --git a/terminus-terminal/yarn.lock b/terminus-terminal/yarn.lock index adc7df19..415374fc 100644 --- a/terminus-terminal/yarn.lock +++ b/terminus-terminal/yarn.lock @@ -214,9 +214,9 @@ uuid@^3.3.2: integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ== xterm-addon-fit@^0.3.0-beta2: - version "0.3.0-beta3" - resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.3.0-beta3.tgz#c091d1fcff49fbb321a5276fe04cbc90d37f03ad" - integrity sha512-cTRWGje3/WvWly0xF3E/kl8Clr2l/EUiQpbMrpsBpnASQbEdZ+u+OLSYsouT6+H/mO/MX+VzFZKWD/WrZitx7A== + version "0.3.0-beta7" + resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.3.0-beta7.tgz#12fb13453bc58974ddf797827ba7b0a7851c0529" + integrity sha512-z33ayDakyYfvln7/tZW4w6dNXO7njTUrGRViFj5Bbmnl8UTYcxRS3eyYuXACzm3omwbFmFx7LE2Jf7IOD8n3+w== xterm-addon-ligatures@^0.2.0: version "0.2.0" @@ -232,9 +232,9 @@ xterm-addon-search@^0.3.0-beta2: integrity sha512-L5ifwmrQ31/CmY1OR/8Hg2tPIFJB/lga6p0x+AUaxR+MxeiyJ++aRC/uua9InwVprunKrbV6pVp2pL+xlaEJ1Q== xterm-addon-webgl@^0.3.0-beta2: - version "0.3.0-beta9" - resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.3.0-beta9.tgz#98bf95d9ddd24fa9fa12dc4113ff6e8d71df4299" - integrity sha512-AC7Hyiv4J7p8KS7t2oFhMLPYTNecY/+IJ4njs8DDN3MPGRJOvM+utLOxOsnDFpFg0hSrTZU9fgH5/NbfYG+4GA== + version "0.3.0" + resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.3.0.tgz#6e3bec9541ab7d04544533cc93741b4b959e730a" + integrity sha512-p2SLueOfJkyIqDMOo+e1ViOQjE84cA55qCeJelMz6vLW7htGQz7tX1tXTYWrCHihiggq6LFSGoDf2xpIRDP5Ag== xterm@3.15.0-beta98: version "3.15.0-beta98" diff --git a/yarn.lock b/yarn.lock index 5bfe365c..3439da55 100644 --- a/yarn.lock +++ b/yarn.lock @@ -106,10 +106,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.17.tgz#b96d4dd3e427382482848948041d3754d40fd5ce" integrity sha512-p/sGgiPaathCfOtqu2fx5Mu1bcjuP8ALFg4xpGgNkcin7LwRyzUKniEHBKdcE1RPsenq5JVPIpMTJSygLboygQ== -"@types/webpack-env@1.13.9": - version "1.13.9" - resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.9.tgz#a67287861c928ebf4159a908d1fb1a2a34d4097a" - integrity sha512-p8zp5xqkly3g4cCmo2mKOHI9+Z/kObmDj0BmjbDDJQlgDTiEGTbm17MEwTAusV6XceCy+bNw9q/ZHXHyKo3zkg== +"@types/webpack-env@1.14.1": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.14.1.tgz#0d8a53f308f017c53a5ddc3d07f4d6fa76b790d7" + integrity sha512-0Ki9jAAhKDSuLDXOIMADg54Hu60SuBTEsWaJGGy5cV+SSUQ63J2a+RrYYGrErzz39fXzTibhKrAQJAb8M7PNcA== "@typescript-eslint/eslint-plugin@^2.3.1": version "2.3.3" @@ -1452,10 +1452,10 @@ core-js@^2.4.0: version "2.4.1" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e" -core-js@^3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.3.2.tgz#cd42da1d7b0bb33ef11326be3a721934277ceb42" - integrity sha512-S1FfZpeBchkhyoY76YAdFzKS4zz9aOK7EeFaNA2aJlyXyA+sgqz6xdxmLPGXEAf0nF44MVN1kSjrA9Kt3ATDQg== +core-js@^3.3.3: + version "3.3.3" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.3.3.tgz#b7048d3c6c1a52b5fe55a729c1d4ccdffe0891bb" + integrity sha512-0xmD4vUJRY8nfLyV9zcpC17FtSie5STXzw+HyYw2t8IIvmDnbq7RJUULECCo+NstpJtwK9kx8S+898iyqgeUow== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -4208,14 +4208,10 @@ mute-stream@0.0.7, mute-stream@~0.0.4: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" -nan@^2.13.2: +nan@^2.13.2, nan@^2.9.2: version "2.13.2" resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7" -nan@^2.9.2: - version "2.11.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.0.tgz#574e360e4d954ab16966ec102c0c049fd961a099" - nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -4264,10 +4260,10 @@ no-case@^2.2.0: dependencies: lower-case "^1.1.1" -node-abi@^2.11.0, node-abi@^2.8.0, node-abi@^2.9.0: - version "2.11.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.11.0.tgz#b7dce18815057544a049be5ae75cd1fdc2e9ea59" - integrity sha512-kuy/aEg75u40v378WRllQ4ZexaXJiCvB68D2scDXclp/I4cRq6togpbOoKhmN07tns9Zldu51NNERo0wehfX9g== +node-abi@^2.12.0, node-abi@^2.8.0, node-abi@^2.9.0: + version "2.12.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.12.0.tgz#40e9cfabdda1837863fa825e7dfa0b15686adf6f" + integrity sha512-VhPBXCIcvmo/5K8HPmnWJyyhvgKxnHTUMXR/XwGHV68+wrgkzST4UmQrY/XszSWA5dtnXpNp528zkcyJ/pzVcw== dependencies: semver "^5.4.1" @@ -4392,9 +4388,10 @@ node-pre-gyp@^0.10.0: semver "^5.3.0" tar "^4" -node-sass@^4.12.0: - version "4.12.0" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.12.0.tgz#0914f531932380114a30cc5fa4fa63233a25f017" +node-sass@^4.13.0: + version "4.13.0" + resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.0.tgz#b647288babdd6a1cb726de4545516b31f90da066" + integrity sha512-W1XBrvoJ1dy7VsvTAS5q1V45lREbTlZQqFbiHb3R3OTTCma0XBtuG6xZ6Z4506nR4lmHPTqVRwxT6KgtWC97CA== dependencies: async-foreach "^0.1.3" chalk "^1.1.1" @@ -4403,7 +4400,7 @@ node-sass@^4.12.0: get-stdin "^4.0.1" glob "^7.0.3" in-publish "^2.0.0" - lodash "^4.17.11" + lodash "^4.17.15" meow "^3.7.0" mkdirp "^0.5.1" nan "^2.13.2" @@ -7140,10 +7137,10 @@ webpack-sources@^1.4.0, webpack-sources@^1.4.1: source-list-map "^2.0.0" source-map "~0.6.1" -webpack@^4.41.1: - version "4.41.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.1.tgz#5388dd3047d680d5d382a84249fd4750e87372fd" - integrity sha512-ak7u4tUu/U63sCVxA571IuPZO/Q0pZ9cEXKg+R/woxkDzVovq57uB6L2Hlg/pC8LCU+TWpvtcYwsstivQwMJmw== +webpack@^4.41.2: + version "4.41.2" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.2.tgz#c34ec76daa3a8468c9b61a50336d8e3303dce74e" + integrity sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A== dependencies: "@webassemblyjs/ast" "1.8.5" "@webassemblyjs/helper-module-context" "1.8.5"