Skip to content

build: update to MDC 3.0.0 #16526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 15, 2019
Merged

build: update to MDC 3.0.0 #16526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
},
"version": "8.0.2",
"requiredAngularVersion": "^8.0.0 || ^9.0.0-0",
"requiredMDCVersion": "^2.3.1",
"requiredMDCVersion": "^3.0.0",
"dependencies": {
"@angular/animations": "^8.1.0",
"@angular/common": "^8.1.0",
Expand All @@ -47,7 +47,7 @@
"@angular/platform-browser": "^8.1.0",
"@webcomponents/custom-elements": "^1.1.0",
"core-js": "^2.6.1",
"material-components-web": "^2.3.1",
"material-components-web": "^3.0.0",
"rxjs": "^6.4.0",
"systemjs": "0.19.43",
"tsickle": "^0.35.0",
Expand Down
1 change: 0 additions & 1 deletion src/dev-app/system-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ System.config({
'@material/tab-indicator': 'node:@material/tab-indicator/dist/mdc.tabIndicator.js',
'@material/tab-scroller': 'node:@material/tab-scroller/dist/mdc.tabScroller.js',
'@material/text-field': 'node:@material/textfield/dist/mdc.textField.js',
'@material/toolbar': 'node:@material/toolbar/dist/mdc.toolbar.js',
'@material/top-app-bar': 'node:@material/top-app-bar/dist/mdc.topAppBar.js',

// Angular specific mappings.
Expand Down
1 change: 0 additions & 1 deletion src/e2e-app/devserver-configure.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ require.config({
'@material/tab-indicator': '@material/tab-indicator/dist/mdc.tabIndicator',
'@material/tab-scroller': '@material/tab-scroller/dist/mdc.tabScroller',
'@material/text-field': '@material/textfield/dist/mdc.textField',
'@material/toolbar': '@material/toolbar/dist/mdc.toolbar',
'@material/top-app-bar': '@material/top-app-bar/dist/mdc.topAppBar',
}
});
Expand Down
3 changes: 3 additions & 0 deletions src/material-experimental/mdc-chips/chip.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,9 @@ export class MatChip extends _MatChipMixinBase implements AfterContentInit, Afte
this._elementRef.nativeElement.style.setProperty(propertyName, value);
},
hasLeadingIcon: () => { return !!this.leadingIcon; },
setAttr: (name: string, value: string) => {
this._elementRef.nativeElement.setAttribute(name, value);
},
// The 2 functions below are used by the MDC ripple, which we aren't using,
// so they will never be called
getRootBoundingClientRect: () => this._elementRef.nativeElement.getBoundingClientRect(),
Expand Down
2 changes: 0 additions & 2 deletions src/material-experimental/mdc-helpers/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,6 @@ sass_library(
"@npm//:node_modules/@material/theme/_functions.scss",
"@npm//:node_modules/@material/theme/_mixins.scss",
"@npm//:node_modules/@material/theme/_variables.scss",
"@npm//:node_modules/@material/toolbar/_mixins.scss",
"@npm//:node_modules/@material/toolbar/_variables.scss",
"@npm//:node_modules/@material/top-app-bar/_mixins.scss",
"@npm//:node_modules/@material/top-app-bar/_variables.scss",
"@npm//:node_modules/@material/typography/_functions.scss",
Expand Down
1 change: 0 additions & 1 deletion src/material-experimental/mdc_require_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ require.config({
'@material/tab-indicator': '/base/npm/node_modules/@material/tab-indicator/dist/mdc.tabIndicator',
'@material/tab-scroller': '/base/npm/node_modules/@material/tab-scroller/dist/mdc.tabScroller',
'@material/text-field': '/base/npm/node_modules/@material/textfield/dist/mdc.textField',
'@material/toolbar': '/base/npm/node_modules/@material/toolbar/dist/mdc.toolbar',
'@material/top-app-bar': '/base/npm/node_modules/@material/top-app-bar/dist/mdc.topAppBar',
}
});
1 change: 0 additions & 1 deletion test/karma-system-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ System.config({
'@material/tab-indicator': 'node:@material/tab-indicator/dist/mdc.tabIndicator.js',
'@material/tab-scroller': 'node:@material/tab-scroller/dist/mdc.tabScroller.js',
'@material/text-field': 'node:@material/textfield/dist/mdc.textField.js',
'@material/toolbar': 'node:@material/toolbar/dist/mdc.toolbar.js',
'@material/top-app-bar': 'node:@material/top-app-bar/dist/mdc.topAppBar.js',

// Angular specific mappings.
Expand Down
1 change: 0 additions & 1 deletion tools/package-tools/rollup-globals.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ export const rollupGlobals = {
'@material/tab-indicator': 'mdc.tabIndicator',
'@material/tab-scroller': 'mdc.tabScroller',
'@material/text-field': 'mdc.textField',
'@material/toolbar': 'mdc.toolbar',
'@material/top-app-bar': 'mdc.topAppBar',

'@angular/animations': 'ng.animations',
Expand Down
Loading