a
/
code-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1896 from cdr/vscode-1.47.2 

Update to VS Code 1.47.2
This commit is contained in:
Asher 2020-07-21 13:51:22 -05:00 committed by GitHub
parent 81d25dd048 de8e9804ad
commit 89cfe6876e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ci/dev/vscode.patch
View File

@ -218,7 +218,7 @@ index 0000000000..88b720ceee
+ common.minifyTask("out-vscode") + common.minifyTask("out-vscode")
+)); +));
diff --git a/package.json b/package.json diff --git a/package.json b/package.json
index 3729a85589..88742d99fc 100644 index 86e3d5140d..2e52256e49 100644
--- a/package.json --- a/package.json
+++ b/package.json +++ b/package.json
@@ -42,6 +42,9 @@ @@ -42,6 +42,9 @@
@ -232,7 +232,7 @@ index 3729a85589..88742d99fc 100644
"chokidar": "3.2.3", "chokidar": "3.2.3",
"graceful-fs": "4.2.3", "graceful-fs": "4.2.3",
diff --git a/product.json b/product.json diff --git a/product.json b/product.json
index e20b354974..92f72662c5 100644 index 5378b017c8..afdadda974 100644
--- a/product.json --- a/product.json
+++ b/product.json +++ b/product.json
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@

2
lib/vscode

@ -1 +1 @@
Subproject commit d5e9aa0227e057a60c82568bf31c04730dc15dcd Subproject commit 17299e413d5590b14ab0340ea477cdd86ff13daf

3
src/browser/pages/vscode.html
View File

@ -84,9 +84,10 @@
xterm: `${staticBase}/node_modules/xterm/lib/xterm.js`, xterm: `${staticBase}/node_modules/xterm/lib/xterm.js`,
"xterm-addon-search": `${staticBase}/node_modules/xterm-addon-search/lib/xterm-addon-search.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-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`, "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`, "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, "vs/nls": nlsConfig,
} }