Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit b4c9f93

Browse files
DeborahKDeborahK
committed
Update to Angular v10
1 parent 0cbf8fc commit b4c9f93

24 files changed

+193
-144
lines changed

‎.vscode/settings.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎APM-Final/.browserslistrc

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
2+
# For additional information regarding the format and rule options, please see:
3+
# https://github.com/browserslist/browserslist#queries
4+
5+
# For the full list of supported browsers by the Angular framework, please see:
6+
# https://angular.io/guide/browser-support
7+
8+
# You can see what browsers were selected by your queries by running:
9+
# npx browserslist
10+
11+
last 1 Chrome version
12+
last 1 Firefox version
13+
last 2 Edge major versions
14+
last 2 Safari major versions
15+
last 2 iOS major versions
16+
Firefox ESR
17+
not IE 9-10 # Angular support for IE 9-10 has been deprecated and will be removed as of Angular v11. To opt-in, remove the 'not' prefix on this line.
18+
not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.

‎APM-Final/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# APM
22

3-
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 9.1.1.
3+
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 10.0.3.
44

55
## Development server
66

‎APM-Final/browserslist

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎APM-Final/e2e/protractor.conf.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Protractor configuration file, see link for more information
33
// https://github.com/angular/protractor/blob/master/lib/config.ts
44

5-
const { SpecReporter } = require('jasmine-spec-reporter');
5+
const { SpecReporter, StacktraceOption } = require('jasmine-spec-reporter');
66

77
/**
88
* @type { import("protractor").Config }
@@ -27,6 +27,10 @@ exports.config = {
2727
require('ts-node').register({
2828
project: require('path').join(__dirname, './tsconfig.json')
2929
});
30-
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
30+
jasmine.getEnv().addReporter(new SpecReporter({
31+
spec: {
32+
displayStacktrace: StacktraceOption.PRETTY
33+
}
34+
}));
3135
}
3236
};

‎APM-Final/e2e/tsconfig.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
/* To learn more about this file see: https://angular.io/config/tsconfig. */
12
{
2-
"extends": "../tsconfig.json",
3+
"extends": "../tsconfig.base.json",
34
"compilerOptions": {
45
"outDir": "../out-tsc/e2e",
56
"module": "commonjs",
6-
"target": "es5",
7+
"target": "es2018",
78
"types": [
89
"jasmine",
910
"jasminewd2",

‎APM-Final/package.json

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,39 +11,38 @@
1111
},
1212
"private": true,
1313
"dependencies": {
14-
"@angular/animations": "~9.1.1",
15-
"@angular/common": "~9.1.1",
16-
"@angular/compiler": "~9.1.1",
17-
"@angular/core": "~9.1.1",
18-
"@angular/forms": "~9.1.1",
19-
"@angular/platform-browser": "~9.1.1",
20-
"@angular/platform-browser-dynamic": "~9.1.1",
21-
"@angular/router": "~9.1.1",
22-
"bootstrap": "^4.4.1",
14+
"@angular/animations": "~10.0.4",
15+
"@angular/common": "~10.0.4",
16+
"@angular/compiler": "~10.0.4",
17+
"@angular/core": "~10.0.4",
18+
"@angular/forms": "~10.0.4",
19+
"@angular/platform-browser": "~10.0.4",
20+
"@angular/platform-browser-dynamic": "~10.0.4",
21+
"@angular/router": "~10.0.4",
22+
"bootstrap": "^4.5.0",
2323
"font-awesome": "^4.7.0",
24-
"rxjs": "~6.5.4",
25-
"tslib": "^1.10.0",
26-
"zone.js": "~0.10.2"
24+
"rxjs": "~6.5.5",
25+
"tslib": "^2.0.0",
26+
"zone.js": "~0.10.3"
2727
},
2828
"devDependencies": {
29-
"@angular-devkit/build-angular": "~0.901.1",
30-
"@angular/cli": "~9.1.1",
31-
"@angular/compiler-cli": "~9.1.1",
32-
"@angular/language-service": "~9.1.1",
29+
"@angular-devkit/build-angular": "~0.1000.3",
30+
"@angular/cli": "~10.0.3",
31+
"@angular/compiler-cli": "~10.0.4",
3332
"@types/node": "^12.11.1",
3433
"@types/jasmine": "~3.5.0",
3534
"@types/jasminewd2": "~2.0.3",
36-
"codelyzer": "^5.1.2",
35+
"codelyzer": "^6.0.0",
3736
"jasmine-core": "~3.5.0",
38-
"jasmine-spec-reporter": "~4.2.1",
39-
"karma": "~4.4.1",
37+
"jasmine-spec-reporter": "~5.0.0",
38+
"karma": "~5.0.0",
4039
"karma-chrome-launcher": "~3.1.0",
41-
"karma-coverage-istanbul-reporter": "~2.1.0",
42-
"karma-jasmine": "~3.0.1",
43-
"karma-jasmine-html-reporter": "^1.4.2",
44-
"protractor": "~5.4.3",
40+
"karma-coverage-istanbul-reporter": "~3.0.2",
41+
"karma-jasmine": "~3.3.0",
42+
"karma-jasmine-html-reporter": "^1.5.0",
43+
"protractor": "~7.0.0",
4544
"ts-node": "~8.3.0",
4645
"tslint": "~6.1.0",
47-
"typescript": "~3.8.3"
46+
"typescript": "~3.9.7"
4847
}
4948
}

‎APM-Final/src/app/products/product.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export class ProductService {
3131
);
3232
}
3333

34-
private handleError(err: HttpErrorResponse) {
34+
private handleError(err: HttpErrorResponse): Observable<never> {
3535
// in a real world app, we may send the server to some remote logging infrastructure
3636
// instead of just logging it to the console
3737
let errorMessage = '';

‎APM-Final/tsconfig.app.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
/* To learn more about this file see: https://angular.io/config/tsconfig. */
12
{
2-
"extends": "./tsconfig.json",
3+
"extends": "./tsconfig.base.json",
34
"compilerOptions": {
45
"outDir": "./out-tsc/app",
56
"types": []

‎APM-Final/tsconfig.base.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/* To learn more about this file see: https://angular.io/config/tsconfig. */
2+
{
3+
"compileOnSave": false,
4+
"compilerOptions": {
5+
"baseUrl": "./",
6+
"outDir": "./dist/out-tsc",
7+
"sourceMap": true,
8+
"declaration": false,
9+
"downlevelIteration": true,
10+
"experimentalDecorators": true,
11+
"moduleResolution": "node",
12+
"importHelpers": true,
13+
"target": "es2015",
14+
"module": "es2020",
15+
"lib": [
16+
"es2018",
17+
"dom"
18+
]
19+
}
20+
}

‎APM-Final/tsconfig.json

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,17 @@
1+
/*
2+
This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
3+
It is not intended to be used to perform a compilation.
4+
5+
To learn more about this file see: https://angular.io/config/solution-tsconfig.
6+
*/
17
{
2-
"compileOnSave": false,
3-
"compilerOptions": {
4-
"baseUrl": "./",
5-
"outDir": "./dist/out-tsc",
6-
"sourceMap": true,
7-
"declaration": false,
8-
"downlevelIteration": true,
9-
"experimentalDecorators": true,
10-
"module": "esnext",
11-
"moduleResolution": "node",
12-
"importHelpers": true,
13-
"target": "es2015",
14-
"lib": [
15-
"es2018",
16-
"dom"
17-
]
18-
},
19-
"angularCompilerOptions": {
20-
"fullTemplateTypeCheck": true,
21-
"strictInjectionParameters": true
22-
}
8+
"files": [],
9+
"references": [
10+
{
11+
"path": "./tsconfig.app.json"
12+
},
13+
{
14+
"path": "./tsconfig.spec.json"
15+
}
16+
]
2317
}

‎APM-Final/tsconfig.spec.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
/* To learn more about this file see: https://angular.io/config/tsconfig. */
12
{
2-
"extends": "./tsconfig.json",
3+
"extends": "./tsconfig.base.json",
34
"compilerOptions": {
45
"outDir": "./out-tsc/spec",
56
"types": [
6-
"jasmine",
7-
"node"
7+
"jasmine"
88
]
99
},
1010
"files": [

‎APM-Final/tslint.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@
9494
"named": "never"
9595
}
9696
},
97+
"typedef": [
98+
true,
99+
"call-signature"
100+
],
97101
"typedef-whitespace": {
98102
"options": [
99103
{
@@ -117,7 +121,7 @@
117121
"ban-keywords",
118122
"check-format",
119123
"allow-pascal-case",
120-
"allow-leading-underscore"
124+
"allow-leading-underscore"
121125
]
122126
},
123127
"whitespace": {

‎APM-Start/.browserslistrc

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
2+
# For additional information regarding the format and rule options, please see:
3+
# https://github.com/browserslist/browserslist#queries
4+
5+
# For the full list of supported browsers by the Angular framework, please see:
6+
# https://angular.io/guide/browser-support
7+
8+
# You can see what browsers were selected by your queries by running:
9+
# npx browserslist
10+
11+
last 1 Chrome version
12+
last 1 Firefox version
13+
last 2 Edge major versions
14+
last 2 Safari major versions
15+
last 2 iOS major versions
16+
Firefox ESR
17+
not IE 9-10 # Angular support for IE 9-10 has been deprecated and will be removed as of Angular v11. To opt-in, remove the 'not' prefix on this line.
18+
not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.

‎APM-Start/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# APM
22

3-
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 9.1.1.
3+
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 10.0.3.
44

55
## Development server
66

‎APM-Start/browserslist

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎APM-Start/e2e/protractor.conf.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Protractor configuration file, see link for more information
33
// https://github.com/angular/protractor/blob/master/lib/config.ts
44

5-
const { SpecReporter } = require('jasmine-spec-reporter');
5+
const { SpecReporter, StacktraceOption } = require('jasmine-spec-reporter');
66

77
/**
88
* @type { import("protractor").Config }
@@ -27,6 +27,10 @@ exports.config = {
2727
require('ts-node').register({
2828
project: require('path').join(__dirname, './tsconfig.json')
2929
});
30-
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
30+
jasmine.getEnv().addReporter(new SpecReporter({
31+
spec: {
32+
displayStacktrace: StacktraceOption.PRETTY
33+
}
34+
}));
3135
}
3236
};

‎APM-Start/e2e/tsconfig.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
/* To learn more about this file see: https://angular.io/config/tsconfig. */
12
{
2-
"extends": "../tsconfig.json",
3+
"extends": "../tsconfig.base.json",
34
"compilerOptions": {
45
"outDir": "../out-tsc/e2e",
56
"module": "commonjs",
6-
"target": "es5",
7+
"target": "es2018",
78
"types": [
89
"jasmine",
910
"jasminewd2",

‎APM-Start/package.json

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,36 @@
1111
},
1212
"private": true,
1313
"dependencies": {
14-
"@angular/animations": "~9.1.1",
15-
"@angular/common": "~9.1.1",
16-
"@angular/compiler": "~9.1.1",
17-
"@angular/core": "~9.1.1",
18-
"@angular/forms": "~9.1.1",
19-
"@angular/platform-browser": "~9.1.1",
20-
"@angular/platform-browser-dynamic": "~9.1.1",
21-
"@angular/router": "~9.1.1",
22-
"rxjs": "~6.5.4",
23-
"tslib": "^1.10.0",
24-
"zone.js": "~0.10.2"
14+
"@angular/animations": "~10.0.4",
15+
"@angular/common": "~10.0.4",
16+
"@angular/compiler": "~10.0.4",
17+
"@angular/core": "~10.0.4",
18+
"@angular/forms": "~10.0.4",
19+
"@angular/platform-browser": "~10.0.4",
20+
"@angular/platform-browser-dynamic": "~10.0.4",
21+
"@angular/router": "~10.0.4",
22+
"rxjs": "~6.5.5",
23+
"tslib": "^2.0.0",
24+
"zone.js": "~0.10.3"
2525
},
2626
"devDependencies": {
27-
"@angular-devkit/build-angular": "~0.901.1",
28-
"@angular/cli": "~9.1.1",
29-
"@angular/compiler-cli": "~9.1.1",
30-
"@angular/language-service": "~9.1.1",
27+
"@angular-devkit/build-angular": "~0.1000.3",
28+
"@angular/cli": "~10.0.3",
29+
"@angular/compiler-cli": "~10.0.4",
3130
"@types/node": "^12.11.1",
3231
"@types/jasmine": "~3.5.0",
3332
"@types/jasminewd2": "~2.0.3",
34-
"codelyzer": "^5.1.2",
33+
"codelyzer": "^6.0.0",
3534
"jasmine-core": "~3.5.0",
36-
"jasmine-spec-reporter": "~4.2.1",
37-
"karma": "~4.4.1",
35+
"jasmine-spec-reporter": "~5.0.0",
36+
"karma": "~5.0.0",
3837
"karma-chrome-launcher": "~3.1.0",
39-
"karma-coverage-istanbul-reporter": "~2.1.0",
40-
"karma-jasmine": "~3.0.1",
41-
"karma-jasmine-html-reporter": "^1.4.2",
42-
"protractor": "~5.4.3",
38+
"karma-coverage-istanbul-reporter": "~3.0.2",
39+
"karma-jasmine": "~3.3.0",
40+
"karma-jasmine-html-reporter": "^1.5.0",
41+
"protractor": "~7.0.0",
4342
"ts-node": "~8.3.0",
4443
"tslint": "~6.1.0",
45-
"typescript": "~3.8.3"
44+
"typescript": "~3.9.7"
4645
}
4746
}

0 commit comments

Comments
 (0)