Merge pull request #224 from stagehacks/dependabot/npm_and_yarn/electron/notarize-2.3.2

Bump @electron/notarize from 2.3.0 to 2.3.2

.github/dependabot.yml

@@ -1,6 +1,10 @@
 version: 2
 updates:
-  - package-ecosystem: "npm"
-    directory: "/"
+  - package-ecosystem: 'npm'
+    directory: '/'
     schedule:
-      interval: "weekly"
+      interval: 'weekly'
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'weekly'

.github/release.yaml

@@ -0,0 +1,14 @@
+changelog:
+  exclude:
+    authors:
+      - dependabot
+  categories:
+    - title: Plugins 🖥️
+      labels:
+        - plugin
+    - title: Interface
+      labels:
+        - interface
+    - title: Other Changes
+      labels:
+        - '*'

.github/workflows/release.yaml

@@ -9,20 +9,20 @@ jobs:
   build-linux:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: 'npm'
       - run: npm ci
       - run: npm run release
   build-windows:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: 'npm'
       - run: npm ci
       - run: npm run release
@@ -34,10 +34,10 @@ jobs:
       APPLE_ID: ${{ secrets.APPLE_ID }}
       APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: 'npm'
       - run: npm ci
       - run: npm run release

.nvmrc

@@ -1 +1 @@
-v18.13.0
+v20.12.1

main.js

@@ -38,6 +38,13 @@ const menuTemplate = [
     label: 'View',
     submenu: [
       { role: 'togglefullscreen' },
+      {
+        label: 'Toggle Sidebar',
+        id: 'toggleSidebar',
+        click(menuItem, window, event) {
+          mainWindow.webContents.send('toggleSidebar');
+        },
+      },
       { type: 'separator' },
       {
         label: 'Arrangement 1',
@@ -144,8 +151,8 @@ const menuTemplate = [
 const windowMac = {
   width: 1500,
   height: 900,
-  titleBarStyle: 'hiddenInset',
-  transparent: true,
+  titleBarStyle: 'customButtonsOnHover',
+  transparent: false,
   frame: false,
   show: false,
   vibrancy: 'window',

notarize.js

@@ -1,44 +0,0 @@
-const notarize = require('@electron/notarize');
-const fs = require('fs');
-const path = require('path');
-
-module.exports = async function (params) {
-  if (process.platform !== 'darwin') {
-    console.log('Only need to notarize MacOS, skipping');
-    return;
-  }
-
-  const appId = 'com.stagehacks.cueview';
-
-  const appPath = path.join(
-    params.appOutDir,
-    `${params.packager.appInfo.productFilename}.app`
-  );
-
-  if (!fs.existsSync(appPath)) {
-    console.error('App file not found skipping notarization.');
-    return;
-  }
-
-  if (
-    process.env.APPLE_ID === undefined ||
-    process.env.APPLE_ID_PASSWORD === undefined
-  ) {
-    console.log('Apple ID and Password must be set in order to notarize.');
-    return;
-  }
-
-  try {
-    console.log(`Notarizing ${appId} found at ${appPath}`);
-    await notarize.notarize({
-      appBundleId: appId,
-      appPath,
-      appleId: process.env.APPLE_ID,
-      appleIdPassword: process.env.APPLE_ID_PASSWORD,
-    });
-    console.log(`Done notarizing ${appId}`);
-  } catch (error) {
-    console.log('There was an error notarizing.');
-    console.error(error);
-  }
-};

package.json

@@ -20,20 +20,20 @@
   "homepage": "https://github.com/stagehacks/Cue-View",
   "repository": "https://github.com/stagehacks/Cue-View",
   "devDependencies": {
-    "@electron/notarize": "^2.1.0",
-    "electron": "^26.2.4",
-    "electron-builder": "^24.6.4",
-    "eslint": "^8.51.0",
+    "@electron/notarize": "^2.3.2",
+    "electron": "^30.0.6",
+    "electron-builder": "^24.13.3",
+    "eslint": "^8.57.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-import": "^2.28.1",
-    "prettier": "^3.0.3"
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-import": "^2.29.1",
+    "prettier": "^3.2.5"
   },
   "dependencies": {
     "@jwetzell/posistagenet": "^0.4.6",
-    "atem-connection": "^3.3.2",
+    "atem-connection": "^3.5.0",
     "bonjour": "^3.5.0",
-    "electron-updater": "^6.1.4",
+    "electron-updater": "^6.1.8",
     "lodash": "^4.17.21",
     "md5": "^2.3.0",
     "netmask": "^2.0.2",
@@ -48,6 +48,9 @@
       "category": "Utilities",
       "icon": "src/assets/img/icon.icns",
       "hardenedRuntime": true,
+      "notarize": {
+        "teamId": "JHA7H7P56J"
+      },
       "electronLanguages": [
         "en"
       ],

plugins/atem/main.js

@@ -6,7 +6,7 @@ exports.config = {
   defaultName: 'ATEM',
   connectionType: 'atem',
   defaultPort: 9910,
-  mayChangePort: false,
+  mayChangePorts: false,
   searchOptions: {
     type: 'UDPScan',
     searchBuffer: Buffer.from([

plugins/eos/main.js

@@ -7,7 +7,7 @@ exports.config = {
   defaultName: 'ETC Eos',
   connectionType: 'osc',
   defaultPort: 3037,
-  mayChangePort: true,
+  mayChangePorts: true,
   heartbeatInterval: 5000,
   heartbeatTimeout: 6000,
   searchOptions: {

preload.js

@@ -155,6 +155,10 @@ ipcRenderer.on('clearSavedData', (event, message) => {
   SAVESLOTS.clearSavedData();
 });
 
+ipcRenderer.on('toggleSidebar', (event, message) => {
+  document.getElementById('main').classList.toggle('sidebar-hidden');
+});
+
 ipcRenderer.on('loadSlot', (event, slot) => {
   if (slot) {
     SAVESLOTS.loadSlot(slot);

src/assets/css/index.css

@@ -31,6 +31,14 @@ a {
   float: right;
 }
 
+#main.sidebar-hidden {
+  grid-template-columns: auto;
+}
+
+#main.sidebar-hidden > #device-list-col {
+  display: none;
+}
+
 #main {
   box-sizing: border-box;
   display: grid;