Skip to content

Commit e7e1d3c

Browse files
Merge branch 'angular:main' into feat/sub-resource-integrity-with-debug-id
2 parents fe8b135 + b0b3a47 commit e7e1d3c

137 files changed

Lines changed: 8318 additions & 9519 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/assistant-to-the-branch-manager.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
if: github.event.repository.fork == false
1616
steps:
17-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
17+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
1818
with:
1919
persist-credentials: false
2020
- uses: angular/dev-infra/github-actions/branch-manager@ba726e7bca0b08b125ccc6f93c233749e1213c17

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ jobs:
1919
fail-fast: false
2020
steps:
2121
- name: Checkout repository
22-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
22+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2323
with:
2424
persist-credentials: false
2525
- name: Initialize CodeQL
26-
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
26+
uses: github/codeql-action/init@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4.37.0
2727
with:
2828
languages: javascript-typescript
2929
build-mode: none
3030
config-file: .github/codeql/config.yml
3131
- name: Perform CodeQL Analysis
32-
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
32+
uses: github/codeql-action/analyze@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4.37.0
3333
with:
3434
category: '/language:javascript-typescript'

.github/workflows/pr.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
outputs:
2121
snapshots: ${{ steps.filter.outputs.snapshots }}
2222
steps:
23-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
23+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2424
with:
2525
persist-credentials: false
26-
- uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
26+
- uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
2727
id: filter
2828
with:
2929
filters: |
@@ -38,7 +38,7 @@ jobs:
3838
- name: Setup Bazel
3939
uses: angular/dev-infra/github-actions/bazel/setup@ba726e7bca0b08b125ccc6f93c233749e1213c17
4040
- name: Setup ESLint Caching
41-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
41+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
4242
with:
4343
path: .eslintcache
4444
key: ${{ runner.os }}-${{ hashFiles('.eslintrc.json') }}

.github/workflows/scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: 'Checkout code'
28-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
28+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2929
with:
3030
persist-credentials: false
3131

@@ -46,6 +46,6 @@ jobs:
4646

4747
# Upload the results to GitHub's code scanning dashboard.
4848
- name: 'Upload to code-scanning'
49-
uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
49+
uses: github/codeql-action/upload-sarif@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4.37.0
5050
with:
5151
sarif_file: results.sarif

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.22.3
1+
22.23.1

CHANGELOG.md

Lines changed: 371 additions & 26 deletions
Large diffs are not rendered by default.

MODULE.bazel

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,49 +6,49 @@ module(
66

77
bazel_dep(name = "platforms", version = "1.1.0")
88
bazel_dep(name = "yq.bzl", version = "0.3.6")
9-
bazel_dep(name = "rules_nodejs", version = "6.7.4")
9+
bazel_dep(name = "rules_nodejs", version = "6.7.5")
1010
bazel_dep(name = "aspect_rules_js", version = "3.2.2")
11-
bazel_dep(name = "aspect_rules_ts", version = "3.8.10")
11+
bazel_dep(name = "aspect_rules_ts", version = "3.8.11")
1212
bazel_dep(name = "rules_pkg", version = "1.2.0")
13-
bazel_dep(name = "rules_cc", version = "0.2.19")
13+
bazel_dep(name = "rules_cc", version = "0.2.22")
1414
bazel_dep(name = "jq.bzl", version = "0.6.1")
15-
bazel_dep(name = "bazel_lib", version = "3.3.1")
15+
bazel_dep(name = "bazel_lib", version = "3.4.0")
1616
bazel_dep(name = "bazel_skylib", version = "1.9.0")
1717
bazel_dep(name = "aspect_rules_esbuild", version = "0.26.0")
1818
bazel_dep(name = "aspect_rules_jasmine", version = "2.0.4")
1919
bazel_dep(name = "rules_angular")
2020
git_override(
2121
module_name = "rules_angular",
22-
commit = "0571709fc1bf8174c94f4b01c87f50a3b3d3cf23",
22+
commit = "50b8a6daa50cfbbab422d5f29f85c40128e10fd1",
2323
remote = "https://github.com/angular/rules_angular.git",
2424
)
2525

2626
bazel_dep(name = "devinfra")
2727
git_override(
2828
module_name = "devinfra",
29-
commit = "b9d15e3de22a6b8b161046d1ed5cea574a2537ca",
29+
commit = "ab850ab679f5ee8f019adca5283795ddf1581201",
3030
remote = "https://github.com/angular/dev-infra.git",
3131
)
3232

3333
bazel_dep(name = "rules_browsers")
3434
git_override(
3535
module_name = "rules_browsers",
36-
commit = "3e345a43e88f86a744003da90a28fc31cf4e07fb",
36+
commit = "b7be6ff1a213baece2fb729ea0ae5809a772ee59",
3737
remote = "https://github.com/angular/rules_browsers.git",
3838
)
3939

4040
node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
4141
node.toolchain(
4242
node_repositories = {
43-
"22.22.3-darwin_arm64": ("node-v22.22.3-darwin-arm64.tar.gz", "node-v22.22.3-darwin-arm64", "0da7ff74ef8611328c8212f17943368713a2ad953fb7d89a8c8a0eae87c23207"),
44-
"22.22.3-darwin_amd64": ("node-v22.22.3-darwin-x64.tar.gz", "node-v22.22.3-darwin-x64", "45830ba752fa0d892c6dcd640946669801293cac820a33591ded40ac075198ec"),
45-
"22.22.3-linux_arm64": ("node-v22.22.3-linux-arm64.tar.xz", "node-v22.22.3-linux-arm64", "1c4a9933a5e45bc88f54f70b5f91232c127ec49f1a5989d23fb85824c7adf9b7"),
46-
"22.22.3-linux_ppc64le": ("node-v22.22.3-linux-ppc64le.tar.xz", "node-v22.22.3-linux-ppc64le", "edb5478071bd1375e80195ca52f72823998bb5141b1a09e68bc54b3e2eb67754"),
47-
"22.22.3-linux_s390x": ("node-v22.22.3-linux-s390x.tar.xz", "node-v22.22.3-linux-s390x", "ce398c057830d57a24c458177279a17bc51742d5c22dd4cbe97b10dbd43f2617"),
48-
"22.22.3-linux_amd64": ("node-v22.22.3-linux-x64.tar.xz", "node-v22.22.3-linux-x64", "2e5d13569282d016861fae7c8f935e741693c269101a5bebcf761a5376d1f99f"),
49-
"22.22.3-windows_amd64": ("node-v22.22.3-win-x64.zip", "node-v22.22.3-win-x64", "6c8d54f635feff4df76c2ca80f45332eb2ff57d25226edce36592e51a177ee33"),
43+
"22.23.1-darwin_arm64": ("node-v22.23.1-darwin-arm64.tar.gz", "node-v22.23.1-darwin-arm64", "ef28d8fab2c0e4314522d4bb1b7173270aa3937e93b92cb7de79c112ac1fa953"),
44+
"22.23.1-darwin_amd64": ("node-v22.23.1-darwin-x64.tar.gz", "node-v22.23.1-darwin-x64", "b8da981b8a0b1241b70249204916da76c63573ddf5814dbd2d1e41069105cb81"),
45+
"22.23.1-linux_arm64": ("node-v22.23.1-linux-arm64.tar.xz", "node-v22.23.1-linux-arm64", "0294e8b915ab75f92c7513d2fcb830ae06e10684e6c603e99a87dbf8835389c1"),
46+
"22.23.1-linux_ppc64le": ("node-v22.23.1-linux-ppc64le.tar.xz", "node-v22.23.1-linux-ppc64le", "a645bcb7bbc498d09ba9249b5c6414aa6d0a461d8854afc61e32096646ba5e66"),
47+
"22.23.1-linux_s390x": ("node-v22.23.1-linux-s390x.tar.xz", "node-v22.23.1-linux-s390x", "f16b5636ba925b462e627c5e0ef47de3255bf4a7b38d56db58e2cf165df19c3c"),
48+
"22.23.1-linux_amd64": ("node-v22.23.1-linux-x64.tar.xz", "node-v22.23.1-linux-x64", "9749e988f437343b7fa832c69ded82a312e41a03116d766797ac14f6f9eee578"),
49+
"22.23.1-windows_amd64": ("node-v22.23.1-win-x64.zip", "node-v22.23.1-win-x64", "7df0bc9375723f4a86b3aa1b7cc73342423d9677a8df4538aca31a049e309c29"),
5050
},
51-
node_version = "22.22.3",
51+
node_version = "22.23.1",
5252
)
5353
use_repo(
5454
node,
@@ -131,8 +131,8 @@ use_repo(
131131
pnpm = use_extension("@aspect_rules_js//npm:extensions.bzl", "pnpm")
132132
pnpm.pnpm(
133133
name = "pnpm",
134-
pnpm_version = "11.5.3",
135-
pnpm_version_integrity = "sha512-esHJGTQcITo03A0Cr7cUPFwmrCbujEeC3uqCG4rGTSE0oIH9iUHa5uKbu0j1jfwrf7zuzMB8svCdIZ00Kklp7Q==",
134+
pnpm_version = "11.10.0",
135+
pnpm_version_integrity = "sha512-C3+LmAYAMZBMAX46QesYehbUDuuCm5XE+MsDaBdh/Eq1PdIZEVubRH9NzhoFohR2RGHn03AzkqnzL5URzoyGyA==",
136136
)
137137
use_repo(pnpm, "pnpm")
138138

0 commit comments

Comments
 (0)