Skip to content

Commit 91d1898

Browse files
Angular2GuyAngular2Guy
committed
angular 10 update
1 parent e425a86 commit 91d1898

File tree

9 files changed

+5142
-4336
lines changed

9 files changed

+5142
-4336
lines changed

Diff for: ‎carrental-web/src/main/angular/carrental/browserslist renamed to ‎carrental-web/src/main/angular/carrental/.browserslistrc

File renamed without changes.

Diff for: ‎carrental-web/src/main/angular/carrental/e2e/tsconfig.e2e.json

+1-1
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
"module": "commonjs",

Diff for: ‎carrental-web/src/main/angular/carrental/package-lock.json

+5,011-4,283
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎carrental-web/src/main/angular/carrental/package.json

+25-25
Original file line numberDiff line numberDiff line change
@@ -15,44 +15,44 @@
1515
},
1616
"private": true,
1717
"dependencies": {
18-
"@angular/animations": "^9.1.0",
19-
"@angular/common": "^9.1.0",
20-
"@angular/compiler": "^9.1.0",
21-
"@angular/core": "^9.1.0",
22-
"@angular/forms": "^9.1.0",
23-
"@angular/localize": "^9.1.0",
24-
"@angular/platform-browser": "^9.1.0",
25-
"@angular/platform-browser-dynamic": "^9.1.0",
26-
"@angular/router": "^9.1.0",
27-
"bootstrap": "^4.4.1",
18+
"@angular/animations": "^10.0.1",
19+
"@angular/common": "^10.0.1",
20+
"@angular/compiler": "^10.0.1",
21+
"@angular/core": "^10.0.1",
22+
"@angular/forms": "^10.0.1",
23+
"@angular/localize": "^10.0.1",
24+
"@angular/platform-browser": "^10.0.1",
25+
"@angular/platform-browser-dynamic": "^10.0.1",
26+
"@angular/router": "^10.0.1",
27+
"bootstrap": "^4.5.0",
2828
"popper.js": "^1.16.1",
2929
"core-js": "^2.5.7",
3030
"rxjs": "^6.5.4",
31-
"tslib": "^1.10.0",
32-
"zone.js": "~0.10.2"
31+
"tslib": "^2.0.0",
32+
"zone.js": "~0.10.3"
3333
},
3434
"devDependencies": {
35-
"@angular-devkit/build-angular": "~0.901.0",
36-
"@angular/cli": "^9.1.0",
37-
"@angular/compiler-cli": "^9.1.0",
38-
"@angular/language-service": "^9.1.0",
35+
"@angular-devkit/build-angular": "~0.1000.0",
36+
"@angular/cli": "^10.0.0",
37+
"@angular/compiler-cli": "^10.0.1",
38+
"@angular/language-service": "^10.0.1",
3939
"@types/jasmine": "~3.5.0",
4040
"@types/jasminewd2": "~2.0.3",
4141
"@types/node": "^12.11.1",
42-
"codelyzer": "^5.1.2",
42+
"codelyzer": "^6.0.0-next.1",
4343
"jasmine-core": "~3.5.0",
44-
"jasmine-spec-reporter": "~4.2.1",
44+
"jasmine-spec-reporter": "~5.0.0",
4545
"jquery": "^3.5.0",
46-
"karma": "~4.3.0",
46+
"karma": "~5.0.0",
4747
"karma-chrome-launcher": "~3.1.0",
48-
"karma-coverage-istanbul-reporter": "~2.1.0",
49-
"karma-jasmine": "~2.0.1",
50-
"karma-jasmine-html-reporter": "^1.4.2",
48+
"karma-coverage-istanbul-reporter": "~3.0.2",
49+
"karma-jasmine": "~3.3.0",
50+
"karma-jasmine-html-reporter": "^1.5.0",
5151
"karma-junit-reporter": "~1.2.0",
5252
"npm-run-all": "^4.1.5",
53-
"protractor": "~5.4.3",
53+
"protractor": "~7.0.0",
5454
"ts-node": "~8.3.0",
55-
"tslint": "~5.18.0",
56-
"typescript": "~3.7.5"
55+
"tslint": "~6.1.0",
56+
"typescript": "~3.9.5"
5757
}
5858
}

Diff for: ‎carrental-web/src/main/angular/carrental/tsconfig.app.json

+1-1
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
"types": []

Diff for: ‎carrental-web/src/main/angular/carrental/tsconfig.base.json

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
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+
},
22+
"angularCompilerOptions": {
23+
"fullTemplateTypeCheck": true,
24+
"strictInjectionParameters": true
25+
}
26+
}

Diff for: ‎carrental-web/src/main/angular/carrental/tsconfig.json

100755100644
+12-24
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,14 @@
11
{
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-
},
22-
"angularCompilerOptions": {
23-
"fullTemplateTypeCheck": true,
24-
"strictInjectionParameters": true
25-
}
2+
"files": [],
3+
"references": [
4+
{
5+
"path": "./tsconfig.app.json"
6+
},
7+
{
8+
"path": "./tsconfig.spec.json"
9+
},
10+
{
11+
"path": "./e2e/tsconfig.e2e.json"
12+
}
13+
]
2614
}

Diff for: ‎carrental-web/src/main/angular/carrental/tsconfig.spec.json

+1-1
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
"types": [

Diff for: ‎carrental-web/src/main/angular/carrental/tslint.json

+65-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
{
22
"extends": "tslint:recommended",
33
"rules": {
4+
"align": {
5+
"options": [
6+
"parameters",
7+
"statements"
8+
]
9+
},
410
"array-type": false,
511
"arrow-parens": false,
12+
"arrow-return-shorthand": true,
13+
"curly": true,
614
"deprecation": {
715
"severity": "warning"
816
},
@@ -21,10 +29,17 @@
2129
"app",
2230
"kebab-case"
2331
],
32+
"eofline": true,
2433
"import-blacklist": [
2534
true,
2635
"rxjs/Rx"
2736
],
37+
"import-spacing": true,
38+
"indent": {
39+
"options": [
40+
"spaces"
41+
]
42+
},
2843
"interface-name": false,
2944
"max-classes-per-file": false,
3045
"max-line-length": [
@@ -71,6 +86,20 @@
7186
true,
7287
"single"
7388
],
89+
"semicolon": {
90+
"options": [
91+
"always"
92+
]
93+
},
94+
"space-before-function-paren": {
95+
"options": {
96+
"anonymous": "never",
97+
"asyncArrow": "always",
98+
"constructor": "never",
99+
"method": "never",
100+
"named": "never"
101+
}
102+
},
74103
"trailing-comma": false,
75104
"no-conflicting-lifecycle": true,
76105
"no-host-metadata-property": true,
@@ -82,9 +111,44 @@
82111
"no-outputs-metadata-property": true,
83112
"template-banana-in-box": true,
84113
"template-no-negated-async": true,
114+
"typedef-whitespace": {
115+
"options": [
116+
{
117+
"call-signature": "nospace",
118+
"index-signature": "nospace",
119+
"parameter": "nospace",
120+
"property-declaration": "nospace",
121+
"variable-declaration": "nospace"
122+
},
123+
{
124+
"call-signature": "onespace",
125+
"index-signature": "onespace",
126+
"parameter": "onespace",
127+
"property-declaration": "onespace",
128+
"variable-declaration": "onespace"
129+
}
130+
]
131+
},
85132
"use-lifecycle-interface": true,
86133
"use-pipe-transform-interface": true
87-
},
134+
, "variable-name": {
135+
"options": [
136+
"ban-keywords",
137+
"check-format",
138+
"allow-pascal-case"
139+
]
140+
},
141+
"whitespace": {
142+
"options": [
143+
"check-branch",
144+
"check-decl",
145+
"check-operator",
146+
"check-separator",
147+
"check-type",
148+
"check-typecast"
149+
]
150+
}
151+
},
88152
"rulesDirectory": [
89153
"codelyzer"
90154
]

0 commit comments

Comments
 (0)