Skip to content

Commit cc7d5fb

Browse files
authored
build: remove legacy component usages from integration tests (#25838)
Removes the legacy components from the integration tests, updates the sizes and deletes the `material-experimental` size tests.
1 parent fc8535f commit cc7d5fb

File tree

29 files changed

+58
-163
lines changed

29 files changed

+58
-163
lines changed

goldens/size-test.yaml

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1-
cdk/drag-drop/all-directives: 153589
2-
cdk/drag-drop/basic: 151067
3-
material-experimental/mdc-chips/basic: 228960
4-
material-experimental/mdc-form-field/advanced: 263071
5-
material-experimental/mdc-form-field/basic: 261520
6-
material/autocomplete/without-optgroup: 271956
7-
material/button-toggle/standalone: 188227
8-
material/chips/basic: 225027
9-
material/datepicker/range-picker/without-form-field: 383794
10-
material/expansion/without-accordion: 197936
11-
material/form-field/advanced: 242955
12-
material/form-field/basic: 241344
13-
material/list/nav-list: 193236
14-
material/menu/without-lazy-content: 276217
15-
material/radio/without-group: 191753
16-
material/select/basic: 317415
17-
material/tabs/advanced: 254738
18-
material/tabs/basic: 253876
1+
cdk/drag-drop/all-directives: 153026
2+
cdk/drag-drop/basic: 150520
3+
material/autocomplete/without-optgroup: 274252
4+
material/button-toggle/standalone: 188001
5+
material/chips/basic: 260951
6+
material/datepicker/range-picker/without-form-field: 400297
7+
material/expansion/without-accordion: 197979
8+
material/form-field/advanced: 263205
9+
material/form-field/basic: 261635
10+
material/list/nav-list: 218753
11+
material/menu/without-lazy-content: 278141
12+
material/radio/without-group: 199995
13+
material/select/basic: 316667
14+
material/tabs/advanced: 259447
15+
material/tabs/basic: 259301

integration/harness-e2e-cli/e2e/radio-harness.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {MatLegacyRadioGroupHarness} from '@angular/material/legacy-radio/testing';
1+
import {MatRadioGroupHarness} from '@angular/material/radio/testing';
22
import {SeleniumWebDriverHarnessEnvironment} from '@angular/cdk/testing/selenium-webdriver';
33
import {HarnessLoader} from '@angular/cdk/testing';
44
import {configureDriver} from './driver.js';
@@ -18,7 +18,7 @@ describe('app test', () => {
1818
});
1919

2020
it('should work', async () => {
21-
const group = await loader.getHarness(MatLegacyRadioGroupHarness);
21+
const group = await loader.getHarness(MatRadioGroupHarness);
2222

2323
expect(group).toBeDefined();
2424
expect(await group.getCheckedValue()).toBe(null);

integration/harness-e2e-cli/src/app/app.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import {BrowserModule} from '@angular/platform-browser';
33
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
44

55
import {AppComponent} from './app.component';
6-
import {MatLegacyRadioModule} from '@angular/material/legacy-radio';
6+
import {MatRadioModule} from '@angular/material/radio';
77

88
@NgModule({
99
declarations: [AppComponent],
10-
imports: [MatLegacyRadioModule, NoopAnimationsModule, BrowserModule],
10+
imports: [MatRadioModule, NoopAnimationsModule, BrowserModule],
1111
bootstrap: [AppComponent],
1212
})
1313
export class AppModule {}

integration/ng-add/src/app/app.module.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {AppComponent} from './app.component';
77
@NgModule({
88
declarations: [AppComponent],
99
imports: [BrowserModule, AppRoutingModule],
10-
providers: [],
1110
bootstrap: [AppComponent],
1211
})
1312
export class AppModule {}

integration/ng-update-v13/src/app/app.module.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
77
@NgModule({
88
declarations: [AppComponent],
99
imports: [BrowserModule, BrowserAnimationsModule],
10-
providers: [],
1110
bootstrap: [AppComponent],
1211
})
1312
export class AppModule {}

integration/size-test/material-experimental/mdc-chips/BUILD.bazel

Lines changed: 0 additions & 7 deletions
This file was deleted.

integration/size-test/material-experimental/mdc-chips/basic.ts

Lines changed: 0 additions & 22 deletions
This file was deleted.

integration/size-test/material-experimental/mdc-form-field/BUILD.bazel

Lines changed: 0 additions & 19 deletions
This file was deleted.

integration/size-test/material-experimental/mdc-form-field/advanced.ts

Lines changed: 0 additions & 27 deletions
This file was deleted.

integration/size-test/material-experimental/mdc-form-field/basic.ts

Lines changed: 0 additions & 24 deletions
This file was deleted.

integration/size-test/material/autocomplete/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ load("//integration/size-test:index.bzl", "size_test")
33
size_test(
44
name = "without-optgroup",
55
file = "without-optgroup.ts",
6-
deps = ["//src/material/legacy-autocomplete"],
6+
deps = ["//src/material/autocomplete"],
77
)

integration/size-test/material/autocomplete/without-optgroup.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component, NgModule} from '@angular/core';
2-
import {MatLegacyAutocompleteModule} from '@angular/material/legacy-autocomplete';
2+
import {MatAutocompleteModule} from '@angular/material/autocomplete';
33

44
/**
55
* Basic component using `MatAutocomplete` and `MatOption`. Other supported parts of the
@@ -16,7 +16,7 @@ import {MatLegacyAutocompleteModule} from '@angular/material/legacy-autocomplete
1616
export class TestComponent {}
1717

1818
@NgModule({
19-
imports: [MatLegacyAutocompleteModule],
19+
imports: [MatAutocompleteModule],
2020
declarations: [TestComponent],
2121
bootstrap: [TestComponent],
2222
})

integration/size-test/material/chips/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ load("//integration/size-test:index.bzl", "size_test")
33
size_test(
44
name = "basic",
55
file = "basic.ts",
6-
deps = ["//src/material/legacy-chips"],
6+
deps = ["//src/material/chips"],
77
)

integration/size-test/material/chips/basic.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
import {Component, NgModule} from '@angular/core';
2-
import {MatLegacyChipsModule} from '@angular/material/legacy-chips';
2+
import {MatChipsModule} from '@angular/material/chips';
33

44
/**
55
* Basic component using `MatChipList` and `MatChip`. Other supported parts of the
66
* chip module such as `MatChipRemove` are not used and should be tree-shaken away.
77
*/
88
@Component({
99
template: `
10-
<mat-chip-list>
11-
<mat-chip>First</mat-chip>
12-
</mat-chip-list>
10+
<mat-chip-listbox>
11+
<mat-chip-option>First</mat-chip-option>
12+
</mat-chip-listbox>
1313
`,
1414
})
1515
export class TestComponent {}
1616

1717
@NgModule({
18-
imports: [MatLegacyChipsModule],
18+
imports: [MatChipsModule],
1919
declarations: [TestComponent],
2020
bootstrap: [TestComponent],
2121
})

integration/size-test/material/form-field/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ size_test(
44
name = "basic",
55
file = "basic.ts",
66
deps = [
7-
"//src/material/legacy-form-field",
8-
"//src/material/legacy-input",
7+
"//src/material/form-field",
8+
"//src/material/input",
99
],
1010
)
1111

1212
size_test(
1313
name = "advanced",
1414
file = "advanced.ts",
1515
deps = [
16-
"//src/material/legacy-form-field",
17-
"//src/material/legacy-input",
16+
"//src/material/form-field",
17+
"//src/material/input",
1818
],
1919
)

integration/size-test/material/form-field/advanced.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Component, NgModule} from '@angular/core';
2-
import {MatLegacyFormFieldModule} from '@angular/material/legacy-form-field';
3-
import {MatLegacyInputModule} from '@angular/material/legacy-input';
2+
import {MatFormFieldModule} from '@angular/material/form-field';
3+
import {MatInputModule} from '@angular/material/input';
44

55
/**
66
* Advanced component using `MatFormField` and `MatInput` in combination with content
@@ -20,7 +20,7 @@ import {MatLegacyInputModule} from '@angular/material/legacy-input';
2020
export class TestComponent {}
2121

2222
@NgModule({
23-
imports: [MatLegacyInputModule, MatLegacyFormFieldModule],
23+
imports: [MatInputModule, MatFormFieldModule],
2424
declarations: [TestComponent],
2525
bootstrap: [TestComponent],
2626
})

integration/size-test/material/form-field/basic.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Component, NgModule} from '@angular/core';
2-
import {MatLegacyFormFieldModule} from '@angular/material/legacy-form-field';
3-
import {MatLegacyInputModule} from '@angular/material/legacy-input';
2+
import {MatFormFieldModule} from '@angular/material/form-field';
3+
import {MatInputModule} from '@angular/material/input';
44

55
/**
66
* Basic component using `MatFormField` and `MatInput`. Other parts of the form-field
@@ -17,7 +17,7 @@ import {MatLegacyInputModule} from '@angular/material/legacy-input';
1717
export class TestComponent {}
1818

1919
@NgModule({
20-
imports: [MatLegacyInputModule, MatLegacyFormFieldModule],
20+
imports: [MatInputModule, MatFormFieldModule],
2121
declarations: [TestComponent],
2222
bootstrap: [TestComponent],
2323
})

integration/size-test/material/list/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ load("//integration/size-test:index.bzl", "size_test")
33
size_test(
44
name = "nav-list",
55
file = "nav-list.ts",
6-
deps = ["//src/material/legacy-list"],
6+
deps = ["//src/material/list"],
77
)

integration/size-test/material/list/nav-list.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component, NgModule} from '@angular/core';
2-
import {MatLegacyListModule} from '@angular/material/legacy-list';
2+
import {MatListModule} from '@angular/material/list';
33

44
/**
55
* Basic component using `MatNavList` and `MatListItem`. Other parts of the list
@@ -18,7 +18,7 @@ import {MatLegacyListModule} from '@angular/material/legacy-list';
1818
export class TestComponent {}
1919

2020
@NgModule({
21-
imports: [MatLegacyListModule],
21+
imports: [MatListModule],
2222
declarations: [TestComponent],
2323
bootstrap: [TestComponent],
2424
})

integration/size-test/material/menu/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ load("//integration/size-test:index.bzl", "size_test")
33
size_test(
44
name = "without-lazy-content",
55
file = "without-lazy-content.ts",
6-
deps = ["//src/material/legacy-menu"],
6+
deps = ["//src/material/menu"],
77
)

integration/size-test/material/menu/without-lazy-content.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component, NgModule} from '@angular/core';
2-
import {MatLegacyMenuModule} from '@angular/material/legacy-menu';
2+
import {MatMenuModule} from '@angular/material/menu';
33

44
/**
55
* Basic component using `MatMenu` and `MatMenuTrigger`. No lazy `MatMenuContent` is
@@ -14,7 +14,7 @@ import {MatLegacyMenuModule} from '@angular/material/legacy-menu';
1414
export class TestComponent {}
1515

1616
@NgModule({
17-
imports: [MatLegacyMenuModule],
17+
imports: [MatMenuModule],
1818
declarations: [TestComponent],
1919
bootstrap: [TestComponent],
2020
})

integration/size-test/material/radio/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ load("//integration/size-test:index.bzl", "size_test")
33
size_test(
44
name = "without-group",
55
file = "without-group.ts",
6-
deps = ["//src/material/legacy-radio"],
6+
deps = ["//src/material/radio"],
77
)

integration/size-test/material/radio/without-group.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component, NgModule} from '@angular/core';
2-
import {MatLegacyRadioModule} from '@angular/material/legacy-radio';
2+
import {MatRadioModule} from '@angular/material/radio';
33

44
/**
55
* Basic component using `MatRadioButton`. Doesn't use a `MatRadioGroup`, so the class
@@ -13,7 +13,7 @@ import {MatLegacyRadioModule} from '@angular/material/legacy-radio';
1313
export class TestComponent {}
1414

1515
@NgModule({
16-
imports: [MatLegacyRadioModule],
16+
imports: [MatRadioModule],
1717
declarations: [TestComponent],
1818
bootstrap: [TestComponent],
1919
})

integration/size-test/material/select/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ load("//integration/size-test:index.bzl", "size_test")
33
size_test(
44
name = "basic",
55
file = "basic.ts",
6-
deps = ["//src/material/legacy-select"],
6+
deps = ["//src/material/select"],
77
)

integration/size-test/material/select/basic.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component, NgModule} from '@angular/core';
2-
import {MatLegacySelectModule} from '@angular/material/legacy-select';
2+
import {MatSelectModule} from '@angular/material/select';
33

44
/**
55
* Basic component using `MatSelect` and `MatOption`. Other supported parts of the
@@ -16,7 +16,7 @@ import {MatLegacySelectModule} from '@angular/material/legacy-select';
1616
export class TestComponent {}
1717

1818
@NgModule({
19-
imports: [MatLegacySelectModule],
19+
imports: [MatSelectModule],
2020
declarations: [TestComponent],
2121
bootstrap: [TestComponent],
2222
})

0 commit comments

Comments
 (0)