timamsk/vscodium
1
0
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2026-04-11 16:27:18 +10:00
Code Issues Packages Projects Releases Wiki Activity
Files
master
vscodium/patches/fix-policies.patch

276 lines
17 KiB
Diff
Raw Permalink Blame History

# 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
--- a/build/.moduleignore
+++ b/build/.moduleignore
@@ -128,9 +128,11 @@ vsda/**
-@vscode/policy-watcher/build/**
-@vscode/policy-watcher/.husky/**
-@vscode/policy-watcher/src/**
-@vscode/policy-watcher/binding.gyp
-@vscode/policy-watcher/README.md
-@vscode/policy-watcher/index.d.ts
-!@vscode/policy-watcher/build/Release/vscode-policy-watcher.node
+@vscodium/policy-watcher/.github/**
+@vscodium/policy-watcher/.husky/**
+@vscodium/policy-watcher/build/**
+@vscodium/policy-watcher/src/**
+@vscodium/policy-watcher/.release-it.yml
+@vscodium/policy-watcher/binding.gyp
+@vscodium/policy-watcher/README.md
+@vscodium/policy-watcher/index.d.ts
+!@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
--- a/build/lib/policies/basePolicy.ts
+++ b/build/lib/policies/basePolicy.ts
@@ -38,3 +38,3 @@ export abstract class BasePolicy implements Policy {
return [
- `<policy name="${this.name}" class="Both" displayName="$(string.${this.name})" explainText="$(string.${this.name}_${this.description.nlsKey.replace(/\./g, '_')})" key="Software\\Policies\\Microsoft\\${regKey}" presentation="$(presentation.${this.name})">`,
+ `<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
--- 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
<policyNamespaces>
- <target prefix="${regKey}" namespace="Microsoft.Policies.${regKey}" />
+ <target prefix="${regKey}" namespace="!!ORG_NAME!!.Policies.${regKey}" />
</policyNamespaces>
@@ -167,3 +167,3 @@ export function renderProfileManifest(appName: string, bundleIdentifier: string,
<key>pfm_default</key>
- <string>Microsoft</string>
+ <string>!!ORG_NAME!!</string>
<key>pfm_name</key>
@@ -185,3 +185,3 @@ export function renderProfileManifest(appName: string, bundleIdentifier: string,
<key>pfm_app_url</key>
- <string>https://code.visualstudio.com/</string>
+ <string>https://github.com/VSCodium/vscodium</string>
<key>pfm_description</key>
@@ -189,3 +189,3 @@ export function renderProfileManifest(appName: string, bundleIdentifier: string,
<key>pfm_documentation_url</key>
- <string>https://code.visualstudio.com/docs/setup/enterprise</string>
+ <string>https://github.com/VSCodium/vscodium</string>
<key>pfm_domain</key>
@@ -255,3 +255,3 @@ ${policyEntries}
<key>PayloadDescription</key>
- <string>This profile manages ${appName}. For more information see https://code.visualstudio.com/docs/setup/enterprise</string>
+ <string>This profile manages ${appName}. For more information see https://github.com/VSCodium/vscodium</string>
<key>PayloadDisplayName</key>
@@ -261,3 +261,3 @@ ${policyEntries}
<key>PayloadOrganization</key>
- <string>Microsoft</string>
+ <string>!!ORG_NAME!!</string>
<key>PayloadType</key>
diff --git a/eslint.config.js b/eslint.config.js
index f008259..f87fda1 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1464,3 +1464,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
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,3 +21,2 @@
"@vscode/native-watchdog": "^1.4.6",
- "@vscode/policy-watcher": "^1.3.2",
"@vscode/proxy-agent": "^0.39.1",
@@ -33,2 +32,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 @@
},
- "node_modules/@vscode/policy-watcher": {
- "version": "1.3.7",
- "resolved": "https://registry.npmjs.org/@vscode/policy-watcher/-/policy-watcher-1.3.7.tgz",
- "integrity": "sha512-OvIczTbtGLZs7YU0ResbjM0KEB2ORBnlJ4ICxaB9fKHNVBwNVp4i2qIkDQGp3UBGtu7P8/+eg4/ZKk2oJGFcug==",
- "hasInstallScript": true,
- "license": "MIT",
- "dependencies": {
- "bindings": "^1.5.0",
- "node-addon-api": "^8.2.0"
- }
- },
- "node_modules/@vscode/policy-watcher/node_modules/node-addon-api": {
- "version": "8.2.0",
- "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.2.0.tgz",
- "integrity": "sha512-qnyuI2ROiCkye42n9Tj5aX1ns7rzj6n7zW1XReSnLSL9v/vbLeR6fJq6PU27YU/ICfYw6W7Ouk/N7cysWu/hlw==",
- "license": "MIT",
- "engines": {
- "node": "^18 || ^20 || >= 21"
- }
- },
"node_modules/@vscode/proxy-agent": {
@@ -4869,2 +4849,22 @@
},
+ "node_modules/@vscodium/policy-watcher": {
+ "version": "1.3.2-255408",
+ "resolved": "https://registry.npmjs.org/@vscodium/policy-watcher/-/policy-watcher-1.3.2-255408.tgz",
+ "integrity": "sha512-0KERmB+VkSz9hvFWEDGalCpxQ9+qjLaUazXMBkzWQ9SjKPaD6zU9u6wA4/OUu816JnvCFEeJYEe9WcDZPnKQ1w==",
+ "hasInstallScript": true,
+ "license": "MIT",
+ "dependencies": {
+ "bindings": "^1.5.0",
+ "node-addon-api": "^8.2.0"
+ }
+ },
+ "node_modules/@vscodium/policy-watcher/node_modules/node-addon-api": {
+ "version": "8.6.0",
+ "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.6.0.tgz",
+ "integrity": "sha512-gBVjCaqDlRUk0EwoPNKzIr9KkS9041G/q31IBShPs1Xz6UTA+EXdZADbzqAJQrpDRq71CIMnOP5VMut3SL0z5Q==",
+ "license": "MIT",
+ "engines": {
+ "node": "^18 || ^20 || >= 21"
+ }
+ },
"node_modules/@wdio/config": {
diff --git a/package.json b/package.json
index 54d14ad..47778c2 100644
--- a/package.json
+++ b/package.json
@@ -91,3 +91,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",
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
+++ b/src/vs/base/test/node/uri.perf.data.txt
@@ -14698,48 +14698,48 @@
/Users/example/node_modules/@vscode/node-addon-api/node_addon_api.Makefile
-/Users/example/node_modules/@vscode/policy-watcher/LICENSE
-/Users/example/node_modules/@vscode/policy-watcher/binding.gyp
-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/LICENSE.md
-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/conversion.js
-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/eslint-format.js
-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/clang-format.js
-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/README.md
-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/check-napi.js
-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/except.gypi
-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/napi-inl.deprecated.h
-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/index.js
-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/README.md
-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/napi-inl.h
-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/node_api.gyp
-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/napi.h
-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/package.json
-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/noexcept.gypi
-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/common.gypi
-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/nothing.c
-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/package-support.json
-/Users/example/node_modules/@vscode/policy-watcher/index.js
-/Users/example/node_modules/@vscode/policy-watcher/README.md
-/Users/example/node_modules/@vscode/policy-watcher/package.json
-/Users/example/node_modules/@vscode/policy-watcher/build/vscode-policy-watcher.target.mk
-/Users/example/node_modules/@vscode/policy-watcher/build/gyp-mac-tool
-/Users/example/node_modules/@vscode/policy-watcher/build/Makefile
-/Users/example/node_modules/@vscode/policy-watcher/build/Release/obj.target/vscode-policy-watcher/src/main.o
-/Users/example/node_modules/@vscode/policy-watcher/build/Release/obj.target/vscode-policy-watcher/src/macos/PolicyWatcher.o
-/Users/example/node_modules/@vscode/policy-watcher/build/Release/vscode-policy-watcher.node
-/Users/example/node_modules/@vscode/policy-watcher/build/Release/.deps/Release/vscode-policy-watcher.node.d
-/Users/example/node_modules/@vscode/policy-watcher/build/Release/.deps/Release/obj.target/vscode-policy-watcher/src/macos/PolicyWatcher.o.d
-/Users/example/node_modules/@vscode/policy-watcher/build/Release/.deps/Release/obj.target/vscode-policy-watcher/src/main.o.d
-/Users/example/node_modules/@vscode/policy-watcher/build/config.gypi
-/Users/example/node_modules/@vscode/policy-watcher/build/binding.Makefile
-/Users/example/node_modules/@vscode/policy-watcher/index.d.ts
-/Users/example/node_modules/@vscode/policy-watcher/src/main.cc
-/Users/example/node_modules/@vscode/policy-watcher/src/macos/PolicyWatcher.cc
-/Users/example/node_modules/@vscode/policy-watcher/src/PolicyWatcher.hh
-/Users/example/node_modules/@vscode/policy-watcher/src/linux/PolicyWatcher.cc
-/Users/example/node_modules/@vscode/policy-watcher/src/Policy.hh
-/Users/example/node_modules/@vscode/policy-watcher/src/windows/RegistryPolicy.hh
-/Users/example/node_modules/@vscode/policy-watcher/src/windows/PolicyWatcher.cc
-/Users/example/node_modules/@vscode/policy-watcher/src/windows/NumberPolicy.cc
-/Users/example/node_modules/@vscode/policy-watcher/src/windows/StringPolicy.hh
-/Users/example/node_modules/@vscode/policy-watcher/src/windows/StringPolicy.cc
-/Users/example/node_modules/@vscode/policy-watcher/src/windows/NumberPolicy.hh
+/Users/example/node_modules/@vscodium/policy-watcher/LICENSE
+/Users/example/node_modules/@vscodium/policy-watcher/binding.gyp
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/LICENSE.md
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/conversion.js
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/eslint-format.js
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/clang-format.js
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/README.md
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/check-napi.js
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/except.gypi
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/napi-inl.deprecated.h
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/index.js
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/README.md
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/napi-inl.h
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/node_api.gyp
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/napi.h
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/package.json
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/noexcept.gypi
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/common.gypi
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/nothing.c
+/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/package-support.json
+/Users/example/node_modules/@vscodium/policy-watcher/index.js
+/Users/example/node_modules/@vscodium/policy-watcher/README.md
+/Users/example/node_modules/@vscodium/policy-watcher/package.json
+/Users/example/node_modules/@vscodium/policy-watcher/build/vscode-policy-watcher.target.mk
+/Users/example/node_modules/@vscodium/policy-watcher/build/gyp-mac-tool
+/Users/example/node_modules/@vscodium/policy-watcher/build/Makefile
+/Users/example/node_modules/@vscodium/policy-watcher/build/Release/obj.target/vscode-policy-watcher/src/main.o
+/Users/example/node_modules/@vscodium/policy-watcher/build/Release/obj.target/vscode-policy-watcher/src/macos/PolicyWatcher.o
+/Users/example/node_modules/@vscodium/policy-watcher/build/Release/vscode-policy-watcher.node
+/Users/example/node_modules/@vscodium/policy-watcher/build/Release/.deps/Release/vscode-policy-watcher.node.d
+/Users/example/node_modules/@vscodium/policy-watcher/build/Release/.deps/Release/obj.target/vscode-policy-watcher/src/macos/PolicyWatcher.o.d
+/Users/example/node_modules/@vscodium/policy-watcher/build/Release/.deps/Release/obj.target/vscode-policy-watcher/src/main.o.d
+/Users/example/node_modules/@vscodium/policy-watcher/build/config.gypi
+/Users/example/node_modules/@vscodium/policy-watcher/build/binding.Makefile
+/Users/example/node_modules/@vscodium/policy-watcher/index.d.ts
+/Users/example/node_modules/@vscodium/policy-watcher/src/main.cc
+/Users/example/node_modules/@vscodium/policy-watcher/src/macos/PolicyWatcher.cc
+/Users/example/node_modules/@vscodium/policy-watcher/src/PolicyWatcher.hh
+/Users/example/node_modules/@vscodium/policy-watcher/src/linux/PolicyWatcher.cc
+/Users/example/node_modules/@vscodium/policy-watcher/src/Policy.hh
+/Users/example/node_modules/@vscodium/policy-watcher/src/windows/RegistryPolicy.hh
+/Users/example/node_modules/@vscodium/policy-watcher/src/windows/PolicyWatcher.cc
+/Users/example/node_modules/@vscodium/policy-watcher/src/windows/NumberPolicy.cc
+/Users/example/node_modules/@vscodium/policy-watcher/src/windows/StringPolicy.hh
+/Users/example/node_modules/@vscodium/policy-watcher/src/windows/StringPolicy.cc
+/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
--- 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)', () => {
- test('@vscode/policy-watcher', async () => {
- const watcher = await import('@vscode/policy-watcher');
- assert.ok(typeof watcher.createWatcher === 'function', testErrorMessage('@vscode/policy-watcher'));
+ test('@vscodium/policy-watcher', async () => {
+ const watcher = await import('@vscodium/policy-watcher');
+ 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
--- 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';
import { Throttler } from '../../../base/common/async.js';
-import type { PolicyUpdate, Watcher } from '@vscode/policy-watcher';
+import type { PolicyUpdate, Watcher } from '@vscodium/policy-watcher';
import { MutableDisposable } from '../../../base/common/lifecycle.js';
@@ -27,3 +27,3 @@ export class NativePolicyService extends AbstractPolicyService implements IPolic
- 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 {
- this.watcher.value = createWatcher(this.productName, policyDefinitions, update => {
+ this.watcher.value = createWatcher('VSCodium', this.productName, policyDefinitions, update => {
this._onDidPolicyChange(update);
Reference in New Issue View Git Blame Copy Permalink