Bump deps and version, and fix path issues

package.json

@@ -1,6 +1,6 @@
 {
   "name": "universal-np",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -45,7 +45,7 @@
     "prettier": "^1.18.2",
     "sass": "^1.18.0",
     "sass-loader": "^7.1.0",
-    "vue-cli-plugin-electron-builder": "^1.4.0",
+    "vue-cli-plugin-electron-builder": "^2.0.0",
     "vue-cli-plugin-vuetify": "^1.0.0",
     "vue-template-compiler": "^2.6.10",
     "vuetify-loader": "^1.2.2"

src/App.vue

@@ -127,6 +127,10 @@ export default {
 </script>
 
 <style lang="scss">
+html {
+  overflow-y: auto !important;
+}
+
 .footer {
   padding-left: 10px;
   // a:not(:first-child) {

src/background.js

@@ -5,6 +5,9 @@ import {
   createProtocol,
   installVueDevtools
 } from 'vue-cli-plugin-electron-builder/lib';
+
+const path = require('path');
+
 const isDevelopment = process.env.NODE_ENV !== 'production';
 
 // Keep a global reference of the window object, if you don't, the window will
@@ -32,7 +35,9 @@ function createWindow() {
     width: 800,
     height: 600,
     webPreferences: {
-      nodeIntegration: true
+      // Use pluginOptions.nodeIntegration, leave this alone
+      // See https://github.com/nklayman/vue-cli-plugin-electron-builder/blob/v2/docs/guide/configuration.md#node-integration for more info
+      nodeIntegration: process.env.ELECTRON_NODE_INTEGRATION
     },
     darkTheme: true
   });
@@ -93,13 +98,13 @@ app.on('ready', async () => {
     // If you are not using Windows 10 dark mode, you may uncomment these lines
     // In addition, if the linked issue is closed, you can upgrade electron and uncomment these lines
     try {
-      await installVueDevtools()
+      await installVueDevtools();
     } catch (e) {
-      console.error('Vue Devtools failed to install:', e.toString())
+      console.error('Vue Devtools failed to install:', e.toString());
     }
   }
 
-  tray = new Tray('./public/icon.png');
+  tray = new Tray(path.join(__static, 'icon.png'));
   tray.setToolTip('Universal Now Playing');
 
   const mainWindow = createWindow();

src/players/iTunes/iTunesHandler_win32.js

@@ -1,7 +1,7 @@
 import Handler from './../Handler';
 import { remote } from 'electron';
-const { exec } = remote.require('child_process');
-const { join } = remote.require('path');
+const { exec } = require('child_process');
+const { join } = require('path');
 
 import { copyWindowsScripts } from '@/util';
 import { getProcessByName } from '@pendo324/get-process-by-name';
@@ -12,21 +12,19 @@ import { getProcessByName } from '@pendo324/get-process-by-name';
 
 const getCurrentTrack = () => {
   return new Promise((resolve, reject) => {
-    exec(
-      `powershell ${join(
-        remote.app.getPath('userData'),
-        'windows_runtime_scripts',
-        'getTrack_iTunes.ps1'
-      )}`,
-      (err, stdout) => {
-        if (err) {
-          return reject(err);
-        }
-
-        const parsed = stdout.trim();
-        resolve(parsed);
+    const scriptPath = `powershell ${join(
+      remote.app.getPath('userData'),
+      'windows_runtime_scripts',
+      'getTrack_iTunes.ps1'
+    )}`;
+    exec(scriptPath, (err, stdout) => {
+      if (err) {
+        return reject(err);
       }
-    );
+
+      const parsed = stdout.trim();
+      resolve(parsed);
+    });
   });
 };
 

vue.config.js

@@ -4,9 +4,10 @@ module.exports = {
   pluginOptions: {
     electronBuilder: {
       externals: ['body-parser'],
+      nodeIntegration: true,
       builderOptions: {
         win: {
-          requestedExecutionLevel: 'highestAvailable'
+          publisherName: 'Flying Lawnmower Development'
         }
       }
     }