From ab54a72364f84dbd593eabae2d744c52495d4fc7 Mon Sep 17 00:00:00 2001 From: Matt Bierner <12821956+mjbvz@users.noreply.github.com> Date: Mon, 13 Oct 2025 11:59:50 -0700 Subject: [PATCH] Pick up latest `@types/trusted-types` Should unblock #270041 --- package-lock.json | 11 ++++++----- package.json | 2 +- src/typings/vscode-globals-ttp.d.ts | 7 +++---- src/vs/amdX.ts | 4 +--- src/vs/base/browser/trustedTypes.ts | 6 ++++-- src/vs/workbench/workbench.web.main.ts | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0bda4675df5..f26fb7c358c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -71,7 +71,7 @@ "@types/node": "22.x", "@types/sinon": "^10.0.2", "@types/sinon-test": "^2.4.2", - "@types/trusted-types": "^1.0.6", + "@types/trusted-types": "^2.0.7", "@types/vscode-notebook-renderer": "^1.72.0", "@types/webpack": "^5.28.5", "@types/wicg-file-system-access": "^2023.10.7", @@ -2155,10 +2155,11 @@ "dev": true }, "node_modules/@types/trusted-types": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-1.0.6.tgz", - "integrity": "sha512-230RC8sFeHoT6sSUlRO6a8cAnclO06eeiq1QDfiv2FGCLWFvvERWgwIQD4FWqD9A69BN7Lzee4OXwoMVnnsWDw==", - "dev": true + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", + "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==", + "dev": true, + "license": "MIT" }, "node_modules/@types/tunnel": { "version": "0.0.3", diff --git a/package.json b/package.json index 1ce8f67d781..509fd3a40c7 100644 --- a/package.json +++ b/package.json @@ -132,7 +132,7 @@ "@types/node": "22.x", "@types/sinon": "^10.0.2", "@types/sinon-test": "^2.4.2", - "@types/trusted-types": "^1.0.6", + "@types/trusted-types": "^2.0.7", "@types/vscode-notebook-renderer": "^1.72.0", "@types/webpack": "^5.28.5", "@types/wicg-file-system-access": "^2023.10.7", diff --git a/src/typings/vscode-globals-ttp.d.ts b/src/typings/vscode-globals-ttp.d.ts index b91080ec741..b79cf938c68 100644 --- a/src/typings/vscode-globals-ttp.d.ts +++ b/src/typings/vscode-globals-ttp.d.ts @@ -7,10 +7,9 @@ declare global { - var _VSCODE_WEB_PACKAGE_TTP: Pick, 'name' | 'createScriptURL'> | undefined; + var _VSCODE_WEB_PACKAGE_TTP: Pick | undefined; } // fake export to make global work -export { } +export { }; + diff --git a/src/vs/amdX.ts b/src/vs/amdX.ts index b2f9fd3fa91..374d4f19faf 100644 --- a/src/vs/amdX.ts +++ b/src/vs/amdX.ts @@ -38,9 +38,7 @@ class AMDModuleImporter { private readonly _defineCalls: DefineCall[] = []; private _state = AMDModuleImporterState.Uninitialized; - private _amdPolicy: Pick, 'name' | 'createScriptURL'> | undefined; + private _amdPolicy: Pick | undefined; constructor() { } diff --git a/src/vs/base/browser/trustedTypes.ts b/src/vs/base/browser/trustedTypes.ts index 9610e7606a9..c7d977b505b 100644 --- a/src/vs/base/browser/trustedTypes.ts +++ b/src/vs/base/browser/trustedTypes.ts @@ -5,16 +5,18 @@ import { onUnexpectedError } from '../common/errors.js'; +type TrustedTypePolicyOptions = import('trusted-types/lib/index.d.ts').TrustedTypePolicyOptions; + export function createTrustedTypesPolicy( policyName: string, policyOptions?: Options, -): undefined | Pick, 'name' | Extract> { +): undefined | Pick> { interface IMonacoEnvironment { createTrustedTypesPolicy( policyName: string, policyOptions?: Options, - ): undefined | Pick, 'name' | Extract>; + ): undefined | Pick>; } // eslint-disable-next-line local/code-no-any-casts const monacoEnvironment: IMonacoEnvironment | undefined = (globalThis as any).MonacoEnvironment; diff --git a/src/vs/workbench/workbench.web.main.ts b/src/vs/workbench/workbench.web.main.ts index 383909739c6..79a78b6f9f0 100644 --- a/src/vs/workbench/workbench.web.main.ts +++ b/src/vs/workbench/workbench.web.main.ts @@ -73,7 +73,7 @@ } globalThis._VSCODE_FILE_ROOT = baseUrl; - const trustedTypesPolicy: Pick, 'name' | 'createScriptURL'> | undefined = require.getConfig().trustedTypesPolicy; + const trustedTypesPolicy: Pick | undefined = require.getConfig().trustedTypesPolicy; if (trustedTypesPolicy) { globalThis._VSCODE_WEB_PACKAGE_TTP = trustedTypesPolicy; }