⬆️ Update to Angular 12
ng update @angular/animations@12 @angular/cdk@12 @angular/common@12 @angular/compiler@12 @angular/core@12 @angular/flex-layout@12.0.0-beta.35 @angular/forms@12 @angular/material@12 @angular/platform-browser@12 @angular/platform-browser-dynamic@12 @angular/router@12 @angular-devkit/build-angular@12 @angular/cli@12 @angular/compiler-cli@12 @angular/language-service@12merge-requests/3/head
parent
91c9fdca31
commit
28f89c6b09
24
angular.json
24
angular.json
|
@ -29,7 +29,6 @@
|
||||||
"main": "src/main.ts",
|
"main": "src/main.ts",
|
||||||
"polyfills": "src/polyfills.ts",
|
"polyfills": "src/polyfills.ts",
|
||||||
"tsConfig": "tsconfig.app.json",
|
"tsConfig": "tsconfig.app.json",
|
||||||
"aot": true,
|
|
||||||
"assets": [
|
"assets": [
|
||||||
"src/favicon.png",
|
"src/favicon.png",
|
||||||
"src/assets"
|
"src/assets"
|
||||||
|
@ -37,7 +36,13 @@
|
||||||
"styles": [
|
"styles": [
|
||||||
"src/styles.scss"
|
"src/styles.scss"
|
||||||
],
|
],
|
||||||
"scripts": []
|
"scripts": [],
|
||||||
|
"vendorChunk": true,
|
||||||
|
"extractLicenses": false,
|
||||||
|
"buildOptimizer": false,
|
||||||
|
"sourceMap": true,
|
||||||
|
"optimization": false,
|
||||||
|
"namedChunks": true
|
||||||
},
|
},
|
||||||
"configurations": {
|
"configurations": {
|
||||||
"production": {
|
"production": {
|
||||||
|
@ -49,11 +54,7 @@
|
||||||
],
|
],
|
||||||
"optimization": true,
|
"optimization": true,
|
||||||
"outputHashing": "all",
|
"outputHashing": "all",
|
||||||
"sourceMap": true,
|
|
||||||
"namedChunks": true,
|
|
||||||
"aot": true,
|
|
||||||
"extractLicenses": true,
|
"extractLicenses": true,
|
||||||
"vendorChunk": true,
|
|
||||||
"buildOptimizer": true,
|
"buildOptimizer": true,
|
||||||
"budgets": [
|
"budgets": [
|
||||||
{
|
{
|
||||||
|
@ -77,11 +78,7 @@
|
||||||
],
|
],
|
||||||
"optimization": true,
|
"optimization": true,
|
||||||
"outputHashing": "all",
|
"outputHashing": "all",
|
||||||
"sourceMap": true,
|
|
||||||
"namedChunks": true,
|
|
||||||
"aot": true,
|
|
||||||
"extractLicenses": true,
|
"extractLicenses": true,
|
||||||
"vendorChunk": true,
|
|
||||||
"buildOptimizer": true,
|
"buildOptimizer": true,
|
||||||
"budgets": [
|
"budgets": [
|
||||||
{
|
{
|
||||||
|
@ -105,11 +102,7 @@
|
||||||
],
|
],
|
||||||
"optimization": true,
|
"optimization": true,
|
||||||
"outputHashing": "all",
|
"outputHashing": "all",
|
||||||
"sourceMap": true,
|
|
||||||
"namedChunks": true,
|
|
||||||
"aot": true,
|
|
||||||
"extractLicenses": true,
|
"extractLicenses": true,
|
||||||
"vendorChunk": true,
|
|
||||||
"buildOptimizer": true,
|
"buildOptimizer": true,
|
||||||
"budgets": [
|
"budgets": [
|
||||||
{
|
{
|
||||||
|
@ -124,7 +117,8 @@
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
|
"defaultConfiguration": ""
|
||||||
},
|
},
|
||||||
"serve": {
|
"serve": {
|
||||||
"builder": "@angular-devkit/build-angular:dev-server",
|
"builder": "@angular-devkit/build-angular:dev-server",
|
||||||
|
|
36
package.json
36
package.json
|
@ -16,35 +16,35 @@
|
||||||
},
|
},
|
||||||
"private": false,
|
"private": false,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/animations": "~11.2.6",
|
"@angular/animations": "~12.2.16",
|
||||||
"@angular/cdk": "~11.2.5",
|
"@angular/cdk": "~12.2.13",
|
||||||
"@angular/common": "~11.2.6",
|
"@angular/common": "~12.2.16",
|
||||||
"@angular/compiler": "~11.2.6",
|
"@angular/compiler": "~12.2.16",
|
||||||
"@angular/core": "~11.2.6",
|
"@angular/core": "~12.2.16",
|
||||||
"@angular/flex-layout": "^11.0.0-beta.33",
|
"@angular/flex-layout": "^12.0.0-beta.35",
|
||||||
"@angular/forms": "~11.2.6",
|
"@angular/forms": "~12.2.16",
|
||||||
"@angular/material": "^11.2.5",
|
"@angular/material": "^12.2.13",
|
||||||
"@angular/platform-browser": "~11.2.6",
|
"@angular/platform-browser": "~12.2.16",
|
||||||
"@angular/platform-browser-dynamic": "~11.2.6",
|
"@angular/platform-browser-dynamic": "~12.2.16",
|
||||||
"@angular/router": "~11.2.6",
|
"@angular/router": "~12.2.16",
|
||||||
"bootstrap": "^4.5.0",
|
"bootstrap": "^4.5.0",
|
||||||
"ipfs-css": "^1.2.0",
|
"ipfs-css": "^1.2.0",
|
||||||
"rxjs": "~6.6.0",
|
"rxjs": "~6.6.0",
|
||||||
"tslib": "^2.0.0",
|
"tslib": "^2.0.0",
|
||||||
"zone.js": "~0.10.3"
|
"zone.js": "~0.11.4"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@angular-devkit/build-angular": "~0.1102.5",
|
"@angular-devkit/build-angular": "~12.2.16",
|
||||||
"@angular/cli": "~11.2.5",
|
"@angular/cli": "~12.2.16",
|
||||||
"@angular/compiler-cli": "~11.2.6",
|
"@angular/compiler-cli": "~12.2.16",
|
||||||
"@angular/language-service": "~11.2.6",
|
"@angular/language-service": "~12.2.16",
|
||||||
"@types/jasmine": "~3.6.0",
|
"@types/jasmine": "~3.6.0",
|
||||||
"@types/jasminewd2": "~2.0.3",
|
"@types/jasminewd2": "~2.0.3",
|
||||||
"@types/node": "^12.11.1",
|
"@types/node": "^12.11.1",
|
||||||
"codelyzer": "^6.0.0",
|
"codelyzer": "^6.0.0",
|
||||||
"jasmine-core": "~3.6.0",
|
"jasmine-core": "~3.6.0",
|
||||||
"jasmine-spec-reporter": "~5.0.0",
|
"jasmine-spec-reporter": "~5.0.0",
|
||||||
"karma": "~6.2.0",
|
"karma": "~6.3.17",
|
||||||
"karma-chrome-launcher": "~3.1.0",
|
"karma-chrome-launcher": "~3.1.0",
|
||||||
"karma-coverage-istanbul-reporter": "~3.0.2",
|
"karma-coverage-istanbul-reporter": "~3.0.2",
|
||||||
"karma-jasmine": "~4.0.0",
|
"karma-jasmine": "~4.0.0",
|
||||||
|
@ -56,6 +56,6 @@
|
||||||
"tslint-consistent-codestyle": "^1.16.0",
|
"tslint-consistent-codestyle": "^1.16.0",
|
||||||
"tslint-origin-ordered-imports-rule": "^1.3.0-0",
|
"tslint-origin-ordered-imports-rule": "^1.3.0-0",
|
||||||
"tslint-rxjs-subject-restrictions-rule": "^1.0.4",
|
"tslint-rxjs-subject-restrictions-rule": "^1.0.4",
|
||||||
"typescript": "~4.1.5"
|
"typescript": "~4.3.5"
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -17,4 +17,4 @@ export const environment: Environment = {
|
||||||
* This import should be commented out in production mode because it will have a negative impact
|
* This import should be commented out in production mode because it will have a negative impact
|
||||||
* on performance if an error is thrown.
|
* 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.
|
||||||
|
|
|
@ -55,7 +55,7 @@
|
||||||
/***************************************************************************************************
|
/***************************************************************************************************
|
||||||
* Zone JS is required by default for Angular itself.
|
* 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.
|
||||||
|
|
||||||
|
|
||||||
/***************************************************************************************************
|
/***************************************************************************************************
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
// Custom Theming for Angular Material
|
// Custom Theming for Angular Material
|
||||||
|
@use '~@angular/material' as mat;
|
||||||
// For more information: https://material.angular.io/guide/theming
|
// For more information: https://material.angular.io/guide/theming
|
||||||
@import '~@angular/material/theming';
|
|
||||||
// Plus imports for other components in your app.
|
// Plus imports for other components in your app.
|
||||||
|
|
||||||
// Include the common styles for Angular Material. We include this here so that you only
|
// Include the common styles for Angular Material. We include this here so that you only
|
||||||
// have to load a single css file for Angular Material in your app.
|
// have to load a single css file for Angular Material in your app.
|
||||||
// Be sure that you only ever include this mixin once!
|
// Be sure that you only ever include this mixin once!
|
||||||
@include mat-core();
|
@include mat.core();
|
||||||
|
|
||||||
// // Define the palettes for your theme using the Material Design palettes available in palette.scss
|
// // Define the palettes for your theme using the Material Design palettes available in palette.scss
|
||||||
// // (imported above). For each palette, you can optionally specify a default, lighter, and darker
|
// // (imported above). For each palette, you can optionally specify a default, lighter, and darker
|
||||||
|
@ -28,11 +28,11 @@
|
||||||
@import 'styles/ipfs-themes.scss';
|
@import 'styles/ipfs-themes.scss';
|
||||||
|
|
||||||
.theme-light {
|
.theme-light {
|
||||||
@include angular-material-theme($ipfs-light-theme);
|
@include mat.all-component-themes($ipfs-light-theme);
|
||||||
}
|
}
|
||||||
|
|
||||||
.theme-dark {
|
.theme-dark {
|
||||||
@include angular-material-theme($ipfs-dark-theme);
|
@include mat.all-component-themes($ipfs-dark-theme);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* You can add global styles to this file, and also import other style files */
|
/* You can add global styles to this file, and also import other style files */
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
|
@use '~@angular/material' as mat;
|
||||||
@import 'ipfs-colours.scss';
|
@import 'ipfs-colours.scss';
|
||||||
|
|
||||||
$ipfs-primary: mat-palette($ipfs-colour-navy, 'default', 'lighter', 'darker');
|
$ipfs-primary: mat.define-palette($ipfs-colour-navy, 'default', 'lighter', 'darker');
|
||||||
$ipfs-accent: mat-palette($ipfs-colour-aqua, 'default', 'lighter', 'darker');
|
$ipfs-accent: mat.define-palette($ipfs-colour-aqua, 'default', 'lighter', 'darker');
|
||||||
$ipfs-warn: mat-palette($ipfs-colour-yellow, 'default', 'lighter', 'darker');
|
$ipfs-warn: mat.define-palette($ipfs-colour-yellow, 'default', 'lighter', 'darker');
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
|
@use '~@angular/material' as mat;
|
||||||
@import 'ipfs-palettes.scss';
|
@import 'ipfs-palettes.scss';
|
||||||
|
|
||||||
$ipfs-light-theme: mat-light-theme($ipfs-primary, $ipfs-accent, $ipfs-warn);
|
$ipfs-light-theme: mat.define-light-theme($ipfs-primary, $ipfs-accent, $ipfs-warn);
|
||||||
$ipfs-dark-theme: mat-dark-theme($ipfs-primary, $ipfs-accent, $ipfs-warn);
|
$ipfs-dark-theme: mat.define-dark-theme($ipfs-primary, $ipfs-accent, $ipfs-warn);
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
|
// 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 { getTestBed } from '@angular/core/testing';
|
||||||
import {
|
import {
|
||||||
BrowserDynamicTestingModule,
|
BrowserDynamicTestingModule,
|
||||||
|
|
Loading…
Reference in New Issue