Skip to content

Commit

Permalink
Merge pull request bigbluebutton#31 from bigbluebutton/update-app-dep…
Browse files Browse the repository at this point in the history
…endencies

Update dependencies
  • Loading branch information
tibroc authored Aug 2, 2024
2 parents 69574fd + c04e33f commit d01b0f0
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 24 deletions.
39 changes: 20 additions & 19 deletions appliance-application/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,39 +25,40 @@
"format": "npx prettier --write \"**/*.{js,mjs,cjs,ts,mts,cts,vue,json}\""
},
"devDependencies": {
"@types/node": "20.9.0",
"@typescript-eslint/eslint-plugin": "6.11.0",
"@vitejs/plugin-vue": "4.4.1",
"@vue/test-utils": "2.4.2",
"@types/node": "^22.1.0",
"@typescript-eslint/eslint-plugin": "^8.0.0",
"@vitejs/plugin-vue": "^5.1.2",
"@vue/test-utils": "^2.4.6",
"autoprefixer": "^10.4.16",
"cross-env": "7.0.3",
"electron": "^28.0.0-beta.10",
"electron-builder": "24.6.4",
"eslint": "8.53.0",
"eslint-plugin-vue": "9.18.1",
"happy-dom": "12.10.3",
"electron": "^31.3.1",
"electron-builder": "^24.13.3",
"eslint": "^9.8.0",
"eslint-plugin-vue": "^9.18.1",
"happy-dom": "^14.12.3",
"nano-staged": "0.8.0",
"playwright": "1.39.0",
"playwright": "^1.45.3",
"postcss": "^8.4.31",
"simple-git-hooks": "2.9.0",
"simple-git-hooks": "^2.11.1",
"tailwindcss": "^3.3.5",
"typescript": "5.2.2",
"typescript": "^5.5.4",
"unplugin-auto-expose": "0.0.5",
"vite": "4.5.0",
"vitest": "0.34.6",
"vue": "3.3.4",
"vue-tsc": "1.8.22"
"vite": "^5.3.5",
"vitest": "^2.0.5",
"vue": "^3.4.35",
"vue-tsc": "^2.0.29"
},
"dependencies": {
"@apollo/client": "^3.10.8",
"@elgato-stream-deck/node": "^5.7.3",
"@elgato-stream-deck/node": "^6.2.0",
"@heroicons/vue": "^2.0.18",
"@julusian/jpeg-turbo": "^2.1.0",
"axios": "^1.6.2",
"electron-updater": "6.1.4",
"electron-updater": "^6.3.2",
"graphql": "^16.8.1",
"graphql-ws": "^5.16.0",
"sharp": "^0.32.6",
"sharp": "^0.33.4",
"vue-template-compiler": "^2.7.16",
"ws": "^8.14.2"
}
}
9 changes: 6 additions & 3 deletions appliance-application/packages/main/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {app, systemPreferences, protocol} from 'electron';
import {app} from 'electron';
import './security-restrictions';
import {restoreOrCreateWindow, hdiDevices } from '/@/mainWindow';
import {openStreamDeck} from '@elgato-stream-deck/node';
import {listStreamDecks, openStreamDeck} from '@elgato-stream-deck/node';
import {StreamDeckHID} from '/@/streamdeck';


Expand Down Expand Up @@ -51,7 +51,10 @@ app
console.log('App is ready');

try {
const myStreamDeck = await openStreamDeck();
const allStreamDecks = await listStreamDecks();
console.debug('All Streamdecks found: ', allStreamDecks);
const myStreamDeck = await openStreamDeck(allStreamDecks[0].path);
console.debug('Streamdeck found: ', myStreamDeck);
hdiDevices.push(new StreamDeckHID(myStreamDeck));
} catch (e) {
console.error(e);
Expand Down
2 changes: 0 additions & 2 deletions appliance-application/packages/main/src/mainWindow.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import {app, BrowserWindow, ipcMain, screen, session} from 'electron';
import {join, resolve} from 'node:path';
import {openStreamDeck} from '@elgato-stream-deck/node';
import fs from 'fs';
import {StreamDeckHID} from '/@/streamdeck';
import {HID} from '/@/HID';
import {BBBMeeting} from '/@/bbb-meeting';
import {fileURLToPath} from "url";
Expand Down

0 comments on commit d01b0f0

Please sign in to comment.