policies.patch 14 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230
  1. diff --git a/build/.moduleignore b/build/.moduleignore
  2. index 0459b46..49f3c66 100644
  3. --- a/build/.moduleignore
  4. +++ b/build/.moduleignore
  5. @@ -128,9 +128,11 @@ vsda/**
  6. -@vscode/policy-watcher/build/**
  7. -@vscode/policy-watcher/.husky/**
  8. -@vscode/policy-watcher/src/**
  9. -@vscode/policy-watcher/binding.gyp
  10. -@vscode/policy-watcher/README.md
  11. -@vscode/policy-watcher/index.d.ts
  12. -!@vscode/policy-watcher/build/Release/vscode-policy-watcher.node
  13. +@vscodium/policy-watcher/.github/**
  14. +@vscodium/policy-watcher/.husky/**
  15. +@vscodium/policy-watcher/build/**
  16. +@vscodium/policy-watcher/src/**
  17. +@vscodium/policy-watcher/.release-it.yml
  18. +@vscodium/policy-watcher/binding.gyp
  19. +@vscodium/policy-watcher/README.md
  20. +@vscodium/policy-watcher/index.d.ts
  21. +!@vscodium/policy-watcher/build/Release/vscodium-policy-watcher.node
  22. diff --git a/eslint.config.js b/eslint.config.js
  23. index 69a9a69..9a3d7ed 100644
  24. --- a/eslint.config.js
  25. +++ b/eslint.config.js
  26. @@ -1724,3 +1724,3 @@ export default tseslint.config(
  27. '@vscode/iconv-lite-umd',
  28. - '@vscode/policy-watcher',
  29. + '@vscodium/policy-watcher',
  30. '@vscode/proxy-agent',
  31. diff --git a/package-lock.json b/package-lock.json
  32. index 2ffd231..70d78f7 100644
  33. --- a/package-lock.json
  34. +++ b/package-lock.json
  35. @@ -18,3 +18,2 @@
  36. "@vscode/iconv-lite-umd": "0.7.1",
  37. - "@vscode/policy-watcher": "^1.3.2",
  38. "@vscode/proxy-agent": "^0.36.0",
  39. @@ -29,2 +28,3 @@
  40. "@vscode/windows-registry": "^1.1.0",
  41. + "@vscodium/policy-watcher": "^1.3.2-252465",
  42. "@xterm/addon-clipboard": "^0.2.0-beta.119",
  43. @@ -2997,22 +2997,2 @@
  44. },
  45. - "node_modules/@vscode/policy-watcher": {
  46. - "version": "1.3.2",
  47. - "resolved": "https://registry.npmjs.org/@vscode/policy-watcher/-/policy-watcher-1.3.2.tgz",
  48. - "integrity": "sha512-fmNPYysU2ioH99uCaBPiRblEZSnir5cTmc7w91hAxAoYoGpHt2PZPxT5eIOn7FGmPOsjLdQcd6fduFJGYVD4Mw==",
  49. - "hasInstallScript": true,
  50. - "license": "MIT",
  51. - "dependencies": {
  52. - "bindings": "^1.5.0",
  53. - "node-addon-api": "^8.2.0"
  54. - }
  55. - },
  56. - "node_modules/@vscode/policy-watcher/node_modules/node-addon-api": {
  57. - "version": "8.2.0",
  58. - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.2.0.tgz",
  59. - "integrity": "sha512-qnyuI2ROiCkye42n9Tj5aX1ns7rzj6n7zW1XReSnLSL9v/vbLeR6fJq6PU27YU/ICfYw6W7Ouk/N7cysWu/hlw==",
  60. - "license": "MIT",
  61. - "engines": {
  62. - "node": "^18 || ^20 || >= 21"
  63. - }
  64. - },
  65. "node_modules/@vscode/proxy-agent": {
  66. @@ -3412,2 +3392,22 @@
  67. },
  68. + "node_modules/@vscodium/policy-watcher": {
  69. + "version": "1.3.2-252465",
  70. + "resolved": "https://registry.npmjs.org/@vscodium/policy-watcher/-/policy-watcher-1.3.2-252465.tgz",
  71. + "integrity": "sha512-kpnb656HMteBIm8d9LhBpQ5gL2A/4rJrsaLCF0D8IWyrZAQ0UR9EzXM6tZ6p5H+KWot3QUjm0Gry6vMV1yye5Q==",
  72. + "hasInstallScript": true,
  73. + "license": "MIT",
  74. + "dependencies": {
  75. + "bindings": "^1.5.0",
  76. + "node-addon-api": "^8.2.0"
  77. + }
  78. + },
  79. + "node_modules/@vscodium/policy-watcher/node_modules/node-addon-api": {
  80. + "version": "8.3.0",
  81. + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.3.0.tgz",
  82. + "integrity": "sha512-8VOpLHFrOQlAH+qA0ZzuGRlALRA6/LVh8QJldbrC4DY0hXoMP0l4Acq8TzFC018HztWiRqyCEj2aTWY2UvnJUg==",
  83. + "license": "MIT",
  84. + "engines": {
  85. + "node": "^18 || ^20 || >= 21"
  86. + }
  87. + },
  88. "node_modules/@webassemblyjs/ast": {
  89. diff --git a/package.json b/package.json
  90. index 32047ab..ecbce6b 100644
  91. --- a/package.json
  92. +++ b/package.json
  93. @@ -80,3 +80,3 @@
  94. "@vscode/iconv-lite-umd": "0.7.1",
  95. - "@vscode/policy-watcher": "^1.3.2",
  96. + "@vscodium/policy-watcher": "^1.3.2-252465",
  97. "@vscode/proxy-agent": "^0.36.0",
  98. diff --git a/src/vs/base/test/node/uri.perf.data.txt b/src/vs/base/test/node/uri.perf.data.txt
  99. index ee0a24b..881ce36 100644
  100. --- a/src/vs/base/test/node/uri.perf.data.txt
  101. +++ b/src/vs/base/test/node/uri.perf.data.txt
  102. @@ -14698,48 +14698,48 @@
  103. /Users/example/node_modules/@vscode/node-addon-api/node_addon_api.Makefile
  104. -/Users/example/node_modules/@vscode/policy-watcher/LICENSE
  105. -/Users/example/node_modules/@vscode/policy-watcher/binding.gyp
  106. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/LICENSE.md
  107. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/conversion.js
  108. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/eslint-format.js
  109. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/clang-format.js
  110. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/README.md
  111. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/check-napi.js
  112. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/except.gypi
  113. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/napi-inl.deprecated.h
  114. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/index.js
  115. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/README.md
  116. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/napi-inl.h
  117. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/node_api.gyp
  118. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/napi.h
  119. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/package.json
  120. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/noexcept.gypi
  121. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/common.gypi
  122. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/nothing.c
  123. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/package-support.json
  124. -/Users/example/node_modules/@vscode/policy-watcher/index.js
  125. -/Users/example/node_modules/@vscode/policy-watcher/README.md
  126. -/Users/example/node_modules/@vscode/policy-watcher/package.json
  127. -/Users/example/node_modules/@vscode/policy-watcher/build/vscode-policy-watcher.target.mk
  128. -/Users/example/node_modules/@vscode/policy-watcher/build/gyp-mac-tool
  129. -/Users/example/node_modules/@vscode/policy-watcher/build/Makefile
  130. -/Users/example/node_modules/@vscode/policy-watcher/build/Release/obj.target/vscode-policy-watcher/src/main.o
  131. -/Users/example/node_modules/@vscode/policy-watcher/build/Release/obj.target/vscode-policy-watcher/src/macos/PolicyWatcher.o
  132. -/Users/example/node_modules/@vscode/policy-watcher/build/Release/vscode-policy-watcher.node
  133. -/Users/example/node_modules/@vscode/policy-watcher/build/Release/.deps/Release/vscode-policy-watcher.node.d
  134. -/Users/example/node_modules/@vscode/policy-watcher/build/Release/.deps/Release/obj.target/vscode-policy-watcher/src/macos/PolicyWatcher.o.d
  135. -/Users/example/node_modules/@vscode/policy-watcher/build/Release/.deps/Release/obj.target/vscode-policy-watcher/src/main.o.d
  136. -/Users/example/node_modules/@vscode/policy-watcher/build/config.gypi
  137. -/Users/example/node_modules/@vscode/policy-watcher/build/binding.Makefile
  138. -/Users/example/node_modules/@vscode/policy-watcher/index.d.ts
  139. -/Users/example/node_modules/@vscode/policy-watcher/src/main.cc
  140. -/Users/example/node_modules/@vscode/policy-watcher/src/macos/PolicyWatcher.cc
  141. -/Users/example/node_modules/@vscode/policy-watcher/src/PolicyWatcher.hh
  142. -/Users/example/node_modules/@vscode/policy-watcher/src/linux/PolicyWatcher.cc
  143. -/Users/example/node_modules/@vscode/policy-watcher/src/Policy.hh
  144. -/Users/example/node_modules/@vscode/policy-watcher/src/windows/RegistryPolicy.hh
  145. -/Users/example/node_modules/@vscode/policy-watcher/src/windows/PolicyWatcher.cc
  146. -/Users/example/node_modules/@vscode/policy-watcher/src/windows/NumberPolicy.cc
  147. -/Users/example/node_modules/@vscode/policy-watcher/src/windows/StringPolicy.hh
  148. -/Users/example/node_modules/@vscode/policy-watcher/src/windows/StringPolicy.cc
  149. -/Users/example/node_modules/@vscode/policy-watcher/src/windows/NumberPolicy.hh
  150. +/Users/example/node_modules/@vscodium/policy-watcher/LICENSE
  151. +/Users/example/node_modules/@vscodium/policy-watcher/binding.gyp
  152. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/LICENSE.md
  153. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/conversion.js
  154. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/eslint-format.js
  155. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/clang-format.js
  156. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/README.md
  157. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/check-napi.js
  158. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/except.gypi
  159. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/napi-inl.deprecated.h
  160. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/index.js
  161. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/README.md
  162. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/napi-inl.h
  163. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/node_api.gyp
  164. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/napi.h
  165. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/package.json
  166. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/noexcept.gypi
  167. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/common.gypi
  168. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/nothing.c
  169. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/package-support.json
  170. +/Users/example/node_modules/@vscodium/policy-watcher/index.js
  171. +/Users/example/node_modules/@vscodium/policy-watcher/README.md
  172. +/Users/example/node_modules/@vscodium/policy-watcher/package.json
  173. +/Users/example/node_modules/@vscodium/policy-watcher/build/vscode-policy-watcher.target.mk
  174. +/Users/example/node_modules/@vscodium/policy-watcher/build/gyp-mac-tool
  175. +/Users/example/node_modules/@vscodium/policy-watcher/build/Makefile
  176. +/Users/example/node_modules/@vscodium/policy-watcher/build/Release/obj.target/vscode-policy-watcher/src/main.o
  177. +/Users/example/node_modules/@vscodium/policy-watcher/build/Release/obj.target/vscode-policy-watcher/src/macos/PolicyWatcher.o
  178. +/Users/example/node_modules/@vscodium/policy-watcher/build/Release/vscode-policy-watcher.node
  179. +/Users/example/node_modules/@vscodium/policy-watcher/build/Release/.deps/Release/vscode-policy-watcher.node.d
  180. +/Users/example/node_modules/@vscodium/policy-watcher/build/Release/.deps/Release/obj.target/vscode-policy-watcher/src/macos/PolicyWatcher.o.d
  181. +/Users/example/node_modules/@vscodium/policy-watcher/build/Release/.deps/Release/obj.target/vscode-policy-watcher/src/main.o.d
  182. +/Users/example/node_modules/@vscodium/policy-watcher/build/config.gypi
  183. +/Users/example/node_modules/@vscodium/policy-watcher/build/binding.Makefile
  184. +/Users/example/node_modules/@vscodium/policy-watcher/index.d.ts
  185. +/Users/example/node_modules/@vscodium/policy-watcher/src/main.cc
  186. +/Users/example/node_modules/@vscodium/policy-watcher/src/macos/PolicyWatcher.cc
  187. +/Users/example/node_modules/@vscodium/policy-watcher/src/PolicyWatcher.hh
  188. +/Users/example/node_modules/@vscodium/policy-watcher/src/linux/PolicyWatcher.cc
  189. +/Users/example/node_modules/@vscodium/policy-watcher/src/Policy.hh
  190. +/Users/example/node_modules/@vscodium/policy-watcher/src/windows/RegistryPolicy.hh
  191. +/Users/example/node_modules/@vscodium/policy-watcher/src/windows/PolicyWatcher.cc
  192. +/Users/example/node_modules/@vscodium/policy-watcher/src/windows/NumberPolicy.cc
  193. +/Users/example/node_modules/@vscodium/policy-watcher/src/windows/StringPolicy.hh
  194. +/Users/example/node_modules/@vscodium/policy-watcher/src/windows/StringPolicy.cc
  195. +/Users/example/node_modules/@vscodium/policy-watcher/src/windows/NumberPolicy.hh
  196. /Users/example/node_modules/@vscode/vscode-languagedetection/CODE_OF_CONDUCT.md
  197. diff --git a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
  198. index 5099915..98a2041 100644
  199. --- a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
  200. +++ b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
  201. @@ -62,5 +62,5 @@ flakySuite('Native Modules (all platforms)', () => {
  202. - test('@vscode/policy-watcher', async () => {
  203. - const watcher = await import('@vscode/policy-watcher');
  204. - assert.ok(typeof watcher.createWatcher === 'function', testErrorMessage('@vscode/policy-watcher'));
  205. + test('@vscodium/policy-watcher', async () => {
  206. + const watcher = await import('@vscodium/policy-watcher');
  207. + assert.ok(typeof watcher.createWatcher === 'function', testErrorMessage('@vscodium/policy-watcher'));
  208. });
  209. diff --git a/src/vs/platform/policy/node/nativePolicyService.ts b/src/vs/platform/policy/node/nativePolicyService.ts
  210. index 21bb9c4..6a85d60 100644
  211. --- a/src/vs/platform/policy/node/nativePolicyService.ts
  212. +++ b/src/vs/platform/policy/node/nativePolicyService.ts
  213. @@ -8,3 +8,3 @@ import { IStringDictionary } from '../../../base/common/collections.js';
  214. import { Throttler } from '../../../base/common/async.js';
  215. -import type { PolicyUpdate, Watcher } from '@vscode/policy-watcher';
  216. +import type { PolicyUpdate, Watcher } from '@vscodium/policy-watcher';
  217. import { MutableDisposable } from '../../../base/common/lifecycle.js';
  218. @@ -27,3 +27,3 @@ export class NativePolicyService extends AbstractPolicyService implements IPolic
  219. - const { createWatcher } = await import('@vscode/policy-watcher');
  220. + const { createWatcher } = await import('@vscodium/policy-watcher');
  221. @@ -31,3 +31,3 @@ export class NativePolicyService extends AbstractPolicyService implements IPolic
  222. try {
  223. - this.watcher.value = createWatcher(this.productName, policyDefinitions, update => {
  224. + this.watcher.value = createWatcher('!!ORG_NAME!!', this.productName, policyDefinitions, update => {
  225. this._onDidPolicyChange(update);