[orga-build] fix dependency issue

Author: xiaoxinghu

packages/orga-build/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() {

packages/orga-build/lib/build.js

@@ -40,6 +40,7 @@ export async function build({
 		build: {
 			ssr: true,
 			cssCodeSplit: false,
+			emptyOutDir: true,
 			rollupOptions: {
 				input: fileURLToPath(new URL('./ssr.jsx', import.meta.url)),
 				output: {
@@ -67,6 +68,7 @@ export async function build({
 		plugins,
 		build: {
 			cssCodeSplit: false,
+			emptyOutDir: true,
 			rollupOptions: {
 				input: fileURLToPath(new URL('./client.jsx', import.meta.url)),
 				preserveEntrySignatures: 'allow-extension'

packages/orga-build/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'

packages/orga-build/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()
 			}
 		}

packages/orga-build/package.json

@@ -7,32 +7,18 @@
 		"orga-build": "./cli.js"
 	},
 	"scripts": {},
-	"files": [
-		"lib/",
-		"cli.js",
-		"index.js",
-		"index.d.ts",
-		"index.d.ts.map"
-	],
+	"files": ["lib/", "cli.js", "index.js", "index.d.ts", "index.d.ts.map"],
 	"exports": {
 		".": {
 			"types": "./index.d.ts",
 			"import": "./index.js"
 		},
-		"./csr.jsx": "./lib/csr.jsx"
+		"./csr": "./lib/csr.jsx"
 	},
-	"keywords": [
-		"orgajs",
-		"org-mode",
-		"build",
-		"website",
-		"react"
-	],
+	"keywords": ["orgajs", "org-mode", "build", "website", "react"],
 	"author": "Xiaoxing Hu <[email protected]>",
 	"license": "MIT",
 	"dependencies": {
-		"@orgajs/esbuild": "workspace:^",
-		"@orgajs/node-loader": "workspace:^",
 		"@orgajs/rollup": "workspace:*",
 		"@vitejs/plugin-react": "^4.4.0",
 		"esbuild": "^0.24.2",
@@ -44,13 +30,11 @@
 		"wouter": "^3.7.0"
 	},
 	"devDependencies": {
-		"@orgajs/orgx": "workspace:^",
 		"@types/express": "^5.0.1",
 		"@types/hast": "^3.0.4",
 		"@types/node": "^22.13.1",
 		"@types/react": "^19.0.8",
-		"@types/react-dom": "^19.0.3",
-		"orga": "workspace:^"
+		"@types/react-dom": "^19.0.3"
 	},
 	"peerDependencies": {
 		"react": "^19.0.0",