@nera-static/nera 1.1.0 → 1.2.0

package/README.md

@@ -20,7 +20,7 @@ npm run dev            # or: nera dev
 |---|---|
 | `nera new <name>` | Scaffold a new thin Nera site (one dependency: `@nera-static/nera`). Add `--theme <name>` to start from a theme. |
 | `nera build` | Render `pages/` → `public/`. |
-| `nera dev` | Build, serve `public/`, and rebuild on change with live reload. |
+| `nera dev` | Build, serve `public/`, and rebuild on change with live reload. Watches `pages/`, `config/`, `theme/` and a local theme (`theme: ./themes/<name>`). |
 | `nera serve` | Serve the already-built `public/` folder. |
 | `nera update` | Update the site's Nera packages. On a legacy cloned site, `nera update --migrate` converts it to the thin model. |
 | `nera validate` | Check the site (layouts, includes, YAML) before publishing; exits non-zero on any error. |

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nera-static/nera",
-    "version": "1.1.0",
+    "version": "1.2.0",
     "description": "The Nera CLI — scaffold, build, preview and update a Nera static site with one command over the @nera-static/core engine",
     "type": "module",
     "bin": {
@@ -42,7 +42,7 @@
         "access": "public"
     },
     "dependencies": {
-        "@nera-static/core": "^4.9.0",
+        "@nera-static/core": "^4.12.0",
         "@nera-static/validate": "^1.0.0",
         "chokidar": "^5.0.0",
         "semver": "^7.8.5",

package/src/commands/dev.js

@@ -1,5 +1,6 @@
 import fssync from 'fs'
-import run from '@nera-static/core'
+import path from 'path'
+import run, { resolveSiteModel } from '@nera-static/core'
 import { startServer } from './serve.js'
 
 // Build once, serve `public/`, then rebuild on any change to the site's
@@ -19,13 +20,8 @@ export async function runDev(args = []) {
 
     const { default: chokidar } = await import('chokidar')
 
-    // Presentation lives under theme/ in the current layout, or the deprecated
-    // root views/ on an unmigrated site — watch whichever exists.
-    const watchDirs = [
-        'pages',
-        'config',
-        fssync.existsSync('theme') ? 'theme' : 'views',
-    ].filter((d) => fssync.existsSync(d))
+    const watched = new Set(watchTargets())
+    const watcher = chokidar.watch([...watched], { ignoreInitial: true })
 
     // Serialise rebuilds: coalesce changes that land mid-build into one re-run.
     let building = false
@@ -42,22 +38,59 @@ export async function runDev(args = []) {
             console.error('❌ Build error:', err.message)
         }
         building = false
+        // config/app.yaml may now name a different local theme — start
+        // watching it too. A dropped one stays watched; that only costs an
+        // extra rebuild if it is edited.
+        for (const dir of watchTargets()) {
+            if (!watched.has(dir)) {
+                watched.add(dir)
+                watcher.add(dir)
+            }
+        }
         if (queued) {
             queued = false
             await rebuild()
         }
     }
 
-    chokidar
-        .watch(watchDirs, { ignoreInitial: true })
-        .on('all', async (event, filePath) => {
-            console.log(`↻ ${event} ${filePath} — rebuilding`)
-            await rebuild()
-        })
+    watcher.on('all', async (event, filePath) => {
+        console.log(
+            `↻ ${event} ${path.relative(process.cwd(), filePath)} — rebuilding`
+        )
+        await rebuild()
+    })
 
     return server
 }
 
+// What a rebuild depends on: pages/, config/, the site's presentation folder
+// — theme/ in the current layout, or the deprecated root views/ on an
+// unmigrated site — and a LOCAL theme (`theme: ./themes/classic`, or the same
+// via NERA_THEME), which lives outside all of those. The theme is resolved
+// through core, so the watcher follows exactly the spec the build uses. Only
+// the theme's payload folders are watched, never its root: `theme: .` makes
+// the root the site itself, and watching public/ would rebuild forever. An
+// installed theme package under node_modules is left alone: it changes only on
+// npm install, and watching node_modules is expensive.
+export function watchTargets(cwd = process.cwd()) {
+    const dirs = [
+        'pages',
+        'config',
+        fssync.existsSync(path.join(cwd, 'theme')) ? 'theme' : 'views',
+    ].map((d) => path.join(cwd, d))
+
+    const { theme } = resolveSiteModel({ cwd })
+    if (theme && !theme.root.split(path.sep).includes('node_modules')) {
+        dirs.push(
+            theme.viewsRoot,
+            theme.assetsRoot,
+            path.join(theme.root, 'config')
+        )
+    }
+
+    return [...new Set(dirs)].filter((d) => fssync.existsSync(d))
+}
+
 const parsePort = (args) => {
     const i = args.indexOf('--port')
     const val = i >= 0 ? Number(args[i + 1]) : NaN