diff --git a/.gitignore b/.gitignore index 79aa59e..478e476 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ frontend/ legacy/ DB/csv/ otis/package-lock.json +otis/.eslintcache \ No newline at end of file diff --git a/otis/angular.json b/otis/angular.json index a175f2a..30bfab3 100644 --- a/otis/angular.json +++ b/otis/angular.json @@ -22,7 +22,6 @@ "main": "src/main.ts", "polyfills": "src/polyfills.ts", "tsConfig": "tsconfig.app.json", - "aot": true, "assets": [ "src/favicon.ico", "src/assets" @@ -31,7 +30,13 @@ "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", "src/styles.css" ], - "scripts": [] + "scripts": [], + "vendorChunk": true, + "extractLicenses": false, + "buildOptimizer": false, + "sourceMap": true, + "optimization": false, + "namedChunks": true }, "configurations": { "production": { @@ -61,7 +66,8 @@ } ] } - } + }, + "defaultConfiguration": "" }, "serve": { "builder": "@angular-devkit/build-angular:dev-server", diff --git a/otis/package.json b/otis/package.json index 287127b..5425984 100644 --- a/otis/package.json +++ b/otis/package.json @@ -14,35 +14,35 @@ }, "private": true, "dependencies": { - "@angular/animations": "^11.1.0", - "@angular/cdk": "^11.1.0", - "@angular/common": "^11.1.0", - "@angular/compiler": "^11.1.0", - "@angular/core": "^11.1.0", - "@angular/flex-layout": "^11.0.0-beta.33", - "@angular/forms": "^11.1.0", - "@angular/material": "^11.1.0", - "@angular/material-moment-adapter": "^11.1.0", - "@angular/platform-browser": "^11.1.0", - "@angular/platform-browser-dynamic": "^11.1.0", - "@angular/router": "^11.1.0", + "@angular/animations": "^12.2.16", + "@angular/cdk": "^12.2.13", + "@angular/common": "^12.2.16", + "@angular/compiler": "^12.2.16", + "@angular/core": "^12.2.16", + "@angular/flex-layout": "^12.0.0-beta.35", + "@angular/forms": "^12.2.16", + "@angular/material": "^12.2.13", + "@angular/material-moment-adapter": "^12.2.13", + "@angular/platform-browser": "^12.2.16", + "@angular/platform-browser-dynamic": "^12.2.16", + "@angular/router": "^12.2.16", "jspdf": "^2.3.0", "jspdf-autotable": "^3.5.13", "moment": "^2.29.1", "rxjs": "^6.6.3", "tslib": "^2.1.0", - "zone.js": "^0.11.3" + "zone.js": "~0.11.4" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.1101.1", + "@angular-devkit/build-angular": "~12.2.17", "@angular-eslint/builder": "^1.1.0", "@angular-eslint/eslint-plugin": "^1.1.0", "@angular-eslint/eslint-plugin-template": "^1.1.0", "@angular-eslint/schematics": "^1.1.0", "@angular-eslint/template-parser": "^1.1.0", - "@angular/cli": "^11.1.1", - "@angular/compiler-cli": "^11.1.0", - "@angular/language-service": "^11.1.0", + "@angular/cli": "^12.2.17", + "@angular/compiler-cli": "^12.2.16", + "@angular/language-service": "^12.2.16", "@types/jasmine": "~3.6.3", "@types/node": "^14.14.22", "@typescript-eslint/eslint-plugin": "^4.14.0", @@ -54,7 +54,7 @@ "husky": "^4.3.8", "jasmine-core": "^3.6.0", "jasmine-spec-reporter": "^6.0.0", - "karma": "^6.0.1", + "karma": "^6.3.18", "karma-chrome-launcher": "~3.1.0", "karma-coverage-istanbul-reporter": "~3.0.2", "karma-jasmine": "^4.0.0", @@ -63,7 +63,7 @@ "prettier": "^2.2.1", "standard-version": "^9.1.0", "ts-node": "^9.1.1", - "typescript": "^4.1.3" + "typescript": "^4.3.5" }, "husky": { "hooks": { @@ -78,4 +78,4 @@ "npx eslint --cache --fix" ] } -} +} \ No newline at end of file diff --git a/otis/src/environments/environment.ts b/otis/src/environments/environment.ts index 7571df4..8d60309 100644 --- a/otis/src/environments/environment.ts +++ b/otis/src/environments/environment.ts @@ -15,4 +15,4 @@ export const environment = { * This import should be commented out in production mode because it will have a negative impact * on performance if an error is thrown. */ -// import 'zone.js/dist/zone-error'; // Included with Angular CLI. +// import 'zone.js/plugins/zone-error'; // Included with Angular CLI. diff --git a/otis/src/polyfills.ts b/otis/src/polyfills.ts index 955e1ce..0cdffa7 100644 --- a/otis/src/polyfills.ts +++ b/otis/src/polyfills.ts @@ -55,7 +55,7 @@ /*************************************************************************************************** * Zone JS is required by default for Angular itself. */ -import 'zone.js/dist/zone'; // Included with Angular CLI. +import 'zone.js'; // Included with Angular CLI. /*************************************************************************************************** * APPLICATION IMPORTS diff --git a/otis/src/test.ts b/otis/src/test.ts index e103ada..a0e80c3 100644 --- a/otis/src/test.ts +++ b/otis/src/test.ts @@ -1,6 +1,6 @@ // This file is required by karma.conf.js and loads recursively all the .spec and framework files -import 'zone.js/dist/zone-testing'; +import 'zone.js/testing'; import { getTestBed } from '@angular/core/testing'; import { BrowserDynamicTestingModule,