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

Commit ff7b516

Browse files
SplaktarSplaktar
authored
build: run ng update migrations for v12-next (#932)
* build: run ng update migrations for v12-next - update StackBlitz for v12-next - add v12-next to version list - fix warnings about `--prod` being deprecated * build: update to Angular 12.0.0-next.5 and typescript 4.2.3 - this fixes the broken form-field examples * build: update to Angular CLI 12.0.0-next.5
1 parent 41738f3 commit ff7b516

File tree

13 files changed

+240
-214
lines changed

13 files changed

+240
-214
lines changed

‎package.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"ng": "ng",
88
"start": "ng serve",
99
"start:jit": "ng serve --aot=false",
10-
"start:prod": "ng serve --prod",
10+
"start:prod": "ng serve --configuration production",
1111
"start:scenes": "ng serve scenes",
1212
"start:emulators": "firebase emulators:start",
1313
"lint": "ng lint",
@@ -16,8 +16,8 @@
1616
"build": "ng build",
1717
"build:scenes": "ng build scenes",
1818
"build:content": "yarn upgrade @angular/components-examples",
19-
"build:sm": "ng build --prod --source-map",
20-
"prod-build": "ng build --prod",
19+
"build:sm": "ng build --configuration production --source-map",
20+
"prod-build": "ng build --configuration production",
2121
"postinstall": "ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points",
2222
"publish-prod": "bash ./tools/deploy.sh stable prod",
2323
"publish-dev": "bash ./tools/deploy.sh",
@@ -34,36 +34,36 @@
3434
},
3535
"private": true,
3636
"dependencies": {
37-
"@angular/animations": "^12.0.0-next.4",
37+
"@angular/animations": "^12.0.0-next.5",
3838
"@angular/cdk": "^12.0.0-next.3",
3939
"@angular/cdk-experimental": "^12.0.0-next.3",
40-
"@angular/common": "^12.0.0-next.4",
41-
"@angular/compiler": "^12.0.0-next.4",
40+
"@angular/common": "^12.0.0-next.5",
41+
"@angular/compiler": "^12.0.0-next.5",
4242
"@angular/components-examples": "angular/material2-docs-content#master",
43-
"@angular/core": "^12.0.0-next.4",
44-
"@angular/forms": "^12.0.0-next.4",
43+
"@angular/core": "^12.0.0-next.5",
44+
"@angular/forms": "^12.0.0-next.5",
4545
"@angular/google-maps": "^12.0.0-next.3",
4646
"@angular/material": "^12.0.0-next.3",
4747
"@angular/material-experimental": "^12.0.0-next.3",
4848
"@angular/material-moment-adapter": "^12.0.0-next.3",
49-
"@angular/platform-browser": "^12.0.0-next.4",
50-
"@angular/platform-browser-dynamic": "^12.0.0-next.4",
51-
"@angular/router": "^12.0.0-next.4",
49+
"@angular/platform-browser": "^12.0.0-next.5",
50+
"@angular/platform-browser-dynamic": "^12.0.0-next.5",
51+
"@angular/router": "^12.0.0-next.5",
5252
"@angular/youtube-player": "^12.0.0-next.3",
5353
"material-components-web": "10.0.0-canary.2ed2d829b.0",
5454
"moment": "^2.29.1",
5555
"rxjs": "^6.6.6",
5656
"tslib": "^2.1.0",
57-
"zone.js": "^0.11.4"
57+
"zone.js": "~0.11.4"
5858
},
5959
"devDependencies": {
60-
"@angular-devkit/build-angular": "^0.1200.0-next.4",
61-
"@angular/cli": "^12.0.0-next.4",
62-
"@angular/compiler-cli": "^12.0.0-next.4",
63-
"@angular/localize": "^12.0.0-next.4",
60+
"@angular-devkit/build-angular": "^0.1200.0-next.5",
61+
"@angular/cli": "^12.0.0-next.5",
62+
"@angular/compiler-cli": "^12.0.0-next.5",
63+
"@angular/localize": "^12.0.0-next.5",
6464
"@types/imagemin": "^7.0.0",
6565
"@types/jasmine": "^3.6.6",
66-
"@types/node": "^12.20.5",
66+
"@types/node": "^12.20.6",
6767
"@types/shelljs": "~0.8.8",
6868
"codelyzer": "^6.0.1",
6969
"firebase-tools": "^9.6.0",
@@ -86,6 +86,6 @@
8686
"shelljs": "^0.8.4",
8787
"ts-node": "^8.10.2",
8888
"tslint": "^6.1.3",
89-
"typescript": "~4.1.5"
89+
"typescript": "~4.2.3"
9090
}
9191
}

‎scenes/src/environments/environment.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ export const environment = {
1313
* This import should be commented out in production mode because it will have a negative impact
1414
* on performance if an error is thrown.
1515
*/
16-
// import 'zone.js/dist/zone-error'; // Included with Angular CLI.
16+
// import 'zone.js/plugins/zone-error'; // Included with Angular CLI.

‎scenes/src/polyfills.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
/***************************************************************************************************
5959
* Zone JS is required by default for Angular itself.
6060
*/
61-
import 'zone.js/dist/zone'; // Included with Angular CLI.
61+
import 'zone.js'; // Included with Angular CLI.
6262

6363

6464
/***************************************************************************************************

‎scenes/src/test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
22

3-
import 'zone.js/dist/zone-testing';
3+
import 'zone.js/testing';
44
import { getTestBed } from '@angular/core/testing';
55
import {
66
BrowserDynamicTestingModule,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const TEST_TEMPLATE_FILES = [
5757
];
5858

5959
const TAGS: string[] = ['angular', 'material', 'example'];
60-
const angularVersion = '^11.0.0';
60+
const angularVersion = '^12.0.0-next.0';
6161

6262
const dependencies = {
6363
'@angular/cdk': materialVersion,

‎src/assets/stack-blitz-tests/package.json

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,34 @@
1111
},
1212
"private": true,
1313
"dependencies": {
14-
"@angular/animations": "^11.0.0",
15-
"@angular/cdk": "^11.0.0",
16-
"@angular/common": "^11.0.0",
17-
"@angular/compiler": "^11.0.0",
18-
"@angular/core": "^11.0.0",
19-
"@angular/forms": "^11.0.0",
20-
"@angular/material": "^11.0.0",
21-
"@angular/material-moment-adapter": "^11.0.0",
22-
"@angular/platform-browser": "^11.0.0",
23-
"@angular/platform-browser-dynamic": "^11.0.0",
24-
"@angular/router": "^11.0.0",
14+
"@angular/animations": "^12.0.0-next.0",
15+
"@angular/cdk": "^12.0.0-next.0",
16+
"@angular/common": "^12.0.0-next.0",
17+
"@angular/compiler": "^12.0.0-next.0",
18+
"@angular/core": "^12.0.0-next.0",
19+
"@angular/forms": "^12.0.0-next.0",
20+
"@angular/material": "^12.0.0-next.0",
21+
"@angular/material-moment-adapter": "^12.0.0-next.0",
22+
"@angular/platform-browser": "^12.0.0-next.0",
23+
"@angular/platform-browser-dynamic": "^12.0.0-next.0",
24+
"@angular/router": "^12.0.0-next.0",
2525
"angular-in-memory-web-api": "~0.11.0",
2626
"moment": "^2.29.1",
27-
"rxjs": "^6.6.3",
28-
"tslib": "^2.0.3",
29-
"zone.js": "^0.11.2"
27+
"rxjs": "^6.6.6",
28+
"tslib": "^2.1.0",
29+
"zone.js": "^0.11.4"
3030
},
3131
"devDependencies": {
32-
"@angular-devkit/build-angular": "0.1100.0",
33-
"@angular/cli": "^11.0.0",
34-
"@angular/compiler-cli": "^11.0.0",
35-
"@angular/language-service": "^11.0.0",
36-
"@angular/localize": "^11.0.0",
37-
"@types/jasmine": "^3.6.0",
38-
"@types/node": "^12.12.70",
32+
"@angular-devkit/build-angular": "0.1200.0-next.4",
33+
"@angular/cli": "^12.0.0-next.4",
34+
"@angular/compiler-cli": "^12.0.0-next.0",
35+
"@angular/language-service": "^12.0.0-next.0",
36+
"@angular/localize": "^12.0.0-next.0",
37+
"@types/jasmine": "^3.6.6",
38+
"@types/node": "^12.20.6",
3939
"codelyzer": "^6.0.1",
40-
"ts-node": "^8.10.1",
40+
"ts-node": "^8.10.2",
4141
"tslint": "~6.1.2",
42-
"typescript": "~4.0.2"
42+
"typescript": "~4.1.5"
4343
}
4444
}

‎src/assets/stack-blitz-tests/src/polyfills.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import 'zone.js/dist/zone';
1+
import 'zone.js';

‎src/assets/stack-blitz/package.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,30 @@
1111
},
1212
"private": true,
1313
"dependencies": {
14-
"@angular/animations": "^11.0.0",
15-
"@angular/cdk": "^11.0.0",
16-
"@angular/common": "^11.0.0",
17-
"@angular/compiler": "^11.0.0",
18-
"@angular/core": "^11.0.0",
19-
"@angular/forms": "^11.0.0",
20-
"@angular/material": "^11.0.0",
21-
"@angular/material-moment-adapter": "^11.0.0",
22-
"@angular/platform-browser": "^11.0.0",
23-
"@angular/platform-browser-dynamic": "^11.0.0",
24-
"@angular/router": "^11.0.0",
14+
"@angular/animations": "^12.0.0-next.0",
15+
"@angular/cdk": "^12.0.0-next.0",
16+
"@angular/common": "^12.0.0-next.0",
17+
"@angular/compiler": "^12.0.0-next.0",
18+
"@angular/core": "^12.0.0-next.0",
19+
"@angular/forms": "^12.0.0-next.0",
20+
"@angular/material": "^12.0.0-next.0",
21+
"@angular/material-moment-adapter": "^12.0.0-next.0",
22+
"@angular/platform-browser": "^12.0.0-next.0",
23+
"@angular/platform-browser-dynamic": "^12.0.0-next.0",
24+
"@angular/router": "^12.0.0-next.0",
2525
"angular-in-memory-web-api": "~0.11.0",
2626
"moment": "^2.29.1",
2727
"rxjs": "^6.6.6",
2828
"tslib": "^2.1.0",
2929
"zone.js": "^0.11.4"
3030
},
3131
"devDependencies": {
32-
"@angular-devkit/build-angular": "^0.1102.4",
33-
"@angular/cli": "^11.2.4",
34-
"@angular/compiler-cli": "^11.0.0",
35-
"@angular/language-service": "^11.0.0",
36-
"@angular/localize": "^11.0.0",
37-
"@types/node": "^12.20.5",
32+
"@angular-devkit/build-angular": "^0.1200.0-next.4",
33+
"@angular/cli": "^12.0.0-next.4",
34+
"@angular/compiler-cli": "^12.0.0-next.0",
35+
"@angular/language-service": "^12.0.0-next.0",
36+
"@angular/localize": "^12.0.0-next.0",
37+
"@types/node": "^12.20.6",
3838
"codelyzer": "^6.0.1",
3939
"ts-node": "^8.10.2",
4040
"tslint": "~6.1.3",

‎src/assets/stack-blitz/src/polyfills.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import 'zone.js/dist/zone';
1+
import 'zone.js';

‎src/assets/versions.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,9 @@
2626
{
2727
"url": "https://material.angular.io/",
2828
"title": "11.2.4"
29+
},
30+
{
31+
"url": "https://next.material.angular.io/",
32+
"title": "12.0.0-next.3"
2933
}
3034
]

‎src/polyfills.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
/***************************************************************************************************
5959
* Zone JS is required by default for Angular itself.
6060
*/
61-
import 'zone.js/dist/zone'; // Included with Angular CLI.
61+
import 'zone.js'; // Included with Angular CLI.
6262

6363

6464
/***************************************************************************************************

‎src/test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
22

3-
import 'zone.js/dist/zone-testing';
3+
import 'zone.js/testing';
44
import {getTestBed} from '@angular/core/testing';
55
import {
66
BrowserDynamicTestingModule,

0 commit comments

Comments
 (0)