Skip to content

Commit 3914fe6

Browse files
authored
build: update to Angular v20 (#2172)
Updates the repo to Angular v20 and Node 22.
1 parent ec6be2c commit 3914fe6

File tree

8 files changed

+85
-71
lines changed

8 files changed

+85
-71
lines changed

.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU=

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Input hashes for repository rule npm_translate_lock(name = "npm", pnpm_lock = "//:pnpm-lock.yaml").
33
# This file should be checked into version control along with the pnpm-lock.yaml file.
44
.npmrc=974837034
5-
pnpm-lock.yaml=820490778
6-
yarn.lock=117553296
7-
package.json=-1545135950
5+
pnpm-lock.yaml=-1331107132
6+
yarn.lock=-1794001287
7+
package.json=-951386062
88
pnpm-workspace.yaml=1711114604

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
type: enum
1010
enum: ['package.json', 'builds-repo']
1111
docker:
12-
- image: cimg/node:18.19.1
12+
- image: cimg/node:22.15.0
1313
environment:
1414
# TODO: Remove when pnpm is exclusively used.
1515
ASPECT_RULES_JS_FROZEN_PNPM_LOCK: '1'

WORKSPACE

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,16 @@ load("@rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains")
6868

6969
nodejs_register_toolchains(
7070
name = "nodejs",
71-
node_version = "18.13.0",
71+
node_repositories = {
72+
"22.11.0-darwin_arm64": ("node-v22.11.0-darwin-arm64.tar.gz", "node-v22.11.0-darwin-arm64", "2e89afe6f4e3aa6c7e21c560d8a0453d84807e97850bbb819b998531a22bdfde"),
73+
"22.11.0-darwin_amd64": ("node-v22.11.0-darwin-x64.tar.gz", "node-v22.11.0-darwin-x64", "668d30b9512137b5f5baeef6c1bb4c46efff9a761ba990a034fb6b28b9da2465"),
74+
"22.11.0-linux_arm64": ("node-v22.11.0-linux-arm64.tar.xz", "node-v22.11.0-linux-arm64", "6031d04b98f59ff0f7cb98566f65b115ecd893d3b7870821171708cdbaf7ae6e"),
75+
"22.11.0-linux_ppc64le": ("node-v22.11.0-linux-ppc64le.tar.xz", "node-v22.11.0-linux-ppc64le", "d1d49d7d611b104b6d616e18ac439479d8296aa20e3741432de0e85f4735a81e"),
76+
"22.11.0-linux_s390x": ("node-v22.11.0-linux-s390x.tar.xz", "node-v22.11.0-linux-s390x", "f474ed77d6b13d66d07589aee1c2b9175be4c1b165483e608ac1674643064a99"),
77+
"22.11.0-linux_amd64": ("node-v22.11.0-linux-x64.tar.xz", "node-v22.11.0-linux-x64", "83bf07dd343002a26211cf1fcd46a9d9534219aad42ee02847816940bf610a72"),
78+
"22.11.0-windows_amd64": ("node-v22.11.0-win-x64.zip", "node-v22.11.0-win-x64", "905373a059aecaf7f48c1ce10ffbd5334457ca00f678747f19db5ea7d256c236"),
79+
},
80+
node_version = "22.11.0",
7281
)
7382

7483
load("@aspect_rules_js//npm:npm_import.bzl", "npm_translate_lock")

client/src/tests/embedded_support_spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ describe('embedded language support', () => {
2424

2525
it('inside template', () => {
2626
test(
27-
`const foo = {template: '<div>¦</div>'}`, isNotTypescriptOrSupportedDecoratorField,
28-
true);
27+
`const foo = {template: '<div>¦</div>'}`, isNotTypescriptOrSupportedDecoratorField, true);
2928
});
3029

3130
it('just after templateUrl', () => {

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "ng-template",
33
"displayName": "Angular Language Service",
44
"description": "Editor services for Angular templates",
5-
"version": "19.2.4",
5+
"version": "20.0.0",
66
"publisher": "Angular",
77
"icon": "angular.png",
88
"license": "MIT",
@@ -269,8 +269,8 @@
269269
"test:legacy-syntaxes": "yarn compile:syntaxes-test && yarn build:syntaxes && jasmine dist/syntaxes/test/driver.js"
270270
},
271271
"dependencies": {
272-
"@angular/language-service": "19.2.7",
273-
"typescript": "5.8.1-rc",
272+
"@angular/language-service": "^20.0.0-rc.0",
273+
"typescript": "^5.8.1",
274274
"vscode-html-languageservice": "^4.2.5",
275275
"vscode-jsonrpc": "6.0.0",
276276
"vscode-languageclient": "7.0.0",
@@ -280,7 +280,7 @@
280280
},
281281
"devDependencies": {
282282
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#262cb3bb487e8dddb3c404f4f2c8b34a9a1f14c2",
283-
"@angular/core": "^19.0.1",
283+
"@angular/core": "^20.0.0-rc.0",
284284
"@bazel/bazelisk": "1.18.0",
285285
"@bazel/ibazel": "0.16.2",
286286
"@types/jasmine": "3.10.7",

pnpm-lock.yaml

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

server/src/session.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -822,10 +822,11 @@ export class Session {
822822
// buffer in the user's editor which has not been saved to disk.
823823
// See https://github.com/angular/vscode-ng-language-service/issues/632
824824
let result = this.projectService.openClientFile(filePath, text, scriptKind);
825-
// If the first opened file is an HTML file and the project is a composite/solution-style project with references,
826-
// TypeScript will _not_ open a project unless the file is explicitly included in the files/includes list.
827-
// This is quite unlikely to be the case for HTML files. As a best-effort to fix this, we attempt to open
828-
// a TS file with the same name. Most of the time, this is going to be the component file for the external template.
825+
// If the first opened file is an HTML file and the project is a composite/solution-style
826+
// project with references, TypeScript will _not_ open a project unless the file is explicitly
827+
// included in the files/includes list. This is quite unlikely to be the case for HTML files.
828+
// As a best-effort to fix this, we attempt to open a TS file with the same name. Most of the
829+
// time, this is going to be the component file for the external template.
829830
// https://github.com/angular/vscode-ng-language-service/issues/2149
830831
if (result.configFileName === undefined && languageId === LanguageId.HTML) {
831832
const maybeComponentTsPath = filePath.replace(/\.html$/, '.ts');
@@ -1379,9 +1380,9 @@ function isExternalAngularCore(path: string): boolean {
13791380

13801381
function isInternalAngularCore(path: string): boolean {
13811382
// path in g3
1382-
return path.endsWith('angular2/rc/packages/core/index.d.ts') ||
1383-
// angular/angular repository direct sources
1384-
path.indexOf('angular/packages/core/src') !== -1;
1383+
return path.endsWith('angular2/rc/packages/core/index.d.ts') ||
1384+
// angular/angular repository direct sources
1385+
path.indexOf('angular/packages/core/src') !== -1;
13851386
}
13861387

13871388
function isTypeScriptFile(path: string): boolean {

0 commit comments

Comments
 (0)