orga-build 0.4.0 → 0.5.0

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

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

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

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

package/lib/__tests__/build.test.js

@@ -0,0 +1,64 @@
+import { test, describe, before, after } from 'node:test'
+import assert from 'node:assert'
+import fs from 'node:fs/promises'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { build } from '../build.js'
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const fixtureDir = path.join(__dirname, 'fixtures')
+const outDir = path.join(__dirname, '.test-output')
+
+describe('orga-build', () => {
+	before(async () => {
+		await fs.mkdir(fixtureDir, { recursive: true })
+		// Create minimal fixture
+		await fs.writeFile(
+			path.join(fixtureDir, 'index.org'),
+			`#+title: Test Page
+
+* Hello World
+
+This is a test page.
+`
+		)
+	})
+
+	after(async () => {
+		await fs.rm(outDir, { recursive: true, force: true })
+		await fs.rm(fixtureDir, { recursive: true, force: true })
+	})
+
+	test('builds org files to HTML', async () => {
+		await build({
+			root: fixtureDir,
+			outDir: outDir,
+			containerClass: [],
+			vitePlugins: [],
+			preBuild: [],
+			postBuild: []
+		})
+
+		// Check output exists
+		const indexPath = path.join(outDir, 'index.html')
+		const indexExists = await fs
+			.access(indexPath)
+			.then(() => true)
+			.catch(() => false)
+		assert.ok(indexExists, 'index.html should exist')
+
+		// Check content
+		const html = await fs.readFile(indexPath, 'utf-8')
+		assert.ok(html.includes('<title>Test Page</title>'), 'should have title')
+		assert.ok(html.includes('Hello World'), 'should have heading content')
+	})
+
+	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')
+	})
+})

package/lib/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["build.js"],"names":[],"mappings":"AAmBA;;GAEG;AACH,qEAFW,OAAO,aAAa,EAAE,MAAM,iBA8JtC;AArKD;;;;EAIC"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["build.js"],"names":[],"mappings":"AAqBA;;GAEG;AACH,qEAFW,OAAO,aAAa,EAAE,MAAM,iBAoJtC;AA9JD;;;;EAIC"}

package/lib/build.js

@@ -1,13 +1,12 @@
 import path from 'node:path'
 import { createRequire } from 'node:module'
-import { build as viteBuild } from 'vite'
+import { createBuilder } from 'vite'
 import { setupOrga } from './orga.js'
 import react from '@vitejs/plugin-react'
 import { fileURLToPath, pathToFileURL } from 'node:url'
 import { copy, emptyDir, ensureDir } from './fs.js'
 import { pluginFactory } from './vite.js'
 import fs from 'fs/promises'
-import assert from 'node:assert'
 
 const require = createRequire(import.meta.url)
 
@@ -17,6 +16,9 @@ export const alias = {
 	wouter: path.dirname(require.resolve('wouter'))
 }
 
+const ssrEntry = fileURLToPath(new URL('./ssr.jsx', import.meta.url))
+const clientEntry = fileURLToPath(new URL('./client.jsx', import.meta.url))
+
 /**
  * @param {import('./config.js').Config} config
  */
@@ -26,7 +28,6 @@ export async function build({
 	containerClass,
 	vitePlugins = []
 }) {
-	/* --- prepare folders, out, ssr, client --- */
 	await emptyDir(outDir)
 	const ssrOutDir = path.join(outDir, '.ssr')
 	const clientOutDir = path.join(outDir, '.client')
@@ -38,80 +39,71 @@ export async function build({
 		...vitePlugins
 	]
 
-	/* --- build ssr bundle: server.mjs --- */
-	console.log('preparing ssr bundle...')
-	await viteBuild({
+	// Shared config with environment-specific build settings
+	const builder = await createBuilder({
 		root,
 		plugins,
-		build: {
-			ssr: true,
-			cssCodeSplit: false,
-			emptyOutDir: true,
-			rollupOptions: {
-				input: fileURLToPath(new URL('./ssr.jsx', import.meta.url)),
-				output: {
-					entryFileNames: '[name].mjs',
-					chunkFileNames: '[name]-[hash].mjs'
+		resolve: { alias },
+		ssr: { noExternal: true },
+		environments: {
+			ssr: {
+				build: {
+					ssr: true,
+					outDir: ssrOutDir,
+					cssCodeSplit: false,
+					emptyOutDir: true,
+					minify: false,
+					rollupOptions: {
+						input: ssrEntry,
+						output: {
+							entryFileNames: '[name].mjs',
+							chunkFileNames: '[name]-[hash].mjs'
+						}
+					}
 				}
 			},
-			outDir: ssrOutDir,
-			minify: false
-		},
-		ssr: {
-			noExternal: true
-		},
-		resolve: {
-			alias: alias
+			client: {
+				build: {
+					outDir: clientOutDir,
+					cssCodeSplit: false,
+					emptyOutDir: true,
+					assetsDir: 'assets',
+					rollupOptions: {
+						input: clientEntry,
+						preserveEntrySignatures: 'allow-extension'
+					}
+				}
+			}
 		}
 	})
 
-	/* --- import ssr bundle entry output, to get all the data and render function --- */
+	// Build SSR first to get render function and pages
+	console.log('preparing ssr bundle...')
+	await builder.build(builder.environments.ssr)
 
 	const { render, pages } = await import(
 		pathToFileURL(path.join(ssrOutDir, 'ssr.mjs')).toString()
 	)
 
-	/* --- build client bundle: client.mjs --- */
-	const _clientResult = await viteBuild({
-		root,
-		plugins,
-		build: {
-			cssCodeSplit: false,
-			emptyOutDir: true,
-			rollupOptions: {
-				input: fileURLToPath(new URL('./client.jsx', import.meta.url)),
-				preserveEntrySignatures: 'allow-extension'
-			},
-			assetsDir: 'assets',
-			outDir: clientOutDir
-		},
-		ssr: {
-			noExternal: true
-		},
-		resolve: {
-			alias: alias
-		}
-	})
+	// Build client bundle
+	const _clientResult = await builder.build(builder.environments.client)
 
-	/** @type {import('vite').Rollup.RollupOutput} */
-	let clientResult
-	if (Array.isArray(_clientResult)) {
-		if (_clientResult.length !== 1)
-			throw new Error(`expect viteBuild to have only one BuildResult`)
-		clientResult = _clientResult[0]
-	} else {
-		assert('output' in _clientResult)
-		clientResult = _clientResult
-	}
+	// Normalize build result to single RollupOutput
+	const clientOutput = Array.isArray(_clientResult)
+		? _clientResult[0].output
+		: 'output' in _clientResult
+			? _clientResult.output
+			: null
+	if (!clientOutput) throw new Error('Unexpected client build result')
 
 	/* --- get from client bundle result: entry chunk, css chunks --- */
-	const entryChunk = clientResult.output.filter((c) => {
-		return c.type === 'chunk' && c.isEntry
-	})[0]
+	const entryChunk = clientOutput.find(
+		(/** @type {any} */ c) => c.type === 'chunk' && c.isEntry
+	)
 
-	const cssChunks = clientResult.output.filter((c) => {
-		return c.type === 'asset' && c.fileName.endsWith('.css')
-	})
+	const cssChunks = clientOutput.filter(
+		(/** @type {any} */ c) => c.type === 'asset' && c.fileName.endsWith('.css')
+	)
 
 	/* --- get html template, inject entry js and css --- */
 	const template = await fs.readFile(
@@ -157,11 +149,11 @@ export async function build({
 		`
 		)
 		const css = cssChunks
-			.map((c) => `<link rel="stylesheet" href="/${c.fileName}">`)
+			.map((/** @type {any} */ c) => `<link rel="stylesheet" href="/${c.fileName}">`)
 			.join('\n')
 		html = html.replace(
 			'<script type="module" src="/@orga-build/main.js"></script>',
-			`<script type="module" src="/${entryChunk.fileName}"></script>`
+			`<script type="module" src="/${entryChunk?.fileName}"></script>`
 		)
 
 		html = html.replace('</head>', `${css}</head>`)

package/lib/serve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["serve.js"],"names":[],"mappings":"AAQA;;;GAGG;AACH,8BAHW,OAAO,aAAa,EAAE,MAAM,SAC5B,MAAM,iBA6ChB"}
+{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["serve.js"],"names":[],"mappings":"AAQA;;;GAGG;AACH,8BAHW,OAAO,aAAa,EAAE,MAAM,SAC5B,MAAM,iBA4ChB"}

package/lib/serve.js

@@ -45,7 +45,6 @@ export async function serve(config, port = 3000) {
 			const html = template
 			res.status(200).setHeader('Content-Type', 'text/html').end(html)
 		} catch (/** @type{any} */ e) {
-			vite.ssrFixStacktrace(e)
 			next(e)
 		}
 	})

package/lib/vite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite.d.ts","sourceRoot":"","sources":["vite.js"],"names":[],"mappings":"AASA;;;;GAIG;AACH,uCAHG;IAAwB,GAAG,EAAnB,MAAM;CACd,GAAU,OAAO,MAAM,EAAE,MAAM,CA6JjC"}
+{"version":3,"file":"vite.d.ts","sourceRoot":"","sources":["vite.js"],"names":[],"mappings":"AASA;;;;GAIG;AACH,uCAHG;IAAwB,GAAG,EAAnB,MAAM;CACd,GAAU,OAAO,MAAM,EAAE,MAAM,CA2JjC"}

package/lib/vite.js

@@ -19,6 +19,11 @@ export function pluginFactory({ dir }) {
 		name: 'vite-plugin-orga-pages',
 		enforce: 'pre',
 		config: (config, env) => ({
+			future: {
+				removePluginHookSsrArgument: 'warn',
+				removePluginHookHandleHotUpdate: 'warn',
+				removeSsrLoadModule: 'warn'
+			},
 			optimizeDeps: {
 				include: [
 					'react',
@@ -31,25 +36,18 @@ export function pluginFactory({ dir }) {
 			}
 		}),
 
-		configureServer(server) {
-			const { watcher, moduleGraph, ws } = server
-
-			// Invalidate content module on file changes
-			watcher.on('change', (filePath) => {
-				const module = moduleGraph.getModuleById(contentModuleIdResolved)
-				if (module) {
-					moduleGraph.invalidateModule(module)
-					// Send HMR update to client
-					ws.send({
-						type: 'full-reload',
-						path: '*'
-					})
-				}
-			})
+		hotUpdate() {
+			// 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
+				this.environment.hot.send({ type: 'full-reload', path: '*' })
+			}
 		},
 
-		buildStart() {},
-
 		async resolveId(id, importer) {
 			if (id === appEntryId) {
 				return appEntryId

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "orga-build",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "A simple tool that builds org-mode files into a website",
   "type": "module",
+  "engines": {
+    "node": ">=20.19.0"
+  },
   "bin": {
     "orga-build": "./cli.js"
   },
@@ -60,6 +63,7 @@
     "orga": "4.6.0"
   },
   "scripts": {
-    "clean": "fd . -e d.ts -e d.ts.map -I -x rm {}"
+    "clean": "fd . -e d.ts -e d.ts.map -I -x rm {}",
+    "test": "node --test --no-warnings \"lib/__tests__/*.test.js\""
   }
 }