electron 16 update

justlep · Feb 14, 2022 · 434b63e · 434b63e
1 parent 2f70c98
commit 434b63e
Show file tree

Hide file tree

Showing 15 changed files with 238 additions and 527 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to Sample Commander will be documented in this file.
 
+## [2.3.0] - TBA
+* faster program start
+* reduced installer size
+* security updates
+
 ## [2.2.0] - 4<sup>th</sup> March 2021
 * security update (upgraded from Electron 7 to 9)
 * faster folders listings

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sample-commander",
-  "version": "2.2.2-beta17",
+  "version": "2.3.0-beta1",
   "description": "A spectrogram-assisted file browser & player for audio recordings",
   "author": "Lennart Pegel <[email protected]>",
   "license": "GPL-3.0",
@@ -86,39 +86,32 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "async": "^3.2.3",
-    "electron-store": "^8.0.1",
-    "electron-window-state": "^5.0.3",
-    "lodash": "^4.17.21",
-    "mousetrap": "^1.6.5",
-    "move-file": "^1.2.0",
-    "readdirp": "^3.6.0",
-    "vue": "^2.6.14",
-    "vue-electron": "^1.0.6",
-    "vuex": "^3.6.2",
-    "vuex-pathify": "^1.5.1",
-    "buefy": "^0.9.14",
     "@babel/core": "^7.17.0",
     "@babel/preset-env": "^7.16.11",
     "@babel/register": "^7.17.0",
     "@babel/runtime": "^7.17.0",
+    "@electron/remote": "^2.0.4",
     "@growthbunker/vuedarkmode": "^0.5.56",
     "@types/jest": "^27.4.0",
     "ajv": "^6.10.0",
+    "async": "^3.2.3",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^27.4.6",
     "babel-loader": "^8.2.3",
+    "buefy": "^0.9.14",
     "bulma-slider": "^2.0.5",
     "chai": "^4.3.6",
     "chalk": "^4.1.2",
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^5.1.6",
     "css-loader": "^2.1.1",
     "del": "^3.0.0",
-    "electron": "11.5.0",
-    "electron-builder": "^22.14.5",
+    "electron": "^16.0.8",
+    "electron-builder": "^22.14.13",
     "electron-debug": "^3.2.0",
     "electron-devtools-installer": "^3.2.0",
+    "electron-store": "^8.0.1",
+    "electron-window-state": "^5.0.3",
     "eslint": "^4.19.1",
     "eslint-config-standard": "^11.0.0",
     "eslint-loader": "^2.0.0",
@@ -132,20 +125,28 @@
     "html-webpack-plugin": "^4.5.2",
     "inject-loader": "^4.0.1",
     "jest": "^27.4.7",
+    "lodash": "^4.17.21",
     "mini-css-extract-plugin": "0.4.0",
+    "mousetrap": "^1.6.5",
+    "move-file": "^1.2.0",
     "node-loader": "^0.6.0",
     "node-sass": "^6.0.1",
     "node-stream-zip": "^1.15.0",
     "pug": "~3.0.1",
     "pug-plain-loader": "^1.1.0",
+    "readdirp": "^3.6.0",
     "sass-loader": "^10.2.1",
     "style-loader": "^0.21.0",
     "url-loader": "^1.0.1",
+    "vue": "^2.6.14",
+    "vue-electron": "^1.0.6",
     "vue-jest": "^3.0.7",
     "vue-loader": "^15.9.8",
     "vue-multipane": "^0.9.5",
     "vue-style-loader": "^4.1.3",
     "vue-template-compiler": "^2.6.14",
+    "vuex": "^3.6.2",
+    "vuex-pathify": "^1.5.1",
     "webpack": "^4.46.0",
     "webpack-dev-server": "^3.11.0",
     "webpack-hot-middleware": "^2.25.1"

diff --git a/src/index.ejs b/src/index.ejs
@@ -3,12 +3,6 @@
   <head>
     <meta charset="utf-8">
     <title><%= htmlWebpackPlugin.options.title %></title>
-    <% if (htmlWebpackPlugin.options.nodeModules) { %>
-      <!-- Add `node_modules/` to global paths so `require` works properly in development -->
-      <script>
-        require('module').globalPaths.push('<%= htmlWebpackPlugin.options.nodeModules.replace(/\\/g, '\\\\') %>')
-      </script>
-    <% } %>
     <style>
       .bodyspinner:after {
         content: '';
@@ -32,9 +26,17 @@
   <body class="bodyspinner" style="background:#111" onload="document.body.classList.remove('bodyspinner')">
     <div id="app"></div>
     <!-- Set `__static` path to static files in production -->
+    <% if (htmlWebpackPlugin.options.nodeModules) { %>
+      <script>
+        <!-- Add `node_modules/` to global paths so `require` works properly in development -->
+        require('module').globalPaths.push('<%= htmlWebpackPlugin.options.nodeModules.replace(/\\/g, '\\\\') %>')
+      </script>
+    <% } %>
     <% if (!require('process').browser) { %>
       <script>
-        if (process.env.NODE_ENV !== 'development') window.__static = require('path').join(__dirname, '/static').replace(/\\/g, '\\\\')
+        if (process.env.NODE_ENV !== 'development') {
+          window.__static = require('path').join(__dirname, '/static').replace(/\\/g, '\\\\')
+        }
       </script>
     <% } %>
     <!-- webpack builds are automatically injected -->

diff --git a/src/main/index.dev.js b/src/main/index.dev.js
@@ -5,21 +5,24 @@
  *  environment.
  */
 
-/* eslint-disable */
-
 // Install `electron-debug` with `devtron`
-require('electron-debug')({showDevTools: true});
 
-// Install `vue-devtools`
+require('electron-debug')({
+    isEnabled: true,
+    showDevTools: true,
+    devToolsMode: 'undocked'
+});
+
+// install vue-devtools..
+
+const installExtension = require('electron-devtools-installer')
+
 require('electron').app.on('ready', () => {
-    let installExtension = require('electron-devtools-installer');
     installExtension.default(installExtension.VUEJS_DEVTOOLS)
-        .then(() => {
-        })
-        .catch(err => {
-            console.log('Unable to install `vue-devtools`: \n', err)
-        })
-});
+        .then(() => console.log('Installed vue-devtools')) // eslint-disable-line
+        .catch(err => console.log('Unable to install `vue-devtools`: \n', err)) // eslint-disable-line
+    }
+);
 
 // Require `main` process to boot app
 require('./index');