chore: update Nx

pubkeyapp · Nov 15, 2023 · 0f34051 · 0f34051
1 parent 283c58b
commit 0f34051
Show file tree

Hide file tree

Showing 45 changed files with 615 additions and 806 deletions.
diff --git a/.gitignore b/.gitignore
@@ -38,3 +38,5 @@ testem.log
 # System Files
 .DS_Store
 Thumbs.db
+
+.nx/cache
diff --git a/.prettierignore b/.prettierignore
@@ -3,3 +3,5 @@
 /dist
 /coverage
 tmp
+
+/.nx/cache
diff --git a/apps/api-e2e/project.json b/apps/api-e2e/project.json
@@ -7,12 +7,11 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{e2eProjectRoot}"],
       "options": {
-        "jestConfig": "apps/api-e2e/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "apps/api-e2e/jest.config.ts"
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/api-e2e/**/*.{js,ts}"]

diff --git a/apps/api/project.json b/apps/api/project.json
@@ -39,7 +39,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/api/**/*.ts"]
@@ -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"
       }
     }
   },

diff --git a/apps/web-e2e/project.json b/apps/web-e2e/project.json
@@ -21,7 +21,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/web-e2e/**/*.{js,ts}"]

diff --git a/apps/web/project.json b/apps/web/project.json
@@ -63,7 +63,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/web/**/*.{ts,tsx,js,jsx}"]
@@ -79,14 +79,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/web/jest.config.ts",
-        "passWithNoTests": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
+        "jestConfig": "apps/web/jest.config.ts"
       }
     }
   },

diff --git a/libs/api/auth/data-access/project.json b/libs/api/auth/data-access/project.json
@@ -5,7 +5,7 @@
   "projectType": "library",
   "targets": {
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/api/auth/data-access/**/*.ts"]
@@ -15,14 +15,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "libs/api/auth/data-access/jest.config.ts",
-        "passWithNoTests": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
+        "jestConfig": "libs/api/auth/data-access/jest.config.ts"
       }
     }
   },

diff --git a/libs/api/auth/feature/project.json b/libs/api/auth/feature/project.json
@@ -5,7 +5,7 @@
   "projectType": "library",
   "targets": {
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/api/auth/feature/**/*.ts"]
@@ -15,14 +15,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "libs/api/auth/feature/jest.config.ts",
-        "passWithNoTests": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
+        "jestConfig": "libs/api/auth/feature/jest.config.ts"
       }
     }
   },

diff --git a/libs/api/core/data-access/project.json b/libs/api/core/data-access/project.json
@@ -5,7 +5,7 @@
   "projectType": "library",
   "targets": {
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/api/core/data-access/**/*.ts"]
@@ -15,14 +15,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "libs/api/core/data-access/jest.config.ts",
-        "passWithNoTests": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
+        "jestConfig": "libs/api/core/data-access/jest.config.ts"
       }
     }
   },

diff --git a/libs/api/core/feature/project.json b/libs/api/core/feature/project.json
@@ -5,7 +5,7 @@
   "projectType": "library",
   "targets": {
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/api/core/feature/**/*.ts"]
@@ -15,14 +15,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "libs/api/core/feature/jest.config.ts",
-        "passWithNoTests": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
+        "jestConfig": "libs/api/core/feature/jest.config.ts"
       }
     }
   },

diff --git a/libs/api/email/data-access/project.json b/libs/api/email/data-access/project.json
@@ -5,7 +5,7 @@
   "projectType": "library",
   "targets": {
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/api/email/data-access/**/*.ts"]
@@ -15,14 +15,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "libs/api/email/data-access/jest.config.ts",
-        "passWithNoTests": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
+        "jestConfig": "libs/api/email/data-access/jest.config.ts"
       }
     }
   },

diff --git a/libs/api/email/feature/project.json b/libs/api/email/feature/project.json
@@ -5,7 +5,7 @@
   "projectType": "library",
   "targets": {
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/api/email/feature/**/*.ts"]
@@ -15,14 +15,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "libs/api/email/feature/jest.config.ts",
-        "passWithNoTests": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
+        "jestConfig": "libs/api/email/feature/jest.config.ts"
       }
     }
   },

diff --git a/libs/api/identity/data-access/project.json b/libs/api/identity/data-access/project.json
@@ -5,7 +5,7 @@
   "projectType": "library",
   "targets": {
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/api/identity/data-access/**/*.ts"]
@@ -15,14 +15,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "libs/api/identity/data-access/jest.config.ts",
-        "passWithNoTests": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
+        "jestConfig": "libs/api/identity/data-access/jest.config.ts"
       }
     }
   },

diff --git a/libs/api/identity/feature/project.json b/libs/api/identity/feature/project.json
@@ -5,7 +5,7 @@
   "projectType": "library",
   "targets": {
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/api/identity/feature/**/*.ts"]
@@ -15,14 +15,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "libs/api/identity/feature/jest.config.ts",
-        "passWithNoTests": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
+        "jestConfig": "libs/api/identity/feature/jest.config.ts"
       }
     }
   },

diff --git a/libs/api/user/data-access/project.json b/libs/api/user/data-access/project.json
@@ -5,7 +5,7 @@
   "projectType": "library",
   "targets": {
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/api/user/data-access/**/*.ts"]
@@ -15,14 +15,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "libs/api/user/data-access/jest.config.ts",
-        "passWithNoTests": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
+        "jestConfig": "libs/api/user/data-access/jest.config.ts"
       }
     }
   },

diff --git a/libs/api/user/feature/project.json b/libs/api/user/feature/project.json
@@ -5,7 +5,7 @@
   "projectType": "library",
   "targets": {
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/api/user/feature/**/*.ts"]
@@ -15,14 +15,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "libs/api/user/feature/jest.config.ts",
-        "passWithNoTests": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
+        "jestConfig": "libs/api/user/feature/jest.config.ts"
       }
     }
   },

diff --git a/libs/sdk/project.json b/libs/sdk/project.json
@@ -11,12 +11,11 @@
         "outputPath": "dist/libs/sdk",
         "main": "libs/sdk/src/index.ts",
         "tsConfig": "libs/sdk/tsconfig.lib.json",
-        "assets": ["libs/sdk/*.md"],
-        "updateBuildableProjectDepsInPackageJson": true
+        "assets": ["libs/sdk/*.md"]
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["libs/sdk/**/*.ts"]
@@ -26,14 +25,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "libs/sdk/jest.config.ts",
-        "passWithNoTests": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
+        "jestConfig": "libs/sdk/jest.config.ts"
       }
     }
   },

diff --git a/libs/tools/package.json b/libs/tools/package.json
@@ -3,16 +3,17 @@
   "version": "0.0.1",
   "dependencies": {
     "@clack/prompts": "^0.7.0",
-    "@nx/devkit": "16.8.1",
+    "@nx/devkit": "17.1.2",
     "@mrleebo/prisma-ast": "^0.7.0",
-    "@nx/linter": "16.8.1",
-    "@nx/nest": "16.8.1",
-    "@nx/react": "16.8.1",
+    "@nx/nest": "17.1.2",
+    "@nx/react": "17.1.2",
     "dotenv": "16.3.1",
     "pg": "^8.11.2",
     "pluralize": "^8.0.0",
     "ts-morph": "^19.0.0",
-    "tslib": "^2.3.0"
+    "tslib": "^2.3.0",
+    "@nx/eslint": "17.1.2",
+    "@nx/js": "17.1.2"
   },
   "type": "commonjs",
   "main": "./src/index.js",
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,3 +3,5 @@ @@
     /dist
     /coverage
     tmp
+    /.nx/cache