feat(1.104): update patches (#2491)

Author: daiyam

announcements-extra.json

@@ -1,7 +1,2 @@
 [
-  {
-    "id": "#2358",
-    "title": "Wanted! Feedback for new website :)",
-    "url": "https://github.com/VSCodium/vscodium/discussions/2358"
-  }
 ]

patches/brand.patch

@@ -1,9 +1,9 @@
 diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
-index 56220de..68d708f 100644
+index 549cfc6..9632509 100644
 --- a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
 +++ b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
-@@ -142,3 +142,3 @@ configurationRegistry.registerConfiguration({
- 			markdownDescription: nls.localize('chat.commandCenter.enabled', "Controls whether the command center shows a menu for actions to control Copilot (requires {0}).", '`#window.commandCenter#`'),
+@@ -171,3 +171,3 @@ configurationRegistry.registerConfiguration({
+ 			markdownDescription: nls.localize('chat.commandCenter.enabled', "Controls whether the command center shows a menu for actions to control chat (requires {0}).", '`#window.commandCenter#`'),
 -			default: true
 +			default: false
  		},

patches/chat.patch

@@ -1,9 +1,9 @@
 diff --git a/src/bootstrap-esm.ts b/src/bootstrap-esm.ts
-index c4a55e6..7285051 100644
+index 54681a2..39f72ad 100644
 --- a/src/bootstrap-esm.ts
 +++ b/src/bootstrap-esm.ts
 @@ -6,3 +6,3 @@
- import * as fs from 'fs';
+ import * as fs from 'node:fs';
 -import { register } from 'node:module';
 +import * as Module from 'node:module';
  import { product, pkg } from './bootstrap-meta.js';
@@ -18,25 +18,3 @@ index c4a55e6..7285051 100644
 +	// @ts-ignore
 +	Module.register(`data:text/javascript;base64,${Buffer.from(jsCode).toString('base64')}`, import.meta.url);
  }
-diff --git a/src/bootstrap-esm.ts.rej b/src/bootstrap-esm.ts.rej
-new file mode 100644
-index 0000000..df9a975
---- /dev/null
-+++ b/src/bootstrap-esm.ts.rej
-@@ -0,0 +1,16 @@
-+diff a/src/bootstrap-esm.ts b/src/bootstrap-esm.ts	(rejected hunks)
-+@@ -6,3 +6,3 @@
-+ import * as fs from 'fs';
-+-import { createRequire, register } from 'node:module';
-++import * as Module from 'node:module';
-+ import { product, pkg } from './bootstrap-meta.js';
-+@@ -12,6 +12,7 @@ import { INLSConfiguration } from './vs/nls.js';
-+ 
-+-const require = createRequire(import.meta.url);
-++const require = Module.createRequire(import.meta.url);
-+ 
-+ // Install a hook to module resolution to map 'fs' to 'original-fs'
-+-if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) {
-++// @ts-ignore
-++if (Module.register && (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron'])) {
-+ 	const jsCode = `

patches/linux/fix-reh-bootstrap.patch

@@ -1,11 +1,11 @@
 diff --git a/src/main.ts b/src/main.ts
-index 1600666..eb6eee9 100644
+index deba4c4..1b41bde 100644
 --- a/src/main.ts
 +++ b/src/main.ts
 @@ -8,2 +8,3 @@ import * as fs from 'original-fs';
- import * as os from 'os';
+ import * as os from 'node:os';
 +import { createRequire } from 'node:module';
- import { performance } from 'perf_hooks';
+ import { performance } from 'node:perf_hooks';
 @@ -22,2 +23,4 @@ import { NativeParsedArgs } from './vs/platform/environment/common/argv.js';
 
 +const require = createRequire(import.meta.url);
@@ -31,7 +31,7 @@ index 1600666..eb6eee9 100644
 +	resolveUserProduct();
 
 diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
-index a299f02..cca9de6 100644
+index 5a6c171..0cb5e20 100644
 --- a/src/vs/platform/product/common/product.ts
 +++ b/src/vs/platform/product/common/product.ts
 @@ -31,2 +31,36 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) {

patches/merge-user-product.patch

@@ -59,13 +59,13 @@ index d7b29f2..1eb07aa 100644
 +						'@vscodium/policy-watcher',
  						'@vscode/proxy-agent',
 diff --git a/package-lock.json b/package-lock.json
-index cef5e6a..2be4f62 100644
+index 1349d08..a6a2212 100644
 --- a/package-lock.json
 +++ b/package-lock.json
 @@ -18,3 +18,2 @@
          "@vscode/iconv-lite-umd": "0.7.0",
 -        "@vscode/policy-watcher": "^1.3.2",
-         "@vscode/proxy-agent": "^0.32.0",
+         "@vscode/proxy-agent": "^0.33.0",
 @@ -29,2 +28,3 @@
          "@vscode/windows-registry": "^1.1.0",
 +        "@vscodium/policy-watcher": "^1.3.2-252465",
@@ -117,14 +117,14 @@ index cef5e6a..2be4f62 100644
 +    },
      "node_modules/@webassemblyjs/ast": {
 diff --git a/package.json b/package.json
-index 48fa670..db19440 100644
+index d9385d4..56d4690 100644
 --- a/package.json
 +++ b/package.json
 @@ -78,3 +78,3 @@
      "@vscode/iconv-lite-umd": "0.7.0",
 -    "@vscode/policy-watcher": "^1.3.2",
 +    "@vscodium/policy-watcher": "^1.3.2-252465",
-     "@vscode/proxy-agent": "^0.32.0",
+     "@vscode/proxy-agent": "^0.33.0",
 diff --git a/src/vs/base/test/node/uri.perf.data.txt b/src/vs/base/test/node/uri.perf.data.txt
 index ee0a24b..881ce36 100644
 --- a/src/vs/base/test/node/uri.perf.data.txt

patches/policies.patch

@@ -1,4 +1,4 @@
 {
   "tag": "1.104.0",
-  "commit": "70e7eae7709159b57b503df2541e0cb2e7b66c92"
+  "commit": "966ec1415440da5f1ef53acbd97ba2113add8853"
 }