Merge pull request #232 from nobkd/fix/add-cwd-to-root-pth

fix: use `cwd` + `nue root` as base for relative file output path

packages/nuekit/src/site.js

@@ -1,5 +1,5 @@
 
-import { log, getParts, getAppDir, getDirs, colors, toPosix, sortCSS } from './util.js'
+import { log, getParts, getAppDir, getDirs, colors, toPosix, sortCSS, joinRootPath } from './util.js'
 import { join, extname, basename, sep, parse as parsePath } from 'node:path'
 import { parse as parseNue } from 'nuejs-core'
 import { promises as fs } from 'node:fs'
@@ -68,11 +68,12 @@ export async function createSite(args) {
  }
 
  const {
- dist = `${root}/.dist/${is_prod ? 'prod' : 'dev'}`,
+ dist: rawDist,
  port = is_prod ? 8081 : 8080
-
  } = site_data
 
+ const dist = joinRootPath(root, rawDist || join('.dist', is_prod ? 'prod' : 'dev'))
+
  // flag if .dist is empty
  try {
  await fs.stat(dist)

packages/nuekit/src/util.js

@@ -1,6 +1,6 @@
 
 /* misc stuff. think shame.css */
-import { sep, parse, normalize } from 'node:path'
+import { sep, parse, normalize, join, isAbsolute } from 'node:path'
 
 
 export function log(msg, extra='') {
@@ -28,6 +28,10 @@ export const colors = getColorFunctions()
 
 /* path parts */
 
+export function joinRootPath(root, path, abs = false) {
+ return join(abs ? process.cwd() : '', isAbsolute(path) ? '' : root, path)
+}
+
 export function getParts(path) {
  path = normalize(path)
  const { dir, name, base } = parse(path)

packages/nuekit/test/nuekit.test.js

@@ -71,7 +71,7 @@ test('site.yaml', async () => {
  const site = await getSite()
 
  expect(site.globals).toEqual(['global'])
- expect(site.dist).toBe('.mydist')
+ expect(site.dist).toBe('_test/.mydist')
  expect(site.port).toBe(1500)
 
  // teardown
@@ -83,7 +83,7 @@ test('environment', async () => {
  await write(env, 'dist: .alt')
  const site = await createSite({ root, env })
 
- expect(site.dist).toBe('.alt')
+ expect(site.dist).toBe('_test/.alt')
  expect(site.port).toBe(8080)
 })