Skip to content

Commit 9370bb5

Browse files
Ivan Peshevtsvetomir
andauthored
refactor(examples): update to Angular v10 (#2964)
* chore: update to angular 10 * chore: angular-universal * chore: package-lock.json * chore: update angular * chore: update to anuglar 10 * chore: update to ng 10 * chore: fix tslint.json * chore: increase node heap * chore: fix assets path * chore: bump tslib to 2.0 Co-authored-by: Tsvetomir Tsonev <[email protected]>
1 parent aa04197 commit 9370bb5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+25428
-20647
lines changed

examples-standalone/angular-universal/node_sample_application/e2e/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"extends": "../tsconfig.json",
2+
"extends": "../tsconfig.base.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/e2e",
55
"module": "commonjs",
6-
"target": "es5",
6+
"target": "es2018",
77
"types": [
88
"jasmine",
99
"jasminewd2",

examples-standalone/angular-universal/node_sample_application/package-lock.json

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

examples-standalone/angular-universal/node_sample_application/package.json

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
},
1616
"private": true,
1717
"dependencies": {
18-
"@angular/animations": "~9.0.1",
19-
"@angular/common": "~9.0.1",
20-
"@angular/compiler": "~9.0.1",
21-
"@angular/core": "~9.0.1",
22-
"@angular/forms": "~9.0.1",
23-
"@angular/localize": "~9.0.1",
24-
"@angular/platform-browser": "~9.0.1",
25-
"@angular/platform-browser-dynamic": "~9.0.1",
26-
"@angular/platform-server": "~9.0.1",
27-
"@angular/router": "~9.0.1",
18+
"@angular/animations": "~10.0.0",
19+
"@angular/common": "~10.0.0",
20+
"@angular/compiler": "~10.0.0",
21+
"@angular/core": "~10.0.0",
22+
"@angular/forms": "~10.0.0",
23+
"@angular/localize": "~10.0.0",
24+
"@angular/platform-browser": "~10.0.0",
25+
"@angular/platform-browser-dynamic": "~10.0.0",
26+
"@angular/platform-server": "~10.0.0",
27+
"@angular/router": "~10.0.0",
2828
"@nguniversal/express-engine": "^9.0.1",
2929
"@progress/kendo-angular-buttons": "^5.0.0",
3030
"@progress/kendo-angular-charts": "^4.1.3",
@@ -43,31 +43,31 @@
4343
"@progress/kendo-theme-default": "latest",
4444
"express": "^4.15.2",
4545
"rxjs": "~6.5.4",
46-
"tslib": "^1.10.0",
46+
"tslib": "^2.0.0",
4747
"zone.js": "~0.10.2",
4848
"hammerjs": "^2.0.0"
4949
},
5050
"devDependencies": {
51-
"@angular-devkit/build-angular": "~0.900.2",
52-
"@angular/cli": "~9.0.2",
53-
"@angular/compiler-cli": "~9.0.1",
54-
"@angular/language-service": "~9.0.1",
51+
"@angular-devkit/build-angular": "~0.1000.0",
52+
"@angular/cli": "~10.0.0",
53+
"@angular/compiler-cli": "~10.0.0",
54+
"@angular/language-service": "~10.0.0",
5555
"@nguniversal/builders": "^9.0.1",
5656
"@types/express": "^4.17.0",
5757
"@types/node": "^12.11.1",
5858
"@types/jasmine": "~3.5.0",
5959
"@types/jasminewd2": "~2.0.3",
6060
"codelyzer": "^5.1.2",
6161
"jasmine-core": "~3.5.0",
62-
"jasmine-spec-reporter": "~4.2.1",
63-
"karma": "~4.3.0",
62+
"jasmine-spec-reporter": "~5.0.0",
63+
"karma": "~5.0.0",
6464
"karma-chrome-launcher": "~3.1.0",
65-
"karma-coverage-istanbul-reporter": "~2.1.0",
66-
"karma-jasmine": "~2.0.1",
67-
"karma-jasmine-html-reporter": "^1.4.2",
68-
"protractor": "~5.4.3",
65+
"karma-coverage-istanbul-reporter": "~3.0.2",
66+
"karma-jasmine": "~3.3.0",
67+
"karma-jasmine-html-reporter": "^1.5.0",
68+
"protractor": "~7.0.0",
6969
"ts-node": "~8.3.0",
70-
"tslint": "~5.18.0",
71-
"typescript": "~3.7.5"
70+
"tslint": "~6.1.0",
71+
"typescript": "~3.9.5"
7272
}
7373
}

examples-standalone/angular-universal/node_sample_application/tsconfig.app.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/app",
55
"types": []
Lines changed: 26 additions & 0 deletions
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+
}
Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,20 @@
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-
},
22-
"angularCompilerOptions": {
23-
"fullTemplateTypeCheck": true,
24-
"strictInjectionParameters": true
25-
}
26-
}
8+
"files": [],
9+
"references": [
10+
{
11+
"path": "./tsconfig.app.json"
12+
},
13+
{
14+
"path": "./tsconfig.spec.json"
15+
},
16+
{
17+
"path": "./tsconfig.server.json"
18+
}
19+
]
20+
}

examples-standalone/angular-universal/node_sample_application/tsconfig.server.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"extends": "./tsconfig.app.json",
33
"compilerOptions": {
44
"outDir": "./out-tsc/app-server",
5-
"module": "commonjs",
65
"types": [
76
"node"
87
]
9-
},
8+
, "target": "es2016"
9+
},
1010
"files": [
1111
"src/main.server.ts",
1212
"server.ts"

examples-standalone/angular-universal/node_sample_application/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
"types": [

examples-standalone/angular-universal/node_sample_application/tslint.json

Lines changed: 65 additions & 1 deletion
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)