Skip to content

Commit f16fddd

Browse files
authored
Merge pull request #22 from sjimenez77/develop
Upgrade to Angular 10 and new versions added for each package
2 parents 2775bfd + 056931c commit f16fddd

File tree

6 files changed

+1617
-1832
lines changed

6 files changed

+1617
-1832
lines changed

package.json

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,43 +16,42 @@
1616
},
1717
"private": true,
1818
"dependencies": {
19-
"@angular/animations": "~9.1.13",
20-
"@angular/common": "~9.1.13",
21-
"@angular/compiler": "~9.1.13",
22-
"@angular/core": "~9.1.13",
23-
"@angular/forms": "~9.1.13",
24-
"@angular/platform-browser": "~9.1.13",
25-
"@angular/platform-browser-dynamic": "~9.1.13",
26-
"@angular/router": "~9.1.13",
19+
"@angular/animations": "~10.2.4",
20+
"@angular/common": "~10.2.4",
21+
"@angular/compiler": "~10.2.4",
22+
"@angular/core": "~10.2.4",
23+
"@angular/forms": "~10.2.4",
24+
"@angular/platform-browser": "~10.2.4",
25+
"@angular/platform-browser-dynamic": "~10.2.4",
26+
"@angular/router": "~10.2.4",
2727
"core-js": "^2.5.4",
2828
"object-hash": "~1.3.1",
2929
"rxjs": "^6.6.3",
30-
"tslib": "^1.10.0",
30+
"tslib": "^2.0.0",
3131
"zone.js": "~0.10.2"
3232
},
3333
"devDependencies": {
34-
"@angular-devkit/build-angular": "~0.901.14",
35-
"@angular-devkit/build-ng-packagr": "~0.901.14",
36-
"@angular/cli": "~9.1.14",
37-
"@angular/compiler-cli": "~9.1.13",
38-
"@angular/language-service": "~9.1.13",
34+
"@angular-devkit/build-angular": "~0.1002.2",
35+
"@angular-devkit/build-ng-packagr": "~0.1002.2",
36+
"@angular/cli": "~10.2.2",
37+
"@angular/compiler-cli": "~10.2.4",
38+
"@angular/language-service": "~10.2.4",
3939
"@types/jasmine": "~2.8.8",
4040
"@types/jasminewd2": "~2.0.3",
4141
"@types/node": "^12.11.1",
4242
"@types/object-hash": "^1.2.0",
4343
"codelyzer": "^5.1.2",
44-
"jasmine-core": "~2.99.1",
45-
"jasmine-spec-reporter": "~4.2.1",
46-
"karma": "~4.0.0",
47-
"karma-chrome-launcher": "~2.2.0",
48-
"karma-coverage-istanbul-reporter": "~2.0.1",
49-
"karma-jasmine": "~1.1.2",
50-
"karma-jasmine-html-reporter": "^0.2.2",
51-
"ng-packagr": "^9.0.0",
52-
"protractor": "~5.4.0",
44+
"jasmine-core": "~3.5.0",
45+
"jasmine-spec-reporter": "~5.0.0",
46+
"karma": "~5.0.0",
47+
"karma-chrome-launcher": "~3.1.0",
48+
"karma-coverage-istanbul-reporter": "~3.0.2",
49+
"karma-jasmine": "~4.0.0",
50+
"karma-jasmine-html-reporter": "^1.5.0",
51+
"ng-packagr": "^10.1.0",
52+
"protractor": "~7.0.0",
5353
"ts-node": "~7.0.0",
54-
"tslib": "^1.9.0",
55-
"tslint": "~5.11.0",
56-
"typescript": "~3.8.3"
54+
"tslint": "~6.1.0",
55+
"typescript": "~4.0.7"
5756
}
5857
}

projects/devon4ng/authorization/package.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devon4ng/authorization",
3-
"version": "9.0.0",
3+
"version": "10.0.0",
44
"description": "Adds rights-based authorization to your Angular app's routes",
55
"author": {
66
"name": "devonfw team"
@@ -17,10 +17,13 @@
1717
"type": "git",
1818
"url": "git+https://github.com/devonfw/devon4ng-library.git"
1919
},
20+
"dependencies": {
21+
"tslib": "^2.0.0"
22+
},
2023
"peerDependencies": {
21-
"@angular/common": "^9.1.0",
22-
"@angular/core": "^9.1.0",
23-
"@angular/router": "^9.1.0",
24+
"@angular/common": "^10.2.0",
25+
"@angular/core": "^10.2.0",
26+
"@angular/router": "^10.2.0",
2427
"rxjs": "^6.6.0"
2528
}
2629
}
Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,25 @@
11
{
22
"name": "@devon4ng/cache",
3-
"version": "9.0.0",
3+
"version": "10.0.0",
44
"description": "Add configurable cache request feature to your Angular project",
5+
"keywords": [
6+
"angular",
7+
"request",
8+
"cache",
9+
"interceptor"
10+
],
511
"homepage": "https://github.com/devonfw/devon4ng-library/tree/master/projects/devon4ng/cache",
612
"license": "Apache-2.0",
713
"repository": {
814
"type": "git",
915
"url": "git+https://github.com/devonfw/devon4ng-library.git"
1016
},
17+
"dependencies": {
18+
"tslib": "^2.0.0"
19+
},
1120
"peerDependencies": {
12-
"@angular/common": "^9.1.0",
13-
"@angular/core": "^9.1.0",
21+
"@angular/common": "^10.2.0",
22+
"@angular/core": "^10.2.0",
1423
"object-hash": "~1.3.1"
1524
}
1625
}

tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"outDir": "./dist/out-tsc",
66
"sourceMap": true,
77
"declaration": false,
8-
"module": "esnext",
8+
"module": "es2020",
99
"moduleResolution": "node",
1010
"emitDecoratorMetadata": true,
1111
"experimentalDecorators": true,

tslint.json

Lines changed: 65 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,32 @@
44
"codelyzer"
55
],
66
"rules": {
7+
"align": {
8+
"options": [
9+
"parameters",
10+
"statements"
11+
]
12+
},
713
"array-type": false,
814
"arrow-parens": false,
15+
"arrow-return-shorthand": true,
916
"deprecation": {
1017
"severity": "warn"
1118
},
19+
"curly": true,
1220
"import-blacklist": [
1321
true,
1422
"rxjs/Rx"
1523
],
1624
"interface-name": false,
25+
"eofline": true,
1726
"max-classes-per-file": false,
27+
"import-spacing": true,
28+
"indent": {
29+
"options": [
30+
"spaces"
31+
]
32+
},
1833
"max-line-length": [
1934
true,
2035
140
@@ -48,7 +63,6 @@
4863
"no-non-null-assertion": true,
4964
"no-redundant-jsdoc": true,
5065
"no-switch-case-fall-through": true,
51-
"no-use-before-declare": true,
5266
"no-var-requires": false,
5367
"object-literal-key-quotes": [
5468
true,
@@ -65,11 +79,60 @@
6579
"use-input-property-decorator": true,
6680
"use-output-property-decorator": true,
6781
"use-host-property-decorator": true,
82+
"semicolon": {
83+
"options": [
84+
"always"
85+
]
86+
},
87+
"space-before-function-paren": {
88+
"options": {
89+
"anonymous": "never",
90+
"asyncArrow": "always",
91+
"constructor": "never",
92+
"method": "never",
93+
"named": "never"
94+
}
95+
},
6896
"no-input-rename": true,
97+
"typedef-whitespace": {
98+
"options": [
99+
{
100+
"call-signature": "nospace",
101+
"index-signature": "nospace",
102+
"parameter": "nospace",
103+
"property-declaration": "nospace",
104+
"variable-declaration": "nospace"
105+
},
106+
{
107+
"call-signature": "onespace",
108+
"index-signature": "onespace",
109+
"parameter": "onespace",
110+
"property-declaration": "onespace",
111+
"variable-declaration": "onespace"
112+
}
113+
]
114+
},
69115
"no-output-rename": true,
70116
"use-life-cycle-interface": true,
71117
"use-pipe-transform-interface": true,
72118
"component-class-suffix": true,
73-
"directive-class-suffix": true
119+
"directive-class-suffix": true,
120+
"variable-name": {
121+
"options": [
122+
"ban-keywords",
123+
"check-format",
124+
"allow-pascal-case"
125+
]
126+
},
127+
"whitespace": {
128+
"options": [
129+
"check-branch",
130+
"check-decl",
131+
"check-operator",
132+
"check-separator",
133+
"check-type",
134+
"check-typecast"
135+
]
136+
}
74137
}
75138
}

0 commit comments

Comments
 (0)