Merge pull request #2285 from Scavanger/ESM-Modules

ESM modules & More

Author: sensei-hacker

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ on:
 
 jobs:
     build-linux:
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-24.04
         steps:
             - uses: actions/checkout@v4
             - name: Setup environment
@@ -37,23 +37,20 @@ jobs:
                 echo "BUILD_NAME=inav-configurator_linux_x64_${VERSION}_${BUILD_SUFFIX}" >> $GITHUB_ENV
             - uses: actions/setup-node@v4
               with:
-                node-version: 20
+                node-version: 22
                 #check-latest: true
-                #cache: 'npm'
             - name: Install dependencies
               run: sudo apt-get update && sudo apt-get -y install dpkg fakeroot rpm build-essential libudev-dev
             - name: Install deps
               uses: nick-fields/retry@v3
               with:
                 max_attempts: 3
                 retry_on: error
-                command: npm install --foreground-scripts
+                command: yarn install
                 timeout_minutes: 10
                 on_retry_command: rm -rfv node_modules
-            - name: Remove other SITL binary
-              run: rm -v resources/sitl/linux/arm64/inav_SITL
             - name: Build Linux
-              run: npm run make
+              run: yarn run make
             - name: Upload Linux deb
               uses: actions/upload-artifact@v4
               with:
@@ -71,7 +68,7 @@ jobs:
                 path: ./out/make/zip/linux/x64/*.zip
 
     build-linux-aarch64:
-        runs-on: ubuntu-24.04-arm
+        runs-on: ubuntu-24.04
         steps:
             - uses: actions/checkout@v4
             - name: Setup environment
@@ -93,25 +90,20 @@ jobs:
                 echo "BUILD_NAME=inav-configurator_linux_aarch64_${VERSION}_${BUILD_SUFFIX}" >> $GITHUB_ENV
             - uses: actions/setup-node@v4
               with:
-                node-version: 20
+                node-version: 22
                 #check-latest: true
-                #cache: 'npm'
             - name: Install dependencies
               run: sudo apt-get update && sudo apt-get -y install dpkg fakeroot rpm build-essential libudev-dev
             - name: Install deps
               uses: nick-fields/retry@v3
               with:
                 max_attempts: 3
                 retry_on: error
-                command: npm install --foreground-scripts
+                command: yarn install
                 timeout_minutes: 10
                 on_retry_command: rm -rfv node_modules
-            - name: Remove other SITL binary
-              run: |
-                mv -fv resources/sitl/linux/arm64/inav_SITL resources/sitl/linux/inav_SITL
-                rmdir -v resources/sitl/linux/arm64
             - name: Build Linux
-              run: npm run make
+              run: yarn run make -- --arch="arm64"
             - name: Upload Linux deb
               uses: actions/upload-artifact@v4
               with:
@@ -150,9 +142,8 @@ jobs:
             echo "BUILD_NAMEarm64=inav-configurator_MacOS_arm64_${VERSION}_${BUILD_SUFFIX}" >> $GITHUB_ENV
         - uses: actions/setup-node@v4
           with:
-            node-version: 20
+            node-version: 22
             #check-latest: true
-            #cache: 'npm'
         # Workaround due to a bug in node-gyp: https://github.com/electron/rebuild/issues/1116
         - name: Install Setuptools
           run: python3 -m pip install --break-system-packages setuptools
@@ -161,11 +152,11 @@ jobs:
           with:
             max_attempts: 3
             retry_on: error
-            command: npm install --foreground-scripts
+            command: yarn install --foreground-scripts
             timeout_minutes: 10
             on_retry_command: rm -rfv node_modules
         - name: Build MacOS arm64
-          run: npm run make -- --arch="arm64"
+          run: yarn run make -- --arch="arm64"
         - name: Upload MacOS arm64 zip
           uses: actions/upload-artifact@v4
           with:
@@ -199,9 +190,8 @@ jobs:
             echo "BUILD_NAMEx64=inav-configurator_MacOS_x64_${VERSION}_${BUILD_SUFFIX}" >> $GITHUB_ENV
         - uses: actions/setup-node@v4
           with:
-            node-version: 20
+            node-version: 22
             #check-latest: true
-            #cache: 'npm'
         # Workaround due to a bug in node-gyp: https://github.com/electron/rebuild/issues/1116
         - name: Install Setuptools
           run: python3 -m pip install --break-system-packages setuptools
@@ -210,11 +200,11 @@ jobs:
           with:
             max_attempts: 3
             retry_on: error
-            command: npm install --foreground-scripts
+            command: yarn install --foreground-scripts
             timeout_minutes: 10
             on_retry_command: rm -rfv node_modules
         - name: Build MacOS x64
-          run: npm run make -- --arch="x64"
+          run: yarn run make -- --arch="x64"
         - name: Upload MacOS x64 zip
           uses: actions/upload-artifact@v4
           with:
@@ -252,8 +242,7 @@ jobs:
               shell: bash
             - uses: actions/setup-node@v4
               with:
-                node-version: 20
-                #cache: 'npm'
+                node-version: 22
             - uses: engineerd/[email protected]
               with: 
                 name: "Wix Toolset 3.1.4"
@@ -264,11 +253,11 @@ jobs:
               with:
                 max_attempts: 3
                 retry_on: error
-                command: npm install --foreground-scripts
+                command: yarn install --foreground-scripts
                 timeout_minutes: 10
                 on_retry_command: rm -rfv node_modules
             - name: Build Win x64
-              run: npm run make -- --arch="x64"
+              run: yarn run make -- --arch="x64"
             - name: Upload Windows x64 zip
               uses: actions/upload-artifact@v4
               with:
@@ -306,8 +295,7 @@ jobs:
               shell: bash
             - uses: actions/setup-node@v4
               with:
-                node-version: 20
-                #cache: 'npm'
+                node-version: 22
             - uses: engineerd/[email protected]
               with: 
                 name: "Wix Toolset 3.1.4"
@@ -318,11 +306,11 @@ jobs:
               with:
                 max_attempts: 3
                 retry_on: error
-                command: npm install --foreground-scripts
+                command: yarn install --foreground-scripts
                 timeout_minutes: 10
                 on_retry_command: rm -rfv node_modules
             - name: Build Win32
-              run: npm run make -- --arch="ia32"
+              run: yarn run make -- --arch="ia32"
             - name: Upload Windows ia32 zip
               uses: actions/upload-artifact@v4
               with:

.gitignore

@@ -6,6 +6,7 @@ npm-debug.log
 npm-debug.log
 inav-configurator.iml
 /out
+/.vite
 .eslintrc.json
 /.project
 /cache/
@@ -16,4 +17,3 @@ inav-configurator.iml
 *.swp
 *.bak
 eeprom.bin
-yarn.lock

.vscode/launch.json

@@ -12,7 +12,8 @@
         "args": ["--inspect", "--no-sandbox"],
         "env": {
           "NODE_ENV": "development",
-          "NODE_PATH": "${workspaceFolder}/js/"
+          "NODE_PATH": "${workspaceFolder}/js/",
+          "DEV_TOOLS_MODE": "undocked" // left, right, bottom, undocked, detach
         },
         "cwd": "${workspaceFolder}",
         "console": "integratedTerminal"

.vscode/tasks.json

@@ -5,8 +5,7 @@
 			"type": "npm",
 			"script": "start",
 			"problemMatcher": [],
-			"label": "npm: start",
-			"detail": "node node_modules/gulp/bin/gulp.js build && node node_modules/nw/bin/nw .",
+			"label": "yarn: start",
 			"group": {
 				"kind": "build",
 				"isDefault": true

README.md

@@ -1,26 +1,47 @@
-const path = require('path');
-const fs = require('fs');
+import path from 'node:path';
+import fs from 'node:fs';
+import { fileURLToPath } from 'node:url';
 
-module.exports = {
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+export default {
   packagerConfig: {
     executableName: "inav-configurator",
     asar: false,
     icon: 'images/inav',
-    ignore: [
-      "^(\/\.vscode$)",
-      "^(\/support$)",
-      ".gitattributes",
-      ".gitignore",
-      ".github",
-      ".git",
-      "3D_model_creation.md",
-      "LICENSE",
-      "MAPPROXY.md",
-      "package-lock.json",
-      "README.md",
-      "inav_icon_128.psd",
-    ]
   },
+  rebuildConfig: {},
+  plugins: [
+    {
+      name: '@electron-forge/plugin-vite',
+      config: {
+        build: [
+          {
+            entry: 'js/main/main.js',
+            config: 'vite.main.config.js',
+          },
+          {
+            entry: 'js/main/preload.js',
+            config: 'vite.preload.config.js',
+          },
+          {
+            entry: 'js/libraries/bluetooth-device-chooser/bt-device-chooser-preload.js',
+            config: 'vite.preload.config.js',
+          },
+        ],
+        renderer: [
+          {
+            name: 'bt_device_chooser',
+            config: 'vite.bt-dc-renderer.config.js',
+          },
+          {
+            name: 'main_window',
+            config: 'vite.main-renderer.config.js',
+          },
+        ],
+      },
+    },
+  ],
   hooks: {
     // Uniform artifact file names
     postMake: async (config, makeResults) => {
@@ -36,9 +57,8 @@ module.exports = {
           console.log('Artifact: ' + newPath);
         });
       });
-    }
+    },
   },
-  rebuildConfig: {},
   makers: [
     {
       name: '@electron-forge/maker-wix',
@@ -53,7 +73,7 @@ module.exports = {
         appUserModelId: "com.inav.configurator",
         icon: path.join(__dirname, "./assets/windows/inav_installer_icon.ico"),
         upgradeCode: "13606ff3-b0bc-4dde-8fac-805bc8aed2f8",
-        ui : {
+        ui: {
           enabled: false,
           chooseDirectory: true,
           images: {