Skip to content

Commit c8a49ec

Browse files
committed
build: update to TypeScript 6
Updates the repo to TypeScript 6.
1 parent 47dae10 commit c8a49ec

File tree

40 files changed

+312
-419
lines changed

40 files changed

+312
-419
lines changed

.vscode/settings.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{
22
"[javascript]": {
3+
"editor.defaultFormatter": "esbenp.prettier-vscode",
34
"editor.formatOnSave": true
45
},
56
"[typescript]": {
7+
"editor.defaultFormatter": "esbenp.prettier-vscode",
68
"editor.formatOnSave": true
79
},
810
// Exclude third party modules and build artifacts from the editor watchers/searches.

MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,9 @@ use_repo(npm, "npm")
165165
rules_ts_ext = use_extension("@aspect_rules_ts//ts:extensions.bzl", "ext")
166166
rules_ts_ext.deps(
167167
name = "angular_cli_npm_typescript",
168-
# Obtained by: npm info typescript@5.9.3 dist.integrity
169-
ts_integrity = "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
170-
ts_version = "5.9.3",
168+
# Obtained by: npm info typescript@6.0.0-beta dist.integrity
169+
ts_integrity = "sha512-CldZdztDpQRLM1HC6WDQjQkQN5Ub5zRau737a1diGh3lPmb9oRsaWHk1y5iqK0o7+1bNJ0oXfEGRkAogFZBL+Q==",
170+
ts_version = "6.0.0-beta",
171171
)
172172
use_repo(rules_ts_ext, **{"npm_typescript": "angular_cli_npm_typescript"})
173173

MODULE.bazel.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/testing/builder/projects/hello-world-app/src/tsconfig.server.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"extends": "./tsconfig.app.json",
33
"compilerOptions": {
44
"outDir": "../dist-server",
5-
"baseUrl": "./",
65
"types": ["@angular/localize", "node"]
76
},
87
"files": [

modules/testing/builder/src/test-utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ export async function browserBuild(
8080
scheduleOptions?: ScheduleOptions,
8181
): Promise<BrowserBuildOutput> {
8282
const run = await architect.scheduleTarget(target, overrides, scheduleOptions);
83-
const output = (await run.result) as BuilderOutput & { outputs: { path: string }[] };
83+
const output = await run.result;
8484
expect(output.success).toBe(true);
8585

8686
if (!output.success) {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
"semver": "7.7.4",
128128
"source-map-support": "0.5.21",
129129
"tslib": "2.8.1",
130-
"typescript": "5.9.3",
130+
"typescript": "6.0.0-beta",
131131
"undici": "7.22.0",
132132
"unenv": "^1.10.0",
133133
"verdaccio": "6.2.7",

packages/angular/build/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"postcss": "^8.4.0",
7474
"tailwindcss": "^2.0.0 || ^3.0.0 || ^4.0.0",
7575
"tslib": "^2.3.0",
76-
"typescript": ">=5.9 <6.0",
76+
"typescript": ">=5.9 <6.1",
7777
"vitest": "^4.0.8"
7878
},
7979
"peerDependenciesMeta": {

packages/angular_devkit/architect/src/create-builder.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,7 @@ export function createBuilder<OptT = json.JsonObject, OutT extends BuilderOutput
9292

9393
function onInput(i: BuilderInput) {
9494
const builder = i.info as BuilderInfo;
95-
const loggerName = i.target
96-
? targetStringFromTarget(i.target as Target)
97-
: builder.builderName;
95+
const loggerName = i.target ? targetStringFromTarget(i.target) : builder.builderName;
9896
const logger = new logging.Logger(loggerName);
9997

10098
subscriptions.push(logger.subscribe((entry) => log(entry)));
@@ -103,7 +101,7 @@ export function createBuilder<OptT = json.JsonObject, OutT extends BuilderOutput
103101
builder,
104102
workspaceRoot: i.workspaceRoot,
105103
currentDirectory: i.currentDirectory,
106-
target: i.target as Target,
104+
target: i.target,
107105
logger: logger,
108106
id: i.id,
109107
async scheduleTarget(

packages/angular_devkit/build_angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"karma": "^6.3.0",
8282
"ng-packagr": "0.0.0-NG-PACKAGR-PEER-DEP",
8383
"tailwindcss": "^2.0.0 || ^3.0.0 || ^4.0.0",
84-
"typescript": ">=5.9 <6.0"
84+
"typescript": ">=5.9 <6.1"
8585
},
8686
"peerDependenciesMeta": {
8787
"@angular/core": {

packages/angular_devkit/build_angular/src/builders/app-shell/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,10 @@ async function _appShellBuilder(
194194
let spinner: Spinner | undefined;
195195

196196
try {
197-
const [browserResult, serverResult] = await Promise.all([
198-
browserTargetRun.result as Promise<BrowserBuilderOutput>,
199-
serverTargetRun.result as Promise<ServerBuilderOutput>,
200-
]);
197+
const [browserResult, serverResult] = (await Promise.all([
198+
browserTargetRun.result,
199+
serverTargetRun.result,
200+
])) as [BrowserBuilderOutput, ServerBuilderOutput];
201201

202202
if (browserResult.success === false || browserResult.baseOutputPath === undefined) {
203203
return browserResult;

0 commit comments

Comments
 (0)