chore: bump to 6.0.0-beta.6 and remove explicit preserveWhitespaces setting (#10216)

* Bumps the Angular version to at least 6.0.0-beta.6.
* Removes all of the `preserveWhitespaces` declarations, because the option is now `false` by default.
* Removes the tslint requirement for `preserveWhitespaces`.

Author: crisbeto

package-lock.json

@@ -26,12 +26,12 @@
     "node": ">= 5.4.1"
   },
   "dependencies": {
-    "@angular/animations": ">=6.0.0-beta.0 <7.0.0",
-    "@angular/common": ">=6.0.0-beta.0 <7.0.0",
-    "@angular/compiler": ">=6.0.0-beta.0 <7.0.0",
-    "@angular/core": ">=6.0.0-beta.0 <7.0.0",
-    "@angular/forms": ">=6.0.0-beta.0 <7.0.0",
-    "@angular/platform-browser": ">=6.0.0-beta.0 <7.0.0",
+    "@angular/animations": ">=6.0.0-beta.6 <7.0.0",
+    "@angular/common": ">=6.0.0-beta.6 <7.0.0",
+    "@angular/compiler": ">=6.0.0-beta.6 <7.0.0",
+    "@angular/core": ">=6.0.0-beta.6 <7.0.0",
+    "@angular/forms": ">=6.0.0-beta.6 <7.0.0",
+    "@angular/platform-browser": ">=6.0.0-beta.6 <7.0.0",
     "core-js": "^2.4.1",
     "rxjs": "^5.5.5",
     "systemjs": "0.19.43",
@@ -40,12 +40,12 @@
     "zone.js": "^0.8.12"
   },
   "devDependencies": {
-    "@angular/bazel": ">=6.0.0-beta.0 <7.0.0",
-    "@angular/compiler-cli": ">=6.0.0-beta.0 <7.0.0",
-    "@angular/http": ">=6.0.0-beta.0 <7.0.0",
-    "@angular/platform-browser-dynamic": ">=6.0.0-beta.0 <7.0.0",
-    "@angular/platform-server": ">=6.0.0-beta.0 <7.0.0",
-    "@angular/router": ">=6.0.0-beta.0 <7.0.0",
+    "@angular/bazel": ">=6.0.0-beta.6 <7.0.0",
+    "@angular/compiler-cli": ">=6.0.0-beta.6 <7.0.0",
+    "@angular/http": ">=6.0.0-beta.6 <7.0.0",
+    "@angular/platform-browser-dynamic": ">=6.0.0-beta.6 <7.0.0",
+    "@angular/platform-server": ">=6.0.0-beta.6 <7.0.0",
+    "@angular/router": ">=6.0.0-beta.6 <7.0.0",
     "@angular/upgrade": "^5.0.1",
     "@bazel/ibazel": "0.3.1",
     "@google-cloud/storage": "^1.1.1",

package.json

@@ -47,7 +47,6 @@ export function throwDialogContentAlreadyAttachedError() {
   templateUrl: './dialog-container.html',
   styleUrls: ['dialog-container.css'],
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
   // Using OnPush for dialogs caused some G3 sync issues. Disabled until we can track them down.
   // tslint:disable-next-line:validate-decorators
   changeDetection: ChangeDetectionStrategy.Default,

src/cdk-experimental/dialog/dialog-container.ts

@@ -73,7 +73,6 @@ export class StepperSelectionEvent {
   exportAs: 'cdkStep',
   templateUrl: 'step.html',
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class CdkStep implements OnChanges {

src/cdk/stepper/stepper.ts

@@ -159,7 +159,6 @@ export class CdkCellOutlet {
   },
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
 })
 export class CdkHeaderRow { }
 
@@ -174,6 +173,5 @@ export class CdkHeaderRow { }
   },
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
 })
 export class CdkRow { }

src/cdk/table/row.ts

@@ -94,7 +94,6 @@ abstract class RowViewRef<T> extends EmbeddedViewRef<CdkCellOutletRowContext<T>>
     'class': 'cdk-table',
   },
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class CdkTable<T> implements CollectionViewer, OnInit, AfterContentChecked {

src/cdk/table/table.ts

@@ -132,7 +132,6 @@ export class CdkTreeNode<T>  implements FocusableOption, OnDestroy {
     'role': 'tree',
   },
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class CdkTree<T> implements CollectionViewer, OnInit, OnDestroy {

src/cdk/tree/tree.ts

@@ -23,7 +23,6 @@ export class AccessibilityHome {}
   templateUrl: 'a11y.html',
   styleUrls: ['a11y.css'],
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
 })
 export class AccessibilityDemo implements OnDestroy {
   currentComponent: string = '';

src/demo-app/a11y/a11y.ts

@@ -14,7 +14,6 @@ import {MatSnackBar} from '@angular/material';
   selector: 'icon-a11y',
   templateUrl: 'icon-a11y.html',
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
 })
 export class IconAccessibilityDemo {
   constructor(private snackBar: MatSnackBar) {}

src/demo-app/a11y/icon/icon-a11y.ts

@@ -16,6 +16,5 @@ import {Component, ViewEncapsulation} from '@angular/core';
   styleUrls: ['shared.css'],
   host: {'class': 'a11y-demo-sidenav-app'},
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
 })
 export class SidenavBasicAccessibilityDemo {}

src/demo-app/a11y/sidenav/basic-sidenav-a11y.ts

@@ -17,7 +17,6 @@ import {MatSnackBar} from '@angular/material/snack-bar';
   styleUrls: ['shared.css', 'dual-sidenav-a11y.css'],
   host: {'class': 'a11y-demo-sidenav-app'},
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
 })
 export class SidenavDualAccessibilityDemo {
   constructor(private _snackbar: MatSnackBar) {}

src/demo-app/a11y/sidenav/dual-sidenav-a11y.ts

@@ -17,7 +17,6 @@ import {ChangeDetectorRef, Component, OnDestroy, ViewEncapsulation} from '@angul
   styleUrls: ['shared.css', 'mobile-sidenav-a11y.css'],
   host: {'class': 'a11y-demo-sidenav-app'},
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
 })
 export class SidenavMobileAccessibilityDemo implements OnDestroy {
   mobileQuery: MediaQueryList;

src/demo-app/a11y/sidenav/mobile-sidenav-a11y.ts

@@ -13,6 +13,5 @@ import {Component} from '@angular/core';
   moduleId: module.id,
   selector: 'sidenav-a11y',
   templateUrl: 'sidenav-a11y.html',
-  preserveWhitespaces: false,
 })
 export class SidenavAccessibilityDemo {}

src/demo-app/a11y/sidenav/sidenav-a11y.ts

@@ -27,7 +27,6 @@ export interface StateGroup {
   templateUrl: 'autocomplete-demo.html',
   styleUrls: ['autocomplete-demo.css'],
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
 })
 export class AutocompleteDemo {
   stateCtrl: FormControl;

src/demo-app/autocomplete/autocomplete-demo.ts

@@ -21,7 +21,6 @@ const defaultConfig = new MatBottomSheetConfig();
   styleUrls: ['bottom-sheet-demo.css'],
   templateUrl: 'bottom-sheet-demo.html',
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
 })
 export class BottomSheetDemo {
   config: MatBottomSheetConfig = {

src/demo-app/bottom-sheet/bottom-sheet-demo.ts

@@ -20,7 +20,6 @@ import {Component, ElementRef, ViewEncapsulation} from '@angular/core';
   selector: 'entry-app',
   template: '<router-outlet></router-outlet>',
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
 })
 export class EntryApp {}
 
@@ -45,7 +44,6 @@ export class Home {}
   templateUrl: 'demo-app.html',
   styleUrls: ['demo-app.css'],
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
 })
 export class DemoApp {
   dark = false;

src/demo-app/demo-app/demo-app.ts

@@ -15,7 +15,6 @@ import {Component, ViewEncapsulation} from '@angular/core';
   templateUrl: 'drawer-demo.html',
   styleUrls: ['drawer-demo.css'],
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
 })
 export class DrawerDemo {
   invert = false;

src/demo-app/drawer/drawer-demo.ts

@@ -15,7 +15,6 @@ import {MatAccordion} from '@angular/material';
   styleUrls: ['expansion-demo.css'],
   templateUrl: 'expansion-demo.html',
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
 })
 export class ExpansionDemo {
   @ViewChild(MatAccordion) accordion: MatAccordion;

src/demo-app/expansion/expansion-demo.ts

@@ -16,7 +16,6 @@ import {MatIconRegistry} from '@angular/material';
   templateUrl: 'icon-demo.html',
   styleUrls: ['icon-demo.css'],
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
 })
 export class IconDemo {
   constructor(iconRegistry: MatIconRegistry, sanitizer: DomSanitizer) {

src/demo-app/icon/icon-demo.ts

@@ -26,7 +26,6 @@ import {tap} from 'rxjs/operators/tap';
   templateUrl: 'overlay-demo.html',
   styleUrls: ['overlay-demo.css'],
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
 })
 export class OverlayDemo {
   nextPosition: number = 0;

src/demo-app/overlay/overlay-demo.ts

@@ -15,7 +15,6 @@ import {Component, ViewEncapsulation} from '@angular/core';
   templateUrl: 'sidenav-demo.html',
   styleUrls: ['sidenav-demo.css'],
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
 })
 export class SidenavDemo {
   isLaunched = false;

src/demo-app/sidenav/sidenav-demo.ts

@@ -22,7 +22,6 @@ import {
   styleUrls: ['snack-bar-demo.css'],
   templateUrl: 'snack-bar-demo.html',
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
 })
 export class SnackBarDemo {
   @ViewChild('template') template: TemplateRef<any>;

src/demo-app/snack-bar/snack-bar-demo.ts

@@ -15,7 +15,6 @@ import {Observable} from 'rxjs/Observable';
   templateUrl: 'tabs-demo.html',
   styleUrls: ['tabs-demo.css'],
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
 })
 export class TabsDemo {
   // Nav bar demo

src/demo-app/tabs/tabs-demo.ts

@@ -16,7 +16,6 @@ import {TooltipPosition} from '@angular/material';
   templateUrl: 'tooltip-demo.html',
   styleUrls: ['tooltip-demo.css'],
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
 })
 export class TooltipDemo {
   position: TooltipPosition = 'below';

src/demo-app/tooltip/tooltip-demo.ts

@@ -71,7 +71,6 @@ export const MAT_AUTOCOMPLETE_DEFAULT_OPTIONS =
   templateUrl: 'autocomplete.html',
   styleUrls: ['autocomplete.css'],
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   exportAs: 'matAutocomplete',
   inputs: ['disableRipple'],

src/lib/autocomplete/autocomplete.ts

@@ -47,7 +47,6 @@ import {FocusTrap, FocusTrapFactory} from '@angular/cdk/a11y';
   styleUrls: ['bottom-sheet-container.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
   animations: [matBottomSheetAnimations.bottomSheetState],
   host: {
     'class': 'mat-bottom-sheet-container',

src/lib/bottom-sheet/bottom-sheet-container.ts

@@ -242,7 +242,6 @@ export const _MatButtonToggleMixinBase = mixinDisableRipple(MatButtonToggleBase)
   templateUrl: 'button-toggle.html',
   styleUrls: ['button-toggle.css'],
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
   exportAs: 'matButtonToggle',
   changeDetection: ChangeDetectionStrategy.OnPush,
   inputs: ['disableRipple'],

src/lib/button-toggle/button-toggle.ts

@@ -70,7 +70,6 @@ export const _MatButtonMixinBase = mixinColor(mixinDisabled(mixinDisableRipple(M
   styleUrls: ['button.css'],
   inputs: ['disabled', 'disableRipple', 'color'],
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MatButton extends _MatButtonMixinBase
@@ -155,7 +154,6 @@ export class MatButton extends _MatButtonMixinBase
   templateUrl: 'button.html',
   styleUrls: ['button.css'],
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MatAnchor extends MatButton {

src/lib/button/button.ts

@@ -155,7 +155,6 @@ export class MatCardAvatar {}
   templateUrl: 'card.html',
   styleUrls: ['card.css'],
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   host: {'class': 'mat-card'}
 })
@@ -172,7 +171,6 @@ export class MatCard {}
   selector: 'mat-card-header',
   templateUrl: 'card-header.html',
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   host: {'class': 'mat-card-header'}
 })
@@ -189,7 +187,6 @@ export class MatCardHeader {}
   selector: 'mat-card-title-group',
   templateUrl: 'card-title-group.html',
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   host: {'class': 'mat-card-title-group'}
 })

src/lib/card/card.ts

@@ -112,7 +112,6 @@ export const _MatCheckboxMixinBase =
   providers: [MAT_CHECKBOX_CONTROL_VALUE_ACCESSOR],
   inputs: ['disabled', 'disableRipple', 'color', 'tabIndex'],
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class MatCheckbox extends _MatCheckboxMixinBase implements ControlValueAccessor,

src/lib/checkbox/checkbox.ts

@@ -92,7 +92,6 @@ export class MatChipListChange {
   providers: [{provide: MatFormFieldControl, useExisting: MatChipList}],
   styleUrls: ['chips.css'],
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class MatChipList extends _MatChipListMixinBase implements MatFormFieldControl<any>,

src/lib/chips/chip-list.ts

@@ -26,7 +26,6 @@ let _uniqueOptgroupIdCounter = 0;
   exportAs: 'matOptgroup',
   templateUrl: 'optgroup.html',
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   inputs: ['disabled'],
   styleUrls: ['optgroup.css'],

src/lib/core/option/optgroup.ts

@@ -81,7 +81,6 @@ export const MAT_OPTION_PARENT_COMPONENT =
   styleUrls: ['option.css'],
   templateUrl: 'option.html',
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MatOption implements AfterViewChecked {

src/lib/core/option/option.ts

@@ -26,7 +26,6 @@ export type MatPseudoCheckboxState = 'unchecked' | 'checked' | 'indeterminate';
 @Component({
   moduleId: module.id,
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   selector: 'mat-pseudo-checkbox',
   styleUrls: ['pseudo-checkbox.css'],

src/lib/core/selection/pseudo-checkbox/pseudo-checkbox.ts

@@ -46,7 +46,6 @@ export class MatCalendarCell {
   },
   exportAs: 'matCalendarBody',
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MatCalendarBody {

src/lib/datepicker/calendar-body.ts

@@ -45,7 +45,6 @@ import {MatYearView} from './year-view';
   },
   exportAs: 'matCalendar',
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MatCalendar<D> implements AfterContentInit, OnDestroy, OnChanges {

src/lib/datepicker/calendar.ts

@@ -47,7 +47,6 @@ export class MatDatepickerToggleIcon {}
   },
   exportAs: 'matDatepickerToggle',
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MatDatepickerToggle<D> implements AfterContentInit, OnChanges, OnDestroy {

src/lib/datepicker/datepicker-toggle.ts

@@ -94,7 +94,6 @@ export const _MatDatepickerContentMixinBase = mixinColor(MatDatepickerContentBas
   },
   exportAs: 'matDatepickerContent',
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush,
   inputs: ['color'],
 })
@@ -134,7 +133,6 @@ export class MatDatepickerContent<D> extends _MatDatepickerContentMixinBase
   exportAs: 'matDatepicker',
   changeDetection: ChangeDetectionStrategy.OnPush,
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
 })
 export class MatDatepicker<D> implements OnDestroy, CanColor {
   /** The date to open the calendar to initially. */

src/lib/datepicker/datepicker.ts

@@ -49,7 +49,6 @@ const DAYS_PER_WEEK = 7;
   templateUrl: 'month-view.html',
   exportAs: 'matMonthView',
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class MatMonthView<D> implements AfterContentInit {

src/lib/datepicker/month-view.ts

@@ -49,7 +49,6 @@ export const yearsPerRow = 4;
   templateUrl: 'multi-year-view.html',
   exportAs: 'matMultiYearView',
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class MatMultiYearView<D> implements AfterContentInit {

src/lib/datepicker/multi-year-view.ts

@@ -45,7 +45,6 @@ import {createMissingDateImplError} from './datepicker-errors';
   templateUrl: 'year-view.html',
   exportAs: 'matYearView',
   encapsulation: ViewEncapsulation.None,
-  preserveWhitespaces: false,
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class MatYearView<D> implements AfterContentInit {