Skip to content

Commit 40571e8

Browse files
authored
fix(multiple): import ANIMATION_MODULE_TYPE from core (#28459)
Moves all imports of `ANIMATION_MODULE_TYPE` from `platform-browser/animations` to `core` to reduce our dependence on the animations module and to avoid potential issues when lazy-loading animations.
1 parent 23e2f3e commit 40571e8

File tree

31 files changed

+30
-29
lines changed

31 files changed

+30
-29
lines changed

src/cdk/clipboard/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ ng_module(
1010
),
1111
assets = glob(["**/*.html"]),
1212
deps = [
13+
"@npm//@angular/common",
1314
"@npm//@angular/core",
1415
"@npm//rxjs",
1516
],

src/cdk/observers/private/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ ng_module(
1515
),
1616
deps = [
1717
"//src:dev_mode_types",
18+
"@npm//@angular/core",
1819
"@npm//rxjs",
1920
],
2021
)

src/cdk/portal/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ ng_module(
1616
),
1717
deps = [
1818
"//src:dev_mode_types",
19+
"@npm//@angular/common",
1920
"@npm//@angular/core",
2021
],
2122
)

src/dev-app/checkbox/checkbox-demo.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import {Component, Directive} from '@angular/core';
9+
import {Component, Directive, ANIMATION_MODULE_TYPE} from '@angular/core';
1010
import {MatCheckboxModule, MAT_CHECKBOX_DEFAULT_OPTIONS} from '@angular/material/checkbox';
11-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
1211
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
1312
import {MatPseudoCheckboxModule, ThemePalette} from '@angular/material/core';
1413
import {MatInputModule} from '@angular/material/input';

src/material/badge/badge.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import {
2626
Optional,
2727
Renderer2,
2828
ViewEncapsulation,
29+
ANIMATION_MODULE_TYPE,
2930
} from '@angular/core';
3031
import {ThemePalette} from '@angular/material/core';
31-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
3232

3333
let nextId = 0;
3434

src/material/button/button.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import {
1515
NgZone,
1616
Optional,
1717
ViewEncapsulation,
18+
ANIMATION_MODULE_TYPE,
1819
} from '@angular/core';
19-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
2020

2121
import {MAT_ANCHOR_HOST, MAT_BUTTON_HOST, MatAnchorBase, MatButtonBase} from './button-base';
2222

src/material/button/fab.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import {
1818
Optional,
1919
ViewEncapsulation,
2020
booleanAttribute,
21+
ANIMATION_MODULE_TYPE,
2122
} from '@angular/core';
22-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
2323

2424
import {MatAnchor} from './button';
2525
import {MAT_ANCHOR_HOST, MAT_BUTTON_HOST, MatButtonBase} from './button-base';

src/material/button/icon-button.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import {
1515
NgZone,
1616
Optional,
1717
ViewEncapsulation,
18+
ANIMATION_MODULE_TYPE,
1819
} from '@angular/core';
19-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
2020
import {MAT_ANCHOR_HOST, MAT_BUTTON_HOST, MatAnchorBase, MatButtonBase} from './button-base';
2121

2222
/**

src/material/checkbox/checkbox.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import {
2626
SimpleChanges,
2727
ViewChild,
2828
ViewEncapsulation,
29+
ANIMATION_MODULE_TYPE,
2930
} from '@angular/core';
3031
import {
3132
AbstractControl,
@@ -36,7 +37,6 @@ import {
3637
Validator,
3738
} from '@angular/forms';
3839
import {_MatInternalFormField, MatRipple} from '@angular/material/core';
39-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
4040
import {FocusableOption} from '@angular/cdk/a11y';
4141
import {
4242
MAT_CHECKBOX_DEFAULT_OPTIONS,

src/material/chips/chip-row.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
*/
88

99
import {ENTER} from '@angular/cdk/keycodes';
10-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
1110
import {
1211
AfterViewInit,
1312
Attribute,
@@ -24,6 +23,7 @@ import {
2423
Output,
2524
ViewChild,
2625
ViewEncapsulation,
26+
ANIMATION_MODULE_TYPE,
2727
} from '@angular/core';
2828
import {DOCUMENT} from '@angular/common';
2929
import {MAT_RIPPLE_GLOBAL_OPTIONS, RippleGlobalOptions} from '@angular/material/core';

src/material/chips/chip.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
109
import {
1110
AfterViewInit,
1211
AfterContentInit,
@@ -32,6 +31,7 @@ import {
3231
inject,
3332
booleanAttribute,
3433
numberAttribute,
34+
ANIMATION_MODULE_TYPE,
3535
} from '@angular/core';
3636
import {DOCUMENT} from '@angular/common';
3737
import {

src/material/core/ripple/ripple.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ import {
1717
OnDestroy,
1818
OnInit,
1919
Optional,
20+
ANIMATION_MODULE_TYPE,
2021
} from '@angular/core';
2122
import {RippleAnimationConfig, RippleConfig, RippleRef} from './ripple-ref';
2223
import {RippleRenderer, RippleTarget} from './ripple-renderer';
23-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
2424

2525
/** Configurable options for `matRipple`. */
2626
export interface RippleGlobalOptions {

src/material/core/selection/pseudo-checkbox/pseudo-checkbox.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import {
1313
ChangeDetectionStrategy,
1414
Inject,
1515
Optional,
16+
ANIMATION_MODULE_TYPE,
1617
} from '@angular/core';
17-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
1818

1919
/**
2020
* Possible states for a pseudo checkbox.

src/material/dialog/dialog-container.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import {
2020
OnDestroy,
2121
Optional,
2222
ViewEncapsulation,
23+
ANIMATION_MODULE_TYPE,
2324
} from '@angular/core';
2425
import {MatDialogConfig} from './dialog-config';
25-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
2626
import {CdkDialogContainer} from '@angular/cdk/dialog';
2727
import {coerceNumberProperty} from '@angular/cdk/coercion';
2828
import {CdkPortalOutlet, ComponentPortal} from '@angular/cdk/portal';

src/material/expansion/expansion-panel-header.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import {
2323
OnDestroy,
2424
Optional,
2525
ViewEncapsulation,
26+
ANIMATION_MODULE_TYPE,
2627
} from '@angular/core';
27-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
2828
import {EMPTY, merge, Subscription} from 'rxjs';
2929
import {filter} from 'rxjs/operators';
3030
import {MatAccordionTogglePosition} from './accordion-base';

src/material/expansion/expansion-panel.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ import {
3333
ViewContainerRef,
3434
ViewEncapsulation,
3535
booleanAttribute,
36+
ANIMATION_MODULE_TYPE,
3637
} from '@angular/core';
37-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
3838
import {Subject} from 'rxjs';
3939
import {distinctUntilChanged, filter, startWith, take} from 'rxjs/operators';
4040
import {MatAccordionBase, MatAccordionTogglePosition, MAT_ACCORDION} from './accordion-base';

src/material/form-field/form-field.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ import {
2626
QueryList,
2727
ViewChild,
2828
ViewEncapsulation,
29+
ANIMATION_MODULE_TYPE,
2930
} from '@angular/core';
3031
import {AbstractControlDirective} from '@angular/forms';
3132
import {ThemePalette} from '@angular/material/core';
32-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
3333
import {merge, Subject} from 'rxjs';
3434
import {takeUntil} from 'rxjs/operators';
3535
import {MAT_ERROR, MatError} from './directives/error';

src/material/list/list-base.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import {
2020
OnDestroy,
2121
Optional,
2222
QueryList,
23+
ANIMATION_MODULE_TYPE,
2324
} from '@angular/core';
2425
import {
2526
MAT_RIPPLE_GLOBAL_OPTIONS,
@@ -28,7 +29,6 @@ import {
2829
RippleRenderer,
2930
RippleTarget,
3031
} from '@angular/material/core';
31-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
3232
import {Subscription, merge} from 'rxjs';
3333
import {
3434
MatListItemLine,

src/material/list/list.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import {
2020
ViewChild,
2121
ViewEncapsulation,
2222
InjectionToken,
23+
ANIMATION_MODULE_TYPE,
2324
} from '@angular/core';
2425
import {MAT_RIPPLE_GLOBAL_OPTIONS, RippleGlobalOptions} from '@angular/material/core';
25-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
2626
import {MatListBase, MatListItemBase} from './list-base';
2727
import {MatListItemLine, MatListItemMeta, MatListItemTitle} from './list-item-sections';
2828
import {coerceBooleanProperty} from '@angular/cdk/coercion';

src/material/progress-bar/progress-bar.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import {
2323
InjectionToken,
2424
inject,
2525
numberAttribute,
26+
ANIMATION_MODULE_TYPE,
2627
} from '@angular/core';
2728
import {DOCUMENT} from '@angular/common';
2829
import {ThemePalette} from '@angular/material/core';
29-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
3030

3131
/** Last animation end data. */
3232
export interface ProgressAnimationEnd {

src/material/progress-spinner/progress-spinner.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import {
1717
ViewChild,
1818
ViewEncapsulation,
1919
numberAttribute,
20+
ANIMATION_MODULE_TYPE,
2021
} from '@angular/core';
2122
import {ThemePalette} from '@angular/material/core';
22-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
2323
import {NgTemplateOutlet} from '@angular/common';
2424

2525
/** Possible mode for a progress spinner. */

src/material/radio/radio.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ import {
3131
QueryList,
3232
ViewChild,
3333
ViewEncapsulation,
34+
ANIMATION_MODULE_TYPE,
3435
} from '@angular/core';
3536
import {_MatInternalFormField, MatRipple, ThemePalette} from '@angular/material/core';
3637
import {FocusMonitor, FocusOrigin} from '@angular/cdk/a11y';
3738
import {UniqueSelectionDispatcher} from '@angular/cdk/collections';
38-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
3939
import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
4040
import {Subscription} from 'rxjs';
4141

src/material/sidenav/drawer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ import {
4242
QueryList,
4343
ViewChild,
4444
ViewEncapsulation,
45+
ANIMATION_MODULE_TYPE,
4546
} from '@angular/core';
4647
import {fromEvent, merge, Observable, Subject} from 'rxjs';
4748
import {
@@ -55,7 +56,6 @@ import {
5556
mapTo,
5657
} from 'rxjs/operators';
5758
import {matDrawerAnimations} from './drawer-animations';
58-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
5959

6060
/**
6161
* Throws an exception when two MatDrawer are matching the same position.

src/material/slide-toggle/slide-toggle.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import {
2626
SimpleChanges,
2727
ViewChild,
2828
ViewEncapsulation,
29+
ANIMATION_MODULE_TYPE,
2930
} from '@angular/core';
3031
import {
3132
AbstractControl,
@@ -35,7 +36,6 @@ import {
3536
ValidationErrors,
3637
Validator,
3738
} from '@angular/forms';
38-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
3939
import {FocusMonitor} from '@angular/cdk/a11y';
4040
import {
4141
MAT_SLIDE_TOGGLE_DEFAULT_OPTIONS,

src/material/slider/slider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ import {
2828
ViewChild,
2929
ViewChildren,
3030
ViewEncapsulation,
31+
ANIMATION_MODULE_TYPE,
3132
} from '@angular/core';
3233
import {MAT_RIPPLE_GLOBAL_OPTIONS, RippleGlobalOptions, ThemePalette} from '@angular/material/core';
33-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
3434
import {Subscription} from 'rxjs';
3535
import {
3636
_MatThumb,

src/material/tabs/paginated-tab-header.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import {
2323
booleanAttribute,
2424
numberAttribute,
2525
Output,
26+
ANIMATION_MODULE_TYPE,
2627
} from '@angular/core';
2728
import {Direction, Directionality} from '@angular/cdk/bidi';
2829
import {ViewportRuler} from '@angular/cdk/scrolling';
@@ -40,7 +41,6 @@ import {
4041
} from 'rxjs';
4142
import {take, switchMap, startWith, skip, takeUntil, filter} from 'rxjs/operators';
4243
import {Platform, normalizePassiveListenerOptions} from '@angular/cdk/platform';
43-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
4444

4545
/** Config used to bind passive event listeners */
4646
const passiveEventListenerOptions = normalizePassiveListenerOptions({

src/material/tabs/tab-group.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import {
2626
booleanAttribute,
2727
inject,
2828
numberAttribute,
29+
ANIMATION_MODULE_TYPE,
2930
} from '@angular/core';
30-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
3131
import {MAT_TAB_GROUP, MatTab} from './tab';
3232
import {MatTabHeader} from './tab-header';
3333
import {ThemePalette, MatRipple} from '@angular/material/core';

src/material/tabs/tab-header.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ import {
2424
ViewChild,
2525
ViewEncapsulation,
2626
booleanAttribute,
27+
ANIMATION_MODULE_TYPE,
2728
} from '@angular/core';
2829
import {ViewportRuler} from '@angular/cdk/scrolling';
2930
import {Platform} from '@angular/cdk/platform';
3031
import {Directionality} from '@angular/cdk/bidi';
31-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
3232
import {MatTabLabelWrapper} from './tab-label-wrapper';
3333
import {MatInkBar} from './ink-bar';
3434
import {MatPaginatedTabHeader} from './paginated-tab-header';

src/material/tabs/tab-nav-bar/tab-nav-bar.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import {
2626
QueryList,
2727
ViewChild,
2828
ViewEncapsulation,
29+
ANIMATION_MODULE_TYPE,
2930
} from '@angular/core';
30-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
3131
import {
3232
MAT_RIPPLE_GLOBAL_OPTIONS,
3333
MatRipple,

src/material/tooltip/tooltip.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ import {
3030
ViewContainerRef,
3131
ViewEncapsulation,
3232
inject,
33+
ANIMATION_MODULE_TYPE,
3334
} from '@angular/core';
3435
import {DOCUMENT, NgClass} from '@angular/common';
3536
import {normalizePassiveListenerOptions, Platform} from '@angular/cdk/platform';
36-
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
3737
import {AriaDescriber, FocusMonitor} from '@angular/cdk/a11y';
3838
import {Directionality} from '@angular/cdk/bidi';
3939
import {

tools/defaults.bzl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ def ng_module(
143143
local_deps = [
144144
# Add tslib because we use import helpers for all public packages.
145145
"@npm//tslib",
146-
"@npm//@angular/platform-browser",
147146
]
148147

149148
# Append given deps only if they're not in the default set of deps

0 commit comments

Comments
 (0)