policies.patch 16 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268
  1. diff --git a/build/.moduleignore b/build/.moduleignore
  2. index 01541e8..5b67f2b 100644
  3. --- a/build/.moduleignore
  4. +++ b/build/.moduleignore
  5. @@ -120,9 +120,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/vscode-policy-watcher.node
  22. diff --git a/build/lib/policies.js b/build/lib/policies.js
  23. index d52015c..39a4001 100644
  24. --- a/build/lib/policies.js
  25. +++ b/build/lib/policies.js
  26. @@ -64,3 +64,3 @@ class BasePolicy {
  27. return [
  28. - `<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})">`,
  29. + `<policy name="${this.name}" class="Both" displayName="$(string.${this.name})" explainText="$(string.${this.name}_${this.description.nlsKey.replace(/\./g, '_')})" key="Software\\Policies\\VSCodium\\${regKey}" presentation="$(presentation.${this.name})">`,
  30. ` <parentCategory ref="${this.category.name.nlsKey}" />`,
  31. @@ -376,3 +376,3 @@ function renderADMX(regKey, versions, categories, policies) {
  32. <policyNamespaces>
  33. - <target prefix="${regKey}" namespace="Microsoft.Policies.${regKey}" />
  34. + <target prefix="${regKey}" namespace="VSCodium.Policies.${regKey}" />
  35. </policyNamespaces>
  36. diff --git a/build/lib/policies.ts b/build/lib/policies.ts
  37. index 57941d8..50c1843 100644
  38. --- a/build/lib/policies.ts
  39. +++ b/build/lib/policies.ts
  40. @@ -80,3 +80,3 @@ abstract class BasePolicy implements Policy {
  41. return [
  42. - `<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})">`,
  43. + `<policy name="${this.name}" class="Both" displayName="$(string.${this.name})" explainText="$(string.${this.name}_${this.description.nlsKey.replace(/\./g, '_')})" key="Software\\Policies\\VSCodium\\${regKey}" presentation="$(presentation.${this.name})">`,
  44. ` <parentCategory ref="${this.category.name.nlsKey}" />`,
  45. @@ -553,3 +553,3 @@ function renderADMX(regKey: string, versions: string[], categories: Category[],
  46. <policyNamespaces>
  47. - <target prefix="${regKey}" namespace="Microsoft.Policies.${regKey}" />
  48. + <target prefix="${regKey}" namespace="VSCodium.Policies.${regKey}" />
  49. </policyNamespaces>
  50. diff --git a/eslint.config.js b/eslint.config.js
  51. index f9f120a..db61adc 100644
  52. --- a/eslint.config.js
  53. +++ b/eslint.config.js
  54. @@ -798,3 +798,3 @@ export default tseslint.config(
  55. '@vscode/iconv-lite-umd',
  56. - '@vscode/policy-watcher',
  57. + '@vscodium/policy-watcher',
  58. '@vscode/proxy-agent',
  59. diff --git a/package-lock.json b/package-lock.json
  60. index 652a389..b5103dd 100644
  61. --- a/package-lock.json
  62. +++ b/package-lock.json
  63. @@ -2,3 +2,3 @@
  64. "name": "code-oss-dev",
  65. - "version": "1.97.0",
  66. + "version": "1.97.2",
  67. "lockfileVersion": 3,
  68. @@ -8,3 +8,3 @@
  69. "name": "code-oss-dev",
  70. - "version": "1.97.0",
  71. + "version": "1.97.2",
  72. "hasInstallScript": true,
  73. @@ -18,3 +18,2 @@
  74. "@vscode/iconv-lite-umd": "0.7.0",
  75. - "@vscode/policy-watcher": "^1.1.8",
  76. "@vscode/proxy-agent": "^0.31.0",
  77. @@ -29,2 +28,3 @@
  78. "@vscode/windows-registry": "^1.1.0",
  79. + "@vscodium/policy-watcher": "^1.1.8-2501211616",
  80. "@xterm/addon-clipboard": "^0.2.0-beta.80",
  81. @@ -2831,22 +2831,2 @@
  82. },
  83. - "node_modules/@vscode/policy-watcher": {
  84. - "version": "1.1.8",
  85. - "resolved": "https://registry.npmjs.org/@vscode/policy-watcher/-/policy-watcher-1.1.8.tgz",
  86. - "integrity": "sha512-IFT3eIPLIcjjgyOUBvbxfKlqTjSDJU+ZJrTlrgdjZrwS3HRLexAMTCfmBqIgZ+vS5N9QWtQW0yp8vX8UJv8JFg==",
  87. - "hasInstallScript": true,
  88. - "license": "MIT",
  89. - "dependencies": {
  90. - "bindings": "^1.5.0",
  91. - "node-addon-api": "^8.2.0"
  92. - }
  93. - },
  94. - "node_modules/@vscode/policy-watcher/node_modules/node-addon-api": {
  95. - "version": "8.2.0",
  96. - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.2.0.tgz",
  97. - "integrity": "sha512-qnyuI2ROiCkye42n9Tj5aX1ns7rzj6n7zW1XReSnLSL9v/vbLeR6fJq6PU27YU/ICfYw6W7Ouk/N7cysWu/hlw==",
  98. - "license": "MIT",
  99. - "engines": {
  100. - "node": "^18 || ^20 || >= 21"
  101. - }
  102. - },
  103. "node_modules/@vscode/proxy-agent": {
  104. @@ -3247,2 +3227,22 @@
  105. },
  106. + "node_modules/@vscodium/policy-watcher": {
  107. + "version": "1.1.8-2501211616",
  108. + "resolved": "https://registry.npmjs.org/@vscodium/policy-watcher/-/policy-watcher-1.1.8-2501211616.tgz",
  109. + "integrity": "sha512-zrMcMkvh4D7Kicwz/Z/6Nm4FsCLrDIhjLZswzBMlZhTH1vP4XhEBYsic7j/RSgeCPCUxkBQx7c9io3yVovy2HA==",
  110. + "hasInstallScript": true,
  111. + "license": "MIT",
  112. + "dependencies": {
  113. + "bindings": "^1.5.0",
  114. + "node-addon-api": "^8.2.0"
  115. + }
  116. + },
  117. + "node_modules/@vscodium/policy-watcher/node_modules/node-addon-api": {
  118. + "version": "8.3.0",
  119. + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.3.0.tgz",
  120. + "integrity": "sha512-8VOpLHFrOQlAH+qA0ZzuGRlALRA6/LVh8QJldbrC4DY0hXoMP0l4Acq8TzFC018HztWiRqyCEj2aTWY2UvnJUg==",
  121. + "license": "MIT",
  122. + "engines": {
  123. + "node": "^18 || ^20 || >= 21"
  124. + }
  125. + },
  126. "node_modules/@webassemblyjs/ast": {
  127. diff --git a/package.json b/package.json
  128. index 1b0f83e..6438b79 100644
  129. --- a/package.json
  130. +++ b/package.json
  131. @@ -76,3 +76,3 @@
  132. "@vscode/iconv-lite-umd": "0.7.0",
  133. - "@vscode/policy-watcher": "^1.1.8",
  134. + "@vscodium/policy-watcher": "^1.1.8-2501211616",
  135. "@vscode/proxy-agent": "^0.31.0",
  136. diff --git a/src/vs/base/test/node/uri.perf.data.txt b/src/vs/base/test/node/uri.perf.data.txt
  137. index ee0a24b..881ce36 100644
  138. --- a/src/vs/base/test/node/uri.perf.data.txt
  139. +++ b/src/vs/base/test/node/uri.perf.data.txt
  140. @@ -14698,48 +14698,48 @@
  141. /Users/example/node_modules/@vscode/node-addon-api/node_addon_api.Makefile
  142. -/Users/example/node_modules/@vscode/policy-watcher/LICENSE
  143. -/Users/example/node_modules/@vscode/policy-watcher/binding.gyp
  144. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/LICENSE.md
  145. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/conversion.js
  146. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/eslint-format.js
  147. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/clang-format.js
  148. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/README.md
  149. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/check-napi.js
  150. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/except.gypi
  151. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/napi-inl.deprecated.h
  152. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/index.js
  153. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/README.md
  154. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/napi-inl.h
  155. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/node_api.gyp
  156. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/napi.h
  157. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/package.json
  158. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/noexcept.gypi
  159. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/common.gypi
  160. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/nothing.c
  161. -/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/package-support.json
  162. -/Users/example/node_modules/@vscode/policy-watcher/index.js
  163. -/Users/example/node_modules/@vscode/policy-watcher/README.md
  164. -/Users/example/node_modules/@vscode/policy-watcher/package.json
  165. -/Users/example/node_modules/@vscode/policy-watcher/build/vscode-policy-watcher.target.mk
  166. -/Users/example/node_modules/@vscode/policy-watcher/build/gyp-mac-tool
  167. -/Users/example/node_modules/@vscode/policy-watcher/build/Makefile
  168. -/Users/example/node_modules/@vscode/policy-watcher/build/Release/obj.target/vscode-policy-watcher/src/main.o
  169. -/Users/example/node_modules/@vscode/policy-watcher/build/Release/obj.target/vscode-policy-watcher/src/macos/PolicyWatcher.o
  170. -/Users/example/node_modules/@vscode/policy-watcher/build/Release/vscode-policy-watcher.node
  171. -/Users/example/node_modules/@vscode/policy-watcher/build/Release/.deps/Release/vscode-policy-watcher.node.d
  172. -/Users/example/node_modules/@vscode/policy-watcher/build/Release/.deps/Release/obj.target/vscode-policy-watcher/src/macos/PolicyWatcher.o.d
  173. -/Users/example/node_modules/@vscode/policy-watcher/build/Release/.deps/Release/obj.target/vscode-policy-watcher/src/main.o.d
  174. -/Users/example/node_modules/@vscode/policy-watcher/build/config.gypi
  175. -/Users/example/node_modules/@vscode/policy-watcher/build/binding.Makefile
  176. -/Users/example/node_modules/@vscode/policy-watcher/index.d.ts
  177. -/Users/example/node_modules/@vscode/policy-watcher/src/main.cc
  178. -/Users/example/node_modules/@vscode/policy-watcher/src/macos/PolicyWatcher.cc
  179. -/Users/example/node_modules/@vscode/policy-watcher/src/PolicyWatcher.hh
  180. -/Users/example/node_modules/@vscode/policy-watcher/src/linux/PolicyWatcher.cc
  181. -/Users/example/node_modules/@vscode/policy-watcher/src/Policy.hh
  182. -/Users/example/node_modules/@vscode/policy-watcher/src/windows/RegistryPolicy.hh
  183. -/Users/example/node_modules/@vscode/policy-watcher/src/windows/PolicyWatcher.cc
  184. -/Users/example/node_modules/@vscode/policy-watcher/src/windows/NumberPolicy.cc
  185. -/Users/example/node_modules/@vscode/policy-watcher/src/windows/StringPolicy.hh
  186. -/Users/example/node_modules/@vscode/policy-watcher/src/windows/StringPolicy.cc
  187. -/Users/example/node_modules/@vscode/policy-watcher/src/windows/NumberPolicy.hh
  188. +/Users/example/node_modules/@vscodium/policy-watcher/LICENSE
  189. +/Users/example/node_modules/@vscodium/policy-watcher/binding.gyp
  190. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/LICENSE.md
  191. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/conversion.js
  192. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/eslint-format.js
  193. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/clang-format.js
  194. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/README.md
  195. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/check-napi.js
  196. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/except.gypi
  197. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/napi-inl.deprecated.h
  198. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/index.js
  199. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/README.md
  200. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/napi-inl.h
  201. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/node_api.gyp
  202. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/napi.h
  203. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/package.json
  204. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/noexcept.gypi
  205. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/common.gypi
  206. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/nothing.c
  207. +/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/package-support.json
  208. +/Users/example/node_modules/@vscodium/policy-watcher/index.js
  209. +/Users/example/node_modules/@vscodium/policy-watcher/README.md
  210. +/Users/example/node_modules/@vscodium/policy-watcher/package.json
  211. +/Users/example/node_modules/@vscodium/policy-watcher/build/vscode-policy-watcher.target.mk
  212. +/Users/example/node_modules/@vscodium/policy-watcher/build/gyp-mac-tool
  213. +/Users/example/node_modules/@vscodium/policy-watcher/build/Makefile
  214. +/Users/example/node_modules/@vscodium/policy-watcher/build/Release/obj.target/vscode-policy-watcher/src/main.o
  215. +/Users/example/node_modules/@vscodium/policy-watcher/build/Release/obj.target/vscode-policy-watcher/src/macos/PolicyWatcher.o
  216. +/Users/example/node_modules/@vscodium/policy-watcher/build/Release/vscode-policy-watcher.node
  217. +/Users/example/node_modules/@vscodium/policy-watcher/build/Release/.deps/Release/vscode-policy-watcher.node.d
  218. +/Users/example/node_modules/@vscodium/policy-watcher/build/Release/.deps/Release/obj.target/vscode-policy-watcher/src/macos/PolicyWatcher.o.d
  219. +/Users/example/node_modules/@vscodium/policy-watcher/build/Release/.deps/Release/obj.target/vscode-policy-watcher/src/main.o.d
  220. +/Users/example/node_modules/@vscodium/policy-watcher/build/config.gypi
  221. +/Users/example/node_modules/@vscodium/policy-watcher/build/binding.Makefile
  222. +/Users/example/node_modules/@vscodium/policy-watcher/index.d.ts
  223. +/Users/example/node_modules/@vscodium/policy-watcher/src/main.cc
  224. +/Users/example/node_modules/@vscodium/policy-watcher/src/macos/PolicyWatcher.cc
  225. +/Users/example/node_modules/@vscodium/policy-watcher/src/PolicyWatcher.hh
  226. +/Users/example/node_modules/@vscodium/policy-watcher/src/linux/PolicyWatcher.cc
  227. +/Users/example/node_modules/@vscodium/policy-watcher/src/Policy.hh
  228. +/Users/example/node_modules/@vscodium/policy-watcher/src/windows/RegistryPolicy.hh
  229. +/Users/example/node_modules/@vscodium/policy-watcher/src/windows/PolicyWatcher.cc
  230. +/Users/example/node_modules/@vscodium/policy-watcher/src/windows/NumberPolicy.cc
  231. +/Users/example/node_modules/@vscodium/policy-watcher/src/windows/StringPolicy.hh
  232. +/Users/example/node_modules/@vscodium/policy-watcher/src/windows/StringPolicy.cc
  233. +/Users/example/node_modules/@vscodium/policy-watcher/src/windows/NumberPolicy.hh
  234. /Users/example/node_modules/@vscode/vscode-languagedetection/CODE_OF_CONDUCT.md
  235. diff --git a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
  236. index e0b99f3..f3af586 100644
  237. --- a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
  238. +++ b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
  239. @@ -62,5 +62,5 @@ flakySuite('Native Modules (all platforms)', () => {
  240. - test('@vscode/policy-watcher', async () => {
  241. - const watcher = await import('@vscode/policy-watcher');
  242. - assert.ok(typeof watcher.createWatcher === 'function', testErrorMessage('@vscode/policy-watcher'));
  243. + test('@vscodium/policy-watcher', async () => {
  244. + const watcher = await import('@vscodium/policy-watcher');
  245. + assert.ok(typeof watcher.createWatcher === 'function', testErrorMessage('@vscodium/policy-watcher'));
  246. });
  247. diff --git a/src/vs/platform/policy/node/nativePolicyService.ts b/src/vs/platform/policy/node/nativePolicyService.ts
  248. index 67f7892..5b8859c 100644
  249. --- a/src/vs/platform/policy/node/nativePolicyService.ts
  250. +++ b/src/vs/platform/policy/node/nativePolicyService.ts
  251. @@ -8,3 +8,3 @@ import { IStringDictionary } from '../../../base/common/collections.js';
  252. import { Throttler } from '../../../base/common/async.js';
  253. -import type { PolicyUpdate, Watcher } from '@vscode/policy-watcher';
  254. +import type { PolicyUpdate, Watcher } from '@vscodium/policy-watcher';
  255. import { MutableDisposable } from '../../../base/common/lifecycle.js';
  256. @@ -27,3 +27,3 @@ export class NativePolicyService extends AbstractPolicyService implements IPolic
  257. - const { createWatcher } = await import('@vscode/policy-watcher');
  258. + const { createWatcher } = await import('@vscodium/policy-watcher');
  259. @@ -31,3 +31,3 @@ export class NativePolicyService extends AbstractPolicyService implements IPolic
  260. try {
  261. - this.watcher.value = createWatcher(this.productName, policyDefinitions, update => {
  262. + this.watcher.value = createWatcher('VSCodium', this.productName, policyDefinitions, update => {
  263. this._onDidPolicyChange(update);