Skip to content

Commit 1cf5426

Browse files
authored
Merge branch 'angular:main' into toggle-nav
2 parents a0c8569 + 96117bc commit 1cf5426

File tree

122 files changed

+1095
-1235
lines changed

Some content is hidden

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

122 files changed

+1095
-1235
lines changed

WORKSPACE

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ http_archive(
158158
load("@aspect_rules_ts//ts:repositories.bzl", "rules_ts_dependencies")
159159

160160
rules_ts_dependencies(
161-
# Obtained by: curl --silent https://registry.npmjs.org/typescript/5.8.3 | jq -r '.dist.integrity'
162-
ts_integrity = "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
161+
# Obtained by: curl --silent https://registry.npmjs.org/typescript/5.9.2 | jq -r '.dist.integrity'
162+
ts_integrity = "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
163163
ts_version_from = "//:package.json",
164164
)
165165

@@ -177,6 +177,13 @@ http_archive(
177177
url = "https://github.com/aspect-build/rules_jasmine/releases/download/v2.0.0/rules_jasmine-v2.0.0.tar.gz",
178178
)
179179

180+
http_archive(
181+
name = "jq.bzl",
182+
sha256 = "7b63435aa19cc6a0cfd1a82fbdf2c7a2f0a94db1a79ff7a4469ffa94286261ab",
183+
strip_prefix = "jq.bzl-0.1.0",
184+
url = "https://github.com/bazel-contrib/jq.bzl/releases/download/v0.1.0/jq.bzl-v0.1.0.tar.gz",
185+
)
186+
180187
load("@aspect_rules_jasmine//jasmine:dependencies.bzl", "rules_jasmine_dependencies")
181188

182189
rules_jasmine_dependencies()
@@ -199,7 +206,7 @@ setup_dependencies_2()
199206

200207
git_repository(
201208
name = "rules_angular",
202-
commit = "652e5b0ef9be65ca738e11d5d01424b64344b466",
209+
commit = "8bf9ae3fa3017ec12877908533001daed9c6ce83",
203210
remote = "https://github.com/devversion/rules_angular.git",
204211
)
205212

docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,6 @@
7979
"sass": "1.89.2",
8080
"shelljs": "^0.10.0",
8181
"ts-node": "10.9.2",
82-
"typescript": "~5.8.2"
82+
"typescript": "~5.9.2"
8383
}
8484
}

docs/src/app/shared/guide-items/guide-items.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ const GUIDES: GuideItem[] = [
5252
id: 'creating-a-custom-stepper-using-the-cdk-stepper',
5353
name: 'Custom stepper using the CdkStepper',
5454
document: '/docs-content/guides/creating-a-custom-stepper-using-the-cdk-stepper.md.html',
55-
overview: 'Create a custom stepper components using Angular CDK.',
55+
overview: 'Create a custom stepper component using Angular CDK.',
5656
},
5757
{
5858
id: 'using-component-harnesses',

docs/tsconfig.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
"strictInjectionParameters": true,
3333
"strictInputAccessModifiers": true,
3434
"strictTemplates": true,
35+
"strictInputTypes": true,
36+
"strictOutputEventTypes": true,
37+
"strictDomEventTypes": true,
3538
"typeCheckHostBindings": true
3639
}
3740
}

guides/creating-a-custom-stepper-using-the-cdk-stepper.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Creating a custom stepper using the CDK stepper
22

3-
The [CDK stepper](https://material.angular.dev/cdk/stepper/overview) allows to build a custom stepper which you can completely style yourself without any specific Material Design styling.
3+
The [CDK stepper](https://material.angular.dev/cdk/stepper/overview) allows you to build a custom stepper which you can completely style yourself without any specific Material Design styling.
44

5-
In this guide, we'll learn how we can build our own custom stepper using the CDK stepper. Here is what we'll build by the end of this guide:
5+
In this guide, we'll learn how to build our own custom stepper using the CDK stepper. Here is what we'll build by the end of this guide:
66

77
<!-- example(cdk-custom-stepper-without-form) -->
88

@@ -126,7 +126,7 @@ If you want to iterate over your steps and use your own custom component you can
126126

127127
The above example allows the user to freely navigate between all steps. The `CdkStepper` additionally provides the linear mode which requires the user to complete previous steps before proceeding.
128128

129-
A simple example without using forms could look this way:
129+
A simple example without using forms could look like this:
130130

131131
**app.component.html**
132132

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,14 @@
145145
"tsickle": "0.46.3",
146146
"tslint": "^6.1.3",
147147
"tsutils": "^3.21.0",
148-
"typescript": "5.8.3",
148+
"typescript": "5.9.2",
149149
"vrsource-tslint-rules": "6.0.0",
150150
"yargs": "^18.0.0",
151151
"zx": "^8.0.0"
152152
},
153153
"pnpm": {
154154
"overrides": {
155-
"typescript": "5.8.3"
155+
"typescript": "5.9.2"
156156
},
157157
"onlyBuiltDependencies": [],
158158
"packageExtensions": {

pnpm-lock.yaml

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

pnpm-workspace.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@ packages:
1717
- src/youtube-player
1818

1919
catalog:
20-
'@angular-devkit/build-angular': 20.2.0-next.0
21-
'@angular-devkit/core': 20.2.0-next.0
22-
'@angular-devkit/schematics': 20.2.0-next.0
23-
'@angular/animations': 20.2.0-next.1
24-
'@angular/build': 20.2.0-next.0
25-
'@angular/cli': 20.2.0-next.0
26-
'@angular/common': 20.2.0-next.1
27-
'@angular/compiler-cli': 20.2.0-next.1
28-
'@angular/compiler': 20.2.0-next.1
29-
'@angular/core': 20.2.0-next.1
30-
'@angular/ssr': 20.2.0-next.0
31-
'@angular/forms': 20.2.0-next.1
32-
'@angular/localize': 20.2.0-next.1
33-
'@angular/platform-browser': 20.2.0-next.1
34-
'@angular/platform-browser-dynamic': 20.2.0-next.1
35-
'@angular/platform-server': 20.2.0-next.1
36-
'@angular/router': 20.2.0-next.1
37-
'@schematics/angular': 20.2.0-next.0
20+
'@angular-devkit/build-angular': 20.2.0-next.1
21+
'@angular-devkit/core': 20.2.0-next.1
22+
'@angular-devkit/schematics': 20.2.0-next.1
23+
'@angular/animations': 20.2.0-next.2
24+
'@angular/build': 20.2.0-next.1
25+
'@angular/cli': 20.2.0-next.1
26+
'@angular/common': 20.2.0-next.2
27+
'@angular/compiler-cli': 20.2.0-next.2
28+
'@angular/compiler': 20.2.0-next.2
29+
'@angular/core': 20.2.0-next.2
30+
'@angular/ssr': 20.2.0-next.1
31+
'@angular/forms': 20.2.0-next.2
32+
'@angular/localize': 20.2.0-next.2
33+
'@angular/platform-browser': 20.2.0-next.2
34+
'@angular/platform-browser-dynamic': 20.2.0-next.2
35+
'@angular/platform-server': 20.2.0-next.2
36+
'@angular/router': 20.2.0-next.2
37+
'@schematics/angular': 20.2.0-next.1
3838
'rxjs': ^6.6.7

src/bazel-tsconfig-build.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@
5151
"angularCompilerOptions": {
5252
"strictTemplates": true,
5353
"typeCheckHostBindings": true,
54+
"strictInputAccessModifiers": true,
55+
"strictInputTypes": true,
56+
"strictOutputEventTypes": true,
57+
"strictDomEventTypes": true,
5458
"extendedDiagnostics": {
5559
"defaultCategory": "error"
5660
}

src/cdk-experimental/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
load("@npm//:defs.bzl", "npm_link_all_packages")
12
load("//src/cdk-experimental:config.bzl", "CDK_EXPERIMENTAL_TARGETS")
23
load("//tools:defaults.bzl", "ng_package", "ts_project")
3-
load("@npm//:defs.bzl", "npm_link_all_packages")
44

55
package(default_visibility = ["//visibility:public"])
66

0 commit comments

Comments
 (0)