orga-build 0.2.2 → 0.2.4

package/lib/app.jsx

@@ -1,6 +1,6 @@
-import pages from '@orga-build/pages'
-import layouts from '@orga-build/layouts'
-import * as components from '@orga-build/components'
+import pages from '/@orga-build/pages'
+import layouts from '/@orga-build/layouts'
+import * as components from '/@orga-build/components'
 import { Route, Switch, Link } from 'wouter'
 
 export function App() {

package/lib/build.d.ts

@@ -2,4 +2,9 @@
  * @param {import('./config.js').Config} config
  */
 export function build({ outDir, root, containerClass, vitePlugins }: import("./config.js").Config): Promise<void>;
+export const alias: {
+    react: string;
+    'react-dom': string;
+    wouter: string;
+};
 //# sourceMappingURL=build.d.ts.map

package/lib/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["build.js"],"names":[],"mappings":"AAWA;;GAEG;AACH,qEAFW,OAAO,aAAa,EAAE,MAAM,iBAwJtC"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["build.js"],"names":[],"mappings":"AAoBA;;GAEG;AACH,qEAFW,OAAO,aAAa,EAAE,MAAM,iBAgKtC;AAvKD;;;;EAIC"}

package/lib/build.js

@@ -1,4 +1,5 @@
 import path from 'node:path'
+import { createRequire } from 'node:module'
 import { build as viteBuild } from 'vite'
 import orga from '@orgajs/rollup'
 import react from '@vitejs/plugin-react'
@@ -9,6 +10,14 @@ import fs from 'fs/promises'
 import assert from 'node:assert'
 import { rehypeWrap } from './plugins.js'
 
+const require = createRequire(import.meta.url)
+
+export const alias = {
+	react: path.dirname(require.resolve('react/package.json')),
+	'react-dom': path.dirname(require.resolve('react-dom/package.json')),
+	wouter: path.dirname(require.resolve('wouter'))
+}
+
 /**
  * @param {import('./config.js').Config} config
  */
@@ -40,6 +49,7 @@ export async function build({
 		build: {
 			ssr: true,
 			cssCodeSplit: false,
+			emptyOutDir: true,
 			rollupOptions: {
 				input: fileURLToPath(new URL('./ssr.jsx', import.meta.url)),
 				output: {
@@ -52,6 +62,9 @@ export async function build({
 		},
 		ssr: {
 			noExternal: true
+		},
+		resolve: {
+			alias: alias
 		}
 	})
 
@@ -67,6 +80,7 @@ export async function build({
 		plugins,
 		build: {
 			cssCodeSplit: false,
+			emptyOutDir: true,
 			rollupOptions: {
 				input: fileURLToPath(new URL('./client.jsx', import.meta.url)),
 				preserveEntrySignatures: 'allow-extension'
@@ -76,6 +90,9 @@ export async function build({
 		},
 		ssr: {
 			noExternal: true
+		},
+		resolve: {
+			alias: alias
 		}
 	})
 

package/lib/components.d.ts

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

package/lib/components.d.ts.map

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

package/lib/components.js

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

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,iBA0ChB"}
+{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["serve.js"],"names":[],"mappings":"AASA;;;GAGG;AACH,8BAHW,OAAO,aAAa,EAAE,MAAM,SAC5B,MAAM,iBA6ChB"}

package/lib/serve.js

@@ -5,6 +5,7 @@ import orga from '@orgajs/rollup'
 import react from '@vitejs/plugin-react'
 import { pluginFactory } from './vite.js'
 import { rehypeWrap } from './plugins.js'
+import { alias } from './build.js'
 
 /**
  * @param {import('./config.js').Config} config
@@ -22,7 +23,10 @@ export async function serve(config, port = 3000) {
 			...config.vitePlugins
 		],
 		server: { middlewareMode: true },
-		appType: 'custom'
+		appType: 'custom',
+		resolve: {
+			alias: alias
+		}
 	})
 
 	app.use(vite.middlewares)

package/lib/ssr.jsx

@@ -1,4 +1,4 @@
-import pages from '@orga-build/pages'
+import pages from '/@orga-build/pages'
 import { renderToString } from 'react-dom/server'
 import { App } from './app.jsx'
 import { Router } from 'wouter'

package/lib/vite.d.ts.map

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

package/lib/vite.js

@@ -1,8 +1,9 @@
 import { setup } from './files.js'
 import path from 'node:path'
 
-const magicModulePrefix = '@orga-build'
-const appEntryId = `/${magicModulePrefix}/main.js`
+const magicModulePrefix = '/@orga-build/'
+const pagesModuleId = magicModulePrefix + 'pages'
+const appEntryId = `${magicModulePrefix}main.js`
 
 /**
  * @param {Object} options
@@ -15,6 +16,19 @@ export function pluginFactory({ dir }) {
 	return {
 		name: 'vite-plugin-orga-pages',
 		enforce: 'pre',
+		config: (config, env) => ({
+			optimizeDeps: {
+				include: [
+					'react',
+					'react/jsx-runtime',
+					'react-dom',
+					'react-dom/client',
+					'wouter'
+				],
+				exclude: ['orga-build']
+			}
+		}),
+
 		configureServer({ watcher, moduleGraph }) {
 			const reloadVirtualModule = (/** @type {string} */ moduleId) => {
 				const module = moduleGraph.getModuleById(moduleId)
@@ -27,8 +41,7 @@ export function pluginFactory({ dir }) {
 			reloadVirtualModule('/')
 		},
 
-		buildStart() {
-		},
+		buildStart() {},
 
 		async resolveId(id, importer) {
 			if (id === appEntryId) {
@@ -40,13 +53,13 @@ export function pluginFactory({ dir }) {
 		},
 		async load(id) {
 			if (id === appEntryId) {
-				return `import "orga-build/csr.jsx";`
+				return `import "orga-build/csr";`
 			}
-			if (id === `${magicModulePrefix}/pages`) {
+			if (id === pagesModuleId) {
 				return await renderPageList()
 			}
-			if (id.startsWith(`${magicModulePrefix}/pages/`)) {
-				let pageId = id.replace(`${magicModulePrefix}/pages/`, '/')
+			if (id.startsWith(pagesModuleId)) {
+				let pageId = id.replace(pagesModuleId, '')
 				const page = await files.page(pageId)
 				if (page) {
 					return `
@@ -56,7 +69,7 @@ export {default} from '${page.dataPath}';
 				}
 			}
 
-			if (id === `${magicModulePrefix}/layouts`) {
+			if (id === `${magicModulePrefix}layouts`) {
 				const layouts = await files.layouts()
 				/** @type {string[]} */
 				const imports = []
@@ -72,7 +85,7 @@ export default layouts;
 				`
 			}
 
-			if (id === `${magicModulePrefix}/components`) {
+			if (id === `${magicModulePrefix}components`) {
 				return await renderComponents()
 			}
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orga-build",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "A simple tool that builds org-mode files into a website",
   "type": "module",
   "bin": {
@@ -18,7 +18,8 @@
       "types": "./index.d.ts",
       "import": "./index.js"
     },
-    "./csr.jsx": "./lib/csr.jsx"
+    "./csr": "./lib/csr.jsx",
+    "./components": "./lib/components.js"
   },
   "keywords": [
     "orgajs",
@@ -31,15 +32,14 @@
   "license": "MIT",
   "dependencies": {
     "@vitejs/plugin-react": "^4.4.0",
-    "esbuild": "^0.24.2",
     "express": "^5.1.0",
     "globby": "^14.1.0",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
     "rehype-katex": "^7.0.1",
     "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"
   },
   "devDependencies": {
@@ -47,13 +47,7 @@
     "@types/hast": "^3.0.4",
     "@types/node": "^22.13.1",
     "@types/react": "^19.0.8",
-    "@types/react-dom": "^19.0.3",
-    "@orgajs/orgx": "^2.5.2",
-    "orga": "^4.5.1"
-  },
-  "peerDependencies": {
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0"
+    "@types/react-dom": "^19.0.3"
   },
   "scripts": {}
 }