From 7e4e91cab44b0cb3069c863ea0a1bd70f1effe46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20B=C3=A4umer?= Date: Tue, 14 Jul 2026 12:34:04 +0200 Subject: [PATCH] Adapt to TypeScript 7 (#325757) * Adapt TypeScript 7 * Ensure that we always call TS7 from spawnTsgo * Fix package lock file * tsc - tsc6 * More tsc -> tsc6 * More TSGO conversion * More moves from tsgo -> tsc * Fix tsgo resolving in extension folder * Call TS7 compiler directly * Update package-lock.json * Remove tsc:version again --- .eslint-plugin-local/package.json | 2 +- .../instructions/buildNext.instructions.md | 4 +- .github/workflows/monaco-editor.yml | 4 +- .../product-quality-checks.yml | 2 +- build/gulpfile.editor.ts | 2 +- build/lib/tsgo.ts | 19 +- build/package.json | 2 +- extensions/configuration-editing/package.json | 4 +- extensions/copilot/package-lock.json | 350 +++++++++++++++--- extensions/copilot/package.json | 14 +- .../copilot/script/build/extractChatLib.ts | 2 +- extensions/emmet/package.json | 4 +- .../markdown-language-features/package.json | 4 +- extensions/media-preview/package.json | 4 +- extensions/merge-conflict/package.json | 4 +- .../mermaid-markdown-features/package.json | 4 +- extensions/npm/package.json | 4 +- extensions/package-lock.json | 51 ++- extensions/postinstall.mjs | 2 + extensions/references-view/package.json | 4 +- extensions/search-result/package.json | 4 +- extensions/simple-browser/package.json | 4 +- .../typescript-language-features/package.json | 4 +- package-lock.json | 350 +++++++++++++++--- package.json | 16 +- .../electron-browser/workspaceTagsService.ts | 2 + test/automation/package.json | 4 +- test/integration/browser/package.json | 2 +- test/mcp/package.json | 4 +- test/monaco/package.json | 2 +- test/smoke/package.json | 4 +- 31 files changed, 708 insertions(+), 174 deletions(-) diff --git a/.eslint-plugin-local/package.json b/.eslint-plugin-local/package.json index 90e7facf0a0..8745d49e541 100644 --- a/.eslint-plugin-local/package.json +++ b/.eslint-plugin-local/package.json @@ -2,6 +2,6 @@ "private": true, "type": "module", "scripts": { - "typecheck": "tsgo -p tsconfig.json --noEmit" + "typecheck": "tsc -p tsconfig.json --noEmit" } } diff --git a/.github/instructions/buildNext.instructions.md b/.github/instructions/buildNext.instructions.md index ae43776e829..3f4d4307174 100644 --- a/.github/instructions/buildNext.instructions.md +++ b/.github/instructions/buildNext.instructions.md @@ -321,12 +321,12 @@ The default `VS Code - Build` task now runs three parallel watchers: | Task | What it does | Script | |------|-------------|--------| | **Core - Transpile** | esbuild single-file TS→JS (fast, no type checking) | `watch-client-transpiled` → `node build/next/index.ts transpile --watch` | -| **Core - Typecheck** | tsgo `noEmit` watch (type errors only, no output) | `watch-clientd` → `gulp watch-client` (uses `watchTypeCheckTask`) | +| **Core - Typecheck** | tsc `noEmit` watch (type errors only, no output) | `watch-clientd` → `gulp watch-client` (uses `watchTypeCheckTask`) | | **Ext - Build** | Extension compilation (unchanged) | `watch-extensionsd` | ### Key Changes -- **`build/lib/compilation.ts`**: `ICompileTaskOptions` gained `noEmit?: boolean`. `watchTypeCheckTask()` runs the tsgo type-checker in watch mode with `noEmit: true`. +- **`build/lib/compilation.ts`**: `ICompileTaskOptions` gained `noEmit?: boolean`. `watchTypeCheckTask()` runs the tsc type-checker in watch mode with `noEmit: true`. - **`build/gulpfile.ts`**: `watchClientTask` is now `task.parallel(compilation.watchTypeCheckTask('src'), ...)` — no `rimraf('out')` (the transpiler owns that), no JS emit. - **`build/next/index.ts`**: Watch mode emits `Starting transpilation...` / `Finished transpilation with N errors after X ms` for VS Code problem matcher. - **`.vscode/tasks.json`**: Old "Core - Build" split into "Core - Transpile" + "Core - Typecheck" with separate problem matchers (owners: `esbuild` vs `typescript`). diff --git a/.github/workflows/monaco-editor.yml b/.github/workflows/monaco-editor.yml index 04de681e4bc..b04e59e9a16 100644 --- a/.github/workflows/monaco-editor.yml +++ b/.github/workflows/monaco-editor.yml @@ -83,9 +83,9 @@ jobs: working-directory: ./typings-test run: | npm init -yp - ../node_modules/.bin/tsc --init + ../node_modules/.bin/tsc6 --init echo "import '../out-monaco-editor-core';" > a.ts - ../node_modules/.bin/tsc --noEmit + ../node_modules/.bin/tsc6 --noEmit - name: Package Editor with Webpack working-directory: ./test/monaco diff --git a/build/azure-pipelines/product-quality-checks.yml b/build/azure-pipelines/product-quality-checks.yml index 6ff1658deaf..39fe5633f78 100644 --- a/build/azure-pipelines/product-quality-checks.yml +++ b/build/azure-pipelines/product-quality-checks.yml @@ -346,7 +346,7 @@ jobs: - script: | set -e - npx tsc --skipLibCheck --module nodenext --moduleResolution nodenext --esModuleInterop --target es2022 --types node --outDir .oss-build-out build/azure-pipelines/oss/apply-overrides.ts build/azure-pipelines/oss/scan-licenses.ts build/azure-pipelines/oss/parse-notices.ts build/azure-pipelines/oss/merge-notices.ts + npx tsc6 --skipLibCheck --module nodenext --moduleResolution nodenext --esModuleInterop --target es2022 --types node --outDir .oss-build-out build/azure-pipelines/oss/apply-overrides.ts build/azure-pipelines/oss/scan-licenses.ts build/azure-pipelines/oss/parse-notices.ts build/azure-pipelines/oss/merge-notices.ts node .oss-build-out/scan-licenses.js \ --repo "$(Build.SourcesDirectory)" \ --cg "$(Build.SourcesDirectory)/ThirdPartyNotices.generated.txt" \ diff --git a/build/gulpfile.editor.ts b/build/gulpfile.editor.ts index bb3b3584a37..f9a3e91df61 100644 --- a/build/gulpfile.editor.ts +++ b/build/gulpfile.editor.ts @@ -235,7 +235,7 @@ task.task('monacodts', task.define('monacodts', () => { function createTscCompileTask(watch: boolean) { return () => { return new Promise((resolve, reject) => { - const args = ['./node_modules/.bin/tsc', '-p', './src/tsconfig.monaco.json', '--noEmit']; + const args = ['./node_modules/.bin/tsc6', '-p', './src/tsconfig.monaco.json', '--noEmit']; if (watch) { args.push('-w'); } diff --git a/build/lib/tsgo.ts b/build/lib/tsgo.ts index ff42fa6e88e..7c48e299981 100644 --- a/build/lib/tsgo.ts +++ b/build/lib/tsgo.ts @@ -7,13 +7,23 @@ import ansiColors from 'ansi-colors'; import * as cp from 'child_process'; import es from 'event-stream'; import fancyLog from 'fancy-log'; +import { createRequire } from 'module'; import * as path from 'path'; const root = path.dirname(path.dirname(import.meta.dirname)); -const npx = process.platform === 'win32' ? 'npx.cmd' : 'npx'; const ansiRegex = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g; const timestampRegex = /^\[\d{2}:\d{2}:\d{2}\]\s*/; +/** + * Absolute path to the TypeScript 7 (native) compiler entrypoint. TS7 is + * installed under the `@typescript/native` alias, a package name that only + * exists at the repository root and never collides with the `typescript` + * (<= 6.x) that individual extensions install locally. Resolving it explicitly + * and invoking it via `node` guarantees we always run TS7, regardless of the + * node_modules layout of the project being compiled. + */ +const ts7TscPath = path.join(path.dirname(createRequire(import.meta.url).resolve('@typescript/native/package.json')), 'bin', 'tsc'); + export function spawnTsgo(projectPath: string, config: { taskName: string; noEmit?: boolean }, onComplete?: () => Promise | void): Promise { function runReporter(output: string) { const lines = (output || '').split('\n'); @@ -24,16 +34,15 @@ export function spawnTsgo(projectPath: string, config: { taskName: string; noEmi } } - const args = ['tsgo', '--project', projectPath, '--pretty', 'false', '--incremental']; + const args = [ts7TscPath, '--project', projectPath, '--pretty', 'false', '--incremental']; if (config.noEmit) { args.push('--noEmit'); } else { args.push('--sourceMap', '--inlineSources'); } - const child = cp.spawn(npx, args, { + const child = cp.spawn(process.execPath, args, { cwd: root, - stdio: ['ignore', 'pipe', 'pipe'], - shell: true + stdio: ['ignore', 'pipe', 'pipe'] }); let stdoutData = ''; diff --git a/build/package.json b/build/package.json index 6892c087b6a..84db71fd0f9 100644 --- a/build/package.json +++ b/build/package.json @@ -67,7 +67,7 @@ "scripts": { "copy-policy-dto": "node lib/policies/copyPolicyDto.ts", "pretypecheck": "npm run copy-policy-dto", - "typecheck": "cd .. && npx tsgo --project build/tsconfig.json", + "typecheck": "cd .. && npx tsc --project build/tsconfig.json", "watch": "npm run typecheck -- --watch", "test": "node --test '{lib,next,agent-sdk,codex}/**/*.test.ts'" }, diff --git a/extensions/configuration-editing/package.json b/extensions/configuration-editing/package.json index 45101fa18fa..60b8434ce12 100644 --- a/extensions/configuration-editing/package.json +++ b/extensions/configuration-editing/package.json @@ -25,10 +25,10 @@ "watch": "gulp watch-extension:configuration-editing", "compile-web": "npm-run-all2 -lp bundle-web typecheck-web", "bundle-web": "node ./esbuild.browser.mts", - "typecheck-web": "tsgo --project ./tsconfig.browser.json --noEmit", + "typecheck-web": "node ../../node_modules/@typescript/native/lib/tsc.js --project ./tsconfig.browser.json --noEmit", "watch-web": "npm-run-all2 -lp watch-bundle-web watch-typecheck-web", "watch-bundle-web": "node ./esbuild.browser.mts --watch", - "watch-typecheck-web": "tsgo --project ./tsconfig.browser.json --noEmit --watch" + "watch-typecheck-web": "node ../../node_modules/@typescript/native/lib/tsc.js --project ./tsconfig.browser.json --noEmit --watch" }, "dependencies": { "@octokit/rest": "^21.1.1", diff --git a/extensions/copilot/package-lock.json b/extensions/copilot/package-lock.json index 4bbff2d677d..76c9a50211a 100644 --- a/extensions/copilot/package-lock.json +++ b/extensions/copilot/package-lock.json @@ -88,7 +88,7 @@ "@typescript-eslint/eslint-plugin": "^8.35.0", "@typescript-eslint/parser": "^8.32.0", "@typescript-eslint/typescript-estree": "^8.26.1", - "@typescript/native-preview": "^7.0.0-dev.20260429", + "@typescript/native": "npm:typescript@^7.0.2", "@vitest/coverage-v8": "^4.1.8", "@vitest/snapshot": "^1.5.0", "@vscode/debugadapter": "^1.68.0", @@ -131,7 +131,7 @@ "tar": "^7.5.16", "ts-dedent": "^2.2.0", "tsx": "^4.22.4", - "typescript": "^5.8.3", + "typescript": "npm:@typescript/typescript6@^6.0.2", "vite-plugin-wasm": "^3.6.0", "vitest": "^4.1.8", "vscode-languageserver-protocol": "^3.17.5", @@ -6589,32 +6589,78 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/@typescript/native-preview": { - "version": "7.0.0-dev.20260527.2", - "resolved": "https://registry.npmjs.org/@typescript/native-preview/-/native-preview-7.0.0-dev.20260527.2.tgz", - "integrity": "sha512-piqkDwikVeizCFqA1lcwI5F4wOAtBdxuliWe77ApBNRyBPPvfCJB+u/HYi9/8t5nd0sWvFs6/qt/AzJ1CCoykQ==", + "node_modules/@typescript/native": { + "name": "typescript", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-7.0.2.tgz", + "integrity": "sha512-8FYau96o3NKOhbjKi/qNvG/W5jhzxkbdm5sj9AbZ/5T5sWqn3hJgLfGx27sRKZWTvyzCP8dLRBTf5tBTSRVUNA==", "dev": true, "license": "Apache-2.0", "bin": { - "tsgo": "bin/tsgo.js" + "tsc": "bin/tsc" }, "engines": { "node": ">=16.20.0" }, "optionalDependencies": { - "@typescript/native-preview-darwin-arm64": "7.0.0-dev.20260527.2", - "@typescript/native-preview-darwin-x64": "7.0.0-dev.20260527.2", - "@typescript/native-preview-linux-arm": "7.0.0-dev.20260527.2", - "@typescript/native-preview-linux-arm64": "7.0.0-dev.20260527.2", - "@typescript/native-preview-linux-x64": "7.0.0-dev.20260527.2", - "@typescript/native-preview-win32-arm64": "7.0.0-dev.20260527.2", - "@typescript/native-preview-win32-x64": "7.0.0-dev.20260527.2" + "@typescript/typescript-aix-ppc64": "7.0.2", + "@typescript/typescript-darwin-arm64": "7.0.2", + "@typescript/typescript-darwin-x64": "7.0.2", + "@typescript/typescript-freebsd-arm64": "7.0.2", + "@typescript/typescript-freebsd-x64": "7.0.2", + "@typescript/typescript-linux-arm": "7.0.2", + "@typescript/typescript-linux-arm64": "7.0.2", + "@typescript/typescript-linux-loong64": "7.0.2", + "@typescript/typescript-linux-mips64el": "7.0.2", + "@typescript/typescript-linux-ppc64": "7.0.2", + "@typescript/typescript-linux-riscv64": "7.0.2", + "@typescript/typescript-linux-s390x": "7.0.2", + "@typescript/typescript-linux-x64": "7.0.2", + "@typescript/typescript-netbsd-arm64": "7.0.2", + "@typescript/typescript-netbsd-x64": "7.0.2", + "@typescript/typescript-openbsd-arm64": "7.0.2", + "@typescript/typescript-openbsd-x64": "7.0.2", + "@typescript/typescript-sunos-x64": "7.0.2", + "@typescript/typescript-win32-arm64": "7.0.2", + "@typescript/typescript-win32-x64": "7.0.2" } }, - "node_modules/@typescript/native-preview-darwin-arm64": { - "version": "7.0.0-dev.20260527.2", - "resolved": "https://registry.npmjs.org/@typescript/native-preview-darwin-arm64/-/native-preview-darwin-arm64-7.0.0-dev.20260527.2.tgz", - "integrity": "sha512-3LqSu4DlxkEfeC/Z/29QMCJn5jjkDtXI7LYuxfmjdmAatS6umDKqm8J17fnP/7fyrZUMBTIYRwSDpChGV3G1ew==", + "node_modules/@typescript/old": { + "name": "typescript", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz", + "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/@typescript/typescript-aix-ppc64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-aix-ppc64/-/typescript-aix-ppc64-7.0.2.tgz", + "integrity": "sha512-MTKKkWB7p/0E9xi1d1tHtZ5PiLkGEMIq88pK2CubZjOsLtYTLqhgIgi6zepFa+9GHZ6h05NMCkQxGKiPXMxXtQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=16.20.0" + } + }, + "node_modules/@typescript/typescript-darwin-arm64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-darwin-arm64/-/typescript-darwin-arm64-7.0.2.tgz", + "integrity": "sha512-gowzar9MwS/aRWp6f3a4KUqzRjAZjOsmGNCM6LcTgXum+dBfgsBVMN+AgvOCCbguXyick6LJhpBszxMebJ8syA==", "cpu": [ "arm64" ], @@ -6628,10 +6674,10 @@ "node": ">=16.20.0" } }, - "node_modules/@typescript/native-preview-darwin-x64": { - "version": "7.0.0-dev.20260527.2", - "resolved": "https://registry.npmjs.org/@typescript/native-preview-darwin-x64/-/native-preview-darwin-x64-7.0.0-dev.20260527.2.tgz", - "integrity": "sha512-H4+sxE9qaBbLF83wMdWE0FsgfK0Pom+/O+/oxqyGzhVkDJlNt3vfpgQZMit48/Gm44AacGfBggJ9Dhbi3aeSFw==", + "node_modules/@typescript/typescript-darwin-x64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-darwin-x64/-/typescript-darwin-x64-7.0.2.tgz", + "integrity": "sha512-SZ9xZInqApNlNGc9s0W1VSsktYSOe9cFqNOIqmN1Gs8SmkjKZYFt017G4VwPxASInODuAdbTW7sXiFUf893RgA==", "cpu": [ "x64" ], @@ -6645,10 +6691,44 @@ "node": ">=16.20.0" } }, - "node_modules/@typescript/native-preview-linux-arm": { - "version": "7.0.0-dev.20260527.2", - "resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-arm/-/native-preview-linux-arm-7.0.0-dev.20260527.2.tgz", - "integrity": "sha512-6I9Cv9ozwfS9zB9vRQDPIYseLX3artEO9jl3yVgLj4ishwlSF4cWAbIsjl5IztPaEgHv8coej/6tX1D0uaBzXg==", + "node_modules/@typescript/typescript-freebsd-arm64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-freebsd-arm64/-/typescript-freebsd-arm64-7.0.2.tgz", + "integrity": "sha512-W5NH4y/J0plIIS5b2xvTEkU7JFxyqdMAOgf+Ilhl0vHQXKO5dZoxd+C/jEtq56c4F3wk71RB4BMRQ2XdI+bwYQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=16.20.0" + } + }, + "node_modules/@typescript/typescript-freebsd-x64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-freebsd-x64/-/typescript-freebsd-x64-7.0.2.tgz", + "integrity": "sha512-UMGDx5sTpzNw3WiPebH7l90IWfJggEd+egHt/q6p7/Cm3zqoV7VxkGXt+3DxPIw8CcmvAB0j3sVVfbhX+M4Tpw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=16.20.0" + } + }, + "node_modules/@typescript/typescript-linux-arm": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-linux-arm/-/typescript-linux-arm-7.0.2.tgz", + "integrity": "sha512-gffT3xPz9sR7j/YJExkyPntrI0P2EP9XbOyWzth2/Gs0RstK+90RBcO0ncXoXy/beYll1SXw846Nf2zdnEz0QQ==", "cpu": [ "arm" ], @@ -6662,10 +6742,10 @@ "node": ">=16.20.0" } }, - "node_modules/@typescript/native-preview-linux-arm64": { - "version": "7.0.0-dev.20260527.2", - "resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-arm64/-/native-preview-linux-arm64-7.0.0-dev.20260527.2.tgz", - "integrity": "sha512-BGUDMjC2Z3TTdZRkGGwhBLelkP5UYgO2rbep8aF4dS3fu7T5lFPPrnfS6EgqJgie+cF5Fsev7xEq8wWyBDM+lg==", + "node_modules/@typescript/typescript-linux-arm64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-linux-arm64/-/typescript-linux-arm64-7.0.2.tgz", + "integrity": "sha512-Qh4eU4/y3yDjnfjjyPYihMj5/ODIlmt+Bzu17OI+fiSRDW57QmU5SiN63exPRNJPKUzcc1INa1NXdrJ+MqHjUQ==", "cpu": [ "arm64" ], @@ -6679,10 +6759,95 @@ "node": ">=16.20.0" } }, - "node_modules/@typescript/native-preview-linux-x64": { - "version": "7.0.0-dev.20260527.2", - "resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-x64/-/native-preview-linux-x64-7.0.0-dev.20260527.2.tgz", - "integrity": "sha512-vpazOu+ozlxBo8U57YJMzsOPuxAV8H7fu36KJ8ea8At/D8pdGmOAy5TuB+9OBQV9JDe0OXJMy2kmbhOpmkTAmA==", + "node_modules/@typescript/typescript-linux-loong64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-linux-loong64/-/typescript-linux-loong64-7.0.2.tgz", + "integrity": "sha512-uEHck9i8hoAzXPiYRib1O7miOnz23SxIeVl6F4LXox+qov1K35jHcEW6VHKvZI+pyvl7fZEP4MCU5LYvIq1GuQ==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=16.20.0" + } + }, + "node_modules/@typescript/typescript-linux-mips64el": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-linux-mips64el/-/typescript-linux-mips64el-7.0.2.tgz", + "integrity": "sha512-R4KvAMnE43W5Qeqb0Ly56O3mWMWIAgsMyz36DCaycd5nbg/9kzm0liw3JocfRqyJY0KPmzFjbswozXyW0DnIYA==", + "cpu": [ + "mips64el" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=16.20.0" + } + }, + "node_modules/@typescript/typescript-linux-ppc64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-linux-ppc64/-/typescript-linux-ppc64-7.0.2.tgz", + "integrity": "sha512-DORx5b3sd/4S7eayxm4FQv+A7CrkUIGRaHiwI8oiHTAI1fAPWhF4J0vAlkC8biAlHSVVwxMQ3tjZ2/DVbnQiiA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=16.20.0" + } + }, + "node_modules/@typescript/typescript-linux-riscv64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-linux-riscv64/-/typescript-linux-riscv64-7.0.2.tgz", + "integrity": "sha512-wf0jqEDOjrPRnKwYRyyJDRo11KMbvMFrU+q4zqKyChODBzvlkbhNQfKvLxQCcwTpdDaXSHZTVuh0JoCrKCUMHQ==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=16.20.0" + } + }, + "node_modules/@typescript/typescript-linux-s390x": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-linux-s390x/-/typescript-linux-s390x-7.0.2.tgz", + "integrity": "sha512-IkwJc3L7yhytWd/ewjyxNDfOmswCm9GWMJT/ue/dU4aZNbwZeYAetq42VyLmsmSjvoX7z74X6ZaYCtzAr0EuGw==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=16.20.0" + } + }, + "node_modules/@typescript/typescript-linux-x64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-linux-x64/-/typescript-linux-x64-7.0.2.tgz", + "integrity": "sha512-EYdf2cNg7rgCWJnxCdJ+F3V39O8ihb37eHAu1LK8oAFizgTQbPOK7zHHXbPt8rX24COqODXeI3sIf0fCXG7H/A==", "cpu": [ "x64" ], @@ -6696,10 +6861,95 @@ "node": ">=16.20.0" } }, - "node_modules/@typescript/native-preview-win32-arm64": { - "version": "7.0.0-dev.20260527.2", - "resolved": "https://registry.npmjs.org/@typescript/native-preview-win32-arm64/-/native-preview-win32-arm64-7.0.0-dev.20260527.2.tgz", - "integrity": "sha512-DBFnFE3V6AITkPO1K1VxXf3yEZKjU2FwtXlNwRqhzDu0rrL2SsJHOSrBDX+OacTxQFzZMxFcpiuhV8jHZALPEg==", + "node_modules/@typescript/typescript-netbsd-arm64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-netbsd-arm64/-/typescript-netbsd-arm64-7.0.2.tgz", + "integrity": "sha512-+polYF4MF04aPpO5FTkHran9yUQDSXqy5GiSDKpsll5jy3l3+g9QLhpf39T+ePtefhXLOGrLl0QIjkQP6VnelA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=16.20.0" + } + }, + "node_modules/@typescript/typescript-netbsd-x64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-netbsd-x64/-/typescript-netbsd-x64-7.0.2.tgz", + "integrity": "sha512-8YIT0EHM/3dq10ZOVF/A7pc/YSMtbcecct4rWtexrnSCHOPcpC2KTLXfTCR6vDpnSiY12heNb1GiN/wu+T/FyA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=16.20.0" + } + }, + "node_modules/@typescript/typescript-openbsd-arm64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-openbsd-arm64/-/typescript-openbsd-arm64-7.0.2.tgz", + "integrity": "sha512-APT8+ClYnuYm1u9+kgGXoMj2VzWzcymwh2gNSQVySHfkRDGOTVkoWLjCmOQSaO+PoqQ57B0flRp9SA+7GnnkzQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=16.20.0" + } + }, + "node_modules/@typescript/typescript-openbsd-x64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-openbsd-x64/-/typescript-openbsd-x64-7.0.2.tgz", + "integrity": "sha512-yX7s+Q0Dln0Dt9tEzZsAjXXR/+ytBM7AlglaqyeMPxQszJ1JhlJdZ6jLA+IzldHtflX81em7lDao1xXu+aRRkg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=16.20.0" + } + }, + "node_modules/@typescript/typescript-sunos-x64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-sunos-x64/-/typescript-sunos-x64-7.0.2.tgz", + "integrity": "sha512-dLJDGaLZ1D4HPQn62u1n8mBDkJREwMsAkCdkwd4Ieqw+x3TUyTsqY0YiBCtE6H6OzzgGk3iuZ3vFWRS+E8/d1g==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=16.20.0" + } + }, + "node_modules/@typescript/typescript-win32-arm64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-win32-arm64/-/typescript-win32-arm64-7.0.2.tgz", + "integrity": "sha512-Gyl1Vy6OsWesLzmq+EP0Fb7b4Nid5232AvcA2SFcdYreldpNtYFFofPjnt62y9hQy7VTaZp65ICJjuAQRaVcIQ==", "cpu": [ "arm64" ], @@ -6713,10 +6963,10 @@ "node": ">=16.20.0" } }, - "node_modules/@typescript/native-preview-win32-x64": { - "version": "7.0.0-dev.20260527.2", - "resolved": "https://registry.npmjs.org/@typescript/native-preview-win32-x64/-/native-preview-win32-x64-7.0.0-dev.20260527.2.tgz", - "integrity": "sha512-1tBlErMvQgcMqqYwsx4tytupcjCJcOUXD3vBn1Wb/kAvus1FzWQAFE0fcKBvLfcqLQfTiiEwKKEtbLjGmakqqg==", + "node_modules/@typescript/typescript-win32-x64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-win32-x64/-/typescript-win32-x64-7.0.2.tgz", + "integrity": "sha512-0BQ3HkAHHlKLSp1qRvf3SUhGpGsDuhB/jgFw75guyqbxJqEaS0Cw/VFO8i2nHglJUzQCRtMMR/IBAKE3ETMC4g==", "cpu": [ "x64" ], @@ -16429,17 +16679,17 @@ } }, "node_modules/typescript": { - "version": "5.8.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz", - "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==", + "name": "@typescript/typescript6", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript6/-/typescript6-6.0.2.tgz", + "integrity": "sha512-mbCddXd+jm7hfx7w2YU64/Av4/NqqeG3GoRZgxPcgoTxYjhrcfJRw9ULch71SS4G+Q3bOXFhRvPqjguN0Hyp5w==", "dev": true, "license": "Apache-2.0", - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" + "dependencies": { + "@typescript/old": "npm:typescript@^6" }, - "engines": { - "node": ">=14.17" + "bin": { + "tsc6": "bin/tsc6" } }, "node_modules/uc.micro": { diff --git a/extensions/copilot/package.json b/extensions/copilot/package.json index 0db3e57a9a7..63581b0005d 100644 --- a/extensions/copilot/package.json +++ b/extensions/copilot/package.json @@ -7139,11 +7139,11 @@ "compile": "node .esbuild.mts --dev", "watch": "npm-run-all -lp watch:esbuild watch:typecheck", "watch:esbuild": "node .esbuild.mts --watch --dev", - "watch:typecheck": "npx tsgo --noEmit --watch --preserveWatchOutput --project tsconfig.json", - "watch:typecheck-extension": "npx tsgo --noEmit --watch --project tsconfig.json", - "watch:typecheck-extension-web": "npx tsgo --noEmit --watch --project tsconfig.worker.json", - "watch:typecheck-simulation-workbench": "npx tsgo --noEmit --watch --project test/simulation/workbench/tsconfig.json", - "typecheck": "npx tsgo --noEmit --project tsconfig.json && npx tsgo --noEmit --project test/simulation/workbench/tsconfig.json && npx tsgo --noEmit --project tsconfig.worker.json && npx tsgo --noEmit --project src/extension/completions-core/vscode-node/extension/src/copilotPanel/webView/tsconfig.json", + "watch:typecheck": "tsc --noEmit --watch --preserveWatchOutput --project tsconfig.json", + "watch:typecheck-extension": "tsc --noEmit --watch --project tsconfig.json", + "watch:typecheck-extension-web": "tsc --noEmit --watch --project tsconfig.worker.json", + "watch:typecheck-simulation-workbench": "tsc --noEmit --watch --project test/simulation/workbench/tsconfig.json", + "typecheck": "tsc --noEmit --project tsconfig.json && tsc --noEmit --project test/simulation/workbench/tsconfig.json && tsc --noEmit --project tsconfig.worker.json && tsc --noEmit --project src/extension/completions-core/vscode-node/extension/src/copilotPanel/webView/tsconfig.json", "lint": "npx eslint . --max-warnings=0", "lint-staged": "npx eslint --max-warnings=0", "tsfmt": "npx tsfmt -r --verify", @@ -7204,7 +7204,7 @@ "@typescript-eslint/eslint-plugin": "^8.35.0", "@typescript-eslint/parser": "^8.32.0", "@typescript-eslint/typescript-estree": "^8.26.1", - "@typescript/native-preview": "^7.0.0-dev.20260429", + "@typescript/native": "npm:typescript@^7.0.2", "@vitest/coverage-v8": "^4.1.8", "@vitest/snapshot": "^1.5.0", "@vscode/debugadapter": "^1.68.0", @@ -7247,7 +7247,7 @@ "tar": "^7.5.16", "ts-dedent": "^2.2.0", "tsx": "^4.22.4", - "typescript": "^5.8.3", + "typescript": "npm:@typescript/typescript6@^6.0.2", "vite-plugin-wasm": "^3.6.0", "vitest": "^4.1.8", "vscode-languageserver-protocol": "^3.17.5", diff --git a/extensions/copilot/script/build/extractChatLib.ts b/extensions/copilot/script/build/extractChatLib.ts index 08ad93486c6..2b7586fdd0a 100644 --- a/extensions/copilot/script/build/extractChatLib.ts +++ b/extensions/copilot/script/build/extractChatLib.ts @@ -891,7 +891,7 @@ class ChatLibExtractor { try { // Change to the chat-lib directory and run TypeScript compiler - const { stdout, stderr } = await execAsync('npx tsc --noEmit', { + const { stdout, stderr } = await execAsync('npx tsc6 --noEmit', { cwd: CHAT_LIB_DIR, timeout: 60000 // 60 second timeout }); diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json index ff49a4a21f4..226d2243b44 100644 --- a/extensions/emmet/package.json +++ b/extensions/emmet/package.json @@ -478,10 +478,10 @@ "watch": "gulp watch-extension:emmet", "compile-web": "npm-run-all2 -lp bundle-web typecheck-web", "bundle-web": "node ./esbuild.browser.mts", - "typecheck-web": "tsgo --project ./tsconfig.browser.json --noEmit", + "typecheck-web": "node ../../node_modules/@typescript/native/lib/tsc.js --project ./tsconfig.browser.json --noEmit", "watch-web": "npm-run-all2 -lp watch-bundle-web watch-typecheck-web", "watch-bundle-web": "node ./esbuild.browser.mts --watch", - "watch-typecheck-web": "tsgo --project ./tsconfig.browser.json --noEmit --watch", + "watch-typecheck-web": "node ../../node_modules/@typescript/native/lib/tsc.js --project ./tsconfig.browser.json --noEmit --watch", "deps": "npm install @vscode/emmet-helper" }, "devDependencies": { diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json index 711066ba469..aedacbaf21c 100644 --- a/extensions/markdown-language-features/package.json +++ b/extensions/markdown-language-features/package.json @@ -902,10 +902,10 @@ "watch-markdown-editor": "node ./esbuild.markdownEditor.mts --watch", "compile-web": "npm-run-all2 -lp bundle-web typecheck-web", "bundle-web": "node ./esbuild.browser.mts", - "typecheck-web": "tsgo --project ./tsconfig.browser.json --noEmit", + "typecheck-web": "node ../../node_modules/@typescript/native/lib/tsc.js --project ./tsconfig.browser.json --noEmit", "watch-web": "npm-run-all2 -lp watch-bundle-web watch-typecheck-web", "watch-bundle-web": "node ./esbuild.browser.mts --watch", - "watch-typecheck-web": "tsgo --project ./tsconfig.browser.json --noEmit --watch" + "watch-typecheck-web": "node ../../node_modules/@typescript/native/lib/tsc.js --project ./tsconfig.browser.json --noEmit --watch" }, "dependencies": { "@vscode/extension-telemetry": "^0.9.8", diff --git a/extensions/media-preview/package.json b/extensions/media-preview/package.json index ec2dec6dbad..90c6771814f 100644 --- a/extensions/media-preview/package.json +++ b/extensions/media-preview/package.json @@ -158,10 +158,10 @@ "build-ext": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.mjs compile-extension:media-preview ./tsconfig.json", "compile-web": "npm-run-all2 -lp bundle-web typecheck-web", "bundle-web": "node ./esbuild.browser.mts", - "typecheck-web": "tsgo --project ./tsconfig.browser.json --noEmit", + "typecheck-web": "node ../../node_modules/@typescript/native/lib/tsc.js --project ./tsconfig.browser.json --noEmit", "watch-web": "npm-run-all2 -lp watch-bundle-web watch-typecheck-web", "watch-bundle-web": "node ./esbuild.browser.mts --watch", - "watch-typecheck-web": "tsgo --project ./tsconfig.browser.json --noEmit --watch" + "watch-typecheck-web": "node ../../node_modules/@typescript/native/lib/tsc.js --project ./tsconfig.browser.json --noEmit --watch" }, "dependencies": { "@vscode/extension-telemetry": "^0.9.8", diff --git a/extensions/merge-conflict/package.json b/extensions/merge-conflict/package.json index 2773fe9127c..1a4bc6c920f 100644 --- a/extensions/merge-conflict/package.json +++ b/extensions/merge-conflict/package.json @@ -29,10 +29,10 @@ "watch": "gulp watch-extension:merge-conflict", "compile-web": "npm-run-all2 -lp bundle-web typecheck-web", "bundle-web": "node ./esbuild.browser.mts", - "typecheck-web": "tsgo --project ./tsconfig.json --noEmit", + "typecheck-web": "node ../../node_modules/@typescript/native/lib/tsc.js --project ./tsconfig.json --noEmit", "watch-web": "npm-run-all2 -lp watch-bundle-web watch-typecheck-web", "watch-bundle-web": "node ./esbuild.browser.mts --watch", - "watch-typecheck-web": "tsgo --project ./tsconfig.json --noEmit --watch" + "watch-typecheck-web": "node ../../node_modules/@typescript/native/lib/tsc.js --project ./tsconfig.json --noEmit --watch" }, "contributes": { "commands": [ diff --git a/extensions/mermaid-markdown-features/package.json b/extensions/mermaid-markdown-features/package.json index 1fa810cab8b..e4a20e4e2d2 100644 --- a/extensions/mermaid-markdown-features/package.json +++ b/extensions/mermaid-markdown-features/package.json @@ -243,10 +243,10 @@ "build-webview": "node ./esbuild.webview.mts", "compile-web": "npm-run-all2 -lp bundle-web typecheck-web", "bundle-web": "node ./esbuild.browser.mts", - "typecheck-web": "tsgo --project ./tsconfig.browser.json --noEmit", + "typecheck-web": "node ../../node_modules/@typescript/native/lib/tsc.js --project ./tsconfig.browser.json --noEmit", "watch-web": "npm-run-all2 -lp watch-bundle-web watch-typecheck-web", "watch-bundle-web": "node ./esbuild.browser.mts --watch", - "watch-typecheck-web": "tsgo --project ./tsconfig.browser.json --noEmit --watch" + "watch-typecheck-web": "node ../../node_modules/@typescript/native/lib/tsc.js --project ./tsconfig.browser.json --noEmit --watch" }, "devDependencies": { "@types/markdown-it": "^14.1.0", diff --git a/extensions/npm/package.json b/extensions/npm/package.json index fd5f0c62bab..ce9f1486c27 100644 --- a/extensions/npm/package.json +++ b/extensions/npm/package.json @@ -21,10 +21,10 @@ "watch": "npx gulp watch-extension:npm", "compile-web": "npm-run-all2 -lp bundle-web typecheck-web", "bundle-web": "node ./esbuild.browser.mts", - "typecheck-web": "tsgo --project ./tsconfig.browser.json --noEmit", + "typecheck-web": "node ../../node_modules/@typescript/native/lib/tsc.js --project ./tsconfig.browser.json --noEmit", "watch-web": "npm-run-all2 -lp watch-bundle-web watch-typecheck-web", "watch-bundle-web": "node ./esbuild.browser.mts --watch", - "watch-typecheck-web": "tsgo --project ./tsconfig.browser.json --noEmit --watch" + "watch-typecheck-web": "node ../../node_modules/@typescript/native/lib/tsc.js --project ./tsconfig.browser.json --noEmit --watch" }, "dependencies": { "find-up": "^5.0.0", diff --git a/extensions/package-lock.json b/extensions/package-lock.json index 9f46fe5d416..a55af3c1109 100644 --- a/extensions/package-lock.json +++ b/extensions/package-lock.json @@ -588,6 +588,9 @@ "arm" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -609,6 +612,9 @@ "arm" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -630,6 +636,9 @@ "arm64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -651,6 +660,9 @@ "arm64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -672,6 +684,9 @@ "x64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -693,6 +708,9 @@ "x64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -774,6 +792,7 @@ "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-1.12.7.tgz", "integrity": "sha512-pLXHFxQMPklVoEekowk8b3erNynC+DVJzChxS/LCBBgR6/8AJkHivkm//zbowcfc7BTCAjryuhx6gPqPRfsFoA==", "dev": true, + "license": "MIT", "bin": { "cake": "bin/cake", "coffee": "bin/coffee" @@ -787,6 +806,7 @@ "resolved": "https://registry.npmjs.org/cson-parser/-/cson-parser-4.0.9.tgz", "integrity": "sha512-I79SAcCYquWnEfXYj8hBqOOWKj6eH6zX1hhX3yqmS4K3bYp7jME3UFpHPzu3rUew0oyfc0s8T6IlWGXRAheHag==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "coffeescript": "1.12.7" }, @@ -795,9 +815,9 @@ } }, "node_modules/detect-libc": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz", - "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", + "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", "dev": true, "license": "Apache-2.0", "engines": { @@ -849,14 +869,16 @@ "node_modules/fast-plist": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/fast-plist/-/fast-plist-0.1.2.tgz", - "integrity": "sha1-pFr/NFGWAG1AbKbNzQX2kFHvNbg= sha512-2HxzrqJhmMoxVzARjYFvkzkL2dCBB8sogU5sD8gqcZWv5UCivK9/cXM9KIPDRwU+eD3mbRDN/GhW8bO/4dtMfg==", - "dev": true + "integrity": "sha512-2HxzrqJhmMoxVzARjYFvkzkL2dCBB8sogU5sD8gqcZWv5UCivK9/cXM9KIPDRwU+eD3mbRDN/GhW8bO/4dtMfg==", + "dev": true, + "license": "MIT" }, "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -866,6 +888,7 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, + "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" }, @@ -874,19 +897,16 @@ } }, "node_modules/node-addon-api": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz", - "integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz", + "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==", "dev": true, - "license": "MIT", - "engines": { - "node": "^16 || ^18 || >= 20" - } + "license": "MIT" }, "node_modules/picomatch": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", - "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz", + "integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==", "dev": true, "license": "MIT", "engines": { @@ -914,6 +934,7 @@ "resolved": "https://registry.npmjs.org/vscode-grammar-updater/-/vscode-grammar-updater-1.1.0.tgz", "integrity": "sha512-rWcJXyEFK27Mh9bxfBTLaul0KiGQk0GMXj2qTDH9cy3UZVx5MrF035B03os1w4oIXwl/QDhdLnsBK0j2SNiL1A==", "dev": true, + "license": "MIT", "dependencies": { "cson-parser": "^4.0.9", "fast-plist": "0.1.2" diff --git a/extensions/postinstall.mjs b/extensions/postinstall.mjs index f073aa720c9..eb8af1bbea9 100644 --- a/extensions/postinstall.mjs +++ b/extensions/postinstall.mjs @@ -27,6 +27,8 @@ function processLib() { const toDelete = new Set([ 'tsc.js', '_tsc.js', + 'tsc6.js', + '_tsc6.js', 'typescriptServices.js', '_typescriptServices.js', diff --git a/extensions/references-view/package.json b/extensions/references-view/package.json index 2a04026c35a..3c0474913f1 100644 --- a/extensions/references-view/package.json +++ b/extensions/references-view/package.json @@ -399,10 +399,10 @@ "watch": "npx gulp watch-extension:references-view", "compile-web": "npm-run-all2 -lp bundle-web typecheck-web", "bundle-web": "node ./esbuild.browser.mts", - "typecheck-web": "tsgo --project ./tsconfig.json --noEmit", + "typecheck-web": "node ../../node_modules/@typescript/native/lib/tsc.js --project ./tsconfig.json --noEmit", "watch-web": "npm-run-all2 -lp watch-bundle-web watch-typecheck-web", "watch-bundle-web": "node ./esbuild.browser.mts --watch", - "watch-typecheck-web": "tsgo --project ./tsconfig.json --noEmit --watch" + "watch-typecheck-web": "node ../../node_modules/@typescript/native/lib/tsc.js --project ./tsconfig.json --noEmit --watch" }, "devDependencies": { "@types/node": "24.x" diff --git a/extensions/search-result/package.json b/extensions/search-result/package.json index aae5ddd0a30..06e67b66151 100644 --- a/extensions/search-result/package.json +++ b/extensions/search-result/package.json @@ -19,10 +19,10 @@ "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.mjs compile-extension:search-result ./tsconfig.json", "compile-web": "npm-run-all2 -lp bundle-web typecheck-web", "bundle-web": "node ./esbuild.browser.mts", - "typecheck-web": "tsgo --project ./tsconfig.json --noEmit", + "typecheck-web": "node ../../node_modules/@typescript/native/lib/tsc.js --project ./tsconfig.json --noEmit", "watch-web": "npm-run-all2 -lp watch-bundle-web watch-typecheck-web", "watch-bundle-web": "node ./esbuild.browser.mts --watch", - "watch-typecheck-web": "tsgo --project ./tsconfig.json --noEmit --watch" + "watch-typecheck-web": "node ../../node_modules/@typescript/native/lib/tsc.js --project ./tsconfig.json --noEmit --watch" }, "capabilities": { "virtualWorkspaces": true, diff --git a/extensions/simple-browser/package.json b/extensions/simple-browser/package.json index 352d4ea1e15..e6e30714c62 100644 --- a/extensions/simple-browser/package.json +++ b/extensions/simple-browser/package.json @@ -72,10 +72,10 @@ "build-webview": "node ./esbuild.webview.mts", "compile-web": "npm-run-all2 -lp bundle-web typecheck-web", "bundle-web": "node ./esbuild.browser.mts", - "typecheck-web": "tsgo --project ./tsconfig.json --noEmit", + "typecheck-web": "node ../../node_modules/@typescript/native/lib/tsc.js --project ./tsconfig.json --noEmit", "watch-web": "npm-run-all2 -lp watch-bundle-web watch-typecheck-web", "watch-bundle-web": "node ./esbuild.browser.mts --watch", - "watch-typecheck-web": "tsgo --project ./tsconfig.json --noEmit --watch" + "watch-typecheck-web": "node ../../node_modules/@typescript/native/lib/tsc.js --project ./tsconfig.json --noEmit --watch" }, "dependencies": { "@vscode/extension-telemetry": "^0.9.8" diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json index 6d98d4e251b..72af5f8bd38 100644 --- a/extensions/typescript-language-features/package.json +++ b/extensions/typescript-language-features/package.json @@ -65,10 +65,10 @@ "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.mjs compile-extension:typescript-language-features", "compile-web": "npm-run-all2 -lp bundle-web typecheck-web", "bundle-web": "node ./esbuild.browser.mts", - "typecheck-web": "tsgo --project ./tsconfig.browser.json --noEmit", + "typecheck-web": "node ../../node_modules/@typescript/native/lib/tsc.js --project ./tsconfig.browser.json --noEmit", "watch-web": "npm-run-all2 -lp watch-bundle-web watch-typecheck-web", "watch-bundle-web": "node ./esbuild.browser.mts --watch", - "watch-typecheck-web": "tsgo --project ./tsconfig.browser.json --noEmit --watch" + "watch-typecheck-web": "node ../../node_modules/@typescript/native/lib/tsc.js --project ./tsconfig.browser.json --noEmit --watch" }, "activationEvents": [ "onLanguage:javascript", diff --git a/package-lock.json b/package-lock.json index f316d9d279c..2faf1946422 100644 --- a/package-lock.json +++ b/package-lock.json @@ -107,7 +107,7 @@ "@types/yauzl": "^2.10.0", "@types/yazl": "^2.4.2", "@typescript-eslint/utils": "^8.45.0", - "@typescript/native-preview": "^7.0.0-dev.20260609", + "@typescript/native": "npm:typescript@^7.0.2", "@vscode/component-explorer": "^0.2.1-58", "@vscode/component-explorer-cli": "^0.2.1-59", "@vscode/gulp-electron": "^1.42.0", @@ -177,7 +177,7 @@ "tar": "^7.5.16", "tsec": "0.2.7", "tslib": "^2.6.3", - "typescript": "^6.0.0-dev.20260416", + "typescript": "npm:@typescript/typescript6@^6.0.2", "typescript-eslint": "^8.45.0", "util": "^0.12.4", "xml2js": "^0.5.0", @@ -3520,32 +3520,78 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/@typescript/native-preview": { - "version": "7.0.0-dev.20260609.1", - "resolved": "https://registry.npmjs.org/@typescript/native-preview/-/native-preview-7.0.0-dev.20260609.1.tgz", - "integrity": "sha512-1HOuH/u/451O3hx4Z9fesNqarpeit6UfkgwK96sCVWi5p69F0N3v+6bI969lLIjF7K9dbYQNiWUaZ6Wik87iKg==", + "node_modules/@typescript/native": { + "name": "typescript", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-7.0.2.tgz", + "integrity": "sha512-8FYau96o3NKOhbjKi/qNvG/W5jhzxkbdm5sj9AbZ/5T5sWqn3hJgLfGx27sRKZWTvyzCP8dLRBTf5tBTSRVUNA==", "dev": true, "license": "Apache-2.0", "bin": { - "tsgo": "bin/tsgo.js" + "tsc": "bin/tsc" }, "engines": { "node": ">=16.20.0" }, "optionalDependencies": { - "@typescript/native-preview-darwin-arm64": "7.0.0-dev.20260609.1", - "@typescript/native-preview-darwin-x64": "7.0.0-dev.20260609.1", - "@typescript/native-preview-linux-arm": "7.0.0-dev.20260609.1", - "@typescript/native-preview-linux-arm64": "7.0.0-dev.20260609.1", - "@typescript/native-preview-linux-x64": "7.0.0-dev.20260609.1", - "@typescript/native-preview-win32-arm64": "7.0.0-dev.20260609.1", - "@typescript/native-preview-win32-x64": "7.0.0-dev.20260609.1" + "@typescript/typescript-aix-ppc64": "7.0.2", + "@typescript/typescript-darwin-arm64": "7.0.2", + "@typescript/typescript-darwin-x64": "7.0.2", + "@typescript/typescript-freebsd-arm64": "7.0.2", + "@typescript/typescript-freebsd-x64": "7.0.2", + "@typescript/typescript-linux-arm": "7.0.2", + "@typescript/typescript-linux-arm64": "7.0.2", + "@typescript/typescript-linux-loong64": "7.0.2", + "@typescript/typescript-linux-mips64el": "7.0.2", + "@typescript/typescript-linux-ppc64": "7.0.2", + "@typescript/typescript-linux-riscv64": "7.0.2", + "@typescript/typescript-linux-s390x": "7.0.2", + "@typescript/typescript-linux-x64": "7.0.2", + "@typescript/typescript-netbsd-arm64": "7.0.2", + "@typescript/typescript-netbsd-x64": "7.0.2", + "@typescript/typescript-openbsd-arm64": "7.0.2", + "@typescript/typescript-openbsd-x64": "7.0.2", + "@typescript/typescript-sunos-x64": "7.0.2", + "@typescript/typescript-win32-arm64": "7.0.2", + "@typescript/typescript-win32-x64": "7.0.2" } }, - "node_modules/@typescript/native-preview-darwin-arm64": { - "version": "7.0.0-dev.20260609.1", - "resolved": "https://registry.npmjs.org/@typescript/native-preview-darwin-arm64/-/native-preview-darwin-arm64-7.0.0-dev.20260609.1.tgz", - "integrity": "sha512-Yf/zHEadP/yUiWUdM/mZVfEVFJuGMf6nhRSFif0vp+FwtfGU4jmlpNF7BTJJdOHrrcWkwEJKzAoMCtEtyxhuyQ==", + "node_modules/@typescript/old": { + "name": "typescript", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz", + "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/@typescript/typescript-aix-ppc64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-aix-ppc64/-/typescript-aix-ppc64-7.0.2.tgz", + "integrity": "sha512-MTKKkWB7p/0E9xi1d1tHtZ5PiLkGEMIq88pK2CubZjOsLtYTLqhgIgi6zepFa+9GHZ6h05NMCkQxGKiPXMxXtQ==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=16.20.0" + } + }, + "node_modules/@typescript/typescript-darwin-arm64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-darwin-arm64/-/typescript-darwin-arm64-7.0.2.tgz", + "integrity": "sha512-gowzar9MwS/aRWp6f3a4KUqzRjAZjOsmGNCM6LcTgXum+dBfgsBVMN+AgvOCCbguXyick6LJhpBszxMebJ8syA==", "cpu": [ "arm64" ], @@ -3559,10 +3605,10 @@ "node": ">=16.20.0" } }, - "node_modules/@typescript/native-preview-darwin-x64": { - "version": "7.0.0-dev.20260609.1", - "resolved": "https://registry.npmjs.org/@typescript/native-preview-darwin-x64/-/native-preview-darwin-x64-7.0.0-dev.20260609.1.tgz", - "integrity": "sha512-z4dYWI57CPHs0wV/FWFth8fWmqYH7iOm7THOfZ5Fv0jo/SWK6kE1kEUIqIAExqo7ueRNqSrCw0I8U1J4TJszAw==", + "node_modules/@typescript/typescript-darwin-x64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-darwin-x64/-/typescript-darwin-x64-7.0.2.tgz", + "integrity": "sha512-SZ9xZInqApNlNGc9s0W1VSsktYSOe9cFqNOIqmN1Gs8SmkjKZYFt017G4VwPxASInODuAdbTW7sXiFUf893RgA==", "cpu": [ "x64" ], @@ -3576,10 +3622,44 @@ "node": ">=16.20.0" } }, - "node_modules/@typescript/native-preview-linux-arm": { - "version": "7.0.0-dev.20260609.1", - "resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-arm/-/native-preview-linux-arm-7.0.0-dev.20260609.1.tgz", - "integrity": "sha512-mEtN8BbAgVtBu/5MVomYquXNvgok2C0KG6V0D4SV1jfBJNtlcqbp0WuIqT0bnM9DA4TgzcHvnFMpwGSK/dqI5A==", + "node_modules/@typescript/typescript-freebsd-arm64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-freebsd-arm64/-/typescript-freebsd-arm64-7.0.2.tgz", + "integrity": "sha512-W5NH4y/J0plIIS5b2xvTEkU7JFxyqdMAOgf+Ilhl0vHQXKO5dZoxd+C/jEtq56c4F3wk71RB4BMRQ2XdI+bwYQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=16.20.0" + } + }, + "node_modules/@typescript/typescript-freebsd-x64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-freebsd-x64/-/typescript-freebsd-x64-7.0.2.tgz", + "integrity": "sha512-UMGDx5sTpzNw3WiPebH7l90IWfJggEd+egHt/q6p7/Cm3zqoV7VxkGXt+3DxPIw8CcmvAB0j3sVVfbhX+M4Tpw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=16.20.0" + } + }, + "node_modules/@typescript/typescript-linux-arm": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-linux-arm/-/typescript-linux-arm-7.0.2.tgz", + "integrity": "sha512-gffT3xPz9sR7j/YJExkyPntrI0P2EP9XbOyWzth2/Gs0RstK+90RBcO0ncXoXy/beYll1SXw846Nf2zdnEz0QQ==", "cpu": [ "arm" ], @@ -3593,10 +3673,10 @@ "node": ">=16.20.0" } }, - "node_modules/@typescript/native-preview-linux-arm64": { - "version": "7.0.0-dev.20260609.1", - "resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-arm64/-/native-preview-linux-arm64-7.0.0-dev.20260609.1.tgz", - "integrity": "sha512-OxNVWH9IhrMAzNlDyDit1dPO64GFIDPOUKoruIkJ9A1ZEONfIHXG5f+V3si9jtuNmuomiz9FjpbzOqLsgaxt+w==", + "node_modules/@typescript/typescript-linux-arm64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-linux-arm64/-/typescript-linux-arm64-7.0.2.tgz", + "integrity": "sha512-Qh4eU4/y3yDjnfjjyPYihMj5/ODIlmt+Bzu17OI+fiSRDW57QmU5SiN63exPRNJPKUzcc1INa1NXdrJ+MqHjUQ==", "cpu": [ "arm64" ], @@ -3610,10 +3690,95 @@ "node": ">=16.20.0" } }, - "node_modules/@typescript/native-preview-linux-x64": { - "version": "7.0.0-dev.20260609.1", - "resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-x64/-/native-preview-linux-x64-7.0.0-dev.20260609.1.tgz", - "integrity": "sha512-KO8WO1gBIC09T3255RlTY42TGu8en5mEkLPQu2wkMn+dX2T8KYL64zXrCeLeUWa0NvmVdJUeyWu3pFOn3zKemw==", + "node_modules/@typescript/typescript-linux-loong64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-linux-loong64/-/typescript-linux-loong64-7.0.2.tgz", + "integrity": "sha512-uEHck9i8hoAzXPiYRib1O7miOnz23SxIeVl6F4LXox+qov1K35jHcEW6VHKvZI+pyvl7fZEP4MCU5LYvIq1GuQ==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=16.20.0" + } + }, + "node_modules/@typescript/typescript-linux-mips64el": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-linux-mips64el/-/typescript-linux-mips64el-7.0.2.tgz", + "integrity": "sha512-R4KvAMnE43W5Qeqb0Ly56O3mWMWIAgsMyz36DCaycd5nbg/9kzm0liw3JocfRqyJY0KPmzFjbswozXyW0DnIYA==", + "cpu": [ + "mips64el" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=16.20.0" + } + }, + "node_modules/@typescript/typescript-linux-ppc64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-linux-ppc64/-/typescript-linux-ppc64-7.0.2.tgz", + "integrity": "sha512-DORx5b3sd/4S7eayxm4FQv+A7CrkUIGRaHiwI8oiHTAI1fAPWhF4J0vAlkC8biAlHSVVwxMQ3tjZ2/DVbnQiiA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=16.20.0" + } + }, + "node_modules/@typescript/typescript-linux-riscv64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-linux-riscv64/-/typescript-linux-riscv64-7.0.2.tgz", + "integrity": "sha512-wf0jqEDOjrPRnKwYRyyJDRo11KMbvMFrU+q4zqKyChODBzvlkbhNQfKvLxQCcwTpdDaXSHZTVuh0JoCrKCUMHQ==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=16.20.0" + } + }, + "node_modules/@typescript/typescript-linux-s390x": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-linux-s390x/-/typescript-linux-s390x-7.0.2.tgz", + "integrity": "sha512-IkwJc3L7yhytWd/ewjyxNDfOmswCm9GWMJT/ue/dU4aZNbwZeYAetq42VyLmsmSjvoX7z74X6ZaYCtzAr0EuGw==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=16.20.0" + } + }, + "node_modules/@typescript/typescript-linux-x64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-linux-x64/-/typescript-linux-x64-7.0.2.tgz", + "integrity": "sha512-EYdf2cNg7rgCWJnxCdJ+F3V39O8ihb37eHAu1LK8oAFizgTQbPOK7zHHXbPt8rX24COqODXeI3sIf0fCXG7H/A==", "cpu": [ "x64" ], @@ -3627,10 +3792,95 @@ "node": ">=16.20.0" } }, - "node_modules/@typescript/native-preview-win32-arm64": { - "version": "7.0.0-dev.20260609.1", - "resolved": "https://registry.npmjs.org/@typescript/native-preview-win32-arm64/-/native-preview-win32-arm64-7.0.0-dev.20260609.1.tgz", - "integrity": "sha512-+8q19LWjnMKK6SF3PLeMEalbfWDYWHs0AU8kSFCBCke/RLoDG4FjQzVtLgUo+KWhsmZMosiEyqEnZmSlED2tIQ==", + "node_modules/@typescript/typescript-netbsd-arm64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-netbsd-arm64/-/typescript-netbsd-arm64-7.0.2.tgz", + "integrity": "sha512-+polYF4MF04aPpO5FTkHran9yUQDSXqy5GiSDKpsll5jy3l3+g9QLhpf39T+ePtefhXLOGrLl0QIjkQP6VnelA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=16.20.0" + } + }, + "node_modules/@typescript/typescript-netbsd-x64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-netbsd-x64/-/typescript-netbsd-x64-7.0.2.tgz", + "integrity": "sha512-8YIT0EHM/3dq10ZOVF/A7pc/YSMtbcecct4rWtexrnSCHOPcpC2KTLXfTCR6vDpnSiY12heNb1GiN/wu+T/FyA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=16.20.0" + } + }, + "node_modules/@typescript/typescript-openbsd-arm64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-openbsd-arm64/-/typescript-openbsd-arm64-7.0.2.tgz", + "integrity": "sha512-APT8+ClYnuYm1u9+kgGXoMj2VzWzcymwh2gNSQVySHfkRDGOTVkoWLjCmOQSaO+PoqQ57B0flRp9SA+7GnnkzQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=16.20.0" + } + }, + "node_modules/@typescript/typescript-openbsd-x64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-openbsd-x64/-/typescript-openbsd-x64-7.0.2.tgz", + "integrity": "sha512-yX7s+Q0Dln0Dt9tEzZsAjXXR/+ytBM7AlglaqyeMPxQszJ1JhlJdZ6jLA+IzldHtflX81em7lDao1xXu+aRRkg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=16.20.0" + } + }, + "node_modules/@typescript/typescript-sunos-x64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-sunos-x64/-/typescript-sunos-x64-7.0.2.tgz", + "integrity": "sha512-dLJDGaLZ1D4HPQn62u1n8mBDkJREwMsAkCdkwd4Ieqw+x3TUyTsqY0YiBCtE6H6OzzgGk3iuZ3vFWRS+E8/d1g==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=16.20.0" + } + }, + "node_modules/@typescript/typescript-win32-arm64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-win32-arm64/-/typescript-win32-arm64-7.0.2.tgz", + "integrity": "sha512-Gyl1Vy6OsWesLzmq+EP0Fb7b4Nid5232AvcA2SFcdYreldpNtYFFofPjnt62y9hQy7VTaZp65ICJjuAQRaVcIQ==", "cpu": [ "arm64" ], @@ -3644,10 +3894,10 @@ "node": ">=16.20.0" } }, - "node_modules/@typescript/native-preview-win32-x64": { - "version": "7.0.0-dev.20260609.1", - "resolved": "https://registry.npmjs.org/@typescript/native-preview-win32-x64/-/native-preview-win32-x64-7.0.0-dev.20260609.1.tgz", - "integrity": "sha512-qNPcss+6yRoNFfFIKQbPwJWYxDfOZwyL8JBJh4J+yMLOad/+/AOjsO4EtZsIpv5PMCjpnD75coBoDkw+5NkItw==", + "node_modules/@typescript/typescript-win32-x64": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript-win32-x64/-/typescript-win32-x64-7.0.2.tgz", + "integrity": "sha512-0BQ3HkAHHlKLSp1qRvf3SUhGpGsDuhB/jgFw75guyqbxJqEaS0Cw/VFO8i2nHglJUzQCRtMMR/IBAKE3ETMC4g==", "cpu": [ "x64" ], @@ -18845,17 +19095,17 @@ } }, "node_modules/typescript": { - "version": "6.0.0-dev.20260416", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.0-dev.20260416.tgz", - "integrity": "sha512-64CCow5rQc6+oBAPqLtvZ8f3iz4WVCLwMVkg6/kOfMQlGshVOMkBhCXn+MMP4SX4Xtnz48VpD98FkptirMEuEQ==", + "name": "@typescript/typescript6", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/@typescript/typescript6/-/typescript6-6.0.2.tgz", + "integrity": "sha512-mbCddXd+jm7hfx7w2YU64/Av4/NqqeG3GoRZgxPcgoTxYjhrcfJRw9ULch71SS4G+Q3bOXFhRvPqjguN0Hyp5w==", "dev": true, "license": "Apache-2.0", - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" + "dependencies": { + "@typescript/old": "npm:typescript@^6" }, - "engines": { - "node": ">=14.17" + "bin": { + "tsc6": "bin/tsc6" } }, "node_modules/typescript-eslint": { diff --git a/package.json b/package.json index f137d72d5df..e52b15593dd 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "compile-copilot": "npm --prefix extensions/copilot run compile", "build-fast": "npm-run-all2 -lp transpile-client build-fast-extensions compile-copilot", "build-fast-extensions": "npm run gulp copy-codicons compile-extensions compile-extension-media", - "typecheck-client": "tsgo --project ./src/tsconfig.json --noEmit --skipLibCheck", + "typecheck-client": "tsc --project ./src/tsconfig.json --noEmit --skipLibCheck", "codex:gen-protocol": "node build/codex/generate-protocol.mjs", "codex:check-protocol": "node build/codex/check-protocol-sync.ts", "watch": "npm-run-all2 -lp watch-client-transpile watch-client watch-extensions watch-copilot", @@ -59,11 +59,11 @@ "smoketest-no-compile": "cd test/smoke && node test/index.js", "download-builtin-extensions": "node build/lib/builtInExtensions.ts", "download-builtin-extensions-cg": "node build/lib/builtInExtensionsCG.ts", - "monaco-compile-check": "tsgo --project src/tsconfig.monaco.json --noEmit", + "monaco-compile-check": "tsc --project src/tsconfig.monaco.json --noEmit", "tsec-compile-check": "node --max-old-space-size=8192 node_modules/tsec/bin/tsec -p src/tsconfig.tsec.json", - "vscode-dts-compile-check": "tsgo --project src/tsconfig.vscode-dts.json && tsgo --project src/tsconfig.vscode-proposed-dts.json", - "valid-layers-check": "node build/checker/layersChecker.ts && tsgo --project build/checker/tsconfig.browser.json && tsgo --project build/checker/tsconfig.worker.json && tsgo --project build/checker/tsconfig.node.json && tsgo --project build/checker/tsconfig.electron-browser.json && tsgo --project build/checker/tsconfig.electron-main.json && tsgo --project build/checker/tsconfig.electron-utility.json", - "define-class-fields-check": "node build/lib/propertyInitOrderChecker.ts && tsgo --project src/tsconfig.defineClassFields.json", + "vscode-dts-compile-check": "tsc --project src/tsconfig.vscode-dts.json && tsc --project src/tsconfig.vscode-proposed-dts.json", + "valid-layers-check": "node build/checker/layersChecker.ts && tsc --project build/checker/tsconfig.browser.json && tsc --project build/checker/tsconfig.worker.json && tsc --project build/checker/tsconfig.node.json && tsc --project build/checker/tsconfig.electron-browser.json && tsc --project build/checker/tsconfig.electron-main.json && tsc --project build/checker/tsconfig.electron-utility.json", + "define-class-fields-check": "node build/lib/propertyInitOrderChecker.ts && tsc --project src/tsconfig.defineClassFields.json", "update-distro": "node build/npm/update-distro.ts", "export-policy-data": "node build/lib/policies/exportPolicyData.ts", "web": "echo 'npm run web' is replaced by './scripts/code-server' or './scripts/code-web'", @@ -89,7 +89,7 @@ "perf:chat-leak": "node scripts/chat-simulation/test-chat-mem-leaks.js", "copilot:setup": "npm --prefix extensions/copilot run setup", "copilot:get_token": "npm --prefix extensions/copilot run get_token", - "update-build-ts-version": "npm install -D typescript@next && npm install -D @typescript/native-preview && (cd build && npm run typecheck)", + "update-build-ts-version": "npm install -D typescript@npm:@typescript/typescript6@^6.0.2 && npm install -D @typescript/native@npm:typescript@next && (cd build && npm run typecheck)", "install-local-component-explorer": "npm install ../vscode-packages/js-component-explorer/dist/vscode-component-explorer-0.1.0.tgz ../vscode-packages/js-component-explorer/dist/vscode-component-explorer-cli-0.1.0.tgz --no-save && cd build/rspack && npm install ../../../vscode-packages/js-component-explorer/dist/vscode-component-explorer-webpack-plugin-0.1.0.tgz --no-save && cd ../vite && npm install ../../../vscode-packages/js-component-explorer/dist/vscode-component-explorer-vite-plugin-0.1.0.tgz --no-save", "symlink-local-component-explorer": "npm install ../vscode-packages/js-component-explorer/packages/explorer ../vscode-packages/js-component-explorer/packages/cli --no-save && cd build/rspack && npm install ../../../vscode-packages/js-component-explorer/packages/webpack-plugin ../../../vscode-packages/js-component-explorer/packages/explorer --no-save && cd ../vite && npm install ../../../vscode-packages/js-component-explorer/packages/vite-plugin ../../../vscode-packages/js-component-explorer/packages/explorer --no-save", "install-latest-component-explorer": "npm install @vscode/component-explorer@next @vscode/component-explorer-cli@next && cd build/rspack && npm install @vscode/component-explorer-webpack-plugin@next @vscode/component-explorer@next && cd ../vite && npm install @vscode/component-explorer-vite-plugin@next @vscode/component-explorer@next" @@ -192,7 +192,7 @@ "@types/yauzl": "^2.10.0", "@types/yazl": "^2.4.2", "@typescript-eslint/utils": "^8.45.0", - "@typescript/native-preview": "^7.0.0-dev.20260609", + "@typescript/native": "npm:typescript@^7.0.2", "@vscode/component-explorer": "^0.2.1-58", "@vscode/component-explorer-cli": "^0.2.1-59", "@vscode/gulp-electron": "^1.42.0", @@ -262,7 +262,7 @@ "tar": "^7.5.16", "tsec": "0.2.7", "tslib": "^2.6.3", - "typescript": "^6.0.0-dev.20260416", + "typescript": "npm:@typescript/typescript6@^6.0.2", "typescript-eslint": "^8.45.0", "util": "^0.12.4", "xml2js": "^0.5.0", diff --git a/src/vs/workbench/contrib/tags/electron-browser/workspaceTagsService.ts b/src/vs/workbench/contrib/tags/electron-browser/workspaceTagsService.ts index e22f45b9dfb..169bcc00a45 100644 --- a/src/vs/workbench/contrib/tags/electron-browser/workspaceTagsService.ts +++ b/src/vs/workbench/contrib/tags/electron-browser/workspaceTagsService.ts @@ -98,6 +98,7 @@ const ModulesToLookFor = [ 'praisonai', 'qdrant', 'typescript', + '@typescript/native', '@typescript/native-preview', 'tslib', 'eslint', @@ -709,6 +710,7 @@ export class WorkspaceTagsService implements IWorkspaceTagsService { "workspace.npm.vuepress" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }, "workspace.npm.docusaurus" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }, "workspace.npm.typescript" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }, + "workspace.npm.@typescript/native" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }, "workspace.npm.@typescript/native-preview" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }, "workspace.npm.tslib" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }, "workspace.npm.eslint" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }, diff --git a/test/automation/package.json b/test/automation/package.json index 5ac9e4d74b4..de1953d6b59 100644 --- a/test/automation/package.json +++ b/test/automation/package.json @@ -9,9 +9,9 @@ "main": "./out/index.js", "private": true, "scripts": { - "compile": "npm run copy-driver-definition && node ../../node_modules/typescript/bin/tsc", + "compile": "npm run copy-driver-definition && node ../../node_modules/typescript/bin/tsc6", "watch": "npm-run-all2 -lp watch-driver-definition watch-tsc", - "watch-tsc": "node ../../node_modules/typescript/bin/tsc --watch --preserveWatchOutput", + "watch-tsc": "node ../../node_modules/typescript/bin/tsc6 --watch --preserveWatchOutput", "copy-driver-definition": "node tools/copy-driver-definition.js", "watch-driver-definition": "nodemon --watch ../../src/vs/workbench/services/driver/common/driver.ts tools/copy-driver-definition.js", "copy-package-version": "node tools/copy-package-version.js", diff --git a/test/integration/browser/package.json b/test/integration/browser/package.json index b38f1b36f52..aa8e756d532 100644 --- a/test/integration/browser/package.json +++ b/test/integration/browser/package.json @@ -4,7 +4,7 @@ "license": "MIT", "main": "./index.js", "scripts": { - "compile": "node ../../../node_modules/typescript/bin/tsc" + "compile": "node ../../../node_modules/typescript/bin/tsc6" }, "devDependencies": { "@types/node": "24.x", diff --git a/test/mcp/package.json b/test/mcp/package.json index 946d170ddd5..bbddd2ed4fc 100644 --- a/test/mcp/package.json +++ b/test/mcp/package.json @@ -5,9 +5,9 @@ "main": "./out/main.js", "private": true, "scripts": { - "compile": "cd ../automation && npm run compile && cd ../mcp && node ../../node_modules/typescript/bin/tsc", + "compile": "cd ../automation && npm run compile && cd ../mcp && node ../../node_modules/typescript/bin/tsc6", "watch-automation": "cd ../automation && npm run watch", - "watch-mcp": "node ../../node_modules/typescript/bin/tsc --watch --preserveWatchOutput", + "watch-mcp": "node ../../node_modules/typescript/bin/tsc6 --watch --preserveWatchOutput", "watch": "npm-run-all2 -lp watch-automation watch-mcp", "start-stdio": "echo 'Starting vscode-automation-mcp... For customization and troubleshooting, see ./test/mcp/README.md' && npm ci && npm run -s compile && node ./out/stdio.js" }, diff --git a/test/monaco/package.json b/test/monaco/package.json index b9f6cbd3e00..3565ca83a12 100644 --- a/test/monaco/package.json +++ b/test/monaco/package.json @@ -5,7 +5,7 @@ "license": "MIT", "private": true, "scripts": { - "compile": "node ../../node_modules/typescript/bin/tsc", + "compile": "node ../../node_modules/typescript/bin/tsc6", "bundle-webpack": "webpack --config ./webpack.config.js --bail", "esm-check": "node esm-check/esm-check.js", "test": "node runner.js" diff --git a/test/smoke/package.json b/test/smoke/package.json index 043ce67fcbf..14c34c0bb09 100644 --- a/test/smoke/package.json +++ b/test/smoke/package.json @@ -4,9 +4,9 @@ "license": "MIT", "main": "./src/main.js", "scripts": { - "compile": "cd ../automation && npm run compile && cd ../smoke && node ../../node_modules/typescript/bin/tsc", + "compile": "cd ../automation && npm run compile && cd ../smoke && node ../../node_modules/typescript/bin/tsc6", "watch-automation": "cd ../automation && npm run watch", - "watch-smoke": "node ../../node_modules/typescript/bin/tsc --watch --preserveWatchOutput", + "watch-smoke": "node ../../node_modules/typescript/bin/tsc6 --watch --preserveWatchOutput", "watch": "npm-run-all2 -lp watch-automation watch-smoke", "mocha": "node ../node_modules/mocha/bin/mocha" },