Skip to content
This repository was archived by the owner on Dec 18, 2024. It is now read-only.

Commit 3698d8c

Browse files
authored
build: update to Angular 15 (#1170)
Updates to Angular 15 and TS 4.8.
1 parent 1bf01ad commit 3698d8c

File tree

5 files changed

+2748
-2647
lines changed

5 files changed

+2748
-2647
lines changed

package.json

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -34,45 +34,45 @@
3434
},
3535
"private": true,
3636
"dependencies": {
37-
"@angular/animations": "^14.0.0",
38-
"@angular/cdk": "^14.0.0",
39-
"@angular/cdk-experimental": "^14.0.0",
40-
"@angular/common": "^14.0.0",
41-
"@angular/compiler": "^14.0.0",
42-
"@angular/components-examples": "https://github.com/angular/material2-docs-content.git#9bd54cb435a675b1880f4026a64eb9f1677e7087",
43-
"@angular/core": "^14.0.0",
44-
"@angular/forms": "^14.0.0",
45-
"@angular/google-maps": "^14.0.0",
46-
"@angular/localize": "^14.0.0",
47-
"@angular/material": "^14.0.0",
48-
"@angular/material-experimental": "^14.0.0",
49-
"@angular/material-moment-adapter": "^14.0.0",
50-
"@angular/platform-browser": "14.0.0",
51-
"@angular/platform-browser-dynamic": "14.0.0",
52-
"@angular/router": "14.0.0",
53-
"@angular/youtube-player": "^14.0.0",
37+
"@angular/animations": "^15.0.0-next.0",
38+
"@angular/cdk": "^15.0.0-next.0",
39+
"@angular/cdk-experimental": "^15.0.0-next.0",
40+
"@angular/common": "^15.0.0-next.0",
41+
"@angular/compiler": "^15.0.0-next.0",
42+
"@angular/components-examples": "https://github.com/angular/material2-docs-content.git#e4dc811b9dd3ece98df7ce2cfd687e4db5f60329",
43+
"@angular/core": "^15.0.0-next.0",
44+
"@angular/forms": "^15.0.0-next.0",
45+
"@angular/google-maps": "^15.0.0-next.0",
46+
"@angular/localize": "^15.0.0-next.0",
47+
"@angular/material": "^15.0.0-next.0",
48+
"@angular/material-experimental": "^15.0.0-next.0",
49+
"@angular/material-moment-adapter": "^15.0.0-next.0",
50+
"@angular/platform-browser": "^15.0.0-next.0",
51+
"@angular/platform-browser-dynamic": "^15.0.0-next.0",
52+
"@angular/router": "^15.0.0-next.0",
53+
"@angular/youtube-player": "^15.0.0-next.0",
5454
"@stackblitz/sdk": "^1.5.2",
55-
"material-components-web": "15.0.0-canary.10196647d.0",
55+
"material-components-web": "15.0.0-canary.c363f267b.0",
5656
"moment": "^2.29.1",
5757
"rxjs": "^6.6.7",
5858
"tslib": "^2.3.0",
5959
"zone.js": "~0.11.5"
6060
},
6161
"devDependencies": {
62-
"@angular-devkit/build-angular": "^14.0.0",
63-
"@angular-eslint/builder": "^13.1.0",
64-
"@angular-eslint/eslint-plugin": "^13.1.0",
65-
"@angular-eslint/eslint-plugin-template": "^13.1.0",
66-
"@angular-eslint/template-parser": "^13.1.0",
67-
"@angular/cli": "^14.0.0",
68-
"@angular/compiler-cli": "^14.0.0",
62+
"@angular-devkit/build-angular": "^15.0.0-next.0",
63+
"@angular-eslint/builder": "^14.0.0",
64+
"@angular-eslint/eslint-plugin": "^14.0.0",
65+
"@angular-eslint/eslint-plugin-template": "^14.0.0",
66+
"@angular-eslint/template-parser": "^14.0.0",
67+
"@angular/cli": "^15.0.0-next.0",
68+
"@angular/compiler-cli": "^15.0.0-next.0",
6969
"@types/imagemin": "^7.0.0",
7070
"@types/jasmine": "^3.7.7",
7171
"@types/node": "^14.14.22",
7272
"@types/shelljs": "~0.8.8",
73-
"@typescript-eslint/eslint-plugin": "5.2.0",
74-
"@typescript-eslint/parser": "5.2.0",
75-
"eslint": "^7.6.0",
73+
"@typescript-eslint/eslint-plugin": "^5.37.0",
74+
"@typescript-eslint/parser": "^5.37.0",
75+
"eslint": "^8.23.1",
7676
"eslint-plugin-ban": "^1.5.2",
7777
"eslint-plugin-import": "^2.22.1",
7878
"eslint-plugin-jsdoc": "^32.3.0",
@@ -96,6 +96,6 @@
9696
"puppeteer": "~8.0.0",
9797
"shelljs": "^0.8.4",
9898
"ts-node": "^8.10.2",
99-
"typescript": "~4.7.2"
99+
"typescript": "~4.8.2"
100100
}
101101
}

src/app/pages/component-viewer/component-viewer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
ViewChildren,
1313
ViewEncapsulation,
1414
} from '@angular/core';
15-
import {MatTabsModule} from '@angular/material/tabs';
15+
import {MatLegacyTabsModule} from '@angular/material/legacy-tabs';
1616
import {ActivatedRoute, Params, Router, RouterModule} from '@angular/router';
1717
import {combineLatest, Observable, ReplaySubject, Subject} from 'rxjs';
1818
import {map, skip, takeUntil} from 'rxjs/operators';
@@ -193,7 +193,7 @@ export class ComponentExamples extends ComponentBaseView {
193193

194194
@NgModule({
195195
imports: [
196-
MatTabsModule,
196+
MatLegacyTabsModule,
197197
RouterModule,
198198
DocViewerModule,
199199
CommonModule,

src/app/shared/doc-viewer/doc-viewer.spec.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ class DocViewerTestComponent {
153153
}
154154

155155
const FAKE_DOCS: {[key: string]: string} = {
156+
/* eslint-disable @typescript-eslint/naming-convention */
156157
'http://material.angular.io/simple-doc.html': '<div>my docs page</div>',
157158
'http://material.angular.io/doc-with-example.html': `
158159
<div>Check out this example:</div>
@@ -166,4 +167,5 @@ const FAKE_DOCS: {[key: string]: string} = {
166167
'<div material-docs-example="demo-example"></div>',
167168
'http://material.angular.io/whole-snippet-example.html':
168169
'<div material-docs-example="whole-snippet-example" file="whole-snippet-example.ts"></div>',
170+
/* eslint-enable @typescript-eslint/naming-convention */
169171
};

src/app/shared/stack-blitz/stack-blitz-writer.spec.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ const testExampleId = 'my-test-example-id';
88
const testExampleBasePath = `/docs-content/examples-source/cdk/my-comp/${testExampleId}`;
99

1010
const FAKE_DOCS: {[key: string]: string} = {
11+
/* eslint-disable @typescript-eslint/naming-convention */
1112
'/assets/stack-blitz/src/index.html': '<material-docs-example></material-docs-example>',
1213
'/assets/stack-blitz/src/app/app.module.ts':
1314
`import {MaterialDocsExample} from './material-docs-example';`,
15+
/* eslint-enable @typescript-eslint/naming-convention */
1416
[`${testExampleBasePath}/test.ts`]: 'ExampleComponent',
1517
[`${testExampleBasePath}/test.html`]: `<example></example>`,
1618
[`${testExampleBasePath}/src/detail.ts`]: 'DetailComponent',
@@ -108,6 +110,7 @@ describe('StackBlitzWriter', () => {
108110
flushMicrotasks();
109111

110112
const expectedFiles = jasmine.objectContaining({
113+
/* eslint-disable @typescript-eslint/naming-convention */
111114
'angular.json': 'fake',
112115
'src/main.ts': 'fake',
113116
'src/test.ts': 'fake',
@@ -118,6 +121,7 @@ describe('StackBlitzWriter', () => {
118121
/** Copyright ${new Date().getFullYear()} Google LLC. All Rights Reserved.
119122
Use of this source code is governed by an MIT-style license that
120123
can be found in the LICENSE file at https://angular.io/license */`,
124+
/* eslint-enable @typescript-eslint/naming-convention */
121125
});
122126

123127
expect(openProjectSpy).toHaveBeenCalledTimes(1);

0 commit comments

Comments
 (0)