From 624dc9436df54122e818419d8f3b3981333cb469 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Tue, 21 Jan 2025 19:35:53 +0100 Subject: [PATCH] fix(windows): replace all policy-watcher [slip ci] --- patches/windows/policies.patch | 121 +++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/patches/windows/policies.patch b/patches/windows/policies.patch index 130a3ef..57ac2bb 100644 --- a/patches/windows/policies.patch +++ b/patches/windows/policies.patch @@ -49,6 +49,15 @@ index f602c8a..11919c9 100644 - + +diff --git a/eslint.config.js b/eslint.config.js +index f9f120a..db61adc 100644 +--- a/eslint.config.js ++++ b/eslint.config.js +@@ -798,3 +798,3 @@ export default tseslint.config( + '@vscode/iconv-lite-umd', +- '@vscode/policy-watcher', ++ '@vscodium/policy-watcher', + '@vscode/proxy-agent', diff --git a/package-lock.json b/package-lock.json index 99a6c49..0997218 100644 --- a/package-lock.json @@ -116,6 +125,118 @@ index 2a79290..a924360 100644 - "@vscode/policy-watcher": "^1.1.8", + "@vscodium/policy-watcher": "^1.1.8-2501211616", "@vscode/proxy-agent": "^0.30.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 ++++ 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 e0b99f3..f3af586 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 67f7892..5b8859c 100644 --- a/src/vs/platform/policy/node/nativePolicyService.ts