Skip to content

Commit f8b2c26

Browse files
committed
fix: support vp commands for nuxt
1 parent 4cc723c commit f8b2c26

21 files changed

Lines changed: 1125 additions & 155 deletions

.github/workflows/format.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Vize Format
1+
name: Vite+ Format
22

33
on:
44
pull_request:
@@ -14,7 +14,6 @@ on:
1414
- 'pnpm-lock.yaml'
1515
- 'vite.config.ts'
1616
- 'vitest.config.ts'
17-
- 'vize.config.json'
1817
- 'nuxt.config.ts'
1918
- 'tsconfig.json'
2019
- 'tsconfig.vize.json'
@@ -37,12 +36,8 @@ jobs:
3736
cache: pnpm
3837
- name: Enable pnpm
3938
run: corepack enable
40-
- name: Setup Rust
41-
uses: dtolnay/rust-toolchain@stable
4239
- name: Install dependencies
4340
run: pnpm install --frozen-lockfile
44-
- name: Install Vize CLI
45-
run: cargo install --git https://github.com/ubugeeei/vize --tag v0.63.0 --locked vize
4641
- name: Run format check
4742
run: pnpm fmt:check
4843
env:

.github/workflows/linter.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ on:
1313
- 'pnpm-lock.yaml'
1414
- 'vite.config.ts'
1515
- 'vitest.config.ts'
16-
- 'vize.config.json'
1716
- 'nuxt.config.ts'
1817
- 'tsconfig.json'
1918
- 'tsconfig.vize.json'

.github/workflows/typecheck.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ on:
1313
- 'pnpm-lock.yaml'
1414
- 'vite.config.ts'
1515
- 'vitest.config.ts'
16-
- 'vize.config.json'
1716
- 'nuxt.config.ts'
1817
- 'tsconfig.json'
1918
- 'tsconfig.vize.json'

.github/workflows/vitest.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ on:
1313
- 'pnpm-lock.yaml'
1414
- 'vite.config.ts'
1515
- 'vitest.config.ts'
16-
- 'vize.config.json'
1716
- 'nuxt.config.ts'
1817
- 'tsconfig.json'
1918
- 'tsconfig.vize.json'

README.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,20 @@ pnpm install
2929

3030
## Commands
3131

32-
開発サーバやビルドなどの npm scripts は pnpm 経由で実行します。Lint / Format / Type Check は Vize 系ツールを利用します。
33-
34-
| 用途 | コマンド |
35-
| ------------- | ----------------- |
36-
| 開発サーバ | `pnpm dev` |
37-
| ビルド | `pnpm build` |
38-
| 静的生成 | `pnpm generate` |
39-
| プレビュー | `pnpm preview` |
40-
| Lint | `pnpm lint` |
41-
| Format | `pnpm fmt` |
42-
| Format Check | `pnpm fmt:check` |
43-
| Type Check | `pnpm typecheck` |
44-
| Test | `pnpm test` |
45-
| Test(watch) | `pnpm test:watch` |
32+
開発サーバやビルドなどの npm scripts は pnpm 経由で実行できます。Vite+ の `vp dev` / `vp build` も Nuxt に橋渡しされ、Format は Vite+ の `vp fmt`、Lint / Type Check は Vize 系ツールを利用します。
33+
34+
| 用途 | コマンド |
35+
| ------------- | ----------------------------------- |
36+
| 開発サーバ | `pnpm dev` / `vp dev` |
37+
| ビルド | `pnpm build` / `vp build` |
38+
| 静的生成 | `pnpm generate` |
39+
| プレビュー | `pnpm preview` |
40+
| Lint | `pnpm lint` |
41+
| Format | `pnpm fmt` / `vp fmt --write` |
42+
| Format Check | `pnpm fmt:check` / `vp fmt --check` |
43+
| Type Check | `pnpm typecheck` |
44+
| Test | `pnpm test` |
45+
| Test(watch) | `pnpm test:watch` |
4646

4747
## CI
4848

@@ -53,7 +53,7 @@ GitHub Actions でも同じ pnpm scripts を実行します。
5353
- `pnpm typecheck`
5454
- `pnpm test`
5555

56-
`pnpm fmt:check` `pnpm typecheck` は Rust-native Vize CLI を利用します。
56+
`pnpm fmt:check` は Vite+、`pnpm typecheck` は Rust-native Vize CLI を利用します。
5757

5858
## Deploy
5959

app/components/AppFooter.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ const { t } = useVfjsI18n();
33
</script>
44

55
<template>
6-
<footer class="border-t border-[var(--rule)] flex flex-wrap gap-x-[24px] gap-y-[8px] items-baseline justify-between px-[var(--pad-x)] py-[20px] text-[12px] text-[var(--ink-3)] [font-family:var(--font-mono)]">
6+
<footer
7+
class="border-t border-[var(--rule)] flex flex-wrap gap-x-[24px] gap-y-[8px] items-baseline justify-between px-[var(--pad-x)] py-[20px] text-[12px] text-[var(--ink-3)] [font-family:var(--font-mono)]"
8+
>
79
<div>
810
<NuxtLink class="text-inherit underline hover:no-underline hover:text-[var(--ink-3)]" to="/">
911
{{ t.back_top }}

app/components/AppHeader.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ const { scheme, setScheme } = useColorScheme();
1515
to="/"
1616
>
1717
<AppLogoMark class="w-[16px] h-auto text-[var(--ink)]" />
18-
<span>
19-
Vue Fes Japan Speakers
20-
</span>
18+
<span>Vue Fes Japan Speakers</span>
2119
</NuxtLink>
2220
<div class="flex items-center gap-2">
2321
<select
2422
class="border border-[var(--rule)] bg-[var(--paper)] text-[var(--ink-2)] [font-family:var(--font-mono)] text-[12px] tracking-[0.08em] px-[8px] py-[5px] cursor-pointer"
2523
:aria-label="t.color_scheme"
2624
:value="scheme"
27-
@change="setScheme(($event.target as HTMLSelectElement).value as 'light' | 'dark' | 'system')"
25+
@change="
26+
setScheme(($event.target as HTMLSelectElement).value as 'light' | 'dark' | 'system')
27+
"
2828
>
2929
<option value="light">
3030
{{ t.color_scheme_light }}

app/components/AppLogoMark.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
<path
1111
d="M26.19,89.73c12.25,0,22.19-9.93,22.19-22.19s-9.93-22.19-22.19-22.19-22.19,9.93-22.19,22.19,9.93,22.19,22.19,22.19Z"
1212
fill="var(--accent)"
13-
/>
13+
/>
1414
</svg>
1515
</template>

app/components/AppMasthead.vue

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,20 @@ const { t } = useVfjsI18n();
77
</script>
88

99
<template>
10-
<section class="border-b border-[var(--rule)] pt-[clamp(48px,8vw,120px)] pb-[clamp(40px,6vw,72px)] px-[var(--pad-x)]">
10+
<section
11+
class="border-b border-[var(--rule)] pt-[clamp(48px,8vw,120px)] pb-[clamp(40px,6vw,72px)] px-[var(--pad-x)]"
12+
>
1113
<div class="grid grid-cols-12 gap-6 items-end">
12-
<div class="col-span-9 flex items-center gap-[clamp(18px,2.4vw,34px)] max-[800px]:col-span-12 max-[560px]:flex-col max-[560px]:items-start">
13-
<AppLogoMark class="w-[clamp(42px,5vw,72px)] h-auto text-[var(--ink)] mb-[0.08em] max-[560px]:mb-0" />
14-
<h1 class="m-0 [font-family:var(--font-display)] font-[500] text-[clamp(38px,6.2vw,104px)] leading-[0.96] text-[var(--ink)] word-break-keep-all">
15-
<span>
16-
Vue Fes Japan Speakers
17-
</span>
14+
<div
15+
class="col-span-9 flex items-center gap-[clamp(18px,2.4vw,34px)] max-[800px]:col-span-12 max-[560px]:flex-col max-[560px]:items-start"
16+
>
17+
<AppLogoMark
18+
class="w-[clamp(42px,5vw,72px)] h-auto text-[var(--ink)] mb-[0.08em] max-[560px]:mb-0"
19+
/>
20+
<h1
21+
class="m-0 [font-family:var(--font-display)] font-[500] text-[clamp(38px,6.2vw,104px)] leading-[0.96] text-[var(--ink)] word-break-keep-all"
22+
>
23+
<span>Vue Fes Japan Speakers</span>
1824
</h1>
1925
</div>
2026
<aside
@@ -40,7 +46,9 @@ const { t } = useVfjsI18n();
4046
{{ t.meta_years }}
4147
</div>
4248
</aside>
43-
<p class="col-span-9 mt-[28px] text-[clamp(16px,1.4vw,20px)] text-[var(--ink-2)] leading-[1.5] m-0 max-[800px]:col-span-12">
49+
<p
50+
class="col-span-9 mt-[28px] text-[clamp(16px,1.4vw,20px)] text-[var(--ink-2)] leading-[1.5] m-0 max-[800px]:col-span-12"
51+
>
4452
{{ t.sub_all }}
4553
</p>
4654
</div>

app/components/ChronicleView.vue

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ const grouped = computed(() => {
7070
:counts="counts"
7171
:selected-year="selectedYear"
7272
@update:selected-year="emit('update:selectedYear', $event)"
73-
/>
73+
/>
7474
<div
7575
v-if="grouped.length === 0"
7676
class="px-[var(--pad-x)] py-[80px] text-center [font-family:var(--font-mono)] text-[13px] tracking-[0.05em] uppercase text-[var(--ink-3)]"
@@ -94,7 +94,9 @@ const grouped = computed(() => {
9494
>
9595
{{ year }}
9696
</span>
97-
<span class="[font-family:var(--font-mono)] text-[12px] tracking-[0.08em] uppercase text-[var(--ink-3)] mt-[10px]">
97+
<span
98+
class="[font-family:var(--font-mono)] text-[12px] tracking-[0.08em] uppercase text-[var(--ink-3)] mt-[10px]"
99+
>
98100
{{ t.year_total_talks(arr.length) }}
99101
</span>
100102
<NuxtLink
@@ -120,9 +122,13 @@ const grouped = computed(() => {
120122
{{ String(i + 1).padStart(2, '0') }}
121123
</span>
122124
</div>
123-
<div class="grid grid-cols-[minmax(0,300px)_minmax(0,1fr)] gap-[clamp(16px,2vw,32px)] items-baseline max-[700px]:grid-cols-1 max-[700px]:gap-[6px]">
125+
<div
126+
class="grid grid-cols-[minmax(0,300px)_minmax(0,1fr)] gap-[clamp(16px,2vw,32px)] items-baseline max-[700px]:grid-cols-1 max-[700px]:gap-[6px]"
127+
>
124128
<!-- Speaker names -->
125-
<div class="[font-family:var(--font-display)] font-[500] text-[clamp(17px,1.5vw,22px)] tracking-[-0.01em] leading-[1.25]">
129+
<div
130+
class="[font-family:var(--font-display)] font-[500] text-[clamp(17px,1.5vw,22px)] tracking-[-0.01em] leading-[1.25]"
131+
>
126132
<template v-for="(n, ni) in s.name" :key="n">
127133
<span v-if="ni > 0" aria-hidden="true" class="text-[var(--ink-2)] font-normal">
128134
×

0 commit comments

Comments
 (0)