Skip to content

Commit fc50e9f

Browse files
Add: チェックを追加
1 parent f5a74e4 commit fc50e9f

File tree

6 files changed

+11
-16
lines changed

6 files changed

+11
-16
lines changed

playwright.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ const config: PlaywrightTestConfig = {
8484

8585
webServer: [
8686
{
87-
command: "vite --mode test --port 7357",
87+
command: "vite build --mode test && vite preview --mode test --port 7357",
8888
port: 7357,
8989
reuseExistingServer: !process.env.CI,
9090
},

src/browser/contract.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { EngineInfo, EngineId } from "@/type/preload";
22

33
export const defaultEngine: EngineInfo = {
44
uuid: EngineId("074fc39e-678b-4c13-8916-ffca8d505d1d"),
5-
host: "http://127.0.0.1:50021",
5+
host: "http://192.168.1.2:50021",
66
name: "VOICEVOX Engine",
77
path: undefined,
88
executionEnabled: false,

src/components/MenuBar.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ export type MenuItemButton = MenuItemBase<"button"> & {
6262
disabled?: boolean;
6363
disableWhenUiLocked: boolean;
6464
disablreloadingLocked?: boolean;
65+
label: HotkeyAction;
6566
};
6667
6768
export type MenuItemData = MenuItemSeparator | MenuItemRoot | MenuItemButton;

src/components/MenuItem.vue

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@
1414
</q-item-section>
1515

1616
<q-item-section>{{ menudata.label }}</q-item-section>
17-
<q-item-section
18-
v-if="menudata.label != undefined && getMenuBarHotkey(menudata.label)"
19-
side
20-
>
21-
{{ getMenuBarHotkey(menudata.label) }}
22-
</q-item-section>
2317

2418
<q-item-section side>
2519
<q-icon name="keyboard_arrow_right" />
@@ -49,6 +43,7 @@
4943
clickable
5044
class="bg-background"
5145
:disable="menudata.disabled"
46+
tabindex="0"
5247
@click="menudata.onClick"
5348
>
5449
<q-item-section
@@ -96,9 +91,9 @@ const hotkeySettingsMap = computed(
9691
)
9792
);
9893
// FIXME: string型は受け付けないべき
99-
const getMenuBarHotkey = (label: HotkeyAction | string) => {
94+
const getMenuBarHotkey = (label: HotkeyAction) => {
10095
const hotkey = hotkeySettingsMap.value.get(label);
101-
if (hotkey === undefined) {
96+
if (hotkey == undefined) {
10297
return "";
10398
} else {
10499
// Mac の Meta キーは Cmd キーであるため、Meta の表示名を Cmd に置換する

tests/e2e/navigators.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ export async function toggleSetting(page: Page, settingName: string) {
3434
await page.waitForTimeout(100);
3535
// FIXME: なぜかariaで取得できない
3636
// await page.getByRole("listitem", { name: "オプション" }).click();
37+
await expect(page.getByText("オプション")).toBeVisible();
3738
await page.getByText("オプション").click();
3839
await page.waitForTimeout(100);
3940
await page

vite.config.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/// <reference types="vitest" />
22
import path from "path";
3-
import { rmSync } from "fs";
43
import treeKill from "tree-kill";
54

65
import electron from "vite-plugin-electron";
@@ -11,17 +10,15 @@ import { nodePolyfills } from "vite-plugin-node-polyfills";
1110
import { BuildOptions, defineConfig, loadEnv, Plugin } from "vite";
1211
import { quasar } from "@quasar/vite-plugin";
1312

14-
rmSync(path.resolve(__dirname, "dist"), { recursive: true, force: true });
15-
1613
const isElectron = process.env.VITE_TARGET === "electron";
1714
const isBrowser = process.env.VITE_TARGET === "browser";
1815

1916
export default defineConfig((options) => {
20-
const package_name = process.env.npm_package_name;
17+
const packageName = process.env.npm_package_name;
2118
const env = loadEnv(options.mode, __dirname);
22-
if (!package_name.startsWith(env.VITE_APP_NAME)) {
19+
if (!packageName?.startsWith(env.VITE_APP_NAME)) {
2320
throw new Error(
24-
`"package.json"の"name":"${package_name}"は"VITE_APP_NAME":"${env.VITE_APP_NAME}"から始まっている必要があります`
21+
`"package.json"の"name":"${packageName}"は"VITE_APP_NAME":"${env.VITE_APP_NAME}"から始まっている必要があります`
2522
);
2623
}
2724
const shouldEmitSourcemap = ["development", "test"].includes(options.mode);
@@ -40,6 +37,7 @@ export default defineConfig((options) => {
4037
return {
4138
root: path.resolve(__dirname, "src"),
4239
build: {
40+
emptyOutDir: true,
4341
outDir: path.resolve(__dirname, "dist"),
4442
chunkSizeWarningLimit: 10000,
4543
sourcemap,

0 commit comments

Comments
 (0)