Merge pull request #29 from SlimeVR/fix/firmware-protocol-debugger/esm

fix(firmware-protocol-debugger,firmware-protocol-debugger-gui): doesn't start with the ESM changes
SlimeVR · Jun 6, 2024 · b403e83 · b403e83
2 parents 16bbb17 + fa0f33c
commit b403e83
Show file tree

Hide file tree

Showing 15 changed files with 1,138 additions and 365 deletions.
diff --git a/.changeset/eighty-bats-hunt.md b/.changeset/eighty-bats-hunt.md
@@ -0,0 +1,6 @@
+---
+'slimevr-firmware-protocol-debugger-gui': patch
+'@slimevr/firmware-protocol-debugger': patch
+---
+
+fixed startup
diff --git a/apps/firmware-protocol-debugger-gui/backend/src/electron/main.ts b/apps/firmware-protocol-debugger-gui/backend/src/electron/main.ts
@@ -1,8 +1,8 @@
 import { SerializedTracker, ServerStatus } from '@slimevr/firmware-protocol-debugger-shared';
 import { BrowserWindow, app, ipcMain } from 'electron';
 import { join } from 'node:path';
-import merge from 'ts-deepmerge';
-import { Server } from '../Server';
+import { merge } from 'ts-deepmerge';
+import { Server } from '../Server.js';
 
 let mainWindow: BrowserWindow | null;
 
@@ -74,11 +74,13 @@ const createWindow = async () => {
     height: 600,
     width: 800,
     webPreferences: {
-      preload: join(__dirname, 'preload.js')
+      preload: join(import.meta.dirname, 'preload.mjs')
     }
   });
 
-  const url = app.isPackaged ? `file://${__dirname}/../../index.html` : (process.env.ELECTRON_START_URL as string);
+  const url = app.isPackaged
+    ? `file://${import.meta.dirname}/../../index.html`
+    : (process.env.ELECTRON_START_URL as string);
 
   console.log(url);
 
@@ -93,10 +95,11 @@ const createWindow = async () => {
     //   .default(devtoolsInstaller.REDUX_DEVTOOLS)
     //   .then((name) => console.log(`Added Extension:  ${name}`))
     //   .catch((err) => console.log('An error occurred: ', err));
+
+    mainWindow.webContents.openDevTools();
   }
 
   mainWindow.loadURL(url);
-  mainWindow.webContents.openDevTools();
 };
 
 app.on('ready', () => {

diff --git a/...ugger-gui/backend/src/electron/preload.ts → ...gger-gui/backend/src/electron/preload.mts b/...ugger-gui/backend/src/electron/preload.ts → ...gger-gui/backend/src/electron/preload.mts
@@ -1,4 +1,4 @@
-import { SerializedTracker, ServerStatus } from '@slimevr/firmware-protocol-debugger-shared';
+import { type SerializedTracker, type ServerStatus } from '@slimevr/firmware-protocol-debugger-shared';
 import { contextBridge, ipcRenderer } from 'electron';
 
 contextBridge.exposeInMainWorld('api', {

diff --git a/apps/firmware-protocol-debugger-gui/backend/tsconfig.json b/apps/firmware-protocol-debugger-gui/backend/tsconfig.json
@@ -1,9 +1,12 @@
 {
   "extends": "@slimevr/tsconfig/electron.json",
   "include": ["src/**/*.ts"],
-  "exclude": ["dist", "build", "node_modules"],
+  "exclude": ["dist", "build", "node_modules", "src/electron/preload.mts"],
   "compilerOptions": {
-    "target": "ES2022",
-    "outDir": "../build/backend"
+    "target": "ESNext",
+    "module": "NodeNext",
+    "esModuleInterop": true,
+    "outDir": "../build/backend",
+    "moduleResolution": "NodeNext"
   }
 }
diff --git a/apps/firmware-protocol-debugger-gui/backend/tsconfig.preload.json b/apps/firmware-protocol-debugger-gui/backend/tsconfig.preload.json
@@ -0,0 +1,12 @@
+{
+  "extends": "@slimevr/tsconfig/electron.json",
+  "include": ["src/electron/preload.mts"],
+  "exclude": ["dist", "build", "node_modules"],
+  "compilerOptions": {
+    "target": "ESNext",
+    "module": "CommonJS",
+    "esModuleInterop": true,
+    "outDir": "../build/backend/electron",
+    "moduleResolution": "Node"
+  }
+}
diff --git a/apps/firmware-protocol-debugger-gui/package.json b/apps/firmware-protocol-debugger-gui/package.json
@@ -4,6 +4,7 @@
   "main": "build/backend/electron/main.js",
   "license": "(MIT OR Apache-2.0)",
   "private": true,
+  "type": "module",
   "homepage": ".",
   "author": {
     "name": "DevMiner",
@@ -17,43 +18,46 @@
     "url": "https://github.com/SlimeVR/slimevr-node/issues"
   },
   "dependencies": {
-    "@react-three/fiber": "^8.13.6",
+    "@react-three/fiber": "^8.16.8",
     "@slimevr/common": "workspace:*",
     "@slimevr/firmware-protocol": "workspace:*",
-    "@slimevr/firmware-protocol-debugger-utils": "workspace:*",
     "@slimevr/firmware-protocol-debugger-shared": "workspace:*",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "@slimevr/firmware-protocol-debugger-utils": "workspace:*",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "strict-event-emitter-types": "^2.0.0",
-    "three": "^0.155.0",
-    "ts-deepmerge": "^6.2.0",
-    "zustand": "^4.4.0"
+    "three": "^0.165.0",
+    "ts-deepmerge": "^7.0.0",
+    "zustand": "^4.5.2"
   },
   "devDependencies": {
     "@slimevr/tsconfig": "workspace:*",
-    "@types/node": "^18.17.2",
-    "@types/react": "^18.2.18",
-    "@types/react-dom": "^18.2.7",
-    "@types/three": "^0.155.0",
-    "@vitejs/plugin-react": "^4.0.4",
-    "autoprefixer": "10.4.14",
-    "concurrently": "^8.2.0",
+    "@types/node": "^20.14.2",
+    "@types/react": "^18.3.3",
+    "@types/react-dom": "^18.3.0",
+    "@types/three": "^0.165.0",
+    "@vitejs/plugin-react": "^4.3.0",
+    "autoprefixer": "10.4.19",
+    "concurrently": "^8.2.2",
     "cross-env": "^7.0.3",
-    "electron": "^25.4.0",
-    "electron-builder": "^24.6.3",
+    "electron": "^30.1.0",
+    "electron-builder": "^24.13.3",
     "electron-devtools-installer": "^3.2.0",
-    "eslint-plugin-react": "^7.33.1",
-    "postcss": "8.4.27",
-    "tailwindcss": "^3.3.3",
-    "typescript": "^5.1.6",
-    "wait-for-it": "1.0.0",
-    "vite": "4.4.8"
+    "eslint-plugin-react": "^7.34.2",
+    "postcss": "8.4.38",
+    "tailwindcss": "^3.4.4",
+    "vite": "5.2.12",
+    "wait-for-it": "1.0.0"
   },
   "scripts": {
     "postinstall": "electron-builder install-app-deps",
-    "dev": "concurrently --names 'be-tsc,fe,be-electron' \"tsc -w -p backend/tsconfig.json\" \"vite\" \"npm run dev:electron\"",
+    "dev": "concurrently --names 'be-tsc,pr-tsc,fe,be-electron' \"pnpm run build:backend -w\" \"pnpm run build:preload -w\" \"vite\" \"npm run dev:electron\"",
     "dev:electron": "cross-env ELECTRON_START_URL=http://localhost:5173 electron .",
-    "build": "vite build && tsc -p backend/tsconfig.json && electron-builder --publish never",
+    "build": "pnpm run build:frontend && pnpm run build:backend && pnpm run build:preload && pnpm run build:electron",
+    "build:frontend": "vite build",
+    "build:backend": "tsc -p backend/tsconfig.json",
+    "build:preload": "tsc -p backend/tsconfig.preload.json",
+    "build:electron": "electron-builder --publish never",
     "dist": "electron-builder",
     "pack": "electron-builder --dir",
     "clean": "rimraf dist build"

diff --git a/apps/firmware-protocol-debugger-gui/postcss.config.js b/apps/firmware-protocol-debugger-gui/postcss.config.js
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   plugins: {
     tailwindcss: {},
     autoprefixer: {}

diff --git a/apps/firmware-protocol-debugger-gui/src/store.ts b/apps/firmware-protocol-debugger-gui/src/store.ts
@@ -1,5 +1,5 @@
 import { SerializedTracker, ServerStatus } from '@slimevr/firmware-protocol-debugger-shared';
-import create from 'zustand';
+import { create } from 'zustand';
 import { devtools } from 'zustand/middleware';
 
 export type Store = {

diff --git a/apps/firmware-protocol-debugger-gui/tailwind.config.js b/apps/firmware-protocol-debugger-gui/tailwind.config.js
@@ -1,5 +1,5 @@
 /** @type {import('tailwindcss').Config} */
-module.exports = {
+const config = {
   content: ['./src/components/**/*.{ts,tsx}'],
   theme: {
     extend: {
@@ -25,3 +25,5 @@ module.exports = {
   },
   plugins: []
 };
+
+export default config;
diff --git a/apps/firmware-protocol-debugger-gui/tsconfig.json b/apps/firmware-protocol-debugger-gui/tsconfig.json
@@ -4,6 +4,8 @@
   "exclude": ["dist", "build", "node_modules"],
   "compilerOptions": {
     "target": "ES2017",
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
     "outDir": "build"
   }
 }
diff --git a/apps/firmware-protocol-debugger/package.json b/apps/firmware-protocol-debugger/package.json
@@ -3,7 +3,7 @@
   "version": "0.2.10",
   "main": "dist/index.js",
   "license": "(MIT OR Apache-2.0)",
-  "homepage": ".",
+  "type": "module",
   "author": {
     "name": "DevMiner",
     "email": "devminer@devminer.xyz"

diff --git a/apps/firmware-protocol-debugger/src/index.ts b/apps/firmware-protocol-debugger/src/index.ts
@@ -1,4 +1,4 @@
-import { Server } from './Server';
+import { Server } from './Server.js';
 
 const server = new Server();
 

diff --git a/apps/firmware-protocol-debugger/tsconfig.json b/apps/firmware-protocol-debugger/tsconfig.json
@@ -4,6 +4,7 @@
   "exclude": ["dist", "build", "node_modules"],
   "compilerOptions": {
     "target": "ES2022",
+    "module": "ESNext",
     "outDir": "./dist"
   }
 }
diff --git a/packages/tsconfig/base.json b/packages/tsconfig/base.json
@@ -2,6 +2,7 @@
   "$schema": "https://json.schemastore.org/tsconfig",
   "display": "Default",
   "compilerOptions": {
+    "target": "ES2020",
     "composite": false,
     "declaration": true,
     "declarationMap": true,
@@ -14,7 +15,7 @@
     "noUnusedParameters": false,
     "preserveWatchOutput": true,
     "skipLibCheck": true,
-    "strict": true
+    "strict": true,
   },
   "exclude": ["node_modules"]
 }