Home Explore Help
Sign In
mirrors
/
vscodium
mirror of https://github.com/VSCodium/vscodium
2
0
Fork 0
Files Issues 0 Wiki
Tree: 6fdc08b665
Branches Tags
vscodium
/
patches
/
windows
/
policies.patch

policies.patch 6.7 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137 
  1. diff --git a/build/.moduleignore b/build/.moduleignore
    2. 

  2. index 01541e8..5b67f2b 100644
    3. 

  3. --- a/build/.moduleignore
    4. 

  4. +++ b/build/.moduleignore
    5. 

  5. @@ -120,9 +120,11 @@ vsda/**
    6. 

  6.  
    7. 

  7. -@vscode/policy-watcher/build/**
    8. 

  8. -@vscode/policy-watcher/.husky/**
    9. 

  9. -@vscode/policy-watcher/src/**
    10. 

  10. -@vscode/policy-watcher/binding.gyp
    11. 

  11. -@vscode/policy-watcher/README.md
    12. 

  12. -@vscode/policy-watcher/index.d.ts
    13. 

  13. -!@vscode/policy-watcher/build/Release/vscode-policy-watcher.node
    14. 

  14. +@vscodium/policy-watcher/.github/**
    15. 

  15. +@vscodium/policy-watcher/.husky/**
    16. 

  16. +@vscodium/policy-watcher/build/**
    17. 

  17. +@vscodium/policy-watcher/src/**
    18. 

  18. +@vscodium/policy-watcher/.release-it.yml
    19. 

  19. +@vscodium/policy-watcher/binding.gyp
    20. 

  20. +@vscodium/policy-watcher/README.md
    21. 

  21. +@vscodium/policy-watcher/index.d.ts
    22. 

  22. +!@vscodium/policy-watcher/build/Release/vscode-policy-watcher.node
    23. 

  23.  
    24. 

  24. diff --git a/build/lib/policies.js b/build/lib/policies.js
    25. 

  25. index 1560dc7..07c7348 100644
    26. 

  26. --- a/build/lib/policies.js
    27. 

  27. +++ b/build/lib/policies.js
    28. 

  28. @@ -61,3 +61,3 @@ class BasePolicy {
    29. 

  29.          return [
    30. 

  30. -            `<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})">`,
    31. 

  31. +            `<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})">`,
    32. 

  32.              `	<parentCategory ref="${this.category.name.nlsKey}" />`,
    33. 

  33. @@ -373,3 +373,3 @@ function renderADMX(regKey, versions, categories, policies) {
    34. 

  34.  	<policyNamespaces>
    35. 

  35. -		<target prefix="${regKey}" namespace="Microsoft.Policies.${regKey}" />
    36. 

  36. +		<target prefix="${regKey}" namespace="VSCodium.Policies.${regKey}" />
    37. 

  37.  	</policyNamespaces>
    38. 

  38. diff --git a/build/lib/policies.ts b/build/lib/policies.ts
    39. 

  39. index f602c8a..11919c9 100644
    40. 

  40. --- a/build/lib/policies.ts
    41. 

  41. +++ b/build/lib/policies.ts
    42. 

  42. @@ -80,3 +80,3 @@ abstract class BasePolicy implements Policy {
    43. 

  43.  		return [
    44. 

  44. -			`<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})">`,
    45. 

  45. +			`<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})">`,
    46. 

  46.  			`	<parentCategory ref="${this.category.name.nlsKey}" />`,
    47. 

  47. @@ -553,3 +553,3 @@ function renderADMX(regKey: string, versions: string[], categories: Category[],
    48. 

  48.  	<policyNamespaces>
    49. 

  49. -		<target prefix="${regKey}" namespace="Microsoft.Policies.${regKey}" />
    50. 

  50. +		<target prefix="${regKey}" namespace="VSCodium.Policies.${regKey}" />
    51. 

  51.  	</policyNamespaces>
    52. 

  52. diff --git a/package-lock.json b/package-lock.json
    53. 

  53. index 99a6c49..0997218 100644
    54. 

  54. --- a/package-lock.json
    55. 

  55. +++ b/package-lock.json
    56. 

  56. @@ -18,3 +18,2 @@
    57. 

  57.          "@vscode/iconv-lite-umd": "0.7.0",
    58. 

  58. -        "@vscode/policy-watcher": "^1.1.8",
    59. 

  59.          "@vscode/proxy-agent": "^0.30.0",
    60. 

  60. @@ -29,2 +28,3 @@
    61. 

  61.          "@vscode/windows-registry": "^1.1.0",
    62. 

  62. +        "@vscodium/policy-watcher": "^1.1.8-2501211616",
    63. 

  63.          "@xterm/addon-clipboard": "^0.2.0-beta.79",
    64. 

  64. @@ -2830,22 +2830,2 @@
    65. 

  65.      },
    66. 

  66. -    "node_modules/@vscode/policy-watcher": {
    67. 

  67. -      "version": "1.1.8",
    68. 

  68. -      "resolved": "https://registry.npmjs.org/@vscode/policy-watcher/-/policy-watcher-1.1.8.tgz",
    69. 

  69. -      "integrity": "sha512-IFT3eIPLIcjjgyOUBvbxfKlqTjSDJU+ZJrTlrgdjZrwS3HRLexAMTCfmBqIgZ+vS5N9QWtQW0yp8vX8UJv8JFg==",
    70. 

  70. -      "hasInstallScript": true,
    71. 

  71. -      "license": "MIT",
    72. 

  72. -      "dependencies": {
    73. 

  73. -        "bindings": "^1.5.0",
    74. 

  74. -        "node-addon-api": "^8.2.0"
    75. 

  75. -      }
    76. 

  76. -    },
    77. 

  77. -    "node_modules/@vscode/policy-watcher/node_modules/node-addon-api": {
    78. 

  78. -      "version": "8.2.0",
    79. 

  79. -      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.2.0.tgz",
    80. 

  80. -      "integrity": "sha512-qnyuI2ROiCkye42n9Tj5aX1ns7rzj6n7zW1XReSnLSL9v/vbLeR6fJq6PU27YU/ICfYw6W7Ouk/N7cysWu/hlw==",
    81. 

  81. -      "license": "MIT",
    82. 

  82. -      "engines": {
    83. 

  83. -        "node": "^18 || ^20 || >= 21"
    84. 

  84. -      }
    85. 

  85. -    },
    86. 

  86.      "node_modules/@vscode/proxy-agent": {
    87. 

  87. @@ -3264,2 +3244,22 @@
    88. 

  88.      },
    89. 

  89. +    "node_modules/@vscodium/policy-watcher": {
    90. 

  90. +      "version": "1.1.8-2501211616",
    91. 

  91. +      "resolved": "https://registry.npmjs.org/@vscodium/policy-watcher/-/policy-watcher-1.1.8-2501211616.tgz",
    92. 

  92. +      "integrity": "sha512-zrMcMkvh4D7Kicwz/Z/6Nm4FsCLrDIhjLZswzBMlZhTH1vP4XhEBYsic7j/RSgeCPCUxkBQx7c9io3yVovy2HA==",
    93. 

  93. +      "hasInstallScript": true,
    94. 

  94. +      "license": "MIT",
    95. 

  95. +      "dependencies": {
    96. 

  96. +        "bindings": "^1.5.0",
    97. 

  97. +        "node-addon-api": "^8.2.0"
    98. 

  98. +      }
    99. 

  99. +    },
    100. 

  100. +    "node_modules/@vscodium/policy-watcher/node_modules/node-addon-api": {
    101. 

  101. +      "version": "8.3.0",
    102. 

  102. +      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.3.0.tgz",
    103. 

  103. +      "integrity": "sha512-8VOpLHFrOQlAH+qA0ZzuGRlALRA6/LVh8QJldbrC4DY0hXoMP0l4Acq8TzFC018HztWiRqyCEj2aTWY2UvnJUg==",
    104. 

  104. +      "license": "MIT",
    105. 

  105. +      "engines": {
    106. 

  106. +        "node": "^18 || ^20 || >= 21"
    107. 

  107. +      }
    108. 

  108. +    },
    109. 

  109.      "node_modules/@webassemblyjs/ast": {
    110. 

  110. diff --git a/package.json b/package.json
    111. 

  111. index 2a79290..a924360 100644
    112. 

  112. --- a/package.json
    113. 

  113. +++ b/package.json
    114. 

  114. @@ -76,3 +76,3 @@
    115. 

  115.      "@vscode/iconv-lite-umd": "0.7.0",
    116. 

  116. -    "@vscode/policy-watcher": "^1.1.8",
    117. 

  117. +    "@vscodium/policy-watcher": "^1.1.8-2501211616",
    118. 

  118.      "@vscode/proxy-agent": "^0.30.0",
    119. 

  119. diff --git a/src/vs/platform/policy/node/nativePolicyService.ts b/src/vs/platform/policy/node/nativePolicyService.ts
    120. 

  120. index 67f7892..5b8859c 100644
    121. 

  121. --- a/src/vs/platform/policy/node/nativePolicyService.ts
    122. 

  122. +++ b/src/vs/platform/policy/node/nativePolicyService.ts
    123. 

  123. @@ -8,3 +8,3 @@ import { IStringDictionary } from '../../../base/common/collections.js';
    124. 

  124.  import { Throttler } from '../../../base/common/async.js';
    125. 

  125. -import type { PolicyUpdate, Watcher } from '@vscode/policy-watcher';
    126. 

  126. +import type { PolicyUpdate, Watcher } from '@vscodium/policy-watcher';
    127. 

  127.  import { MutableDisposable } from '../../../base/common/lifecycle.js';
    128. 

  128. @@ -27,3 +27,3 @@ export class NativePolicyService extends AbstractPolicyService implements IPolic
    129. 

  129.  
    130. 

  130. -		const { createWatcher } = await import('@vscode/policy-watcher');
    131. 

  131. +		const { createWatcher } = await import('@vscodium/policy-watcher');
    132. 

  132.  
    133. 

  133. @@ -31,3 +31,3 @@ export class NativePolicyService extends AbstractPolicyService implements IPolic
    134. 

  134.  			try {
    135. 

  135. -				this.watcher.value = createWatcher(this.productName, policyDefinitions, update => {
    136. 

  136. +				this.watcher.value = createWatcher('VSCodium', this.productName, policyDefinitions, update => {
    137. 

  137.  					this._onDidPolicyChange(update);
    138.