Merge branch 'main' into feat/user-auth

# Conflicts: # package-lock.json
kordis-leitstelle · Dec 13, 2023 · e204e7e · e204e7e
2 parents ec07268 + 2ff8b9d
commit e204e7e
Show file tree

Hide file tree

Showing 18 changed files with 1,122 additions and 2,421 deletions.
diff --git a/.github/workflows/preview-deployment.yml b/.github/workflows/preview-deployment.yml
@@ -110,7 +110,7 @@ jobs:
             Commit SHA: ${{ steps.set-pr-sha.outputs.head_sha }}
           reactions: "rocket"
       - name: AZ B2C Tenant Login
-        uses: azure/[email protected].0
+        uses: azure/[email protected].1
         with:
           creds: '${{ secrets.AZURE_AADB2C_CREDENTIALS }}'
           allow-no-subscriptions: true
@@ -217,7 +217,7 @@ jobs:
             🏁 This PR has been closed. No deployment preview is available.
           reactions: "hooray"
       - name: AZ B2C Tenant Login
-        uses: azure/[email protected].0
+        uses: azure/[email protected].1
         with:
           creds: '${{ secrets.AZURE_AADB2C_CREDENTIALS }}'
           allow-no-subscriptions: true

diff --git a/.prettierrc b/.prettierrc
@@ -6,10 +6,15 @@
 	"proseWrap": "always",
 	"overrides": [
 		{
-			"files": ["*.ts"],
+			"files": [
+				"*.ts"
+			],
 			"options": {
 				"parser": "typescript",
-				"importOrder": ["^@kordis/(.*)$", "^[./]"],
+				"importOrder": [
+					"^@kordis/(.*)$",
+					"^[./]"
+				],
 				"importOrderSeparation": true,
 				"importOrderSortSpecifiers": true,
 				"importOrderParserPlugins": [
@@ -20,6 +25,9 @@
 			}
 		}
 	],
-	"plugins": ["prettier-plugin-tailwindcss"],
+	"plugins": [
+		"@trivago/prettier-plugin-sort-imports",
+		"prettier-plugin-tailwindcss"
+	],
 	"tailwindConfig": "./apps/spa/tailwind.config.js"
 }
diff --git a/apps/api/project.json b/apps/api/project.json
@@ -40,10 +40,7 @@
 		},
 		"lint": {
 			"executor": "@nx/eslint:lint",
-			"outputs": ["{options.outputFile}"],
-			"options": {
-				"lintFilePatterns": ["apps/api/**/*.ts"]
-			}
+			"outputs": ["{options.outputFile}"]
 		},
 		"test": {
 			"executor": "@nx/jest:jest",

diff --git a/apps/spa-e2e/project.json b/apps/spa-e2e/project.json
@@ -23,10 +23,7 @@
 		},
 		"lint": {
 			"executor": "@nx/eslint:lint",
-			"outputs": ["{options.outputFile}"],
-			"options": {
-				"lintFilePatterns": ["apps/spa-e2e/**/*.{ts,tsx,js,jsx}"]
-			}
+			"outputs": ["{options.outputFile}"]
 		}
 	},
 	"tags": [],

diff --git a/apps/spa/project.json b/apps/spa/project.json
@@ -76,10 +76,7 @@
 		},
 		"lint": {
 			"executor": "@nx/eslint:lint",
-			"outputs": ["{options.outputFile}"],
-			"options": {
-				"lintFilePatterns": ["apps/spa/**/*.ts", "apps/spa/**/*.html"]
-			}
+			"outputs": ["{options.outputFile}"]
 		},
 		"test": {
 			"executor": "@nx/jest:jest",

diff --git a/commitlint.config.js b/commitlint.config.js
@@ -1,3 +1,6 @@
 module.exports = {
 	extends: ['@commitlint/config-conventional', '@commitlint/config-nx-scopes'],
+	rules: {
+		'body-max-line-length': [2, 'always', 200],
+	},
 };
diff --git a/libs/api/auth/project.json b/libs/api/auth/project.json
@@ -6,10 +6,7 @@
 	"targets": {
 		"lint": {
 			"executor": "@nx/eslint:lint",
-			"outputs": ["{options.outputFile}"],
-			"options": {
-				"lintFilePatterns": ["libs/api/auth/**/*.ts"]
-			}
+			"outputs": ["{options.outputFile}"]
 		},
 		"test": {
 			"executor": "@nx/jest:jest",

diff --git a/libs/api/observability/project.json b/libs/api/observability/project.json
@@ -6,10 +6,7 @@
 	"targets": {
 		"lint": {
 			"executor": "@nx/eslint:lint",
-			"outputs": ["{options.outputFile}"],
-			"options": {
-				"lintFilePatterns": ["libs/api/observability/**/*.ts"]
-			}
+			"outputs": ["{options.outputFile}"]
 		},
 		"test": {
 			"executor": "@nx/jest:jest",

diff --git a/libs/api/observability/src/lib/sentry-observability.module.ts b/libs/api/observability/src/lib/sentry-observability.module.ts
@@ -2,7 +2,6 @@ import { Logger, Module, OnModuleInit } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { APP_FILTER, APP_INTERCEPTOR, ModulesContainer } from '@nestjs/core';
 import { init as initSentry } from '@sentry/node';
-import { ProfilingIntegration } from '@sentry/profiling-node';
 
 import { SentryExceptionsFilter } from './filters/sentry-exceptions.filter';
 import { SentryOTelUserContextInterceptor } from './interceptors/sentry-otel-user-context.interceptor';
@@ -48,11 +47,9 @@ export class SentryObservabilityModule implements OnModuleInit {
 		initSentry({
 			dsn: this.config.get('SENTRY_KEY'),
 			tracesSampleRate: 1.0,
-			profilesSampleRate: 1.0,
 			instrumenter: 'otel',
 			environment: this.config.get('ENVIRONMENT_NAME') ?? 'local-dev',
 			release: this.config.get('RELEASE_VERSION') ?? '0.0.0-development',
-			integrations: [new ProfilingIntegration()],
 		});
 		wrapProvidersWithTracingSpans(this.modulesContainer);
 		oTelSDK.start();

diff --git a/libs/api/organization/project.json b/libs/api/organization/project.json
@@ -6,10 +6,7 @@
 	"targets": {
 		"lint": {
 			"executor": "@nx/eslint:lint",
-			"outputs": ["{options.outputFile}"],
-			"options": {
-				"lintFilePatterns": ["libs/api/organization/**/*.ts"]
-			}
+			"outputs": ["{options.outputFile}"]
 		},
 		"test": {
 			"executor": "@nx/jest:jest",

diff --git a/libs/api/shared/project.json b/libs/api/shared/project.json
@@ -6,10 +6,7 @@
 	"targets": {
 		"lint": {
 			"executor": "@nx/eslint:lint",
-			"outputs": ["{options.outputFile}"],
-			"options": {
-				"lintFilePatterns": ["libs/api/shared/**/*.ts"]
-			}
+			"outputs": ["{options.outputFile}"]
 		},
 		"test": {
 			"executor": "@nx/jest:jest",

diff --git a/libs/api/test-helpers/project.json b/libs/api/test-helpers/project.json
@@ -6,10 +6,7 @@
 	"targets": {
 		"lint": {
 			"executor": "@nx/eslint:lint",
-			"outputs": ["{options.outputFile}"],
-			"options": {
-				"lintFilePatterns": ["libs/api/test-helpers/**/*.ts"]
-			}
+			"outputs": ["{options.outputFile}"]
 		}
 	},
 	"tags": []

diff --git a/libs/shared/auth/project.json b/libs/shared/auth/project.json
@@ -6,10 +6,7 @@
 	"targets": {
 		"lint": {
 			"executor": "@nx/eslint:lint",
-			"outputs": ["{options.outputFile}"],
-			"options": {
-				"lintFilePatterns": ["libs/shared/auth/**/*.ts"]
-			}
+			"outputs": ["{options.outputFile}"]
 		}
 	},
 	"tags": []

diff --git a/libs/spa/auth/project.json b/libs/spa/auth/project.json
@@ -14,10 +14,7 @@
 		},
 		"lint": {
 			"executor": "@nx/eslint:lint",
-			"outputs": ["{options.outputFile}"],
-			"options": {
-				"lintFilePatterns": ["libs/spa/auth/**/*.ts", "libs/spa/auth/**/*.html"]
-			}
+			"outputs": ["{options.outputFile}"]
 		}
 	},
 	"tags": []

diff --git a/libs/spa/observability/project.json b/libs/spa/observability/project.json
@@ -15,13 +15,7 @@
 		},
 		"lint": {
 			"executor": "@nx/eslint:lint",
-			"outputs": ["{options.outputFile}"],
-			"options": {
-				"lintFilePatterns": [
-					"libs/spa/observability/**/*.ts",
-					"libs/spa/observability/**/*.html"
-				]
-			}
+			"outputs": ["{options.outputFile}"]
 		}
 	}
 }
diff --git a/migrations.json b/migrations.json
@@ -2,93 +2,11 @@
   "migrations": [
     {
       "cli": "nx",
-      "version": "17.1.0-beta.5",
-      "requires": {
-        "@angular/core": ">=17.0.0"
-      },
-      "description": "Update the @angular/cli package version to ~17.0.0.",
-      "factory": "./src/migrations/update-17-1-0/update-angular-cli",
-      "package": "@nx/angular",
-      "name": "update-angular-cli-version-17-0-0"
-    },
-    {
-      "cli": "nx",
-      "version": "17.1.0-beta.5",
-      "requires": {
-        "@angular/core": ">=17.0.0"
-      },
-      "description": "Rename 'browserTarget' to 'buildTarget'.",
-      "factory": "./src/migrations/update-17-1-0/browser-target-to-build-target",
-      "package": "@nx/angular",
-      "name": "rename-browser-target-to-build-target"
-    },
-    {
-      "cli": "nx",
-      "version": "17.1.0-beta.5",
-      "requires": {
-        "@angular/core": ">=17.0.0"
-      },
-      "description": "Replace usages of '@nguniversal/builders' with '@angular-devkit/build-angular'.",
-      "factory": "./src/migrations/update-17-1-0/replace-nguniversal-builders",
-      "package": "@nx/angular",
-      "name": "replace-nguniversal-builders"
-    },
-    {
-      "cli": "nx",
-      "version": "17.1.0-beta.5",
-      "requires": {
-        "@angular/core": ">=17.0.0"
-      },
-      "description": "Replace usages of '@nguniversal/' packages with '@angular/ssr'.",
-      "factory": "./src/migrations/update-17-1-0/replace-nguniversal-engines",
-      "package": "@nx/angular",
-      "name": "replace-nguniversal-engines"
-    },
-    {
-      "cli": "nx",
-      "version": "17.1.0-beta.5",
-      "requires": {
-        "@angular/core": ">=17.0.0"
-      },
-      "description": "Replace the deep imports from 'zone.js/dist/zone' and 'zone.js/dist/zone-testing' with 'zone.js' and 'zone.js/testing'.",
-      "factory": "./src/migrations/update-17-1-0/update-zone-js-deep-import",
-      "package": "@nx/angular",
-      "name": "update-zone-js-deep-import"
-    },
-    {
-      "version": "17.1.0-beta.1",
-      "description": "Updates for @typescript-utils/utils v6.9.1+",
-      "implementation": "./src/migrations/update-17-1-0/update-typescript-eslint",
-      "package": "@nx/eslint",
-      "name": "update-typescript-eslint"
-    },
-    {
-      "version": "17.1.0-beta.2",
-      "description": "Move jest executor options to nx.json targetDefaults",
-      "implementation": "./src/migrations/update-17-1-0/move-options-to-target-defaults",
-      "package": "@nx/jest",
-      "name": "move-options-to-target-defaults"
-    },
-    {
-      "version": "17.0.0",
-      "description": "Angular v17 introduces a new control flow syntax that uses the @ and } characters. This migration replaces the existing usages with their corresponding HTML entities.",
-      "factory": "./migrations/block-template-entities/bundle",
-      "package": "@angular/core",
-      "name": "block-template-entities"
-    },
-    {
-      "version": "17.0.0",
-      "description": "CompilerOption.useJit and CompilerOption.missingTranslation are unused under Ivy. This migration removes their usage",
-      "factory": "./migrations/compiler-options/bundle",
-      "package": "@angular/core",
-      "name": "migration-v17-compiler-options"
-    },
-    {
-      "version": "17.0.0",
-      "description": "Updates `TransferState`, `makeStateKey`, `StateKey` imports from `@angular/platform-browser` to `@angular/core`.",
-      "factory": "./migrations/transfer-state/bundle",
-      "package": "@angular/core",
-      "name": "migration-transfer-state"
+      "version": "17.2.1-beta.0",
+      "description": "Add webpack.config.js file when webpackConfig is not defined",
+      "implementation": "./src/migrations/update-17-2-1/webpack-config-setup",
+      "package": "@nx/webpack",
+      "name": "update-17-2-1-webpack-config-setup"
     }
   ]
 }