IKC-423 Update frontend dependencies

kouncil-frontend/.eslintrc.json

@@ -1,12 +1,12 @@
 {
   "root": true,
   "ignorePatterns": ["**/*"],
-  "plugins": ["@nrwl/nx"],
+  "plugins": ["@nx"],
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
       "rules": {
-        "@nrwl/nx/enforce-module-boundaries": [
+        "@nx/enforce-module-boundaries": [
           "error",
           {
             "enforceBuildableLibDependency": true,
@@ -23,13 +23,12 @@
     },
     {
       "files": ["*.ts", "*.tsx"],
-      "extends": ["plugin:@nrwl/nx/typescript",
-        "@consdata/eslint-config"],
+      "extends": ["plugin:@nx/typescript", "@consdata/eslint-config"],
       "rules": {}
     },
     {
       "files": ["*.js", "*.jsx"],
-      "extends": ["plugin:@nrwl/nx/javascript"],
+      "extends": ["plugin:@nx/javascript"],
       "rules": {}
     }
   ]

kouncil-frontend/.gitignore

@@ -45,3 +45,4 @@ testem.log
 Thumbs.db
 
 .angular
+.nx/cache

kouncil-frontend/apps/kouncil/.eslintrc.json

@@ -5,7 +5,7 @@
     {
       "files": ["*.ts"],
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates",
         "@consdata/eslint-config"
       ],
@@ -31,7 +31,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

kouncil-frontend/apps/kouncil/jest.config.ts

@@ -3,21 +3,22 @@ export default {
   displayName: 'kouncil',
   preset: '../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.spec.json',
-      stringifyContentPathRegex: '\\.(html|svg)$',
-    },
-  },
+  globals: {},
   coverageDirectory: '../../coverage/apps/kouncil',
   transform: {
-    '^.+\\.(ts|mjs|js|html)$': 'jest-preset-angular',
+    '^.+\\.(ts|mjs|js|html)$': [
+      'jest-preset-angular',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+        stringifyContentPathRegex: '\\.(html|svg)$',
+      },
+    ],
   },
   transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
   snapshotSerializers: [
     'jest-preset-angular/build/serializers/no-ng-attributes',
     'jest-preset-angular/build/serializers/ng-snapshot',
     'jest-preset-angular/build/serializers/html-comment',
   ],
-  testEnvironment: "jsdom"
+  testEnvironment: 'jsdom',
 };

kouncil-frontend/apps/kouncil/project.json

@@ -6,10 +6,8 @@
   "prefix": "app",
   "targets": {
     "build": {
-      "executor": "@nrwl/angular:webpack-browser",
-      "outputs": [
-        "{options.outputPath}"
-      ],
+      "executor": "@nx/angular:webpack-browser",
+      "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "dist/apps/kouncil",
         "index": "apps/kouncil/src/index.html",
@@ -121,7 +119,7 @@
       "defaultConfiguration": "production"
     },
     "serve": {
-      "executor": "@nrwl/angular:webpack-dev-server",
+      "executor": "@nx/angular:webpack-dev-server",
       "configurations": {
         "production": {
           "browserTarget": "kouncil:build:production"
@@ -142,7 +140,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": [
           "apps/kouncil/src/**/*.ts",
@@ -151,10 +149,8 @@
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
-      "outputs": [
-        "{workspaceRoot}/coverage/apps/kouncil"
-      ],
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/apps/kouncil"],
       "options": {
         "jestConfig": "apps/kouncil/jest.config.ts",
         "passWithNoTests": true

kouncil-frontend/apps/kouncil/src/app/routing/auth.guard.ts

@@ -1,13 +1,13 @@
-import {Injectable} from '@angular/core';
-import {ActivatedRouteSnapshot, CanActivate, Router} from '@angular/router';
-import {AuthService, SystemFunctionName} from '@app/common-auth';
-import {map} from 'rxjs/operators';
-import {Observable} from 'rxjs';
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Router } from '@angular/router';
+import { AuthService, SystemFunctionName } from '@app/common-auth';
+import { map } from 'rxjs/operators';
+import { Observable } from 'rxjs';
 
 @Injectable({
   providedIn: 'root'
 })
-export class AuthGuard implements CanActivate {
+export class AuthGuard {
 
   constructor(public router: Router, private authService: AuthService) {
   }

kouncil-frontend/apps/kouncil/src/app/routing/config-resolver.ts

@@ -1,11 +1,10 @@
-import {Injectable} from '@angular/core';
-import {Resolve} from '@angular/router';
-import {Observable} from 'rxjs';
-import {ServersService} from '@app/common-servers';
-import {configProviderFactory} from '../app.module';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { ServersService } from '@app/common-servers';
+import { configProviderFactory } from '../app.module';
 
 @Injectable({providedIn: 'root'})
-export class ConfigResolver implements Resolve<boolean> {
+export class ConfigResolver {
 
   constructor(private service: ServersService) {
   }