orga-build 0.2.0 → 0.2.2

package/lib/app.jsx

@@ -1,8 +1,7 @@
-import { createElement } from 'react'
 import pages from '@orga-build/pages'
 import layouts from '@orga-build/layouts'
 import * as components from '@orga-build/components'
-import { Link, useRoutes } from 'react-router'
+import { Route, Switch, Link } from 'wouter'
 
 export function App() {
 	const _pages = Object.entries(pages).map(([path, page]) => {
@@ -16,19 +15,13 @@ export function App() {
 		const layoutIds = Object.keys(layouts)
 			.filter((key) => path.startsWith(key))
 			.sort((a, b) => -a.localeCompare(b))
-		let element = createElement(page.default, {
-			components: { ...components, Link }
-		})
+		let element = <page.default components={{ ...components, Link, a: Link }} />
 		for (const layoutId of layoutIds) {
-			element = createElement(
-				layouts[layoutId],
-				{
-					title: page.title,
-					slug: path,
-					...page,
-					pages: _pages
-				},
-				element
+			const Layout = layouts[layoutId]
+			element = (
+				<Layout title={page.title} slug={path} pages={_pages} {...page}>
+					{element}
+				</Layout>
 			)
 		}
 		return {
@@ -37,5 +30,15 @@ export function App() {
 		}
 	})
 
-	return useRoutes(pageRoutes)
+	return (
+		<Switch>
+			{pageRoutes.map((route) => {
+				return (
+					<Route key={`r-${route.path}`} path={route.path}>
+						{route.element}
+					</Route>
+				)
+			})}
+		</Switch>
+	)
 }

package/lib/client.jsx

@@ -1,18 +1,12 @@
 import { hydrateRoot } from 'react-dom/client'
-import { BrowserRouter } from 'react-router'
+import { Router } from 'wouter'
 import { App } from './app.jsx'
 
 const ssr = window._ssr
 
-hydrate()
-
-function hydrate() {
-	const container = document.getElementById('root')
-	// const page = pages[ssr.routePath]
-	hydrateRoot(
-		container,
-		<BrowserRouter basename="/">
-			<App />
-		</BrowserRouter>
-	)
-}
+hydrateRoot(
+	document.getElementById('root'),
+	<Router>
+		<App />
+	</Router>
+)

package/lib/csr.jsx

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

package/lib/ssr.jsx

@@ -1,7 +1,7 @@
 import pages from '@orga-build/pages'
 import { renderToString } from 'react-dom/server'
-import { StaticRouter } from 'react-router'
 import { App } from './app.jsx'
+import { Router } from 'wouter'
 
 export { pages }
 
@@ -14,13 +14,11 @@ export function render(url) {
 		console.log(`no page found for ${url}`)
 		return
 	}
-	return renderToString(<SSRContent url={url} />)
-}
-
-function SSRContent({ url }) {
-	return (
-		<StaticRouter location={url}>
+	const ssrContext = {}
+	console.log(`rendering ${url}`)
+	return renderToString(
+		<Router ssrPath={url} ssrContext={ssrContext}>
 			<App />
-		</StaticRouter>
+		</Router>
 	)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orga-build",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "A simple tool that builds org-mode files into a website",
   "type": "module",
   "bin": {
@@ -34,13 +34,10 @@
     "esbuild": "^0.24.2",
     "express": "^5.1.0",
     "globby": "^14.1.0",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "react-router": "^7.5.1",
     "rehype-katex": "^7.0.1",
-    "serve-handler": "^6.1.6",
     "unist-util-visit-parents": "^6.0.1",
     "vite": "6.3.2",
+    "wouter": "^3.7.0",
     "@orgajs/esbuild": "^1.1.3",
     "@orgajs/node-loader": "^1.1.3",
     "@orgajs/rollup": "1.3.2"
@@ -51,9 +48,12 @@
     "@types/node": "^22.13.1",
     "@types/react": "^19.0.8",
     "@types/react-dom": "^19.0.3",
-    "@types/serve-handler": "^6.1.4",
     "@orgajs/orgx": "^2.5.2",
     "orga": "^4.5.1"
   },
+  "peerDependencies": {
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0"
+  },
   "scripts": {}
 }