Skip to content

Commit b269578

Browse files
author
Tajudeen
committed
Fix compilation errors for VS Code 1.106.x
- Fix @vscode/policy-watcher -> @vscodium/policy-watcher imports - Update package.json to use @vscodium/policy-watcher - Fix duplicate workbench.welcomePage.extraAnnouncements in gettingStarted.contribution.ts - Update createWatcher call to include org name parameter - Add @vscodium/policy-watcher to eslint allowed imports - Clean up .orig and .rej files
1 parent 28c79a4 commit b269578

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

eslint.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1723,6 +1723,7 @@ export default tseslint.config(
17231723
'@vscode/ripgrep',
17241724
'@vscode/iconv-lite-umd',
17251725
'@vscode/policy-watcher',
1726+
'@vscodium/policy-watcher',
17261727
'@vscode/proxy-agent',
17271728
'@vscode/spdlog',
17281729
'@vscode/windows-process-tree',

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
"@types/semver": "^7.5.8",
9191
"@vscode/deviceid": "^0.1.1",
9292
"@vscode/iconv-lite-umd": "0.7.1",
93-
"@vscode/policy-watcher": "^1.3.2",
93+
"@vscodium/policy-watcher": "^1.3.0-2503300035",
9494
"@vscode/proxy-agent": "^0.36.0",
9595
"@vscode/ripgrep": "^1.15.13",
9696
"@vscode/spdlog": "^0.15.2",

src/vs/platform/policy/node/nativePolicyService.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { AbstractPolicyService, IPolicyService, PolicyDefinition } from '../common/policy.js';
77
import { IStringDictionary } from '../../../base/common/collections.js';
88
import { Throttler } from '../../../base/common/async.js';
9-
import type { PolicyUpdate, Watcher } from '@vscode/policy-watcher';
9+
import type { PolicyUpdate, Watcher } from '@vscodium/policy-watcher';
1010
import { MutableDisposable } from '../../../base/common/lifecycle.js';
1111
import { ILogService } from '../../log/common/log.js';
1212

@@ -25,11 +25,11 @@ export class NativePolicyService extends AbstractPolicyService implements IPolic
2525
protected async _updatePolicyDefinitions(policyDefinitions: IStringDictionary<PolicyDefinition>): Promise<void> {
2626
this.logService.trace(`NativePolicyService#_updatePolicyDefinitions - Found ${Object.keys(policyDefinitions).length} policy definitions`);
2727

28-
const { createWatcher } = await import('@vscode/policy-watcher');
28+
const { createWatcher } = await import('@vscodium/policy-watcher');
2929

3030
await this.throttler.queue(() => new Promise<void>((c, e) => {
3131
try {
32-
this.watcher.value = createWatcher(this.productName, policyDefinitions, update => {
32+
this.watcher.value = createWatcher('OpenCortexIDE', this.productName, policyDefinitions, update => {
3333
this._onDidPolicyChange(update);
3434
c();
3535
});

src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,12 @@ configurationRegistry.registerConfiguration({
302302
default: true,
303303
description: localize('workbench.welcomePage.walkthroughs.openOnInstall', "When enabled, an extension's walkthrough will open upon install of the extension.")
304304
},
305+
'workbench.welcomePage.extraAnnouncements': {
306+
scope: ConfigurationScope.MACHINE,
307+
type: 'boolean',
308+
default: true,
309+
description: localize('workbench.welcomePage.extraAnnouncements', "When enabled, the get started page loads additional announcements from !!APP_NAME!!'s repository.")
310+
},
305311
'workbench.startupEditor': {
306312
'scope': ConfigurationScope.RESOURCE,
307313
'type': 'string',

0 commit comments

Comments
 (0)