Skip to content

Commit 943c5fc

Browse files
eneufeldsdirix
authored andcommitted
Update to Angular 10
1 parent e5914e8 commit 943c5fc

File tree

8 files changed

+4817
-3542
lines changed

8 files changed

+4817
-3542
lines changed

e2e/tsconfig.e2e.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../tsconfig.json",
2+
"extends": "../tsconfig.base.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/e2e",
55
"baseUrl": "./",

package-lock.json

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

package.json

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,51 +12,52 @@
1212
},
1313
"private": true,
1414
"dependencies": {
15-
"@angular/animations": "^9.0.2",
16-
"@angular/cdk": "^9.0.1",
17-
"@angular/common": "^9.0.2",
18-
"@angular/compiler": "^9.0.2",
19-
"@angular/core": "^9.0.2",
20-
"@angular/flex-layout": "^9.0.0-beta.29",
21-
"@angular/forms": "^9.0.2",
22-
"@angular/material": "^9.0.1",
23-
"@angular/platform-browser": "^9.0.2",
24-
"@angular/platform-browser-dynamic": "^9.0.2",
25-
"@angular/router": "^9.0.2",
15+
"@angular/animations": "^10.0.1",
16+
"@angular/cdk": "^10.0.1",
17+
"@angular/common": "^10.0.1",
18+
"@angular/compiler": "^10.0.1",
19+
"@angular/core": "^10.0.1",
20+
"@angular/flex-layout": "^10.0.0-beta.32",
21+
"@angular/forms": "^10.0.1",
22+
"@angular/material": "^10.0.1",
23+
"@angular/platform-browser": "^10.0.1",
24+
"@angular/platform-browser-dynamic": "^10.0.1",
25+
"@angular/router": "^10.0.1",
2626
"@jsonforms/angular": "^2.5.0-alpha.0",
2727
"@jsonforms/angular-material": "^2.5.0-alpha.0",
2828
"@jsonforms/core": "^2.5.0-alpha.0",
29+
"ajv": "^6.10.2",
2930
"core-js": "^2.4.1",
3031
"json-refs": "^3.0.4",
3132
"libphonenumber-js": "^1.6.8",
3233
"path": "^0.12.7",
3334
"random-words": "^1.1.0",
3435
"redux": "4.0.1",
3536
"rxjs": "^6.5.4",
36-
"tslib": "^1.10.0",
37-
"zone.js": "~0.10.2"
37+
"tslib": "^2.0.0",
38+
"zone.js": "~0.10.3"
3839
},
3940
"devDependencies": {
40-
"@angular-devkit/build-angular": "~0.900.3",
41-
"@angular/cli": "^9.0.3",
42-
"@angular/compiler-cli": "^9.0.2",
43-
"@angular/language-service": "^9.0.2",
41+
"@angular-devkit/build-angular": "~0.1000.0",
42+
"@angular/cli": "^10.0.0",
43+
"@angular/compiler-cli": "^10.0.1",
44+
"@angular/language-service": "^10.0.1",
4445
"@types/jasmine": "~2.8.3",
4546
"@types/jasminewd2": "~2.0.2",
4647
"@types/node": "^12.11.1",
4748
"codelyzer": "^5.1.2",
48-
"jasmine-core": "~2.8.0",
49-
"jasmine-spec-reporter": "~4.2.1",
50-
"karma": "^3.0.0",
51-
"karma-chrome-launcher": "^2.2.0",
52-
"karma-coverage-istanbul-reporter": "^2.0.4",
53-
"karma-jasmine": "^1.1.2",
54-
"karma-jasmine-html-reporter": "^1.3.1",
55-
"protractor": "^5.4.1",
49+
"jasmine-core": "~3.5.0",
50+
"jasmine-spec-reporter": "~5.0.0",
51+
"karma": "~5.0.0",
52+
"karma-chrome-launcher": "~3.1.0",
53+
"karma-coverage-istanbul-reporter": "~3.0.2",
54+
"karma-jasmine": "~3.3.0",
55+
"karma-jasmine-html-reporter": "^1.5.0",
56+
"protractor": "~7.0.0",
5657
"redux-logger": "^3.0.6",
5758
"ts-node": "~4.1.0",
58-
"tslint": "~5.9.1",
59-
"typescript": "3.7.5"
59+
"tslint": "~6.1.0",
60+
"typescript": "3.9.5"
6061
},
6162
"browser": {
6263
"http": false,

src/tsconfig.app.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../tsconfig.json",
2+
"extends": "../tsconfig.base.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/app"
55
},
@@ -8,6 +8,8 @@
88
"polyfills.ts"
99
],
1010
"include": [
11-
"src/**/*.d.ts"
11+
"**/*.d.ts",
12+
"**/*.ts",
13+
"./assets/*.json"
1214
]
1315
}

src/tsconfig.spec.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../tsconfig.json",
2+
"extends": "../tsconfig.base.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/spec",
55
"baseUrl": "./",

tsconfig.base.json

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"compileOnSave": false,
3+
"compilerOptions": {
4+
"baseUrl": "./",
5+
"outDir": "./dist/out-tsc",
6+
"sourceMap": true,
7+
"declaration": true,
8+
"downlevelIteration": true,
9+
"experimentalDecorators": true,
10+
"module": "esnext",
11+
"moduleResolution": "node",
12+
"importHelpers": true,
13+
"target": "es2015",
14+
"typeRoots": [
15+
"node_modules/@types"
16+
],
17+
"lib": [
18+
"es2018",
19+
"dom"
20+
],
21+
"allowSyntheticDefaultImports": true,
22+
"resolveJsonModule": true,
23+
"composite": true
24+
},
25+
"angularCompilerOptions": {
26+
"fullTemplateTypeCheck": true,
27+
"strictInjectionParameters": true,
28+
"enableIvy":true
29+
},
30+
"paths": {
31+
"json-schema-ref-parser": ["node_modules/json-schema-ref-parser/dist/ref-parser.js"]
32+
}
33+
}

tsconfig.json

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,16 @@
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-
"typeRoots": [
15-
"node_modules/@types"
16-
],
17-
"lib": [
18-
"es2018",
19-
"dom"
20-
],
21-
"allowSyntheticDefaultImports": true,
22-
"resolveJsonModule": true
23-
},
24-
"angularCompilerOptions": {
25-
"fullTemplateTypeCheck": true,
26-
"strictInjectionParameters": true,
27-
"enableIvy":true
28-
},
29-
"paths": {
30-
"json-schema-ref-parser": ["node_modules/json-schema-ref-parser/dist/ref-parser.js"]
31-
}
8+
"references": [
9+
{
10+
"path": "./src/tsconfig.app.json"
11+
},
12+
{
13+
"path": "./src/tsconfig.spec.json"
14+
}
15+
]
3216
}

tslint.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
"no-trailing-whitespace": true,
7373
"no-unnecessary-initializer": true,
7474
"no-unused-expression": true,
75-
"no-use-before-declare": true,
7675
"no-var-keyword": true,
7776
"object-literal-sort-keys": false,
7877
"one-line": [

0 commit comments

Comments
 (0)