Skip to content

Commit 0ae9418

Browse files
committed
chore: bump to 6.0.0-beta.6 and remove explicit preserveWhitespaces setting
* 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`.
1 parent 915a2b7 commit 0ae9418

File tree

79 files changed

+187
-225
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+187
-225
lines changed

package-lock.json

Lines changed: 175 additions & 118 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
"node": ">= 5.4.1"
2727
},
2828
"dependencies": {
29-
"@angular/animations": ">=6.0.0-beta.0 <7.0.0",
30-
"@angular/common": ">=6.0.0-beta.0 <7.0.0",
31-
"@angular/compiler": ">=6.0.0-beta.0 <7.0.0",
32-
"@angular/core": ">=6.0.0-beta.0 <7.0.0",
33-
"@angular/forms": ">=6.0.0-beta.0 <7.0.0",
34-
"@angular/platform-browser": ">=6.0.0-beta.0 <7.0.0",
29+
"@angular/animations": ">=6.0.0-beta.6 <7.0.0",
30+
"@angular/common": ">=6.0.0-beta.6 <7.0.0",
31+
"@angular/compiler": ">=6.0.0-beta.6 <7.0.0",
32+
"@angular/core": ">=6.0.0-beta.6 <7.0.0",
33+
"@angular/forms": ">=6.0.0-beta.6 <7.0.0",
34+
"@angular/platform-browser": ">=6.0.0-beta.6 <7.0.0",
3535
"core-js": "^2.4.1",
3636
"rxjs": "^5.5.5",
3737
"systemjs": "0.19.43",
@@ -40,12 +40,12 @@
4040
"zone.js": "^0.8.12"
4141
},
4242
"devDependencies": {
43-
"@angular/bazel": ">=6.0.0-beta.0 <7.0.0",
44-
"@angular/compiler-cli": ">=6.0.0-beta.0 <7.0.0",
45-
"@angular/http": ">=6.0.0-beta.0 <7.0.0",
46-
"@angular/platform-browser-dynamic": ">=6.0.0-beta.0 <7.0.0",
47-
"@angular/platform-server": ">=6.0.0-beta.0 <7.0.0",
48-
"@angular/router": ">=6.0.0-beta.0 <7.0.0",
43+
"@angular/bazel": ">=6.0.0-beta.6 <7.0.0",
44+
"@angular/compiler-cli": ">=6.0.0-beta.6 <7.0.0",
45+
"@angular/http": ">=6.0.0-beta.6 <7.0.0",
46+
"@angular/platform-browser-dynamic": ">=6.0.0-beta.6 <7.0.0",
47+
"@angular/platform-server": ">=6.0.0-beta.6 <7.0.0",
48+
"@angular/router": ">=6.0.0-beta.6 <7.0.0",
4949
"@angular/upgrade": "^5.0.1",
5050
"@bazel/ibazel": "0.3.1",
5151
"@google-cloud/storage": "^1.1.1",

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ export function throwDialogContentAlreadyAttachedError() {
4747
templateUrl: './dialog-container.html',
4848
styleUrls: ['dialog-container.css'],
4949
encapsulation: ViewEncapsulation.None,
50-
preserveWhitespaces: false,
5150
// Using OnPush for dialogs caused some G3 sync issues. Disabled until we can track them down.
5251
// tslint:disable-next-line:validate-decorators
5352
changeDetection: ChangeDetectionStrategy.Default,

src/cdk/stepper/stepper.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ export class StepperSelectionEvent {
7676
exportAs: 'cdkStep',
7777
templateUrl: 'step.html',
7878
encapsulation: ViewEncapsulation.None,
79-
preserveWhitespaces: false,
8079
changeDetection: ChangeDetectionStrategy.OnPush,
8180
})
8281
export class CdkStep implements OnChanges {

src/cdk/table/row.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ export class CdkCellOutlet {
159159
},
160160
changeDetection: ChangeDetectionStrategy.OnPush,
161161
encapsulation: ViewEncapsulation.None,
162-
preserveWhitespaces: false,
163162
})
164163
export class CdkHeaderRow { }
165164

@@ -174,6 +173,5 @@ export class CdkHeaderRow { }
174173
},
175174
changeDetection: ChangeDetectionStrategy.OnPush,
176175
encapsulation: ViewEncapsulation.None,
177-
preserveWhitespaces: false,
178176
})
179177
export class CdkRow { }

src/cdk/table/table.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ abstract class RowViewRef<T> extends EmbeddedViewRef<CdkCellOutletRowContext<T>>
9494
'class': 'cdk-table',
9595
},
9696
encapsulation: ViewEncapsulation.None,
97-
preserveWhitespaces: false,
9897
changeDetection: ChangeDetectionStrategy.OnPush,
9998
})
10099
export class CdkTable<T> implements CollectionViewer, OnInit, AfterContentChecked {

src/cdk/tree/tree.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ export class CdkTreeNode<T> implements FocusableOption, OnDestroy {
132132
'role': 'tree',
133133
},
134134
encapsulation: ViewEncapsulation.None,
135-
preserveWhitespaces: false,
136135
changeDetection: ChangeDetectionStrategy.OnPush
137136
})
138137
export class CdkTree<T> implements CollectionViewer, OnInit, OnDestroy {

src/demo-app/a11y/a11y.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ export class AccessibilityHome {}
2323
templateUrl: 'a11y.html',
2424
styleUrls: ['a11y.css'],
2525
encapsulation: ViewEncapsulation.None,
26-
preserveWhitespaces: false,
2726
})
2827
export class AccessibilityDemo implements OnDestroy {
2928
currentComponent: string = '';

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {MatSnackBar} from '@angular/material';
1414
selector: 'icon-a11y',
1515
templateUrl: 'icon-a11y.html',
1616
encapsulation: ViewEncapsulation.None,
17-
preserveWhitespaces: false,
1817
})
1918
export class IconAccessibilityDemo {
2019
constructor(private snackBar: MatSnackBar) {}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,5 @@ import {Component, ViewEncapsulation} from '@angular/core';
1616
styleUrls: ['shared.css'],
1717
host: {'class': 'a11y-demo-sidenav-app'},
1818
encapsulation: ViewEncapsulation.None,
19-
preserveWhitespaces: false,
2019
})
2120
export class SidenavBasicAccessibilityDemo {}

0 commit comments

Comments
 (0)