Skip to content

Commit

Permalink
Angular 11 + various other dependency updates
Browse files Browse the repository at this point in the history
  • Loading branch information
bassages committed Dec 21, 2020
1 parent 5c7ca48 commit 1d731ff
Show file tree
Hide file tree
Showing 9 changed files with 3,053 additions and 2,445 deletions.
1 change: 0 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
Expand Down
2 changes: 1 addition & 1 deletion e2e/tsconfig.e2e.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../tsconfig.base.json",
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"baseUrl": "./",
Expand Down
5,359 changes: 2,992 additions & 2,367 deletions package-lock.json

Large diffs are not rendered by default.

73 changes: 37 additions & 36 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,71 +23,72 @@
},
"private": true,
"dependencies": {
"@angular-devkit/build-angular": "~0.1000.8",
"@angular/animations": "10.0.14",
"@angular/common": "10.0.14",
"@angular/compiler": "10.0.14",
"@angular/core": "10.0.14",
"@angular/forms": "10.0.14",
"@angular/localize": "^10.0.14",
"@angular/platform-browser": "10.0.14",
"@angular/platform-browser-dynamic": "10.0.14",
"@angular/router": "10.0.14",
"@angular-devkit/build-angular": "~0.1100.5",
"@angular/animations": "11.0.5",
"@angular/common": "11.0.5",
"@angular/compiler": "11.0.5",
"@angular/core": "11.0.5",
"@angular/forms": "11.0.5",
"@angular/localize": "^11.0.5",
"@angular/platform-browser": "11.0.5",
"@angular/platform-browser-dynamic": "11.0.5",
"@angular/router": "11.0.5",
"@fortawesome/fontawesome": "^1.1.8",
"@fortawesome/fontawesome-free-brands": "^5.0.13",
"@fortawesome/fontawesome-free-regular": "^5.0.13",
"@fortawesome/fontawesome-free-solid": "^5.0.13",
"@fortawesome/fontawesome-free-webfonts": "^1.0.9",
"@ng-bootstrap/ng-bootstrap": "^7.0.0",
"@stomp/ng2-stompjs": "^7.2.0",
"@ng-bootstrap/ng-bootstrap": "^8.0.0",
"@stomp/ng2-stompjs": "^8.0.0",
"@types/c3": "^0.4.54",
"@types/chroma-js": "^2.0.0",
"bootstrap": "^4.5.2",
"@types/chroma-js": "^2.1.2",
"bootstrap": "^4.5.3",
"c3": "^0.4.24",
"chroma-js": "^2.1.0",
"font-awesome": "^4.7.0",
"jquery": "^3.5.1",
"lodash": "^4.17.20",
"moment": "2.27.0",
"ng2-date-picker": "^10.0.0",
"moment": "2.29.1",
"ng2-date-picker": "^11.0.0",
"ngx-spinner": "^10.0.1",
"popper.js": "^1.16.1",
"rxjs": "^6.6.2",
"rxjs": "^6.6.3",
"sockjs-client": "^1.5.0",
"stompjs": "^2.3.3",
"tslib": "^2.0.1",
"zone.js": "~0.11.1"
"tslib": "^2.0.3",
"zone.js": "~0.11.3"
},
"resolutions": {
"moment": "2.24.0"
"moment": "2.29.1"
},
"devDependencies": {
"@angular/cli": "10.0.8",
"@angular/compiler-cli": "10.0.14",
"@angular/language-service": "10.0.14",
"@types/jasmine": "~3.5.14",
"@angular-devkit/build-angular": "~0.1100.5",
"@angular/cli": "11.0.5",
"@angular/compiler-cli": "11.0.5",
"@angular/language-service": "11.0.5",
"@types/jasmine": "~3.6.0",
"@types/jasminewd2": "~2.0.8",
"@types/lodash": "^4.14.161",
"@types/node": "^14.6.2",
"@types/sockjs-client": "^1.1.1",
"codelyzer": "^6.0.0",
"@types/lodash": "^4.14.165",
"@types/node": "^14.14.14",
"@types/sockjs-client": "^1.5.0",
"codelyzer": "^6.0.1",
"cypress": "^6.1.0",
"dayjs": "^1.9.7",
"jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~5.0.0",
"karma": "~5.1.1",
"jasmine-spec-reporter": "~6.0.0",
"karma": "~5.2.3",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.2",
"karma-jasmine": "~4.0.1",
"karma-jasmine-html-reporter": "^1.5.4",
"node-sass": "^4.14.1",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"node-sass": "^5.0.0",
"npm-run-all": "^4.1.5",
"protractor": "~7.0.0",
"start-server-and-test": "^1.11.6",
"ts-mockito": "^2.6.1",
"ts-node": "~9.0.0",
"ts-node": "~9.1.1",
"tslint": "~6.1.3",
"typescript": "~3.9.7",
"webpack-bundle-analyzer": "^3.8.0"
"typescript": "~4.0.5",
"webpack-bundle-analyzer": "^4.3.0"
}
}
2 changes: 1 addition & 1 deletion src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ const appRoutes: Routes = [
DpDatePickerModule,
NgxSpinnerModule,
BrowserAnimationsModule,
RouterModule.forRoot(appRoutes, {enableTracing: false, useHash: true})
RouterModule.forRoot(appRoutes, { enableTracing: false, useHash: true, relativeLinkResolution: 'legacy' })
],
providers: [
AuthService,
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.app.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "./tsconfig.base.json",
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"baseUrl": "./",
Expand Down
21 changes: 0 additions & 21 deletions tsconfig.base.json

This file was deleted.

36 changes: 20 additions & 16 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
/*
This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
It is not intended to be used to perform a compilation.
To learn more about this file see: https://angular.io/config/solution-tsconfig.
*/
{
"files": [],
"references": [
{
"path": "./tsconfig.app.json"
},
{
"path": "./tsconfig.spec.json"
}
]
}
"compileOnSave": false,
"compilerOptions": {
"importHelpers": true,
"module": "es2020",
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"target": "es5",
"typeRoots": [
"node_modules/@types"
],
"lib": [
"es2017",
"dom"
]
}
}
2 changes: 1 addition & 1 deletion tsconfig.spec.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "./tsconfig.base.json",
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "./out-tsc/spec",
"types": [
Expand Down

0 comments on commit 1d731ff

Please sign in to comment.