orga-build 0.6.1 → 0.6.2

package/lib/__tests__/build.test.js

@@ -29,6 +29,10 @@ Here's [[file:more.org][another page]].
 		)
 		await fs.writeFile(path.join(fixtureDir, 'docs', 'index.org'), 'Docs index page.')
 		await fs.writeFile(path.join(fixtureDir, 'more.org'), 'Another page.')
+		await fs.writeFile(
+			path.join(fixtureDir, 'style.css'),
+			'.global-style-marker { color: rgb(1, 2, 3); }'
+		)
 	})
 
 	after(async () => {
@@ -70,4 +74,29 @@ Here's [[file:more.org][another page]].
 			.catch(() => false)
 		assert.ok(assetsExists, 'assets directory should exist')
 	})
+
+	test('processes configured global styles through vite and injects built css', async () => {
+		await build({
+			root: fixtureDir,
+			outDir: outDir,
+			containerClass: [],
+			styles: ['/style.css'],
+			vitePlugins: [],
+			preBuild: [],
+			postBuild: []
+		})
+
+		const html = await fs.readFile(path.join(outDir, 'index.html'), 'utf-8')
+		assert.ok(!html.includes('href="/style.css"'), 'should not link raw source css path')
+
+		const cssHrefMatch = html.match(/href="\/(assets\/[^"]+\.css)"/)
+		assert.ok(cssHrefMatch, 'should link built css asset from assets with hashed name')
+
+		const builtCssPath = cssHrefMatch[1]
+		const builtCss = await fs.readFile(path.join(outDir, builtCssPath), 'utf-8')
+		assert.ok(
+			builtCss.includes('.global-style-marker'),
+			'built css should include configured global style content'
+		)
+	})
 })

package/lib/build.js

@@ -5,12 +5,12 @@ import { emptyDir, ensureDir, exists } from './fs.js'
 import fs from 'fs/promises'
 import { createOrgaBuildConfig, alias } from './plugin.js'
 import { escapeHtml } from './util.js'
+import { appEntryId } from './vite.js'
 
 // Re-export alias for backwards compatibility
 export { alias }
 
 const ssrEntry = fileURLToPath(new URL('./ssr.jsx', import.meta.url))
-const clientEntry = fileURLToPath(new URL('./client.jsx', import.meta.url))
 const defaultIndexHtml = fileURLToPath(new URL('./index.html', import.meta.url))
 
 /**
@@ -66,7 +66,7 @@ export async function build({
 					emptyOutDir: false,
 					assetsDir: 'assets',
 					rollupOptions: {
-						input: clientEntry,
+						input: appEntryId,
 						preserveEntrySignatures: 'allow-extension'
 					}
 				}

package/lib/vite.d.ts

@@ -10,4 +10,5 @@ export function pluginFactory({ dir, outDir, styles }: {
     outDir?: string | undefined;
     styles?: string[] | undefined;
 }): import("vite").Plugin;
+export const appEntryId: "/@orga-build/main.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":"AASA;;;;;;GAMG;AACH,uDALG;IAAwB,GAAG,EAAnB,MAAM;IACW,MAAM;IACJ,MAAM;CACjC,GAAU,OAAO,MAAM,EAAE,MAAM,CA8JjC"}
+{"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;AAvKD,gDAAuD"}

package/lib/vite.js

@@ -3,7 +3,7 @@ import path from 'node:path'
 
 const magicModulePrefix = '/@orga-build/'
 const pagesModuleId = magicModulePrefix + 'pages'
-const appEntryId = `${magicModulePrefix}main.js`
+export const appEntryId = `${magicModulePrefix}main.js`
 const contentModuleId = 'orga-build:content'
 const contentModuleIdResolved = '\0' + contentModuleId
 

package/package.json

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

package/lib/client.jsx

@@ -1,12 +0,0 @@
-import { hydrateRoot } from 'react-dom/client'
-import { Router } from 'wouter'
-import { App } from './app.jsx'
-
-const ssr = window._ssr
-
-hydrateRoot(
-	document.getElementById('root'),
-	<Router>
-		<App />
-	</Router>
-)