timamsk/vscodium
1
0
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2026-04-23 19:40:14 +10:00
Code Issues Packages Projects Releases Wiki Activity

feat(1.116): update patches (#2796)

Browse Source
This commit is contained in:
Baptiste Augrain
2026-04-22 01:54:37 +02:00
committed by GitHub
parent 3db4d595d6
commit caebfcd986
23 changed files with 6019 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
patches/fix-policies.patch
View File

@@ -1,10 +1,8 @@
# Fix: Replace @vscode/policy-watcher with @vscodium/policy-watcher
# Documentation: docs/patches.md#fix-policies
diff --git a/build/.moduleignore b/build/.moduleignore
index 5b040cc..8d5fd71 100644
index aaa384bf..25adcdbf 100644
--- a/build/.moduleignore
+++ b/build/.moduleignore
@@ -128,9 +128,11 @@ vsda/**
@@ -153,9 +153,11 @@ vsda/**
-@vscode/policy-watcher/build/**
-@vscode/policy-watcher/.husky/**
@@ -24,7 +22,7 @@ index 5b040cc..8d5fd71 100644
+!@vscodium/policy-watcher/build/Release/vscodium-policy-watcher.node
diff --git a/build/lib/policies/basePolicy.ts b/build/lib/policies/basePolicy.ts
index 7f650ba..db927cb 100644
index 7f650ba7..db927cb4 100644
--- a/build/lib/policies/basePolicy.ts
+++ b/build/lib/policies/basePolicy.ts
@@ -38,3 +38,3 @@ export abstract class BasePolicy implements Policy {
@@ -33,7 +31,7 @@ index 7f650ba..db927cb 100644
+ `<policy name="${this.name}" class="Both" displayName="$(string.${this.name})" explainText="$(string.${this.name}_${this.description.nlsKey.replace(/\./g, '_')})" key="Software\\Policies\\!!ORG_NAME!!\\${regKey}" presentation="$(presentation.${this.name})">`,
` <parentCategory ref="${this.category.name.nlsKey}" />`,
diff --git a/build/lib/policies/render.ts b/build/lib/policies/render.ts
index 47b485d..8437fd4 100644
index 47b485d1..8437fd47 100644
--- a/build/lib/policies/render.ts
+++ b/build/lib/policies/render.ts
@@ -49,3 +49,3 @@ export function renderADMX(regKey: string, versions: string[], categories: Categ
@@ -67,27 +65,27 @@ index 47b485d..8437fd4 100644
+ <string>!!ORG_NAME!!</string>
<key>PayloadType</key>
diff --git a/eslint.config.js b/eslint.config.js
index f008259..f87fda1 100644
index 494a2c2c..c53b46aa 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1464,3 +1464,3 @@ export default tseslint.config(
@@ -1509,3 +1509,3 @@ export default tseslint.config(
'@vscode/native-watchdog',
- '@vscode/policy-watcher',
+ '@vscodium/policy-watcher',
'@vscode/proxy-agent',
diff --git a/package-lock.json b/package-lock.json
index ae566c1..3b3a5dd 100644
index 88c2aee4..d8852aa8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,3 +21,2 @@
@@ -28,3 +28,2 @@
"@vscode/native-watchdog": "^1.4.6",
- "@vscode/policy-watcher": "^1.3.2",
"@vscode/proxy-agent": "^0.39.1",
@@ -33,2 +32,3 @@
"@vscode/proxy-agent": "^0.41.0",
@@ -40,2 +39,3 @@
"@vscodium/native-keymap": "3.3.7-258424",
+ "@vscodium/policy-watcher": "^1.3.2-252465",
"@xterm/addon-clipboard": "^0.3.0-beta.191",
@@ -4538,22 +4538,2 @@
"@xterm/addon-clipboard": "^0.3.0-beta.197",
@@ -3844,22 +3844,2 @@
},
- "node_modules/@vscode/policy-watcher": {
- "version": "1.3.7",
@@ -110,7 +108,7 @@ index ae566c1..3b3a5dd 100644
- }
- },
"node_modules/@vscode/proxy-agent": {
@@ -4869,2 +4849,22 @@
@@ -4175,2 +4155,22 @@
},
+ "node_modules/@vscodium/policy-watcher": {
+ "version": "1.3.2-255408",
@@ -134,16 +132,16 @@ index ae566c1..3b3a5dd 100644
+ },
"node_modules/@wdio/config": {
diff --git a/package.json b/package.json
index 54d14ad..47778c2 100644
index 166f0cae..51cd5977 100644
--- a/package.json
+++ b/package.json
@@ -91,3 +91,3 @@
@@ -105,3 +105,3 @@
"@vscode/native-watchdog": "^1.4.6",
- "@vscode/policy-watcher": "^1.3.2",
+ "@vscodium/policy-watcher": "^1.3.2-252465",
"@vscode/proxy-agent": "^0.39.1",
"@vscode/proxy-agent": "^0.41.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
index ee0a24b5..881ce36a 100644
--- a/src/vs/base/test/node/uri.perf.data.txt
+++ b/src/vs/base/test/node/uri.perf.data.txt
@@ -14698,48 +14698,48 @@
@@ -242,7 +240,7 @@ index ee0a24b..881ce36 100644
+/Users/example/node_modules/@vscodium/policy-watcher/src/windows/NumberPolicy.hh
/Users/example/node_modules/@vscode/vscode-languagedetection/CODE_OF_CONDUCT.md
diff --git a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
index ca6cea2..32b22fe 100644
index ca6cea22..32b22fed 100644
--- a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
+++ b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
@@ -62,5 +62,5 @@ flakySuite('Native Modules (all platforms)', () => {
@@ -255,7 +253,7 @@ index ca6cea2..32b22fe 100644
+ assert.ok(typeof watcher.createWatcher === 'function', testErrorMessage('@vscodium/policy-watcher'));
});
diff --git a/src/vs/platform/policy/node/nativePolicyService.ts b/src/vs/platform/policy/node/nativePolicyService.ts
index feb4ba1..4d9e0c3 100644
index 6039dbb7..f2ea09cf 100644
--- a/src/vs/platform/policy/node/nativePolicyService.ts
+++ b/src/vs/platform/policy/node/nativePolicyService.ts
@@ -8,3 +8,3 @@ import { IStringDictionary } from '../../../base/common/collections.js';
@@ -268,8 +266,8 @@ index feb4ba1..4d9e0c3 100644
- const { createWatcher } = await import('@vscode/policy-watcher');
+ const { createWatcher } = await import('@vscodium/policy-watcher');
@@ -31,3 +31,3 @@ export class NativePolicyService extends AbstractPolicyService implements IPolic
try {
@@ -32,3 +32,3 @@ export class NativePolicyService extends AbstractPolicyService implements IPolic
this.logService.trace(`Creating watcher for productName ${this.productName}`);
- this.watcher.value = createWatcher(this.productName, policyDefinitions, update => {
+ this.watcher.value = createWatcher('VSCodium', this.productName, policyDefinitions, update => {
this._onDidPolicyChange(update);