chore: update nx to v18.2.0 and angular to v17.3.0 (DEV-4406) (#1952)

dasch-swiss · Dec 9, 2024 · 1718fb0 · 1718fb0
1 parent 6e4e035
commit 1718fb0
Show file tree

Hide file tree

Showing 65 changed files with 16,715 additions and 24,481 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -24,7 +24,8 @@
       ],
       "excludedFiles": [
         "*.spec.ts",
-        "**/test-setup.ts"
+        "**/test-setup.ts",
+        "**/environment*.ts"
       ],
       "extends": [
         "airbnb-base",

diff --git a/.prettierignore b/.prettierignore
@@ -4,3 +4,5 @@
 /coverage
 
 .angular
+
+/.nx/cache
diff --git a/apps/dateAdapter/karma.conf.js b/apps/dateAdapter/karma.conf.js
@@ -2,30 +2,30 @@
 // https://karma-runner.github.io/1.0/config/configuration-file.html
 
 module.exports = function (config) {
-    config.set({
-        basePath: '',
-        frameworks: ['jasmine', '@angular-devkit/build-angular'],
-        plugins: [
-            require('karma-jasmine'),
-            require('karma-chrome-launcher'),
-            require('karma-jasmine-html-reporter'),
-            require('karma-coverage-istanbul-reporter'),
-            require('@angular-devkit/build-angular/plugins/karma'),
-        ],
-        client: {
-            clearContext: false, // leave Jasmine Spec Runner output visible in browser
-        },
-        coverageIstanbulReporter: {
-            dir: require('path').join(__dirname, '../coverage'),
-            reports: ['html', 'lcovonly'],
-            fixWebpackSourcePaths: true,
-        },
-        reporters: ['progress', 'kjhtml'],
-        port: 9876,
-        colors: true,
-        logLevel: config.LOG_INFO,
-        autoWatch: true,
-        browsers: ['Chrome'],
-        singleRun: false,
-    });
+  config.set({
+    basePath: '',
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
+    plugins: [
+      require('karma-jasmine'),
+      require('karma-chrome-launcher'),
+      require('karma-jasmine-html-reporter'),
+      require('karma-coverage-istanbul-reporter'),
+      require('@angular-devkit/build-angular/plugins/karma'),
+    ],
+    client: {
+      clearContext: false, // leave Jasmine Spec Runner output visible in browser
+    },
+    coverageIstanbulReporter: {
+      dir: require('path').join(__dirname, '../coverage'),
+      reports: ['html', 'lcovonly'],
+      fixWebpackSourcePaths: true,
+    },
+    reporters: ['progress', 'kjhtml'],
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: true,
+    browsers: ['Chrome'],
+    singleRun: false,
+  });
 };
diff --git a/apps/dateAdapter/project.json b/apps/dateAdapter/project.json
@@ -15,10 +15,7 @@
         "main": "apps/dateAdapter/src/main.ts",
         "polyfills": "apps/dateAdapter/src/polyfills.ts",
         "tsConfig": "apps/dateAdapter/tsconfig.app.json",
-        "assets": [
-          "apps/dateAdapter/src/favicon.ico",
-          "apps/dateAdapter/src/assets"
-        ],
+        "assets": ["apps/dateAdapter/src/favicon.ico", "apps/dateAdapter/src/assets"],
         "styles": ["apps/dateAdapter/src/styles.scss"],
         "scripts": []
       },
@@ -53,32 +50,26 @@
     "serve": {
       "executor": "@angular-devkit/build-angular:dev-server",
       "options": {
-        "browserTarget": "dateAdapter:build"
+        "buildTarget": "dateAdapter:build"
       },
       "configurations": {
         "development": {
-          "browserTarget": "dateAdapter:build:development"
+          "buildTarget": "dateAdapter:build:development"
         },
         "production": {
-          "browserTarget": "dateAdapter:build:production",
+          "buildTarget": "dateAdapter:build:production"
         }
       }
     },
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "browserTarget": "dateAdapter:build"
+        "buildTarget": "dateAdapter:build"
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": [
-          "apps/dateAdapter/**/*.ts",
-          "apps/dateAdapter/**/*.html"
-        ]
-      }
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@angular-devkit/build-angular:karma",
@@ -89,10 +80,7 @@
         "karmaConfig": "apps/dateAdapter/karma.conf.js",
         "styles": ["apps/dateAdapter/src/styles.scss"],
         "scripts": [],
-        "assets": [
-          "apps/dateAdapter/src/favicon.ico",
-          "apps/dateAdapter/src/assets"
-        ]
+        "assets": ["apps/dateAdapter/src/favicon.ico", "apps/dateAdapter/src/assets"]
       },
       "configurations": {
         "ci": {

diff --git a/apps/dateAdapter/src/test.ts b/apps/dateAdapter/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, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
 

diff --git a/apps/dsp-app/karma.conf.js b/apps/dsp-app/karma.conf.js
@@ -2,30 +2,30 @@
 // https://karma-runner.github.io/1.0/config/configuration-file.html
 
 module.exports = function (config) {
-    config.set({
-        basePath: '',
-        frameworks: ['jasmine', '@angular-devkit/build-angular'],
-        plugins: [
-            require('karma-jasmine'),
-            require('karma-chrome-launcher'),
-            require('karma-jasmine-html-reporter'),
-            require('karma-coverage-istanbul-reporter'),
-            require('@angular-devkit/build-angular/plugins/karma'),
-        ],
-        client: {
-            clearContext: false, // leave Jasmine Spec Runner output visible in browser
-        },
-        coverageIstanbulReporter: {
-            dir: require('path').join(__dirname, '../coverage'),
-            reports: ['html', 'lcovonly'],
-            fixWebpackSourcePaths: true,
-        },
-        reporters: ['progress', 'kjhtml'],
-        port: 9876,
-        colors: true,
-        logLevel: config.LOG_INFO,
-        autoWatch: true,
-        browsers: ['Chrome'],
-        singleRun: false,
-    });
+  config.set({
+    basePath: '',
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
+    plugins: [
+      require('karma-jasmine'),
+      require('karma-chrome-launcher'),
+      require('karma-jasmine-html-reporter'),
+      require('karma-coverage-istanbul-reporter'),
+      require('@angular-devkit/build-angular/plugins/karma'),
+    ],
+    client: {
+      clearContext: false, // leave Jasmine Spec Runner output visible in browser
+    },
+    coverageIstanbulReporter: {
+      dir: require('path').join(__dirname, '../coverage'),
+      reports: ['html', 'lcovonly'],
+      fixWebpackSourcePaths: true,
+    },
+    reporters: ['progress', 'kjhtml'],
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: true,
+    browsers: ['Chrome'],
+    singleRun: false,
+  });
 };
diff --git a/apps/dsp-app/project.json b/apps/dsp-app/project.json
@@ -12,9 +12,7 @@
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
-      "outputs": [
-        "{options.outputPath}"
-      ],
+      "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "dist/apps/dsp-app",
         "index": "apps/dsp-app/src/index.html",
@@ -39,15 +37,11 @@
             "output": "/assets/"
           }
         ],
-        "styles": [
-          "apps/dsp-app/src/styles.scss"
-        ],
+        "styles": ["apps/dsp-app/src/styles.scss"],
         "stylePreprocessorOptions": {
           "includePaths": ["apps/dsp-app/src/styles"]
         },
-        "scripts": [
-          "node_modules/openseadragon/build/openseadragon/openseadragon.min.js"
-        ]
+        "scripts": ["node_modules/openseadragon/build/openseadragon/openseadragon.min.js"]
       },
       "configurations": {
         "production": {
@@ -161,48 +155,41 @@
     "serve": {
       "executor": "@angular-devkit/build-angular:dev-server",
       "options": {
-        "browserTarget": "dsp-app:build"
+        "buildTarget": "dsp-app:build"
       },
       "configurations": {
         "development": {
-          "browserTarget": "dsp-app:build:development"
+          "buildTarget": "dsp-app:build:development"
         },
         "production": {
-          "browserTarget": "dsp-app:build:production"
+          "buildTarget": "dsp-app:build:production"
         },
         "dev-server": {
-          "browserTarget": "dsp-app:build:dev-server"
+          "buildTarget": "dsp-app:build:dev-server"
         },
         "test-server": {
-          "browserTarget": "dsp-app:build:test-server"
+          "buildTarget": "dsp-app:build:test-server"
         },
         "ls-test-server": {
-          "browserTarget": "dsp-app:build:ls-test-server"
+          "buildTarget": "dsp-app:build:ls-test-server"
         },
         "0845-test-server": {
-          "browserTarget": "dsp-app:build:ls-test-server"
+          "buildTarget": "dsp-app:build:ls-test-server"
         },
         "stage-server": {
-          "browserTarget": "dsp-app:build:stage-server"
+          "buildTarget": "dsp-app:build:stage-server"
         }
       }
     },
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "browserTarget": "dsp-app:build"
+        "buildTarget": "dsp-app:build"
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
-      "outputs": [
-        "{options.outputFile}"
-      ],
-      "options": {
-        "lintFilePatterns": [
-          "apps/dsp-app/**/*.{ts,html}"
-        ]
-      }
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@angular-devkit/build-angular:karma",
@@ -212,12 +199,8 @@
         "tsConfig": "apps/dsp-app/tsconfig.spec.json",
         "inlineStyleLanguage": "scss",
         "karmaConfig": "apps/dsp-app/karma.conf.js",
-        "styles": [
-          "apps/dsp-app/src/styles.scss"
-        ],
-        "scripts": [
-          "node_modules/openseadragon/build/openseadragon/openseadragon.min.js"
-        ],
+        "styles": ["apps/dsp-app/src/styles.scss"],
+        "scripts": ["node_modules/openseadragon/build/openseadragon/openseadragon.min.js"],
         "assets": [
           "apps/dsp-app/src/favicon.ico",
           "apps/dsp-app/src/config",

diff --git a/apps/dsp-app/src/polyfills.ts b/apps/dsp-app/src/polyfills.ts
@@ -62,7 +62,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/apps/dsp-app/src/test.ts b/apps/dsp-app/src/test.ts
@@ -2,7 +2,7 @@
  * 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, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
 

diff --git a/libs/jdnconvertiblecalendar/project.json b/libs/jdnconvertiblecalendar/project.json
@@ -3,6 +3,7 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/jdnconvertiblecalendar/src",
   "projectType": "library",
+  "tags": [],
   "targets": {
     "build": {
       "executor": "@nx/js:tsc",
@@ -22,26 +23,15 @@
       "dependsOn": ["build"]
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["libs/jdnconvertiblecalendar/**/*.ts"]
-      }
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "libs/jdnconvertiblecalendar/jest.config.ts",
-        "passWithNoTests": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
+        "jestConfig": "libs/jdnconvertiblecalendar/jest.config.ts"
       }
     }
-  },
-  "tags": []
+  }
 }