Skip to content

Commit e8adaa9

Browse files
crisbetojelbourn
authored andcommitted
build: update to MDC 3.0.0 (#16526)
Bumps the repo to `[email protected]` and fixes a compilation error that showed up as a result.
1 parent dde12c2 commit e8adaa9

File tree

9 files changed

+451
-461
lines changed

9 files changed

+451
-461
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
},
3737
"version": "8.0.2",
3838
"requiredAngularVersion": "^8.0.0 || ^9.0.0-0",
39-
"requiredMDCVersion": "^2.3.1",
39+
"requiredMDCVersion": "^3.0.0",
4040
"dependencies": {
4141
"@angular/animations": "^8.1.0",
4242
"@angular/common": "^8.1.0",
@@ -47,7 +47,7 @@
4747
"@angular/platform-browser": "^8.1.0",
4848
"@webcomponents/custom-elements": "^1.1.0",
4949
"core-js": "^2.6.1",
50-
"material-components-web": "^2.3.1",
50+
"material-components-web": "^3.0.0",
5151
"rxjs": "^6.4.0",
5252
"systemjs": "0.19.43",
5353
"tsickle": "^0.35.0",

src/dev-app/system-config.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ System.config({
5050
'@material/tab-indicator': 'node:@material/tab-indicator/dist/mdc.tabIndicator.js',
5151
'@material/tab-scroller': 'node:@material/tab-scroller/dist/mdc.tabScroller.js',
5252
'@material/text-field': 'node:@material/textfield/dist/mdc.textField.js',
53-
'@material/toolbar': 'node:@material/toolbar/dist/mdc.toolbar.js',
5453
'@material/top-app-bar': 'node:@material/top-app-bar/dist/mdc.topAppBar.js',
5554

5655
// Angular specific mappings.

src/e2e-app/devserver-configure.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ require.config({
3434
'@material/tab-indicator': '@material/tab-indicator/dist/mdc.tabIndicator',
3535
'@material/tab-scroller': '@material/tab-scroller/dist/mdc.tabScroller',
3636
'@material/text-field': '@material/textfield/dist/mdc.textField',
37-
'@material/toolbar': '@material/toolbar/dist/mdc.toolbar',
3837
'@material/top-app-bar': '@material/top-app-bar/dist/mdc.topAppBar',
3938
}
4039
});

src/material-experimental/mdc-chips/chip.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,9 @@ export class MatChip extends _MatChipMixinBase implements AfterContentInit, Afte
256256
this._elementRef.nativeElement.style.setProperty(propertyName, value);
257257
},
258258
hasLeadingIcon: () => { return !!this.leadingIcon; },
259+
setAttr: (name: string, value: string) => {
260+
this._elementRef.nativeElement.setAttribute(name, value);
261+
},
259262
// The 2 functions below are used by the MDC ripple, which we aren't using,
260263
// so they will never be called
261264
getRootBoundingClientRect: () => this._elementRef.nativeElement.getBoundingClientRect(),

src/material-experimental/mdc-helpers/BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,6 @@ sass_library(
116116
"@npm//:node_modules/@material/theme/_functions.scss",
117117
"@npm//:node_modules/@material/theme/_mixins.scss",
118118
"@npm//:node_modules/@material/theme/_variables.scss",
119-
"@npm//:node_modules/@material/toolbar/_mixins.scss",
120-
"@npm//:node_modules/@material/toolbar/_variables.scss",
121119
"@npm//:node_modules/@material/top-app-bar/_mixins.scss",
122120
"@npm//:node_modules/@material/top-app-bar/_variables.scss",
123121
"@npm//:node_modules/@material/typography/_functions.scss",

src/material-experimental/mdc_require_config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ require.config({
3131
'@material/tab-indicator': '/base/npm/node_modules/@material/tab-indicator/dist/mdc.tabIndicator',
3232
'@material/tab-scroller': '/base/npm/node_modules/@material/tab-scroller/dist/mdc.tabScroller',
3333
'@material/text-field': '/base/npm/node_modules/@material/textfield/dist/mdc.textField',
34-
'@material/toolbar': '/base/npm/node_modules/@material/toolbar/dist/mdc.toolbar',
3534
'@material/top-app-bar': '/base/npm/node_modules/@material/top-app-bar/dist/mdc.topAppBar',
3635
}
3736
});

test/karma-system-config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ System.config({
3737
'@material/tab-indicator': 'node:@material/tab-indicator/dist/mdc.tabIndicator.js',
3838
'@material/tab-scroller': 'node:@material/tab-scroller/dist/mdc.tabScroller.js',
3939
'@material/text-field': 'node:@material/textfield/dist/mdc.textField.js',
40-
'@material/toolbar': 'node:@material/toolbar/dist/mdc.toolbar.js',
4140
'@material/top-app-bar': 'node:@material/top-app-bar/dist/mdc.topAppBar.js',
4241

4342
// Angular specific mappings.

tools/package-tools/rollup-globals.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ export const rollupGlobals = {
8181
'@material/tab-indicator': 'mdc.tabIndicator',
8282
'@material/tab-scroller': 'mdc.tabScroller',
8383
'@material/text-field': 'mdc.textField',
84-
'@material/toolbar': 'mdc.toolbar',
8584
'@material/top-app-bar': 'mdc.topAppBar',
8685

8786
'@angular/animations': 'ng.animations',

0 commit comments

Comments
 (0)