Compare commits

..

1 Commits

Author SHA1 Message Date
jaybe 6ff27295e6 chore(ci): prevent duplicate 'automerge' creation — use existing label id only (auto-label/auto-pr)
Auto PR / open-pr (push) Successful in 29s
Auto Label PR / add-automerge-label (pull_request) Successful in 6s
CI / test (pull_request) Successful in 1m10s
2025-11-14 22:33:43 +09:00
8 changed files with 17 additions and 262 deletions
+2 -2
View File
@@ -55,7 +55,7 @@ jobs:
done
if [ -n "${PR_NUMBER:-}" ]; then
echo "Resolving existing label id for 'automerge' in $OWNER/$NAME (no creation)"
echo "Resolving existing label id for 'automerge' (no creation)"
curl -sS -o /tmp/labels.json -H "Authorization: token ${CI_TOKEN}" \
"${GITEA_BASE_URL}/api/v1/repos/${OWNER}/${NAME}/labels?limit=1000" || true
LID=$(tr '\n' ' ' < /tmp/labels.json | \
@@ -69,7 +69,7 @@ jobs:
"${GITEA_BASE_URL}/api/v1/repos/${OWNER}/${NAME}/issues/${PR_NUMBER}/labels" \
-d '{"labels":['"${LID}"']}' || true
else
echo "No existing 'automerge' found; skip labeling"
echo "No existing 'automerge' label found; skipping label add"
fi
else
echo "PR number could not be determined; skipping label add"
-32
View File
@@ -1,32 +0,0 @@
import { describe, it, expect } from 'vitest'
import { exportPage } from '@/lib/exporter/html'
import { pageSchema, type Page } from '@/lib/schema/page'
function makePage(overrides: Partial<Page> = {}): Page {
const base: Page = {
title: 'CTA Edge',
locale: 'en',
theme: { primaryColor: '#2563eb', fontFamily: 'Inter' },
sections: [
{ type: 'cta', props: { text: ' ', href: '#' } },
{ type: 'features', props: { items: ['One'] } },
] as Page['sections'],
form: { actionUrl: '', fields: [], spamProtection: { honeypotFieldName: '_hp', minSubmitSeconds: 2 } },
analytics: { ga4MeasurementId: '', metaPixelId: '', customHeadHtml: '' },
seo: { title: 't', description: 'd' },
}
return pageSchema.parse({ ...base, ...overrides })
}
describe('Exporter - CTA edge cases', () => {
it('drops CTA section when text is whitespace-only', () => {
const out = exportPage(makePage())
expect(out.html).not.toContain('<section class="cta"')
expect(out.html).not.toContain('<a class="btn-cta"')
})
it('renders CTA when text is valid after trimming', () => {
const out = exportPage(makePage({ sections: [ { type: 'cta', props: { text: ' Buy Now ', href: '#' } } ] as Page['sections'] }))
expect(out.html).toContain('<a class="btn-cta" href="#">Buy Now</a>')
})
})
@@ -1,30 +0,0 @@
import { describe, it, expect } from 'vitest'
import { exportPage } from '@/lib/exporter/html'
import { pageSchema, type Page } from '@/lib/schema/page'
function makePage(): Page {
return pageSchema.parse({
title: 'Dark Contrast Hover',
locale: 'en',
theme: { primaryColor: '#2563eb', fontFamily: 'Inter' },
sections: [
{ type: 'hero', props: { heading: 'Welcome', subheading: 'Sub', imageUrl: 'https://img.example/h.png' } },
{ type: 'cta', props: { text: 'Call', href: '#' } },
],
form: { actionUrl: '', fields: [], spamProtection: { honeypotFieldName: '_hp', minSubmitSeconds: 2 } },
seo: { title: 't', description: 'd' },
})
}
describe('Exporter - dark mode hover/cta tokens', () => {
it('adds link hover underline and ensures btn-cta readable in dark', () => {
const out = exportPage(makePage())
const css = out.css
// underline on hover for links in dark for clearer affordance
expect(css).toMatch(/@media \(prefers-color-scheme: dark\)[\s\S]*a:hover\{[^}]*text-decoration:underline/i)
// btn-cta has readable foreground/background in dark
expect(css).toMatch(/@media \(prefers-color-scheme: dark\)[\s\S]*\.btn-cta\{[^}]*background:[^;]+;[^}]*color:#fff/i)
})
})
-37
View File
@@ -1,37 +0,0 @@
import { describe, it, expect } from 'vitest'
import { exportPage } from '@/lib/exporter/html'
import { pageSchema, type Page } from '@/lib/schema/page'
function makePage(): Page {
return pageSchema.parse({
title: 'Dark Contrast',
locale: 'en',
theme: { primaryColor: '#2563eb', fontFamily: 'Inter' },
sections: [
{ type: 'hero', props: { heading: 'Welcome', subheading: 'Sub', imageUrl: 'https://img.example/h.png' } },
{ type: 'faq', props: { items: [{ q: 'Q', a: 'A' }] } },
{ type: 'cta', props: { text: 'Go', href: '#' } },
],
form: { actionUrl: '', fields: [], spamProtection: { honeypotFieldName: '_hp', minSubmitSeconds: 2 } },
seo: { title: 't', description: 'd' },
})
}
describe('Exporter - dark mode contrast tokens', () => {
it('includes dark mode tokens that improve contrast for links/buttons/faq text', () => {
const out = exportPage(makePage())
const css = out.css
// dark mode block exists
expect(css).toMatch(/@media \(prefers-color-scheme: dark\)/)
// link color token in dark
expect(css).toMatch(/@media \(prefers-color-scheme: dark\)[\s\S]*a\{[^}]*color:#93c5fd/i)
// button keeps readable foreground/background in dark
expect(css).toMatch(/@media \(prefers-color-scheme: dark\)[\s\S]*button\{[^}]*background:[^;]+;[^}]*color:#fff/i)
// faq answer text brighter in dark
expect(css).toMatch(/@media \(prefers-color-scheme: dark\)[\s\S]*\.faq-a\{[^}]*color:#cbd5e1/i)
})
})
-31
View File
@@ -1,31 +0,0 @@
import { describe, it, expect } from 'vitest'
import { exportPage } from '@/lib/exporter/html'
import { pageSchema, type Page } from '@/lib/schema/page'
function makePage(overrides: Partial<Page> = {}): Page {
const base: Page = {
title: 'Hero Edge',
locale: 'en',
theme: { primaryColor: '#2563eb', fontFamily: 'Inter' },
sections: [
{ type: 'hero', props: { heading: 'Welcome', subheading: ' ', imageUrl: 'https://img.example/h.png' } },
] as Page['sections'],
form: { actionUrl: '', fields: [], spamProtection: { honeypotFieldName: '_hp', minSubmitSeconds: 2 } },
analytics: { ga4MeasurementId: '', metaPixelId: '', customHeadHtml: '' },
seo: { title: 't', description: 'd' },
}
return pageSchema.parse({ ...base, ...overrides })
}
describe('Exporter - hero edge cases', () => {
it('omits subheading when whitespace-only', () => {
const out = exportPage(makePage())
expect(out.html).toContain('<h1 id="hero-heading">Welcome</h1>')
expect(out.html).not.toMatch(/<div class="text">[\s\S]*<p>\s*<\/p>/)
})
it('trims subheading content', () => {
const out = exportPage(makePage({ sections: [ { type: 'hero', props: { heading: 'Welcome', subheading: ' Hello world ', imageUrl: 'https://img.example/h.png' } } ] as Page['sections'] }))
expect(out.html).toContain('<p>Hello world</p>')
})
})
+15 -33
View File
@@ -5,12 +5,7 @@ export type Exported = { html: string; css: string; js: string }
export type ExportOptions = { assetManager?: AssetManager }
function renderFaq(section: { props: { items: Array<{ q: string; a: string }> } }) {
const itemsRaw: Array<{ q: string; a: string }> = Array.isArray(section.props.items) ? section.props.items : []
const isBlank = (s: string | undefined | null) => !s || s.trim().length === 0
const items = itemsRaw
.map((it) => ({ q: (it.q || '').trim(), a: (it.a || '').trim() }))
// drop when both question and answer are blank
.filter((it) => !(isBlank(it.q) && isBlank(it.a)))
const items: Array<{ q: string; a: string }> = Array.isArray(section.props.items) ? section.props.items : []
return `
<section class="faq" aria-labelledby="faq-heading">
<div class="container">
@@ -32,9 +27,7 @@ function renderFaq(section: { props: { items: Array<{ q: string; a: string }> }
}
function renderFeatures(section: { props: { items: string[] } }) {
const items: string[] = (Array.isArray(section.props?.items) ? section.props.items : [])
.map((s) => String(s ?? '').trim())
.filter((s) => s.length > 0)
const items: string[] = Array.isArray(section.props?.items) ? section.props.items : []
return `
<section class="features" aria-labelledby="features-heading">
<div class="container">
@@ -48,9 +41,7 @@ function renderFeatures(section: { props: { items: string[] } }) {
}
function renderBenefits(section: { props: { items: string[] } }) {
const items: string[] = (Array.isArray(section.props?.items) ? section.props.items : [])
.map((s) => String(s ?? '').trim())
.filter((s) => s.length > 0)
const items: string[] = Array.isArray(section.props?.items) ? section.props.items : []
return `
<section class="benefits" aria-labelledby="benefits-heading">
<div class="container">
@@ -64,12 +55,9 @@ function renderBenefits(section: { props: { items: string[] } }) {
}
function renderTestimonials(section: { props: { items: Array<{ author: string; quote: string }> } }) {
const items: Array<{ author: string; quote: string }> = (Array.isArray(section.props?.items)
const items: Array<{ author: string; quote: string }> = Array.isArray(section.props?.items)
? section.props.items
: [])
.map((it) => ({ author: (it.author || '').trim(), quote: (it.quote || '').trim() }))
// drop when both are blank
.filter((it) => !(it.author.length === 0 && it.quote.length === 0))
: []
return `
<section class="testimonials" aria-labelledby="testimonials-heading">
<div class="container">
@@ -78,8 +66,8 @@ function renderTestimonials(section: { props: { items: Array<{ author: string; q
.map(
(it) => `
<figure class="testimonial">
<blockquote>“${escapeHtml(it.quote)}”</blockquote>
${it.author.length > 0 ? `<figcaption>— ${escapeHtml(it.author)}</figcaption>` : ''}
<blockquote>“${escapeHtml(it.quote || '')}”</blockquote>
<figcaption>— ${escapeHtml(it.author || '')}</figcaption>
</figure>`
)
.join('')}
@@ -89,9 +77,7 @@ function renderTestimonials(section: { props: { items: Array<{ author: string; q
}
function renderCta(section: { props: { text: string; href?: string } }) {
const href = section.props.href
const text = (section.props.text || '').trim()
if (text.length === 0) return ''
const { text, href } = section.props
return `
<section class="cta" aria-labelledby="cta-heading">
<div class="container">
@@ -110,9 +96,7 @@ const escapeHtml = (s: string) =>
.replaceAll('"', '&quot;')
function renderHero(section: { props: { heading: string; subheading?: string; imageUrl: string } }, opts?: ExportOptions) {
const { heading } = section.props
const subheadingRaw = section.props.subheading
const subheading = subheadingRaw ? subheadingRaw.trim() : ''
const { heading, subheading } = section.props
const am = opts?.assetManager
const imageUrlRaw: string = section.props.imageUrl
const imageUrl = am ? am.rewriteUrl(imageUrlRaw) : imageUrlRaw
@@ -121,7 +105,7 @@ function renderHero(section: { props: { heading: string; subheading?: string; im
<div class="container">
<div class="text">
<h1 id="hero-heading">${escapeHtml(heading)}</h1>
${subheading.length > 0 ? `<p>${escapeHtml(subheading)}</p>` : ''}
${subheading ? `<p>${escapeHtml(subheading)}</p>` : ''}
</div>
<div class="media">
<img src="${escapeHtml(imageUrl)}" alt="${escapeHtml(heading)}" loading="lazy" decoding="async" />
@@ -278,20 +262,18 @@ function buildCss(page: Page) {
button:focus, a:focus, input:focus, select:focus, textarea:focus{ outline: 3px solid #2563eb; outline-offset:2px }
.faq-list{ list-style:none; padding:0; margin:0 }
.faq-item{ margin: .75rem 0 }
.faq-q{ font-size: 1rem; font-weight:600; overflow-wrap:anywhere }
.faq-a{ color:#334155; overflow-wrap:anywhere }
.faq-q{ font-size: 1rem; font-weight:600; }
.faq-a{ color:#334155 }
.btn-cta{ background: var(--primary); color:#fff; padding:.75rem 1rem; border-radius:.5rem; display:inline-block; text-decoration:none }
.features{ background:#f8fafc }
.features-list{ list-style:none; padding:0; margin:0; display:grid; grid-template-columns: repeat(auto-fit, minmax(200px, 1fr)); gap: .75rem }
.feature-item{ background:#fff; border:1px solid #e2e8f0; border-radius:.5rem; padding:.75rem; overflow-wrap:anywhere }
.benefits-list{ list-style:none; padding:0; margin:0 }
.benefit-item{ overflow-wrap:anywhere }
.feature-item{ background:#fff; border:1px solid #e2e8f0; border-radius:.5rem; padding:.75rem }
.testimonials{ background:#ffffff }
.testimonial{ border-left:4px solid var(--primary); padding:.5rem 1rem; margin: .75rem 0; background:#fefefe }
.testimonial blockquote{ margin:0; font-style:italic; color:#1f2937; overflow-wrap:anywhere }
.testimonial blockquote{ margin:0; font-style:italic; color:#1f2937 }
.testimonial figcaption{ color:#475569; margin-top:.25rem }
@media (max-width: 640px){ .container{ padding: 1rem } h1{ font-size: 1.5rem } }
@media (prefers-color-scheme: dark){ body{ color:#e5e7eb; background:#0b1020 } .feature-item{ background:#0f172a; border-color:#1f2937 } a{ color:#93c5fd } a:hover{ text-decoration:underline } button{ background: var(--primary); color:#fff } .btn-cta{ background: var(--primary); color:#fff } .faq-a{ color:#cbd5e1 } }
@media (prefers-color-scheme: dark){ body{ color:#e5e7eb; background:#0b1020 } .feature-item{ background:#0f172a; border-color:#1f2937 } }
@media (prefers-reduced-motion: reduce){ *{ transition: none !important; animation: none !important } }
`
}
-57
View File
@@ -1,57 +0,0 @@
import { describe, it, expect } from 'vitest'
import { exportPage } from '@/lib/exporter/html'
import { pageSchema, type Page } from '@/lib/schema/page'
function makePage(overrides: Partial<Page> = {}): Page {
const base: Page = {
title: 'Edge',
locale: 'en',
theme: { primaryColor: '#2563eb', fontFamily: 'Inter' },
sections: [
{ type: 'features', props: { items: ['One', ' ', ' ', 'Two'] } },
{ type: 'benefits', props: { items: ['A', ' ', ' ', 'B'] } },
{ type: 'faq', props: { items: [
{ q: ' ', a: ' ' },
{ q: 'Valid Q', a: ' ' },
{ q: 'Another', a: 'Answer' },
] } },
{ type: 'testimonials', props: { items: [
{ author: ' ', quote: ' ' },
{ author: 'Jane', quote: ' Great product ' },
] } },
] as Page['sections'],
form: { actionUrl: '', fields: [], spamProtection: { honeypotFieldName: '_hp', minSubmitSeconds: 2 } },
analytics: { ga4MeasurementId: '', metaPixelId: '', customHeadHtml: '' },
seo: { title: 't', description: 'd' },
}
return pageSchema.parse({ ...base, ...overrides })
}
describe('Exporter - sections edge cases', () => {
it('filters out whitespace-only items and keeps valid ones', () => {
const out = exportPage(makePage())
const html = out.html
// features: only One, Two
expect(html).toContain('<li class="feature-item">One</li>')
expect(html).toContain('<li class="feature-item">Two</li>')
expect(html).not.toMatch(/<li class="feature-item"><\/li>/)
// benefits: only A, B
expect(html).toContain('<li class="benefit-item">A</li>')
expect(html).toContain('<li class="benefit-item">B</li>')
// faq: drop fully empty, keep items even if answer empty when question is valid
expect(html).toContain('<h3 class="faq-q">Valid Q</h3>')
// testimonials: drop fully empty, keep trimmed quote
expect(html).toContain('<blockquote>“Great product”</blockquote>')
})
it('adds word-break tokens to avoid overflow for long words', () => {
const out = exportPage(makePage())
const css = out.css
expect(css).toMatch(/\.feature-item\{[\s\S]*(?:word-break:break-word|overflow-wrap:anywhere)/i)
expect(css).toMatch(/\.benefit-item\{[\s\S]*(?:word-break:break-word|overflow-wrap:anywhere)/i)
expect(css).toMatch(/\.testimonial blockquote\{[\s\S]*(?:word-break:break-word|overflow-wrap:anywhere)/i)
})
})
-40
View File
@@ -1,40 +0,0 @@
import { describe, it, expect } from 'vitest'
import { exportPage } from '@/lib/exporter/html'
import { pageSchema, type Page } from '@/lib/schema/page'
function makePage(overrides: Partial<Page> = {}): Page {
const base: Page = {
title: 'Edge P3',
locale: 'en',
theme: { primaryColor: '#2563eb', fontFamily: 'Inter' },
sections: [
{ type: 'faq', props: { items: [ { q: 'VeryVeryVeryVeryVeryLongWordWithoutSpaces', a: 'AnotherSuperLongUnbreakableWord' } ] } },
{ type: 'testimonials', props: { items: [
{ author: ' ', quote: 'Great!' },
{ author: 'Alice', quote: 'Nice' },
] } },
] as Page['sections'],
form: { actionUrl: '', fields: [], spamProtection: { honeypotFieldName: '_hp', minSubmitSeconds: 2 } },
analytics: { ga4MeasurementId: '', metaPixelId: '', customHeadHtml: '' },
seo: { title: 't', description: 'd' },
}
return pageSchema.parse({ ...base, ...overrides })
}
describe('Exporter - phase3 edge cases', () => {
it('omits testimonial author line when author is blank', () => {
const out = exportPage(makePage())
const html = out.html
// First item author blank -> no figcaption for that blockquote
expect(html).toMatch(/<blockquote>“Great!\”<\/blockquote>[\s\S]*?<\/figure>/)
// Ensure the next item with author renders figcaption
expect(html).toMatch(/<figcaption>— Alice<\/figcaption>/)
})
it('adds word-break/overflow-wrap for FAQ q/a to avoid overflow', () => {
const out = exportPage(makePage())
const css = out.css
expect(css).toMatch(/\.faq-q\{[\s\S]*(?:overflow-wrap:anywhere|word-break:break-word)/i)
expect(css).toMatch(/\.faq-a\{[\s\S]*(?:overflow-wrap:anywhere|word-break:break-word)/i)
})
})