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

build: run ng update migrations for v12-next #932

Merged
merged 3 commits into from
Mar 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 18 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"ng": "ng",
"start": "ng serve",
"start:jit": "ng serve --aot=false",
"start:prod": "ng serve --prod",
"start:prod": "ng serve --configuration production",
"start:scenes": "ng serve scenes",
"start:emulators": "firebase emulators:start",
"lint": "ng lint",
Expand All @@ -16,8 +16,8 @@
"build": "ng build",
"build:scenes": "ng build scenes",
"build:content": "yarn upgrade @angular/components-examples",
"build:sm": "ng build --prod --source-map",
"prod-build": "ng build --prod",
"build:sm": "ng build --configuration production --source-map",
"prod-build": "ng build --configuration production",
"postinstall": "ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points",
"publish-prod": "bash ./tools/deploy.sh stable prod",
"publish-dev": "bash ./tools/deploy.sh",
Expand All @@ -34,36 +34,36 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^12.0.0-next.4",
"@angular/animations": "^12.0.0-next.5",
"@angular/cdk": "^12.0.0-next.3",
"@angular/cdk-experimental": "^12.0.0-next.3",
"@angular/common": "^12.0.0-next.4",
"@angular/compiler": "^12.0.0-next.4",
"@angular/common": "^12.0.0-next.5",
"@angular/compiler": "^12.0.0-next.5",
"@angular/components-examples": "angular/material2-docs-content#master",
"@angular/core": "^12.0.0-next.4",
"@angular/forms": "^12.0.0-next.4",
"@angular/core": "^12.0.0-next.5",
"@angular/forms": "^12.0.0-next.5",
"@angular/google-maps": "^12.0.0-next.3",
"@angular/material": "^12.0.0-next.3",
"@angular/material-experimental": "^12.0.0-next.3",
"@angular/material-moment-adapter": "^12.0.0-next.3",
"@angular/platform-browser": "^12.0.0-next.4",
"@angular/platform-browser-dynamic": "^12.0.0-next.4",
"@angular/router": "^12.0.0-next.4",
"@angular/platform-browser": "^12.0.0-next.5",
"@angular/platform-browser-dynamic": "^12.0.0-next.5",
"@angular/router": "^12.0.0-next.5",
"@angular/youtube-player": "^12.0.0-next.3",
"material-components-web": "10.0.0-canary.2ed2d829b.0",
"moment": "^2.29.1",
"rxjs": "^6.6.6",
"tslib": "^2.1.0",
"zone.js": "^0.11.4"
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.1200.0-next.4",
"@angular/cli": "^12.0.0-next.4",
"@angular/compiler-cli": "^12.0.0-next.4",
"@angular/localize": "^12.0.0-next.4",
"@angular-devkit/build-angular": "^0.1200.0-next.5",
"@angular/cli": "^12.0.0-next.5",
"@angular/compiler-cli": "^12.0.0-next.5",
"@angular/localize": "^12.0.0-next.5",
"@types/imagemin": "^7.0.0",
"@types/jasmine": "^3.6.6",
"@types/node": "^12.20.5",
"@types/node": "^12.20.6",
"@types/shelljs": "~0.8.8",
"codelyzer": "^6.0.1",
"firebase-tools": "^9.6.0",
Expand All @@ -86,6 +86,6 @@
"shelljs": "^0.8.4",
"ts-node": "^8.10.2",
"tslint": "^6.1.3",
"typescript": "~4.1.5"
"typescript": "~4.2.3"
}
}
2 changes: 1 addition & 1 deletion scenes/src/environments/environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ export const environment = {
* This import should be commented out in production mode because it will have a negative impact
* on performance if an error is thrown.
*/
// import 'zone.js/dist/zone-error'; // Included with Angular CLI.
// import 'zone.js/plugins/zone-error'; // Included with Angular CLI.
2 changes: 1 addition & 1 deletion scenes/src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
/***************************************************************************************************
* Zone JS is required by default for Angular itself.
*/
import 'zone.js/dist/zone'; // Included with Angular CLI.
import 'zone.js'; // Included with Angular CLI.


/***************************************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion scenes/src/test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files

import 'zone.js/dist/zone-testing';
import 'zone.js/testing';
import { getTestBed } from '@angular/core/testing';
import {
BrowserDynamicTestingModule,
Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/stack-blitz/stack-blitz-writer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const TEST_TEMPLATE_FILES = [
];

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

const dependencies = {
'@angular/cdk': materialVersion,
Expand Down
46 changes: 23 additions & 23 deletions src/assets/stack-blitz-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,34 +11,34 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^11.0.0",
"@angular/cdk": "^11.0.0",
"@angular/common": "^11.0.0",
"@angular/compiler": "^11.0.0",
"@angular/core": "^11.0.0",
"@angular/forms": "^11.0.0",
"@angular/material": "^11.0.0",
"@angular/material-moment-adapter": "^11.0.0",
"@angular/platform-browser": "^11.0.0",
"@angular/platform-browser-dynamic": "^11.0.0",
"@angular/router": "^11.0.0",
"@angular/animations": "^12.0.0-next.0",
"@angular/cdk": "^12.0.0-next.0",
"@angular/common": "^12.0.0-next.0",
"@angular/compiler": "^12.0.0-next.0",
"@angular/core": "^12.0.0-next.0",
"@angular/forms": "^12.0.0-next.0",
"@angular/material": "^12.0.0-next.0",
"@angular/material-moment-adapter": "^12.0.0-next.0",
"@angular/platform-browser": "^12.0.0-next.0",
"@angular/platform-browser-dynamic": "^12.0.0-next.0",
"@angular/router": "^12.0.0-next.0",
"angular-in-memory-web-api": "~0.11.0",
"moment": "^2.29.1",
"rxjs": "^6.6.3",
"tslib": "^2.0.3",
"zone.js": "^0.11.2"
"rxjs": "^6.6.6",
"tslib": "^2.1.0",
"zone.js": "^0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "0.1100.0",
"@angular/cli": "^11.0.0",
"@angular/compiler-cli": "^11.0.0",
"@angular/language-service": "^11.0.0",
"@angular/localize": "^11.0.0",
"@types/jasmine": "^3.6.0",
"@types/node": "^12.12.70",
"@angular-devkit/build-angular": "0.1200.0-next.4",
"@angular/cli": "^12.0.0-next.4",
"@angular/compiler-cli": "^12.0.0-next.0",
"@angular/language-service": "^12.0.0-next.0",
"@angular/localize": "^12.0.0-next.0",
"@types/jasmine": "^3.6.6",
"@types/node": "^12.20.6",
"codelyzer": "^6.0.1",
"ts-node": "^8.10.1",
"ts-node": "^8.10.2",
"tslint": "~6.1.2",
"typescript": "~4.0.2"
"typescript": "~4.1.5"
}
}
2 changes: 1 addition & 1 deletion src/assets/stack-blitz-tests/src/polyfills.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
import 'zone.js/dist/zone';
import 'zone.js';
34 changes: 17 additions & 17 deletions src/assets/stack-blitz/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,30 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^11.0.0",
"@angular/cdk": "^11.0.0",
"@angular/common": "^11.0.0",
"@angular/compiler": "^11.0.0",
"@angular/core": "^11.0.0",
"@angular/forms": "^11.0.0",
"@angular/material": "^11.0.0",
"@angular/material-moment-adapter": "^11.0.0",
"@angular/platform-browser": "^11.0.0",
"@angular/platform-browser-dynamic": "^11.0.0",
"@angular/router": "^11.0.0",
"@angular/animations": "^12.0.0-next.0",
"@angular/cdk": "^12.0.0-next.0",
"@angular/common": "^12.0.0-next.0",
"@angular/compiler": "^12.0.0-next.0",
"@angular/core": "^12.0.0-next.0",
"@angular/forms": "^12.0.0-next.0",
"@angular/material": "^12.0.0-next.0",
"@angular/material-moment-adapter": "^12.0.0-next.0",
"@angular/platform-browser": "^12.0.0-next.0",
"@angular/platform-browser-dynamic": "^12.0.0-next.0",
"@angular/router": "^12.0.0-next.0",
"angular-in-memory-web-api": "~0.11.0",
"moment": "^2.29.1",
"rxjs": "^6.6.6",
"tslib": "^2.1.0",
"zone.js": "^0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.1102.4",
"@angular/cli": "^11.2.4",
"@angular/compiler-cli": "^11.0.0",
"@angular/language-service": "^11.0.0",
"@angular/localize": "^11.0.0",
"@types/node": "^12.20.5",
"@angular-devkit/build-angular": "^0.1200.0-next.4",
"@angular/cli": "^12.0.0-next.4",
"@angular/compiler-cli": "^12.0.0-next.0",
"@angular/language-service": "^12.0.0-next.0",
"@angular/localize": "^12.0.0-next.0",
"@types/node": "^12.20.6",
"codelyzer": "^6.0.1",
"ts-node": "^8.10.2",
"tslint": "~6.1.3",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/stack-blitz/src/polyfills.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
import 'zone.js/dist/zone';
import 'zone.js';
4 changes: 4 additions & 0 deletions src/assets/versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,9 @@
{
"url": "https://material.angular.io/",
"title": "11.2.4"
},
{
"url": "https://next.material.angular.io/",
"title": "12.0.0-next.3"
}
]
2 changes: 1 addition & 1 deletion src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
/***************************************************************************************************
* Zone JS is required by default for Angular itself.
*/
import 'zone.js/dist/zone'; // Included with Angular CLI.
import 'zone.js'; // Included with Angular CLI.


/***************************************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion src/test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files

import 'zone.js/dist/zone-testing';
import 'zone.js/testing';
import {getTestBed} from '@angular/core/testing';
import {
BrowserDynamicTestingModule,
Expand Down
Loading