Merge remote-tracking branch 'origin/master'

.github/workflows/build.yml

@@ -26,14 +26,20 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 9
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
           node-version: 18
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
       - name: Install Dependencies
-        run: npm ci
+        run: pnpm install
       - name: Build Production Client
-        run: npm run build
+        run: pnpm run build
       - uses: actions/upload-artifact@v4
         with:
           name: built-client

.github/workflows/lint-format.yml

@@ -72,17 +72,23 @@ jobs:
         working-directory: photon-client
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 9
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
       - name: Install Dependencies
-        run: npm ci
+        run: pnpm install
       - name: Check Linting
-        run: npm run lint-ci
+        run: pnpm run lint-ci
       - name: Check Formatting
-        run: npm run format-ci
+        run: pnpm run format-ci
   server-index:
     name: "Check server index.html not changed"
     runs-on: ubuntu-22.04

.github/workflows/photon-code-docs.yml

@@ -36,14 +36,20 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 9
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
           node-version: 18
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
       - name: Install Dependencies
-        run: npm ci
+        run: pnpm install
       - name: Build Production Client
-        run: npm run build-demo
+        run: pnpm run build-demo
       - uses: actions/upload-artifact@v4
         with:
           name: built-client

docs/source/docs/contributing/photonvision/build-instructions.rst

@@ -9,18 +9,8 @@ Development Setup
 Prerequisites
 ~~~~~~~~~~~~~
 
-| **Java Development Kit:** This project requires Java Development Kit (JDK) 17 to be compiled. This is the same Java version that comes with WPILib for 2025+. If you don't have this JDK with WPILib, you can follow the instructions to install JDK 17 for your platform `here <https://bell-sw.com/pages/downloads/#jdk-17-lts>`_.
-| **Node JS:** The UI is written in Node JS. To compile the UI, Node 14.18.0 to Node 16.0.0 is required. To install Node JS follow the instructions for your platform `on the official Node JS website <https://nodejs.org/en/download/>`_.  However, modify this line
-
-.. code-block:: bash
-
-   nvm install 20
-
-so that it instead reads
-
-.. code-block:: javascript
-
-   nvm install 14.18.0
+| **Java Development Kit:** This project requires Java Development Kit (JDK) 17 to be compiled. This is the same Java version that comes with WPILib for 2024+. If you don't have this JDK with WPILib, you can follow the instructions to install JDK 17 for your platform `here <https://bell-sw.com/pages/downloads/#jdk-17-lts>`__.
+| **Node.js and pnpm** The UI is created using Vue and built using Vite. Node.js is required to develop and build the UI. We recomend using the pnpm package manager to handle dependencies and install Node.js. You can follow the instructions to install pnpm `here <https://pnpm.io/installation>`__. The project is already configured to create a Node.js v18 env when building photon-client.
 
 Compiling Instructions
 ----------------------
@@ -46,7 +36,7 @@ In the photon-client directory:
 
 .. code-block:: bash
 
-   npm install
+   pnpm install
 
 Build and Copy UI to Java Source
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -68,6 +58,8 @@ In the root directory:
 
       ``gradlew buildAndCopyUI``
 
+Please note that if you installed Node.js via pnpm, this gradle action will mirror Node.js in the gradle workdir and use that instead of the pnpm version.
+
 Build and Run PhotonVision
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 

docs/source/docs/integration/simpleStrategies.rst

@@ -24,7 +24,7 @@ See the  :ref:`Aiming at a Target <docs/examples/aimingatatarget:Knowledge and E
 Range Alignment
 ---------------
 
-By looking at the position of the target in the "vertical" direction in the image, and applying some trionometery, the distance between the robot and the camera can be deduced.
+By looking at the position of the target in the "vertical" direction in the image, and applying some trigonometry, the distance between the robot and the camera can be deduced.
 
 1. Read the current distance to the target from the vision coprocessor.
 2. If too far in one direction, command the drivetrain to travel in the opposite direction to compensate.

photon-client/.npmrc

@@ -0,0 +1 @@
+use-node-version=18.20.4