orga-build 0.7.1 → 0.8.0

package/README.org

@@ -93,14 +93,14 @@ export default {
 
 ** Configuration Options
 
-| Option | Type | Default | Description |
-|--------+------+---------+-------------|
-| =root= | =string= | ='pages'= | Directory containing content files |
-| =outDir= | =string= | ='out'= | Output directory for production build |
-| =containerClass= | =string \vert string[]= | =[]= | CSS class(es) for content wrapper |
-| =styles= | =string[]= | =[]= | Global stylesheet URLs injected/imported explicitly |
-| =rehypePlugins= | =PluggableList= | =[]= | Extra rehype plugins appended to orga-build defaults |
-| =vitePlugins= | =PluginOption[]= | =[]= | Additional Vite plugins |
+| Option         | Type              | Default | Description                                          |
+|----------------+-------------------+---------+------------------------------------------------------|
+| =root=           | =string=            | ='pages'= | Directory containing content files                   |
+| =outDir=         | =string=            | ='out'=   | Output directory for production build                |
+| =containerClass= | =string \vert string[]= | =[]=      | CSS class(es) for content wrapper                    |
+| =styles=         | =string[]=          | =[]=      | Global stylesheet URLs injected/imported explicitly  |
+| =rehypePlugins=  | =PluggableList=     | =[]=      | Extra rehype plugins appended to orga-build defaults |
+| =vitePlugins=    | =PluginOption[]=    | =[]=      | Additional Vite plugins                              |
 
 ** Syntax Highlighting Example
 
@@ -112,6 +112,47 @@ export default {
 }
 #+end_src
 
+* Routing
+
+orga-build supports two route types: *page routes* and *endpoint routes*.
+
+** Page Routes
+
+Page routes are discovered from =.org=, =.tsx=, and =.jsx= files.
+
+- =index.org= -> =/=
+- =about.org= -> =/about=
+- =docs/getting-started.tsx= -> =/docs/getting-started=
+
+At build time, page routes are emitted as HTML:
+
+- =/about= -> =out/about/index.html=
+
+** Endpoint Routes
+
+Endpoint routes are discovered from =.ts=, =.js=, =.mts=, and =.mjs= files where the basename already includes a target extension (for example =rss.xml.ts= or =data.json.ts=).
+
+- =rss.xml.ts= -> =/rss.xml=
+- =nested/feed.xml.ts= -> =/nested/feed.xml=
+- =api/data.json.ts= -> =/api/data.json=
+
+Endpoint modules must export:
+
+#+begin_src ts
+export async function GET(ctx) {
+  return new Response('ok', {
+    headers: { 'content-type': 'text/plain; charset=utf-8' }
+  })
+}
+#+end_src
+
+At build time, endpoint routes are emitted to exact filenames:
+
+- =/rss.xml= -> =out/rss.xml=
+- =/api/data.json= -> =out/api/data.json=
+
+Route conflicts (same final route path) fail fast during dev/build startup.
+
 * TypeScript Setup
 
 If you're using TypeScript and want type support for the =orga-build:content= virtual module, you need to add a reference to the type definitions.

package/lib/__tests__/build.test.js

@@ -49,6 +49,19 @@ Here's [[mailto:hi@unclex.net][send me an email]].
 			'Docs index page.'
 		)
 		await fs.writeFile(path.join(fixtureDir, 'more.org'), 'Another page.')
+		await fs.writeFile(
+			path.join(fixtureDir, 'rss.xml.ts'),
+			`import { getPages } from 'orga-build:content'
+
+export function GET() {
+  const pages = getPages()
+  return new Response(
+    '<?xml version="1.0" encoding="UTF-8"?><rss><count>' + pages.length + '</count></rss>',
+    { headers: { 'content-type': 'application/xml; charset=utf-8' } }
+  )
+}
+`
+		)
 		await fs.writeFile(
 			path.join(fixtureDir, 'style.css'),
 			'.global-style-marker { color: rgb(1, 2, 3); }'
@@ -169,4 +182,50 @@ This page verifies custom rehype plugins.`
 			await fs.rm(fixtureDirRehype, { recursive: true, force: true })
 		}
 	})
+
+	test('emits endpoint routes with exact output filenames', async () => {
+		await build({
+			root: fixtureDir,
+			outDir: outDir,
+			containerClass: [],
+			vitePlugins: [],
+			preBuild: [],
+			postBuild: []
+		})
+
+		const rss = await fs.readFile(path.join(outDir, 'rss.xml'), 'utf-8')
+		assert.ok(
+			rss.includes('<rss>') && rss.includes('<count>'),
+			'should emit rss.xml from GET endpoint'
+		)
+	})
+
+	test('fails on duplicate route conflicts', async () => {
+		const fixtureDirConflict = path.join(__dirname, 'fixtures-conflict')
+		const outDirConflict = path.join(__dirname, '.test-output-conflict')
+		try {
+			await fs.mkdir(fixtureDirConflict, { recursive: true })
+			await fs.writeFile(path.join(fixtureDirConflict, 'index.org'), 'Home')
+			await fs.writeFile(
+				path.join(fixtureDirConflict, 'index.tsx'),
+				'export default function Page() { return <div>Index</div> }'
+			)
+
+			await assert.rejects(
+				() =>
+					build({
+						root: fixtureDirConflict,
+						outDir: outDirConflict,
+						containerClass: [],
+						vitePlugins: [],
+						preBuild: [],
+						postBuild: []
+					}),
+				/Route conflict detected/
+			)
+		} finally {
+			await fs.rm(outDirConflict, { recursive: true, force: true })
+			await fs.rm(fixtureDirConflict, { recursive: true, force: true })
+		}
+	})
 })

package/lib/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["build.js"],"names":[],"mappings":"AAeA;;;GAGG;AACH,4FAHW,OAAO,aAAa,EAAE,MAAM,gBAC5B,MAAM,iBA8JhB;;sBA1K4C,aAAa"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["build.js"],"names":[],"mappings":"AAgBA;;;GAGG;AACH,4FAHW,OAAO,aAAa,EAAE,MAAM,gBAC5B,MAAM,iBAyLhB;;sBArM4C,aAAa"}

package/lib/build.js

@@ -2,6 +2,7 @@ import fs from 'node:fs/promises'
 import path from 'node:path'
 import { fileURLToPath, pathToFileURL } from 'node:url'
 import { createBuilder } from 'vite'
+import { resolveEndpointResponse } from './endpoint.js'
 import { emptyDir, ensureDir, exists } from './fs.js'
 import { alias, createOrgaBuildConfig } from './plugin.js'
 import { escapeHtml } from './util.js'
@@ -83,9 +84,11 @@ export async function build(
 	console.log('preparing ssr bundle...')
 	await builder.build(builder.environments.ssr)
 
-	const { render, pages } = await import(
-		pathToFileURL(path.join(ssrOutDir, 'ssr.mjs')).toString()
-	)
+	const {
+		render,
+		pages,
+		endpoints = {}
+	} = await import(pathToFileURL(path.join(ssrOutDir, 'ssr.mjs')).toString())
 
 	// Build client bundle
 	const _clientResult = await builder.build(builder.environments.client)
@@ -129,6 +132,31 @@ export async function build(
 		})
 	)
 
+	const endpointPaths = Object.keys(endpoints)
+	await Promise.all(
+		endpointPaths.map(async (route) => {
+			const endpointModule = endpoints[route]
+			const ctx = {
+				url: new URL(`http://localhost${route}`),
+				params: {},
+				mode: /** @type {'build'} */ ('build'),
+				route: { route }
+			}
+
+			const response = await resolveEndpointResponse(endpointModule, ctx, 'GET')
+			if (response.status < 200 || response.status >= 300) {
+				throw new Error(
+					`Endpoint route "${route}" returned non-2xx status during build: ${response.status}`
+				)
+			}
+
+			const bytes = Buffer.from(await response.arrayBuffer())
+			const writePath = path.join(clientOutDir, route.replace(/^\//, ''))
+			await ensureDir(path.dirname(writePath))
+			await fs.writeFile(writePath, bytes)
+		})
+	)
+
 	await fs.rm(ssrOutDir, { recursive: true })
 
 	return

package/lib/endpoint.d.ts

@@ -0,0 +1,23 @@
+/**
+ * @typedef {Object} EndpointContext
+ * @property {URL} url
+ * @property {Record<string, string>} params
+ * @property {'dev' | 'build'} mode
+ * @property {{ route: string }} route
+ */
+/**
+ * @param {Record<string, any>} endpointModule
+ * @param {EndpointContext} ctx
+ * @param {string} method
+ * @returns {Promise<Response>}
+ */
+export function resolveEndpointResponse(endpointModule: Record<string, any>, ctx: EndpointContext, method?: string): Promise<Response>;
+export type EndpointContext = {
+    url: URL;
+    params: Record<string, string>;
+    mode: "dev" | "build";
+    route: {
+        route: string;
+    };
+};
+//# sourceMappingURL=endpoint.d.ts.map

package/lib/endpoint.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"endpoint.d.ts","sourceRoot":"","sources":["endpoint.js"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH;;;;;GAKG;AACH,wDALW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,OACnB,eAAe,WACf,MAAM,GACJ,OAAO,CAAC,QAAQ,CAAC,CAoC7B;;SA9Ca,GAAG;YACH,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;UACtB,KAAK,GAAG,OAAO;WACf;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE"}

package/lib/endpoint.js

@@ -0,0 +1,49 @@
+/**
+ * @typedef {Object} EndpointContext
+ * @property {URL} url
+ * @property {Record<string, string>} params
+ * @property {'dev' | 'build'} mode
+ * @property {{ route: string }} route
+ */
+
+/**
+ * @param {Record<string, any>} endpointModule
+ * @param {EndpointContext} ctx
+ * @param {string} method
+ * @returns {Promise<Response>}
+ */
+export async function resolveEndpointResponse(
+	endpointModule,
+	ctx,
+	method = 'GET'
+) {
+	const route = ctx.route.route
+
+	if (method === 'HEAD' && typeof endpointModule.HEAD === 'function') {
+		const res = await endpointModule.HEAD(ctx)
+		if (!(res instanceof Response))
+			throw new Error(`Endpoint route "${route}" HEAD must return Response`)
+		return res
+	}
+
+	if (typeof endpointModule.GET !== 'function') {
+		throw new Error(
+			`Endpoint route "${route}" must export GET(ctx) returning Response`
+		)
+	}
+
+	const res = await endpointModule.GET(ctx)
+	if (!(res instanceof Response)) {
+		throw new Error(`Endpoint route "${route}" GET must return Response`)
+	}
+
+	if (method === 'HEAD') {
+		return new Response(null, {
+			status: res.status,
+			statusText: res.statusText,
+			headers: new Headers(res.headers)
+		})
+	}
+
+	return res
+}

package/lib/files.d.ts

@@ -6,11 +6,24 @@
 export function setup(dir: string, { outDir }?: {
     outDir?: string | undefined;
 }): {
-    pages: () => Promise<Record<string, Page>>;
+    pages: (() => Promise<Record<string, Page>>) & {
+        invalidate: () => void;
+    };
     page: (slug: string) => Promise<Page>;
-    components: () => Promise<string | null>;
-    layouts: () => Promise<Record<string, string>>;
-    contentEntries: () => Promise<ContentEntry[]>;
+    endpoints: (() => Promise<Record<string, EndpointRoute>>) & {
+        invalidate: () => void;
+    };
+    endpoint: (route: string) => Promise<EndpointRoute>;
+    components: (() => Promise<string | null>) & {
+        invalidate: () => void;
+    };
+    layouts: (() => Promise<Record<string, string>>) & {
+        invalidate: () => void;
+    };
+    contentEntries: (() => Promise<ContentEntry[]>) & {
+        invalidate: () => void;
+    };
+    invalidate(): void;
 };
 /**
  * Convert a content file path (relative to content root) to the canonical page slug.
@@ -24,6 +37,10 @@ export type Page = {
      */
     title?: string;
 };
+export type EndpointRoute = {
+    route: string;
+    dataPath: string;
+};
 export type ContentEntry = {
     id: string;
     slug: string;

package/lib/files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"files.d.ts","sourceRoot":"","sources":["files.js"],"names":[],"mappings":"AA8EA;;;;GAIG;AACH,2BAJW,MAAM,eAEd;IAAyB,MAAM;CACjC;;iBAiIY,MAAM;;;;EAKlB;AAsBD;;;GAGG;AACH,4DAFW,MAAM,UAoBhB;;cA7Pa,MAAM;;;;YACN,MAAM;;;QAMN,MAAM;UACN,MAAM;UACN,MAAM;cACN,MAAM;SACN,KAAK,GAAG,KAAK,GAAG,KAAK;UACrB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC"}
+{"version":3,"file":"files.d.ts","sourceRoot":"","sources":["files.js"],"names":[],"mappings":"AAoFA;;;;GAIG;AACH,2BAJW,MAAM,eAEd;IAAyB,MAAM;CACjC;;0BA0LqD,IAAI;;iBApB7C,MAAM;;0BAoBmC,IAAI;;sBAd7C,MAAM;;0BAcmC,IAAI;;;0BAAJ,IAAI;;;0BAAJ,IAAI;;;EATzD;AA8BD;;;GAGG;AACH,4DAFW,MAAM,UAoBhB;;cAtTa,MAAM;;;;YACN,MAAM;;;WAMN,MAAM;cACN,MAAM;;;QAKN,MAAM;UACN,MAAM;UACN,MAAM;cACN,MAAM;SACN,KAAK,GAAG,KAAK,GAAG,KAAK;UACrB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC"}

package/lib/files.js

@@ -10,6 +10,12 @@ import { getSettings } from 'orga'
  *   Path to the page data file
  */
 
+/**
+ * @typedef {Object} EndpointRoute
+ * @property {string} route
+ * @property {string} dataPath
+ */
+
 /**
  * @typedef {Object} ContentEntry
  * @property {string} id
@@ -89,10 +95,10 @@ export function setup(dir, { outDir } = {}) {
 			? `!${outDirRelative}/**`
 			: null
 
-	const pages = cache(async function () {
+	const discoveredRoutes = cache(async function () {
 		const files = await globby(
 			[
-				'**/*.{org,tsx,jsx}',
+				'**/*.{org,tsx,jsx,ts,js,mts,mjs}',
 				'!**/_*/**',
 				'!**/_*',
 				'!**/.*/**',
@@ -105,14 +111,41 @@ export function setup(dir, { outDir } = {}) {
 
 		/** @type {Record<string, Page>} */
 		const pages = {}
+		/** @type {Record<string, EndpointRoute>} */
+		const endpoints = {}
+		/** @type {Map<string, { sourceType: 'page' | 'endpoint', filePath: string }>} */
+		const routeOwners = new Map()
+
 		for (const file of files) {
-			const pageSlug = getSlugFromContentFilePath(file)
-			pages[pageSlug] = {
-				dataPath: path.join(dir, file)
+			const absolutePath = path.join(dir, file)
+			const pageSlug = getPageSlugFromFilePath(file)
+			const endpointRoute = getEndpointRouteFromFilePath(file)
+
+			if (pageSlug) {
+				assertUniqueRoute(routeOwners, pageSlug, 'page', absolutePath)
+				pages[pageSlug] = { dataPath: absolutePath }
+			}
+
+			if (endpointRoute) {
+				assertUniqueRoute(routeOwners, endpointRoute, 'endpoint', absolutePath)
+				endpoints[endpointRoute] = {
+					route: endpointRoute,
+					dataPath: absolutePath
+				}
 			}
 		}
 
-		return pages
+		return { pages, endpoints }
+	})
+
+	const pages = cache(async function () {
+		const routes = await discoveredRoutes()
+		return routes.pages
+	})
+
+	const endpoints = cache(async function () {
+		const routes = await discoveredRoutes()
+		return routes.endpoints
 	})
 
 	const layouts = cache(async function () {
@@ -202,9 +235,19 @@ export function setup(dir, { outDir } = {}) {
 	const files = {
 		pages,
 		page,
+		endpoints,
+		endpoint,
 		components,
 		layouts,
-		contentEntries
+		contentEntries,
+		invalidate() {
+			discoveredRoutes.invalidate()
+			pages.invalidate()
+			endpoints.invalidate()
+			layouts.invalidate()
+			components.invalidate()
+			contentEntries.invalidate()
+		}
 	}
 
 	return files
@@ -214,26 +257,40 @@ export function setup(dir, { outDir } = {}) {
 		const all = await pages()
 		return all[slug]
 	}
+
+	/** @param {string} route */
+	async function endpoint(route) {
+		const all = await endpoints()
+		return all[route]
+	}
 }
 
 /**
  * Creates a cached version of an async function that will only execute once
- * and return the cached result on subsequent calls
+ * and return the cached result on subsequent calls. The returned function
+ * also has an `invalidate()` method to clear the cache.
  *
  * @template T
  * @param {() => Promise<T>} fn - The async function to cache
- * @returns {() => Promise<T>} - Cached function that returns the same type as the input function
+ * @returns {(() => Promise<T>) & { invalidate: () => void }}
  */
 function cache(fn) {
-	/** @type {T | null} */
-	let cache = null
-	return async function () {
-		if (cache) {
-			return cache
+	let settled = false
+	/** @type {T | undefined} */
+	let value
+	/** @returns {Promise<T>} */
+	async function cached() {
+		if (!settled) {
+			value = await fn()
+			settled = true
 		}
-		cache = await fn()
-		return cache
+		return /** @type {T} */ (value)
+	}
+	cached.invalidate = function () {
+		settled = false
+		value = undefined
 	}
+	return cached
 }
 
 /**
@@ -259,3 +316,51 @@ export function getSlugFromContentFilePath(contentFilePath) {
 
 	return slug
 }
+
+/**
+ * @param {string} filePath
+ * @returns {string|null}
+ */
+function getPageSlugFromFilePath(filePath) {
+	if (!/\.(org|tsx|jsx)$/.test(filePath)) {
+		return null
+	}
+	return getSlugFromContentFilePath(filePath)
+}
+
+/**
+ * @param {string} filePath
+ * @returns {string|null}
+ */
+function getEndpointRouteFromFilePath(filePath) {
+	if (!/\.(ts|js|mts|mjs)$/.test(filePath)) {
+		return null
+	}
+
+	const normalizedFilePath = filePath.replace(/\\/g, '/')
+	const targetPath = normalizedFilePath.replace(/\.(ts|js|mts|mjs)$/, '')
+	const basename = path.posix.basename(targetPath)
+
+	// Endpoint files must carry a target extension: rss.xml.ts, data.json.ts, etc.
+	if (!basename.includes('.')) {
+		return null
+	}
+
+	return `/${targetPath.replace(/^\/+/, '')}`
+}
+
+/**
+ * @param {Map<string, { sourceType: 'page' | 'endpoint', filePath: string }>} routeOwners
+ * @param {string} route
+ * @param {'page' | 'endpoint'} sourceType
+ * @param {string} filePath
+ */
+function assertUniqueRoute(routeOwners, route, sourceType, filePath) {
+	const existing = routeOwners.get(route)
+	if (existing) {
+		throw new Error(
+			`Route conflict detected for "${route}"\n- ${existing.sourceType}: ${existing.filePath}\n- ${sourceType}: ${filePath}`
+		)
+	}
+	routeOwners.set(route, { sourceType, filePath })
+}

package/lib/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["plugin.js"],"names":[],"mappings":"AAuBA;;;;;;;GAOG;AAEH;;;;;;GAMG;AACH,yFAHW,sBAAsB,GACpB,OAAO,MAAM,EAAE,YAAY,EAAE,CAczC;AAED;;;;;;GAMG;AACH,8IAHW,sBAAsB,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,MAAM,EAAE,YAAY,EAAE,CAAC;IAAC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,GAC5I;IAAE,OAAO,EAAE,OAAO,MAAM,EAAE,YAAY,EAAE,CAAC;IAAC,OAAO,EAAE;QAAE,KAAK,EAAE,OAAO,KAAK,CAAA;KAAE,CAAA;CAAE,CAyBxF;AAiBD;;;;;;;;;;;;;GAaG;AACH,gDAJW,MAAM,WACN,MAAM,EAAE,GACN,OAAO,MAAM,EAAE,MAAM,CAmFjC;AArLD;;GAEG;AACH;;;;EAIC;;;;;UAIa,MAAM;;;;aACN,MAAM,GAAG,SAAS;;;;qBAClB,MAAM,GAAC,MAAM,EAAE;;;;aACf,MAAM,EAAE;;;;oBACR,OAAO,SAAS,EAAE,aAAa"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["plugin.js"],"names":[],"mappings":"AAwBA;;;;;;;GAOG;AAEH;;;;;;GAMG;AACH,yFAHW,sBAAsB,GACpB,OAAO,MAAM,EAAE,YAAY,EAAE,CAczC;AAED;;;;;;GAMG;AACH,8IAHW,sBAAsB,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,MAAM,EAAE,YAAY,EAAE,CAAC;IAAC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,GAC5I;IAAE,OAAO,EAAE,OAAO,MAAM,EAAE,YAAY,EAAE,CAAC;IAAC,OAAO,EAAE;QAAE,KAAK,EAAE,OAAO,KAAK,CAAA;KAAE,CAAA;CAAE,CAyBxF;AAiBD;;;;;;;;;;;;;GAaG;AACH,gDAJW,MAAM,WACN,MAAM,EAAE,GACN,OAAO,MAAM,EAAE,MAAM,CAsHjC;AAxND;;GAEG;AACH;;;;EAIC;;;;;UAIa,MAAM;;;;aACN,MAAM,GAAG,SAAS;;;;qBAClB,MAAM,GAAC,MAAM,EAAE;;;;aACf,MAAM,EAAE;;;;oBACR,OAAO,SAAS,EAAE,aAAa"}

package/lib/plugin.js

@@ -4,6 +4,7 @@ import path from 'node:path'
 import { fileURLToPath } from 'node:url'
 import react from '@vitejs/plugin-react'
 import { createServerModuleRunner } from 'vite'
+import { resolveEndpointResponse } from './endpoint.js'
 import { setupOrga } from './orga.js'
 import { escapeHtml } from './util.js'
 import { pluginFactory } from './vite.js'
@@ -134,6 +135,43 @@ export function htmlFallbackPlugin(projectRoot, styles = []) {
 					return next()
 				}
 
+				const url = req.url || '/'
+				const pathname = url.split('?')[0]
+
+				// Endpoint routes are handled first and bypass HTML fallback.
+				try {
+					const { endpoints } = await runner.import(ssrEntry)
+					const endpointModule = endpoints?.[pathname]
+					if (endpointModule) {
+						const ctx = {
+							url: new URL(url, `http://${req.headers.host || 'localhost'}`),
+							params: {},
+							mode: /** @type {'dev'} */ ('dev'),
+							route: { route: pathname }
+						}
+
+						const response = await resolveEndpointResponse(
+							endpointModule,
+							ctx,
+							req.method
+						)
+						res.statusCode = response.status
+						response.headers.forEach((headerValue, headerName) => {
+							res.setHeader(headerName, headerValue)
+						})
+						if (req.method === 'HEAD') {
+							res.end()
+							return
+						}
+						const bytes = Buffer.from(await response.arrayBuffer())
+						res.end(bytes)
+						return
+					}
+				} catch (e) {
+					next(e)
+					return
+				}
+
 				// Only handle browser-like navigation requests.
 				// Don't match generic */* accepts to avoid hijacking API requests.
 				const accept = req.headers.accept || ''
@@ -142,8 +180,6 @@ export function htmlFallbackPlugin(projectRoot, styles = []) {
 				}
 
 				// Don't intercept asset requests (files with extensions)
-				const url = req.url || '/'
-				const pathname = url.split('?')[0]
 				if (pathname !== '/' && /\.\w+$/.test(pathname)) {
 					return next()
 				}

package/lib/ssr.jsx

@@ -1,9 +1,11 @@
 import { renderToString } from 'react-dom/server'
 import { Router } from 'wouter'
+import endpoints from '/@orga-build/endpoints'
 import pages from '/@orga-build/pages'
 import { App } from './app.jsx'
 
 export { pages }
+export { endpoints }
 
 /**
  * @param {string} url

package/lib/vite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite.d.ts","sourceRoot":"","sources":["vite.js"],"names":[],"mappings":"AASA;;;;;;GAMG;AACH,uDALG;IAAwB,GAAG,EAAnB,MAAM;IACW,MAAM;IACJ,MAAM;CACjC,GAAU,OAAO,MAAM,EAAE,MAAM,CAoJjC;AA7JD,gDAAuD"}
+{"version":3,"file":"vite.d.ts","sourceRoot":"","sources":["vite.js"],"names":[],"mappings":"AAWA;;;;;;GAMG;AACH,uDALG;IAAwB,GAAG,EAAnB,MAAM;IACW,MAAM;IACJ,MAAM;CACjC,GAAU,OAAO,MAAM,EAAE,MAAM,CA4LjC;AAtMD,gDAAuD"}

package/lib/vite.js

@@ -3,9 +3,11 @@ import { setup } from './files.js'
 
 const magicModulePrefix = '/@orga-build/'
 const pagesModuleId = `${magicModulePrefix}pages`
+const endpointsModuleId = `${magicModulePrefix}endpoints`
 export const appEntryId = `${magicModulePrefix}main.js`
 const contentModuleId = 'orga-build:content'
 const contentModuleIdResolved = `\0${contentModuleId}`
+const endpointModulePrefix = `${endpointsModuleId}/__route__/`
 
 /**
  * @param {Object} options
@@ -28,7 +30,15 @@ export function pluginFactory({ dir, outDir, styles = [] }) {
 			}
 		}),
 
+		async configureServer(_server) {
+			// Eagerly run file discovery so route conflicts surface at startup
+			await files.pages()
+			await files.endpoints()
+		},
+
 		hotUpdate() {
+			// Invalidate in-memory file caches so added/removed routes are picked up
+			files.invalidate()
 			// Invalidate content module when content files change
 			const module = this.environment.moduleGraph.getModuleById(
 				contentModuleIdResolved
@@ -64,6 +74,9 @@ export function pluginFactory({ dir, outDir, styles = [] }) {
 			if (id === pagesModuleId) {
 				return await renderPageList()
 			}
+			if (id === endpointsModuleId) {
+				return await renderEndpointList()
+			}
 			if (id.startsWith(pagesModuleId)) {
 				const pageId = id.replace(pagesModuleId, '')
 				const page = await files.page(pageId)
@@ -74,6 +87,14 @@ export {default} from '${page.dataPath}';
 `
 				}
 			}
+			if (id.startsWith(endpointModulePrefix)) {
+				const routeHex = id.slice(endpointModulePrefix.length)
+				const endpointId = Buffer.from(routeHex, 'hex').toString('utf-8')
+				const endpoint = await files.endpoint(endpointId)
+				if (endpoint) {
+					return `export * from '${endpoint.dataPath}';`
+				}
+			}
 
 			if (id === `${magicModulePrefix}layouts`) {
 				const layouts = await files.layouts()
@@ -99,19 +120,40 @@ export default layouts;
 
 	async function renderPageList() {
 		const pages = await files.pages()
-		/** @type {string[]} */ const _imports = []
-		/** @type {string[]} */ const _pages = []
-		Object.entries(pages).forEach(([pageId, _value], i) => {
-			const dataModulePath = path.join(magicModulePrefix, 'pages', pageId)
-			_imports.push(`import * as page${i} from '${dataModulePath}'`)
-			_pages.push(`pages['${pageId}'] = page${i}`)
+		return renderModuleMap('pages', pages, (id) =>
+			path.join(magicModulePrefix, 'pages', id)
+		)
+	}
+
+	async function renderEndpointList() {
+		const endpoints = await files.endpoints()
+		return renderModuleMap(
+			'endpoints',
+			endpoints,
+			(route) => endpointModulePrefix + Buffer.from(route).toString('hex')
+		)
+	}
+
+	/**
+	 * @param {string} name
+	 * @param {Record<string, unknown>} entries
+	 * @param {(key: string) => string} toModulePath
+	 */
+	function renderModuleMap(name, entries, toModulePath) {
+		/** @type {string[]} */
+		const imports = []
+		/** @type {string[]} */
+		const assignments = []
+		Object.keys(entries).forEach((key, i) => {
+			imports.push(`import * as m${i} from '${toModulePath(key)}'`)
+			assignments.push(`${name}['${key}'] = m${i}`)
 		})
-		return `
-${_imports.join('\n')}
-const pages = {};
-${_pages.join('\n')}
-export default pages;
-	`
+		return [
+			imports.join('\n'),
+			`const ${name} = {};`,
+			assignments.join('\n'),
+			`export default ${name};`
+		].join('\n')
 	}
 
 	async function renderComponents() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orga-build",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "description": "A simple tool that builds org-mode files into a website",
   "type": "module",
   "engines": {