From d95b65443d9785a3f7a119a1d6fae340885a0a81 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Tue, 7 Jul 2020 14:03:23 +0200 Subject: [PATCH] Encoding euckr does not exist anymore (fix #101847) --- build/package.json | 2 +- build/yarn.lock | 8 ++++---- extensions/git/package.json | 2 +- extensions/git/yarn.lock | 8 ++++---- package.json | 2 +- remote/package.json | 2 +- remote/web/package.json | 2 +- remote/web/yarn.lock | 8 ++++---- remote/yarn.lock | 8 ++++---- .../services/textfile/test/node/encoding/encoding.test.ts | 4 ---- yarn.lock | 8 ++++---- 11 files changed, 25 insertions(+), 29 deletions(-) diff --git a/build/package.json b/build/package.json index 5fb14851a21..e077113da5e 100644 --- a/build/package.json +++ b/build/package.json @@ -38,7 +38,7 @@ "gulp-bom": "^1.0.0", "gulp-sourcemaps": "^1.11.0", "gulp-uglify": "^3.0.0", - "iconv-lite-umd": "0.6.5", + "iconv-lite-umd": "0.6.6", "mime": "^1.3.4", "minimatch": "3.0.4", "minimist": "^1.2.3", diff --git a/build/yarn.lock b/build/yarn.lock index f10fe7302e6..dcd2cbdf812 100644 --- a/build/yarn.lock +++ b/build/yarn.lock @@ -1428,10 +1428,10 @@ https-proxy-agent@^4.0.0: agent-base "5" debug "4" -iconv-lite-umd@0.6.5: - version "0.6.5" - resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.5.tgz#6a1f621a3b4d125f72feff813a9839e1ebd6c722" - integrity sha512-WDegH4al+e3n3jTOStRvm+jzDA3JMUQGgzdAsMxAgcgB0Oi72HjfdsoX08ieKsy3rKexXVjWZr41aOIUaCZnMg== +iconv-lite-umd@0.6.6: + version "0.6.6" + resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.6.tgz#d00c8a822a248066d22b1e90635d8506a469f357" + integrity sha512-I4CCm48Jh10a8ETkgqfu2RofZd9gIcQwAcEI2x9MjgvdrbKxk8DdGpyq3WB7064mJXBgGniZgWky435ropCpmw== ignore@^5.1.1: version "5.1.2" diff --git a/extensions/git/package.json b/extensions/git/package.json index bb63c594582..af28c1419cb 100644 --- a/extensions/git/package.json +++ b/extensions/git/package.json @@ -1878,7 +1878,7 @@ "dependencies": { "byline": "^5.0.0", "file-type": "^7.2.0", - "iconv-lite-umd": "0.6.5", + "iconv-lite-umd": "0.6.6", "jschardet": "2.2.1", "vscode-extension-telemetry": "0.1.1", "vscode-nls": "^4.0.0", diff --git a/extensions/git/yarn.lock b/extensions/git/yarn.lock index 63cd0f53efd..fa04de0ce68 100644 --- a/extensions/git/yarn.lock +++ b/extensions/git/yarn.lock @@ -425,10 +425,10 @@ https-proxy-agent@^2.2.1: agent-base "^4.3.0" debug "^3.1.0" -iconv-lite-umd@0.6.5: - version "0.6.5" - resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.5.tgz#6a1f621a3b4d125f72feff813a9839e1ebd6c722" - integrity sha512-WDegH4al+e3n3jTOStRvm+jzDA3JMUQGgzdAsMxAgcgB0Oi72HjfdsoX08ieKsy3rKexXVjWZr41aOIUaCZnMg== +iconv-lite-umd@0.6.6: + version "0.6.6" + resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.6.tgz#d00c8a822a248066d22b1e90635d8506a469f357" + integrity sha512-I4CCm48Jh10a8ETkgqfu2RofZd9gIcQwAcEI2x9MjgvdrbKxk8DdGpyq3WB7064mJXBgGniZgWky435ropCpmw== inflight@^1.0.4: version "1.0.6" diff --git a/package.json b/package.json index cee07480e4f..243566889f7 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "graceful-fs": "4.2.3", "http-proxy-agent": "^2.1.0", "https-proxy-agent": "^2.2.3", - "iconv-lite-umd": "0.6.5", + "iconv-lite-umd": "0.6.6", "jschardet": "2.2.1", "keytar": "^5.5.0", "minimist": "^1.2.5", diff --git a/remote/package.json b/remote/package.json index 69dd3eda9b0..9940fad32f3 100644 --- a/remote/package.json +++ b/remote/package.json @@ -8,7 +8,7 @@ "graceful-fs": "4.2.3", "http-proxy-agent": "^2.1.0", "https-proxy-agent": "^2.2.3", - "iconv-lite-umd": "0.6.5", + "iconv-lite-umd": "0.6.6", "jschardet": "2.2.1", "minimist": "^1.2.5", "native-watchdog": "1.3.0", diff --git a/remote/web/package.json b/remote/web/package.json index 7bc429e56fb..5082bf2f453 100644 --- a/remote/web/package.json +++ b/remote/web/package.json @@ -2,7 +2,7 @@ "name": "vscode-web", "version": "0.0.0", "dependencies": { - "iconv-lite-umd": "0.6.5", + "iconv-lite-umd": "0.6.6", "jschardet": "2.2.1", "semver-umd": "^5.5.7", "vscode-oniguruma": "1.3.1", diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock index fc0ba030177..ab62c1a6215 100644 --- a/remote/web/yarn.lock +++ b/remote/web/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -iconv-lite-umd@0.6.5: - version "0.6.5" - resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.5.tgz#6a1f621a3b4d125f72feff813a9839e1ebd6c722" - integrity sha512-WDegH4al+e3n3jTOStRvm+jzDA3JMUQGgzdAsMxAgcgB0Oi72HjfdsoX08ieKsy3rKexXVjWZr41aOIUaCZnMg== +iconv-lite-umd@0.6.6: + version "0.6.6" + resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.6.tgz#d00c8a822a248066d22b1e90635d8506a469f357" + integrity sha512-I4CCm48Jh10a8ETkgqfu2RofZd9gIcQwAcEI2x9MjgvdrbKxk8DdGpyq3WB7064mJXBgGniZgWky435ropCpmw== jschardet@2.2.1: version "2.2.1" diff --git a/remote/yarn.lock b/remote/yarn.lock index 53550b20fc6..60a2d849254 100644 --- a/remote/yarn.lock +++ b/remote/yarn.lock @@ -196,10 +196,10 @@ https-proxy-agent@^4.0.0: agent-base "5" debug "4" -iconv-lite-umd@0.6.5: - version "0.6.5" - resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.5.tgz#6a1f621a3b4d125f72feff813a9839e1ebd6c722" - integrity sha512-WDegH4al+e3n3jTOStRvm+jzDA3JMUQGgzdAsMxAgcgB0Oi72HjfdsoX08ieKsy3rKexXVjWZr41aOIUaCZnMg== +iconv-lite-umd@0.6.6: + version "0.6.6" + resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.6.tgz#d00c8a822a248066d22b1e90635d8506a469f357" + integrity sha512-I4CCm48Jh10a8ETkgqfu2RofZd9gIcQwAcEI2x9MjgvdrbKxk8DdGpyq3WB7064mJXBgGniZgWky435ropCpmw== ip@^1.1.5: version "1.1.5" diff --git a/src/vs/workbench/services/textfile/test/node/encoding/encoding.test.ts b/src/vs/workbench/services/textfile/test/node/encoding/encoding.test.ts index c1be26cc0f0..682c0d2a3db 100644 --- a/src/vs/workbench/services/textfile/test/node/encoding/encoding.test.ts +++ b/src/vs/workbench/services/textfile/test/node/encoding/encoding.test.ts @@ -407,10 +407,6 @@ suite('Encoding', () => { continue; // skip over encodings from us } - if (enc === 'euckr') { - continue; // TODO@ben failing test for https://github.com/microsoft/vscode/issues/101847 - } - assert.equal(iconv.encodingExists(enc), true, enc); } }); diff --git a/yarn.lock b/yarn.lock index 7a80f8efd29..8e2af18b80a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4594,10 +4594,10 @@ husky@^0.13.1: is-ci "^1.0.9" normalize-path "^1.0.0" -iconv-lite-umd@0.6.5: - version "0.6.5" - resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.5.tgz#6a1f621a3b4d125f72feff813a9839e1ebd6c722" - integrity sha512-WDegH4al+e3n3jTOStRvm+jzDA3JMUQGgzdAsMxAgcgB0Oi72HjfdsoX08ieKsy3rKexXVjWZr41aOIUaCZnMg== +iconv-lite-umd@0.6.6: + version "0.6.6" + resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.6.tgz#d00c8a822a248066d22b1e90635d8506a469f357" + integrity sha512-I4CCm48Jh10a8ETkgqfu2RofZd9gIcQwAcEI2x9MjgvdrbKxk8DdGpyq3WB7064mJXBgGniZgWky435ropCpmw== iconv-lite@^0.4.19: version "0.4.19"