Skip to content

build: update to TypeScript 6 #32899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
crisbeto merged 1 commit into from
Mar 6, 2026
Merged

build: update to TypeScript 6 #32899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ use_repo(yq, "yq_toolchains")
rules_ts_ext = use_extension("@aspect_rules_ts//ts:extensions.bzl", "ext")
rules_ts_ext.deps(
name = "components_npm_typescript",
# Obtained by: curl --silent https://registry.npmjs.org/typescript/5.9.2 | jq -r '.dist.integrity'
ts_integrity = "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
ts_version = "5.9.2",
# Obtained by: curl --silent https://registry.npmjs.org/typescript/6.0.0-beta | jq -r '.dist.integrity'
ts_integrity = "sha512-CldZdztDpQRLM1HC6WDQjQkQN5Ub5zRau737a1diGh3lPmb9oRsaWHk1y5iqK0o7+1bNJ0oXfEGRkAogFZBL+Q==",
ts_version = "6.0.0-beta",
)
use_repo(rules_ts_ext, **{"npm_typescript": "components_npm_typescript"})

Expand Down
6 changes: 3 additions & 3 deletions MODULE.bazel.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,6 @@
"sass": "1.97.3",
"shelljs": "^0.10.0",
"ts-node": "10.9.2",
"typescript": "~5.9.2"
"typescript": "6.0.0-beta"
}
}
1 change: 0 additions & 1 deletion docs/src/assets/stackblitz/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"downlevelIteration": true,
"experimentalDecorators": true,
"moduleResolution": "bundler",
"importHelpers": true,
Expand Down
1 change: 0 additions & 1 deletion docs/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"allowSyntheticDefaultImports": true,
"sourceMap": true,
"declaration": false,
"downlevelIteration": true,
"experimentalDecorators": true,
"module": "es2022",
"moduleResolution": "bundler",
Expand Down
1 change: 0 additions & 1 deletion integration/ng-add-standalone/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"noFallthroughCasesInSwitch": true,
"sourceMap": true,
"declaration": false,
"downlevelIteration": true,
"experimentalDecorators": true,
"moduleResolution": "bundler",
"importHelpers": false,
Expand Down
1 change: 0 additions & 1 deletion integration/ng-add/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"noFallthroughCasesInSwitch": true,
"sourceMap": true,
"declaration": false,
"downlevelIteration": true,
"experimentalDecorators": true,
"moduleResolution": "bundler",
"importHelpers": false,
Expand Down
1 change: 0 additions & 1 deletion integration/yarn-pnp-compat/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"noFallthroughCasesInSwitch": true,
"sourceMap": true,
"declaration": false,
"downlevelIteration": true,
"experimentalDecorators": true,
"moduleResolution": "bundler",
"importHelpers": true,
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,15 @@
"tsickle": "0.46.3",
"tslint": "^6.1.3",
"tsutils": "^3.21.0",
"typescript": "5.9.2",
"typescript": "6.0.0-beta",
"vrsource-tslint-rules": "6.0.0",
"yaml": "^2.8.1",
"yargs": "^18.0.0",
"zx": "^8.0.0"
},
"pnpm": {
"overrides": {
"typescript": "5.9.2"
"typescript": "6.0.0-beta"
},
"onlyBuiltDependencies": [],
"packageExtensions": {
Expand Down
1,397 changes: 739 additions & 658 deletions pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions pnpm-workspace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,23 @@ packages:
- src/youtube-player

catalog:
'@angular-devkit/build-angular': 21.2.0
'@angular-devkit/core': 21.2.0
'@angular-devkit/schematics': 21.2.0
'@angular/build': 21.2.0
'@angular/cli': 21.2.0
'@angular/common': 21.2.0
'@angular/compiler-cli': 21.2.0
'@angular/compiler': 21.2.0
'@angular/core': 21.2.0
'@angular/ssr': 21.2.0
'@angular/forms': 21.2.0
'@angular/localize': 21.2.0
'@angular/platform-browser': 21.2.0
'@angular/platform-browser-dynamic': 21.2.0
'@angular/platform-server': 21.2.0
'@angular/router': 21.2.0
'@schematics/angular': 21.2.0
'@angular-devkit/build-angular': 22.0.0-next.0
'@angular-devkit/core': 22.0.0-next.0
'@angular-devkit/schematics': 22.0.0-next.0
'@angular/build': 22.0.0-next.0
'@angular/cli': 22.0.0-next.0
'@angular/common': 22.0.0-next.0
'@angular/compiler-cli': 22.0.0-next.0
'@angular/compiler': 22.0.0-next.0
'@angular/core': 22.0.0-next.0
'@angular/ssr': 22.0.0-next.0
'@angular/forms': 22.0.0-next.0
'@angular/localize': 22.0.0-next.0
'@angular/platform-browser': 22.0.0-next.0
'@angular/platform-browser-dynamic': 22.0.0-next.0
'@angular/platform-server': 22.0.0-next.0
'@angular/router': 22.0.0-next.0
'@schematics/angular': 22.0.0-next.0
'rxjs': ^6.6.7

# The minimum age of a release to be considered for dependency installation.
Expand Down
2 changes: 1 addition & 1 deletion scripts/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"compilerOptions": {
"outDir": "../dist/dev-infra-scripts",
"rootDir": "../",
"target": "es2020",
"lib": ["es2020"],
"module": "Node16",
Expand All @@ -9,7 +10,6 @@
"noEmit": true,
"noPropertyAccessFromIndexSignature": true,
"skipLibCheck": true,
"downlevelIteration": true,
"esModuleInterop": true
}
}
14 changes: 13 additions & 1 deletion src/cdk/schematics/utils/ast.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ import {getAppModulePath} from '@schematics/angular/utility/ng-ast-utils';
import * as ts from 'typescript';
import {getProjectMainFile} from './project-main-file';

/**
* Temporary type until the CLI starts bundling TS6.
*
* TODO(crisbeto): clean this up eventually.
*/
export type AnyDuringTs6Migration = any;

/** Reads file given path and returns TypeScript source file. */
export function parseSourceFile(host: Tree, path: string): ts.SourceFile {
const buffer = host.read(path);
Expand Down Expand Up @@ -55,7 +62,12 @@ export function addModuleImportToModule(
throw new SchematicsException(`Module not found: ${modulePath}`);
}

const changes = addImportToModule(moduleSource, modulePath, moduleName, src);
const changes = addImportToModule(
moduleSource as AnyDuringTs6Migration,
modulePath,
moduleName,
src,
);
const recorder = host.beginUpdate(modulePath);

changes.forEach(change => {
Expand Down
5 changes: 3 additions & 2 deletions src/cdk/schematics/utils/build-component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import {dirname, join, resolve} from 'path';
import * as ts from 'typescript';
import {getProjectFromWorkspace} from './get-project';
import {getDefaultComponentOptions, isStandaloneSchematic} from './schematic-options';
import {AnyDuringTs6Migration} from './ast';

/**
* Build a default project path for generating.
Expand Down Expand Up @@ -83,7 +84,7 @@ function addDeclarationToNgModule(options: ComponentOptions): Rule {
const classifiedName = strings.classify(`${options.name}Component`);

const declarationChanges = addDeclarationToModule(
source,
source as AnyDuringTs6Migration,
modulePath,
classifiedName,
relativePath,
Expand All @@ -103,7 +104,7 @@ function addDeclarationToNgModule(options: ComponentOptions): Rule {

const exportRecorder = host.beginUpdate(modulePath);
const exportChanges = addExportToModule(
source,
source as AnyDuringTs6Migration,
modulePath,
strings.classify(`${options.name}Component`),
relativePath,
Expand Down
2 changes: 1 addition & 1 deletion src/material/form-field/form-field.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ export class MatFormField
}
this._appearanceSignal.set(newAppearance);
}
private _appearanceSignal = signal(DEFAULT_APPEARANCE);
private _appearanceSignal = signal<MatFormFieldAppearance>(DEFAULT_APPEARANCE);

/**
* Whether the form field should reserve space for one line of hint/error text (default)
Expand Down
1 change: 1 addition & 0 deletions src/tsconfig-legacy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
},
"types": ["jasmine"],
"emitDecoratorMetadata": true,
"noUncheckedSideEffectImports": false,
Copy link
Member

@devversion devversion Mar 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do you know for what imports this was needed?

Copy link
Member Author

@crisbeto crisbeto Mar 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one: https://github.com/angular/components/blob/main/src/material-moment-adapter/adapter/moment-date-adapter.spec.ts#L19.

It became an error now, because TS are changing the defaults on some flags.

"experimentalDecorators": true
},
"include": ["**/*.spec.ts", "dev-mode-types.d.ts", "../node_modules/zone.js/zone.d.ts"],
Expand Down
1 change: 0 additions & 1 deletion tools/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"esModuleInterop": true,
"lib": ["es2020"],
"skipLibCheck": true,
"downlevelIteration": true,
"types": ["node"]
},
"exclude": ["**/*.spec.ts", "**/*.spec.mts", "adev-api-extraction/**"]
Expand Down
1 change: 1 addition & 0 deletions tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
{
"compilerOptions": {
"outDir": "./dist/packages/all",
"rootDir": "./",
"experimentalDecorators": true,
"module": "esnext",
"moduleResolution": "bundler",
Expand Down
Loading