diff --git a/cglicenses.json b/cglicenses.json index 93e5297c9a8..8ee75c0fb34 100644 --- a/cglicenses.json +++ b/cglicenses.json @@ -70,7 +70,7 @@ }, { // Reason: The license cannot be found by the tool due to access controls on the repository - "name": "tas-client-umd", + "name": "tas-client", "fullLicenseText": [ "MIT License", "Copyright (c) 2020 - present Microsoft Corporation", diff --git a/eslint.config.js b/eslint.config.js index 24e3bf503ca..84c7ff2d722 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -1541,7 +1541,7 @@ export default tseslint.config( 'readline', 'stream', 'string_decoder', - 'tas-client-umd', + 'tas-client', 'tls', 'undici', 'undici-types', @@ -1630,7 +1630,7 @@ export default tseslint.config( 'vs/base/~', 'vs/base/parts/*/~', 'vs/platform/*/~', - 'tas-client-umd', // node module allowed even in /common/ + 'tas-client', // node module allowed even in /common/ '@microsoft/1ds-core-js', // node module allowed even in /common/ '@microsoft/1ds-post-js', // node module allowed even in /common/ '@xterm/headless' // node module allowed even in /common/ @@ -1748,7 +1748,7 @@ export default tseslint.config( 'when': 'test', 'pattern': 'vs/workbench/contrib/*/~' }, // TODO@layers - 'tas-client-umd', // node module allowed even in /common/ + 'tas-client', // node module allowed even in /common/ 'vscode-textmate', // node module allowed even in /common/ '@vscode/vscode-languagedetection', // node module allowed even in /common/ '@vscode/tree-sitter-wasm', // type import diff --git a/package-lock.json b/package-lock.json index 53418d479d4..30e321372b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -48,7 +48,7 @@ "native-watchdog": "^1.4.1", "node-pty": "1.1.0-beta35", "open": "^10.1.2", - "tas-client-umd": "0.2.0", + "tas-client": "0.3.1", "undici": "^7.9.0", "v8-inspect-profiler": "^0.1.1", "vscode-oniguruma": "1.7.0", @@ -16659,10 +16659,14 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, - "node_modules/tas-client-umd": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/tas-client-umd/-/tas-client-umd-0.2.0.tgz", - "integrity": "sha512-oezN7mJVm5qZDVEby7OzxCLKUpUN5of0rY4dvOWaDF2JZBlGpd3BXceFN8B53qlTaIkVSzP65aAMT0Vc+/N25Q==" + "node_modules/tas-client": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/tas-client/-/tas-client-0.3.1.tgz", + "integrity": "sha512-Mn4+4t/KXEf8aIENeI1TkzpKIImzmG+FjPZ2dlaoGNFgxJqBE/pp3MT7nc2032EG4aS73E4OEcr2WiNaWW8mdA==", + "license": "MIT", + "engines": { + "node": ">=22" + } }, "node_modules/teex": { "version": "1.0.1", diff --git a/package.json b/package.json index 81413d9d664..d0f7d0e0de4 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "native-watchdog": "^1.4.1", "node-pty": "1.1.0-beta35", "open": "^10.1.2", - "tas-client-umd": "0.2.0", + "tas-client": "0.3.1", "undici": "^7.9.0", "v8-inspect-profiler": "^0.1.1", "vscode-oniguruma": "1.7.0", diff --git a/remote/package-lock.json b/remote/package-lock.json index 4fd02152f92..7d123d102d5 100644 --- a/remote/package-lock.json +++ b/remote/package-lock.json @@ -39,7 +39,7 @@ "minimist": "^1.2.8", "native-watchdog": "^1.4.1", "node-pty": "1.1.0-beta35", - "tas-client-umd": "0.2.0", + "tas-client": "0.3.1", "vscode-oniguruma": "1.7.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "^9.2.1", @@ -1125,10 +1125,14 @@ "node": ">=6" } }, - "node_modules/tas-client-umd": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/tas-client-umd/-/tas-client-umd-0.2.0.tgz", - "integrity": "sha512-oezN7mJVm5qZDVEby7OzxCLKUpUN5of0rY4dvOWaDF2JZBlGpd3BXceFN8B53qlTaIkVSzP65aAMT0Vc+/N25Q==" + "node_modules/tas-client": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/tas-client/-/tas-client-0.3.1.tgz", + "integrity": "sha512-Mn4+4t/KXEf8aIENeI1TkzpKIImzmG+FjPZ2dlaoGNFgxJqBE/pp3MT7nc2032EG4aS73E4OEcr2WiNaWW8mdA==", + "license": "MIT", + "engines": { + "node": ">=22" + } }, "node_modules/tiny-inflate": { "version": "1.0.3", diff --git a/remote/package.json b/remote/package.json index d991ee5d8e1..905eae3d92e 100644 --- a/remote/package.json +++ b/remote/package.json @@ -34,7 +34,7 @@ "minimist": "^1.2.8", "native-watchdog": "^1.4.1", "node-pty": "1.1.0-beta35", - "tas-client-umd": "0.2.0", + "tas-client": "0.3.1", "vscode-oniguruma": "1.7.0", "vscode-regexpp": "^3.1.0", "vscode-textmate": "^9.2.1", diff --git a/remote/web/package-lock.json b/remote/web/package-lock.json index 68d70b572c6..ac1a0d4234d 100644 --- a/remote/web/package-lock.json +++ b/remote/web/package-lock.json @@ -24,7 +24,7 @@ "@xterm/xterm": "^5.6.0-beta.136", "jschardet": "3.1.4", "katex": "^0.16.22", - "tas-client-umd": "0.2.0", + "tas-client": "0.3.1", "vscode-oniguruma": "1.7.0", "vscode-textmate": "^9.2.1" } @@ -287,10 +287,14 @@ "node": ">8.0.0" } }, - "node_modules/tas-client-umd": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/tas-client-umd/-/tas-client-umd-0.2.0.tgz", - "integrity": "sha512-oezN7mJVm5qZDVEby7OzxCLKUpUN5of0rY4dvOWaDF2JZBlGpd3BXceFN8B53qlTaIkVSzP65aAMT0Vc+/N25Q==" + "node_modules/tas-client": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/tas-client/-/tas-client-0.3.1.tgz", + "integrity": "sha512-Mn4+4t/KXEf8aIENeI1TkzpKIImzmG+FjPZ2dlaoGNFgxJqBE/pp3MT7nc2032EG4aS73E4OEcr2WiNaWW8mdA==", + "license": "MIT", + "engines": { + "node": ">=22" + } }, "node_modules/tiny-inflate": { "version": "1.0.3", diff --git a/remote/web/package.json b/remote/web/package.json index e69c409d24e..26584bf22a5 100644 --- a/remote/web/package.json +++ b/remote/web/package.json @@ -19,7 +19,7 @@ "@xterm/xterm": "^5.6.0-beta.136", "jschardet": "3.1.4", "katex": "^0.16.22", - "tas-client-umd": "0.2.0", + "tas-client": "0.3.1", "vscode-oniguruma": "1.7.0", "vscode-textmate": "^9.2.1" } diff --git a/src/vs/platform/assignment/common/assignment.ts b/src/vs/platform/assignment/common/assignment.ts index 653d50723fb..94703ce6897 100644 --- a/src/vs/platform/assignment/common/assignment.ts +++ b/src/vs/platform/assignment/common/assignment.ts @@ -5,7 +5,7 @@ import { Event } from '../../../base/common/event.js'; import * as platform from '../../../base/common/platform.js'; -import type { IExperimentationFilterProvider } from 'tas-client-umd'; +import type { IExperimentationFilterProvider } from 'tas-client'; export const ASSIGNMENT_STORAGE_KEY = 'VSCode.ABExp.FeatureData'; export const ASSIGNMENT_REFETCH_INTERVAL = 60 * 60 * 1000; // 1 hour diff --git a/src/vs/workbench/services/assignment/common/assignmentFilters.ts b/src/vs/workbench/services/assignment/common/assignmentFilters.ts index 3ee5904b34b..8ddefe69770 100644 --- a/src/vs/workbench/services/assignment/common/assignmentFilters.ts +++ b/src/vs/workbench/services/assignment/common/assignmentFilters.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import type { IExperimentationFilterProvider } from 'tas-client-umd'; +import type { IExperimentationFilterProvider } from 'tas-client'; import { IExtensionService } from '../../extensions/common/extensions.js'; import { Disposable } from '../../../../base/common/lifecycle.js'; import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js'; diff --git a/src/vs/workbench/services/assignment/common/assignmentService.ts b/src/vs/workbench/services/assignment/common/assignmentService.ts index ec5119138f1..a205cdf9a13 100644 --- a/src/vs/workbench/services/assignment/common/assignmentService.ts +++ b/src/vs/workbench/services/assignment/common/assignmentService.ts @@ -5,7 +5,7 @@ import { localize } from '../../../../nls.js'; import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js'; -import type { IKeyValueStorage, IExperimentationTelemetry, ExperimentationService as TASClient } from 'tas-client-umd'; +import type { IKeyValueStorage, IExperimentationTelemetry, ExperimentationService as TASClient } from 'tas-client'; import { Memento } from '../../../common/memento.js'; import { ITelemetryService, TelemetryLevel } from '../../../../platform/telemetry/common/telemetry.js'; import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js'; @@ -267,7 +267,7 @@ export class WorkbenchAssignmentService extends Disposable implements IAssignmen this.tasSetupDisposables.add(extensionsFilterProvider.onDidChangeFilters(() => this.refetchAssignments())); const tasConfig = this.productService.tasConfig!; - const tasClient = new (await importAMDNodeModule('tas-client-umd', 'lib/tas-client-umd.js')).ExperimentationService({ + const tasClient = new (await importAMDNodeModule('tas-client', 'dist/tas-client.min.js')).ExperimentationService({ filterProviders: [filterProvider, extensionsFilterProvider], telemetry: this.telemetry, storageKey: ASSIGNMENT_STORAGE_KEY,