Skip to content

Commit 4523347

Browse files
authored
Merge branch 'angular:main' into menu-inlined
2 parents 93eac9c + 869d4f8 commit 4523347

96 files changed

Lines changed: 8337 additions & 922 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.

.bazelignore

Lines changed: 0 additions & 34 deletions
This file was deleted.

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ jobs:
4747

4848
# Upload the results to GitHub's code scanning dashboard.
4949
- name: 'Upload to code-scanning'
50-
uses: github/codeql-action/upload-sarif@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
50+
uses: github/codeql-action/upload-sarif@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
5151
with:
5252
sarif_file: results.sarif

.pullapprove.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ groups:
4949
- >
5050
contains_any_globs(files, [
5151
'.bazel_fix_commands.json',
52-
'.bazelignore',
52+
'REPO.bazel',
5353
'.bazelrc',
5454
'.bazelversion',
5555
'.firebaserc',

CHANGELOG.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,33 @@
1+
<a name="21.0.5"></a>
2+
# 21.0.5 "plastic-deer" (2025-12-18)
3+
4+
<!-- CHANGELOG SPLIT MARKER -->
5+
6+
<a name="21.1.0-next.3"></a>
7+
# 21.1.0-next.3 "lego scooter" (2025-12-17)
8+
### aria
9+
| Commit | Type | Description |
10+
| -- | -- | -- |
11+
| [ebb1c176f2](https://github.com/angular/components/commit/ebb1c176f2f4909acad41c8bbbb87e023c9a0b99) | fix | **tabs:** disabled tab selection |
12+
### cdk
13+
| Commit | Type | Description |
14+
| -- | -- | -- |
15+
| [dd40f25a03](https://github.com/angular/components/commit/dd40f25a03337765d09ea43f89d0baf3ba6b84a8) | fix | **testing:** Skip task tracking if zone patches aren't present ([#32544](https://github.com/angular/components/pull/32544)) |
16+
### material
17+
| Commit | Type | Description |
18+
| -- | -- | -- |
19+
| [0669de57f2](https://github.com/angular/components/commit/0669de57f2eb0b80b418545ab5a8d9725c1c8f51) | fix | **form-field:** outline being thrown off by Tailwind ([#32513](https://github.com/angular/components/pull/32513)) |
20+
| [a364de5d01](https://github.com/angular/components/commit/a364de5d01c46fe94bd44813b0e584f4b80aa7bc) | fix | **schematics:** combine style resets ([#32496](https://github.com/angular/components/pull/32496)) |
21+
| [204788b945](https://github.com/angular/components/commit/204788b9458a24145cce55cc3744b0bc793fbb0f) | fix | **slide-toggle:** Fix a11y issues by hiding label when it has no content. ([#32480](https://github.com/angular/components/pull/32480)) |
22+
| [cdcae54a47](https://github.com/angular/components/commit/cdcae54a471906dbccdfbe905520eea855bebc23) | fix | **tooltip:** remove explicit usePopover ([#32528](https://github.com/angular/components/pull/32528)) |
23+
### multiple
24+
| Commit | Type | Description |
25+
| -- | -- | -- |
26+
| [e63c5648e8](https://github.com/angular/components/commit/e63c5648e8b08931435c087a12d20305d385f5bc) | fix | type issues when importing Aria directives ([#32561](https://github.com/angular/components/pull/32561)) |
27+
| [d4e104ab7f](https://github.com/angular/components/commit/d4e104ab7fba5b3ff9762d937bffae56a0c5b437) | fix | use focus-visible for focus indicator ([#32514](https://github.com/angular/components/pull/32514)) |
28+
29+
<!-- CHANGELOG SPLIT MARKER -->
30+
131
<a name="21.1.0-next.2"></a>
232
# 21.1.0-next.2 "plastic-monkey" (2025-12-10)
333
### cdk

DEV_ENVIRONMENT.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Developer guide: getting your environment set up
2-
1. Make sure you have both `node` and `pnpm@9` installed.
2+
3+
1. Make sure you have both `node` and `pnpm` installed.
34
We recommend using `nvm` to manage your node versions.
45
2. If you are on Windows, see [the extra steps needed for contributing on Windows](#windows)
56
3. Fork the `angular/components` repo on GitHub.
@@ -8,13 +9,13 @@
89
and `<your-username>` for your fork. Also see the [team git shortcuts](https://github.com/angular/components/wiki/Team-git----bash-shortcuts).
910
5. From the root of the project, run `pnpm i` to install the dependencies.
1011

11-
1212
To build angular/components in release mode, run `pnpm build`. The output can be found under `dist/releases`.
1313

1414
To bring up a local server, run `pnpm dev-app`. This will automatically watch for changes
1515
and rebuild. The browser should refresh automatically when changes are made.
1616

1717
### Running tests
18+
1819
To run unit tests, run `pnpm test <target>`. The `target` can be either a short name (e.g. `pnpm test button`) or an explicit path `pnpm test src/cdk/stepper`.
1920
To run the e2e tests, run `pnpm e2e`.
2021
To run lint, run `pnpm lint`.
@@ -23,6 +24,7 @@ You can debug unit tests by running `pnpm test` with the `--debug` option. This
2324
manually connect a browser to the Karma server.
2425

2526
### Getting Packages from Build Artifacts
27+
2628
Each CI run for a Pull Request stores the built Angular packages as
2729
[build artifacts](https://circleci.com/docs/2.0/artifacts). The artifacts are not guaranteed to be
2830
available as a long-term distribution mechanism, but they are guaranteed to be available around the
@@ -32,6 +34,7 @@ You can access the artifacts for a specific CI run by going to the workflow page
3234
`upload_release_packages` job and then switching to the "Artifacts" tab.
3335

3436
#### Archives for each Package
37+
3538
On the "Artifacts" tab, there is a list of links to compressed archives for Angular packages. The
3639
archive names are of the format `<package-name>-pr<pr-number>-<sha>.tgz` (for example
3740
`material-pr12345-a1b2c3d.tgz`).
@@ -49,6 +52,7 @@ to point to the artifact URLs and then run `pnpm` to install the packages:
4952
```
5053

5154
#### Download all Packages
55+
5256
In addition to the individual package archives, a `.tgz` file including all packages is also
5357
available (named `all-pr<pr-number>-<sha>.tgz`). This can be used if one prefers to download all
5458
packages locally and test them by either of the following ways:
@@ -57,14 +61,14 @@ packages locally and test them by either of the following ways:
5761
2. Directly copy the local uncompressed package directories into the `node_modules/` directory
5862
of a project.
5963

60-
6164
### Approving public API changes
65+
6266
If you're making changes to a public API, they need to be propagated to our public API golden files.
6367
To save the changes you can run `pnpm approve-api <target>` and to review the changes, you can look
6468
at the file under `goldens/<package>/<entry-point>.api.md`.
6569

66-
6770
### Disabling Git hooks
71+
6872
If your development workflow does not intend the commit message validation to run automatically
6973
when commits are being created, or if you do not want to run the formatter upon `git commit`, you
7074
can disable any installed Git hooks by setting `HUSKY=0` in your shell environment. e.g.
@@ -85,7 +89,7 @@ without requiring secrets to be committed.
8589

8690
The following variables are currently used in the dev-app:
8791

88-
* `GOOGLE_MAPS_KEY` - Optional key for the Google Maps API.
92+
- `GOOGLE_MAPS_KEY` - Optional key for the Google Maps API.
8993

9094
For example, you can store a personal development Google Maps API key for the
9195
dev-app within your `.bashrc` or `.zshrc` file.

MODULE.bazel

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ bazel_dep(name = "aspect_rules_js", version = "2.8.3")
1010
bazel_dep(name = "rules_pkg", version = "1.1.0")
1111
bazel_dep(name = "tar.bzl", version = "0.7.0")
1212
bazel_dep(name = "aspect_bazel_lib", version = "2.22.0")
13-
bazel_dep(name = "aspect_rules_esbuild", version = "0.24.0")
13+
bazel_dep(name = "aspect_rules_esbuild", version = "0.25.0")
1414
bazel_dep(name = "aspect_rules_jasmine", version = "2.0.2")
1515
bazel_dep(name = "platforms", version = "1.0.0")
16-
bazel_dep(name = "aspect_rules_ts", version = "3.8.0")
17-
bazel_dep(name = "bazel_skylib", version = "1.8.2")
16+
bazel_dep(name = "aspect_rules_ts", version = "3.8.1")
17+
bazel_dep(name = "bazel_skylib", version = "1.9.0")
1818
bazel_dep(name = "rules_browsers")
1919
git_override(
2020
module_name = "rules_browsers",
@@ -56,10 +56,15 @@ rules_ts_ext.deps(
5656
use_repo(rules_ts_ext, **{"npm_typescript": "components_npm_typescript"})
5757

5858
node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
59-
node.toolchain(node_version = "22.12.0")
59+
node.toolchain(node_version_from_nvmrc = "//:.nvmrc")
6060
use_repo(node, "nodejs_toolchains")
6161

6262
pnpm = use_extension("@aspect_rules_js//npm:extensions.bzl", "pnpm")
63+
pnpm.pnpm(
64+
name = "pnpm",
65+
pnpm_version = "10.26.0",
66+
pnpm_version_integrity = "sha512-Oz9scl6+cSUGwKsa1BM8+GsfS2h+/85iqbOLTXLjlUJC5kMZD8UfoWQpScc19APevUT1yw7dZXq+Y6i2p+HkAg==",
67+
)
6368
use_repo(pnpm, "pnpm")
6469

6570
npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
@@ -159,7 +164,6 @@ npm.npm_translate_lock(
159164
],
160165
},
161166
pnpm_lock = "//:pnpm-lock.yaml",
162-
verify_node_modules_ignored = "//:.bazelignore",
163167
)
164168
use_repo(npm, "npm")
165169

MODULE.bazel.lock

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

0 commit comments

Comments
 (0)