Merge remote-tracking branch 'upstream' into coordinate-conversion-cl…

…eanup

.github/workflows/main.yml

@@ -14,9 +14,7 @@ on:
   merge_group:
 
 jobs:
-  # This job builds the client (web view).
   photonclient-build:
-
     # Let all steps run within the photon-client dir.
     defaults:
       run:
@@ -33,19 +31,47 @@ jobs:
     - name: Setup Node.js
       uses: actions/setup-node@v3
       with:
-        node-version: 16
+        node-version: 17
 
     # Run npm
-    - run: npm update -g npm
-    - run: npm ci
-    - run: npm run build --if-present
+    - name: Install Dependencies
+      run: npm ci
+
+    - name: Build Production Client
+      run: npm run build
 
     # Upload client artifact.
     - uses: actions/upload-artifact@master
       with:
         name: built-client
         path: photon-client/dist/
+  photonclient-check-lint:
+    # Let all steps run within the photon-client dir.
+    defaults:
+      run:
+        working-directory: photon-client
+
+    # The type of runner that the job will run on.
+    runs-on: ubuntu-22.04
+
+    steps:
+    # Checkout code.
+    - uses: actions/checkout@v3
 
+    # Setup Node.js
+    - name: Setup Node.js
+      uses: actions/setup-node@v3
+      with:
+        node-version: 17
+
+    - name: Install Dependencies
+      run: npm ci
+
+    - name: Check Linting
+      run: npm run lint-ci
+
+    - name: Check Formatting
+      run: npm run format-ci
   photon-build-examples:
     runs-on: ubuntu-22.04
     name: "Build Examples"
@@ -80,15 +106,14 @@ jobs:
         run: |
           chmod +x gradlew
           ./gradlew copyPhotonlib -x check
-          ./gradlew buildAllExamples -x check --max-workers 2
+          ./gradlew build -x check --max-workers 2
 
       - name: Build C++ examples
         working-directory: photonlib-cpp-examples
         run: |
           chmod +x gradlew
           ./gradlew copyPhotonlib -x check
-          ./gradlew buildAllExamples -x check --max-workers 2
-
+          ./gradlew build -x check --max-workers 2
   photon-build-all:
     # The type of runner that the job will run on.
     runs-on: ubuntu-22.04
@@ -135,7 +160,6 @@ jobs:
         uses: codecov/codecov-action@v3
         with:
           file: ./photon-core/build/reports/jacoco/test/jacocoTestReport.xml
-
   photonserver-build-offline-docs:
     runs-on: ubuntu-22.04
 
@@ -172,7 +196,6 @@ jobs:
         with:
           name: built-docs
           path: build/html
-
   photonserver-check-lint:
     # The type of runner that the job will run on.
     runs-on: ubuntu-22.04
@@ -193,8 +216,6 @@ jobs:
       - run: |
           chmod +x gradlew
           ./gradlew spotlessCheck
-
-  #  Building photonlib
   photonlib-build-host:
     env:
       MACOSX_DEPLOYMENT_TARGET: 10.14
@@ -204,6 +225,7 @@ jobs:
         include:
           - os: windows-2022
             artifact-name: Win64
+            architecture: x64
           # Mac builds are broken due to opencv class loading issues -- disable for now
           # - os: macos-11
           #   artifact-name: macOS
@@ -229,13 +251,12 @@ jobs:
         env:
           ARTIFACTORY_API_KEY: ${{ secrets.ARTIFACTORY_API_KEY }}
         if: github.event_name == 'push'
-
   photonlib-build-docker:
     strategy:
       fail-fast: false
       matrix:
         include:
-          - container: wpilib/roborio-cross-ubuntu:2023-22.04
+          - container: wpilib/roborio-cross-ubuntu:2024-22.04
             artifact-name: Athena
           - container: wpilib/raspbian-cross-ubuntu:bullseye-22.04
             artifact-name: Raspbian
@@ -263,7 +284,6 @@ jobs:
         env:
           ARTIFACTORY_API_KEY: ${{ secrets.ARTIFACTORY_API_KEY }}
         if: github.event_name == 'push'
-
   photonlib-wpiformat:
     name: "wpiformat"
     runs-on: ubuntu-22.04
@@ -280,6 +300,8 @@ jobs:
           python-version: 3.8
       - name: Install wpiformat
         run: pip3 install wpiformat
+      - name: Check index.html not changed
+        run: git --no-pager diff --exit-code origin/master photon-server/src/main/resources/web/index.html
       - name: Run
         run: wpiformat
       - name: Check output
@@ -292,7 +314,6 @@ jobs:
           name: wpiformat fixes
           path: wpiformat-fixes.patch
         if: ${{ failure() }}
-
   photon-build-package:
     needs: [photonclient-build, photon-build-all, photonserver-build-offline-docs]
 
@@ -378,8 +399,6 @@ jobs:
         with:
           name: jar-${{ matrix.artifact-name }}
           path: photon-server/build/libs
-
-
   photon-image-generator:
     needs: [photon-build-package]
     if: ${{ github.event_name != 'pull_request' }}
@@ -420,8 +439,6 @@ jobs:
         with:
           name: image-${{ matrix.image_suffix }}
           path: photonvision*.xz
-
-
   photon-release:
     needs: [photon-build-package, photon-image-generator]
     runs-on: ubuntu-22.04

.gitignore

@@ -159,3 +159,4 @@ photonlib-cpp-examples/*/vendordeps/*
 
 */networktables.json
 *.sqlite
+photon-server/src/main/resources/web/index.html

.styleguide

@@ -17,6 +17,7 @@ modifiableFileExclude {
   \.so$
   \.dll$
   \.webp$
+  \.ico$
   gradlew
 }
 

build.gradle

@@ -2,12 +2,12 @@ plugins {
     id "com.diffplug.spotless" version "6.19.0"
     id "com.github.johnrengelman.shadow" version "7.1.2"
     id "com.github.node-gradle.node" version "3.1.1" apply false
-    id "edu.wpi.first.GradleJni" version "1.0.0"
-    id "edu.wpi.first.GradleVsCode" version "1.1.0"
-    id "edu.wpi.first.NativeUtils" version "2024.1.0" apply false
+    id "edu.wpi.first.GradleJni" version "1.1.0"
+    id "edu.wpi.first.GradleVsCode" version "1.3.0"
+    id "edu.wpi.first.NativeUtils" version "2024.2.0" apply false
     id "edu.wpi.first.wpilib.repositories.WPILibRepositoriesPlugin" version "2020.2"
     id "org.hidetake.ssh" version "2.10.1"
-    id 'edu.wpi.first.WpilibTools' version '1.0.0'
+    id 'edu.wpi.first.WpilibTools' version '1.1.0'
 }
 
 import org.gradle.api.internal.artifacts.dependencies.DefaultExternalModuleDependency;
@@ -26,9 +26,12 @@ allprojects {
 apply from: "versioningHelper.gradle"
 
 ext {
-    wpilibVersion = "2024.0.0-alpha-1"
-    opencvVersion = "4.6.0-4"
+    wpilibVersion = "2024.1.1-beta-1"
+    openCVversion = "4.8.0-1"
     joglVersion = "2.4.0-rc-20200307"
+    javalinVersion = "5.6.2"
+    frcYear = "2024"
+
     pubVersion = versionString
     isDev = pubVersion.startsWith("dev")
 
@@ -60,3 +63,7 @@ spotless {
         targetExclude("photon-lib/src/main/java/org/photonvision/PhotonVersion.java")
     }
 }
+
+wrapper {
+    gradleVersion '8.3'
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services\.gradle\.org/distributions/gradle-8\.3-bin\.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -36,7 +36,8 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 APP_NAME="Gradle"
 APP_BASE_NAME=${0##*/}

photon-client/.eslintrc.json

@@ -0,0 +1,20 @@
+{
+  "root": true,
+  "extends": [
+    "plugin:vue/vue3-recommended",
+    "eslint:recommended",
+    "@vue/eslint-config-typescript",
+    "@vue/eslint-config-prettier/skip-formatting"
+  ],
+  "rules": {
+    "quotes": ["error", "double"],
+    "comma-dangle": ["error", "never"],
+    "comma-spacing": ["error", { "before": false, "after": true }],
+    "semi": ["error", "always"],
+    "eol-last": "error",
+    "object-curly-spacing": ["error", "always"],
+    "quote-props": ["error", "as-needed"],
+    "no-case-declarations": "off",
+    "vue/require-default-prop": "off"
+  }
+}

photon-client/.gitignore

@@ -1,21 +1,28 @@
-.DS_Store
-node_modules
-/dist
-
-# local env files
-.env.local
-.env.*.local
-
-# Log files
+# Logs
+logs
+*.log
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+.DS_Store
+dist
+dist-ssr
+*.local
+
+/cypress/videos/
+/cypress/screenshots/
 
 # Editor directories and files
-.idea
 .vscode
+!.vscode/extensions.json
+.idea
 *.suo
 *.ntvs*
 *.njsproj
 *.sln
 *.sw?
+components.d.ts

photon-client/.prettierignore

@@ -0,0 +1 @@
+src/assets/fonts/PromptRegular.ts

photon-client/.prettierrc.json

@@ -0,0 +1,8 @@
+{
+  "$schema": "https://json.schemastore.org/prettierrc",
+  "semi": true,
+  "tabWidth": 2,
+  "singleQuote": false,
+  "printWidth": 120,
+  "trailingComma": "none"
+}