fix: update to Nx workspace to v20.6.0

.github/actions/install-dependencies/action.yml

@@ -26,7 +26,7 @@ runs:
       with:
         lookup-only: true
         path: '**/node_modules'
-        key: bun-${{ hashFiles('bun.lockb') }}
+        key: bun-${{ hashFiles('bun.lockb','bun.lock') }}
 
     - name: Install packages
       run: bun install --frozen-lockfile

.github/actions/setup/action.yml

@@ -45,7 +45,7 @@ runs:
       with:
         lookup-only: true
         path: '**/node_modules'
-        key: bun-${{ hashFiles('bun.lockb') }}
+        key: bun-${{ hashFiles('bun.lockb','bun.lock') }}
 
     - name: Install packages
       run: bun install --frozen-lockfile

.github/workflows/ci.yml

@@ -19,6 +19,7 @@ jobs:
       ANDROID_SDK_VERSION: 34
       FLUTTER_VERSION: 3.19.3
       JDK_VERSION: 17.0.11
+      JDK_DISTRO: ms
       JAVA_OPTIONS: '-Xmx3g'
     timeout-minutes: 120
     steps:
@@ -36,7 +37,7 @@ jobs:
 
       # Connect your workspace on nx.app and uncomment this to enable task distribution.
       # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "e2e" targets have been requested
-      - run: bunx nx-cloud start-ci-run --distribute-on=".nx/workflows/distribution-config.yaml" --stop-agents-after="e2e-ci" --with-env-vars="ANDROID_SDK_VERSION,FLUTTER_VERSION,JDK_VERSION"
+      - run: bunx nx-cloud start-ci-run --distribute-on=".nx/workflows/distribution-config.yaml" --stop-agents-after="e2e-ci" --with-env-vars="ANDROID_SDK_VERSION,FLUTTER_VERSION,JDK_VERSION,JDK_DISTRO,JAVA_OPTIONS"
 
       # This line is needed for nx affected to work when CI is running on a PR
       - run: git branch --track develop origin/develop || exit 0

.lintstagedrc

@@ -1,6 +1,6 @@
 {
     "*.ts": [
-        "bunx nx affected:lint --fix --files"
+        "bunx nx affected:lint --files"
     ],
     "*": [
         "bunx nx format:write --files"

.nx/workflows/agents.yaml

@@ -9,7 +9,7 @@ launch-templates:
       - name: Restore Node Modules Cache
         uses: 'nrwl/nx-cloud-workflows/v4/workflow-steps/cache/main.yaml'
         inputs:
-          key: 'package-lock.json|yarn.lock|pnpm-lock.yaml|bun.lock|bun.lockb'
+          key: 'package-lock.json|yarn.lock|pnpm-lock.yaml|bun.lockb|bun.lock'
           paths: 'node_modules'
           base-branch: 'develop'
 
@@ -54,7 +54,6 @@ launch-templates:
       - name: Check bun
         script: |
           bun --version
-          echo "bunx=`which bunx`"
 
       - name: Install Node Modules (with Bun)
         script: bun install --frozen-lockfile --ignore-scripts
@@ -94,17 +93,19 @@ launch-templates:
           source $HOME/.sdkman/bin/sdkman-init.sh
           sdk version
 
-          jdkVersion="${JDK_VERSION:-21.0.3}"
+          jdkVersion="${JDK_VERSION:-21.0.6}"
           jdkDistro="${JDK_DISTRO:-ms}"
           javaVersion="${jdkVersion}-${jdkDistro}"
           JAVA_HOME="$HOME/.sdkman/candidates/java/$javaVersion"
 
           if [ ! -d $JAVA_HOME ]; then
             echo "⌛️ Installing  Java v$javaVersion.."
-            sdk install java $javaVersion
+            yes | sdk install java $javaVersion
             sdk use java $javaVersion
           else
-             echo "⏭️ Java v$javaVersion already installed. Skipping it"
+            echo "⏭️ Java v$javaVersion already installed. Making sure it is used"
+            sdk use java $javaVersion
+
           fi
 
           echo "JAVA_HOME=$JAVA_HOME" >> $NX_CLOUD_ENV

.prettierignore

@@ -5,7 +5,7 @@
 
 node_modules
 /package.json
-/pnpm-lock.yaml
+/bun.lock
 
 packages/**/CHANGELOG.md
 

bunfig.toml

@@ -0,0 +1,2 @@
+[install]
+saveTextLockfile = false

e2e/nx-flutter-e2e/eslint.config.mjs

@@ -0,0 +1,3 @@
+import baseConfig from '../../eslint.config.mjs';
+
+export default [...baseConfig];

e2e/nx-flutter-e2e/tests/create-nx-flutter.spec.ts

@@ -11,11 +11,12 @@ describe('create-nx-flutter', () => {
 
   beforeEach(() => {
     // Cleanup the test project
-    projectDirectory &&
+    if (projectDirectory) {
       rmSync(projectDirectory, {
         recursive: true,
         force: true,
       });
+    }
   });
 
   it.each`

e2e/nx-ktor-e2e/eslint.config.mjs

@@ -0,0 +1,3 @@
+import baseConfig from '../../eslint.config.mjs';
+
+export default [...baseConfig];

e2e/nx-ktor-e2e/tests/create-nx-ktor.spec.ts

@@ -11,11 +11,12 @@ describe('create-nx-ktor', () => {
 
   beforeEach(() => {
     // Cleanup the test project
-    projectDirectory &&
+    if (projectDirectory) {
       rmSync(projectDirectory, {
         recursive: true,
         force: true,
       });
+    }
   });
 
   it.each`

e2e/nx-ktor-e2e/tests/nx-ktor.spec.ts

@@ -64,9 +64,9 @@ describe('nx-ktor e2e', () => {
     );
     expect(() =>
       checkFilesExist(
-        `${directory}/gradlew`,
-        `${directory}/build.gradle.kts`
-        //`${directory}/src/main/kotlin/example/com/Application.kt` FIXME: bug in the generator, the package is not being created
+        `${projectDirectory}/${directory}/gradlew`,
+        `${projectDirectory}/${directory}/build.gradle.kts`
+        //`${projectDirectory}/${directory}/src/main/kotlin/example/com/Application.kt` FIXME: bug in the generator, the package is not being created
       )
     ).not.toThrow();
 

e2e/nx-melos-e2e/eslint.config.mjs

@@ -0,0 +1,3 @@
+import baseConfig from '../../eslint.config.mjs';
+
+export default [...baseConfig];

e2e/nx-melos-e2e/tests/nx-melos.spec.ts

@@ -59,7 +59,7 @@ describe('nx-melos e2e', () => {
     const scripts = [
       {
         name: 'melos-bootstrap',
-        output: `Successfully ran target melos-bootstrap for project @test-project/source`,
+        output: `Successfully ran target melos-bootstrap for project @test-project-melos/source`,
       },
     ];
 

e2e/nx-micronaut-e2e/eslint.config.mjs

@@ -0,0 +1,3 @@
+import baseConfig from '../../eslint.config.mjs';
+
+export default [...baseConfig];

e2e/nx-micronaut-e2e/tests/create-nx-micronaut.spec.ts

@@ -11,11 +11,12 @@ describe('create-nx-micronaut', () => {
 
   beforeEach(() => {
     // Cleanup the test project
-    projectDirectory &&
+    if (projectDirectory) {
       rmSync(projectDirectory, {
         recursive: true,
         force: true,
       });
+    }
   });
 
   it.each`

e2e/nx-quarkus-e2e/eslint.config.mjs

@@ -0,0 +1,3 @@
+import baseConfig from '../../eslint.config.mjs';
+
+export default [...baseConfig];

e2e/nx-quarkus-e2e/tests/create-nx-quarkus.spec.ts

@@ -11,11 +11,12 @@ describe('create-nx-quarkus', () => {
 
   beforeEach(() => {
     // Cleanup the test project
-    projectDirectory &&
+    if (projectDirectory) {
       rmSync(projectDirectory, {
         recursive: true,
         force: true,
       });
+    }
   });
 
   it.each`

e2e/nx-spring-boot-e2e/eslint.config.mjs

@@ -0,0 +1,3 @@
+import baseConfig from '../../eslint.config.mjs';
+
+export default [...baseConfig];

e2e/nx-spring-boot-e2e/tests/create-nx-spring-boot.spec.ts

@@ -11,11 +11,12 @@ describe('create-nx-spring-boot', () => {
 
   beforeEach(() => {
     // Cleanup the test project
-    projectDirectory &&
+    if (projectDirectory) {
       rmSync(projectDirectory, {
         recursive: true,
         force: true,
       });
+    }
   });
 
   it.each`

e2e/smoke/eslint.config.mjs

@@ -0,0 +1,3 @@
+import baseConfig from '../../eslint.config.mjs';
+
+export default [...baseConfig];