uniweb 0.13.17 → 0.14.0

package/src/utils/git.js

@@ -32,11 +32,20 @@ import yaml from 'js-yaml'
  * rather than assuming the defaults.
  */
 export function siteContentRoots(siteDir) {
-  const roots = new Set(['site.yml', 'theme.yml', 'head.html', 'collections.yml', 'locales'])
+  const roots = new Set([
+    'site.yml',
+    'theme.yml',
+    'head.html',
+    'collections.yml',
+    'locales'
+  ])
   let paths = {}
   try {
-    paths = yaml.load(readFileSync(join(siteDir, 'site.yml'), 'utf8'))?.paths || {}
-  } catch { /* no or unreadable site.yml — the defaults are right */ }
+    paths =
+      yaml.load(readFileSync(join(siteDir, 'site.yml'), 'utf8'))?.paths || {}
+  } catch {
+    /* no or unreadable site.yml — the defaults are right */
+  }
   roots.add(paths.pages || 'pages')
   roots.add(paths.layout || 'layout')
   roots.add(paths.collections || 'collections')
@@ -50,7 +59,11 @@ export function hasUncommittedContent(siteDir) {
 }
 
 function git(args, cwd) {
-  return execFileSync('git', args, { cwd, encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] })
+  return execFileSync('git', args, {
+    cwd,
+    encoding: 'utf8',
+    stdio: ['ignore', 'pipe', 'ignore']
+  })
 }
 
 /**
@@ -78,14 +91,19 @@ export function isGitRepo(dir) {
 export function uncommittedUnder(dir, relPaths) {
   if (!isGitRepo(dir)) return null
   try {
-    const out = git(['status', '--porcelain', '--untracked-files=all', '--', ...relPaths], dir)
-    return out
-      .split('\n')
-      .filter(Boolean)
-      // porcelain v1: XY<space>path, and a rename is "orig -> new".
-      .map((line) => line.slice(3).trim())
-      .map((p) => (p.includes(' -> ') ? p.split(' -> ')[1] : p))
-      .filter(Boolean)
+    const out = git(
+      ['status', '--porcelain', '--untracked-files=all', '--', ...relPaths],
+      dir
+    )
+    return (
+      out
+        .split('\n')
+        .filter(Boolean)
+        // porcelain v1: XY<space>path, and a rename is "orig -> new".
+        .map((line) => line.slice(3).trim())
+        .map((p) => (p.includes(' -> ') ? p.split(' -> ')[1] : p))
+        .filter(Boolean)
+    )
   } catch {
     // A path git doesn't know (e.g. none of the roots exist yet) is not an error
     // worth failing a pull over.
@@ -111,7 +129,7 @@ export function showAtHead(dir, relPath) {
     return execFileSync('git', ['show', `HEAD:${relPath}`], {
       cwd: dir,
       stdio: ['ignore', 'pipe', 'ignore'],
-      maxBuffer: 64 * 1024 * 1024,
+      maxBuffer: 64 * 1024 * 1024
     })
   } catch {
     return null
@@ -135,10 +153,15 @@ export function mergeFile(dir, minePath, basePath, theirsPath, labels = {}) {
       'git',
       [
         'merge-file',
-        '-L', labels.mine || 'yours (local)',
-        '-L', labels.base || 'common ancestor',
-        '-L', labels.theirs || 'theirs (backend)',
-        minePath, basePath, theirsPath,
+        '-L',
+        labels.mine || 'yours (local)',
+        '-L',
+        labels.base || 'common ancestor',
+        '-L',
+        labels.theirs || 'theirs (backend)',
+        minePath,
+        basePath,
+        theirsPath
       ],
       { cwd: dir, stdio: ['ignore', 'ignore', 'ignore'] }
     )
@@ -174,15 +197,36 @@ export function hasRemote(dir) {
  * @returns {{ ok: boolean, changed: boolean, message: string }}
  */
 export function pullRemote(dir) {
-  const before = (() => { try { return git(['rev-parse', 'HEAD'], dir).trim() } catch { return null } })()
+  const before = (() => {
+    try {
+      return git(['rev-parse', 'HEAD'], dir).trim()
+    } catch {
+      return null
+    }
+  })()
   try {
     const out = execFileSync('git', ['pull', '--ff-only'], {
-      cwd: dir, encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'],
+      cwd: dir,
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'pipe']
     })
-    const after = (() => { try { return git(['rev-parse', 'HEAD'], dir).trim() } catch { return null } })()
-    return { ok: true, changed: Boolean(before && after && before !== after), message: out.trim() }
+    const after = (() => {
+      try {
+        return git(['rev-parse', 'HEAD'], dir).trim()
+      } catch {
+        return null
+      }
+    })()
+    return {
+      ok: true,
+      changed: Boolean(before && after && before !== after),
+      message: out.trim()
+    }
   } catch (err) {
-    const msg = [err?.stderr, err?.stdout].map((b) => (b ? String(b) : '')).join('\n').trim()
+    const msg = [err?.stderr, err?.stdout]
+      .map((b) => (b ? String(b) : ''))
+      .join('\n')
+      .trim()
     return { ok: false, changed: false, message: msg || 'git pull failed' }
   }
 }

package/src/utils/host-prompt.js

@@ -38,9 +38,10 @@ export async function promptForHost({ args, preselect = null } = {}) {
 
   // promptSelect doesn't expose initial-index, so move the preselect to
   // the top of the list — the menu still highlights index 0 by default.
-  const ordered = preselect && adapters.includes(preselect)
-    ? [preselect, ...adapters.filter(a => a !== preselect)]
-    : adapters
+  const ordered =
+    preselect && adapters.includes(preselect)
+      ? [preselect, ...adapters.filter((a) => a !== preselect)]
+      : adapters
 
   const choice = await promptSelect('Pick a host adapter:', ordered)
   if (!choice) {

package/src/utils/install-integrity.js

@@ -117,7 +117,8 @@ export function checkSiteInstall(site, foundation, workspaceDir) {
         `  ${rel(foundation.path)} taken when it was installed. Edits you make will not\n` +
         `  reach the dev server. \`uniweb build\` resolves the foundation by path and reads\n` +
         `  your source, so builds stay correct — which is why this is easy to miss.`,
-      remedy: 'Reinstall so it links to the workspace source (e.g. pnpm install)',
+      remedy:
+        'Reinstall so it links to the workspace source (e.g. pnpm install)'
     })
   } else {
     // Linked, but possibly at the wrong source.
@@ -130,7 +131,7 @@ export function checkSiteInstall(site, foundation, workspaceDir) {
         site: site.name,
         message: `In dev, this site resolves "${foundation.name}" somewhere other than your workspace source.`,
         detail: `  resolves to: ${rel(target)}\n  workspace source: ${rel(expected)}`,
-        remedy: 'Reinstall, and check the site\'s package.json file: reference',
+        remedy: "Reinstall, and check the site's package.json file: reference"
       })
     }
   }
@@ -138,7 +139,10 @@ export function checkSiteInstall(site, foundation, workspaceDir) {
   // What the site actually reaches, versus what the foundation asks for. These
   // agree through a link and drift through a copy — the drift is what runs.
   const foundationPkg = readJson(join(foundation.path, 'package.json'))
-  const declared = { ...foundationPkg?.dependencies, ...foundationPkg?.peerDependencies }
+  const declared = {
+    ...foundationPkg?.dependencies,
+    ...foundationPkg?.peerDependencies
+  }
 
   for (const [name, spec] of Object.entries(declared)) {
     if (!name.startsWith('@uniweb/')) continue
@@ -160,7 +164,7 @@ export function checkSiteInstall(site, foundation, workspaceDir) {
           `  resolved from ${rel(linkPath)}: ${reached}\n` +
           `  ${name} is bundled into the foundation, so the dev server runs the version it\n` +
           `  reaches here. A build reads the workspace tree and may compile a different one.`,
-        remedy: 'Reinstall so the resolved tree matches what is declared',
+        remedy: 'Reinstall so the resolved tree matches what is declared'
       })
     }
   }

package/src/utils/interactive.js

@@ -37,7 +37,7 @@ export function getCliPrefix() {
  * @returns {string[]}
  */
 export function stripNonInteractiveFlag(args) {
-  return args.filter(a => a !== '--non-interactive')
+  return args.filter((a) => a !== '--non-interactive')
 }
 
 /**
@@ -46,8 +46,8 @@ export function stripNonInteractiveFlag(args) {
  * @returns {string}
  */
 export function formatOptions(options) {
-  const maxLen = Math.max(...options.map(o => o.label.length))
+  const maxLen = Math.max(...options.map((o) => o.label.length))
   return options
-    .map(o => `  ${o.label.padEnd(maxLen + 3)}${o.description}`)
+    .map((o) => `  ${o.label.padEnd(maxLen + 3)}${o.description}`)
     .join('\n')
 }

package/src/utils/json-file.js

@@ -62,7 +62,11 @@ export function writeJsonPreservingStyle(filePath, obj, originalSrc = null) {
  * @param {object} obj
  * @param {string|null} [originalSrc]
  */
-export async function writeJsonPreservingStyleAsync(filePath, obj, originalSrc = null) {
-  const src = originalSrc ?? await readFile(filePath, 'utf8')
+export async function writeJsonPreservingStyleAsync(
+  filePath,
+  obj,
+  originalSrc = null
+) {
+  const src = originalSrc ?? (await readFile(filePath, 'utf8'))
   await writeFile(filePath, stringifyJsonLike(obj, src))
 }

package/src/utils/names.js

@@ -25,9 +25,15 @@ import { join } from 'node:path'
  * that's a real constraint, not aesthetic.
  */
 const RESERVED_NAMES = new Set([
-  'default', 'undefined', 'null', 'true', 'false',
-  'node_modules', 'package',
-  'dist', 'build',
+  'default',
+  'undefined',
+  'null',
+  'true',
+  'false',
+  'node_modules',
+  'package',
+  'dist',
+  'build'
 ])
 
 /**
@@ -38,9 +44,12 @@ const RESERVED_NAMES = new Set([
  */
 export function validatePackageName(name, existingNames) {
   if (!name) return 'Name is required'
-  if (!/^[a-z0-9-]+$/.test(name)) return 'Use lowercase letters, numbers, and hyphens'
-  if (RESERVED_NAMES.has(name)) return `"${name}" is a reserved name — choose a different one`
-  if (existingNames?.has(name)) return `"${name}" already exists in this workspace`
+  if (!/^[a-z0-9-]+$/.test(name))
+    return 'Use lowercase letters, numbers, and hyphens'
+  if (RESERVED_NAMES.has(name))
+    return `"${name}" is a reserved name — choose a different one`
+  if (existingNames?.has(name))
+    return `"${name}" already exists in this workspace`
   return true
 }
 

package/src/utils/placement.js

@@ -8,10 +8,18 @@
  */
 
 /** Foundation placement defaults (folder `src/`, package `src`). */
-export const FOUNDATION_KIND = { defaultDir: 'src', defaultPkg: 'src', projectSub: 'src' }
+export const FOUNDATION_KIND = {
+  defaultDir: 'src',
+  defaultPkg: 'src',
+  projectSub: 'src'
+}
 
 /** Site placement defaults (folder `site/`, package `site`). */
-export const SITE_KIND = { defaultDir: 'site', defaultPkg: 'site', projectSub: 'site' }
+export const SITE_KIND = {
+  defaultDir: 'site',
+  defaultPkg: 'site',
+  projectSub: 'site'
+}
 
 /**
  * Resolve where a foundation or site should be placed, given the user's input.
@@ -56,13 +64,13 @@ export function resolvePlacement(rootDir, name, opts, kind) {
       const last = name.split('/').filter(Boolean).pop()
       return {
         relativePath: `${parent}/${name}`.replace(/\/+/g, '/'),
-        packageName: last,
+        packageName: last
       }
     }
     const lastSegment = parent.split('/').filter(Boolean).pop() || parent
     return {
       relativePath: parent,
-      packageName: lastSegment,
+      packageName: lastSegment
     }
   }
 
@@ -72,7 +80,7 @@ export function resolvePlacement(rootDir, name, opts, kind) {
     const lastSegment = relativePath.split('/').filter(Boolean).pop()
     return {
       relativePath,
-      packageName: lastSegment,
+      packageName: lastSegment
     }
   }
 
@@ -80,7 +88,7 @@ export function resolvePlacement(rootDir, name, opts, kind) {
   if (name) {
     return {
       relativePath: name,
-      packageName: name,
+      packageName: name
     }
   }
 
@@ -88,13 +96,13 @@ export function resolvePlacement(rootDir, name, opts, kind) {
   if (opts.project) {
     return {
       relativePath: `${opts.project}/${kind.projectSub}`,
-      packageName: `${opts.project}-${kind.projectSub}`,
+      packageName: `${opts.project}-${kind.projectSub}`
     }
   }
 
   // 5. Default placement.
   return {
     relativePath: kind.defaultDir,
-    packageName: kind.defaultPkg,
+    packageName: kind.defaultPkg
   }
 }