Skip to content
This repository was archived by the owner on Nov 13, 2024. It is now read-only.

Commit 5968209

Browse files
Migrate to Angular 10
1 parent dede006 commit 5968209

23 files changed

+14055
-9800
lines changed

angular.json

+6-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@
1515
"tsConfig": "projects/angular-material-formio/tsconfig.lib.json",
1616
"project": "projects/angular-material-formio/ng-package.json"
1717
}
18-
},
18+
, "configurations": {
19+
"production": {
20+
"tsConfig": "projects/angular-material-formio/tsconfig.lib.prod.json"
21+
}
22+
}
23+
},
1924
"test": {
2025
"builder": "@angular-devkit/build-angular:karma",
2126
"options": {
File renamed without changes.

demo/angular.json

+4
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@
5555
"type": "initial",
5656
"maximumWarning": "2mb",
5757
"maximumError": "5mb"
58+
},
59+
{
60+
"type": "anyComponentStyle",
61+
"maximumWarning": "6kb"
5862
}
5963
]
6064
}

demo/e2e/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"compilerOptions": {
44
"outDir": "../out-tsc/e2e",
55
"module": "commonjs",
6-
"target": "es5",
6+
"target": "es2018",
77
"types": [
88
"jasmine",
99
"jasminewd2",

demo/package-lock.json

+6,460-3,421
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo/package.json

+28-28
Original file line numberDiff line numberDiff line change
@@ -11,45 +11,45 @@
1111
},
1212
"private": true,
1313
"dependencies": {
14-
"@angular/animations": "^8.2.14",
14+
"@angular/animations": "^10.2.1",
1515
"@angular/cdk": "^8.2.3",
16-
"@angular/common": "^8.2.14",
17-
"@angular/compiler": "^8.2.14",
18-
"@angular/core": "^8.2.14",
19-
"@angular/elements": "^8.2.14",
20-
"@angular/flex-layout": "^8.0.0-beta.27",
21-
"@angular/forms": "^8.2.14",
16+
"@angular/common": "^10.2.1",
17+
"@angular/compiler": "^10.2.1",
18+
"@angular/core": "^10.2.1",
19+
"@angular/elements": "^10.2.1",
20+
"@angular/flex-layout": "^10.0.0-beta.32",
21+
"@angular/forms": "^10.2.1",
2222
"@angular/material": "^8.2.3",
23-
"@angular/platform-browser": "^8.2.14",
24-
"@angular/platform-browser-dynamic": "^8.2.14",
25-
"@angular/router": "^8.2.14",
23+
"@angular/platform-browser": "^10.2.1",
24+
"@angular/platform-browser-dynamic": "^10.2.1",
25+
"@angular/router": "^10.2.1",
2626
"angular-material-formio": "^1.30.0",
2727
"formiojs": "^4.10.3-rc.3",
2828
"hammerjs": "^2.0.8",
2929
"rxjs": "^6.5.5",
30-
"tslib": "^1.11.2",
31-
"zone.js": "^0.10.3"
30+
"tslib": "^2.0.0",
31+
"zone.js": "~0.10.2"
3232
},
3333
"devDependencies": {
34-
"@angular-devkit/build-angular": "^0.803.23",
35-
"@angular/cli": "^8.3.23",
36-
"@angular/compiler-cli": "^8.2.14",
37-
"@angular/language-service": "^8.2.14",
34+
"@angular-devkit/build-angular": "~0.1002.0",
35+
"@angular/cli": "^10.2.0",
36+
"@angular/compiler-cli": "^10.2.1",
37+
"@angular/language-service": "^10.2.1",
3838
"@types/jasmine": "^3.5.10",
3939
"@types/jasminewd2": "^2.0.8",
40-
"@types/node": "^13.13.5",
41-
"codelyzer": "^5.2.2",
42-
"jasmine-core": "^3.5.0",
43-
"jasmine-spec-reporter": "~4.2.1",
44-
"karma": "^4.4.1",
45-
"karma-chrome-launcher": "^3.1.0",
46-
"karma-coverage-istanbul-reporter": "^2.1.1",
47-
"karma-jasmine": "^3.1.1",
48-
"karma-jasmine-html-reporter": "^1.5.4",
49-
"protractor": "^5.4.4",
40+
"@types/node": "^12.11.1",
41+
"codelyzer": "^5.1.2",
42+
"jasmine-core": "~3.5.0",
43+
"jasmine-spec-reporter": "~5.0.0",
44+
"karma": "~5.0.0",
45+
"karma-chrome-launcher": "~3.1.0",
46+
"karma-coverage-istanbul-reporter": "~3.0.2",
47+
"karma-jasmine": "~4.0.0",
48+
"karma-jasmine-html-reporter": "^1.5.0",
49+
"protractor": "~7.0.0",
5050
"ts-node": "^8.10.1",
51-
"tslint": "^6.1.2",
52-
"typescript": "~3.5.3"
51+
"tslint": "~6.1.0",
52+
"typescript": "~4.0.5"
5353
},
5454
"description": "This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 8.1.0.",
5555
"main": "karma.conf.js",

demo/tsconfig.app.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"outDir": "./out-tsc/app",
55
"types": ["node"]
66
},
7-
"include": [
8-
"src/**/*.ts"
7+
"files": [
8+
"src/main.ts",
9+
"src/polyfills.ts"
910
],
10-
"exclude": [
11-
"src/test.ts",
12-
"src/**/*.spec.ts"
11+
"include": [
12+
"src/**/*.d.ts"
1313
]
1414
}

demo/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"declaration": false,
88
"downlevelIteration": true,
99
"experimentalDecorators": true,
10-
"module": "esnext",
10+
"module": "es2020",
1111
"moduleResolution": "node",
1212
"importHelpers": true,
1313
"target": "es2015",

demo/tslint.json

+65-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
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,
613
"deprecation": {
714
"severity": "warning"
815
},
916
"component-class-suffix": true,
1017
"contextual-lifecycle": true,
18+
"curly": true,
1119
"directive-class-suffix": true,
1220
"directive-selector": [
1321
true,
@@ -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": [
@@ -60,7 +75,6 @@
6075
"no-non-null-assertion": true,
6176
"no-redundant-jsdoc": true,
6277
"no-switch-case-fall-through": true,
63-
"no-use-before-declare": true,
6478
"no-var-requires": false,
6579
"object-literal-key-quotes": [
6680
true,
@@ -80,11 +94,60 @@
8094
"no-output-native": true,
8195
"no-output-on-prefix": true,
8296
"no-output-rename": true,
97+
"semicolon": {
98+
"options": [
99+
"always"
100+
]
101+
},
102+
"space-before-function-paren": {
103+
"options": {
104+
"anonymous": "never",
105+
"asyncArrow": "always",
106+
"constructor": "never",
107+
"method": "never",
108+
"named": "never"
109+
}
110+
},
83111
"no-outputs-metadata-property": true,
84112
"template-banana-in-box": true,
85113
"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+
},
86132
"use-lifecycle-interface": true,
87-
"use-pipe-transform-interface": true
133+
"use-pipe-transform-interface": true,
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+
}
88151
},
89152
"rulesDirectory": [
90153
"codelyzer"

0 commit comments

Comments
 (0)