Skip to content

Commit 2f75396

Browse files
committed
prep
1 parent 54d6e2e commit 2f75396

File tree

2 files changed

+1715
-2641
lines changed

2 files changed

+1715
-2641
lines changed

WORKSPACE

Lines changed: 11 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,16 @@ rules_js_dependencies()
7676

7777
load("@rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains")
7878

79-
NODE_VERSION = "22.0.0"
79+
NODE_VERSION = "22.11.0"
8080

8181
NODE_REPOSITORIES = {
82-
"22.0.0-darwin_arm64": ("node-v22.0.0-darwin-arm64.tar.gz", "node-v22.0.0-darwin-arm64", "ea96d349cfaa67aa87ceeaa3e5b52c9167f7ac302fd8d1ff162d0785e9dc0785"),
83-
"22.0.0-darwin_amd64": ("node-v22.0.0-darwin-x64.tar.gz", "node-v22.0.0-darwin-x64", "422a3887ff5418f0a4552d89cf99346ab8ab51bb5d384660baa88b8444d2c111"),
84-
"22.0.0-linux_arm64": ("node-v22.0.0-linux-arm64.tar.xz", "node-v22.0.0-linux-arm64", "83711d29cbe46375bdffab5419f3d831892e24294169272f6c39edc364556241"),
85-
"22.0.0-linux_ppc64le": ("node-v22.0.0-linux-ppc64le.tar.xz", "node-v22.0.0-linux-ppc64le", "2b3fb8707a79243bfb3131312b86716ddc3855bce21bb168095b6b916798e5e9"),
86-
"22.0.0-linux_s390x": ("node-v22.0.0-linux-s390x.tar.xz", "node-v22.0.0-linux-s390x", "89a8efeeb9f94ce9ea251b8109e079c14919f4c0dc2cbc9f545ec47ef0886737"),
87-
"22.0.0-linux_amd64": ("node-v22.0.0-linux-x64.tar.xz", "node-v22.0.0-linux-x64", "9122e50f2642afd5f6078cafd1f52ede60fc464284384f05c18a04d13d07ae5a"),
88-
"22.0.0-windows_amd64": ("node-v22.0.0-win-x64.zip", "node-v22.0.0-win-x64", "32d639b47d4c0a651ff8f8d7d41a454168a3d4045be37985f9a810cf8cef6174"),
82+
"22.11.0-darwin_arm64": ("node-v22.11.0-darwin-arm64.tar.gz", "node-v22.11.0-darwin-arm64", "2e89afe6f4e3aa6c7e21c560d8a0453d84807e97850bbb819b998531a22bdfde"),
83+
"22.11.0-darwin_amd64": ("node-v22.11.0-darwin-x64.tar.gz", "node-v22.11.0-darwin-x64", "668d30b9512137b5f5baeef6c1bb4c46efff9a761ba990a034fb6b28b9da2465"),
84+
"22.11.0-linux_arm64": ("node-v22.11.0-linux-arm64.tar.xz", "node-v22.11.0-linux-arm64", "6031d04b98f59ff0f7cb98566f65b115ecd893d3b7870821171708cdbaf7ae6e"),
85+
"22.11.0-linux_ppc64le": ("node-v22.11.0-linux-ppc64le.tar.xz", "node-v22.11.0-linux-ppc64le", "d1d49d7d611b104b6d616e18ac439479d8296aa20e3741432de0e85f4735a81e"),
86+
"22.11.0-linux_s390x": ("node-v22.11.0-linux-s390x.tar.xz", "node-v22.11.0-linux-s390x", "f474ed77d6b13d66d07589aee1c2b9175be4c1b165483e608ac1674643064a99"),
87+
"22.11.0-linux_amd64": ("node-v22.11.0-linux-x64.tar.xz", "node-v22.11.0-linux-x64", "83bf07dd343002a26211cf1fcd46a9d9534219aad42ee02847816940bf610a72"),
88+
"22.11.0-windows_amd64": ("node-v22.11.0-win-x64.zip", "node-v22.11.0-win-x64", "905373a059aecaf7f48c1ce10ffbd5334457ca00f678747f19db5ea7d256c236"),
8989
}
9090

9191
nodejs_register_toolchains(
@@ -102,7 +102,6 @@ rules_js_register_toolchains(
102102
)
103103

104104
load("@build_bazel_rules_nodejs//:index.bzl", "yarn_install")
105-
load("//tools:integration.bzl", "create_npm_package_archive_build_file")
106105

107106
yarn_install(
108107
name = "npm",
@@ -113,52 +112,26 @@ yarn_install(
113112
"//:.yarnrc",
114113
"//:tools/postinstall/apply-patches.js",
115114
"//:tools/postinstall/patches/@angular+bazel+20.0.0-next.3.patch",
116-
"//:tools/postinstall/patches/@angular+build-tooling+0.0.0-335a273d3eb2a73c51efb97930fc1e0cd72e0d32.patch",
115+
"//:tools/postinstall/patches/@angular+build-tooling+0.0.0-1ebf18a3a60b182a3dbad12e9a149fd93af5c29b.patch",
117116
"//:tools/postinstall/patches/tsec+0.2.2.patch",
118117
],
119118
# Currently disabled due to:
120119
# 1. Missing Windows support currently.
121120
# 2. Incompatibilites with the `ts_library` rule.
122121
exports_directories_only = False,
123-
# Add archive targets for some NPM packages that are needed in integration tests.
124-
manual_build_file_contents = create_npm_package_archive_build_file(),
125122
package_json = "//:package.json",
126123
quiet = False,
127124
yarn = "//:.yarn/releases/yarn-1.22.17.cjs",
128125
yarn_lock = "//:yarn.lock",
129126
)
130127

131-
load("@npm//@bazel/protractor:package.bzl", "npm_bazel_protractor_dependencies")
132-
133-
npm_bazel_protractor_dependencies()
134-
135-
# Setup web testing. We need to setup a browser because the web testing rules for TypeScript need
136-
# a reference to a registered browser (ideally that's a hermetic version of a browser)
137-
load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories")
138-
139-
web_test_repositories()
140-
141128
# Setup the Sass rule repositories.
142129
load("@io_bazel_rules_sass//:defs.bzl", "sass_repositories")
143130

144131
sass_repositories(
145132
yarn_script = "//:.yarn/releases/yarn-1.22.17.cjs",
146133
)
147134

148-
# Setup repositories for browsers provided by the shared dev-infra package.
149-
load(
150-
"@npm//@angular/build-tooling/bazel/browsers:browser_repositories.bzl",
151-
_dev_infra_browser_repositories = "browser_repositories",
152-
)
153-
154-
_dev_infra_browser_repositories()
155-
156-
load("@build_bazel_rules_nodejs//toolchains/esbuild:esbuild_repositories.bzl", "esbuild_repositories")
157-
158-
esbuild_repositories(
159-
npm_repository = "npm",
160-
)
161-
162135
load("@aspect_rules_js//npm:repositories.bzl", "npm_translate_lock")
163136

164137
npm_translate_lock(
@@ -174,8 +147,6 @@ npm_translate_lock(
174147
},
175148
data = [
176149
"//:package.json",
177-
"//:patches/@angular__compiler-cli.patch",
178-
"//:patches/@angular__core.patch",
179150
"//:pnpm-workspace.yaml",
180151
"//integration:package.json",
181152
"//src/cdk:package.json",
@@ -205,6 +176,7 @@ npm_translate_lock(
205176
"@angular/material-luxon-adapter": ["//integration:__subpackages__"],
206177
},
207178
pnpm_lock = "//:pnpm-lock.yaml",
179+
pnpm_version = "9.14.1",
208180
update_pnpm_lock = True,
209181
verify_node_modules_ignored = "//:.bazelignore",
210182
yarn_lock = "//:yarn.lock",
@@ -251,7 +223,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
251223

252224
git_repository(
253225
name = "devinfra",
254-
commit = "cddc66a76ac0183790bc7a9fc1e5cf9f87512375",
226+
commit = "35131fc980ce5451fb89d8c033efc827ad39ca68",
255227
remote = "https://github.com/angular/dev-infra.git",
256228
)
257229

0 commit comments

Comments
 (0)