Use a single .nvm file for all node version refs

richardpringle · richardpringle · commit c7bdea1d94a2 · 2025-11-05T14:54:20.000-05:00
diff --git a/.github/actions/frontend-build/action.yml b/.github/actions/frontend-build/action.yml
@@ -15,8 +15,7 @@ inputs:
     default: 'false'
   node-version:
     description: 'Node.js version to use'
-    required: false
-    default: '23'
+    required: true
 
 runs:
   using: 'composite'
diff --git a/.github/actions/load-versions/action.yml b/.github/actions/load-versions/action.yml
@@ -11,6 +11,9 @@ outputs:
   ocaml-version:
     description: "OCaml version"
     value: ${{ steps.load.outputs.ocaml-version }}
+  node-version:
+    description: "Node.js version"
+    value: ${{ steps.load.outputs.node-version }}
 
 runs:
   using: composite
@@ -25,18 +28,33 @@ runs:
         RUST_STABLE=$(yq eval '.rust.stable' "$VERSIONS_FILE")
         RUST_NIGHTLY=$(yq eval '.rust.nightly' "$VERSIONS_FILE")
         OCAML_VERSION=$(yq eval '.ocaml.version' "$VERSIONS_FILE")
+        NODE_VERSION_YAML=$(yq eval '.node.version' "$VERSIONS_FILE")
+
+        # Read node version from .nvmrc
+        NODE_VERSION_NVMRC=$(cat .nvmrc)
+
+        # Verify that the versions match
+        if [ "$NODE_VERSION_YAML" != "$NODE_VERSION_NVMRC" ]; then
+          echo "Error: Node.js version mismatch!"
+          echo "  .github/config/versions.yaml: $NODE_VERSION_YAML"
+          echo "  .nvmrc: $NODE_VERSION_NVMRC"
+          exit 1
+        fi
 
         # Set outputs
         echo "rust-stable=$RUST_STABLE" >> $GITHUB_OUTPUT
         echo "rust-nightly=$RUST_NIGHTLY" >> $GITHUB_OUTPUT
         echo "ocaml-version=$OCAML_VERSION" >> $GITHUB_OUTPUT
+        echo "node-version=$NODE_VERSION_YAML" >> $GITHUB_OUTPUT
 
         # Also set as environment variables for convenience
         echo "RUST_STABLE_VERSION=$RUST_STABLE" >> $GITHUB_ENV
         echo "RUST_NIGHTLY_VERSION=$RUST_NIGHTLY" >> $GITHUB_ENV
         echo "OCAML_VERSION=$OCAML_VERSION" >> $GITHUB_ENV
+        echo "NODE_VERSION=$NODE_VERSION_YAML" >> $GITHUB_ENV
 
         echo "Loaded versions:"
         echo "  Rust stable: $RUST_STABLE"
         echo "  Rust nightly: $RUST_NIGHTLY"
         echo "  OCaml: $OCAML_VERSION"
+        echo "  Node.js: $NODE_VERSION_YAML"
diff --git a/.github/config/versions.yaml b/.github/config/versions.yaml
@@ -15,3 +15,6 @@ rust:
 
 ocaml:
   version: "4.14.2"
+
+node:
+  version: "24.11.0"
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -9,9 +9,6 @@ on:
   pull_request:
   workflow_dispatch:
 
-env:
-  NODE_VERSION: '20'
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
@@ -25,10 +22,13 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v5
 
+      - id: versions
+        uses: ./.github/actions/load-versions
+
       - name: Setup Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: ${{ env.NODE_VERSION }}
+          node-version: ${{ steps.versions.outputs.node-version }}
           cache: 'npm'
           cache-dependency-path: website/package-lock.json
 
@@ -109,10 +109,13 @@ jobs:
       - name: Setup Pages
         uses: actions/configure-pages@v5
 
+      - id: versions
+        uses: ./.github/actions/load-versions
+
       - name: Setup Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: ${{ env.NODE_VERSION }}
+          node-version: ${{ steps.versions.outputs.node-version }}
           cache: 'npm'
           cache-dependency-path: website/package-lock.json
 
@@ -158,10 +161,13 @@ jobs:
         with:
           fetch-depth: 0
 
+      - id: versions
+        uses: ./.github/actions/load-versions
+
       - name: Setup Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: ${{ env.NODE_VERSION }}
+          node-version: ${{ steps.versions.outputs.node-version }}
           cache: 'npm'
           cache-dependency-path: website/package-lock.json
 
diff --git a/.github/workflows/frontend-macos-13.yaml b/.github/workflows/frontend-macos-13.yaml
@@ -16,7 +16,11 @@ jobs:
       - name: Git checkout
         uses: actions/checkout@v5
 
+      - id: versions
+        uses: ./.github/actions/load-versions
+
       - name: Frontend build
         uses: ./.github/actions/frontend-build
         with:
+          node-version: ${{ steps.versions.outputs.node-version }}
           test-build-commands: 'true'
diff --git a/.github/workflows/frontend-macos-14.yaml b/.github/workflows/frontend-macos-14.yaml
@@ -16,7 +16,11 @@ jobs:
       - name: Git checkout
         uses: actions/checkout@v5
 
+      - id: versions
+        uses: ./.github/actions/load-versions
+
       - name: Frontend build
         uses: ./.github/actions/frontend-build
         with:
+          node-version: ${{ steps.versions.outputs.node-version }}
           test-build-commands: 'true'
diff --git a/.github/workflows/frontend-macos-15.yaml b/.github/workflows/frontend-macos-15.yaml
@@ -16,7 +16,11 @@ jobs:
       - name: Git checkout
         uses: actions/checkout@v5
 
+      - id: versions
+        uses: ./.github/actions/load-versions
+
       - name: Frontend build
         uses: ./.github/actions/frontend-build
         with:
+          node-version: ${{ steps.versions.outputs.node-version }}
           test-build-commands: 'true'
diff --git a/.github/workflows/frontend-macos-latest.yaml b/.github/workflows/frontend-macos-latest.yaml
@@ -16,7 +16,11 @@ jobs:
       - name: Git checkout
         uses: actions/checkout@v5
 
+      - id: versions
+        uses: ./.github/actions/load-versions
+
       - name: Frontend build
         uses: ./.github/actions/frontend-build
         with:
+          node-version: ${{ steps.versions.outputs.node-version }}
           test-build-commands: 'true'
diff --git a/.github/workflows/frontend-ubuntu-22-04.yaml b/.github/workflows/frontend-ubuntu-22-04.yaml
@@ -16,7 +16,11 @@ jobs:
       - name: Git checkout
         uses: actions/checkout@v5
 
+      - id: versions
+        uses: ./.github/actions/load-versions
+
       - name: Frontend build
         uses: ./.github/actions/frontend-build
         with:
+          node-version: ${{ steps.versions.outputs.node-version }}
           test-build-commands: 'true'
diff --git a/.github/workflows/frontend-ubuntu-24-04-arm.yaml b/.github/workflows/frontend-ubuntu-24-04-arm.yaml
@@ -16,7 +16,11 @@ jobs:
       - name: Git checkout
         uses: actions/checkout@v5
 
+      - id: versions
+        uses: ./.github/actions/load-versions
+
       - name: Frontend build
         uses: ./.github/actions/frontend-build
         with:
+          node-version: ${{ steps.versions.outputs.node-version }}
           test-build-commands: 'true'
diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml
@@ -16,9 +16,13 @@ jobs:
       - name: Git checkout
         uses: actions/checkout@v5
 
+      - id: versions
+        uses: ./.github/actions/load-versions
+
       - name: Frontend build and test
         uses: ./.github/actions/frontend-build
         with:
+          node-version: ${{ steps.versions.outputs.node-version }}
           run-prettier-check: 'true'
           run-tests: 'true'
           test-build-commands: 'false'
diff --git a/.github/workflows/test-docs-scripts-frontend.yaml b/.github/workflows/test-docs-scripts-frontend.yaml
@@ -34,24 +34,19 @@ jobs:
         run: |
           chmod +x website/docs/developers/scripts/frontend/*.sh
 
-      - name: Install Node.js on Linux
-        if: runner.os == 'Linux'
-        run: |
-          bash website/docs/developers/scripts/frontend/install-nodejs-linux.sh
-          # Set up nvm environment for future steps
-          echo "NVM_DIR=$HOME/.nvm" >> $GITHUB_ENV
+      - name: Load versions
+        id: versions
+        uses: ./.github/actions/load-versions
 
-      - name: Install Node.js on macOS
-        if: runner.os == 'macOS'
-        run: |
-          bash website/docs/developers/scripts/frontend/install-nodejs-macos.sh
+      - name: Setup Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version: ${{ steps.versions.outputs.node-version }}
+          cache: 'npm'
+          cache-dependency-path: website/package-lock.json
 
       - name: Install Angular CLI using documentation script
         run: |
-          # Source nvm if available (Linux)
-          if [ -n "$NVM_DIR" ] && [ -s "$NVM_DIR/nvm.sh" ]; then
-            \. "$NVM_DIR/nvm.sh"
-          fi
           bash website/docs/developers/scripts/frontend/install-angular-cli.sh
 
       - name: Install gtimeout on macOS
@@ -63,42 +58,22 @@ jobs:
 
       - name: Test install dependencies script
         run: |
-          # Source nvm if available (Linux)
-          if [ -n "$NVM_DIR" ] && [ -s "$NVM_DIR/nvm.sh" ]; then
-            \. "$NVM_DIR/nvm.sh"
-          fi
           bash website/docs/developers/scripts/frontend/install-dependencies.sh
 
       - name: Test build production script
         run: |
-          # Source nvm if available (Linux)
-          if [ -n "$NVM_DIR" ] && [ -s "$NVM_DIR/nvm.sh" ]; then
-            \. "$NVM_DIR/nvm.sh"
-          fi
           bash website/docs/developers/scripts/frontend/build-production.sh
 
       - name: Test format code script
         run: |
-          # Source nvm if available (Linux)
-          if [ -n "$NVM_DIR" ] && [ -s "$NVM_DIR/nvm.sh" ]; then
-            \. "$NVM_DIR/nvm.sh"
-          fi
           bash website/docs/developers/scripts/frontend/format-code.sh
 
       - name: Test build leaderboard script
         run: |
-          # Source nvm if available (Linux)
-          if [ -n "$NVM_DIR" ] && [ -s "$NVM_DIR/nvm.sh" ]; then
-            \. "$NVM_DIR/nvm.sh"
-          fi
           bash website/docs/developers/scripts/frontend/build-leaderboard.sh
 
       - name: Test build webnode script
         run: |
-          # Source nvm if available (Linux)
-          if [ -n "$NVM_DIR" ] && [ -s "$NVM_DIR/nvm.sh" ]; then
-            \. "$NVM_DIR/nvm.sh"
-          fi
           bash website/docs/developers/scripts/frontend/build-webnode.sh
 
       - name: Prepare for Cypress tests (Ubuntu 22.04)
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+24.11.0
diff --git a/Makefile b/Makefile
@@ -7,6 +7,7 @@
 # - ./github/workflows/fmt.yaml
 # - ./github/workflows/lint.yaml
 NIGHTLY_RUST_VERSION = "nightly"
+NODE_VERSION := $(shell cat .nvmrc)
 
 # WebAssembly
 WASM_BINDGEN_CLI_VERSION = "0.2.99"
@@ -394,6 +395,7 @@ docker-build-frontend: ## Build frontend Docker image
 	esac; \
 	echo "Building for platform: $$PLATFORM"; \
 	docker buildx build \
+		--build-arg NODE_VERSION=$(NODE_VERSION) \
 		--platform $$PLATFORM \
 		--tag $(DOCKER_ORG)/mina-rust-frontend:$(GIT_COMMIT) \
 		--file ./frontend/Dockerfile \
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -96,18 +96,28 @@ RUN apt-get update && \
         ca-certificates \
         gnupg \
         make \
+        xz-utils \
         && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app
 
-# Copy documentation scripts for Node.js setup
-COPY ./website/docs/developers/scripts/frontend/install-nodejs-linux.sh ./scripts/install-nodejs-linux.sh
+# Install Node.js from build argument
+ARG NODE_VERSION
+ARG TARGETARCH
+RUN case ${TARGETARCH} in \
+        "amd64") \
+            ARCH='x64' \
+            ;; \
+        "arm64") \
+            ARCH='arm64' \
+            ;; \
+    esac && \
+    curl -fsSL https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${ARCH}.tar.xz | tar -xJ -C /usr/local --strip-components=1
+
+# Install Angular CLI
 COPY ./website/docs/developers/scripts/frontend/install-angular-cli.sh ./scripts/install-angular-cli.sh
-
-# Install Node.js and Angular CLI using documentation scripts
-RUN chmod +x ./scripts/*.sh && \
-    bash ./scripts/install-nodejs-linux.sh && \
-    bash -c 'source "$HOME/.nvm/nvm.sh" && bash ./scripts/install-angular-cli.sh'
+RUN chmod +x ./scripts/install-angular-cli.sh && \
+    ./scripts/install-angular-cli.sh
 
 # Copy entire frontend source code and Makefile
 COPY frontend/ ./frontend/
@@ -130,7 +140,7 @@ RUN chmod +x /usr/local/bin/startup.sh && \
 
 # Install frontend dependencies using Makefile
 WORKDIR /app/frontend
-RUN bash -c 'source "$HOME/.nvm/nvm.sh" && make install-deps'
+RUN make install-deps
 
 WORKDIR /app
 
diff --git a/frontend/package.json b/frontend/package.json
@@ -28,6 +28,9 @@
     "tests:headless": "make test-headless"
   },
   "private": true,
+  "engines": {
+    "node": "^24.0.0"
+  },
   "dependencies": {
     "@angular/animations": "^19.2.14",
     "@angular/cdk": "^19.2.19",
diff --git a/website/package.json b/website/package.json
@@ -44,6 +44,6 @@
     ]
   },
   "engines": {
-    "node": ">=18.0"
+    "node": "^24.0.0"
   }
 }
