Merge branch 'main/develop' into main/master

.eslintrc.json

@@ -13,6 +13,7 @@
     "rules": {
         "vue/no-v-html": 0,
         "vue/component-tags-order": 0,
+        "vue/no-v-text-v-html-on-component": 0,
         "vue/valid-v-slot": [
             "error",
             {

.github/workflows/test.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Install node
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: 18
 
       - name: Install dependencies
         run: npm ci
@@ -28,6 +28,6 @@ jobs:
         run: npm run build
 
       - name: Cypress run
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v4
         with:
-          start: npm start
+          start: npm run preview

.gitignore

@@ -14,5 +14,6 @@ package-lock.json
 *.local
 .env
 
+cypress/screenshots/
 cypress/videos/
 components.d.ts

Dockerfile

@@ -1,7 +1,7 @@
 #
 # Builder stage, builds the application in node
 #
-FROM --platform=$BUILDPLATFORM node:16-alpine as builder
+FROM --platform=$BUILDPLATFORM node:18-alpine as builder
 
 RUN apk add zip
 

README.md

@@ -73,7 +73,7 @@ You can find the latest release notes [here](https://github.com/mainsail-crew/ma
 - **Power Control:** _Control power devices such as relays, TP-Link and Tasmota devices, and more_
 - **Powerful Macro-Management:** _Manage your macros on a micro level_
 - **[Configurable Dashboard](https://docs.mainsail.xyz/features/dashboard-organisation):** _Create your own personal dashboard_
-- **[Theming Support](https://docs.mainsail.xyz/features/theming/):** _Customizable user interface including logos, backgrounds, and custom CSS_
+- **[Theming Support](https://docs.mainsail.xyz/features/theming):** _Customizable user interface including logos, backgrounds, and custom CSS_
 - **[Additional Sensors](https://docs.mainsail.xyz/quicktips/additional-sensors):** _Add extra sensors to the temperature graph_
 - **Exclude Objects:** _Exclude parts of your print <sup>(not officially supported by Klipper yet)</sup>_
 

cypress.config.ts

@@ -0,0 +1,13 @@
+import { defineConfig } from 'cypress'
+
+export default defineConfig({
+    e2e: {
+        // We've imported your old cypress plugins here.
+        // You may want to clean this up later by importing these.
+        setupNodeEvents(on, config) {
+            // @ts-ignore
+            return require('./cypress/plugins/index.js')(on, config)
+        },
+        baseUrl: 'http://localhost:4173',
+    },
+})