orga-build 0.9.0 → 0.10.0

package/lib/__tests__/build.test.js

@@ -3,12 +3,33 @@ import fs from 'node:fs/promises'
 import path from 'node:path'
 import { after, before, describe, test } from 'node:test'
 import { fileURLToPath } from 'node:url'
+import { createBuilder } from 'vite'
 import { build } from '../build.js'
+import { renderPageHtml } from '../html.js'
+import { orgaBuildPlugin } from '../plugin.js'
+import { writeIslandFixture } from './fixtures.js'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 const fixtureDir = path.join(__dirname, 'fixtures')
 const outDir = path.join(__dirname, '.test-output')
 
+/**
+ * Build `dir` with plain Vite and only `orgaBuildPlugin`, as a
+ * `vite.config.js` would, without the orga-build CLI.
+ * @param {string} dir
+ * @param {import('vite').InlineConfig} [config]
+ */
+async function viteBuild(dir, config = {}) {
+	const builder = await createBuilder({
+		root: dir,
+		configFile: false,
+		logLevel: 'silent',
+		plugins: orgaBuildPlugin({ root: dir }),
+		...config
+	})
+	await builder.buildApp()
+}
+
 function markCodeBlocks() {
 	/**
 	 * @param {any} tree
@@ -41,6 +62,8 @@ Here's [[file:./docs/index.org][index page]].
 
 Here's [[file:more.org][another page]].
 
+Jump to [[*Hello World][the top]], [[file:more.org::*Some Heading][a heading]] or [[file:./docs/index.org::#cid][an anchor]].
+
 Here's [[mailto:hi@unclex.net][send me an email]].
 `
 		)
@@ -78,9 +101,7 @@ export function GET() {
 			root: fixtureDir,
 			outDir: outDir,
 			containerClass: [],
-			vitePlugins: [],
-			preBuild: [],
-			postBuild: []
+			vitePlugins: []
 		})
 
 		// Check output exists
@@ -100,19 +121,87 @@ export function GET() {
 			'should rewrite docs/index.org to /docs'
 		)
 		assert.ok(html.includes('href="/more"'), 'should rewrite more.org to /more')
+		assert.ok(html.includes('<h1 id="hello-world">'), 'should id headings')
+		assert.ok(html.includes('href="#hello-world"'), 'should link in page')
+		assert.ok(
+			html.includes('href="/more#some-heading"'),
+			'should keep heading search as fragment'
+		)
+		assert.ok(
+			html.includes('href="/docs#cid"'),
+			'should keep custom-id search as fragment'
+		)
 		assert.ok(
 			html.includes('href="mailto:hi@unclex.net"'),
 			'should keep mailto protocol in href'
 		)
 	})
 
-	test('generates assets directory', async () => {
-		const assetsDir = path.join(outDir, 'assets')
-		const assetsExists = await fs
-			.access(assetsDir)
-			.then(() => true)
-			.catch(() => false)
-		assert.ok(assetsExists, 'assets directory should exist')
+	test('ships no JavaScript without islands', async () => {
+		const html = await fs.readFile(path.join(outDir, 'index.html'), 'utf-8')
+		assert.ok(!html.includes('<script'), html)
+	})
+
+	test("hydrates 'use client' components as islands", async () => {
+		const dir = path.join(__dirname, 'fixtures-islands')
+		try {
+			await writeIslandFixture(dir)
+			await viteBuild(dir)
+
+			const html = await fs.readFile(
+				path.join(dir, 'dist', 'index.html'),
+				'utf-8'
+			)
+			const island = html.match(/<orga-island ([^>]+)>/)?.[1] ?? ''
+			const islandSrc = island.match(/src="([^"]+)"/)?.[1] ?? ''
+			assert.match(islandSrc, /^\/assets\/.+\.js$/)
+			assert.match(island, /export="Counter"/)
+			assert.match(island, /props="{&quot;start&quot;:1}"/)
+			assert.match(island, /client="load"/)
+			assert.match(island, /prefix="island-0-"/)
+			assert.match(
+				html,
+				/<button id="[^"]*island-0-[^"]*">1<\/button>/,
+				'island is prerendered with its own useId prefix'
+			)
+			const chunk = await fs.readFile(
+				path.join(dir, 'dist', islandSrc),
+				'utf-8'
+			)
+			assert.match(chunk, /\bCounter\b/, 'island chunk keeps its exports')
+
+			const script =
+				html.match(/<script type="module" src="([^"]*island[^"]*\.js)"/)?.[1] ??
+				''
+			assert.match(script, /^\/assets\//, html)
+			await fs.access(path.join(dir, 'dist', script))
+
+			const nested = await fs.readFile(
+				path.join(dir, 'dist', 'docs', 'index.html'),
+				'utf-8'
+			)
+			assert.match(nested, /<orga-island [^>]*client="visible"/)
+			assert.match(
+				nested,
+				/<orga-island [^>]*export="MemoCounter" props="{&quot;start&quot;:3,&quot;meta&quot;:{&quot;children&quot;:\[&quot;a&quot;\]}}"/,
+				'nested `children` keys are data; undefined is dropped'
+			)
+
+			const plain = await fs.readFile(
+				path.join(dir, 'dist', 'plain', 'index.html'),
+				'utf-8'
+			)
+			assert.ok(!plain.includes('<script'), 'pages without islands stay static')
+
+			const page = await fs.readFile(
+				path.join(dir, 'dist', 'page', 'index.html'),
+				'utf-8'
+			)
+			assert.match(page, /<title>Page<\/title>/)
+			assert.match(page, /<orga-island [^>]*export="default" props="{}"/)
+		} finally {
+			await fs.rm(dir, { recursive: true, force: true })
+		}
 	})
 
 	test('processes configured global styles through vite and injects built css', async () => {
@@ -123,9 +212,7 @@ export function GET() {
 			outDir: outDir,
 			containerClass: [],
 			styles: [styleUrl],
-			vitePlugins: [],
-			preBuild: [],
-			postBuild: []
+			vitePlugins: []
 		})
 
 		const html = await fs.readFile(path.join(outDir, 'index.html'), 'utf-8')
@@ -166,9 +253,7 @@ This page verifies custom rehype plugins.`
 				outDir: outDirRehype,
 				containerClass: [],
 				rehypePlugins: [markCodeBlocks],
-				vitePlugins: [],
-				preBuild: [],
-				postBuild: []
+				vitePlugins: []
 			})
 
 			const html = await fs.readFile(
@@ -190,9 +275,7 @@ This page verifies custom rehype plugins.`
 			root: fixtureDir,
 			outDir: outDir,
 			containerClass: [],
-			vitePlugins: [],
-			preBuild: [],
-			postBuild: []
+			vitePlugins: []
 		})
 
 		const rss = await fs.readFile(path.join(outDir, 'rss.xml'), 'utf-8')
@@ -219,9 +302,7 @@ This page verifies custom rehype plugins.`
 						root: fixtureDirConflict,
 						outDir: outDirConflict,
 						containerClass: [],
-						vitePlugins: [],
-						preBuild: [],
-						postBuild: []
+						vitePlugins: []
 					}),
 				/Route conflict detected/
 			)
@@ -230,4 +311,342 @@ This page verifies custom rehype plugins.`
 			await fs.rm(fixtureDirConflict, { recursive: true, force: true })
 		}
 	})
+
+	test("excludes Vite's output directory from content discovery", async () => {
+		const dir = path.join(__dirname, 'fixtures-vite-outdir')
+		// Dotted chunk names would make bundles look like endpoint routes.
+		const buildOnce = () =>
+			viteBuild(dir, {
+				build: {
+					rolldownOptions: {
+						output: { entryFileNames: 'assets/[name].[hash].js' }
+					}
+				}
+			})
+		try {
+			await fs.mkdir(dir, { recursive: true })
+			await fs.writeFile(path.join(dir, 'index.org'), '#+title: Home\n\nHome')
+
+			await buildOnce()
+			// The second build sees the first build's output inside the root.
+			await buildOnce()
+
+			const html = await fs.readFile(
+				path.join(dir, 'dist', 'index.html'),
+				'utf-8'
+			)
+			assert.ok(html.includes('<title>Home</title>'))
+		} finally {
+			await fs.rm(dir, { recursive: true, force: true })
+		}
+	})
+
+	test('leaves draft pages out of the build', async () => {
+		const dir = path.join(__dirname, 'fixtures-drafts')
+		try {
+			await fs.mkdir(dir, { recursive: true })
+			await fs.writeFile(path.join(dir, 'index.org'), 'Home')
+			await fs.writeFile(path.join(dir, 'draft.org'), '#+draft: t\n\nWIP')
+			await fs.writeFile(
+				path.join(dir, 'published.org'),
+				'#+draft: false\n\nDone'
+			)
+			await fs.writeFile(
+				path.join(dir, 'pages.json.ts'),
+				`import { getPages } from 'orga-build:content'
+export function GET() {
+  return Response.json(getPages().map((page) => page.slug).sort())
+}
+`
+			)
+
+			await viteBuild(dir)
+
+			const out = path.join(dir, 'dist')
+			const slugs = JSON.parse(
+				await fs.readFile(path.join(out, 'pages.json'), 'utf-8')
+			)
+			assert.deepEqual(slugs, ['/', '/published'])
+			await fs.access(path.join(out, 'published', 'index.html'))
+			await assert.rejects(fs.access(path.join(out, 'draft', 'index.html')))
+		} finally {
+			await fs.rm(dir, { recursive: true, force: true })
+		}
+	})
+
+	test('reads TSX page metadata and exposes site', async () => {
+		const dir = path.join(__dirname, 'fixtures-metadata')
+		try {
+			await fs.mkdir(dir, { recursive: true })
+			await fs.writeFile(path.join(dir, 'post.org'), '#+title: Org post\n')
+			await fs.writeFile(
+				path.join(dir, 'page.tsx'),
+				`import { site } from 'orga-build:content'
+export const title = 'TSX page'
+export const tags = ['a', 'b'] as const
+export const order = -1
+export const render = () => title
+export default function Page() {
+	return <a href={site + '/page'}>link</a>
+}
+`
+			)
+			await fs.writeFile(
+				path.join(dir, 'draft.jsx'),
+				'export const draft = true\nexport default () => <p />\n'
+			)
+			await fs.writeFile(
+				path.join(dir, 'pages.json.ts'),
+				`import { getPages, site } from 'orga-build:content'
+export function GET(ctx) {
+  return Response.json({
+    site,
+    ctxSite: ctx.site,
+    url: ctx.url.href,
+    pages: getPages()
+      .map(({ slug, data }) => ({ slug, data }))
+      .sort((a, b) => a.slug.localeCompare(b.slug))
+  })
+}
+`
+			)
+
+			await viteBuild(dir, {
+				plugins: orgaBuildPlugin({
+					root: dir,
+					site: 'https://example.com/blog/'
+				})
+			})
+
+			const out = path.join(dir, 'dist')
+			const json = JSON.parse(
+				await fs.readFile(path.join(out, 'pages.json'), 'utf-8')
+			)
+			assert.deepEqual(json, {
+				site: 'https://example.com/blog',
+				ctxSite: 'https://example.com/blog',
+				url: 'https://example.com/blog/pages.json',
+				pages: [
+					{
+						slug: '/page',
+						data: { title: 'TSX page', tags: ['a', 'b'], order: -1 }
+					},
+					{ slug: '/post', data: { title: 'Org post' } }
+				]
+			})
+			const html = await fs.readFile(
+				path.join(out, 'page', 'index.html'),
+				'utf-8'
+			)
+			assert.ok(html.includes('href="https://example.com/blog/page"'), html)
+			for (const site of ['example.com', 'localhost:3000']) {
+				assert.throws(
+					() => orgaBuildPlugin({ root: dir, site }),
+					/"site" must be an absolute http\(s\) URL/
+				)
+			}
+		} finally {
+			await fs.rm(dir, { recursive: true, force: true })
+		}
+	})
+
+	test('prerenders after a configured builder.buildApp', async () => {
+		const dir = path.join(__dirname, 'fixtures-vite-builder')
+		try {
+			await writeIslandFixture(dir)
+
+			await viteBuild(dir, {
+				builder: {
+					// Builds every environment itself, client first (as e.g. the
+					// Cloudflare plugin does): that client build predates island
+					// discovery and must be redone.
+					async buildApp(builder) {
+						await builder.build(builder.environments.client)
+						await builder.build(builder.environments.ssr)
+					}
+				}
+			})
+
+			const html = await fs.readFile(
+				path.join(dir, 'dist', 'index.html'),
+				'utf-8'
+			)
+			assert.ok(html.includes('<title>Home</title>'), 'page should survive')
+			const islandSrc = html.match(/<orga-island [^>]*src="([^"]+)"/)?.[1]
+			assert.ok(islandSrc, 'island is rendered')
+			await fs.access(path.join(dir, 'dist', islandSrc))
+		} finally {
+			await fs.rm(dir, { recursive: true, force: true })
+		}
+	})
+
+	test('rejects island props that cannot reach the browser', async () => {
+		const dir = path.join(__dirname, 'fixtures-island-props')
+		try {
+			await writeIslandFixture(dir)
+			await fs.writeFile(
+				path.join(dir, 'index.org'),
+				'#+jsx: <Counter start={1} config={{ onClick: () => {} }} />\n'
+			)
+			await assert.rejects(() => viteBuild(dir), /prop "onClick" can't be sent/)
+		} finally {
+			await fs.rm(dir, { recursive: true, force: true })
+		}
+	})
+
+	test('emits images and CSS imported by pages', async () => {
+		const dir = path.join(__dirname, 'fixtures-page-assets')
+		try {
+			await fs.mkdir(dir, { recursive: true })
+			// Larger than Vite's inline limit, so it is emitted as a file.
+			await fs.writeFile(path.join(dir, 'pic.png'), Buffer.alloc(8192, 1))
+			await fs.writeFile(path.join(dir, "it's.png"), Buffer.alloc(8192, 2))
+			await fs.writeFile(
+				path.join(dir, 'index.org'),
+				"[[./pic.png]]\n\n[[./it's.png]]\n"
+			)
+			await fs.writeFile(path.join(dir, 'page.css'), '.page { color: red }\n')
+			await fs.writeFile(
+				path.join(dir, 'page.tsx'),
+				`import './page.css'
+export default function Page() {
+	return <p className="page">hi</p>
+}
+`
+			)
+			await fs.writeFile(
+				path.join(dir, 'feed.json.ts'),
+				`import pic from './pic.png'
+export function GET() {
+	return Response.json({ pic })
+}
+`
+			)
+			await viteBuild(dir, { build: { sourcemap: true } })
+			// The SSR bundle and its source map are not part of the site.
+			for (const file of ['ssr.mjs', 'ssr.mjs.map']) {
+				await assert.rejects(fs.access(path.join(dir, 'dist', file)), file)
+			}
+
+			const html = await fs.readFile(
+				path.join(dir, 'dist', 'index.html'),
+				'utf-8'
+			)
+			const img = html.match(/<img src="\/(assets\/pic-[^"]+\.png)"/)?.[1] ?? ''
+			assert.ok(img, html)
+			await fs.access(path.join(dir, 'dist', img))
+			assert.equal(html.match(/<img src="\/assets\//g)?.length, 2, html)
+
+			const feed = JSON.parse(
+				await fs.readFile(path.join(dir, 'dist', 'feed.json'), 'utf-8')
+			)
+			assert.equal(feed.pic, `/${img}`, 'endpoints get real asset URLs too')
+
+			const page = await fs.readFile(
+				path.join(dir, 'dist', 'page', 'index.html'),
+				'utf-8'
+			)
+			const css =
+				page.match(
+					/<link rel="stylesheet" href="\/(assets\/[^"]+\.css)"/
+				)?.[1] ?? ''
+			assert.ok(css, page)
+			const built = await fs.readFile(path.join(dir, 'dist', css), 'utf-8')
+			assert.ok(built.includes('.page'), built)
+		} finally {
+			await fs.rm(dir, { recursive: true, force: true })
+		}
+	})
+
+	test('leaves external image URLs alone', async () => {
+		const dir = path.join(__dirname, 'fixtures-external-assets')
+		const srcs = ['https://example.com/a.png', '//cdn.example.com/b.png']
+		try {
+			await fs.mkdir(dir, { recursive: true })
+			await fs.writeFile(
+				path.join(dir, 'index.org'),
+				srcs.map((src) => `[[${src}]]`).join('\n\n') + '\n'
+			)
+			await viteBuild(dir)
+			const html = await fs.readFile(
+				path.join(dir, 'dist', 'index.html'),
+				'utf-8'
+			)
+			for (const src of srcs) {
+				assert.ok(html.includes(`<img src="${src}"`), `${src}: ${html}`)
+			}
+		} finally {
+			await fs.rm(dir, { recursive: true, force: true })
+		}
+	})
+
+	test('injects head tags for a page that renders nothing', () => {
+		const html = renderPageHtml(
+			'<html><head></head><body><div id="root"></div></body></html>',
+			{ content: '', page: {}, styles: ['/s.css'] }
+		)
+		assert.match(html, /<link rel="stylesheet" href="\/s.css"><\/head>/)
+	})
+
+	test('rebases relative asset URLs for nested pages', async () => {
+		const dir = path.join(__dirname, 'fixtures-vite-base')
+		try {
+			await writeIslandFixture(dir)
+
+			await viteBuild(dir, { base: './' })
+
+			for (const [page, prefix] of [
+				['', './'],
+				['docs', '../']
+			]) {
+				const pageDir = path.join(dir, 'dist', page)
+				const html = await fs.readFile(
+					path.join(pageDir, 'index.html'),
+					'utf-8'
+				)
+				for (const pattern of [
+					/<script type="module"[^>]* src="([^"]+)"/,
+					/<orga-island [^>]*src="([^"]+)"/,
+					...(page ? [/<img src="([^"]+)"/] : [])
+				]) {
+					const src = html.match(pattern)?.[1] ?? ''
+					assert.ok(
+						src.startsWith(`${prefix}assets/`),
+						`${page || '/'}: ${src}`
+					)
+					await fs.access(path.join(pageDir, src))
+				}
+			}
+		} finally {
+			await fs.rm(dir, { recursive: true, force: true })
+		}
+	})
+
+	test('resolves org links under base', async () => {
+		const dir = path.join(__dirname, 'fixtures-link-base')
+		try {
+			await fs.mkdir(path.join(dir, 'docs'), { recursive: true })
+			await fs.writeFile(
+				path.join(dir, 'index.org'),
+				'[[file:docs/a.org::*Part One][a]]\n'
+			)
+			await fs.writeFile(
+				path.join(dir, 'docs', 'a.org'),
+				'* Part One\n[[file:../index.org][home]]\n'
+			)
+
+			for (const [base, home, a] of [
+				['/blog/', '/blog/', '/blog/docs/a#part-one'],
+				['./', '../../', './docs/a#part-one']
+			]) {
+				await viteBuild(dir, { base })
+				const read = (/** @type {string} */ page) =>
+					fs.readFile(path.join(dir, 'dist', page, 'index.html'), 'utf-8')
+				assert.ok((await read('')).includes(`href="${a}"`), base)
+				assert.ok((await read('docs/a')).includes(`href="${home}"`), base)
+			}
+		} finally {
+			await fs.rm(dir, { recursive: true, force: true })
+		}
+	})
 })

package/lib/__tests__/dev.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=dev.test.d.ts.map

package/lib/__tests__/dev.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dev.test.d.ts","sourceRoot":"","sources":["dev.test.js"],"names":[],"mappings":""}