orga-build 0.9.0 → 0.10.0

package/lib/util.d.ts

@@ -1,28 +1,6 @@
-export function buildNav(): void;
-/**
- * @param {string} file
- * @param {...RegExp|string} patterns
- * @returns {boolean}
- */
-export function match(file: string, ...patterns: (RegExp | string)[]): boolean;
-/**
- * Default layout
- * @param {Object} props
- * @param {string|undefined} props.title
- * @param {import('react').ReactNode} props.children
- * @returns {React.JSX.Element}
- */
-export function DefaultLayout({ title, children }: {
-    title: string | undefined;
-    children: import("react").ReactNode;
-}): React.JSX.Element;
 /**
  * @param {string} str
  * @returns {string}
  */
 export function escapeHtml(str: string): string;
-/**
- * @param {string} cmd
- */
-export function $(cmd: string): Promise<any>;
 //# sourceMappingURL=util.d.ts.map

package/lib/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["util.js"],"names":[],"mappings":"AAGA,iCAA6B;AAE7B;;;;GAIG;AACH,4BAJW,MAAM,eACN,CAAG,MAAM,GAAC,MAAM,GAAA,GACd,OAAO,CASnB;AAED;;;;;;GAMG;AACH,mDAJG;IAAgC,KAAK,EAA7B,MAAM,GAAC,SAAS;IACiB,QAAQ,EAAzC,OAAO,OAAO,EAAE,SAAS;CACjC,GAAU,KAAK,CAAC,GAAG,CAAC,OAAO,CAkB7B;AAED;;;GAGG;AACH,gCAHW,MAAM,GACJ,MAAM,CAQlB;AAED;;GAEG;AACH,uBAFW,MAAM,gBAehB"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["util.js"],"names":[],"mappings":"AAAA;;;GAGG;AACH,gCAHW,MAAM,GACJ,MAAM,CAQlB"}

package/lib/util.js

@@ -1,47 +1,3 @@
-import { exec } from 'node:child_process'
-import { createElement } from 'react'
-
-export function buildNav() {}
-
-/**
- * @param {string} file
- * @param {...RegExp|string} patterns
- * @returns {boolean}
- */
-export function match(file, ...patterns) {
-	return patterns.some((p) => {
-		if (p instanceof RegExp) {
-			return p.test(file)
-		}
-		return file === p
-	})
-}
-
-/**
- * Default layout
- * @param {Object} props
- * @param {string|undefined} props.title
- * @param {import('react').ReactNode} props.children
- * @returns {React.JSX.Element}
- */
-export function DefaultLayout({ title, children }) {
-	return createElement(
-		'html',
-		{ lang: 'en' },
-		createElement(
-			'head',
-			{},
-			createElement('meta', { charSet: 'utf-8' }),
-			createElement('meta', {
-				name: 'viewport',
-				content: 'width=device-width, initial-scale=1'
-			}),
-			title && createElement('title', {}, title)
-		),
-		createElement('body', {}, children)
-	)
-}
-
 /**
  * @param {string} str
  * @returns {string}
@@ -53,21 +9,3 @@ export function escapeHtml(str) {
 		.replace(/</g, '&lt;')
 		.replace(/>/g, '&gt;')
 }
-
-/**
- * @param {string} cmd
- */
-export async function $(cmd) {
-	return new Promise((resolve, reject) => {
-		exec(cmd, (err, stdout, stderr) => {
-			if (err) {
-				reject(err)
-			}
-			if (stderr) {
-				console.error(stderr)
-			}
-			console.log(stdout)
-			resolve(stdout)
-		})
-	})
-}

package/lib/vite.d.ts

@@ -1,16 +1,15 @@
 /**
  * @param {Object} options
  * @param {string} options.dir
- * @param {string} [options.outDir]
- * @param {string[]} [options.styles]
  * @param {string[]} [options.exclude]
+ * @param {string | undefined} [options.site] - Absolute site URL, exported as `site`
  * @returns {import('vite').Plugin}
  */
-export function pluginFactory({ dir, outDir, styles, exclude }: {
+export function pluginFactory({ dir, exclude, site }: {
     dir: string;
-    outDir?: string | undefined;
-    styles?: string[] | undefined;
     exclude?: string[] | undefined;
+    site?: string | undefined;
 }): import("vite").Plugin;
-export const appEntryId: "/@orga-build/main.js";
+/** URL the dev server serves the island runtime from. */
+export const islandRuntimeId: "/@orga-build/islands.js";
 //# sourceMappingURL=vite.d.ts.map

package/lib/vite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite.d.ts","sourceRoot":"","sources":["vite.js"],"names":[],"mappings":"AAWA;;;;;;;GAOG;AACH,gEANG;IAAwB,GAAG,EAAnB,MAAM;IACW,MAAM;IACJ,MAAM;IACN,OAAO;CAClC,GAAU,OAAO,MAAM,EAAE,MAAM,CA4LjC;AAvMD,gDAAuD"}
+{"version":3,"file":"vite.d.ts","sourceRoot":"","sources":["vite.js"],"names":[],"mappings":"AAaA;;;;;;GAMG;AACH,sDALG;IAAwB,GAAG,EAAnB,MAAM;IACa,OAAO;IACG,IAAI,GAAjC,MAAM,GAAG,SAAS;CAC1B,GAAU,OAAO,MAAM,EAAE,MAAM,CA8OjC;AAzPD,yDAAyD;AACzD,wDAA+D"}

package/lib/vite.js

@@ -1,10 +1,12 @@
 import path from 'node:path'
 import { setup } from './files.js'
+import { clientRuntime } from './island.js'
 
 const magicModulePrefix = '/@orga-build/'
 const pagesModuleId = `${magicModulePrefix}pages`
 const endpointsModuleId = `${magicModulePrefix}endpoints`
-export const appEntryId = `${magicModulePrefix}main.js`
+/** URL the dev server serves the island runtime from. */
+export const islandRuntimeId = `${magicModulePrefix}islands.js`
 const contentModuleId = 'orga-build:content'
 const contentModuleIdResolved = `\0${contentModuleId}`
 const endpointModulePrefix = `${endpointsModuleId}/__route__/`
@@ -12,13 +14,27 @@ const endpointModulePrefix = `${endpointsModuleId}/__route__/`
 /**
  * @param {Object} options
  * @param {string} options.dir
- * @param {string} [options.outDir]
- * @param {string[]} [options.styles]
  * @param {string[]} [options.exclude]
+ * @param {string | undefined} [options.site] - Absolute site URL, exported as `site`
  * @returns {import('vite').Plugin}
  */
-export function pluginFactory({ dir, outDir, styles = [], exclude = [] }) {
-	const files = setup(dir, { outDir, exclude })
+export function pluginFactory({ dir, exclude = [], site }) {
+	/** @type {ReturnType<typeof setup>} */
+	let files
+	/** @type {import('vite').ViteDevServer | undefined} */
+	let server
+	const contentDir = path.resolve(dir)
+
+	/**
+	 * Whether a changed file lives in the content root, skipping dot paths the
+	 * same way route discovery does.
+	 * @param {string} file
+	 */
+	function isContentFile(file) {
+		const rel = path.relative(contentDir, file)
+		if (!rel || rel.startsWith('..') || path.isAbsolute(rel)) return false
+		return !rel.split(path.sep).some((segment) => segment.startsWith('.'))
+	}
 
 	return {
 		name: 'vite-plugin-orga-pages',
@@ -31,29 +47,59 @@ export function pluginFactory({ dir, outDir, styles = [], exclude = [] }) {
 			}
 		}),
 
+		configResolved(config) {
+			// Exclude the outDir Vite actually writes the site to (it may sit inside
+			// the content root), so generated files are never discovered as routes.
+			// Read it from the client environment: during a build, `config.build`
+			// is the current environment's (e.g. the SSR outDir).
+			const outDir = config.environments.client.build.outDir
+			files = setup(dir, {
+				outDir: path.resolve(config.root, outDir),
+				exclude,
+				// Preview drafts in dev; leave them out of the build.
+				drafts: config.command === 'serve'
+			})
+		},
+
 		async configureServer(_server) {
+			server = _server
 			// Eagerly run file discovery so route conflicts surface at startup
 			await files.pages()
 			await files.endpoints()
 		},
 
-		hotUpdate() {
+		hotUpdate({ file }) {
+			// Content changes affect routes; files the server renders affect pages.
+			// Anything else in the project (logs, editor backups, tool state) must
+			// not trigger a reload.
+			const rendered =
+				server?.environments.ssr.moduleGraph.getModulesByFile(file)
+			if (!isContentFile(file) && !rendered?.size) return
 			// 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
-			)
-			if (module) {
-				this.environment.moduleGraph.invalidateModule(module)
-				// Full reload for now; can optimize to HMR later
+			// The generated modules list files by path, so regenerate them all:
+			// otherwise added pages are missing and deleted layouts stay imported.
+			const { moduleGraph } = this.environment
+			for (const [id, module] of moduleGraph.idToModuleMap) {
+				if (
+					id === contentModuleIdResolved ||
+					id.startsWith(magicModulePrefix)
+				) {
+					moduleGraph.invalidateModule(module)
+				}
+			}
+			// Pages render on the server: the browser has nothing to hot-swap,
+			// so reload it.
+			if (this.environment.name === 'client') {
 				this.environment.hot.send({ type: 'full-reload', path: '*' })
 			}
 		},
 
 		async resolveId(id, _importer) {
-			if (id === appEntryId) {
-				return appEntryId
+			// Pages with islands link the runtime by a stable URL; point it at the
+			// real file so Vite treats it like any other source module.
+			if (id === islandRuntimeId) {
+				return clientRuntime
 			}
 			if (id === contentModuleId) {
 				return contentModuleIdResolved
@@ -63,12 +109,6 @@ export function pluginFactory({ dir, outDir, styles = [], exclude = [] }) {
 			}
 		},
 		async load(id) {
-			if (id === appEntryId) {
-				const styleImports = styles
-					.map((styleUrl) => `import ${JSON.stringify(styleUrl)};`)
-					.join('\n')
-				return `${styleImports}\nimport "orga-build/csr";`
-			}
 			if (id === contentModuleIdResolved) {
 				return await renderContentModule()
 			}
@@ -81,12 +121,21 @@ export function pluginFactory({ dir, outDir, styles = [], exclude = [] }) {
 			if (id.startsWith(pagesModuleId)) {
 				const pageId = id.replace(pagesModuleId, '')
 				const page = await files.page(pageId)
-				if (page) {
+				if (!page) return
+				// Org pages take `_components` as the `components` prop.
+				if (page.dataPath.endsWith('.org')) {
 					return `
+import { createElement } from 'react';
+import Content from '${page.dataPath}';
+import * as components from '${magicModulePrefix}components';
 export * from '${page.dataPath}';
-export {default} from '${page.dataPath}';
+export default (props) => createElement(Content, { components: { ...components }, ...props });
 `
 				}
+				return `
+export * from '${page.dataPath}';
+export {default} from '${page.dataPath}';
+`
 			}
 			if (id.startsWith(endpointModulePrefix)) {
 				const routeHex = id.slice(endpointModulePrefix.length)
@@ -172,6 +221,8 @@ export default layouts;
 		return `
 const __entries = ${manifest}
 
+export const site = ${JSON.stringify(site)}
+
 function normalizePath(path = '') {
   return String(path).replace(/^\\/+|\\/+$/g, '')
 }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "orga-build",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "A simple tool that builds org-mode files into a website",
   "type": "module",
   "engines": {
-    "node": ">=20.19.0"
+    "node": "^20.19.0 || >=22.12.0"
   },
   "bin": {
     "orga-build": "./cli.js"
@@ -22,8 +22,6 @@
       "types": "./index.d.ts",
       "import": "./index.js"
     },
-    "./csr": "./lib/csr.jsx",
-    "./components": "./lib/components.js",
     "./client": {
       "types": "./lib/content.d.ts"
     }
@@ -43,16 +41,15 @@
     "directory": "packages/orga-build"
   },
   "dependencies": {
-    "@vitejs/plugin-react": "^5.1.4",
+    "@vitejs/plugin-react": "^6.1.2",
     "globby": "^14.1.0",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "rehype-katex": "^7.0.1",
     "unified": "^11.0.5",
     "unist-util-visit-parents": "^6.0.1",
-    "vite": "^7.3.1",
-    "wouter": "^3.7.0",
-    "@orgajs/rollup": "1.3.4"
+    "vite": "^8.3.3",
+    "@orgajs/rollup": "1.3.5"
   },
   "devDependencies": {
     "@types/hast": "^3.0.4",

package/lib/components.d.ts

@@ -1,2 +0,0 @@
-export { Link } from "wouter";
-//# sourceMappingURL=components.d.ts.map

package/lib/components.d.ts.map

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

package/lib/components.js

@@ -1 +0,0 @@
-export { Link } from 'wouter'

package/lib/csr.jsx

@@ -1,11 +0,0 @@
-import { createRoot } from 'react-dom/client'
-import { Router } from 'wouter'
-import { App } from './app.jsx'
-
-const container = document.getElementById('root')
-const root = createRoot(container)
-root.render(
-	<Router>
-		<App />
-	</Router>
-)

package/lib/watch.d.ts

@@ -1,10 +0,0 @@
-/**
- * @param {import("fs").PathLike} dir
- * @param {RegExp} ignore
- * @param {{(event: fs.FileChangeInfo<string>): Promise<void> | void}} onChange
- */
-export function watch(dir: import("fs").PathLike, ignore: RegExp, onChange: {
-    (event: fs.FileChangeInfo<string>): Promise<void> | void;
-}): Promise<void>;
-import fs from 'node:fs/promises';
-//# sourceMappingURL=watch.d.ts.map

package/lib/watch.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["watch.js"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,2BAJW,OAAO,IAAI,EAAE,QAAQ,UACrB,MAAM,YACN;IAAC,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;CAAC,iBA+CpE;eApDc,kBAAkB"}

package/lib/watch.js

@@ -1,53 +0,0 @@
-import fs from 'node:fs/promises'
-
-/**
- * @param {import("fs").PathLike} dir
- * @param {RegExp} ignore
- * @param {{(event: fs.FileChangeInfo<string>): Promise<void> | void}} onChange
- */
-export async function watch(dir, ignore, onChange) {
-	let busy = false
-	let dirty = false
-	/** @type {ReturnType<typeof setTimeout> | null} */
-	let timeout = null
-	const delay = 1000
-	const defaultIgnorePattern = /node_modules|\.git|\.DS_Store|\.orga-build/
-
-	const watcher = fs.watch(dir, { recursive: true })
-	for await (const event of watcher) {
-		if (
-			event.eventType !== 'change' ||
-			event.filename === null ||
-			shouldIgnore(event.filename)
-		) {
-			continue
-		}
-		console.log(`file changed: ${event.filename}`)
-		dirty = true
-		if (busy) {
-			continue
-		}
-		if (timeout !== null) clearTimeout(timeout)
-		timeout = setTimeout(processEvent, delay, event)
-	}
-
-	/**
-	 * @param {any} event
-	 */
-	async function processEvent(event) {
-		busy = true
-		dirty = false
-		await onChange(event)
-		busy = false
-		if (dirty) {
-			processEvent(event)
-		}
-	}
-
-	/**
-	 * @param {string} filename
-	 */
-	function shouldIgnore(filename) {
-		return defaultIgnorePattern.test(filename) || ignore.test(filename)
-	}
-}