Skip to content

Commit f4c7f66

Browse files
authored
Merge branch 'angular:main' into slide-toggle
2 parents f8c3c60 + 76f2603 commit f4c7f66

Some content is hidden

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

67 files changed

+2285
-5195
lines changed

.bazelrc

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,7 @@ build:release --stamp
6363

6464
build:snapshot-build --workspace_status_command="pnpm -s ng-dev:stamp --mode=snapshot"
6565
build:snapshot-build --stamp
66-
67-
##################################
68-
# Always enable Ivy compilation #
69-
##################################
70-
build --define=angular_ivy_enabled=True
66+
build:snapshot-build --//:enable_snapshot_adev_assets
7167

7268
################################
7369
# Remote Execution Setup #

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ jobs:
135135
uses: angular/dev-infra/github-actions/bazel/configure-remote@95e3a0ede6dfa1aedd34b03918ad72b18f87e5ae
136136
- name: Install node modules
137137
run: pnpm install --frozen-lockfile
138-
- name: Build and Verify Release Output
139-
run: pnpm build-and-check-release-output
138+
- name: Build Snapshots
139+
run: pnpm build-snapshots
140140
- name: Verify tooling setup
141141
run: pnpm check-tooling-setup
142142
- name: Build Docs Content

BUILD.bazel

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
12
load("@devinfra//bazel/validation:defs.bzl", "validate_ts_version_matching")
23
load("@npm//:defs.bzl", "npm_link_all_packages")
34
load("//:pkg-externals.bzl", "PKG_EXTERNALS")
@@ -43,3 +44,15 @@ validate_ts_version_matching(
4344
module_lock_file = "MODULE.bazel.lock",
4445
package_json = "package.json",
4546
)
47+
48+
bool_flag(
49+
name = "enable_snapshot_adev_assets",
50+
build_setting_default = False,
51+
)
52+
53+
config_setting(
54+
name = "snapshot_adev_assets",
55+
flag_values = {
56+
":enable_snapshot_adev_assets": "true",
57+
},
58+
)

MODULE.bazel

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

77
bazel_dep(name = "yq.bzl", version = "0.3.2")
88
bazel_dep(name = "rules_nodejs", version = "6.6.2")
9-
bazel_dep(name = "aspect_rules_js", version = "2.8.2")
9+
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.21.2")
@@ -32,7 +32,7 @@ git_override(
3232
bazel_dep(name = "rules_angular")
3333
git_override(
3434
module_name = "rules_angular",
35-
commit = "9b751f826628cab386d1e8ae9c1fa766dbc6a495",
35+
commit = "f942bfd36bf472e93ef568b2f46bc0cfe21f1c3e",
3636
remote = "https://github.com/devversion/rules_angular.git",
3737
)
3838

MODULE.bazel.lock

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

goldens/cdk/collections/index.api.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
```ts
66

77
import * as i0 from '@angular/core';
8-
import { InjectionToken } from '@angular/core';
98
import { IterableChangeRecord } from '@angular/core';
109
import { IterableChanges } from '@angular/core';
1110
import { Observable } from 'rxjs';
@@ -110,9 +109,6 @@ export class UniqueSelectionDispatcher implements OnDestroy {
110109
// @public (undocumented)
111110
export type UniqueSelectionDispatcherListener = (id: string, name: string) => void;
112111

113-
// @public
114-
export const _VIEW_REPEATER_STRATEGY: InjectionToken<_ViewRepeater<unknown, unknown, _ViewRepeaterItemContext<unknown>>>;
115-
116112
// @public
117113
export interface _ViewRepeater<T, R, C extends _ViewRepeaterItemContext<T>> {
118114
// (undocumented)

goldens/cdk/menu/index.api.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export class CdkContextMenuTrigger extends CdkMenuTriggerBase implements OnDestr
4646
open(coordinates: ContextMenuCoordinates): void;
4747
_openOnContextMenu(event: MouseEvent): void;
4848
// (undocumented)
49-
static ɵdir: i0.ɵɵDirectiveDeclaration<CdkContextMenuTrigger, "[cdkContextMenuTriggerFor]", ["cdkContextMenuTriggerFor"], { "menuTemplateRef": { "alias": "cdkContextMenuTriggerFor"; "required": false; }; "menuPosition": { "alias": "cdkContextMenuPosition"; "required": false; }; "menuData": { "alias": "cdkContextMenuTriggerData"; "required": false; }; "disabled": { "alias": "cdkContextMenuDisabled"; "required": false; }; }, { "opened": "cdkContextMenuOpened"; "closed": "cdkContextMenuClosed"; }, never, never, true, never>;
49+
static ɵdir: i0.ɵɵDirectiveDeclaration<CdkContextMenuTrigger, "[cdkContextMenuTriggerFor]", ["cdkContextMenuTriggerFor"], { "menuTemplateRef": { "alias": "cdkContextMenuTriggerFor"; "required": false; }; "menuPosition": { "alias": "cdkContextMenuPosition"; "required": false; }; "menuData": { "alias": "cdkContextMenuTriggerData"; "required": false; }; "transformOriginSelector": { "alias": "cdkContextMenuTriggerTransformOriginOn"; "required": false; }; "disabled": { "alias": "cdkContextMenuDisabled"; "required": false; }; }, { "opened": "cdkContextMenuOpened"; "closed": "cdkContextMenuClosed"; }, never, never, true, never>;
5050
// (undocumented)
5151
static ɵfac: i0.ɵɵFactoryDeclaration<CdkContextMenuTrigger, never>;
5252
}
@@ -224,7 +224,7 @@ export class CdkMenuTrigger extends CdkMenuTriggerBase implements OnChanges, OnD
224224
toggle(): void;
225225
_toggleOnKeydown(event: KeyboardEvent): void;
226226
// (undocumented)
227-
static ɵdir: i0.ɵɵDirectiveDeclaration<CdkMenuTrigger, "[cdkMenuTriggerFor]", ["cdkMenuTriggerFor"], { "menuTemplateRef": { "alias": "cdkMenuTriggerFor"; "required": false; }; "menuPosition": { "alias": "cdkMenuPosition"; "required": false; }; "menuData": { "alias": "cdkMenuTriggerData"; "required": false; }; }, { "opened": "cdkMenuOpened"; "closed": "cdkMenuClosed"; }, never, never, true, never>;
227+
static ɵdir: i0.ɵɵDirectiveDeclaration<CdkMenuTrigger, "[cdkMenuTriggerFor]", ["cdkMenuTriggerFor"], { "menuTemplateRef": { "alias": "cdkMenuTriggerFor"; "required": false; }; "menuPosition": { "alias": "cdkMenuPosition"; "required": false; }; "menuData": { "alias": "cdkMenuTriggerData"; "required": false; }; "transformOriginSelector": { "alias": "cdkMenuTriggerTransformOriginOn"; "required": false; }; }, { "opened": "cdkMenuOpened"; "closed": "cdkMenuClosed"; }, never, never, true, never>;
228228
// (undocumented)
229229
static ɵfac: i0.ɵɵFactoryDeclaration<CdkMenuTrigger, never>;
230230
}
@@ -250,6 +250,7 @@ export abstract class CdkMenuTriggerBase implements OnDestroy {
250250
protected overlayRef: OverlayRef | null;
251251
registerChildMenu(child: Menu): void;
252252
protected readonly stopOutsideClicksListener: rxjs.Observable<void>;
253+
transformOriginSelector: string | null;
253254
protected readonly viewContainerRef: ViewContainerRef;
254255
// (undocumented)
255256
static ɵdir: i0.ɵɵDirectiveDeclaration<CdkMenuTriggerBase, never, never, {}, {}, never, never, true, never>;

goldens/cdk/scrolling/index.api.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ export type _Bottom = {
2626
bottom?: number;
2727
};
2828

29+
// @public
30+
export const CDK_VIRTUAL_SCROLL_VIEWPORT: InjectionToken<CdkVirtualScrollViewport>;
31+
2932
// @public
3033
export class CdkFixedSizeVirtualScroll implements OnChanges {
3134
get itemSize(): number;

goldens/cdk/table/index.api.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ export class CdkNoDataRow {
262262
static ɵfac: i0.ɵɵFactoryDeclaration<CdkNoDataRow, never>;
263263
}
264264

265-
// @public
265+
// @public @deprecated
266266
export class CdkRecycleRows {
267267
// (undocumented)
268268
static ɵdir: i0.ɵɵDirectiveDeclaration<CdkRecycleRows, "cdk-table[recycleRows], table[cdk-table][recycleRows]", never, {}, {}, never, never, true, never>;
@@ -334,6 +334,8 @@ export class CdkTable<T> implements AfterContentInit, AfterContentChecked, Colle
334334
// (undocumented)
335335
static ngAcceptInputType_multiTemplateDataRows: unknown;
336336
// (undocumented)
337+
static ngAcceptInputType_recycleRows: unknown;
338+
// (undocumented)
337339
ngAfterContentChecked(): void;
338340
// (undocumented)
339341
ngAfterContentInit(): void;
@@ -345,6 +347,7 @@ export class CdkTable<T> implements AfterContentInit, AfterContentChecked, Colle
345347
// (undocumented)
346348
_noDataRowOutlet: NoDataRowOutlet;
347349
_outletAssigned(): void;
350+
recycleRows: boolean;
348351
removeColumnDef(columnDef: CdkColumnDef): void;
349352
removeFooterRowDef(footerRowDef: CdkFooterRowDef): void;
350353
removeHeaderRowDef(headerRowDef: CdkHeaderRowDef): void;
@@ -366,9 +369,9 @@ export class CdkTable<T> implements AfterContentInit, AfterContentChecked, Colle
366369
end: number;
367370
}>;
368371
// (undocumented)
369-
protected readonly _viewRepeater: _ViewRepeater<T, RenderRow<T>, RowContext<T>>;
372+
protected _viewRepeater: _ViewRepeater<T, RenderRow<T>, RowContext<T>>;
370373
// (undocumented)
371-
static ɵcmp: i0.ɵɵComponentDeclaration<CdkTable<any>, "cdk-table, table[cdk-table]", ["cdkTable"], { "trackBy": { "alias": "trackBy"; "required": false; }; "dataSource": { "alias": "dataSource"; "required": false; }; "multiTemplateDataRows": { "alias": "multiTemplateDataRows"; "required": false; }; "fixedLayout": { "alias": "fixedLayout"; "required": false; }; }, { "contentChanged": "contentChanged"; }, ["_noDataRow", "_contentColumnDefs", "_contentRowDefs", "_contentHeaderRowDefs", "_contentFooterRowDefs"], ["caption", "colgroup, col", "*"], true, never>;
374+
static ɵcmp: i0.ɵɵComponentDeclaration<CdkTable<any>, "cdk-table, table[cdk-table]", ["cdkTable"], { "trackBy": { "alias": "trackBy"; "required": false; }; "dataSource": { "alias": "dataSource"; "required": false; }; "multiTemplateDataRows": { "alias": "multiTemplateDataRows"; "required": false; }; "fixedLayout": { "alias": "fixedLayout"; "required": false; }; "recycleRows": { "alias": "recycleRows"; "required": false; }; }, { "contentChanged": "contentChanged"; }, ["_noDataRow", "_contentColumnDefs", "_contentRowDefs", "_contentHeaderRowDefs", "_contentFooterRowDefs"], ["caption", "colgroup, col", "*"], true, never>;
372375
// (undocumented)
373376
static ɵfac: i0.ɵɵFactoryDeclaration<CdkTable<any>, never>;
374377
}

goldens/material/table/index.api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ export class MatNoDataRow extends CdkNoDataRow {
139139
static ɵfac: i0.ɵɵFactoryDeclaration<MatNoDataRow, never>;
140140
}
141141

142-
// @public
142+
// @public @deprecated
143143
export class MatRecycleRows {
144144
// (undocumented)
145145
static ɵdir: i0.ɵɵDirectiveDeclaration<MatRecycleRows, "mat-table[recycleRows], table[mat-table][recycleRows]", never, {}, {}, never, never, true, never>;

0 commit comments

Comments
 (0)