Skip to content

Commit db46527

Browse files
Migrate to Angular 10
1 parent d2cd194 commit db46527

8 files changed

+2141
-1774
lines changed

angular.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"prefix": "app",
1111
"schematics": {
1212
"@schematics/angular:component": {
13-
"styleext": "scss"
13+
"style": "scss"
1414
}
1515
},
1616
"architect": {

package-lock.json

+2,110-1,740
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+24-23
Original file line numberDiff line numberDiff line change
@@ -12,46 +12,47 @@
1212
"deploy": "npm run builddemo; cd dist/demo; git init; git remote add origin [email protected]:formio/angular-demo.git; git checkout -b gh-pages; git add -A; git commit -m 'Update demo application'; git push -f origin gh-pages;"
1313
},
1414
"dependencies": {
15-
"@angular/animations": "^9.1.11",
16-
"@angular/common": "^9.1.11",
17-
"@angular/compiler": "^9.1.11",
18-
"@angular/core": "^9.1.11",
19-
"@angular/elements": "^9.1.11",
20-
"@angular/forms": "^9.1.11",
21-
"@angular/platform-browser": "^9.1.11",
22-
"@angular/platform-browser-dynamic": "^9.1.11",
23-
"@angular/router": "^9.1.11",
15+
"@angular/animations": "^10.2.1",
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/forms": "^10.2.1",
21+
"@angular/platform-browser": "^10.2.1",
22+
"@angular/platform-browser-dynamic": "^10.2.1",
23+
"@angular/router": "^10.2.1",
2424
"angular-formio": "^4.8.0",
2525
"bootstrap": "^4.5.0",
2626
"bootswatch": "^4.5.0",
2727
"core-js": "^3.6.5",
2828
"font-awesome": "^4.7.0",
2929
"formiojs": "^4.10.0",
3030
"jquery": "^3.5.1",
31+
"ngx-bootstrap": "^6.1.0",
3132
"prism-themes": "^1.4.0",
3233
"prismjs": "^1.20.0",
3334
"rxjs": "^6.5.5",
3435
"zone.js": "^0.10.3"
3536
},
3637
"devDependencies": {
37-
"@angular-devkit/build-angular": "^0.901.8",
38-
"@angular/cli": "^9.1.8",
39-
"@angular/compiler-cli": "^9.1.11",
40-
"@angular/language-service": "^9.1.11",
38+
"@angular-devkit/build-angular": "^0.1002.0",
39+
"@angular/cli": "^10.2.0",
40+
"@angular/compiler-cli": "^10.2.1",
41+
"@angular/language-service": "^10.2.1",
4142
"@types/jasmine": "^3.5.10",
4243
"@types/jasminewd2": "^2.0.8",
4344
"@types/node": "^14.0.13",
4445
"codelyzer": "^5.2.2",
45-
"jasmine-core": "^3.5.0",
46-
"jasmine-spec-reporter": "^5.0.2",
47-
"karma": "^5.0.9",
48-
"karma-chrome-launcher": "^3.1.0",
49-
"karma-coverage-istanbul-reporter": "^3.0.3",
50-
"karma-jasmine": "^3.3.1",
51-
"karma-jasmine-html-reporter": "^1.5.4",
52-
"protractor": "^7.0.0",
46+
"jasmine-core": "~3.5.0",
47+
"jasmine-spec-reporter": "~5.0.0",
48+
"karma": "~5.0.0",
49+
"karma-chrome-launcher": "~3.1.0",
50+
"karma-coverage-istanbul-reporter": "~3.0.2",
51+
"karma-jasmine": "~4.0.0",
52+
"karma-jasmine-html-reporter": "^1.5.0",
53+
"protractor": "~7.0.0",
5354
"ts-node": "^8.10.2",
54-
"tslint": "^6.1.2",
55-
"typescript": "~3.7.4"
55+
"tslint": "~6.1.0",
56+
"typescript": "~4.0.5"
5657
}
5758
}
File renamed without changes.

src/app/app.module.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,19 @@ import { DataComponent } from './data/data.component';
4545
},
4646
{
4747
path: 'forms',
48-
loadChildren: './forms/forms.module#FormsModule'
48+
loadChildren: () => import('./forms/forms.module').then(m => m.FormsModule)
4949
},
5050
{
5151
path: 'auth',
52-
loadChildren: './auth/auth.module#AuthModule'
52+
loadChildren: () => import('./auth/auth.module').then(m => m.AuthModule)
5353
},
5454
{
5555
path: 'event',
56-
loadChildren: './event/event.module#EventModule'
56+
loadChildren: () => import('./event/event.module').then(m => m.EventModule)
5757
},
5858
{
5959
path: 'manager',
60-
loadChildren: './form/form.module#FormModule'
60+
loadChildren: () => import('./form/form.module').then(m => m.FormModule)
6161
}
6262
], {useHash: true})
6363
],

src/styles.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@import "~bootswatch/dist/cosmo/_variables.scss";
22
@import "~bootstrap/scss/bootstrap.scss";
33
@import "~bootswatch/dist/cosmo/_bootswatch.scss";
4-
$fa-font-path: '../node_modules/font-awesome/fonts';
4+
$fa-font-path: '~font-awesome/fonts';
55
@import '~font-awesome/scss/font-awesome';

tsconfig.json

+1-4
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": "es2015",
8+
"module": "es2020",
99
"moduleResolution": "node",
1010
"emitDecoratorMetadata": true,
1111
"experimentalDecorators": true,
@@ -17,8 +17,5 @@
1717
"es2017",
1818
"dom"
1919
]
20-
},
21-
"angularCompilerOptions": {
22-
"enableIvy": false
2320
}
2421
}

tslint.json

-1
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)