diff --git a/quartz-manager-frontend/angular.json b/quartz-manager-frontend/angular.json index 7cd6f33..563894f 100644 --- a/quartz-manager-frontend/angular.json +++ b/quartz-manager-frontend/angular.json @@ -11,6 +11,7 @@ "build": { "builder": "@angular-devkit/build-angular:browser", "options": { + "aot": true, "outputPath": "../server/src/main/resources/static", "index": "src/index.html", "main": "src/main.ts", @@ -27,6 +28,12 @@ }, "configurations": { "production": { + "budgets": [ + { + "type": "anyComponentStyle", + "maximumWarning": "6kb" + } + ], "optimization": true, "outputHashing": "all", "sourceMap": false, @@ -119,7 +126,7 @@ "schematics": { "@schematics/angular:component": { "prefix": "app", - "styleext": "css" + "style": "css" }, "@schematics/angular:directive": { "prefix": "app" diff --git a/quartz-manager-frontend/package.json b/quartz-manager-frontend/package.json index 06848ba..acc93f2 100644 --- a/quartz-manager-frontend/package.json +++ b/quartz-manager-frontend/package.json @@ -12,18 +12,18 @@ }, "private": true, "dependencies": { - "@angular/animations": "8.2.14", + "@angular/animations": "9.1.4", "@angular/cdk": "7.3.7", - "@angular/common": "8.2.14", - "@angular/compiler": "8.2.14", - "@angular/core": "8.2.14", - "@angular/flex-layout": "7.0.0-beta.24", - "@angular/forms": "8.2.14", + "@angular/common": "9.1.4", + "@angular/compiler": "9.1.4", + "@angular/core": "9.1.4", + "@angular/flex-layout": "9.0.0-beta.29", + "@angular/forms": "9.1.4", "@angular/material": "7.3.7", - "@angular/platform-browser": "8.2.14", - "@angular/platform-browser-dynamic": "8.2.14", - "@angular/platform-server": "8.2.14", - "@angular/router": "8.2.14", + "@angular/platform-browser": "9.1.4", + "@angular/platform-browser-dynamic": "9.1.4", + "@angular/platform-server": "9.1.4", + "@angular/router": "9.1.4", "@fortawesome/fontawesome": "^1.1.4", "@fortawesome/fontawesome-free-regular": "^5.0.8", "@fortawesome/fontawesome-free-solid": "^5.0.8", @@ -33,20 +33,20 @@ "net": "^1.0.2", "rxjs": "6.5.5", "stompjs": "^2.3.3", - "tslib": "^1.9.0", - "zone.js": "~0.9.1" + "tslib": "^1.10.0", + "zone.js": "~0.10.2" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.803.25", - "@angular-devkit/core": "^0.2.0", - "@angular/cli": "8.3.26", - "@angular/compiler-cli": "8.2.14", - "@angular/language-service": "8.2.14", + "@angular-devkit/build-angular": "~0.901.4", + "@angular-devkit/core": "^9.1.4", + "@angular/cli": "9.1.4", + "@angular/compiler-cli": "9.1.4", + "@angular/language-service": "9.1.4", "@types/hammerjs": "2.0.34", "@types/jasmine": "2.5.54", "@types/jasminewd2": "2.0.3", - "@types/node": "6.0.90", - "codelyzer": "^5.0.1", + "@types/node": "^12.11.1", + "codelyzer": "^5.1.2", "jasmine-core": "2.6.4", "jasmine-spec-reporter": "4.1.1", "karma": "1.7.1", @@ -58,6 +58,6 @@ "protractor": "5.1.2", "ts-node": "3.0.6", "tslint": "5.7.0", - "typescript": "3.5.3" + "typescript": "3.8.3" } } diff --git a/quartz-manager-frontend/src/app/services/logs.websocket.service.ts b/quartz-manager-frontend/src/app/services/logs.websocket.service.ts index 76664cc..d7cceb9 100644 --- a/quartz-manager-frontend/src/app/services/logs.websocket.service.ts +++ b/quartz-manager-frontend/src/app/services/logs.websocket.service.ts @@ -3,6 +3,7 @@ import { WebsocketService } from '.'; import { SocketOption } from '../model/SocketOption.model'; Injectable() +@Injectable() export class LogsWebsocketService extends WebsocketService { constructor(){ diff --git a/quartz-manager-frontend/src/app/services/progress.websocket.service.ts b/quartz-manager-frontend/src/app/services/progress.websocket.service.ts index 378b7d2..cb668fa 100644 --- a/quartz-manager-frontend/src/app/services/progress.websocket.service.ts +++ b/quartz-manager-frontend/src/app/services/progress.websocket.service.ts @@ -3,6 +3,7 @@ import { WebsocketService } from '.'; import { SocketOption } from '../model/SocketOption.model'; Injectable() +@Injectable() export class ProgressWebsocketService extends WebsocketService { constructor(){ diff --git a/quartz-manager-frontend/src/app/services/scheduler.service.ts b/quartz-manager-frontend/src/app/services/scheduler.service.ts index 2da0a1f..f2b351b 100644 --- a/quartz-manager-frontend/src/app/services/scheduler.service.ts +++ b/quartz-manager-frontend/src/app/services/scheduler.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { Headers } from '@angular/http'; import { ApiService } from './api.service'; @Injectable() diff --git a/quartz-manager-frontend/src/app/services/user.service.ts b/quartz-manager-frontend/src/app/services/user.service.ts index 310eb49..351653a 100644 --- a/quartz-manager-frontend/src/app/services/user.service.ts +++ b/quartz-manager-frontend/src/app/services/user.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { Headers } from '@angular/http'; import { ApiService } from './api.service'; import { ConfigService } from './config.service'; diff --git a/quartz-manager-frontend/src/app/services/websocket.service.ts b/quartz-manager-frontend/src/app/services/websocket.service.ts index a9fa640..b8ffdf3 100644 --- a/quartz-manager-frontend/src/app/services/websocket.service.ts +++ b/quartz-manager-frontend/src/app/services/websocket.service.ts @@ -1,5 +1,4 @@ import { Injectable, OnInit } from '@angular/core'; -import { Headers } from '@angular/http'; import { Observable } from 'rxjs'; diff --git a/quartz-manager-frontend/src/tsconfig.app.json b/quartz-manager-frontend/src/tsconfig.app.json index cf49d7f..26227d8 100644 --- a/quartz-manager-frontend/src/tsconfig.app.json +++ b/quartz-manager-frontend/src/tsconfig.app.json @@ -5,8 +5,11 @@ "baseUrl": "", "types": [] }, - "exclude": [ - "test.ts", - "**/*.spec.ts" + "files": [ + "main.ts", + "polyfills.ts" + ], + "include": [ + "src/**/*.d.ts" ] }