Skip to content

Commit ec0e137

Browse files
authored
Merge branch 'angular:main' into aria-effects
2 parents 730b4f6 + 39b0f55 commit ec0e137

20 files changed

Lines changed: 1103 additions & 1243 deletions

.github/workflows/ci.material-aio.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: Execute Tests
4646
run: pnpm bazel test --test_tag_filters=-e2e,-audit //docs/...
4747
- name: Store Test Logs
48-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
48+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
4949
if: always()
5050
with:
5151
name: test-logs
@@ -66,7 +66,7 @@ jobs:
6666
- name: Execute Lighthouse Audit
6767
run: pnpm -s bazel test --test_tag_filters=audit //docs/...
6868
- name: Store Audit Logs
69-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
69+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
7070
if: always()
7171
with:
7272
name: lighthouse-logs

.github/workflows/pr.material-aio.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Execute Tests
4444
run: pnpm bazel test --test_tag_filters=-e2e,-audit //docs/...
4545
- name: Store Test Logs
46-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
46+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
4747
if: always()
4848
with:
4949
name: test-logs
@@ -64,7 +64,7 @@ jobs:
6464
- name: Execute Lighthouse Audit
6565
run: pnpm bazel test --test_tag_filters=audit //docs/...
6666
- name: Store Audit Logs
67-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
67+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
6868
if: always()
6969
with:
7070
name: lighthouse-logs

.github/workflows/pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139
- name: Build and create package artifacts
140140
run: ./scripts/create-package-archives.mjs --suffix "pr${{github.event.number}}-$(git rev-parse --short HEAD)"
141141
- name: Upload artifacts
142-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
142+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
143143
with:
144144
name: Package Artifacts
145145
path: dist/release-archives

.github/workflows/scheduled-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
# updates the lock file as expected with the changes
3232
run: node ./scripts/circleci/setup-angular-snapshots.js main
3333
- name: Install node modules
34-
run: pnpm install
34+
run: pnpm install --no-frozen-lockfile
3535
- name: Run Browser tests
3636
run: pnpm bazel test --build_tag_filters=-e2e --test_tag_filters=-e2e --build_tests_only -- src/...
3737

@@ -51,7 +51,7 @@ jobs:
5151
# updates the lock files as expected with the changes
5252
run: node ./scripts/circleci/setup-angular-snapshots.js main
5353
- name: Install node modules
54-
run: pnpm install
54+
run: pnpm install --no-frozen-lockfile
5555
- name: Run linker tests using AOT
5656
run: pnpm test-linker-aot
5757
- name: Run linker tests using JIT

.github/workflows/scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ jobs:
3939

4040
# Upload the results as artifacts.
4141
- name: 'Upload artifact'
42-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
42+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
4343
with:
4444
name: SARIF file
4545
path: results.sarif
4646
retention-days: 5
4747

4848
# Upload the results to GitHub's code scanning dashboard.
4949
- name: 'Upload to code-scanning'
50-
uses: github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
50+
uses: github/codeql-action/upload-sarif@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
5151
with:
5252
sarif_file: results.sarif

CHANGELOG.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,36 @@
1+
<a name="22.0.0-next.5"></a>
2+
# 22.0.0-next.5 "carbon-steel" (2026-04-16)
3+
### aria
4+
| Commit | Type | Description |
5+
| -- | -- | -- |
6+
| [d91f46b4c5](https://github.com/angular/components/commit/d91f46b4c522159e025d3b94b653981f344a4fdf) | feat | **accordion:** introduce accordion harness ([#33046](https://github.com/angular/components/pull/33046)) |
7+
| [1885d35346](https://github.com/angular/components/commit/1885d35346e05341532aed56ac476f9a9eae179b) | feat | **listbox:** introduce listbox harness ([#33064](https://github.com/angular/components/pull/33064)) |
8+
| [75fae5275c](https://github.com/angular/components/commit/75fae5275c5702e64477da6a2ac8a14428623c8b) | feat | **menu:** introduce menu harness ([#33067](https://github.com/angular/components/pull/33067)) |
9+
| [c25e6252ec](https://github.com/angular/components/commit/c25e6252ecf3b5a6472151a8fca4af093b3322e6) | feat | **tabs:** add test harnesses ([#33079](https://github.com/angular/components/pull/33079)) |
10+
| [a49508bacf](https://github.com/angular/components/commit/a49508bacf419f2e8f0545158de1f951f3ba1c1a) | feat | **toolbar:** add test harnesses ([#33068](https://github.com/angular/components/pull/33068)) |
11+
| [30f2239728](https://github.com/angular/components/commit/30f223972870c3016e8e14f4bafb913d22117e20) | feat | **tree:** add test harnesses ([#33066](https://github.com/angular/components/pull/33066)) |
12+
### material
13+
| Commit | Type | Description |
14+
| -- | -- | -- |
15+
| [440cb16064](https://github.com/angular/components/commit/440cb16064a4daf50437e806057403cf80c52bd6) | fix | **autocomplete:** remove modal workaround |
16+
| [348c3c89d5](https://github.com/angular/components/commit/348c3c89d511ab5f74fda95ef0f0ae7a332527fb) | fix | **select:** remove modal workaround |
17+
| [1b6052fbea](https://github.com/angular/components/commit/1b6052fbeaab90a245c86762fea18be4c262cb9a) | fix | **sort:** deprecate MatSortHeaderIntl and hide from docs ([#33089](https://github.com/angular/components/pull/33089)) |
18+
### multiple
19+
| Commit | Type | Description |
20+
| -- | -- | -- |
21+
| [6cb6b5ee19](https://github.com/angular/components/commit/6cb6b5ee1980c18c4ebec9337513e3b6a863661f) | fix | make more public APIs readonly ([#33071](https://github.com/angular/components/pull/33071)) |
22+
23+
<!-- CHANGELOG SPLIT MARKER -->
24+
25+
<a name="21.2.7"></a>
26+
# 21.2.7 "carbon-jetski" (2026-04-16)
27+
### material
28+
| Commit | Type | Description |
29+
| -- | -- | -- |
30+
| [5954c4594c](https://github.com/angular/components/commit/5954c4594c6df87908bc7849214a29f6897b213e) | fix | **sort:** deprecate MatSortHeaderIntl and hide from docs ([#33089](https://github.com/angular/components/pull/33089)) |
31+
32+
<!-- CHANGELOG SPLIT MARKER -->
33+
134
<a name="22.0.0-next.4"></a>
235
# 22.0.0-next.4 "paper cup" (2026-04-08)
336
## Breaking Changes

MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ module(
44
name = "components",
55
)
66

7-
bazel_dep(name = "yq.bzl", version = "0.3.5")
8-
bazel_dep(name = "rules_nodejs", version = "6.7.3")
7+
bazel_dep(name = "yq.bzl", version = "0.3.6")
8+
bazel_dep(name = "rules_nodejs", version = "6.7.4")
99
bazel_dep(name = "aspect_rules_js", version = "3.0.3")
1010
bazel_dep(name = "rules_pkg", version = "1.2.0")
1111
bazel_dep(name = "tar.bzl", version = "0.10.1")

MODULE.bazel.lock

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

goldens/material/sort/index.api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ export class MatSortHeader implements MatSortable, OnDestroy, OnInit, AfterViewI
114114
static ɵfac: i0.ɵɵFactoryDeclaration<MatSortHeader, never>;
115115
}
116116

117-
// @public
117+
// @public @deprecated
118118
export class MatSortHeaderIntl {
119119
readonly changes: Subject<void>;
120120
// (undocumented)

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"ci-docs-monitor-test": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only scripts/docs-deploy/monitoring/ci-test.mts",
5454
"prepare": "husky"
5555
},
56-
"version": "22.0.0-next.4",
56+
"version": "22.0.0-next.5",
5757
"dependencies": {
5858
"@angular-devkit/core": "catalog:",
5959
"@angular-devkit/schematics": "catalog:",

0 commit comments

Comments
 (0)