Skip to content

Commit ef6cbdc

Browse files
authored
Merge branch 'angular:main' into chips-overflow
2 parents a97bba9 + 5b40271 commit ef6cbdc

File tree

94 files changed

+203
-2516
lines changed

Some content is hidden

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

94 files changed

+203
-2516
lines changed

MODULE.bazel

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@ git_override(
2121
commit = "93467ec31f55d87d50b59928a6461cd6cbf241c2",
2222
remote = "https://github.com/devversion/rules_browsers.git",
2323
)
24+
2425
bazel_dep(name = "rules_sass")
2526
git_override(
2627
module_name = "rules_sass",
2728
commit = "76078d5e9776a0080dcee496e90b88d8a6179c19",
2829
remote = "https://github.com/devversion/rules_sass.git",
2930
)
31+
3032
bazel_dep(name = "rules_angular")
3133
git_override(
3234
module_name = "rules_angular",
@@ -37,7 +39,7 @@ git_override(
3739
bazel_dep(name = "devinfra")
3840
git_override(
3941
module_name = "devinfra",
40-
commit = "7a11f99c467ca5ae4411c27beeec4300e32b616a",
42+
commit = "80db036355181684ed07021a175e9f039190d3d6",
4143
remote = "https://github.com/angular/dev-infra.git",
4244
)
4345

@@ -46,12 +48,12 @@ use_repo(yq, "yq_toolchains")
4648

4749
rules_ts_ext = use_extension("@aspect_rules_ts//ts:extensions.bzl", "ext")
4850
rules_ts_ext.deps(
51+
name = "components_npm_typescript",
4952
# Obtained by: curl --silent https://registry.npmjs.org/typescript/5.9.2 | jq -r '.dist.integrity'
5053
ts_integrity = "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
5154
ts_version_from = "//:package.json",
52-
name = "components_npm_typescript",
5355
)
54-
use_repo(rules_ts_ext, **{"npm_typescript":"components_npm_typescript"})
56+
use_repo(rules_ts_ext, **{"npm_typescript": "components_npm_typescript"})
5557

5658
node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
5759
node.toolchain(node_version = "22.12.0")
@@ -140,4 +142,4 @@ rules_angular.setup(
140142
angular_compiler_cli = "//:node_modules/@angular/compiler-cli",
141143
typescript = "//:node_modules/typescript",
142144
)
143-
use_repo(rules_angular, **{"rules_angular_configurable_deps":"components_rules_angular_configurable_deps"})
145+
use_repo(rules_angular, **{"rules_angular_configurable_deps": "components_rules_angular_configurable_deps"})

MODULE.bazel.lock

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

docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"npm-run-all": "^4.1.5",
7777
"protractor": "^7.0.0",
7878
"puppeteer-core": "^24.6.1",
79-
"sass": "1.90.0",
79+
"sass": "1.91.0",
8080
"shelljs": "^0.10.0",
8181
"ts-node": "10.9.2",
8282
"typescript": "~5.9.2"

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,13 @@
7676
"devDependencies": {
7777
"@angular/compiler-cli": "catalog:",
7878
"@angular/localize": "catalog:",
79-
"@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#b9bae2cc9b96652721067a69ece7e79dba123787",
79+
"@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#e5cf193487333c2dbb5eaaa0941a6b23b34af262",
8080
"@angular/platform-server": "catalog:",
8181
"@angular/router": "catalog:",
8282
"@babel/core": "^7.16.12",
8383
"@bazel/bazelisk": "1.26.0",
8484
"@bazel/buildifier": "8.2.1",
85-
"@bazel/ibazel": "^0.25.0",
85+
"@bazel/ibazel": "^0.26.0",
8686
"@bazel/runfiles": "6.3.1",
8787
"@firebase/app-types": "^0.9.0",
8888
"@material/material-color-utilities": "^0.3.0",

pnpm-lock.yaml

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

src/cdk/a11y/aria-describer/aria-describer.spec.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
import {A11yModule, CDK_DESCRIBEDBY_HOST_ATTRIBUTE} from '../index';
22
import {AriaDescriber} from './aria-describer';
33
import {ComponentFixture, TestBed} from '@angular/core/testing';
4-
import {Component, ElementRef, ViewChild, Provider, inject} from '@angular/core';
4+
import {Component, ElementRef, ViewChild, inject} from '@angular/core';
55

66
describe('AriaDescriber', () => {
77
let ariaDescriber: AriaDescriber;
88
let component: TestApp;
99
let fixture: ComponentFixture<TestApp>;
1010

11-
function createFixture(providers: Provider[] = []) {
12-
TestBed.configureTestingModule({
13-
providers: [AriaDescriber, ...providers],
14-
});
15-
11+
function createFixture() {
1612
fixture = TestBed.createComponent(TestApp);
1713
component = fixture.componentInstance;
1814
ariaDescriber = component.ariaDescriber;

src/cdk/clipboard/clipboard.spec.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ describe('Clipboard', () => {
1414
let focusedInput: HTMLElement;
1515

1616
beforeEach(() => {
17-
TestBed.configureTestingModule({});
18-
1917
clipboard = TestBed.inject(Clipboard);
2018
document = TestBed.inject(DOCUMENT);
2119
execCommand = spyOn(document, 'execCommand').and.returnValue(true);

src/cdk/menu/menu-bar.spec.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ describe('MenuBar', () => {
4545
let menuItems: CdkMenuItemRadio[];
4646

4747
beforeEach(waitForAsync(() => {
48-
TestBed.configureTestingModule({});
49-
5048
fixture = TestBed.createComponent(MenuBarRadioGroup);
5149
fixture.detectChanges();
5250

@@ -102,10 +100,6 @@ describe('MenuBar', () => {
102100
detectChanges();
103101
}
104102

105-
beforeEach(waitForAsync(() => {
106-
TestBed.configureTestingModule({});
107-
}));
108-
109103
beforeEach(() => {
110104
fixture = TestBed.createComponent(MultiMenuWithSubmenu);
111105
detectChanges();

src/cdk/observers/observe-content.spec.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,6 @@ describe('ContentObserver injectable', () => {
185185
let contentObserver: ContentObserver;
186186

187187
beforeEach(waitForAsync(() => {
188-
TestBed.configureTestingModule({});
189-
190188
const fixture = TestBed.createComponent(UnobservedComponentWithTextContent);
191189
fixture.autoDetectChanges();
192190
spy = jasmine.createSpy('content observer');

src/cdk/scrolling/scroll-dispatcher.spec.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
1-
import {TestBed, waitForAsync, fakeAsync, ComponentFixture, tick} from '@angular/core/testing';
1+
import {TestBed, fakeAsync, ComponentFixture, tick} from '@angular/core/testing';
22
import {Component, ViewChild, ElementRef} from '@angular/core';
33
import {CdkScrollable, ScrollDispatcher, ScrollingModule} from './public-api';
44
import {dispatchFakeEvent} from '../testing/private';
55

66
describe('ScrollDispatcher', () => {
77
let scroll: ScrollDispatcher;
88

9-
beforeEach(waitForAsync(() => {
10-
TestBed.configureTestingModule({
11-
imports: [ScrollingModule, ScrollingComponent, NestedScrollingComponent],
12-
});
13-
9+
beforeEach(() => {
1410
scroll = TestBed.inject(ScrollDispatcher);
15-
}));
11+
});
1612

1713
describe('Basic usage', () => {
1814
let fixture: ComponentFixture<ScrollingComponent>;

0 commit comments

Comments
 (0)