refactor: dev configs

Enubia · Feb 20, 2024 · 4c51197 · 4c51197
1 parent 8fe214f
commit 4c51197
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 146 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/.vscode/.debug.script.mjs b/.vscode/.debug.script.mjs
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
diff --git a/electron/main/background.ts b/electron/main/background.ts
@@ -46,6 +46,7 @@ const store = createStore();
 
 log.info('Store created');
 
+// paths relative to the output directory (dist, dist-electron)
 const DIST_ELECTRON = join(__dirname, '..');
 const DIST = join(DIST_ELECTRON, '../dist');
 const PUBLIC = process.env.VITE_DEV_SERVER_URL ? join(DIST_ELECTRON, '../public') : DIST;
@@ -78,9 +79,11 @@ app.on('ready', () => {
         },
         process.platform === 'linux' ? 1000 : 0,
     );
+
     // Registering the Keybind on the start of the App
     // Since all Keys are unregistered at close
     const keybind = store.get('keybind').vanishKeybind;
+
     if (keybind) {
         try {
             globalShortcut.register(keybind, () => {
@@ -122,21 +125,24 @@ app.on('activate', () => {
 
 app.on('window-all-closed', () => {
     overlay = null;
-    if (process.platform === 'darwin') {
-        if (store.get('general').mac.quitOnClose) {
-            log.info('unregistering all shortcut');
+
+    const quit = () => {
+        if (store.get('keybind').vanishKeybind) {
+            log.info('unregistering all shortcuts');
             globalShortcut.unregisterAll();
+        }
+
+        log.info('App closing');
+        app.quit();
+    };
 
-            log.info('App closing');
-            app.quit();
+    if (process.platform === 'darwin') {
+        if (store.get('general').mac.quitOnClose) {
+            quit();
         } else {
             app.dock.show();
         }
     } else {
-        log.info('unregistering all shortcut');
-        globalShortcut.unregisterAll();
-
-        log.info('App closing');
-        app.quit();
+        quit();
     }
 });
diff --git a/package.json b/package.json
@@ -32,8 +32,8 @@
         }
     },
     "engines": {
-        "node": ">=20.11.0",
-        "pnpm": ">=8.15.1"
+        "node": ">=20",
+        "pnpm": ">=8"
     },
     "scripts": {
         "build": "vue-tsc --noEmit && vite build",

diff --git a/vite.config.mts b/vite.config.mts
@@ -8,15 +8,11 @@ import { defineConfig } from 'vite';
 import electron from 'vite-plugin-electron';
 import renderer from 'vite-plugin-electron-renderer';
 
-import pkg from './package.json';
-
-// https://vitejs.dev/config/
 export default defineConfig((({ command }) => {
     rmSync('dist-electron', { recursive: true, force: true });
 
     const isServe = command === 'serve';
     const isBuild = command === 'build';
-    const sourcemap = isServe || !!process.env.VSCODE_DEBUG;
 
     return {
         plugins: [
@@ -31,28 +27,18 @@ export default defineConfig((({ command }) => {
                 include: resolve(__dirname, './i18n/locales/**'),
                 runtimeOnly: false,
             }),
+
             electron([
                 {
-                    // Main-Process entry file of the Electron App.
                     entry: 'electron/main/background.ts',
                     onstart(options) {
-                        if (process.env.VSCODE_DEBUG) {
-                            // eslint-disable-next-line no-console
-                            console.log(/* For `.vscode/.debug.script.mjs` */ '[startup] Electron App');
-                        } else {
-                            options.startup();
-                        }
+                        options.startup();
                     },
                     vite: {
                         build: {
-                            sourcemap,
+                            sourcemap: isServe,
                             minify: isBuild,
                             outDir: 'dist-electron/main',
-                            rollupOptions: {
-                                external: Object.keys(
-                                    'dependencies' in pkg ? pkg.dependencies : ({} as unknown as any),
-                                ),
-                            },
                         },
                     },
                 },
@@ -61,15 +47,6 @@ export default defineConfig((({ command }) => {
             // Use Node.js API in the Renderer-process
             renderer(),
         ],
-        server:
-            process.env.VSCODE_DEBUG
-            && (() => {
-                const url = new URL(pkg.debug.env.VITE_DEV_SERVER_URL);
-                return {
-                    host: url.hostname,
-                    port: +url.port,
-                };
-            })(),
         clearScreen: false,
     };
 }) as UserConfigFn);