chore(deps): migrate nx to 17.1.1 (#490)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
kordis-leitstelle · Nov 10, 2023 · 2aba2f3 · 2aba2f3
1 parent 6d750ac
commit 2aba2f3
Show file tree

Hide file tree

Showing 14 changed files with 3,336 additions and 2,696 deletions.
diff --git a/.github/workflows/nx-migration-checker.yml b/.github/workflows/nx-migration-checker.yml
@@ -17,7 +17,7 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'npm'
       - run: npm ci
-      - uses: timonmasberg/[email protected].7
+      - uses: timonmasberg/[email protected].8
         with:
           repoToken: ${{ secrets.WORKFLOW_PAT }}
           prTitle: 'chore(deps): migrate nx to $VERSION'
diff --git a/.prettierignore b/.prettierignore
@@ -9,4 +9,6 @@ package-lock.json
 
 apps/api/src/main.ts
 
-/.nx/cache
+/.nx/cache
+
+migrations.json
diff --git a/apps/api/project.json b/apps/api/project.json
@@ -49,14 +49,7 @@
 			"executor": "@nx/jest:jest",
 			"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
 			"options": {
-				"jestConfig": "apps/api/jest.config.ts",
-				"passWithNoTests": true
-			},
-			"configurations": {
-				"ci": {
-					"ci": true,
-					"codeCoverage": true
-				}
+				"jestConfig": "apps/api/jest.config.ts"
 			}
 		},
 		"docker-build": {

diff --git a/apps/spa/project.json b/apps/spa/project.json
@@ -60,18 +60,18 @@
 			"executor": "@angular-devkit/build-angular:dev-server",
 			"configurations": {
 				"production": {
-					"browserTarget": "spa:build:production"
+					"buildTarget": "spa:build:production"
 				},
 				"development": {
-					"browserTarget": "spa:build:development"
+					"buildTarget": "spa:build:development"
 				}
 			},
 			"defaultConfiguration": "development"
 		},
 		"extract-i18n": {
 			"executor": "@angular-devkit/build-angular:extract-i18n",
 			"options": {
-				"browserTarget": "spa:build"
+				"buildTarget": "spa:build"
 			}
 		},
 		"lint": {
@@ -85,8 +85,7 @@
 			"executor": "@nx/jest:jest",
 			"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
 			"options": {
-				"jestConfig": "apps/spa/jest.config.ts",
-				"passWithNoTests": true
+				"jestConfig": "apps/spa/jest.config.ts"
 			}
 		}
 	},

diff --git a/libs/api/auth/project.json b/libs/api/auth/project.json
@@ -15,14 +15,7 @@
 			"executor": "@nx/jest:jest",
 			"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
 			"options": {
-				"jestConfig": "libs/api/auth/jest.config.ts",
-				"passWithNoTests": true
-			},
-			"configurations": {
-				"ci": {
-					"ci": true,
-					"codeCoverage": true
-				}
+				"jestConfig": "libs/api/auth/jest.config.ts"
 			}
 		}
 	},

diff --git a/libs/api/observability/project.json b/libs/api/observability/project.json
@@ -15,14 +15,7 @@
 			"executor": "@nx/jest:jest",
 			"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
 			"options": {
-				"jestConfig": "libs/api/observability/jest.config.ts",
-				"passWithNoTests": true
-			},
-			"configurations": {
-				"ci": {
-					"ci": true,
-					"codeCoverage": true
-				}
+				"jestConfig": "libs/api/observability/jest.config.ts"
 			}
 		}
 	},

diff --git a/libs/api/organization/project.json b/libs/api/organization/project.json
@@ -15,14 +15,7 @@
 			"executor": "@nx/jest:jest",
 			"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
 			"options": {
-				"jestConfig": "libs/api/organization/jest.config.ts",
-				"passWithNoTests": true
-			},
-			"configurations": {
-				"ci": {
-					"ci": true,
-					"codeCoverage": true
-				}
+				"jestConfig": "libs/api/organization/jest.config.ts"
 			}
 		}
 	},

diff --git a/libs/api/shared/project.json b/libs/api/shared/project.json
@@ -15,14 +15,7 @@
 			"executor": "@nx/jest:jest",
 			"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
 			"options": {
-				"jestConfig": "libs/api/shared/jest.config.ts",
-				"passWithNoTests": true
-			},
-			"configurations": {
-				"ci": {
-					"ci": true,
-					"codeCoverage": true
-				}
+				"jestConfig": "libs/api/shared/jest.config.ts"
 			}
 		}
 	},

diff --git a/libs/spa/auth/project.json b/libs/spa/auth/project.json
@@ -9,14 +9,7 @@
 			"executor": "@nx/jest:jest",
 			"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
 			"options": {
-				"jestConfig": "libs/spa/auth/jest.config.ts",
-				"passWithNoTests": true
-			},
-			"configurations": {
-				"ci": {
-					"ci": true,
-					"codeCoverage": true
-				}
+				"jestConfig": "libs/spa/auth/jest.config.ts"
 			}
 		},
 		"lint": {

diff --git a/libs/spa/observability/project.json b/libs/spa/observability/project.json
@@ -10,14 +10,7 @@
 			"executor": "@nx/jest:jest",
 			"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
 			"options": {
-				"jestConfig": "libs/spa/observability/jest.config.ts",
-				"passWithNoTests": true
-			},
-			"configurations": {
-				"ci": {
-					"ci": true,
-					"codeCoverage": true
-				}
+				"jestConfig": "libs/spa/observability/jest.config.ts"
 			}
 		},
 		"lint": {

diff --git a/migrations.json b/migrations.json
@@ -1,34 +1,94 @@
 {
-	"migrations": [
-		{
-			"cli": "nx",
-			"version": "17.0.0-beta.1",
-			"description": "Updates the default cache directory to .nx/cache",
-			"implementation": "./src/migrations/update-17-0-0/move-cache-directory",
-			"package": "nx",
-			"name": "17.0.0-move-cache-directory"
-		},
-		{
-			"cli": "nx",
-			"version": "17.0.0-beta.3",
-			"description": "Use minimal config for tasksRunnerOptions",
-			"implementation": "./src/migrations/update-17-0-0/use-minimal-config-for-tasks-runner-options",
-			"package": "nx",
-			"name": "17.0.0-use-minimal-config-for-tasks-runner-options"
-		},
-		{
-			"version": "17.0.0-rc.1",
-			"description": "Migration for v17.0.0-rc.1",
-			"implementation": "./src/migrations/update-17-0-0/rm-default-collection-npm-scope",
-			"package": "nx",
-			"name": "rm-default-collection-npm-scope"
-		},
-		{
-			"version": "17.0.0-beta.7",
-			"description": "update-17-0-0-rename-to-eslint",
-			"implementation": "./src/migrations/update-17-0-0-rename-to-eslint/update-17-0-0-rename-to-eslint",
-			"package": "@nx/eslint",
-			"name": "update-17-0-0-rename-to-eslint"
-		}
-	]
+  "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"
+    }
+  ]
 }
diff --git a/nx.json b/nx.json
@@ -6,17 +6,26 @@
 			"inputs": ["production", "^production"],
 			"cache": true
 		},
-		"test": {
-			"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
-			"cache": true
-		},
 		"e2e": {
 			"inputs": ["default", "^production"],
 			"cache": true
 		},
 		"lint": {
 			"inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
 			"cache": true
+		},
+		"@nx/jest:jest": {
+			"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
+			"cache": true,
+			"options": {
+				"passWithNoTests": true
+			},
+			"configurations": {
+				"ci": {
+					"ci": true,
+					"codeCoverage": true
+				}
+			}
 		}
 	},
 	"namedInputs": {