Package with electron-builder and enable auto-updates (#3717)
* WIP: enable build releases Will eventually fix #3528 * Build on all branches * WIP: electron-forge publish to gcs * WIP env var * WIP windows * WIP checkout in publish * Back to matrix for build-apps and upstream wasm build * WIP * WIP * WIP * WIP * WIP * WIP * WIP clean up out upload with all dry runs * WIP macos * Clean up * Add update-electron-app * Bump version down to 0.24.11 * Explicit NODE_ENV=production * A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest) * A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest) * Push dummy version 0.99.99 * Undo * A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest) * Trigger CI * Lint * Experiment with DMG and MSI * Split up artifacts * Executable name to Zoo Modeling App * Linux kebab-case exe, autoUpdate on wix * Experiment with electron-builder * WIP * fail-fast false * tronb:vite * DMG and NSIS * Typo * Disable updater for electron-builder tests, quick fix * WIP macOS sign and notarize * WIP Win signing * CSC_FOR_PULL_REQUEST * Comment out signingHashAlgorithms * APPLE_APP_SPECIFIC_PASSWORD and move scripts * notarize: true and change script link * mac.notarize.teamid * Clean up and first steps on auto updater * Lint * Add logs * Work on nsis config * More extensive configs * Clean up * Test push updater * Push again; Fix lint * Bump down to 0.24.11 to test, disable publish * WIP mac updater * Back to .12 to push zips * Back to .11 to test * Back to .12 to push to same dir * Fix windows and names * Back to .11 to test, no publish * A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest) * Push again .12 * A snapshot a day keeps the bugs away! 📷🐛 (OS: windows-latest) * Add publisherName as in certificate * Back to 11 build * Add msi target * MSI params * perMarchine: false * .12 msi push * WIP tauri bundle generation (macOS) * Typo * Universal build mac * Test last_update tauri gen for macOS * VERSION fix * Add v to VERSION * Add v to VERSION part 2 * Fix tar * WIP windows updater * WIP windows * Change Compress-Archive to 7z on Windows * 7z change * Fix flag * -mm Deflate * -mm Copy and version .99 * perMachine true * perMachine true * Manual autoUpdater.quitAndInstall * Test NSIS for tauri transition * WIP * No more universal for mac, last_download.json endpoint * Typo in json * Tweaks * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest) * Fix typo in download.json * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest) * Revert "A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest)" This reverts commit0d6d67ec2c
. * Revert "A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest)" This reverts commitb01bc589ab
. * A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest) * Revert "A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu-latest)" This reverts commit5deff7614f
. * Fix tauri update json for universal to arch specified * Fix tauri update json for universal to arch specified part 2 * Fix tauri update json for universal to arch specified part 3 * Back to checkUpdateAndNotify, frames on window * Clean up * Default prod env values * CI clean up * More clean up * Override if forge env not set * Make basic-sketch test more robust * Fix env vars set --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: 49lf <ircsurfer33@gmail.com>
This commit is contained in:
47
src/main.ts
47
src/main.ts
@ -8,6 +8,7 @@ import { Issuer } from 'openid-client'
|
||||
import { Bonjour, Service } from 'bonjour-service'
|
||||
// @ts-ignore: TS1343
|
||||
import * as kittycad from '@kittycad/lib/import'
|
||||
import electronUpdater, { type AppUpdater } from 'electron-updater'
|
||||
import minimist from 'minimist'
|
||||
import getCurrentProjectFile from 'lib/getCurrentProjectFile'
|
||||
|
||||
@ -22,8 +23,20 @@ if (!process.env.NODE_ENV)
|
||||
console.warn(
|
||||
'*FOX SCREAM* process.env.NODE_ENV is not explicitly set!, defaulting to production'
|
||||
)
|
||||
// Default prod values
|
||||
|
||||
// dotenv override when present
|
||||
dotenv.config({ path: [`.env.${NODE_ENV}.local`, `.env.${NODE_ENV}`] })
|
||||
|
||||
console.log(process.env)
|
||||
|
||||
process.env.VITE_KC_API_WS_MODELING_URL ??=
|
||||
'wss://api.zoo.dev/ws/modeling/commands'
|
||||
process.env.VITE_KC_API_BASE_URL ??= 'https://api.zoo.dev'
|
||||
process.env.VITE_KC_SITE_BASE_URL ??= 'https://zoo.dev'
|
||||
process.env.VITE_KC_SKIP_AUTH ??= 'false'
|
||||
process.env.VITE_KC_CONNECTION_TIMEOUT_MS ??= '15000'
|
||||
|
||||
// Handle creating/removing shortcuts on Windows when installing/uninstalling.
|
||||
if (require('electron-squirrel-startup')) {
|
||||
app.quit()
|
||||
@ -59,8 +72,8 @@ const createWindow = (): BrowserWindow => {
|
||||
preload: path.join(__dirname, './preload.js'),
|
||||
},
|
||||
icon: path.resolve(process.cwd(), 'assets', 'icon.png'),
|
||||
frame: false,
|
||||
titleBarStyle: 'hiddenInset',
|
||||
// frame: false,
|
||||
// titleBarStyle: 'hiddenInset',
|
||||
})
|
||||
|
||||
// and load the index.html of the app.
|
||||
@ -191,6 +204,36 @@ ipcMain.handle('find_machine_api', () => {
|
||||
})
|
||||
})
|
||||
|
||||
export function getAutoUpdater(): AppUpdater {
|
||||
// Using destructuring to access autoUpdater due to the CommonJS module of 'electron-updater'.
|
||||
// It is a workaround for ESM compatibility issues, see https://github.com/electron-userland/electron-builder/issues/7976.
|
||||
const { autoUpdater } = electronUpdater
|
||||
return autoUpdater
|
||||
}
|
||||
|
||||
export async function checkForUpdates(autoUpdater: AppUpdater) {
|
||||
// TODO: figure out how to get the update modal back
|
||||
const result = await autoUpdater.checkForUpdatesAndNotify()
|
||||
console.log(result)
|
||||
}
|
||||
|
||||
app.on('ready', async () => {
|
||||
const autoUpdater = getAutoUpdater()
|
||||
checkForUpdates(autoUpdater)
|
||||
const fifteenMinutes = 15 * 60 * 1000
|
||||
setInterval(() => {
|
||||
checkForUpdates(autoUpdater)
|
||||
}, fifteenMinutes)
|
||||
|
||||
autoUpdater.on('update-available', (info) => {
|
||||
console.log('update-available', info)
|
||||
})
|
||||
|
||||
autoUpdater.on('update-downloaded', (info) => {
|
||||
console.log('update-downloaded', info)
|
||||
})
|
||||
})
|
||||
|
||||
ipcMain.handle('loadProjectAtStartup', async () => {
|
||||
// If we are in development mode, we don't want to load a project at
|
||||
// startup.
|
||||
|
Reference in New Issue
Block a user