Skip to content

Commit

Permalink
fix(multiple): import ANIMATION_MODULE_TYPE from core (#28459)
Browse files Browse the repository at this point in the history
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.

(cherry picked from commit 40571e8)
  • Loading branch information
crisbeto committed Jan 22, 2024
1 parent 739b841 commit 4c83ea8
Show file tree
Hide file tree
Showing 31 changed files with 30 additions and 29 deletions.
1 change: 1 addition & 0 deletions src/cdk/clipboard/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ ng_module(
),
assets = glob(["**/*.html"]),
deps = [
"@npm//@angular/common",
"@npm//@angular/core",
"@npm//rxjs",
],
Expand Down
1 change: 1 addition & 0 deletions src/cdk/observers/private/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ ng_module(
),
deps = [
"//src:dev_mode_types",
"@npm//@angular/core",
"@npm//rxjs",
],
)
Expand Down
1 change: 1 addition & 0 deletions src/cdk/portal/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ ng_module(
),
deps = [
"//src:dev_mode_types",
"@npm//@angular/common",
"@npm//@angular/core",
],
)
Expand Down
3 changes: 1 addition & 2 deletions src/dev-app/checkbox/checkbox-demo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
* found in the LICENSE file at https://angular.io/license
*/

import {Component, Directive} from '@angular/core';
import {Component, Directive, ANIMATION_MODULE_TYPE} from '@angular/core';
import {MatCheckboxModule, MAT_CHECKBOX_DEFAULT_OPTIONS} from '@angular/material/checkbox';
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {MatPseudoCheckboxModule, ThemePalette} from '@angular/material/core';
import {MatInputModule} from '@angular/material/input';
Expand Down
2 changes: 1 addition & 1 deletion src/material/badge/badge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import {
Optional,
Renderer2,
ViewEncapsulation,
ANIMATION_MODULE_TYPE,
} from '@angular/core';
import {ThemePalette} from '@angular/material/core';
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';

let nextId = 0;

Expand Down
2 changes: 1 addition & 1 deletion src/material/button/button.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import {
NgZone,
Optional,
ViewEncapsulation,
ANIMATION_MODULE_TYPE,
} from '@angular/core';
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';

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

Expand Down
2 changes: 1 addition & 1 deletion src/material/button/fab.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import {
Optional,
ViewEncapsulation,
booleanAttribute,
ANIMATION_MODULE_TYPE,
} from '@angular/core';
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';

import {MatAnchor} from './button';
import {MAT_ANCHOR_HOST, MAT_BUTTON_HOST, MatButtonBase} from './button-base';
Expand Down
2 changes: 1 addition & 1 deletion src/material/button/icon-button.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import {
NgZone,
Optional,
ViewEncapsulation,
ANIMATION_MODULE_TYPE,
} from '@angular/core';
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
import {MAT_ANCHOR_HOST, MAT_BUTTON_HOST, MatAnchorBase, MatButtonBase} from './button-base';

/**
Expand Down
2 changes: 1 addition & 1 deletion src/material/checkbox/checkbox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import {
SimpleChanges,
ViewChild,
ViewEncapsulation,
ANIMATION_MODULE_TYPE,
} from '@angular/core';
import {
AbstractControl,
Expand All @@ -36,7 +37,6 @@ import {
Validator,
} from '@angular/forms';
import {_MatInternalFormField, MatRipple} from '@angular/material/core';
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
import {FocusableOption} from '@angular/cdk/a11y';
import {
MAT_CHECKBOX_DEFAULT_OPTIONS,
Expand Down
2 changes: 1 addition & 1 deletion src/material/chips/chip-row.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
*/

import {ENTER} from '@angular/cdk/keycodes';
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
import {
AfterViewInit,
Attribute,
Expand All @@ -24,6 +23,7 @@ import {
Output,
ViewChild,
ViewEncapsulation,
ANIMATION_MODULE_TYPE,
} from '@angular/core';
import {DOCUMENT} from '@angular/common';
import {MAT_RIPPLE_GLOBAL_OPTIONS, RippleGlobalOptions} from '@angular/material/core';
Expand Down
2 changes: 1 addition & 1 deletion src/material/chips/chip.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
* found in the LICENSE file at https://angular.io/license
*/

import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
import {
AfterViewInit,
AfterContentInit,
Expand All @@ -32,6 +31,7 @@ import {
inject,
booleanAttribute,
numberAttribute,
ANIMATION_MODULE_TYPE,
} from '@angular/core';
import {DOCUMENT} from '@angular/common';
import {
Expand Down
2 changes: 1 addition & 1 deletion src/material/core/ripple/ripple.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import {
OnDestroy,
OnInit,
Optional,
ANIMATION_MODULE_TYPE,
} from '@angular/core';
import {RippleAnimationConfig, RippleConfig, RippleRef} from './ripple-ref';
import {RippleRenderer, RippleTarget} from './ripple-renderer';
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';

/** Configurable options for `matRipple`. */
export interface RippleGlobalOptions {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import {
ChangeDetectionStrategy,
Inject,
Optional,
ANIMATION_MODULE_TYPE,
} from '@angular/core';
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';

/**
* Possible states for a pseudo checkbox.
Expand Down
2 changes: 1 addition & 1 deletion src/material/dialog/dialog-container.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import {
OnDestroy,
Optional,
ViewEncapsulation,
ANIMATION_MODULE_TYPE,
} from '@angular/core';
import {MatDialogConfig} from './dialog-config';
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
import {CdkDialogContainer} from '@angular/cdk/dialog';
import {coerceNumberProperty} from '@angular/cdk/coercion';
import {CdkPortalOutlet, ComponentPortal} from '@angular/cdk/portal';
Expand Down
2 changes: 1 addition & 1 deletion src/material/expansion/expansion-panel-header.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import {
OnDestroy,
Optional,
ViewEncapsulation,
ANIMATION_MODULE_TYPE,
} from '@angular/core';
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
import {EMPTY, merge, Subscription} from 'rxjs';
import {filter} from 'rxjs/operators';
import {MatAccordionTogglePosition} from './accordion-base';
Expand Down
2 changes: 1 addition & 1 deletion src/material/expansion/expansion-panel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import {
ViewContainerRef,
ViewEncapsulation,
booleanAttribute,
ANIMATION_MODULE_TYPE,
} from '@angular/core';
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
import {Subject} from 'rxjs';
import {distinctUntilChanged, filter, startWith, take} from 'rxjs/operators';
import {MatAccordionBase, MatAccordionTogglePosition, MAT_ACCORDION} from './accordion-base';
Expand Down
2 changes: 1 addition & 1 deletion src/material/form-field/form-field.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ import {
QueryList,
ViewChild,
ViewEncapsulation,
ANIMATION_MODULE_TYPE,
} from '@angular/core';
import {AbstractControlDirective} from '@angular/forms';
import {ThemePalette} from '@angular/material/core';
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
import {merge, Subject} from 'rxjs';
import {takeUntil} from 'rxjs/operators';
import {MAT_ERROR, MatError} from './directives/error';
Expand Down
2 changes: 1 addition & 1 deletion src/material/list/list-base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
OnDestroy,
Optional,
QueryList,
ANIMATION_MODULE_TYPE,
} from '@angular/core';
import {
MAT_RIPPLE_GLOBAL_OPTIONS,
Expand All @@ -28,7 +29,6 @@ import {
RippleRenderer,
RippleTarget,
} from '@angular/material/core';
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
import {Subscription, merge} from 'rxjs';
import {
MatListItemLine,
Expand Down
2 changes: 1 addition & 1 deletion src/material/list/list.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import {
ViewChild,
ViewEncapsulation,
InjectionToken,
ANIMATION_MODULE_TYPE,
} from '@angular/core';
import {MAT_RIPPLE_GLOBAL_OPTIONS, RippleGlobalOptions} from '@angular/material/core';
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
import {MatListBase, MatListItemBase} from './list-base';
import {MatListItemLine, MatListItemMeta, MatListItemTitle} from './list-item-sections';
import {coerceBooleanProperty} from '@angular/cdk/coercion';
Expand Down
2 changes: 1 addition & 1 deletion src/material/progress-bar/progress-bar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import {
InjectionToken,
inject,
numberAttribute,
ANIMATION_MODULE_TYPE,
} from '@angular/core';
import {DOCUMENT} from '@angular/common';
import {ThemePalette} from '@angular/material/core';
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';

/** Last animation end data. */
export interface ProgressAnimationEnd {
Expand Down
2 changes: 1 addition & 1 deletion src/material/progress-spinner/progress-spinner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import {
ViewChild,
ViewEncapsulation,
numberAttribute,
ANIMATION_MODULE_TYPE,
} from '@angular/core';
import {ThemePalette} from '@angular/material/core';
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
import {NgTemplateOutlet} from '@angular/common';

/** Possible mode for a progress spinner. */
Expand Down
2 changes: 1 addition & 1 deletion src/material/radio/radio.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ import {
QueryList,
ViewChild,
ViewEncapsulation,
ANIMATION_MODULE_TYPE,
} from '@angular/core';
import {_MatInternalFormField, MatRipple, ThemePalette} from '@angular/material/core';
import {FocusMonitor, FocusOrigin} from '@angular/cdk/a11y';
import {UniqueSelectionDispatcher} from '@angular/cdk/collections';
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
import {Subscription} from 'rxjs';

Expand Down
2 changes: 1 addition & 1 deletion src/material/sidenav/drawer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import {
QueryList,
ViewChild,
ViewEncapsulation,
ANIMATION_MODULE_TYPE,
} from '@angular/core';
import {fromEvent, merge, Observable, Subject} from 'rxjs';
import {
Expand All @@ -55,7 +56,6 @@ import {
mapTo,
} from 'rxjs/operators';
import {matDrawerAnimations} from './drawer-animations';
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';

/**
* Throws an exception when two MatDrawer are matching the same position.
Expand Down
2 changes: 1 addition & 1 deletion src/material/slide-toggle/slide-toggle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import {
SimpleChanges,
ViewChild,
ViewEncapsulation,
ANIMATION_MODULE_TYPE,
} from '@angular/core';
import {
AbstractControl,
Expand All @@ -35,7 +36,6 @@ import {
ValidationErrors,
Validator,
} from '@angular/forms';
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
import {FocusMonitor} from '@angular/cdk/a11y';
import {
MAT_SLIDE_TOGGLE_DEFAULT_OPTIONS,
Expand Down
2 changes: 1 addition & 1 deletion src/material/slider/slider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import {
ViewChild,
ViewChildren,
ViewEncapsulation,
ANIMATION_MODULE_TYPE,
} from '@angular/core';
import {MAT_RIPPLE_GLOBAL_OPTIONS, RippleGlobalOptions, ThemePalette} from '@angular/material/core';
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
import {Subscription} from 'rxjs';
import {
_MatThumb,
Expand Down
2 changes: 1 addition & 1 deletion src/material/tabs/paginated-tab-header.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import {
booleanAttribute,
numberAttribute,
Output,
ANIMATION_MODULE_TYPE,
} from '@angular/core';
import {Direction, Directionality} from '@angular/cdk/bidi';
import {ViewportRuler} from '@angular/cdk/scrolling';
Expand All @@ -40,7 +41,6 @@ import {
} from 'rxjs';
import {take, switchMap, startWith, skip, takeUntil, filter} from 'rxjs/operators';
import {Platform, normalizePassiveListenerOptions} from '@angular/cdk/platform';
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';

/** Config used to bind passive event listeners */
const passiveEventListenerOptions = normalizePassiveListenerOptions({
Expand Down
2 changes: 1 addition & 1 deletion src/material/tabs/tab-group.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import {
booleanAttribute,
inject,
numberAttribute,
ANIMATION_MODULE_TYPE,
} from '@angular/core';
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
import {MAT_TAB_GROUP, MatTab} from './tab';
import {MatTabHeader} from './tab-header';
import {ThemePalette, MatRipple} from '@angular/material/core';
Expand Down
2 changes: 1 addition & 1 deletion src/material/tabs/tab-header.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ import {
ViewChild,
ViewEncapsulation,
booleanAttribute,
ANIMATION_MODULE_TYPE,
} from '@angular/core';
import {ViewportRuler} from '@angular/cdk/scrolling';
import {Platform} from '@angular/cdk/platform';
import {Directionality} from '@angular/cdk/bidi';
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
import {MatTabLabelWrapper} from './tab-label-wrapper';
import {MatInkBar} from './ink-bar';
import {MatPaginatedTabHeader} from './paginated-tab-header';
Expand Down
2 changes: 1 addition & 1 deletion src/material/tabs/tab-nav-bar/tab-nav-bar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import {
QueryList,
ViewChild,
ViewEncapsulation,
ANIMATION_MODULE_TYPE,
} from '@angular/core';
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
import {
MAT_RIPPLE_GLOBAL_OPTIONS,
MatRipple,
Expand Down
2 changes: 1 addition & 1 deletion src/material/tooltip/tooltip.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ import {
ViewContainerRef,
ViewEncapsulation,
inject,
ANIMATION_MODULE_TYPE,
} from '@angular/core';
import {DOCUMENT, NgClass} from '@angular/common';
import {normalizePassiveListenerOptions, Platform} from '@angular/cdk/platform';
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
import {AriaDescriber, FocusMonitor} from '@angular/cdk/a11y';
import {Directionality} from '@angular/cdk/bidi';
import {
Expand Down
1 change: 0 additions & 1 deletion tools/defaults.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ def ng_module(
local_deps = [
# Add tslib because we use import helpers for all public packages.
"@npm//tslib",
"@npm//@angular/platform-browser",
]

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

0 comments on commit 4c83ea8

Please sign in to comment.