diff --git a/playwright.config.ts b/playwright.config.ts index d849a2302e..5801dc43dd 100644 --- a/playwright.config.ts +++ b/playwright.config.ts @@ -84,7 +84,7 @@ const config: PlaywrightTestConfig = { webServer: [ { - command: "vite --mode test --port 7357", + command: "vite build --mode test && vite preview --mode test --port 7357", port: 7357, reuseExistingServer: !process.env.CI, }, diff --git a/src/browser/contract.ts b/src/browser/contract.ts index 486ed0ef65..e093cabcae 100644 --- a/src/browser/contract.ts +++ b/src/browser/contract.ts @@ -2,7 +2,7 @@ import { EngineInfo, EngineId } from "@/type/preload"; export const defaultEngine: EngineInfo = { uuid: EngineId("074fc39e-678b-4c13-8916-ffca8d505d1d"), - host: "http://127.0.0.1:50021", + host: "http://192.168.1.2:50021", name: "VOICEVOX Engine", path: undefined, executionEnabled: false, diff --git a/src/components/MenuBar.vue b/src/components/MenuBar.vue index a311126cfd..b8047314df 100644 --- a/src/components/MenuBar.vue +++ b/src/components/MenuBar.vue @@ -62,6 +62,7 @@ export type MenuItemButton = MenuItemBase<"button"> & { disabled?: boolean; disableWhenUiLocked: boolean; disablreloadingLocked?: boolean; + label: HotkeyAction; }; export type MenuItemData = MenuItemSeparator | MenuItemRoot | MenuItemButton; diff --git a/src/components/MenuItem.vue b/src/components/MenuItem.vue index 308647304e..c923ac66dc 100644 --- a/src/components/MenuItem.vue +++ b/src/components/MenuItem.vue @@ -14,12 +14,6 @@ {{ menudata.label }} - - {{ getMenuBarHotkey(menudata.label) }} - @@ -49,6 +43,7 @@ clickable class="bg-background" :disable="menudata.disabled" + tabindex="0" @click="menudata.onClick" > { +const getMenuBarHotkey = (label: HotkeyAction) => { const hotkey = hotkeySettingsMap.value.get(label); - if (hotkey === undefined) { + if (hotkey == undefined) { return ""; } else { // Mac の Meta キーは Cmd キーであるため、Meta の表示名を Cmd に置換する diff --git a/tests/e2e/navigators.ts b/tests/e2e/navigators.ts index f71281fec8..cb80c0927a 100644 --- a/tests/e2e/navigators.ts +++ b/tests/e2e/navigators.ts @@ -34,6 +34,7 @@ export async function toggleSetting(page: Page, settingName: string) { await page.waitForTimeout(100); // FIXME: なぜかariaで取得できない // await page.getByRole("listitem", { name: "オプション" }).click(); + await expect(page.getByText("オプション")).toBeVisible(); await page.getByText("オプション").click(); await page.waitForTimeout(100); await page diff --git a/vite.config.ts b/vite.config.ts index 34ef3f173e..4188b43d03 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,6 +1,5 @@ /// import path from "path"; -import { rmSync } from "fs"; import treeKill from "tree-kill"; import electron from "vite-plugin-electron"; @@ -11,17 +10,15 @@ import { nodePolyfills } from "vite-plugin-node-polyfills"; import { BuildOptions, defineConfig, loadEnv, Plugin } from "vite"; import { quasar } from "@quasar/vite-plugin"; -rmSync(path.resolve(__dirname, "dist"), { recursive: true, force: true }); - const isElectron = process.env.VITE_TARGET === "electron"; const isBrowser = process.env.VITE_TARGET === "browser"; export default defineConfig((options) => { - const package_name = process.env.npm_package_name; + const packageName = process.env.npm_package_name; const env = loadEnv(options.mode, __dirname); - if (!package_name.startsWith(env.VITE_APP_NAME)) { + if (!packageName?.startsWith(env.VITE_APP_NAME)) { throw new Error( - `"package.json"の"name":"${package_name}"は"VITE_APP_NAME":"${env.VITE_APP_NAME}"から始まっている必要があります` + `"package.json"の"name":"${packageName}"は"VITE_APP_NAME":"${env.VITE_APP_NAME}"から始まっている必要があります` ); } const shouldEmitSourcemap = ["development", "test"].includes(options.mode); @@ -40,6 +37,7 @@ export default defineConfig((options) => { return { root: path.resolve(__dirname, "src"), build: { + emptyOutDir: true, outDir: path.resolve(__dirname, "dist"), chunkSizeWarningLimit: 10000, sourcemap,