Merge remote-tracking branch 'upstream/master' into 2023-08-21_networ…

…kmanager-dbus
PhotonVision · Aug 31, 2023 · 5fea1af · 5fea1af
2 parents f36de41 + 08892b9
commit 5fea1af
Show file tree

Hide file tree

Showing 55 changed files with 3,227 additions and 2,654 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -67,8 +67,11 @@ jobs:
     - name: Install Dependencies
       run: npm ci
 
-    - name: Check Formatting
+    - name: Check Linting
       run: npm run lint
+
+    - name: Check Formatting
+      run: npm run check-format
   photon-build-examples:
     runs-on: ubuntu-22.04
     name: "Build Examples"

diff --git a/photon-client/.eslintrc.json b/photon-client/.eslintrc.json
@@ -1,9 +1,10 @@
 {
   "root": true,
   "extends": [
+    "plugin:vue/vue3-recommended",
     "eslint:recommended",
-    "plugin:vue/recommended",
-    "@vue/eslint-config-typescript/recommended"
+    "@vue/eslint-config-typescript",
+    "@vue/eslint-config-prettier/skip-formatting"
   ],
   "rules": {
     "quotes": ["error", "double"],

diff --git a/photon-client/.prettierignore b/photon-client/.prettierignore
@@ -0,0 +1 @@
+src/assets/fonts/PromptRegular.ts
diff --git a/photon-client/.prettierrc.json b/photon-client/.prettierrc.json
@@ -0,0 +1,8 @@
+{
+  "$schema": "https://json.schemastore.org/prettierrc",
+  "semi": true,
+  "tabWidth": 2,
+  "singleQuote": false,
+  "printWidth": 120,
+  "trailingComma": "none"
+}