Skip to content

Commit 15288a9

Browse files
committed
fix(material/schematics): update and handle import statements for the MDC migration
1 parent abb177b commit 15288a9

File tree

7 files changed

+400
-127
lines changed

7 files changed

+400
-127
lines changed

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,27 @@ import {BrowserModule} from '@angular/platform-browser';
44
import {AppComponent} from './app.component';
55
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
66
import {ReactiveFormsModule} from '@angular/forms';
7-
import {MatAutocompleteModule} from '@angular/material-experimental/mdc-autocomplete';
8-
import {MatButtonModule} from '@angular/material-experimental/mdc-button';
9-
import {MatCardModule} from '@angular/material-experimental/mdc-card';
7+
import {MatAutocompleteModule} from '@angular/material/autocomplete';
8+
import {MatButtonModule} from '@angular/material/button';
9+
import {MatCardModule} from '@angular/material/card';
1010
import {MatCheckboxModule} from '@angular/material/checkbox';
11-
import {MatChipsModule} from '@angular/material-experimental/mdc-chips';
12-
import {MatFormFieldModule} from '@angular/material-experimental/mdc-form-field';
11+
import {MatChipsModule} from '@angular/material/chips';
12+
import {MatFormFieldModule} from '@angular/material/form-field';
1313
import {MatIconModule} from '@angular/material/icon';
14-
import {MatInputModule} from '@angular/material-experimental/mdc-input';
15-
import {MatListModule} from '@angular/material-experimental/mdc-list';
16-
import {MatMenuModule} from '@angular/material-experimental/mdc-menu';
14+
import {MatInputModule} from '@angular/material/input';
15+
import {MatListModule} from '@angular/material/list';
16+
import {MatMenuModule} from '@angular/material/menu';
1717
import {MatPaginatorModule} from '@angular/material/paginator';
18-
import {MatProgressBarModule} from '@angular/material-experimental/mdc-progress-bar';
18+
import {MatProgressBarModule} from '@angular/material/progress-bar';
1919
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
20-
import {MatRadioModule} from '@angular/material-experimental/mdc-radio';
21-
import {MatSelectModule} from '@angular/material-experimental/mdc-select';
20+
import {MatRadioModule} from '@angular/material/radio';
21+
import {MatSelectModule} from '@angular/material/select';
2222
import {MatSlideToggleModule} from '@angular/material/slide-toggle';
23-
import {MatSliderModule} from '@angular/material-experimental/mdc-slider';
23+
import {MatSliderModule} from '@angular/material/slider';
2424
import {MatSnackBarModule} from '@angular/material/legacy-snack-bar';
2525
import {MatTableModule} from '@angular/material/table';
2626
import {MatTabsModule} from '@angular/material/tabs';
27-
import {MatTooltipModule} from '@angular/material-experimental/mdc-tooltip';
27+
import {MatTooltipModule} from '@angular/material/tooltip';
2828
import {AutocompleteComponent} from './components/autocomplete/autocomplete.component';
2929
import {ButtonComponent} from './components/button/button.component';
3030
import {CardComponent} from './components/card/card.component';

integration/mdc-migration/golden/src/app/components/chips/chips.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {COMMA, ENTER} from '@angular/cdk/keycodes';
22
import {Component} from '@angular/core';
3-
import {MatChipInputEvent} from '@angular/material-experimental/mdc-chips';
3+
import {MatChipInputEvent} from '@angular/material/chips';
44

55
export interface Fruit {
66
name: string;

src/cdk/schematics/update-tool/public-api.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ export * from './migration';
1313
export * from './target-version';
1414
export * from './utils/decorators';
1515
export * from './utils/imports';
16+
export * from './utils/property-name';
1617
export * from './version-changes';

src/material/schematics/ng-generate/mdc-migration/rules/ts-migration/import-replacements.ts

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,76 +8,76 @@
88

99
export const IMPORT_REPLACEMENTS: {[component: string]: {old: string; new: string}} = {
1010
'button': {
11-
old: '@angular/material/button',
12-
new: '@angular/material-experimental/mdc-button',
11+
old: '@angular/material/legacy-button',
12+
new: '@angular/material/button',
1313
},
1414
'card': {
15-
old: '@angular/material/card',
16-
new: '@angular/material-experimental/mdc-card',
15+
old: '@angular/material/legacy-card',
16+
new: '@angular/material/card',
1717
},
1818
'checkbox': {
1919
old: '@angular/material/legacy-checkbox',
2020
new: '@angular/material/checkbox',
2121
},
2222
'chips': {
23-
old: '@angular/material/chips',
24-
new: '@angular/material-experimental/mdc-chips',
23+
old: '@angular/material/legacy-chips',
24+
new: '@angular/material/chips',
2525
},
2626
'dialog': {
2727
old: '@angular/material/legacy-dialog',
2828
new: '@angular/material/dialog',
2929
},
3030
'autocomplete': {
31-
old: '@angular/material/autocomplete',
32-
new: '@angular/material-experimental/mdc-autocomplete',
31+
old: '@angular/material/legacy-autocomplete',
32+
new: '@angular/material/autocomplete',
3333
},
3434
'form-field': {
35-
old: '@angular/material/form-field',
36-
new: '@angular/material-experimental/mdc-form-field',
35+
old: '@angular/material/legacy-form-field',
36+
new: '@angular/material/form-field',
3737
},
3838
'input': {
39-
old: '@angular/material/input',
40-
new: '@angular/material-experimental/mdc-input',
39+
old: '@angular/material/legacy-input',
40+
new: '@angular/material/input',
4141
},
4242
'select': {
43-
old: '@angular/material/select',
44-
new: '@angular/material-experimental/mdc-select',
43+
old: '@angular/material/legacy-select',
44+
new: '@angular/material/select',
4545
},
4646
'core': {
47-
old: '@angular/material/core',
47+
old: '@angular/material/legacy-core',
4848
new: '@angular/material/core',
4949
},
5050
'list': {
51-
old: '@angular/material/list',
52-
new: '@angular/material-experimental/mdc-list',
51+
old: '@angular/material/legacy-list',
52+
new: '@angular/material/list',
5353
},
5454
'menu': {
55-
old: '@angular/material/menu',
56-
new: '@angular/material-experimental/mdc-menu',
55+
old: '@angular/material/legacy-menu',
56+
new: '@angular/material/menu',
5757
},
5858
'progress-bar': {
59-
old: '@angular/material/progress-bar',
60-
new: '@angular/material-experimental/mdc-progress-bar',
59+
old: '@angular/material/legacy-progress-bar',
60+
new: '@angular/material/progress-bar',
6161
},
6262
'progress-spinner': {
6363
old: '@angular/material/legacy-progress-spinner',
6464
new: '@angular/material/progress-spinner',
6565
},
6666
'radio': {
67-
old: '@angular/material/radio',
68-
new: '@angular/material-experimental/mdc-radio',
67+
old: '@angular/material/legacy-radio',
68+
new: '@angular/material/radio',
6969
},
7070
'sidenav': {
71-
old: '@angular/material/sidenav',
72-
new: '@angular/material-experimental/mdc-sidenav',
71+
old: '@angular/material/legacy-sidenav',
72+
new: '@angular/material-experimental/legacy-sidenav',
7373
},
7474
'slide-toggle': {
7575
old: '@angular/material/legacy-slide-toggle',
7676
new: '@angular/material/slide-toggle',
7777
},
7878
'slider': {
79-
old: '@angular/material/slider',
80-
new: '@angular/material-experimental/mdc-slider',
79+
old: '@angular/material/legacy-slider',
80+
new: '@angular/material/slider',
8181
},
8282
'snack-bar': {
8383
old: '@angular/material/legacy-snack-bar',
@@ -96,7 +96,7 @@ export const IMPORT_REPLACEMENTS: {[component: string]: {old: string; new: strin
9696
new: '@angular/material/paginator',
9797
},
9898
'tooltip': {
99-
old: '@angular/material/tooltip',
100-
new: '@angular/material-experimental/mdc-tooltip',
99+
old: '@angular/material/legacy-tooltip',
100+
new: '@angular/material/tooltip',
101101
},
102102
};

0 commit comments

Comments
 (0)