chore: bump vscode to 1.96.4 (#620)

conwnet · Feb 6, 2025 · 9e2ba35 · 9e2ba35
1 parent 6b2463f
commit 9e2ba35
Show file tree

Hide file tree

Showing 16 changed files with 1,256 additions and 11 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
   "license": "ISC",
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250109.0",
-    "@github1s/vscode-web": "0.23.2",
+    "@github1s/vscode-web": "0.23.3",
     "chokidar": "^4.0.3",
     "clean-css": "^5.3.3",
     "copy-webpack-plugin": "^12.0.2",

diff --git a/scripts/link.js b/scripts/link.js
@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 
 import path from 'path';
-import cp from 'child_process';
 import { executeCommand, PROJECT_ROOT } from './utils.js';
 
 const main = () => {

diff --git a/scripts/postinstall.js b/scripts/postinstall.js
@@ -2,7 +2,6 @@
 
 import path from 'path';
 import fs from 'fs-extra';
-import cp from 'child_process';
 import { executeCommand, PROJECT_ROOT } from './utils.js';
 
 const main = () => {

diff --git a/scripts/webpack.js b/scripts/webpack.js
diff --git a/vscode-web/.VERSION b/vscode-web/.VERSION
@@ -1 +1 @@
-1.96.2
+1.96.4
diff --git a/vscode-web/package.json b/vscode-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@github1s/vscode-web",
-  "version": "0.23.2",
+  "version": "0.23.3",
   "description": "VS Code web for GitHub1s",
   "author": "github1s",
   "license": "MIT",

diff --git a/vscode-web/scripts/.patch b/vscode-web/scripts/.patch
@@ -7,5 +7,6 @@
   "src/vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.ts": "c220568141adf6ed560bab754ea7769795465c6fa93ecd461e9b59f05ca56377",
   "src/vs/workbench/services/label/common/labelService.ts": "9eacdd41cbcf7f5e2ff7e0b524c495c59a8b4a940834385d486cb5c8b39b903d",
   "src/vs/workbench/services/textfile/browser/textFileService.ts": "64fde77a91847e9881f2a1823e0b12d8af15630602ec9b877b43a3a05ac11eef",
-  "src/vs/base/common/network.ts": "e62486b9d0aec931812589c5bd239d7e8240423a3c80b1327afac4a32d44ef7a"
+  "src/vs/base/common/network.ts": "e62486b9d0aec931812589c5bd239d7e8240423a3c80b1327afac4a32d44ef7a",
+  "src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html": "1b7956deade55aa1420516b62251d412fb578bb1165e2580b21d3d8ace968a67"
 }
diff --git a/vscode-web/scripts/build/nls.js b/vscode-web/scripts/build/nls.js
@@ -46,7 +46,7 @@ const main = () => {
 
 		for (const [file, keys] of nlsKeys) {
 			for (const key of keys) {
-				langMessages.push(contents[file][key] || nlsMessages[langMessages.length]);
+				langMessages.push(contents[file]?.[key] ?? nlsMessages[langMessages.length]);
 			}
 		}
 		if (langMessages.length !== nlsMessages.length) {

diff --git a/vscode-web/scripts/build/package.js b/vscode-web/scripts/build/package.js
diff --git a/vscode-web/scripts/clone.js b/vscode-web/scripts/clone.js
diff --git a/vscode-web/scripts/patch.js b/vscode-web/scripts/patch.js
diff --git a/vscode-web/scripts/watch/extensions.js b/vscode-web/scripts/watch/extensions.js
diff --git a/vscode-web/scripts/watch/source.js b/vscode-web/scripts/watch/source.js
diff --git a/vscode-web/scripts/watch/vscode.js b/vscode-web/scripts/watch/vscode.js