Merge branch 'stable' into SUKU-dev

.github/workflows/nightly.yml

@@ -10,23 +10,23 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          ref: ''
+          ref: ""
           submodules: true
 
       - name: Setup NodeJs
         uses: actions/setup-node@v3
         with:
-          node-version: '16.13.2'        
+          node-version: "16.13.2"
 
       - name: Install dependencies
         run: npm i
         env:
           UA: ${{ secrets.UA }}
-      
-      - name: Build        
+
+      - name: Build
         run: npm run export:nightly
         if: ${{ always() }}
-        env:     
+        env:
           # gh repo token
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -39,7 +39,7 @@ jobs:
         with:
           name: windows-nightly
           path: build/*.*
-      
+
       - name: Download Artifacts
         uses: actions/download-artifact@v3
 
@@ -50,23 +50,23 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          ref: ''
+          ref: ""
           submodules: true
 
       - name: Setup NodeJs
         uses: actions/setup-node@v3
         with:
-          node-version: '16.13.2'        
+          node-version: "16.13.2"
 
       - name: Install dependencies
         run: npm i
         env:
           UA: ${{ secrets.UA }}
-      
-      - name: Build        
+
+      - name: Build
         run: npm run export:nightly
         if: ${{ always() }}
-        env:     
+        env:
           # gh repo token
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -83,7 +83,7 @@ jobs:
         with:
           name: macos-nightly
           path: build/*.*
-      
+
       - name: Download Artifacts
         uses: actions/download-artifact@v3
 
@@ -94,23 +94,23 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          ref: ''
+          ref: ""
           submodules: true
 
       - name: Setup NodeJs
         uses: actions/setup-node@v3
         with:
-          node-version: '16.13.2'        
+          node-version: "16.13.2"
 
       - name: Install dependencies
         run: npm i
         env:
           UA: ${{ secrets.UA }}
-      
-      - name: Build        
+
+      - name: Build
         run: npm run export:nightly
         if: ${{ always() }}
-        env:     
+        env:
           # gh repo token
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -127,7 +127,7 @@ jobs:
         with:
           name: mac-m1-nightly
           path: build/*.*
-      
+
       - name: Download Artifacts
         uses: actions/download-artifact@v3
 
@@ -138,23 +138,23 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          ref: ''
+          ref: ""
           submodules: true
 
       - name: Setup NodeJs
         uses: actions/setup-node@v3
         with:
-          node-version: '16.13.2'        
+          node-version: "16.13.2"
 
       - name: Install dependencies
         run: npm i
         env:
           UA: ${{ secrets.UA }}
-      
-      - name: Build        
+
+      - name: Build
         run: npm run export:nightly
         if: ${{ always() }}
-        env:     
+        env:
           # gh repo token
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -163,7 +163,7 @@ jobs:
         with:
           name: linux-nightly
           path: build/*.*
-      
+
       - name: Download Artifacts
         uses: actions/download-artifact@v3
 
@@ -174,20 +174,20 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          ref: ''
+          ref: ""
           submodules: true
 
       - name: Setup NodeJs
         uses: actions/setup-node@v3
         with:
-          node-version: '16.13.2'        
+          node-version: "16.13.2"
 
       - name: Install dependencies
         run: npm i
         env:
           UA: ${{ secrets.UA }}
 
-      - name: 'Unittests'
+      - name: "Unittests"
         run: |
           npm test >> unittest.txt
           cat unittest.txt
@@ -197,12 +197,12 @@ jobs:
         with:
           name: linux-unittest
           path: unittest.txt
-      
+
       - name: Download Artifacts
         uses: actions/download-artifact@v3
 
       - uses: tsickert/discord-webhook@v4.0.0
         with:
           webhook-url: ${{ secrets.DISCORD_DEV_WEBHOOK }}
           content: "Heyo, here are the editor unittest results!"
-          filename: "unittest.txt"
+          filename: "unittest.txt"

.github/workflows/stable.yml

@@ -1,10 +1,10 @@
 name: Build Stable Grid Editor
 
-on: 
+on:
   workflow_dispatch:
   push:
     tags:
-     - 'v*.*.*'
+      - "v*.*.*"
 
 jobs:
   win-build:
@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          ref: ''
+          ref: ""
           submodules: true
 
       - name: Set env
@@ -27,7 +27,7 @@ jobs:
       - name: Setup NodeJs
         uses: actions/setup-node@v3
         with:
-          node-version: '16.13.2'
+          node-version: "16.13.2"
 
       - name: Install dependencies
         run: npm i
@@ -62,7 +62,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          ref: ''
+          ref: ""
           submodules: true
 
       - name: Set env
@@ -75,7 +75,7 @@ jobs:
       - name: Setup NodeJs
         uses: actions/setup-node@v3
         with:
-          node-version: '16.13.2'
+          node-version: "16.13.2"
 
       - name: Install dependencies
         run: npm i
@@ -114,7 +114,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          ref: ''
+          ref: ""
           submodules: true
 
       - name: Set env
@@ -127,7 +127,7 @@ jobs:
       - name: Setup NodeJs
         uses: actions/setup-node@v3
         with:
-          node-version: '16.13.2'
+          node-version: "16.13.2"
 
       - name: Install dependencies
         run: npm i

.prettierrc

@@ -0,0 +1,3 @@
+{
+	"printWidth": 80
+}

README.md

@@ -1,5 +1,6 @@
 # Grid Editor
-[![Generic badge](https://img.shields.io/badge/Grid_Editor-Beta-blue.svg)](https://github.com/intechstudio/grid-editor/releases/latest) 
+
+[![Generic badge](https://img.shields.io/badge/Grid_Editor-Beta-blue.svg)](https://github.com/intechstudio/grid-editor/releases/latest)
 [![GitHub release](https://img.shields.io/github/release/intechstudio/grid-editor)](https://github.com/intechstudio/grid-editor/releases/latest)
 
 User manual is available under the wiki section: [wiki](https://github.com/intechstudio/grid-editor/wiki/user-manual).

build-assets/notarize.js

@@ -1,26 +1,29 @@
-require('dotenv').config();
-const fs = require('fs');
-const path = require('path');
-const { notarize } = require('@electron/notarize');
-const package = require('../package.json');
+require("dotenv").config();
+const fs = require("fs");
+const path = require("path");
+const { notarize } = require("@electron/notarize");
+const package = require("../package.json");
 
 module.exports = async function (params) {
   // Only notarize the app if building for macOS and the NOTARIZE environment
   // variable is present.
-  if (!process.env.NOTARIZE || process.platform !== 'darwin') {
-    return
+  if (!process.env.NOTARIZE || process.platform !== "darwin") {
+    return;
   }
 
-  console.log('afterSign hook triggered', params);
+  console.log("afterSign hook triggered", params);
 
   // This should match the appId from electron-builder. It reads from
   // package.json so you won't have to maintain two separate configurations.
-  let appId = package.build.appId
+  let appId = package.build.appId;
   if (!appId) {
-    console.error("appId is missing from build configuration 'package.json'")
+    console.error("appId is missing from build configuration 'package.json'");
   }
 
-  let appPath = path.join(params.appOutDir, `${params.packager.appInfo.productFilename}.app`);
+  let appPath = path.join(
+    params.appOutDir,
+    `${params.packager.appInfo.productFilename}.app`
+  );
   if (!fs.existsSync(appPath)) {
     throw new Error(`Cannot find application at: ${appPath}`);
   }

configuration.json

@@ -1,43 +1,43 @@
 {
-    "INFLUX_TOKEN": "7ABXsBiTxyxEFSwbdlZRKq5T7sAEQnUoHIaxvAwy_EfwUSJ19xXw7hEhvTltSaFpZJbGzug3mseZbjOfLL7-sg==",
-    "INFLUX_ORG": "sukuwc@riseup.net",
-    "INFLUX_BUCKET": "editor_analytics",
-    "INFLUX_SERVER": "https://europe-west1-1.gcp.cloud2.influxdata.com",
-    "GOOGLEUA_TOKEN": "UA-151670067-3",
-    "YOUTUBE_EDITORRELEASENOTES_PLAYLISTKEY": "PLtMbdpAm17zdDZ9jkStSFvdWJdVi3skVu",
-    "YOUTUBE_API_KEY": "AIzaSyBSwx2yH2mSGKhyduMtakjpdMU_s7Jhdkw",
-    "YOUTUBE_RELEASENOTES_PLAYLIST_ID": "PLtMbdpAm17zdDZ9jkStSFvdWJdVi3skVu",
-    "YOUTUBE_RELEASENOTES_FALLBACK_URL": "https://www.youtube.com/playlist?list=PLtMbdpAm17zdDZ9jkStSFvdWJdVi3skVu",
-    "USB_VID_0": "0x03eb",
-    "USB_PID_0": "0xecac",
-    "USB_VID_1": "0x03eb",
-    "USB_PID_1": "0xecad",
-    "USB_VID_2": "0x303a",
-    "USB_PID_2": "0x8123",
-    "FIRMWARE_D51_REQUIRED_MAJOR": 1,
-    "FIRMWARE_D51_REQUIRED_MINOR": 2,
-    "FIRMWARE_D51_REQUIRED_PATCH": 20,
-    "FIRMWARE_ESP32_REQUIRED_MAJOR": 1,
-    "FIRMWARE_ESP32_REQUIRED_MINOR": 2,
-    "FIRMWARE_ESP32_REQUIRED_PATCH": 20,
-    "FIRMWARE_URL_BEGINING": "https://github.com/intechstudio/grid-fw/releases/latest/download/",
-    "FIRMWARE_URL_END": "/grid_release.zip",
-    "UXP_PHOTOSHOP_REQUIRED_MAJOR": 0,
-    "UXP_PHOTOSHOP_REQUIRED_MINOR": 0,
-    "UXP_PHOTOSHOP_REQUIRED_PATCH": 1,
-    "UXP_PHOTOSHOP_URL_BEGINING": "https://github.com/intechstudio/grid-photoshop-plugin/releases/download/",
-    "UXP_PHOTOSHOP_URL_END": "/uxp_photoshop_release.zip",
-    "LIBRARY_GITHUB_URL": "https://github.com/intechstudio/grid-profiles/archive/refs/heads/main.zip",
-    "EDITOR_DOWNLOAD_URL": "https://links.intech.studio/grid-editor-download",
-    "DISCORD_FEEDBACK_WEBHOOK": "https://discordapp.com/api/webhooks/943463496073478184/CjyGbGGVQnLzX20yEN9GJgedxZZkXmyf5BDEE5UsinjaTI_eSg2hMC91ailE8mod2hO1",
-    "NOTIFICATION_JSON_URL": "https://raw.githubusercontent.com/intechstudio/grid-editor/stable/notification.json",
-    "DOCUMENTATION_REFERENCEMANUAL_URL": "https://links.intech.studio/wiki",
-    "DOCUMENTATION_DISCORDSERVER_URL": "https://links.intech.studio/discord",
-    "DOCUMENTATION_TROUBLESHOOTING_URL": "https://links.intech.studio/grid-troubleshoot",
-    "DOCUMENTATION_FIRMWAREUPDATE_URL": "https://links.intech.studio/grid-firmware",
-    "DOCUMENTATION_MAINTENANCE_URL": "https://links.intech.studio/grid-maintanance",
-    "PUBLIC_ROADMAP_URL": "https://intechstudio.hellonext.co/",
-    "EDITOR_REPOSITORY_URL": "https://github.com/intechstudio/grid-editor",
-    "HQ_API_URL_PROD": "https://hq.intech.studio",
-    "HQ_API_URL_DEV": "http://localhost:4000"
-}
+  "INFLUX_TOKEN": "7ABXsBiTxyxEFSwbdlZRKq5T7sAEQnUoHIaxvAwy_EfwUSJ19xXw7hEhvTltSaFpZJbGzug3mseZbjOfLL7-sg==",
+  "INFLUX_ORG": "sukuwc@riseup.net",
+  "INFLUX_BUCKET": "editor_analytics",
+  "INFLUX_SERVER": "https://europe-west1-1.gcp.cloud2.influxdata.com",
+  "GOOGLEUA_TOKEN": "UA-151670067-3",
+  "YOUTUBE_EDITORRELEASENOTES_PLAYLISTKEY": "PLtMbdpAm17zdDZ9jkStSFvdWJdVi3skVu",
+  "YOUTUBE_API_KEY": "AIzaSyBSwx2yH2mSGKhyduMtakjpdMU_s7Jhdkw",
+  "YOUTUBE_RELEASENOTES_PLAYLIST_ID": "PLtMbdpAm17zdDZ9jkStSFvdWJdVi3skVu",
+  "YOUTUBE_RELEASENOTES_FALLBACK_URL": "https://www.youtube.com/playlist?list=PLtMbdpAm17zdDZ9jkStSFvdWJdVi3skVu",
+  "USB_VID_0": "0x03eb",
+  "USB_PID_0": "0xecac",
+  "USB_VID_1": "0x03eb",
+  "USB_PID_1": "0xecad",
+  "USB_VID_2": "0x303a",
+  "USB_PID_2": "0x8123",
+  "FIRMWARE_D51_REQUIRED_MAJOR": 1,
+  "FIRMWARE_D51_REQUIRED_MINOR": 2,
+  "FIRMWARE_D51_REQUIRED_PATCH": 20,
+  "FIRMWARE_ESP32_REQUIRED_MAJOR": 1,
+  "FIRMWARE_ESP32_REQUIRED_MINOR": 2,
+  "FIRMWARE_ESP32_REQUIRED_PATCH": 20,
+  "FIRMWARE_URL_BEGINING": "https://github.com/intechstudio/grid-fw/releases/latest/download/",
+  "FIRMWARE_URL_END": "/grid_release.zip",
+  "UXP_PHOTOSHOP_REQUIRED_MAJOR": 0,
+  "UXP_PHOTOSHOP_REQUIRED_MINOR": 0,
+  "UXP_PHOTOSHOP_REQUIRED_PATCH": 1,
+  "UXP_PHOTOSHOP_URL_BEGINING": "https://github.com/intechstudio/grid-photoshop-plugin/releases/download/",
+  "UXP_PHOTOSHOP_URL_END": "/uxp_photoshop_release.zip",
+  "LIBRARY_GITHUB_URL": "https://github.com/intechstudio/grid-profiles/archive/refs/heads/main.zip",
+  "EDITOR_DOWNLOAD_URL": "https://links.intech.studio/grid-editor-download",
+  "DISCORD_FEEDBACK_WEBHOOK": "https://discordapp.com/api/webhooks/943463496073478184/CjyGbGGVQnLzX20yEN9GJgedxZZkXmyf5BDEE5UsinjaTI_eSg2hMC91ailE8mod2hO1",
+  "NOTIFICATION_JSON_URL": "https://raw.githubusercontent.com/intechstudio/grid-editor/stable/notification.json",
+  "DOCUMENTATION_REFERENCEMANUAL_URL": "https://links.intech.studio/wiki",
+  "DOCUMENTATION_DISCORDSERVER_URL": "https://links.intech.studio/discord",
+  "DOCUMENTATION_TROUBLESHOOTING_URL": "https://links.intech.studio/grid-troubleshoot",
+  "DOCUMENTATION_FIRMWAREUPDATE_URL": "https://links.intech.studio/grid-firmware",
+  "DOCUMENTATION_MAINTENANCE_URL": "https://links.intech.studio/grid-maintanance",
+  "PUBLIC_ROADMAP_URL": "https://intechstudio.hellonext.co/",
+  "EDITOR_REPOSITORY_URL": "https://github.com/intechstudio/grid-editor",
+  "HQ_API_URL_PROD": "https://hq.intech.studio",
+  "HQ_API_URL_DEV": "http://localhost:4000"
+}