Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a60789f

Browse files
committedMar 17, 2021
Updating to angular 11
1 parent 3ba3c37 commit a60789f

12 files changed

+1495
-2053
lines changed
 

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ speed-measure-plugin*.json
3535
/.sass-cache
3636
/connect.lock
3737
/coverage
38+
/projects/plotly/coverage
3839
/libpeerconnection.log
3940
npm-debug.log
4041
yarn-error.log

‎angular.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"prefix": "lib",
1111
"architect": {
1212
"build": {
13-
"builder": "@angular-devkit/build-ng-packagr:build",
13+
"builder": "@angular-devkit/build-angular:ng-packagr",
1414
"options": {
1515
"tsConfig": "projects/plotly/tsconfig.lib.json",
1616
"project": "projects/plotly/ng-package.json"

‎package-lock.json

Lines changed: 1443 additions & 1988 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,40 +10,39 @@
1010
},
1111
"private": true,
1212
"dependencies": {
13-
"@angular/animations": "~10.0.9",
14-
"@angular/common": "~10.0.9",
15-
"@angular/compiler": "~10.0.9",
16-
"@angular/core": "~10.0.9",
17-
"@angular/forms": "~10.0.9",
18-
"@angular/platform-browser": "~10.0.9",
19-
"@angular/platform-browser-dynamic": "~10.0.9",
20-
"@angular/router": "~10.0.9",
13+
"@angular/animations": "~11.2.5",
14+
"@angular/common": "~11.2.5",
15+
"@angular/compiler": "~11.2.5",
16+
"@angular/core": "~11.2.5",
17+
"@angular/forms": "~11.2.5",
18+
"@angular/platform-browser": "~11.2.5",
19+
"@angular/platform-browser-dynamic": "~11.2.5",
20+
"@angular/router": "~11.2.5",
2121
"plotly.js-dist": "^1.54.7",
2222
"rxjs": "~6.5.5",
2323
"tslib": "^2.0.0",
2424
"zone.js": "~0.10.3"
2525
},
2626
"devDependencies": {
2727
"@angular-devkit/build-angular": "^0.1102.4",
28-
"@angular-devkit/build-ng-packagr": "~0.1000.6",
29-
"@angular/cli": "~10.0.6",
30-
"@angular/compiler-cli": "~10.0.9",
31-
"@types/jasmine": "~3.5.0",
28+
"@angular/cli": "~11.2.4",
29+
"@angular/compiler-cli": "~11.2.5",
30+
"@types/jasmine": "~3.6.0",
3231
"@types/jasminewd2": "~2.0.3",
3332
"@types/node": "^12.11.1",
3433
"codelyzer": "^6.0.0",
3534
"coveralls": "^3.1.0",
36-
"jasmine-core": "~3.5.0",
35+
"jasmine-core": "~3.6.0",
3736
"jasmine-spec-reporter": "~5.0.0",
38-
"karma": "~5.0.0",
37+
"karma": "~6.2.0",
3938
"karma-chrome-launcher": "~3.1.0",
40-
"karma-coverage-istanbul-reporter": "~3.0.2",
41-
"karma-jasmine": "~3.3.0",
39+
"karma-coverage": "^2.0.3",
40+
"karma-jasmine": "~4.0.0",
4241
"karma-jasmine-html-reporter": "^1.5.0",
43-
"ng-packagr": "^10.0.0",
42+
"ng-packagr": "^11.2.4",
4443
"protractor": "~7.0.0",
4544
"ts-node": "~8.3.0",
4645
"tslint": "~6.1.0",
47-
"typescript": "~3.9.5"
46+
"typescript": "~4.1.5"
4847
}
4948
}

‎projects/plotly/karma.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module.exports = function (config) {
99
require('karma-jasmine'),
1010
require('karma-chrome-launcher'),
1111
require('karma-jasmine-html-reporter'),
12-
require('karma-coverage-istanbul-reporter'),
12+
require('karma-coverage'),
1313
require('@angular-devkit/build-angular/plugins/karma')
1414
],
1515
client: {

‎projects/plotly/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"name": "angular-plotly.js",
33
"version": "3.0.0",
44
"peerDependencies": {
5-
"@angular/common": "^10.0.9",
6-
"@angular/core": "^10.0.9"
5+
"@angular/common": ">10.0.9",
6+
"@angular/core": ">10.0.9"
77
},
88
"devDependencies": {
9-
"plotly.js-dist": "^1.54.7"
9+
"plotly.js-dist": ">1.54.7"
1010
},
1111
"dependencies": {
1212
"tslib": "^2.0.0"

‎projects/plotly/src/lib/plotly.service.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ describe('PlotlyService', () => {
4646
});
4747

4848
it('should call plotly.newPlot method', inject([PlotlyService], async (service: PlotlyService) => {
49-
return new Promise(async (resolve) => {
49+
return new Promise<void>(async (resolve) => {
5050
const plotly = service.getPlotly();
5151
PlotlyService.setPlotly('waiting');
5252

‎projects/plotly/tsconfig.lib.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
/* To learn more about this file see: https://angular.io/config/tsconfig. */
22
{
3-
"extends": "../../tsconfig.base.json",
3+
"extends": "../../tsconfig.json",
44
"compilerOptions": {
55
"experimentalDecorators": true,
6+
"declarationMap": true,
67
"outDir": "../../out-tsc/lib",
78
"target": "es2015",
89
"declaration": true,

‎projects/plotly/tsconfig.lib.prod.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
/* To learn more about this file see: https://angular.io/config/tsconfig. */
22
{
33
"extends": "./tsconfig.lib.json",
4+
"compilerOptions": {
5+
"declarationMap": false
6+
},
47
"angularCompilerOptions": {
58
"enableIvy": false
69
}

‎projects/plotly/tsconfig.spec.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* To learn more about this file see: https://angular.io/config/tsconfig. */
22
{
3-
"extends": "../../tsconfig.base.json",
3+
"extends": "../../tsconfig.json",
44
"compilerOptions": {
55
"outDir": "../../out-tsc/spec",
66
"types": [

‎tsconfig.base.json

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

‎tsconfig.json

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,25 @@
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-
*/
71
{
8-
"files": [],
9-
"references": [
10-
{
11-
"path": "./projects/plotly/tsconfig.lib.json"
12-
},
13-
{
14-
"path": "./projects/plotly/tsconfig.spec.json"
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+
"moduleResolution": "node",
11+
"importHelpers": true,
12+
"target": "es2015",
13+
"module": "es2020",
14+
"lib": [
15+
"es2018",
16+
"dom"
17+
],
18+
"paths": {
19+
"plotly": [
20+
"dist/plotly/plotly",
21+
"dist/plotly"
22+
]
1523
}
16-
]
24+
}
1725
}

0 commit comments

Comments
 (0)
Please sign in to comment.