npm - orga-build - Versions diffs - 0.5.4 → 0.6.1 - Mend

orga-build 0.5.4 → 0.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (22) hide show

package/README.org CHANGED Viewed

@@ -78,6 +78,10 @@ export default {
   // CSS class(es) to wrap rendered org content
   containerClass: ['prose', 'prose-lg'],
+  // Global stylesheet URLs (explicit, no magic files)
+  // These are injected in dev SSR <head> and imported by the client entry.
+  styles: ['/style.css'],
   // Additional Vite plugins
   vitePlugins: []
 }
@@ -90,6 +94,7 @@ export default {
 | =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 |
 | =vitePlugins= | =PluginOption[]= | =[]= | Additional Vite plugins |
 * TypeScript Setup

package/cli.js CHANGED Viewed

@@ -16,6 +16,11 @@ const { positionals } = parseArgs({
 	allowPositionals: true
 })
-const config = await loadConfig('orga.config.js', 'orga.config.mjs')
+const { config, projectRoot } = await loadConfig(
+	'orga.config.js',
+	'orga.config.mjs'
+)
-await (positionals.includes('dev') ? serve(config) : build(config))
+await (positionals.includes('dev')
+	? serve(config, 3000, projectRoot)
+	: build(config, projectRoot))

package/lib/build.d.ts CHANGED Viewed

@@ -1,7 +1,8 @@
 /**
  * @param {import('./config.js').Config} config
+ * @param {string} [projectRoot]
  */
-export function build({ outDir, root, containerClass, vitePlugins }: import("./config.js").Config): Promise<void>;
+export function build({ outDir, root, containerClass, styles, vitePlugins }: import("./config.js").Config, projectRoot?: string): Promise<void>;
 export { alias };
 import { alias } from './plugin.js';
 //# sourceMappingURL=build.d.ts.map

package/lib/build.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"build.d.ts","sourceRoot":"","sources":["build.js"],"names":[],"mappings":"~~AAcA;;GAEG~~;AACH,~~qEAFW~~,OAAO,aAAa,EAAE,MAAM,~~iBAmJtC~~;;~~sBA7J4C~~,aAAa"}
1	+ {"version":3,"file":"build.d.ts","sourceRoot":"","sources":["build.js"],"names":[],"mappings":"AAeA;;;GAGG;AACH,6EAHW,OAAO,aAAa,EAAE,MAAM,gBAC5B,MAAM,iBAoJhB;;sBAhK4C,aAAa"}

package/lib/build.js CHANGED Viewed

@@ -4,6 +4,7 @@ import { fileURLToPath, pathToFileURL } from 'node:url'
 import { emptyDir, ensureDir, exists } from './fs.js'
 import fs from 'fs/promises'
 import { createOrgaBuildConfig, alias } from './plugin.js'
+import { escapeHtml } from './util.js'
 // Re-export alias for backwards compatibility
 export { alias }
@@ -14,13 +15,15 @@ const defaultIndexHtml = fileURLToPath(new URL('./index.html', import.meta.url))
 /**
  * @param {import('./config.js').Config} config
+ * @param {string} [projectRoot]
  */
 export async function build({
 	outDir,
 	root,
 	containerClass,
+	styles = [],
 	vitePlugins = []
-}) {
+}, projectRoot = process.cwd()) {
 	await emptyDir(outDir)
 	const ssrOutDir = path.join(outDir, '.ssr')
 	const clientOutDir = outDir
@@ -29,6 +32,7 @@ export async function build({
 		root,
 		outDir,
 		containerClass,
+		styles,
 		vitePlugins
 	})
@@ -100,7 +104,6 @@ export async function build({
 	/* --- get html template, inject entry js and css --- */
 	// Check for user's index.html in project root, otherwise use default
-	const projectRoot = process.cwd()
 	const userIndexPath = path.join(projectRoot, 'index.html')
 	const indexHtmlPath = (await exists(userIndexPath)) ? userIndexPath : defaultIndexHtml
 	const template = await fs.readFile(indexHtmlPath, { encoding: 'utf-8' })
@@ -150,12 +153,12 @@ export async function build({
 		html = html.replace('</head>', `${css}</head>`)
-		const page = pages[pagePath]
-		if (page && page.title) {
-			html = html.replace(
-				/<title>(.*?)<\/title>/,
-				`<title>${page.title}</title>`
-			)
+			const page = pages[pagePath]
+		if (page) {
+			html = html.replace(/%orga\.(\w+)%/g, (_, key) => {
+				const value = page[key] ?? ''
+				return escapeHtml(String(value))
+			})
 		}
 		return html

package/lib/config.d.ts CHANGED Viewed

@@ -1,8 +1,11 @@
 /**
  * @param {string[]} files
- * @returns {Promise<Config>}
+ * @returns {Promise<{ config: Config, projectRoot: string }>}
  */
-export function loadConfig(...files: string[]): Promise<Config>;
+export function loadConfig(...files: string[]): Promise<{
+    config: Config;
+    projectRoot: string;
+}>;
 export type Config = {
     outDir: string;
     root: string;
@@ -13,5 +16,9 @@ export type Config = {
      */
     vitePlugins: import("vite").PluginOption[];
     containerClass: string[] | string;
+    /**
+     * - Global stylesheet URLs injected in dev SSR and imported by client entry
+     */
+    styles?: string[];
 };
 //# sourceMappingURL=config.d.ts.map

package/lib/config.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["config.js"],"names":[],"mappings":"~~AAuBA~~;;;GAGG;AACH,qCAHW,MAAM,EAAE,GACN,OAAO,CAAC,MAAM,CAAC,~~CAsC3B~~;;~~YA1Da~~,MAAM;UACN,MAAM;cACN,MAAM,EAAE;eACR,MAAM,EAAE;;;;iBACR,OAAO,MAAM,EAAE,YAAY,EAAE;oBAC7B,MAAM,EAAE,GAAC,MAAM"}
1	+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["config.js"],"names":[],"mappings":"AAyBA;;;GAGG;AACH,qCAHW,MAAM,EAAE,GACN,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC,CA6C5D;;YAnEa,MAAM;UACN,MAAM;cACN,MAAM,EAAE;eACR,MAAM,EAAE;;;;iBACR,OAAO,MAAM,EAAE,YAAY,EAAE;oBAC7B,MAAM,EAAE,GAAC,MAAM;;;;aACf,MAAM,EAAE"}

package/lib/config.js CHANGED Viewed

@@ -9,6 +9,7 @@ import path from 'node:path'
  * @property {string[]} postBuild
  * @property {import('vite').PluginOption[]} vitePlugins - Array of Vite plugins
  * @property {string[]|string} containerClass
+ * @property {string[]} [styles] - Global stylesheet URLs injected in dev SSR and imported by client entry
  */
 /** @type {Config} */
@@ -18,12 +19,13 @@ const defaultConfig = {
 	preBuild: [],
 	postBuild: [],
 	vitePlugins: [],
-	containerClass: []
+	containerClass: [],
+	styles: []
 }
 /**
  * @param {string[]} files
- * @returns {Promise<Config>}
+ * @returns {Promise<{ config: Config, projectRoot: string }>}
  */
 export async function loadConfig(...files) {
 	const cwd = process.cwd()
@@ -35,6 +37,7 @@ export async function loadConfig(...files) {
 		path.isAbsolute(value) ? value : path.resolve(cwd, value)
 	let result = { ...defaultConfig }
+	let configPath = null
 	for (const file of files) {
 		const filePath = path.join(cwd, file)
@@ -51,6 +54,7 @@ export async function loadConfig(...files) {
 			// Support both default export (recommended) and named exports
 			const config = module.default || module
 			result = { ...defaultConfig, ...config }
+			configPath = filePath
 			break
 		} catch (err) {
 			// Config file exists but has errors
@@ -60,5 +64,10 @@ export async function loadConfig(...files) {
 	result.root = resolveConfigPath(result.root)
 	result.outDir = resolveConfigPath(result.outDir)
-	return result
+	const styles = result.styles
+	result.styles = Array.isArray(styles) ? styles.filter((v) => typeof v === 'string') : []
+	return {
+		config: result,
+		projectRoot: configPath ? path.dirname(configPath) : cwd
+	}
 }

package/lib/index.html CHANGED Viewed

@@ -3,7 +3,7 @@
 <head>
 	<meta charset="UTF-8"/>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-	<title>📘Orga Pages</title>
+	<title>%orga.title%</title>
 </head>
 <body>
 <div id="root"></div>

package/lib/plugin.d.ts CHANGED Viewed

@@ -3,6 +3,7 @@
  * @property {string} root - Root directory for content files
  * @property {string | undefined} [outDir] - Output directory (excluded from file discovery)
  * @property {string|string[]} [containerClass] - CSS class(es) to wrap rendered content
+ * @property {string[]} [styles] - Global stylesheet URLs to import/inject
  */
 /**
  * Creates the canonical orga-build plugin preset.
@@ -11,7 +12,7 @@
  * @param {OrgaBuildPluginOptions} options
  * @returns {import('vite').PluginOption[]}
  */
-export function orgaBuildPlugin({ root, outDir, containerClass }: OrgaBuildPluginOptions): import("vite").PluginOption[];
+export function orgaBuildPlugin({ root, outDir, containerClass, styles }: OrgaBuildPluginOptions): import("vite").PluginOption[];
 /**
  * Creates the full Vite config options for orga-build.
  * Includes plugins, resolve aliases, and other shared config.
@@ -19,7 +20,7 @@ export function orgaBuildPlugin({ root, outDir, containerClass }: OrgaBuildPlugi
  * @param {OrgaBuildPluginOptions & { outDir?: string, vitePlugins?: import('vite').PluginOption[], includeFallbackHtml?: boolean, projectRoot?: string }} options
  * @returns {{ plugins: import('vite').PluginOption[], resolve: { alias: typeof alias } }}
  */
-export function createOrgaBuildConfig({ root, outDir, containerClass, vitePlugins, includeFallbackHtml, projectRoot }: OrgaBuildPluginOptions & {
+export function createOrgaBuildConfig({ root, outDir, containerClass, styles, vitePlugins, includeFallbackHtml, projectRoot }: OrgaBuildPluginOptions & {
     outDir?: string;
     vitePlugins?: import("vite").PluginOption[];
     includeFallbackHtml?: boolean;
@@ -33,17 +34,18 @@ export function createOrgaBuildConfig({ root, outDir, containerClass, vitePlugin
 /**
  * Creates an HTML serving plugin that handles index.html for dev mode.
  *
- * This plugin:
- * - Serves user's index.html from project root if present, otherwise uses the default template
+ * This plugin performs per-request SSR in dev mode (matching Astro/SvelteKit behaviour):
+ * - SSR-renders each page on every request using Vite's server module runner
+ * - Injects rendered content and page metadata (%orga.*% placeholders) into the template
+ * - Falls back to the shell HTML for unknown routes (client-side router handles 404)
  * - Only handles GET/HEAD requests that accept HTML
- * - Runs late (post middleware) so other plugins get first chance
- * - Passes HTML through transformIndexHtml for ecosystem compatibility
  * - Does not intercept asset requests
  *
  * @param {string} projectRoot - Project root directory (where orga.config.js lives)
+ * @param {string[]} [styles]
  * @returns {import('vite').Plugin}
  */
-export function htmlFallbackPlugin(projectRoot: string): import("vite").Plugin;
+export function htmlFallbackPlugin(projectRoot: string, styles?: string[]): import("vite").Plugin;
 /**
  * Alias map for React and wouter to ensure consistent resolution
  */
@@ -65,5 +67,9 @@ export type OrgaBuildPluginOptions = {
      * - CSS class(es) to wrap rendered content
      */
     containerClass?: string | string[];
+    /**
+     * - Global stylesheet URLs to import/inject
+     */
+    styles?: string[];
 };
 //# sourceMappingURL=plugin.d.ts.map

package/lib/plugin.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["plugin.js"],"names":[],"mappings":"~~AAoBA;;;;;GAKG~~;AAEH;;;;;;GAMG;AACH,~~kEAHW~~,sBAAsB,GACpB,OAAO,MAAM,EAAE,YAAY,EAAE,~~CAQzC~~;AAED;;;;;;GAMG;AACH,~~uHAHW,~~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,~~CAoBxF~~;AAiBD~~;;;;;;;;;;;;GAYG~~;AACH,~~gDAHW~~,MAAM,~~GACJ~~,OAAO,MAAM,EAAE,MAAM,~~CA8CjC~~;~~AAlID~~;;GAEG;AACH;;;;EAIC;;;;;UAIa,MAAM;;;;aACN,MAAM,GAAG,SAAS;;;;qBAClB,MAAM,GAAC,MAAM,EAAE"}
1	+ {"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["plugin.js"],"names":[],"mappings":"AAuBA;;;;;;GAMG;AAEH;;;;;;GAMG;AACH,0EAHW,sBAAsB,GACpB,OAAO,MAAM,EAAE,YAAY,EAAE,CAazC;AAED;;;;;;GAMG;AACH,+HAHW,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,CAwBxF;AAiBD;;;;;;;;;;;;;GAaG;AACH,gDAJW,MAAM,WACN,MAAM,EAAE,GACN,OAAO,MAAM,EAAE,MAAM,CAmFjC;AAlLD;;GAEG;AACH;;;;EAIC;;;;;UAIa,MAAM;;;;aACN,MAAM,GAAG,SAAS;;;;qBAClB,MAAM,GAAC,MAAM,EAAE;;;;aACf,MAAM,EAAE"}

package/lib/plugin.js CHANGED Viewed

@@ -2,13 +2,16 @@ import path from 'node:path'
 import fs from 'node:fs/promises'
 import { createRequire } from 'node:module'
 import { fileURLToPath } from 'node:url'
+import { createServerModuleRunner } from 'vite'
 import react from '@vitejs/plugin-react'
 import { setupOrga } from './orga.js'
 import { pluginFactory } from './vite.js'
+import { escapeHtml } from './util.js'
+const ssrEntry = fileURLToPath(new URL('./ssr.jsx', import.meta.url))
 const require = createRequire(import.meta.url)
 const defaultIndexHtml = fileURLToPath(new URL('./index.html', import.meta.url))
 /**
  * Alias map for React and wouter to ensure consistent resolution
  */
@@ -23,6 +26,7 @@ export const alias = {
  * @property {string} root - Root directory for content files
  * @property {string | undefined} [outDir] - Output directory (excluded from file discovery)
  * @property {string|string[]} [containerClass] - CSS class(es) to wrap rendered content
+ * @property {string[]} [styles] - Global stylesheet URLs to import/inject
  */
 /**
@@ -32,11 +36,16 @@ export const alias = {
  * @param {OrgaBuildPluginOptions} options
  * @returns {import('vite').PluginOption[]}
  */
-export function orgaBuildPlugin({ root, outDir, containerClass = [] }) {
+export function orgaBuildPlugin({
+	root,
+	outDir,
+	containerClass = [],
+	styles = []
+}) {
 	return [
 		setupOrga({ containerClass, root }),
 		react(),
-		pluginFactory({ dir: root, outDir })
+		pluginFactory({ dir: root, outDir, styles })
 	]
 }
@@ -51,15 +60,19 @@ export function createOrgaBuildConfig({
 	root,
 	outDir,
 	containerClass = [],
+	styles = [],
 	vitePlugins = [],
 	includeFallbackHtml = false,
 	projectRoot = process.cwd()
 }) {
-	const plugins = [...vitePlugins, ...orgaBuildPlugin({ root, outDir, containerClass })]
+	const plugins = [
+		...vitePlugins,
+		...orgaBuildPlugin({ root, outDir, containerClass, styles })
+	]
 	if (includeFallbackHtml) {
 		// HTML fallback must be first so it can handle HTML navigation requests
 		// before runtime plugins (e.g. Cloudflare) potentially return 404.
-		plugins.unshift(htmlFallbackPlugin(projectRoot))
+		plugins.unshift(htmlFallbackPlugin(projectRoot, styles))
 	}
 	return {
 		plugins,
@@ -85,17 +98,18 @@ async function hasUserIndexHtml(root) {
 /**
  * Creates an HTML serving plugin that handles index.html for dev mode.
  *
- * This plugin:
- * - Serves user's index.html from project root if present, otherwise uses the default template
+ * This plugin performs per-request SSR in dev mode (matching Astro/SvelteKit behaviour):
+ * - SSR-renders each page on every request using Vite's server module runner
+ * - Injects rendered content and page metadata (%orga.*% placeholders) into the template
+ * - Falls back to the shell HTML for unknown routes (client-side router handles 404)
  * - Only handles GET/HEAD requests that accept HTML
- * - Runs late (post middleware) so other plugins get first chance
- * - Passes HTML through transformIndexHtml for ecosystem compatibility
  * - Does not intercept asset requests
  *
  * @param {string} projectRoot - Project root directory (where orga.config.js lives)
+ * @param {string[]} [styles]
  * @returns {import('vite').Plugin}
  */
-export function htmlFallbackPlugin(projectRoot) {
+export function htmlFallbackPlugin(projectRoot, styles = []) {
 	return {
 		name: 'orga-build:html-fallback',
@@ -106,7 +120,11 @@ export function htmlFallbackPlugin(projectRoot) {
 			const userHasIndex = await hasUserIndexHtml(projectRoot)
 			const indexHtmlPath = userHasIndex ? userIndexPath : defaultIndexHtml
-			// Add middleware to serve HTML early in the chain.
+			// CJS compatibility here depends on Vite externalizing bare-specifier deps
+			// (e.g. react/*) to native Node import(). If aliases rewrite specifiers
+			// to absolute paths, modules can be inlined and evaluated without CJS globals.
+			const runner = createServerModuleRunner(server.environments.ssr)
 			server.middlewares.use(async (req, res, next) => {
 				// Only handle GET/HEAD requests
 				if (req.method !== 'GET' && req.method !== 'HEAD') {
@@ -128,8 +146,41 @@ export function htmlFallbackPlugin(projectRoot) {
 				}
 				try {
+					// Import via the runner on each request — the module graph handles
+					// HMR invalidation so stale modules are never served.
+					const { render, pages } = await runner.import(ssrEntry)
+					const content = render(pathname)
 					let html = await fs.readFile(indexHtmlPath, 'utf-8')
 					html = await server.transformIndexHtml(url, html)
+					const uniqueCssUrls = [...new Set(styles)]
+					if (uniqueCssUrls.length > 0) {
+						const cssLinks = uniqueCssUrls
+							.map((u) => `<link rel="stylesheet" href="${escapeHtml(u)}">`)
+							.join('')
+						html = html.replace('</head>', `${cssLinks}</head>`)
+					}
+					if (content) {
+						const ssr = { routePath: pathname }
+						html = html.replace(
+							'<div id="root"></div>',
+							`<script>window._ssr=${JSON.stringify(ssr)};</script><div id="root">${content}</div>`
+						)
+					}
+					// Replace %orga.*% placeholders with page metadata
+					const page = pages[pathname]
+					if (page) {
+						html = html.replace(/%orga\.(\w+)%/g, (_, key) => {
+							const value = page[key] ?? ''
+							return escapeHtml(String(value))
+						})
+					}
+					// Strip any remaining unresolved placeholders (unknown route)
+					html = html.replace(/%orga\.\w+%/g, '')
 					res.statusCode = 200
 					res.setHeader('Content-Type', 'text/html')
 					res.end(html)

package/lib/serve.d.ts CHANGED Viewed

@@ -3,6 +3,7 @@
  *
  * @param {import('./config.js').Config} config
  * @param {number} [port]
+ * @param {string} [projectRoot]
  */
-export function serve(config: import("./config.js").Config, port?: number): Promise<void>;
+export function serve(config: import("./config.js").Config, port?: number, projectRoot?: string): Promise<void>;
 //# sourceMappingURL=serve.d.ts.map

package/lib/serve.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["serve.js"],"names":[],"mappings":"AAIA~~;;;;;GAKG~~;AACH,~~8BAHW~~,OAAO,aAAa,EAAE,MAAM,SAC5B,MAAM,~~iBA2BhB~~"}
1	+ {"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["serve.js"],"names":[],"mappings":"AAIA;;;;;;GAMG;AACH,8BAJW,OAAO,aAAa,EAAE,MAAM,SAC5B,MAAM,gBACN,MAAM,iBAsChB"}

package/lib/serve.js CHANGED Viewed

@@ -1,27 +1,39 @@
 import path from 'node:path'
 import { createServer } from 'vite'
-import { createOrgaBuildConfig } from './plugin.js'
+import { createOrgaBuildConfig, alias } from './plugin.js'
 /**
  * Start the development server using native Vite.
  *
  * @param {import('./config.js').Config} config
  * @param {number} [port]
+ * @param {string} [projectRoot]
  */
-export async function serve(config, port = 3000) {
-	const { plugins, resolve } = createOrgaBuildConfig({
+export async function serve(config, port = 3000, projectRoot = process.cwd()) {
+	const { plugins } = createOrgaBuildConfig({
 		root: config.root,
 		outDir: config.outDir,
 		containerClass: config.containerClass,
+		styles: config.styles ?? [],
 		vitePlugins: config.vitePlugins,
-		includeFallbackHtml: true
+		includeFallbackHtml: true,
+		projectRoot
 	})
 	const server = await createServer({
 		root: config.root,
 		plugins,
-		resolve,
 		appType: 'custom',
+		// Aliases are scoped to the client environment only.
+		// The SSR environment must NOT have these aliases: they convert bare specifiers
+		// (e.g. 'react') into absolute paths, which bypasses Vite's fetchModule
+		// externalization branch and causes CJS packages to be evaluated inline by
+		// ESModulesEvaluator (which has no 'module'/'require' globals).
+		environments: {
+			client: {
+				resolve: /** @type {any} */ ({ alias })
+			}
+		},
 		server: {
 			port,
 			strictPort: false,

package/lib/util.d.ts CHANGED Viewed

@@ -16,6 +16,11 @@ 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
  */

package/lib/util.d.ts.map CHANGED Viewed

	@@ -1 +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;;GAEG;AACH,uBAFW,MAAM,gBAehB"}
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"}

package/lib/util.js CHANGED Viewed

@@ -42,6 +42,18 @@ export function DefaultLayout({ title, children }) {
 	)
 }
+/**
+ * @param {string} str
+ * @returns {string}
+ */
+export function escapeHtml(str) {
+	return String(str)
+		.replace(/&/g, '&amp;')
+		.replace(/"/g, '&quot;')
+		.replace(/</g, '&lt;')
+		.replace(/>/g, '&gt;')
+}
 /**
  * @param {string} cmd
  */

package/lib/vite.d.ts CHANGED Viewed

@@ -2,10 +2,12 @@
  * @param {Object} options
  * @param {string} options.dir
  * @param {string} [options.outDir]
+ * @param {string[]} [options.styles]
  * @returns {import('vite').Plugin}
  */
-export function pluginFactory({ dir, outDir }: {
+export function pluginFactory({ dir, outDir, styles }: {
     dir: string;
     outDir?: string | undefined;
+    styles?: string[] | undefined;
 }): import("vite").Plugin;
 //# sourceMappingURL=vite.d.ts.map

package/lib/vite.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"vite.d.ts","sourceRoot":"","sources":["vite.js"],"names":[],"mappings":"AASA~~;;;;;GAKG~~;AACH~~,+CAJG~~;IAAwB,GAAG,EAAnB,MAAM;IACW,MAAM;~~CAC/B~~,GAAU,OAAO,MAAM,EAAE,MAAM,~~CA2JjC~~"}
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,CA8JjC"}

package/lib/vite.js CHANGED Viewed

@@ -11,9 +11,10 @@ const contentModuleIdResolved = '\0' + contentModuleId
  * @param {Object} options
  * @param {string} options.dir
  * @param {string} [options.outDir]
+ * @param {string[]} [options.styles]
  * @returns {import('vite').Plugin}
  */
-export function pluginFactory({ dir, outDir }) {
+export function pluginFactory({ dir, outDir, styles = [] }) {
 	const files = setup(dir, { outDir })
 	return {
@@ -62,7 +63,10 @@ export function pluginFactory({ dir, outDir }) {
 		},
 		async load(id) {
 			if (id === appEntryId) {
-				return `import "orga-build/csr";`
+				const styleImports = styles
+					.map((styleUrl) => `import ${JSON.stringify(styleUrl)};`)
+					.join('\n')
+				return `${styleImports}\nimport "orga-build/csr";`
 			}
 			if (id === contentModuleIdResolved) {
 				return await renderContentModule()

package/package.json CHANGED Viewed

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