Merge pull request #15 from Roozenboom/feature/update-to-nx-17-2-4

feat: update to nx 17.2.4

.github/workflows/ci.yml

@@ -9,20 +9,16 @@ on:
 jobs:
   main:
     name: Nx Cloud - Main Job
-    uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.11.3
+    uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.13.0
     with:
       number-of-agents: 3
-      init-commands: |
-        npx nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3
       parallel-commands: |
         npx nx-cloud record -- npx nx format:check
       parallel-commands-on-agents: |
-        npx nx affected --target=lint --parallel=3
-        npx nx affected --target=test --parallel=3 --ci --code-coverage
-        npx nx affected --target=build --parallel=3
+        npx nx affected -t=lint,test,build --parallel=2
 
   agents:
     name: Nx Cloud - Agents
-    uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.11.3
+    uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.13.0
     with:
       number-of-agents: 3

.gitignore

@@ -4,6 +4,9 @@ tmp
 /out-tsc
 /coverage
 
+# cache
+.nx/cache
+
 # dependencies
 node_modules
 yarn-error.log
@@ -26,4 +29,4 @@ yarn-error.log
 
 # System Files
 .DS_Store
-Thumbs.db
+Thumbs.db

.prettierignore

@@ -2,6 +2,7 @@
 /coverage
 /node_modules
 /.vscode
+/.nx/cache
 
 # nx format:check fails on CI on this file
 CHANGELOG.md

e2e/webdriverio-e2e/project.json

@@ -9,7 +9,8 @@
       "dependsOn": ["webdriverio:build"],
       "options": {
         "coverageDirectory": "coverage/e2e/webdriverio-e2e",
-        "jestConfig": "e2e/webdriverio-e2e/jest.config.ts"
+        "jestConfig": "e2e/webdriverio-e2e/jest.config.ts",
+        "passWithNoTests": false
       }
     }
   },

e2e/webdriverio-e2e/tests/defaults.spec.ts

@@ -19,7 +19,7 @@ describe('webdriverio e2e - defaults', () => {
 
     await runCommandAsync(`npm install --dev @nx/react@latest`);
     await runNxCommandAsync(
-      `generate @nx/react:app ${project} --e2eTestRunner=none --linter=eslint --bundler vite`
+      `generate @nx/react:app ${project} --directory=apps/${project} --projectNameAndRootFormat=as-provided --e2eTestRunner=none --linter=eslint --bundler vite`
     );
   }, 100000);
 

e2e/webdriverio-e2e/tests/devtools.spec.ts

@@ -20,7 +20,7 @@ describe('webdriverio e2e - mocha, devtools and localhost', () => {
     ensureNxProject('@rbnx/webdriverio', 'dist/packages/webdriverio');
     await runCommandAsync(`npm install --dev @nx/react@latest`);
     await runNxCommandAsync(
-      `generate @nx/react:app ${project} --e2eTestRunner=none --linter=eslint --bundler vite`
+      `generate @nx/react:app ${project} --directory=apps/${project} --projectNameAndRootFormat=as-provided --e2eTestRunner=none --linter=eslint --bundler vite`
     );
   }, 100000);
 

nx.json

@@ -1,28 +1,31 @@
 {
   "$schema": "./node_modules/nx/schemas/nx-schema.json",
-  "npmScope": "rbnx",
-  "tasksRunnerOptions": {
-    "default": {
-      "runner": "nx-cloud",
-      "options": {
-        "cacheableOperations": ["build", "lint", "test", "e2e"],
-        "accessToken": "MDg4YmI0MGEtOWU5Yy00NjFmLTk5MzctMTYwZjhmMjBjZWQxfHJlYWQtd3JpdGU="
-      }
-    }
-  },
   "targetDefaults": {
     "build": {
-      "dependsOn": ["^build"]
+      "dependsOn": ["^build"],
+      "cache": true
     },
     "lint": {
-      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
+      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
+      "cache": true
     },
-    "test": {
-      "inputs": ["default", "^default", "{workspaceRoot}/jest.preset.js"]
+    "@nx/jest:jest": {
+      "cache": true,
+      "inputs": ["default", "^default", "{workspaceRoot}/jest.preset.js"],
+      "options": {
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "codeCoverage": true
+        }
+      }
     }
   },
   "workspaceLayout": {
     "appsDir": "e2e",
     "libsDir": "packages"
-  }
+  },
+  "nxCloudAccessToken": "YWJlYjU5YTgtMmVkZC00NGYzLWExN2EtNzMwMjU4MDQ0NTgyfHJlYWQ="
 }