From 796940302db623300aeefd12db8ca88caf1a1acd Mon Sep 17 00:00:00 2001 From: Rafael Araujo Lehmkuhl Date: Tue, 15 Oct 2024 14:28:22 -0300 Subject: [PATCH] electron: Run `vite-plugin-pwa` also on build and deploy --- package.json | 6 +++--- vite.config.ts | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 73037fac0..1c7f6a29e 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,9 @@ "build": "vite build", "build:serve": "bun run build && bun run serve", "coverage": "vitest --coverage", - "deploy:electron:dir": "electron-builder --dir", - "deploy:electron": "electron-builder --publish=never -c.extraMetadata.version=$(git describe --tags --abbrev=0 | sed 's/^v//')", - "deploy:flatpak": "electron-builder --x64 --linux flatpak", + "deploy:electron:dir": "ELECTRON=true electron-builder --dir", + "deploy:electron": "ELECTRON=true electron-builder --publish=never -c.extraMetadata.version=$(git describe --tags --abbrev=0 | sed 's/^v//')", + "deploy:flatpak": "ELECTRON=true electron-builder --x64 --linux flatpak", "dev": "vite --host", "dev:electron": "ELECTRON=true vite --host", "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --ignore-path .gitignore --max-warnings=0", diff --git a/vite.config.ts b/vite.config.ts index 2960acf01..72c3d8fea 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -6,12 +6,13 @@ import vuetify from 'vite-plugin-vuetify' const path = require('path') // eslint-disable-line @typescript-eslint/no-var-requires -// Check if we're running in Electron mode +// Check if we're running in Electron mode or building the application const isElectron = process.env.ELECTRON === 'true' +const isBuilding = process.argv.includes('build') export default defineConfig({ plugins: [ - isElectron && + (isElectron || isBuilding) && electron({ entry: 'electron/main.ts', vite: {