Skip to content

Commit c5c69d2

Browse files
authored
switch progress-spinner implementation to use MDC (#25324)
* feat(material/progress-spinner): 1. Move src/material/progress-spinner to src/material/legacy-progress-spinner * feat(material/progress-spinner): 2. rename ts symbols in src/material/legacy-progress-spinner * feat(material/progress-spinner): 3. rename sass mixins in src/material/legacy-progress-spinner * feat(material/progress-spinner): 4. move src/material-experimental/mdc-progress-spinner to src/material/progress-spinner * feat(material/progress-spinner): 5. update the all-theme mixins * fix(material/progress-spinner): fix lint errors * fix(material/progress-spinner): fix build failures after rebase * fixup! fix(material/progress-spinner): fix build failures after rebase * fixup! fix(material/progress-spinner): fix build failures after rebase * fixup! fix(material/progress-spinner): fix build failures after rebase * fixup! fix(material/progress-spinner): fix build failures after rebase * fixup! fix(material/progress-spinner): fix build failures after rebase * fixup! fix(material/progress-spinner): fix build failures after rebase
1 parent f9113b9 commit c5c69d2

File tree

92 files changed

+1584
-1446
lines changed

Some content is hidden

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

92 files changed

+1584
-1446
lines changed

.github/CODEOWNERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
/src/material/prebuilt-themes/** @andrewseguin
2323
/src/material/legacy-prebuilt-themes/** @andrewseguin
2424
/src/material/legacy-progress-bar/** @andrewseguin @crisbeto
25-
/src/material/progress-spinner/** @andrewseguin @crisbeto
25+
/src/material/legacy-progress-spinner/** @andrewseguin @crisbeto
2626
/src/material/legacy-radio/** @andrewseguin @devversion
2727
/src/material/schematics/** @devversion @andrewseguin
2828
/src/material/legacy-select/** @crisbeto
@@ -123,7 +123,7 @@
123123
/src/material/menu/** @crisbeto
124124
/src/material/select/** @crisbeto
125125
/src/material/paginator/** @crisbeto
126-
/src/material-experimental/mdc-progress-spinner/** @andrewseguin
126+
/src/material/progress-spinner/** @andrewseguin
127127
/src/material/progress-bar/** @andrewseguin
128128
/src/material/radio/** @mmalerba
129129
/src/material/snack-bar/** @andrewseguin
@@ -337,7 +337,7 @@
337337
/tools/public_api_guard/material/menu** @crisbeto
338338
/tools/public_api_guard/material/legacy-paginator** @andrewseguin
339339
/tools/public_api_guard/material/legacy-progress-bar** @andrewseguin @crisbeto
340-
/tools/public_api_guard/material/progress-spinner**@andrewseguin @crisbeto
340+
/tools/public_api_guard/material/legacy-progress-spinner**@andrewseguin @crisbeto
341341
/tools/public_api_guard/material/radio** @andrewseguin @devversion
342342
/tools/public_api_guard/material/legacy-radio** @andrewseguin @devversion
343343
/tools/public_api_guard/material/legacy-select** @crisbeto

.ng-dev/commit-message.mts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export const commitMessage: CommitMessageConfig = {
4949
'material/input',
5050
'material/paginator',
5151
'material/progress-bar',
52-
'material-experimental/mdc-progress-spinner',
52+
'material/progress-spinner',
5353
'material/slide-toggle',
5454
'material/snack-bar',
5555
'material/table',
@@ -90,7 +90,7 @@ export const commitMessage: CommitMessageConfig = {
9090
'material/prebuilt-themes',
9191
'material/legacy-prebuilt-themes',
9292
'material/legacy-progress-bar',
93-
'material/progress-spinner',
93+
'material/legacy-progress-spinner',
9494
'material/radio',
9595
'material/legacy-radio',
9696
'material/schematics',

goldens/tsec-exemption.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"../src/cdk/a11y/aria-describer/aria-reference.ts",
66
"../src/material/checkbox/checkbox.ts",
77
"../src/material/list/interactive-list-base.ts",
8-
"../src/material-experimental/mdc-progress-spinner/progress-spinner.ts",
8+
"../src/material/progress-spinner/progress-spinner.ts",
99
"../src/material/slide-toggle/slide-toggle.ts",
1010
"../src/material/icon/icon-registry.ts",
1111
"../src/material/icon/icon.ts"

integration/mdc-migration/golden/src/app/app.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {MatListModule} from '@angular/material-experimental/mdc-list';
1616
import {MatMenuModule} from '@angular/material-experimental/mdc-menu';
1717
import {MatPaginatorModule} from '@angular/material/paginator';
1818
import {MatProgressBarModule} from '@angular/material-experimental/mdc-progress-bar';
19-
import {MatProgressSpinnerModule} from '@angular/material-experimental/mdc-progress-spinner';
19+
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
2020
import {MatRadioModule} from '@angular/material-experimental/mdc-radio';
2121
import {MatSelectModule} from '@angular/material-experimental/mdc-select';
2222
import {MatSlideToggleModule} from '@angular/material/slide-toggle';

integration/mdc-migration/golden/src/app/components/progress-spinner/progress-spinner.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {ComponentFixture, TestBed} from '@angular/core/testing';
22
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
3-
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
3+
import {MatProgressSpinnerModule} from '@angular/material/legacy-progress-spinner';
44
import {ProgressSpinnerComponent} from './progress-spinner.component';
55

66
describe('ProgressSpinnerComponent', () => {

integration/mdc-migration/sample-project/src/app/app.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {MatListModule} from '@angular/material/list';
1616
import {MatMenuModule} from '@angular/material/menu';
1717
import {MatPaginatorModule} from '@angular/material/paginator';
1818
import {MatProgressBarModule} from '@angular/material/progress-bar';
19-
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
19+
import {MatProgressSpinnerModule} from '@angular/material/legacy-progress-spinner';
2020
import {MatRadioModule} from '@angular/material/radio';
2121
import {MatSelectModule} from '@angular/material/select';
2222
import {MatSlideToggleModule} from '@angular/material/legacy-slide-toggle';

integration/mdc-migration/sample-project/src/app/components/progress-spinner/progress-spinner.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {ComponentFixture, TestBed} from '@angular/core/testing';
22
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
3-
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
3+
import {MatProgressSpinnerModule} from '@angular/material/legacy-progress-spinner';
44
import {ProgressSpinnerComponent} from './progress-spinner.component';
55

66
describe('ProgressSpinnerComponent', () => {

src/components-examples/material-experimental/mdc-table/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ ng_module(
2424
"//src/material/legacy-checkbox",
2525
"//src/material/legacy-input",
2626
"//src/material/legacy-paginator",
27+
"//src/material/legacy-progress-spinner",
2728
"//src/material/legacy-table",
2829
"//src/material/legacy-table/testing",
29-
"//src/material/progress-spinner",
3030
"//src/material/sort",
3131
"@npm//@angular/platform-browser",
3232
"@npm//@angular/platform-browser-dynamic",

src/components-examples/material-experimental/mdc-table/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {MatLegacyCheckboxModule} from '@angular/material/legacy-checkbox';
77
import {MatIconModule} from '@angular/material/icon';
88
import {MatLegacyInputModule} from '@angular/material/legacy-input';
99
import {MatLegacyPaginatorModule} from '@angular/material/legacy-paginator';
10-
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
10+
import {MatLegacyProgressSpinnerModule} from '@angular/material/legacy-progress-spinner';
1111
import {MatSortModule} from '@angular/material/sort';
1212
import {MatTableModule} from '@angular/material/table';
1313
import {DragDropModule} from '@angular/cdk/drag-drop';
@@ -124,7 +124,7 @@ const EXAMPLES = [
124124
MatIconModule,
125125
MatLegacyInputModule,
126126
MatLegacyPaginatorModule,
127-
MatProgressSpinnerModule,
127+
MatLegacyProgressSpinnerModule,
128128
MatRippleModule,
129129
MatSortModule,
130130
MatTableModule,

src/components-examples/material/progress-spinner/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ ng_module(
1616
"//src/cdk/testing",
1717
"//src/cdk/testing/testbed",
1818
"//src/material/legacy-card",
19+
"//src/material/legacy-progress-spinner",
20+
"//src/material/legacy-progress-spinner/testing",
1921
"//src/material/legacy-radio",
2022
"//src/material/legacy-slider",
21-
"//src/material/progress-spinner",
22-
"//src/material/progress-spinner/testing",
2323
"@npm//@angular/forms",
2424
"@npm//@angular/platform-browser",
2525
"@npm//@angular/platform-browser-dynamic",
@@ -43,8 +43,8 @@ ng_test_library(
4343
":progress-spinner",
4444
"//src/cdk/testing",
4545
"//src/cdk/testing/testbed",
46-
"//src/material/progress-spinner",
47-
"//src/material/progress-spinner/testing",
46+
"//src/material/legacy-progress-spinner",
47+
"//src/material/legacy-progress-spinner/testing",
4848
"@npm//@angular/platform-browser-dynamic",
4949
],
5050
)

src/components-examples/material/progress-spinner/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {CommonModule} from '@angular/common';
22
import {NgModule} from '@angular/core';
33
import {FormsModule} from '@angular/forms';
44
import {MatLegacyCardModule} from '@angular/material/legacy-card';
5-
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
5+
import {MatLegacyProgressSpinnerModule} from '@angular/material/legacy-progress-spinner';
66
import {MatLegacyRadioModule} from '@angular/material/legacy-radio';
77
import {MatLegacySliderModule} from '@angular/material/legacy-slider';
88
import {ProgressSpinnerConfigurableExample} from './progress-spinner-configurable/progress-spinner-configurable-example';
@@ -25,7 +25,7 @@ const EXAMPLES = [
2525
imports: [
2626
CommonModule,
2727
MatLegacyCardModule,
28-
MatProgressSpinnerModule,
28+
MatLegacyProgressSpinnerModule,
2929
MatLegacyRadioModule,
3030
MatLegacySliderModule,
3131
FormsModule,

src/components-examples/material/progress-spinner/progress-spinner-configurable/progress-spinner-configurable-example.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Component} from '@angular/core';
22
import {ThemePalette} from '@angular/material/core';
3-
import {ProgressSpinnerMode} from '@angular/material/progress-spinner';
3+
import {LegacyProgressSpinnerMode} from '@angular/material/legacy-progress-spinner';
44

55
/**
66
* @title Configurable progress spinner
@@ -12,6 +12,6 @@ import {ProgressSpinnerMode} from '@angular/material/progress-spinner';
1212
})
1313
export class ProgressSpinnerConfigurableExample {
1414
color: ThemePalette = 'primary';
15-
mode: ProgressSpinnerMode = 'determinate';
15+
mode: LegacyProgressSpinnerMode = 'determinate';
1616
value = 50;
1717
}

src/components-examples/material/progress-spinner/progress-spinner-harness/progress-spinner-harness-example.spec.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import {ComponentFixture, TestBed} from '@angular/core/testing';
22
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
3-
import {MatProgressSpinnerHarness} from '@angular/material/progress-spinner/testing';
3+
import {MatLegacyProgressSpinnerHarness} from '@angular/material/legacy-progress-spinner/testing';
44
import {HarnessLoader} from '@angular/cdk/testing';
5-
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
5+
import {MatLegacyProgressSpinnerModule} from '@angular/material/legacy-progress-spinner';
66
import {ProgressSpinnerHarnessExample} from './progress-spinner-harness-example';
77

88
describe('ProgressSpinnerHarnessExample', () => {
@@ -11,7 +11,7 @@ describe('ProgressSpinnerHarnessExample', () => {
1111

1212
beforeEach(async () => {
1313
await TestBed.configureTestingModule({
14-
imports: [MatProgressSpinnerModule],
14+
imports: [MatLegacyProgressSpinnerModule],
1515
declarations: [ProgressSpinnerHarnessExample],
1616
}).compileComponents();
1717
fixture = TestBed.createComponent(ProgressSpinnerHarnessExample);
@@ -20,22 +20,22 @@ describe('ProgressSpinnerHarnessExample', () => {
2020
});
2121

2222
it('should load all progress spinner harnesses', async () => {
23-
const progressSpinners = await loader.getAllHarnesses(MatProgressSpinnerHarness);
23+
const progressSpinners = await loader.getAllHarnesses(MatLegacyProgressSpinnerHarness);
2424
expect(progressSpinners.length).toBe(2);
2525
});
2626

2727
it('should get the value', async () => {
2828
fixture.componentInstance.value = 50;
2929
const [determinate, impliedIndeterminate] = await loader.getAllHarnesses(
30-
MatProgressSpinnerHarness,
30+
MatLegacyProgressSpinnerHarness,
3131
);
3232
expect(await determinate.getValue()).toBe(50);
3333
expect(await impliedIndeterminate.getValue()).toBe(null);
3434
});
3535

3636
it('should get the mode', async () => {
3737
const [determinate, impliedIndeterminate] = await loader.getAllHarnesses(
38-
MatProgressSpinnerHarness,
38+
MatLegacyProgressSpinnerHarness,
3939
);
4040
expect(await determinate.getMode()).toBe('determinate');
4141
expect(await impliedIndeterminate.getMode()).toBe('indeterminate');

src/components-examples/material/table/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ ng_module(
2424
"//src/material/legacy-checkbox",
2525
"//src/material/legacy-input",
2626
"//src/material/legacy-paginator",
27+
"//src/material/legacy-progress-spinner",
2728
"//src/material/legacy-table",
2829
"//src/material/legacy-table/testing",
29-
"//src/material/progress-spinner",
3030
"//src/material/sort",
3131
"@npm//@angular/platform-browser",
3232
"@npm//@angular/platform-browser-dynamic",

src/components-examples/material/table/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {MatLegacyCheckboxModule} from '@angular/material/legacy-checkbox';
77
import {MatIconModule} from '@angular/material/icon';
88
import {MatLegacyInputModule} from '@angular/material/legacy-input';
99
import {MatLegacyPaginatorModule} from '@angular/material/legacy-paginator';
10-
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
10+
import {MatLegacyProgressSpinnerModule} from '@angular/material/legacy-progress-spinner';
1111
import {MatSortModule} from '@angular/material/sort';
1212
import {MatLegacyTableModule} from '@angular/material/legacy-table';
1313
import {DragDropModule} from '@angular/cdk/drag-drop';
@@ -121,7 +121,7 @@ const EXAMPLES = [
121121
MatIconModule,
122122
MatLegacyInputModule,
123123
MatLegacyPaginatorModule,
124-
MatProgressSpinnerModule,
124+
MatLegacyProgressSpinnerModule,
125125
MatRippleModule,
126126
MatSortModule,
127127
MatLegacyTableModule,

src/dev-app/mdc-progress-spinner/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ ng_module(
1010
":mdc_progress_spinner_demo_scss",
1111
],
1212
deps = [
13-
"//src/material-experimental/mdc-progress-spinner",
1413
"//src/material/button",
1514
"//src/material/button-toggle",
1615
"//src/material/checkbox",
16+
"//src/material/progress-spinner",
1717
"@npm//@angular/forms",
1818
],
1919
)

src/dev-app/mdc-progress-spinner/mdc-progress-spinner-demo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import {Component} from '@angular/core';
1010
import {ThemePalette} from '@angular/material/core';
11-
import {MatProgressSpinnerModule} from '@angular/material-experimental/mdc-progress-spinner';
11+
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
1212
import {MatButtonModule} from '@angular/material/button';
1313
import {MatCheckboxModule} from '@angular/material/checkbox';
1414
import {MatButtonToggleModule} from '@angular/material/button-toggle';

src/dev-app/progress-spinner/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ng_module(
1313
"//src/material/button-toggle",
1414
"//src/material/legacy-button",
1515
"//src/material/legacy-checkbox",
16-
"//src/material/progress-spinner",
16+
"//src/material/legacy-progress-spinner",
1717
"@npm//@angular/forms",
1818
],
1919
)

src/dev-app/progress-spinner/progress-spinner-demo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {FormsModule} from '@angular/forms';
1212
import {MatLegacyButtonModule} from '@angular/material/legacy-button';
1313
import {MatButtonToggleModule} from '@angular/material/button-toggle';
1414
import {MatLegacyCheckboxModule} from '@angular/material/legacy-checkbox';
15-
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
15+
import {MatLegacyProgressSpinnerModule} from '@angular/material/legacy-progress-spinner';
1616

1717
@Component({
1818
selector: 'progress-spinner-demo',
@@ -24,7 +24,7 @@ import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
2424
MatLegacyButtonModule,
2525
MatButtonToggleModule,
2626
MatLegacyCheckboxModule,
27-
MatProgressSpinnerModule,
27+
MatLegacyProgressSpinnerModule,
2828
],
2929
})
3030
export class ProgressSpinnerDemo {

src/e2e-app/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ ng_module(
4242
"//src/cdk/testing/tests:test_components",
4343
"//src/components-examples/material-experimental/mdc-card",
4444
"//src/components-examples/private",
45-
"//src/material-experimental/mdc-progress-spinner",
4645
"//src/material/button",
4746
"//src/material/card",
4847
"//src/material/checkbox",
@@ -60,6 +59,7 @@ ng_module(
6059
"//src/material/legacy-list",
6160
"//src/material/legacy-menu",
6261
"//src/material/legacy-progress-bar",
62+
"//src/material/legacy-progress-spinner",
6363
"//src/material/legacy-radio",
6464
"//src/material/legacy-slide-toggle",
6565
"//src/material/legacy-tabs",

src/e2e-app/mdc-progress-spinner/mdc-progress-spinner-module.ts

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

99
import {NgModule} from '@angular/core';
10-
import {MatProgressSpinnerModule} from '@angular/material-experimental/mdc-progress-spinner';
10+
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
1111
import {MdcProgressSpinnerE2e} from './mdc-progress-spinner-e2e';
1212

1313
@NgModule({

src/e2e-app/progress-spinner/progress-spinner-e2e-module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
*/
88

99
import {NgModule} from '@angular/core';
10-
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
10+
import {MatLegacyProgressSpinnerModule} from '@angular/material/legacy-progress-spinner';
1111
import {ProgressSpinnerE2E} from './progress-spinner-e2e';
1212

1313
@NgModule({
14-
imports: [MatProgressSpinnerModule],
14+
imports: [MatLegacyProgressSpinnerModule],
1515
declarations: [ProgressSpinnerE2E],
1616
})
1717
export class ProgressSpinnerE2eModule {}

src/material-experimental/_index.scss

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,5 @@
1717
// MDC-related themes
1818
@forward './mdc-core/core-theme' as mdc-core-* show mdc-core-theme, mdc-core-color,
1919
mdc-core-density, mdc-core-typography;
20-
@forward './mdc-progress-spinner/progress-spinner-theme' as mdc-progress-spinner-* show
21-
mdc-progress-spinner-color, mdc-progress-spinner-typography, mdc-progress-spinner-density,
22-
mdc-progress-spinner-theme;
2320

2421
// Additional public APIs for individual components

src/material-experimental/config.bzl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
entryPoints = [
22
"column-resize",
33
"mdc-core",
4-
"mdc-progress-spinner",
5-
"mdc-progress-spinner/testing",
64
"menubar",
75
"popover-edit",
86
"selection",

src/material-experimental/mdc-core/color/_all-color.import.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@forward '../../../material/core/theming/theming.import';
22
@forward '../../../material/core/core.import';
33
@forward '../core-theme.import';
4-
@forward '../../mdc-progress-spinner/progress-spinner-theme' as mat-mdc-progress-spinner-*;
54
@forward '../theming/all-theme';
65
@forward 'all-color' hide all-mdc-component-colors;
76

src/material-experimental/mdc-core/density/_all-density.import.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@forward '../../../material/core/theming/theming.import';
22
@forward '../../../material/core/core.import';
33
@forward '../core-theme.import';
4-
@forward '../../mdc-progress-spinner/progress-spinner-theme' as mat-mdc-progress-spinner-*;
54
@forward '../theming/all-theme';
65
@forward 'all-density' show all-mdc-component-densities;
76

src/material-experimental/mdc-core/theming/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ sass_library(
2121
deps = [
2222
"//src/material:sass_lib",
2323
"//src/material-experimental/mdc-core:mdc_core_scss_lib",
24-
"//src/material-experimental/mdc-progress-spinner:mdc_progress_spinner_scss_lib",
2524
"//src/material/autocomplete:autocomplete_scss_lib",
2625
"//src/material/button:button_scss_lib",
2726
"//src/material/card:card_scss_lib",
@@ -31,6 +30,7 @@ sass_library(
3130
"//src/material/form-field:form_field_scss_lib",
3231
"//src/material/input:input_scss_lib",
3332
"//src/material/progress-bar:progress_bar_scss_lib",
33+
"//src/material/progress-spinner:progress_spinner_scss_lib",
3434
"//src/material/slide-toggle:slide_toggle_scss_lib",
3535
"//src/material/slider:slider_scss_lib",
3636
"//src/material/snack-bar:snack_bar_scss_lib",
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
@forward '../../../material/core/theming/theming.import';
22
@forward '../../../material/core/core.import';
33
@forward '../core-theme.import';
4-
@forward '../../mdc-progress-spinner/progress-spinner-theme' as mat-mdc-progress-spinner-*;
54
@forward 'all-theme' hide all-mdc-component-themes;;
65

76
@import '../core-theme';
8-
@import '../../mdc-progress-spinner/progress-spinner-theme';
97
@import '../../../material/core/core';
108
@import '../../../material/core/core-theme';
119
@import '../../../material/core/theming/theming';

0 commit comments

Comments
 (0)