orga-build 0.1.0 → 0.1.1

package/cli.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 
-import { argv } from 'node:process'
+import { argv, cwd } from 'node:process'
 import { parseArgs } from 'node:util'
 import { watch } from './lib/watch.js'
-import { loadConfig, clean } from './lib/build.js'
-import { build } from './lib/esbuild/index.js'
+import { build, clean } from './lib/esbuild/build.js'
+import { loadConfig } from './lib/config.js'
 import { serve } from './lib/serve.js'
 
 const { values, positionals } = parseArgs({
@@ -17,7 +17,7 @@ const { values, positionals } = parseArgs({
 	allowPositionals: true
 })
 
-const config = await loadConfig()
+const config = await loadConfig(cwd(), 'orga.config.js', 'orga.config.ts')
 
 await build(config)
 

package/index.d.ts

@@ -1,2 +1,2 @@
-export { build } from "./lib/build.js";
+export { build } from "./lib/esbuild/build.js";
 //# sourceMappingURL=index.d.ts.map

package/index.js

@@ -1 +1 @@
-export { build } from './lib/build.js'
+export { build } from './lib/esbuild/build.js'

package/lib/config.d.ts

@@ -0,0 +1,12 @@
+/**
+ * @param {string} cwd
+ * @param {string[]} files
+ * @returns {Promise<Config>}
+ */
+export function loadConfig(cwd: string, ...files: string[]): Promise<Config>;
+export type Config = {
+    outDir: string;
+    preBuild: string[];
+    postBuild: string[];
+};
+//# sourceMappingURL=config.d.ts.map

package/lib/config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["config.js"],"names":[],"mappings":"AAkBA;;;;GAIG;AACH,gCAJW,MAAM,YACN,MAAM,EAAE,GACN,OAAO,CAAC,MAAM,CAAC,CAY3B;;YA3Ba,MAAM;cACN,MAAM,EAAE;eACR,MAAM,EAAE"}

package/lib/config.js

@@ -0,0 +1,34 @@
+import fs from 'node:fs/promises'
+import path from 'node:path'
+import { evaluate } from './esbuild/evaluate.js'
+
+/**
+ * @typedef {Object} Config
+ * @property {string} outDir
+ * @property {string[]} preBuild
+ * @property {string[]} postBuild
+ */
+
+/** @type {Config} */
+const defaultConfig = {
+	outDir: 'out',
+	preBuild: [],
+	postBuild: []
+}
+
+/**
+ * @param {string} cwd
+ * @param {string[]} files
+ * @returns {Promise<Config>}
+ */
+export async function loadConfig(cwd, ...files) {
+	for (const file of files) {
+		const filePath = path.join(cwd, file)
+		try {
+			await fs.access(filePath, fs.constants.F_OK)
+			const config = await evaluate(filePath)
+			return { ...defaultConfig, ...config }
+		} catch (err) {}
+	}
+	return defaultConfig
+}

package/lib/esbuild/build.d.ts

@@ -0,0 +1,9 @@
+/**
+ * @param {import('../config.js').Config} options
+ */
+export function build({ outDir, preBuild, postBuild }: import("../config.js").Config): Promise<void>;
+/**
+ * @param {import("fs").PathLike} dir
+ */
+export function clean(dir: import("fs").PathLike): Promise<void>;
+//# sourceMappingURL=build.d.ts.map

package/lib/esbuild/build.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["build.js"],"names":[],"mappings":"AAWA;;GAEG;AACH,uDAFW,OAAO,cAAc,EAAE,MAAM,iBAuLvC;AAiCD;;GAEG;AACH,2BAFW,OAAO,IAAI,EAAE,QAAQ,iBAI/B"}

package/lib/esbuild/{index.js → build.js}

@@ -7,16 +7,10 @@ import { renderToString } from 'react-dom/server'
 import assert from 'node:assert'
 import { DefaultLayout, $, match } from '../util.js'
 import rawLoader from './raw-loader.js'
+import resolveReact from './resolve-react.js'
 
 /**
- * @typedef {Object} Options
- * @property {string} [outDir]
- * @property {string[]} [preBuild]
- * @property {string[]} [postBuild]
- */
-
-/**
- * @param {Options} options
+ * @param {import('../config.js').Config} options
  */
 export async function build({ outDir = 'dir', preBuild = [], postBuild = [] }) {
 	for (const cmd of preBuild) {
@@ -62,12 +56,28 @@ export async function build({ outDir = 'dir', preBuild = [], postBuild = [] }) {
 		format: 'esm',
 		platform: 'node',
 		target: 'esnext',
+		// jsxFactory: 'React.createElement',
+		// jsxFragment: 'React.Fragment',
 		jsx: 'automatic',
 		// write: false,
 		outdir: '.orga-build/js',
 		// splitting: true,
 		metafile: true,
-		plugins: [esbuildOrga(), rawLoader],
+		plugins: [
+			esbuildOrga({
+				reorgRehypeOptions: {
+					linkHref: (link) => {
+						if (link.path.protocol === 'file') {
+							return link.path.value.replace(/\.org$/, '.html')
+						}
+						return link.path.value
+					}
+				}
+				// reorgPlugins: [reorgLinks]
+			}),
+			rawLoader,
+			resolveReact
+		],
 		// external: ['react/jsx-runtime'],
 		loader: {
 			'.jsx': 'jsx',
@@ -215,3 +225,10 @@ async function walk(dirPath, callback) {
 		}
 	}
 }
+
+/**
+ * @param {import("fs").PathLike} dir
+ */
+export async function clean(dir) {
+	await fs.rm(dir, { recursive: true })
+}

package/lib/esbuild/evaluate.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Evaluate an org/jsx/tsx/ts file. Returns as a module.
+ * It's like a dynamic import, but without relying on nodejs.
+ * @param {string} filePath
+ * @returns {Promise<any>}
+ */
+export function evaluate(filePath: string): Promise<any>;
+//# sourceMappingURL=evaluate.d.ts.map

package/lib/esbuild/evaluate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"evaluate.d.ts","sourceRoot":"","sources":["evaluate.js"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,mCAHW,MAAM,GACJ,OAAO,CAAC,GAAG,CAAC,CAwBxB"}

package/lib/{esbuild.js → esbuild/evaluate.js}

@@ -31,27 +31,3 @@ export async function evaluate(filePath) {
 		`return import("data:application/javascript,${encodeURIComponent(code)}")`
 	)()
 }
-
-/**
- * @param {string} pattern
- */
-export async function build(pattern) {
-	return await esbuild.build({
-		entryPoints: [pattern],
-		entryNames: '[dir]/_/[name]',
-		bundle: true,
-		format: 'esm',
-		platform: 'node',
-		target: 'esnext',
-		jsx: 'automatic',
-		// write: false,
-		outdir: '.build',
-		plugins: [esbuildOrga()],
-		loader: {
-			'.jsx': 'jsx',
-			'.tsx': 'tsx'
-		}
-	})
-}
-
-export async function b() {}

package/lib/esbuild/resolve-react.d.ts

@@ -0,0 +1,13 @@
+export default resolveReact;
+declare namespace resolveReact {
+    let name: string;
+    /**
+     * @param {PluginBuild} build
+     *   Build.
+     * @returns {undefined}
+     *   Nothing.
+     */
+    function setup(build: PluginBuild): undefined;
+}
+import type { PluginBuild } from 'esbuild';
+//# sourceMappingURL=resolve-react.d.ts.map

package/lib/esbuild/resolve-react.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-react.d.ts","sourceRoot":"","sources":["resolve-react.js"],"names":[],"mappings":";;;IAaC;;;;;OAKG;IACH,sBALW,WAAW,GAET,SAAS,CAOrB;;iCAtB4B,SAAS"}

package/lib/esbuild/resolve-react.js

@@ -0,0 +1,27 @@
+/**
+ * @import {PluginBuild} from 'esbuild'
+ */
+
+import { createRequire } from 'module'
+import path from 'path'
+
+const require = createRequire(import.meta.url)
+const reactPath = require.resolve('react')
+const reactDirPath = path.dirname(reactPath)
+
+const resolveReact = {
+	name: 'resolve-react',
+	/**
+	 * @param {PluginBuild} build
+	 *   Build.
+	 * @returns {undefined}
+	 *   Nothing.
+	 */
+	setup(build) {
+		build.onResolve({ filter: /^react\/jsx-runtime$/ }, () => {
+			return { path: path.join(reactDirPath, 'jsx-runtime.js') }
+		})
+	}
+}
+
+export default resolveReact

package/lib/{build.d.ts.map → node/build.d.ts.map}

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["build.js"],"names":[],"mappings":"AAwJA;;GAEG;AACH,uDAFW,OAAO,aAAa,iBAwC9B;AAwBD;;GAEG;AACH,2BAFW,OAAO,IAAI,EAAE,QAAQ,iBAI/B;AAED;;GAEG;AACH,8BAFa,OAAO,CAAC,OAAO,aAAa,CAAC,CAKzC;;aAzMa,OAAO,cAAc,EAAE,UAAU;;;;cACjC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;;;;SACnB,MAAM;;;;UACN,MAAM;;qBAIP,OAAO,OAAO,EAAE,aAAa,CAAC,GAAG,CAAC;sBAIlC,MAAM,GAAG,MAAM;;;;;iBAKd,OAAO,cAAc,EAAE,aAAa;;;;aACpC,MAAM,GAAG,SAAS;;;;aAClB,OAAO,GAAG,OAAO,EAAE;;;;WACnB,CAAC,IAAI,EAAE,IAAI,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC;;;;eAChG,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,MAAM;;;;kBA5B7D,MAAM,EAAE;mBAER,MAAM,EAAE"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["build.js"],"names":[],"mappings":"AAkJA;;GAEG;AACH,uDAFW,OAAO,aAAa,iBAwC9B;AAoBD;;GAEG;AACH,2BAFW,OAAO,IAAI,EAAE,QAAQ,iBAI/B;AAED;;GAEG;AACH,8BAFa,OAAO,CAAC,OAAO,aAAa,CAAC,CAKzC;;aArMa,OAAO,cAAc,EAAE,UAAU;;;;cACjC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;;;;SACnB,MAAM;;;;UACN,MAAM;;qBAIP,OAAO,OAAO,EAAE,aAAa,CAAC,GAAG,CAAC;sBAIlC,MAAM,GAAG,MAAM;;;;;iBAKd,OAAO,cAAc,EAAE,aAAa;;;;aACpC,MAAM,GAAG,SAAS;;;;aAClB,OAAO,GAAG,OAAO,EAAE;;;;WACnB,CAAC,IAAI,EAAE,IAAI,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC;;;;eAChG,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,MAAM;;;;kBA5B7D,MAAM,EAAE;mBAER,MAAM,EAAE"}

package/lib/{build.js → node/build.js}

@@ -5,17 +5,11 @@ import path from 'path'
 import { createElement } from 'react'
 import { renderToString } from 'react-dom/server'
 import assert from 'node:assert'
-import { match } from './util.js'
-import { evaluate, build as _build } from './esbuild.js'
-import { $, DefaultLayout } from './util.js'
+import { match, $, DefaultLayout } from '../util.js'
 
-const USE_NODE = false
-
-if (USE_NODE) {
-	register('./jsx-loader.js', import.meta.url)
-	register('./orga-loader.js', import.meta.url)
-	register('./raw-loader.js', import.meta.url)
-}
+register('./jsx-loader.js', import.meta.url)
+register('./orga-loader.js', import.meta.url)
+register('./raw-loader.js', import.meta.url)
 
 const defaultConfig = {
 	outDir: 'out',
@@ -208,11 +202,7 @@ async function _import(...files) {
 	const file = found[0]
 	const fullPath = path.isAbsolute(file) ? file : path.join(process.cwd(), file)
 	const { mtime } = await fs.stat(fullPath)
-	if (USE_NODE) {
-		return await import(`${fullPath}?version=${mtime.getTime()}`)
-	} else {
-		return await evaluate(fullPath)
-	}
+	return await import(`${fullPath}?version=${mtime.getTime()}`)
 }
 
 /**

package/lib/watch.js

@@ -11,7 +11,7 @@ export async function watch(dir, ignore, onChange) {
 	/** @type {ReturnType<typeof setTimeout> | null} */
 	let timeout = null
 	const delay = 1000
-	const defaultIgnorePattern = /node_modules|\.git|\.DS_Store/
+	const defaultIgnorePattern = /node_modules|\.git|\.DS_Store|\.orga-build/
 
 	const watcher = fs.watch(dir, { recursive: true })
 	for await (const event of watcher) {

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "orga-build",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "A simple tool that builds org-mode files into a website",
   "type": "module",
   "bin": {
-    "orga-build": "cli.js"
+    "orga-build": "./cli.js"
   },
   "files": [
     "lib/",
@@ -24,21 +24,22 @@
   "author": "Xiaoxing Hu <hi@xiaoxing.dev>",
   "license": "MIT",
   "dependencies": {
-    "@orgajs/esbuild": "^1.1.1",
     "esbuild": "^0.24.2",
     "globby": "^14.0.2",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "rehype-katex": "^7.0.1",
     "serve-handler": "^6.1.6",
-    "@orgajs/node-loader": "^1.1.1"
+    "@orgajs/esbuild": "^1.1.2",
+    "@orgajs/node-loader": "^1.1.2"
   },
   "devDependencies": {
     "@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.0"
+    "@orgajs/orgx": "^2.5.1",
+    "orga": "^4.5.0"
   },
   "scripts": {}
 }

package/lib/esbuild/index.d.ts

@@ -1,16 +0,0 @@
-/**
- * @typedef {Object} Options
- * @property {string} [outDir]
- * @property {string[]} [preBuild]
- * @property {string[]} [postBuild]
- */
-/**
- * @param {Options} options
- */
-export function build({ outDir, preBuild, postBuild }: Options): Promise<void>;
-export type Options = {
-    outDir?: string;
-    preBuild?: string[];
-    postBuild?: string[];
-};
-//# sourceMappingURL=index.d.ts.map

package/lib/esbuild/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.js"],"names":[],"mappings":"AAUA;;;;;GAKG;AAEH;;GAEG;AACH,uDAFW,OAAO,iBAuKjB;;aA7Ka,MAAM;eACN,MAAM,EAAE;gBACR,MAAM,EAAE"}

package/lib/esbuild.d.ts

@@ -1,31 +0,0 @@
-/**
- * Evaluate an org/jsx/tsx/ts file. Returns as a module.
- * It's like a dynamic import, but without relying on nodejs.
- * @param {string} filePath
- * @returns {Promise<any>}
- */
-export function evaluate(filePath: string): Promise<any>;
-/**
- * @param {string} pattern
- */
-export function build(pattern: string): Promise<esbuild.BuildResult<{
-    entryPoints: string[];
-    entryNames: string;
-    bundle: true;
-    format: "esm";
-    platform: "node";
-    target: string;
-    jsx: "automatic";
-    outdir: string;
-    plugins: {
-        name: string;
-        setup: (build: esbuild.PluginBuild) => undefined;
-    }[];
-    loader: {
-        '.jsx': "jsx";
-        '.tsx': "tsx";
-    };
-}>>;
-export function b(): Promise<void>;
-import * as esbuild from 'esbuild';
-//# sourceMappingURL=esbuild.d.ts.map

package/lib/esbuild.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"esbuild.d.ts","sourceRoot":"","sources":["esbuild.js"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,mCAHW,MAAM,GACJ,OAAO,CAAC,GAAG,CAAC,CAwBxB;AAED;;GAEG;AACH,+BAFW,MAAM;;;;;;;;;;;;;;;;;IAmBhB;AAED,mCAA4B;yBAvDH,SAAS"}