orga-build 0.6.0 → 0.6.1

package/cli.js

@@ -16,6 +16,11 @@ const { positionals } = parseArgs({
 	allowPositionals: true
 })
 
-const config = await loadConfig('orga.config.js', 'orga.config.mjs')
+const { config, projectRoot } = await loadConfig(
+	'orga.config.js',
+	'orga.config.mjs'
+)
 
-await (positionals.includes('dev') ? serve(config) : build(config))
+await (positionals.includes('dev')
+	? serve(config, 3000, projectRoot)
+	: build(config, projectRoot))

package/lib/build.d.ts

@@ -1,7 +1,8 @@
 /**
  * @param {import('./config.js').Config} config
+ * @param {string} [projectRoot]
  */
-export function build({ outDir, root, containerClass, styles, vitePlugins }: import("./config.js").Config): Promise<void>;
+export function build({ outDir, root, containerClass, styles, vitePlugins }: import("./config.js").Config, projectRoot?: string): Promise<void>;
 export { alias };
 import { alias } from './plugin.js';
 //# 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":"AAeA;;GAEG;AACH,6EAFW,OAAO,aAAa,EAAE,MAAM,iBAqJtC;;sBAhK4C,aAAa"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["build.js"],"names":[],"mappings":"AAeA;;;GAGG;AACH,6EAHW,OAAO,aAAa,EAAE,MAAM,gBAC5B,MAAM,iBAoJhB;;sBAhK4C,aAAa"}

package/lib/build.js

@@ -15,6 +15,7 @@ const defaultIndexHtml = fileURLToPath(new URL('./index.html', import.meta.url))
 
 /**
  * @param {import('./config.js').Config} config
+ * @param {string} [projectRoot]
  */
 export async function build({
 	outDir,
@@ -22,7 +23,7 @@ export async function build({
 	containerClass,
 	styles = [],
 	vitePlugins = []
-}) {
+}, projectRoot = process.cwd()) {
 	await emptyDir(outDir)
 	const ssrOutDir = path.join(outDir, '.ssr')
 	const clientOutDir = outDir
@@ -103,7 +104,6 @@ export async function build({
 
 	/* --- get html template, inject entry js and css --- */
 	// Check for user's index.html in project root, otherwise use default
-	const projectRoot = process.cwd()
 	const userIndexPath = path.join(projectRoot, 'index.html')
 	const indexHtmlPath = (await exists(userIndexPath)) ? userIndexPath : defaultIndexHtml
 	const template = await fs.readFile(indexHtmlPath, { encoding: 'utf-8' })

package/lib/config.d.ts

@@ -1,8 +1,11 @@
 /**
  * @param {string[]} files
- * @returns {Promise<Config>}
+ * @returns {Promise<{ config: Config, projectRoot: string }>}
  */
-export function loadConfig(...files: string[]): Promise<Config>;
+export function loadConfig(...files: string[]): Promise<{
+    config: Config;
+    projectRoot: string;
+}>;
 export type Config = {
     outDir: string;
     root: string;

package/lib/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["config.js"],"names":[],"mappings":"AAyBA;;;GAGG;AACH,qCAHW,MAAM,EAAE,GACN,OAAO,CAAC,MAAM,CAAC,CAwC3B;;YA9Da,MAAM;UACN,MAAM;cACN,MAAM,EAAE;eACR,MAAM,EAAE;;;;iBACR,OAAO,MAAM,EAAE,YAAY,EAAE;oBAC7B,MAAM,EAAE,GAAC,MAAM;;;;aACf,MAAM,EAAE"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["config.js"],"names":[],"mappings":"AAyBA;;;GAGG;AACH,qCAHW,MAAM,EAAE,GACN,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC,CA6C5D;;YAnEa,MAAM;UACN,MAAM;cACN,MAAM,EAAE;eACR,MAAM,EAAE;;;;iBACR,OAAO,MAAM,EAAE,YAAY,EAAE;oBAC7B,MAAM,EAAE,GAAC,MAAM;;;;aACf,MAAM,EAAE"}

package/lib/config.js

@@ -25,7 +25,7 @@ const defaultConfig = {
 
 /**
  * @param {string[]} files
- * @returns {Promise<Config>}
+ * @returns {Promise<{ config: Config, projectRoot: string }>}
  */
 export async function loadConfig(...files) {
 	const cwd = process.cwd()
@@ -37,6 +37,7 @@ export async function loadConfig(...files) {
 		path.isAbsolute(value) ? value : path.resolve(cwd, value)
 
 	let result = { ...defaultConfig }
+	let configPath = null
 
 	for (const file of files) {
 		const filePath = path.join(cwd, file)
@@ -53,6 +54,7 @@ export async function loadConfig(...files) {
 			// Support both default export (recommended) and named exports
 			const config = module.default || module
 			result = { ...defaultConfig, ...config }
+			configPath = filePath
 			break
 		} catch (err) {
 			// Config file exists but has errors
@@ -64,5 +66,8 @@ export async function loadConfig(...files) {
 	result.outDir = resolveConfigPath(result.outDir)
 	const styles = result.styles
 	result.styles = Array.isArray(styles) ? styles.filter((v) => typeof v === 'string') : []
-	return result
+	return {
+		config: result,
+		projectRoot: configPath ? path.dirname(configPath) : cwd
+	}
 }

package/lib/serve.d.ts

@@ -3,6 +3,7 @@
  *
  * @param {import('./config.js').Config} config
  * @param {number} [port]
+ * @param {string} [projectRoot]
  */
-export function serve(config: import("./config.js").Config, port?: number): Promise<void>;
+export function serve(config: import("./config.js").Config, port?: number, projectRoot?: string): Promise<void>;
 //# sourceMappingURL=serve.d.ts.map

package/lib/serve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["serve.js"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,8BAHW,OAAO,aAAa,EAAE,MAAM,SAC5B,MAAM,iBAsChB"}
+{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["serve.js"],"names":[],"mappings":"AAIA;;;;;;GAMG;AACH,8BAJW,OAAO,aAAa,EAAE,MAAM,SAC5B,MAAM,gBACN,MAAM,iBAsChB"}

package/lib/serve.js

@@ -7,8 +7,9 @@ import { createOrgaBuildConfig, alias } from './plugin.js'
  *
  * @param {import('./config.js').Config} config
  * @param {number} [port]
+ * @param {string} [projectRoot]
  */
-export async function serve(config, port = 3000) {
+export async function serve(config, port = 3000, projectRoot = process.cwd()) {
 	const { plugins } = createOrgaBuildConfig({
 		root: config.root,
 		outDir: config.outDir,
@@ -16,7 +17,7 @@ export async function serve(config, port = 3000) {
 		styles: config.styles ?? [],
 		vitePlugins: config.vitePlugins,
 		includeFallbackHtml: true,
-		projectRoot: config.root
+		projectRoot
 	})
 
 	const server = await createServer({

package/package.json

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