From de8e9804adb6b6917040a03fa585a0d51332f006 Mon Sep 17 00:00:00 2001 From: Asher Date: Tue, 21 Jul 2020 13:03:07 -0500 Subject: [PATCH] Update to VS Code 1.47.2 --- ci/dev/vscode.patch | 4 ++-- lib/vscode | 2 +- src/browser/pages/vscode.html | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ci/dev/vscode.patch b/ci/dev/vscode.patch index 05115823..ec10c3fa 100644 --- a/ci/dev/vscode.patch +++ b/ci/dev/vscode.patch @@ -218,7 +218,7 @@ index 0000000000..88b720ceee + common.minifyTask("out-vscode") +)); diff --git a/package.json b/package.json -index 3729a85589..88742d99fc 100644 +index 86e3d5140d..2e52256e49 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,9 @@ @@ -232,7 +232,7 @@ index 3729a85589..88742d99fc 100644 "chokidar": "3.2.3", "graceful-fs": "4.2.3", diff --git a/product.json b/product.json -index e20b354974..92f72662c5 100644 +index 5378b017c8..afdadda974 100644 --- a/product.json +++ b/product.json @@ -20,7 +20,7 @@ diff --git a/lib/vscode b/lib/vscode index d5e9aa02..17299e41 160000 --- a/lib/vscode +++ b/lib/vscode @@ -1 +1 @@ -Subproject commit d5e9aa0227e057a60c82568bf31c04730dc15dcd +Subproject commit 17299e413d5590b14ab0340ea477cdd86ff13daf diff --git a/src/browser/pages/vscode.html b/src/browser/pages/vscode.html index 72c39824..a1f7fa49 100644 --- a/src/browser/pages/vscode.html +++ b/src/browser/pages/vscode.html @@ -84,9 +84,10 @@ xterm: `${staticBase}/node_modules/xterm/lib/xterm.js`, "xterm-addon-search": `${staticBase}/node_modules/xterm-addon-search/lib/xterm-addon-search.js`, "xterm-addon-unicode11": `${staticBase}/node_modules/xterm-addon-unicode11/lib/xterm-addon-unicode11.js`, - "xterm-addon-web-links": `${staticBase}/node_modules/xterm-addon-web-links/lib/xterm-addon-web-links.js`, "xterm-addon-webgl": `${staticBase}/node_modules/xterm-addon-webgl/lib/xterm-addon-webgl.js`, "semver-umd": `${staticBase}/node_modules/semver-umd/lib/semver-umd.js`, + "iconv-lite-umd": `${staticBase}/node_modules/iconv-lite-umd/lib/iconv-lite-umd.js`, + jschardet: `${staticBase}/node_modules/jschardet/dist/jschardet.min.js`, }, "vs/nls": nlsConfig, }