Merge pull request #965 from gperdomor/feature/nx-18

chore: migrate to nx 18
gperdomor · Feb 17, 2024 · 578c769 · 578c769
2 parents 1474283 + 5ed4b8a
commit 578c769
Show file tree

Hide file tree

Showing 10 changed files with 1,029 additions and 1,222 deletions.
diff --git a/nx.json b/nx.json
@@ -6,7 +6,7 @@
       "dependsOn": ["^build"],
       "inputs": ["production", "^production"]
     },
-    "lint": {
+    "@nx/eslint:lint": {
       "cache": true,
       "inputs": [
         "default",
@@ -15,12 +15,18 @@
         "{workspaceRoot}/eslint.config.js"
       ]
     },
-    "test": {
+    "@nx/jest:jest": {
       "cache": true,
-      "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"]
-    },
-    "e2e": {
-      "cache": true
+      "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
+      "options": {
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "codeCoverage": true
+        }
+      }
     }
   },
   "namedInputs": {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "@actions/exec": "1.1.1",
     "@actions/github": "6.0.0",
     "@actions/io": "1.1.3",
-    "@nx/devkit": "17.0.1",
+    "@nx/devkit": "18.0.4",
     "@octokit/openapi-types": "19.0.0",
     "@renovate/pep440": "1.0.0",
     "@swc/helpers": "0.5.3",
@@ -38,23 +38,23 @@
     "@commitlint/config-conventional": "18.0.0",
     "@commitlint/config-nx-scopes": "18.0.0",
     "@commitlint/cz-commitlint": "18.0.0",
-    "@nx/eslint": "17.0.1",
-    "@nx/eslint-plugin": "17.0.1",
-    "@nx/jest": "17.0.1",
-    "@nx/js": "17.0.1",
-    "@nx/plugin": "17.0.1",
-    "@nx/workspace": "17.0.1",
+    "@nx/eslint": "18.0.4",
+    "@nx/eslint-plugin": "18.0.4",
+    "@nx/jest": "18.0.4",
+    "@nx/js": "18.0.4",
+    "@nx/plugin": "18.0.4",
+    "@nx/workspace": "18.0.4",
     "@prisma/client": "5.5.2",
-    "@swc-node/register": "1.6.8",
+    "@swc-node/register": "1.8.0",
     "@swc/cli": "~0.1.62",
     "@swc/core": "1.3.95",
     "@types/jest": "29.5.6",
-    "@types/node": "18.18.6",
-    "@typescript-eslint/eslint-plugin": "5.62.0",
-    "@typescript-eslint/parser": "5.62.0",
+    "@types/node": "18.19.17",
+    "@typescript-eslint/eslint-plugin": "6.21.0",
+    "@typescript-eslint/parser": "6.21.0",
     "commitizen": "4.3.0",
     "dotenv": "16.3.1",
-    "eslint": "8.46.0",
+    "eslint": "8.48.0",
     "eslint-config-prettier": "9.0.0",
     "husky": "8.0.3",
     "is-ci": "3.0.1",
@@ -63,11 +63,11 @@
     "jest-environment-node": "29.7.0",
     "lint-staged": "15.0.2",
     "mocked-env": "1.3.5",
-    "nx": "17.0.1",
+    "nx": "18.0.4",
     "prettier": "2.8.8",
     "ts-jest": "29.1.1",
     "ts-node": "10.9.1",
-    "typescript": "5.1.6",
+    "typescript": "5.3.3",
     "validate-branch-name": "1.3.0",
     "verdaccio": "^5.0.4"
   },

diff --git a/packages/ci-context/project.json b/packages/ci-context/project.json
@@ -20,23 +20,13 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["packages/ci-context/**/*.ts", "packages/ci-context/package.json"]
-      }
+      "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "packages/ci-context/jest.config.ts",
-        "passWithNoTests": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
+        "jestConfig": "packages/ci-context/jest.config.ts"
       }
     }
   },

diff --git a/packages/container-metadata/project.json b/packages/container-metadata/project.json
@@ -20,23 +20,13 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["packages/container-metadata/**/*.ts", "packages/container-metadata/package.json"]
-      }
+      "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "packages/container-metadata/jest.config.ts",
-        "passWithNoTests": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
+        "jestConfig": "packages/container-metadata/jest.config.ts"
       }
     }
   },

diff --git a/packages/core/project.json b/packages/core/project.json
@@ -20,23 +20,13 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["packages/core/**/*.ts", "packages/core/package.json"]
-      }
+      "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "packages/core/jest.config.ts",
-        "passWithNoTests": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
+        "jestConfig": "packages/core/jest.config.ts"
       }
     }
   },

diff --git a/packages/nx-container/project.json b/packages/nx-container/project.json
@@ -42,28 +42,13 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": [
-          "packages/nx-container/**/*.ts",
-          "packages/nx-container/package.json",
-          "packages/nx-container/executors.json",
-          "packages/nx-container/generators.json"
-        ]
-      }
+      "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "packages/nx-container/jest.config.ts",
-        "passWithNoTests": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
+        "jestConfig": "packages/nx-container/jest.config.ts"
       }
     }
   },

diff --git a/packages/nx-graphql-codegen/project.json b/packages/nx-graphql-codegen/project.json
@@ -42,28 +42,13 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": [
-          "packages/nx-graphql-codegen/**/*.ts",
-          "packages/nx-graphql-codegen/package.json",
-          "packages/nx-graphql-codegen/generators.json",
-          "packages/nx-graphql-codegen/executors.json"
-        ]
-      }
+      "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "packages/nx-graphql-codegen/jest.config.ts",
-        "passWithNoTests": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
+        "jestConfig": "packages/nx-graphql-codegen/jest.config.ts"
       }
     }
   },

diff --git a/packages/nx-prisma/project.json b/packages/nx-prisma/project.json
@@ -42,28 +42,13 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": [
-          "packages/nx-prisma/**/*.ts",
-          "packages/nx-prisma/package.json",
-          "packages/nx-prisma/executors.json",
-          "packages/nx-prisma/generators.json"
-        ]
-      }
+      "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "packages/nx-prisma/jest.config.ts",
-        "passWithNoTests": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
+        "jestConfig": "packages/nx-prisma/jest.config.ts"
       }
     }
   },

diff --git a/packages/nx-set-shas/project.json b/packages/nx-set-shas/project.json
@@ -20,23 +20,13 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["packages/nx-set-shas/**/*.ts", "packages/nx-set-shas/package.json"]
-      }
+      "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "packages/nx-set-shas/jest.config.ts",
-        "passWithNoTests": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
+        "jestConfig": "packages/nx-set-shas/jest.config.ts"
       }
     }
   },