chore: update to Nx workspace to v19.0.0

tinesoft · May 7, 2024 · 864379a · 864379a
1 parent 100f50e
commit 864379a
Show file tree

Hide file tree

Showing 6 changed files with 298 additions and 410 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,57 +1,55 @@
 {
-	"name": "NxRocksDevContainer",
-	"image": "cirrusci/flutter:stable",
-	"features": {
-		"ghcr.io/devcontainers/features/java:1": {
-			"installGradle": true,
-			"installMaven": true,
-			"version": "17"
-		},
-		"ghcr.io/devcontainers/features/node:1": {
-			"nodeGypDependencies": true,
-			"version": "20"
-		},
-		"ghcr.io/devcontainers/features/git:1": {
-			"ppa": true,
-			"version": "latest"
-		},
-		"ghcr.io/devcontainers/features/common-utils:2": {
-			"installZsh": true,
-			"installOhMyZsh": true,
-			"upgradePackages": true,
-			"username": "automatic",
-			"userUid": "automatic",
-			"userGid": "automatic"
-		}
-	},
+  "name": "NxRocksDevContainer",
+  "image": "cirrusci/flutter:stable",
+  "features": {
+    "ghcr.io/devcontainers/features/java:1": {
+      "installGradle": true,
+      "installMaven": true,
+      "version": "21"
+    },
+    "ghcr.io/devcontainers/features/node:1": {
+      "nodeGypDependencies": true,
+      "version": "20"
+    },
+    "ghcr.io/devcontainers/features/git:1": {
+      "ppa": true,
+      "version": "latest"
+    },
+    "ghcr.io/devcontainers/features/common-utils:2": {
+      "installZsh": true,
+      "installOhMyZsh": true,
+      "upgradePackages": true,
+      "username": "automatic",
+      "userUid": "automatic",
+      "userGid": "automatic"
+    }
+  },
 
-	"mounts": [
-		"source=nxrocks-node_modules,target=${containerWorkspaceFolder}/node_modules,type=volume"
-	],
+  "mounts": [
+    "source=nxrocks-node_modules,target=${containerWorkspaceFolder}/node_modules,type=volume"
+  ],
 
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	"forwardPorts": [
-		4211
-	],
-	"runArgs": [],
-	"postCreateCommand": "./.devcontainer/postCreateCommand.sh",
-	"customizations": {
-		"vscode": {
-			"extensions": [
-				"mhutchie.git-graph",
-				"eamodio.gitlens",
-				"usernamehw.errorlens",
-				"nrwl.angular-console",
-				"esbenp.prettier-vscode",
-				"dbaeumer.vscode-eslint",
-				"firsttris.vscode-jest-runner",
-				"anweber.reveal-button",
-				"github.vscode-github-actions"
-			],
-			"settings":{
-				"debug.javascript.autoAttachFilter": "onlyWithFlag",
-				"dotfiles.repository": "https://github.com/tinesoft/dotfiles"
-			}
-		}
-	}
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  "forwardPorts": [4211],
+  "runArgs": [],
+  "postCreateCommand": "./.devcontainer/postCreateCommand.sh",
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "mhutchie.git-graph",
+        "eamodio.gitlens",
+        "usernamehw.errorlens",
+        "nrwl.angular-console",
+        "esbenp.prettier-vscode",
+        "dbaeumer.vscode-eslint",
+        "firsttris.vscode-jest-runner",
+        "anweber.reveal-button",
+        "github.vscode-github-actions"
+      ],
+      "settings": {
+        "debug.javascript.autoAttachFilter": "onlyWithFlag",
+        "dotfiles.repository": "https://github.com/tinesoft/dotfiles"
+      }
+    }
+  }
 }
diff --git a/.devcontainer/postCreateCommand.sh b/.devcontainer/postCreateCommand.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# Install pnpm
-npm install -g @pnpm/exe@8.3.1
+# Install pnpm.
+npm install -g @pnpm/exe@9.1.0
 
 
 # Make sure 'node' user can access the 'node_modules' folder that will be mounted as a volume

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
       NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
       ANDROID_SDK_VERSION: 34
       FLUTTER_VERSION: 3.19.3
-      JDK_VERSION: 17.0.10
+      JDK_VERSION: 21.0.3
     timeout-minutes: 60
     steps:
       - name: Checkout Repo

diff --git a/.nx/workflows/agents.yaml b/.nx/workflows/agents.yaml
@@ -80,7 +80,7 @@ launch-templates:
           source $HOME/.sdkman/bin/sdkman-init.sh
           sdk version
 
-          jdkVersion="${JDK_VERSION:-17.0.10}"
+          jdkVersion="${JDK_VERSION:-21.0.3}"
           jdkDistro="${JDK_DISTRO:-ms}"
           javaVersion="${jdkVersion}-${jdkDistro}"
           JAVA_HOME="$HOME/.sdkman/candidates/java/$javaVersion"

diff --git a/package.json b/package.json
@@ -49,15 +49,15 @@
     "@commitlint/cli": "^17.6.1",
     "@commitlint/config-angular": "^17.6.1",
     "@jest/globals": "^29.5.0",
-    "@nx/devkit": "18.3.4",
-    "@nx/eslint-plugin": "18.3.4",
-    "@nx/jest": "18.3.4",
-    "@nx/js": "18.3.4",
-    "@nx/node": "18.3.4",
-    "@nx/plugin": "18.3.4",
-    "@nx/workspace": "18.3.4",
+    "@nx/devkit": "19.0.0",
+    "@nx/eslint-plugin": "19.0.0",
+    "@nx/jest": "19.0.0",
+    "@nx/js": "19.0.0",
+    "@nx/node": "19.0.0",
+    "@nx/plugin": "19.0.0",
+    "@nx/workspace": "19.0.0",
     "@swc-node/register": "1.8.0",
-    "@swc/cli": "0.1.62",
+    "@swc/cli": "0.3.12",
     "@swc/core": "1.3.87",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "29.4.0",
@@ -79,11 +79,11 @@
     "jest-environment-jsdom": "29.4.3",
     "jest-environment-node": "^29.4.1",
     "jest-mock": "28.1.3",
-    "nx": "18.3.4",
+    "nx": "19.0.0",
     "prettier": "2.6.2",
     "ts-jest": "29.1.0",
     "ts-node": "10.9.1",
-    "typescript": "5.3.3",
+    "typescript": "5.4.5",
     "verdaccio": "^5.0.4"
   },
   "repository": {