Compare commits
18 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8ad3a9e677 | |||
| 678b081364 | |||
| 46a9c5c83d | |||
| 6c86e1cf85 | |||
| a16541e90d | |||
| aaea43f2cc | |||
| 3f7bf3f1c8 | |||
| bc29faf60c | |||
| 4b9627d4ee | |||
| 26a3b43d28 | |||
| a476756a6c | |||
| 6ff27295e6 | |||
| 8d5501d927 | |||
| cd8ae32203 | |||
| 7110db8a4a | |||
| 7b36e14b65 | |||
| 32a760dd9a | |||
| 3d2f1dc8d4 |
@@ -20,9 +20,18 @@ jobs:
|
|||||||
echo "CI_TOKEN not set; skipping labeling"; exit 0; fi
|
echo "CI_TOKEN not set; skipping labeling"; exit 0; fi
|
||||||
OWNER=$(echo "$REPO" | cut -d'/' -f1)
|
OWNER=$(echo "$REPO" | cut -d'/' -f1)
|
||||||
NAME=$(echo "$REPO" | cut -d'/' -f2)
|
NAME=$(echo "$REPO" | cut -d'/' -f2)
|
||||||
echo "Labeling PR #$PR_NUMBER on $OWNER/$NAME with 'automerge'"
|
echo "Resolving existing label id for 'automerge' in $OWNER/$NAME (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
|
||||||
|
# Extract all ids whose name == automerge, prefer the smallest id (oldest)
|
||||||
|
LID=$(tr '\n' ' ' < /tmp/labels.json | \
|
||||||
|
grep -o '"id":[0-9][0-9]*[^\}]*"name":"automerge"' | \
|
||||||
|
sed -E 's/.*"id":([0-9]+).*/\1/' | sort -n | head -n1 || true)
|
||||||
|
if [ -z "${LID:-}" ]; then
|
||||||
|
echo "No existing 'automerge' label found; skipping labeling"; exit 0; fi
|
||||||
|
echo "Labeling PR #$PR_NUMBER with id $LID"
|
||||||
curl -sS -X POST \
|
curl -sS -X POST \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-H "Authorization: token ${CI_TOKEN}" \
|
-H "Authorization: token ${CI_TOKEN}" \
|
||||||
"${GITEA_BASE_URL}/api/v1/repos/${OWNER}/${NAME}/issues/${PR_NUMBER}/labels" \
|
"${GITEA_BASE_URL}/api/v1/repos/${OWNER}/${NAME}/issues/${PR_NUMBER}/labels" \
|
||||||
-d '["automerge"]' || true
|
-d '{"labels":['"${LID}"']}' || true
|
||||||
|
|||||||
@@ -55,12 +55,22 @@ jobs:
|
|||||||
done
|
done
|
||||||
|
|
||||||
if [ -n "${PR_NUMBER:-}" ]; then
|
if [ -n "${PR_NUMBER:-}" ]; then
|
||||||
echo "Adding 'automerge' label to PR #$PR_NUMBER"
|
echo "Resolving existing label id for 'automerge' in $OWNER/$NAME (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 | \
|
||||||
|
grep -o '"id":[0-9][0-9]*[^\}]*"name":"automerge"' | \
|
||||||
|
sed -E 's/.*"id":([0-9]+).*/\1/' | sort -n | head -n1 || true)
|
||||||
|
if [ -n "${LID:-}" ]; then
|
||||||
|
echo "Adding 'automerge' (id=$LID) label to PR #$PR_NUMBER"
|
||||||
curl -sS -X POST \
|
curl -sS -X POST \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-H "Authorization: token ${CI_TOKEN}" \
|
-H "Authorization: token ${CI_TOKEN}" \
|
||||||
"${GITEA_BASE_URL}/api/v1/repos/${OWNER}/${NAME}/issues/${PR_NUMBER}/labels" \
|
"${GITEA_BASE_URL}/api/v1/repos/${OWNER}/${NAME}/issues/${PR_NUMBER}/labels" \
|
||||||
-d '["automerge"]' || true
|
-d '{"labels":['"${LID}"']}' || true
|
||||||
else
|
else
|
||||||
echo "PR number could not be determined after retries; skipping label add"
|
echo "No existing 'automerge' label found; skipping label add"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "PR number could not be determined; skipping label add"
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
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>')
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
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)
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
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)
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
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>')
|
||||||
|
})
|
||||||
|
})
|
||||||
+33
-15
@@ -5,7 +5,12 @@ export type Exported = { html: string; css: string; js: string }
|
|||||||
export type ExportOptions = { assetManager?: AssetManager }
|
export type ExportOptions = { assetManager?: AssetManager }
|
||||||
|
|
||||||
function renderFaq(section: { props: { items: Array<{ q: string; a: string }> } }) {
|
function renderFaq(section: { props: { items: Array<{ q: string; a: string }> } }) {
|
||||||
const items: Array<{ q: string; a: string }> = Array.isArray(section.props.items) ? section.props.items : []
|
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)))
|
||||||
return `
|
return `
|
||||||
<section class="faq" aria-labelledby="faq-heading">
|
<section class="faq" aria-labelledby="faq-heading">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
@@ -27,7 +32,9 @@ function renderFaq(section: { props: { items: Array<{ q: string; a: string }> }
|
|||||||
}
|
}
|
||||||
|
|
||||||
function renderFeatures(section: { props: { items: string[] } }) {
|
function renderFeatures(section: { props: { items: string[] } }) {
|
||||||
const items: string[] = Array.isArray(section.props?.items) ? section.props.items : []
|
const items: string[] = (Array.isArray(section.props?.items) ? section.props.items : [])
|
||||||
|
.map((s) => String(s ?? '').trim())
|
||||||
|
.filter((s) => s.length > 0)
|
||||||
return `
|
return `
|
||||||
<section class="features" aria-labelledby="features-heading">
|
<section class="features" aria-labelledby="features-heading">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
@@ -41,7 +48,9 @@ function renderFeatures(section: { props: { items: string[] } }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function renderBenefits(section: { props: { items: string[] } }) {
|
function renderBenefits(section: { props: { items: string[] } }) {
|
||||||
const items: string[] = Array.isArray(section.props?.items) ? section.props.items : []
|
const items: string[] = (Array.isArray(section.props?.items) ? section.props.items : [])
|
||||||
|
.map((s) => String(s ?? '').trim())
|
||||||
|
.filter((s) => s.length > 0)
|
||||||
return `
|
return `
|
||||||
<section class="benefits" aria-labelledby="benefits-heading">
|
<section class="benefits" aria-labelledby="benefits-heading">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
@@ -55,9 +64,12 @@ function renderBenefits(section: { props: { items: string[] } }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function renderTestimonials(section: { props: { items: Array<{ author: string; quote: 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
|
? 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 `
|
return `
|
||||||
<section class="testimonials" aria-labelledby="testimonials-heading">
|
<section class="testimonials" aria-labelledby="testimonials-heading">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
@@ -66,8 +78,8 @@ function renderTestimonials(section: { props: { items: Array<{ author: string; q
|
|||||||
.map(
|
.map(
|
||||||
(it) => `
|
(it) => `
|
||||||
<figure class="testimonial">
|
<figure class="testimonial">
|
||||||
<blockquote>“${escapeHtml(it.quote || '')}”</blockquote>
|
<blockquote>“${escapeHtml(it.quote)}”</blockquote>
|
||||||
<figcaption>— ${escapeHtml(it.author || '')}</figcaption>
|
${it.author.length > 0 ? `<figcaption>— ${escapeHtml(it.author)}</figcaption>` : ''}
|
||||||
</figure>`
|
</figure>`
|
||||||
)
|
)
|
||||||
.join('')}
|
.join('')}
|
||||||
@@ -77,7 +89,9 @@ function renderTestimonials(section: { props: { items: Array<{ author: string; q
|
|||||||
}
|
}
|
||||||
|
|
||||||
function renderCta(section: { props: { text: string; href?: string } }) {
|
function renderCta(section: { props: { text: string; href?: string } }) {
|
||||||
const { text, href } = section.props
|
const href = section.props.href
|
||||||
|
const text = (section.props.text || '').trim()
|
||||||
|
if (text.length === 0) return ''
|
||||||
return `
|
return `
|
||||||
<section class="cta" aria-labelledby="cta-heading">
|
<section class="cta" aria-labelledby="cta-heading">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
@@ -96,7 +110,9 @@ const escapeHtml = (s: string) =>
|
|||||||
.replaceAll('"', '"')
|
.replaceAll('"', '"')
|
||||||
|
|
||||||
function renderHero(section: { props: { heading: string; subheading?: string; imageUrl: string } }, opts?: ExportOptions) {
|
function renderHero(section: { props: { heading: string; subheading?: string; imageUrl: string } }, opts?: ExportOptions) {
|
||||||
const { heading, subheading } = section.props
|
const { heading } = section.props
|
||||||
|
const subheadingRaw = section.props.subheading
|
||||||
|
const subheading = subheadingRaw ? subheadingRaw.trim() : ''
|
||||||
const am = opts?.assetManager
|
const am = opts?.assetManager
|
||||||
const imageUrlRaw: string = section.props.imageUrl
|
const imageUrlRaw: string = section.props.imageUrl
|
||||||
const imageUrl = am ? am.rewriteUrl(imageUrlRaw) : imageUrlRaw
|
const imageUrl = am ? am.rewriteUrl(imageUrlRaw) : imageUrlRaw
|
||||||
@@ -105,7 +121,7 @@ function renderHero(section: { props: { heading: string; subheading?: string; im
|
|||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="text">
|
<div class="text">
|
||||||
<h1 id="hero-heading">${escapeHtml(heading)}</h1>
|
<h1 id="hero-heading">${escapeHtml(heading)}</h1>
|
||||||
${subheading ? `<p>${escapeHtml(subheading)}</p>` : ''}
|
${subheading.length > 0 ? `<p>${escapeHtml(subheading)}</p>` : ''}
|
||||||
</div>
|
</div>
|
||||||
<div class="media">
|
<div class="media">
|
||||||
<img src="${escapeHtml(imageUrl)}" alt="${escapeHtml(heading)}" loading="lazy" decoding="async" />
|
<img src="${escapeHtml(imageUrl)}" alt="${escapeHtml(heading)}" loading="lazy" decoding="async" />
|
||||||
@@ -262,18 +278,20 @@ function buildCss(page: Page) {
|
|||||||
button:focus, a:focus, input:focus, select:focus, textarea:focus{ outline: 3px solid #2563eb; outline-offset:2px }
|
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-list{ list-style:none; padding:0; margin:0 }
|
||||||
.faq-item{ margin: .75rem 0 }
|
.faq-item{ margin: .75rem 0 }
|
||||||
.faq-q{ font-size: 1rem; font-weight:600; }
|
.faq-q{ font-size: 1rem; font-weight:600; overflow-wrap:anywhere }
|
||||||
.faq-a{ color:#334155 }
|
.faq-a{ color:#334155; overflow-wrap:anywhere }
|
||||||
.btn-cta{ background: var(--primary); color:#fff; padding:.75rem 1rem; border-radius:.5rem; display:inline-block; text-decoration:none }
|
.btn-cta{ background: var(--primary); color:#fff; padding:.75rem 1rem; border-radius:.5rem; display:inline-block; text-decoration:none }
|
||||||
.features{ background:#f8fafc }
|
.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 }
|
.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 }
|
.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 }
|
||||||
.testimonials{ background:#ffffff }
|
.testimonials{ background:#ffffff }
|
||||||
.testimonial{ border-left:4px solid var(--primary); padding:.5rem 1rem; margin: .75rem 0; background:#fefefe }
|
.testimonial{ border-left:4px solid var(--primary); padding:.5rem 1rem; margin: .75rem 0; background:#fefefe }
|
||||||
.testimonial blockquote{ margin:0; font-style:italic; color:#1f2937 }
|
.testimonial blockquote{ margin:0; font-style:italic; color:#1f2937; overflow-wrap:anywhere }
|
||||||
.testimonial figcaption{ color:#475569; margin-top:.25rem }
|
.testimonial figcaption{ color:#475569; margin-top:.25rem }
|
||||||
@media (max-width: 640px){ .container{ padding: 1rem } h1{ font-size: 1.5rem } }
|
@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 } }
|
@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-reduced-motion: reduce){ *{ transition: none !important; animation: none !important } }
|
@media (prefers-reduced-motion: reduce){ *{ transition: none !important; animation: none !important } }
|
||||||
`
|
`
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,57 @@
|
|||||||
|
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)
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
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)
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -5,6 +5,8 @@ export type BuildZipInput = {
|
|||||||
css: string
|
css: string
|
||||||
js: string
|
js: string
|
||||||
assets?: Record<string, Uint8Array>
|
assets?: Record<string, Uint8Array>
|
||||||
|
// root-level extra files like favicon.ico, site.webmanifest, robots.txt
|
||||||
|
extras?: Record<string, Uint8Array>
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function buildZip(input: BuildZipInput): Promise<Uint8Array> {
|
export async function buildZip(input: BuildZipInput): Promise<Uint8Array> {
|
||||||
@@ -19,6 +21,22 @@ export async function buildZip(input: BuildZipInput): Promise<Uint8Array> {
|
|||||||
zip.file(path, buf as unknown as Buffer)
|
zip.file(path, buf as unknown as Buffer)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (input.extras) {
|
||||||
|
// validate manifest if present
|
||||||
|
if (Object.prototype.hasOwnProperty.call(input.extras, 'site.webmanifest')) {
|
||||||
|
try {
|
||||||
|
const manifestBytes = input.extras['site.webmanifest']
|
||||||
|
const manifestStr = Buffer.from(manifestBytes).toString('utf8')
|
||||||
|
JSON.parse(manifestStr)
|
||||||
|
} catch {
|
||||||
|
throw new Error('Invalid site.webmanifest JSON')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (const [path, bytes] of Object.entries(input.extras)) {
|
||||||
|
const buf = Buffer.from(bytes)
|
||||||
|
zip.file(path, buf as unknown as Buffer)
|
||||||
|
}
|
||||||
|
}
|
||||||
const content = await zip.generateAsync({ type: 'uint8array' })
|
const content = await zip.generateAsync({ type: 'uint8array' })
|
||||||
return content
|
return content
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,53 @@
|
|||||||
|
import { describe, it, expect } from 'vitest'
|
||||||
|
import JSZip from 'jszip'
|
||||||
|
import { exportPage } from '@/lib/exporter/html'
|
||||||
|
import { buildZip } from '@/lib/exporter/zip'
|
||||||
|
import { AssetManager } from '@/lib/assets/assetManager'
|
||||||
|
import { pageSchema, type Page } from '@/lib/schema/page'
|
||||||
|
|
||||||
|
function makePageWithLocalAsset(): { page: Page; am: AssetManager } {
|
||||||
|
const am = new AssetManager({ maxBytes: 1024 * 1024, allowedExts: ['png','svg','jpg','jpeg','webp'] })
|
||||||
|
// simulate adding a local image and referencing it by original name via local: prefix
|
||||||
|
const bytes = new Uint8Array([7,8,9])
|
||||||
|
// add as "hero.png"
|
||||||
|
am.add({ name: 'hero.png', type: 'image/png', bytes })
|
||||||
|
|
||||||
|
const base: Page = pageSchema.parse({
|
||||||
|
title: 'Integrated ZIP',
|
||||||
|
locale: 'en',
|
||||||
|
theme: { primaryColor: '#2563eb', fontFamily: 'Inter' },
|
||||||
|
sections: [
|
||||||
|
{ type: 'hero', props: { heading: 'Hello', subheading: 'World', imageUrl: 'local:hero.png' } },
|
||||||
|
{ type: 'cta', props: { text: 'Go', href: '#' } },
|
||||||
|
],
|
||||||
|
form: { actionUrl: '', fields: [], spamProtection: { honeypotFieldName: '_hp', minSubmitSeconds: 2 } },
|
||||||
|
analytics: { ga4MeasurementId: 'G-TEST', metaPixelId: '', customHeadHtml: '' },
|
||||||
|
seo: { title: 't', description: 'd' },
|
||||||
|
})
|
||||||
|
return { page: base, am }
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('Export ZIP 통합 검증', () => {
|
||||||
|
it('exportPage 출력 + buildZip 결과에서 assets 경로/메타가 보존된다', async () => {
|
||||||
|
const { page, am } = makePageWithLocalAsset()
|
||||||
|
const out = exportPage(page, { assetManager: am })
|
||||||
|
const assets = am.toZipStructure()
|
||||||
|
const zipBytes = await buildZip({ html: out.html, css: out.css, js: out.js, assets })
|
||||||
|
|
||||||
|
const zip = await JSZip.loadAsync(zipBytes)
|
||||||
|
const names = Object.keys(zip.files)
|
||||||
|
// assets 파일이 존재해야 함
|
||||||
|
const assetKey = Object.keys(assets)[0]
|
||||||
|
expect(names).toContain(assetKey)
|
||||||
|
|
||||||
|
// index.html에 canonical/meta/ga4 스니펫 보존
|
||||||
|
const html = await zip.files['index.html'].async('string')
|
||||||
|
expect(html).toMatch(/<link rel="canonical" href="\//)
|
||||||
|
expect(html).toMatch(/<meta name="description" content="d"/)
|
||||||
|
expect(html).toMatch(/gtag\('config', 'G-TEST'\)/)
|
||||||
|
|
||||||
|
// hero 이미지가 재작성된 경로를 사용한다
|
||||||
|
const match = html.match(/<img[^>]*src="([^"]+)"/)
|
||||||
|
expect(match && match[1]).toBe(assetKey)
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
import { describe, it, expect } from 'vitest'
|
||||||
|
import JSZip from 'jszip'
|
||||||
|
import { buildZip } from '@/lib/exporter/zip'
|
||||||
|
|
||||||
|
describe('Export ZIP 메타 보존 검증', () => {
|
||||||
|
it('index.html의 SEO/OG/Analytics 메타가 그대로 보존된다', async () => {
|
||||||
|
const html = `<!DOCTYPE html><html><head>
|
||||||
|
<meta charset="utf-8" />
|
||||||
|
<link rel="canonical" href="/" />
|
||||||
|
<meta name="description" content="desc" />
|
||||||
|
<meta property="og:title" content="OT" />
|
||||||
|
<meta property="og:description" content="OD" />
|
||||||
|
<script>window.dataLayer=[];function gtag(){dataLayer.push(arguments);}gtag('js',new Date());</script>
|
||||||
|
</head><body>ok</body></html>`
|
||||||
|
const css = 'body{color:#222}'
|
||||||
|
const js = 'console.log("ok")'
|
||||||
|
|
||||||
|
const zipBytes = await buildZip({ html, css, js, assets: {} })
|
||||||
|
const zip = await JSZip.loadAsync(zipBytes)
|
||||||
|
const htmlContent = await zip.files['index.html'].async('string')
|
||||||
|
|
||||||
|
expect(htmlContent).toMatch(/<link rel="canonical" href="\//)
|
||||||
|
expect(htmlContent).toMatch(/<meta name="description" content="desc"/)
|
||||||
|
expect(htmlContent).toMatch(/<meta property="og:title" content="OT"/)
|
||||||
|
expect(htmlContent).toMatch(/<meta property="og:description" content="OD"/)
|
||||||
|
expect(htmlContent).toMatch(/window\.dataLayer=\[\];/)
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
import { describe, it, expect } from 'vitest'
|
||||||
|
import JSZip from 'jszip'
|
||||||
|
import { buildZip } from '@/lib/exporter/zip'
|
||||||
|
import type { BuildZipInput } from '@/lib/exporter/zip'
|
||||||
|
|
||||||
|
const TE = new TextEncoder()
|
||||||
|
|
||||||
|
describe('Export ZIP 검증 강화 4차: 루트 파일(favicon/manifest/robots)', () => {
|
||||||
|
it('루트 파일들을 포함한다: favicon.ico / site.webmanifest / robots.txt', async () => {
|
||||||
|
const manifest = {
|
||||||
|
name: 'Landing Builder',
|
||||||
|
short_name: 'LB',
|
||||||
|
start_url: '/',
|
||||||
|
display: 'standalone',
|
||||||
|
icons: [{ src: '/favicon.png', sizes: '512x512', type: 'image/png' }],
|
||||||
|
}
|
||||||
|
const input: BuildZipInput = {
|
||||||
|
html: '<!DOCTYPE html><html><head><title>a</title></head><body>ok</body></html>',
|
||||||
|
css: 'body{color:#111}',
|
||||||
|
js: 'console.log("ok")',
|
||||||
|
assets: {},
|
||||||
|
extras: {
|
||||||
|
'favicon.ico': new Uint8Array([0, 1, 2, 3]),
|
||||||
|
'site.webmanifest': TE.encode(JSON.stringify(manifest)),
|
||||||
|
'robots.txt': TE.encode('User-agent: *\nDisallow:'),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
const zipBytes = await buildZip(input)
|
||||||
|
|
||||||
|
const zip = await JSZip.loadAsync(zipBytes)
|
||||||
|
const names = Object.keys(zip.files)
|
||||||
|
expect(names).toContain('favicon.ico')
|
||||||
|
expect(names).toContain('site.webmanifest')
|
||||||
|
expect(names).toContain('robots.txt')
|
||||||
|
|
||||||
|
const robots = await zip.files['robots.txt'].async('string')
|
||||||
|
expect(robots).toMatch(/User-agent: \*/)
|
||||||
|
|
||||||
|
const parsed = JSON.parse(await zip.files['site.webmanifest'].async('string'))
|
||||||
|
expect(parsed.name).toBe('Landing Builder')
|
||||||
|
expect(parsed.icons[0].type).toBe('image/png')
|
||||||
|
})
|
||||||
|
|
||||||
|
it('잘못된 manifest JSON이면 실패한다', async () => {
|
||||||
|
const badInput: BuildZipInput = {
|
||||||
|
html: '<!DOCTYPE html><html><head><title>a</title></head><body>ok</body></html>',
|
||||||
|
css: 'body{color:#111}',
|
||||||
|
js: 'console.log("ok")',
|
||||||
|
extras: { 'site.webmanifest': TE.encode('{ invalid json') },
|
||||||
|
}
|
||||||
|
await expect(buildZip(badInput)).rejects.toThrow()
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
import { describe, it, expect } from 'vitest'
|
||||||
|
import JSZip from 'jszip'
|
||||||
|
import { buildZip } from '@/lib/exporter/zip'
|
||||||
|
|
||||||
|
const TE = new TextEncoder()
|
||||||
|
|
||||||
|
describe('Export ZIP 검증 강화', () => {
|
||||||
|
it('assets가 비어있을 때 index.html/styles.css/app.js만 포함한다', async () => {
|
||||||
|
const zipBytes = await buildZip({
|
||||||
|
html: '<!DOCTYPE html><html><head><title>a</title></head><body>ok</body></html>',
|
||||||
|
css: 'body{color:#111}',
|
||||||
|
js: 'console.log("ok")',
|
||||||
|
assets: {},
|
||||||
|
})
|
||||||
|
const zip = await JSZip.loadAsync(zipBytes)
|
||||||
|
const names = Object.keys(zip.files).sort()
|
||||||
|
expect(names).toEqual(['app.js','index.html','styles.css'])
|
||||||
|
})
|
||||||
|
|
||||||
|
it('assets가 있으면 모든 파일을 그대로 포함한다(서브폴더 포함)', async () => {
|
||||||
|
const assets = {
|
||||||
|
'assets/img/logo.png': new Uint8Array([0,1,2,3]),
|
||||||
|
'assets/svg/icon.svg': TE.encode('<svg></svg>'),
|
||||||
|
'assets/fonts/inter.woff2': new Uint8Array([4,5,6]),
|
||||||
|
}
|
||||||
|
const zipBytes = await buildZip({
|
||||||
|
html: '<!DOCTYPE html><html><head><title>a</title></head><body>ok</body></html>',
|
||||||
|
css: 'body{color:#111}',
|
||||||
|
js: 'console.log("ok")',
|
||||||
|
assets,
|
||||||
|
})
|
||||||
|
const zip = await JSZip.loadAsync(zipBytes)
|
||||||
|
const names = Object.keys(zip.files)
|
||||||
|
expect(names).toContain('index.html')
|
||||||
|
expect(names).toContain('styles.css')
|
||||||
|
expect(names).toContain('app.js')
|
||||||
|
expect(names).toContain('assets/img/logo.png')
|
||||||
|
expect(names).toContain('assets/svg/icon.svg')
|
||||||
|
expect(names).toContain('assets/fonts/inter.woff2')
|
||||||
|
|
||||||
|
const logo = await zip.files['assets/img/logo.png'].async('uint8array')
|
||||||
|
expect(Array.from(logo)).toEqual([0,1,2,3])
|
||||||
|
})
|
||||||
|
})
|
||||||
Reference in New Issue
Block a user