chore: update Nx

pubkeyapp · Jun 21, 2024 · a5a1fca · a5a1fca
1 parent 78f9ba3
commit a5a1fca
Show file tree

Hide file tree

Showing 44 changed files with 13,907 additions and 10,282 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -3,11 +3,9 @@
   "ignorePatterns": ["**/*"],
   "plugins": ["@nx"],
   "overrides": [
-    // Opinionated defaults, feel free to change in your own projects
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
       "rules": {
-        // Only allow function declarations and not const fn = () => {}
         "func-style": ["error", "declaration"]
       }
     },
@@ -32,12 +30,18 @@
     {
       "files": ["*.ts", "*.tsx"],
       "extends": ["plugin:@nx/typescript"],
-      "rules": {}
+      "rules": {
+        "@typescript-eslint/no-extra-semi": "error",
+        "no-extra-semi": "off"
+      }
     },
     {
       "files": ["*.js", "*.jsx"],
       "extends": ["plugin:@nx/javascript"],
-      "rules": {}
+      "rules": {
+        "@typescript-eslint/no-extra-semi": "error",
+        "no-extra-semi": "off"
+      }
     },
     {
       "files": ["*.spec.ts", "*.spec.tsx", "*.spec.js", "*.spec.jsx"],

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,5 +39,5 @@ jobs:
       node-version: 20.10.0
       number-of-agents: 3
       install-commands: |
-        pnpm install --frozen-lockfile
+        pnpm install --no-frozen-lockfile
         pnpm prisma generate
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -48,7 +48,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: '18'
-      - run: pnpm install --frozen-lockfile --prefer-frozen-lockfile
+      - run: pnpm install --no-frozen-lockfile --prefer-frozen-lockfile
       - run: pnpm prisma generate
       - run: pnpm prisma db push --skip-generate
       - run: pnpm nx run-many --target=build --all --parallel --skip-nx-cache --verbose

diff --git a/.gitignore b/.gitignore
@@ -34,6 +34,7 @@ testem.log
 .DS_Store
 Thumbs.db
 .nx/cache
+.nx/workspace-data
 .anchor
 libs/anchor/target/deploy
 libs/anchor/target/debug

diff --git a/.prettierignore b/.prettierignore
@@ -10,4 +10,5 @@ target
 node_modules
 dist
 build
-test-ledger
+test-ledger
+/.nx/workspace-data
diff --git a/apps/api-e2e/project.json b/apps/api-e2e/project.json
@@ -11,8 +11,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
+      "executor": "@nx/eslint:lint"
     }
   }
 }
diff --git a/apps/api/project.json b/apps/api/project.json
@@ -3,6 +3,7 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/api/src",
   "projectType": "application",
+  "tags": [],
   "targets": {
     "build": {
       "executor": "@nx/webpack:webpack",
@@ -39,8 +40,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
+      "executor": "@nx/eslint:lint"
     },
     "test": {
       "executor": "@nx/jest:jest",
@@ -49,6 +49,5 @@
         "jestConfig": "apps/api/jest.config.ts"
       }
     }
-  },
-  "tags": []
+  }
 }
diff --git a/apps/web-e2e/project.json b/apps/web-e2e/project.json
@@ -3,6 +3,8 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/web-e2e/src",
   "projectType": "application",
+  "tags": [],
+  "implicitDependencies": ["web"],
   "targets": {
     "e2e": {
       "executor": "@nx/cypress:cypress",
@@ -21,10 +23,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
+      "executor": "@nx/eslint:lint"
     }
-  },
-  "tags": [],
-  "implicitDependencies": ["web"]
+  }
 }
diff --git a/apps/web/project.json b/apps/web/project.json
@@ -3,6 +3,7 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/web/src",
   "projectType": "application",
+  "tags": [],
   "targets": {
     "build": {
       "executor": "@nx/webpack:webpack",
@@ -64,8 +65,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
+      "executor": "@nx/eslint:lint"
     },
     "serve-static": {
       "executor": "@nx/web:file-server",
@@ -80,6 +80,5 @@
         "jestConfig": "apps/web/jest.config.ts"
       }
     }
-  },
-  "tags": []
+  }
 }
diff --git a/libs/anchor/project.json b/libs/anchor/project.json
@@ -3,6 +3,7 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/anchor/src",
   "projectType": "library",
+  "tags": [],
   "targets": {
     "build": {
       "executor": "@nx/rollup:rollup",
@@ -18,14 +19,18 @@
       }
     },
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
+      "executor": "@nx/eslint:lint"
     },
     "test": {
       "executor": "nx:run-commands",
       "options": {
         "cwd": "libs/anchor",
-        "commands": [{ "command": "anchor test", "forwardAllArgs": false }],
+        "commands": [
+          {
+            "command": "anchor test",
+            "forwardAllArgs": false
+          }
+        ],
         "parallel": false
       }
     },
@@ -52,6 +57,5 @@
         "jestConfig": "libs/anchor/jest.config.ts"
       }
     }
-  },
-  "tags": []
+  }
 }
diff --git a/libs/api/auth/data-access/project.json b/libs/api/auth/data-access/project.json
@@ -3,10 +3,10 @@
   "$schema": "../../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/api/auth/data-access/src",
   "projectType": "library",
+  "tags": ["api", "data-access"],
   "targets": {
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
+      "executor": "@nx/eslint:lint"
     },
     "test": {
       "executor": "@nx/jest:jest",
@@ -15,6 +15,5 @@
         "jestConfig": "libs/api/auth/data-access/jest.config.ts"
       }
     }
-  },
-  "tags": ["api", "data-access"]
+  }
 }
diff --git a/libs/api/auth/feature/project.json b/libs/api/auth/feature/project.json
@@ -3,10 +3,10 @@
   "$schema": "../../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/api/auth/feature/src",
   "projectType": "library",
+  "tags": ["api", "feature"],
   "targets": {
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
+      "executor": "@nx/eslint:lint"
     },
     "test": {
       "executor": "@nx/jest:jest",
@@ -15,6 +15,5 @@
         "jestConfig": "libs/api/auth/feature/jest.config.ts"
       }
     }
-  },
-  "tags": ["api", "feature"]
+  }
 }
diff --git a/libs/api/core/data-access/project.json b/libs/api/core/data-access/project.json
@@ -3,10 +3,10 @@
   "$schema": "../../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/api/core/data-access/src",
   "projectType": "library",
+  "tags": ["api", "data-access"],
   "targets": {
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
+      "executor": "@nx/eslint:lint"
     },
     "test": {
       "executor": "@nx/jest:jest",
@@ -15,6 +15,5 @@
         "jestConfig": "libs/api/core/data-access/jest.config.ts"
       }
     }
-  },
-  "tags": ["api", "data-access"]
+  }
 }
diff --git a/libs/api/core/feature/project.json b/libs/api/core/feature/project.json
@@ -3,10 +3,10 @@
   "$schema": "../../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/api/core/feature/src",
   "projectType": "library",
+  "tags": ["api", "feature"],
   "targets": {
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
+      "executor": "@nx/eslint:lint"
     },
     "test": {
       "executor": "@nx/jest:jest",
@@ -15,6 +15,5 @@
         "jestConfig": "libs/api/core/feature/jest.config.ts"
       }
     }
-  },
-  "tags": ["api", "feature"]
+  }
 }
diff --git a/libs/api/identity/data-access/project.json b/libs/api/identity/data-access/project.json
@@ -3,10 +3,10 @@
   "$schema": "../../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/api/identity/data-access/src",
   "projectType": "library",
+  "tags": ["api", "data-access"],
   "targets": {
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
+      "executor": "@nx/eslint:lint"
     },
     "test": {
       "executor": "@nx/jest:jest",
@@ -15,6 +15,5 @@
         "jestConfig": "libs/api/identity/data-access/jest.config.ts"
       }
     }
-  },
-  "tags": ["api", "data-access"]
+  }
 }
diff --git a/libs/api/identity/feature/project.json b/libs/api/identity/feature/project.json
@@ -3,10 +3,10 @@
   "$schema": "../../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/api/identity/feature/src",
   "projectType": "library",
+  "tags": ["api", "feature"],
   "targets": {
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
+      "executor": "@nx/eslint:lint"
     },
     "test": {
       "executor": "@nx/jest:jest",
@@ -15,6 +15,5 @@
         "jestConfig": "libs/api/identity/feature/jest.config.ts"
       }
     }
-  },
-  "tags": ["api", "feature"]
+  }
 }
diff --git a/libs/api/user/data-access/project.json b/libs/api/user/data-access/project.json
@@ -3,10 +3,10 @@
   "$schema": "../../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/api/user/data-access/src",
   "projectType": "library",
+  "tags": ["api", "data-access"],
   "targets": {
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
+      "executor": "@nx/eslint:lint"
     },
     "test": {
       "executor": "@nx/jest:jest",
@@ -15,6 +15,5 @@
         "jestConfig": "libs/api/user/data-access/jest.config.ts"
       }
     }
-  },
-  "tags": ["api", "data-access"]
+  }
 }
diff --git a/libs/api/user/feature/project.json b/libs/api/user/feature/project.json
@@ -3,10 +3,10 @@
   "$schema": "../../../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/api/user/feature/src",
   "projectType": "library",
+  "tags": ["api", "feature"],
   "targets": {
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
+      "executor": "@nx/eslint:lint"
     },
     "test": {
       "executor": "@nx/jest:jest",
@@ -15,6 +15,5 @@
         "jestConfig": "libs/api/user/feature/jest.config.ts"
       }
     }
-  },
-  "tags": ["api", "feature"]
+  }
 }
diff --git a/libs/sdk/project.json b/libs/sdk/project.json
@@ -3,6 +3,7 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/sdk/src",
   "projectType": "library",
+  "tags": [],
   "targets": {
     "build": {
       "executor": "@nx/js:tsc",
@@ -15,8 +16,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
+      "executor": "@nx/eslint:lint"
     },
     "test": {
       "executor": "@nx/jest:jest",
@@ -25,6 +25,5 @@
         "jestConfig": "libs/sdk/jest.config.ts"
       }
     }
-  },
-  "tags": []
+  }
 }
diff --git a/libs/tools/jest.config.ts b/libs/tools/jest.config.ts
@@ -8,4 +8,5 @@ export default {
   moduleFileExtensions: ['ts', 'js', 'html'],
   coverageDirectory: '../../coverage/libs/tools',
   testEnvironment: 'node',
+  testTimeout: 30000,
 }