From ff46ec54aa89dfcc9f5d8d429c5803f98c05abcf Mon Sep 17 00:00:00 2001 From: nekobato Date: Sun, 26 Nov 2023 04:21:12 +0900 Subject: [PATCH] bugfix --- components/common/HazyButton.vue | 9 +++++++-- electron/windows/mainWindow.ts | 11 +++++------ nuxt.config.ts | 7 +++++-- package-lock.json | 2 +- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/components/common/HazyButton.vue b/components/common/HazyButton.vue index a30eb33..dd60a19 100644 --- a/components/common/HazyButton.vue +++ b/components/common/HazyButton.vue @@ -17,7 +17,9 @@ defineProps({ @@ -27,8 +29,11 @@ defineProps({ position: absolute; visibility: hidden; } +.button-content { + display: contents; +} .loading { - .slot { + .button-content { visibility: hidden; } .loading-icon { diff --git a/electron/windows/mainWindow.ts b/electron/windows/mainWindow.ts index 5862ed0..933e518 100644 --- a/electron/windows/mainWindow.ts +++ b/electron/windows/mainWindow.ts @@ -40,12 +40,11 @@ export function createMainWindow() { win.show(); }); - // win.webContents?.on("will-navigate", (e, url) => { - // if (url.startsWith("http://localhost")) return; - // e.preventDefault(); - // console.log("will-navigate", url); - // electron.shell.openExternal(url); - // }); + win.webContents?.on("will-navigate", (e, url) => { + e.preventDefault(); + console.log("will-navigate", url); + electron.shell.openExternal(url); + }); return win; } diff --git a/nuxt.config.ts b/nuxt.config.ts index 96b157b..a37c894 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -1,7 +1,10 @@ // https://nuxt.com/docs/api/configuration/nuxt-config export default defineNuxtConfig({ - devtools: { enabled: false }, - ssr: false, + devtools: { enabled: true }, + experimental: { + // https://github.com/caoxiemeihao/nuxt-electron/issues/53 + appManifest: false, + }, modules: ["nuxt-electron", "@pinia/nuxt"], electron: { build: [ diff --git a/package-lock.json b/package-lock.json index 0a5536c..cee359e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,7 @@ "electron-icon-builder": "^2.0.1", "mfm-js": "^0.23.3", "misskey-js": "^0.0.16", - "nuxt": "^3.8.2", + "nuxt": "^3.7.0", "nuxt-electron": "^0.6.0", "pinia": "^2.1.7", "postcss-html": "^1.5.0",