domma-cms 0.5.3 → 0.5.4

package/bin/cli.js

@@ -355,6 +355,13 @@ if (noSeed) {
 // Success
 // ---------------------------------------------------------------------------
 
+let devPort = 4096;
+try {
+    const serverCfg = JSON.parse(readFileSync(path.join(target, 'config/server.json'), 'utf8'));
+    if (Number.isInteger(serverCfg.port)) devPort = serverCfg.port;
+} catch { /* fallback to default */
+}
+
 console.log('');
 console.log('  ┌──────────────────────────────────────────┐');
 console.log('  │   ✓ Project created successfully!        │');
@@ -366,5 +373,5 @@ if (noInstall) console.log(`    npm install`);
 if (noSetup && !noInstall) console.log(`    npm run setup`);
 console.log(`    npm run dev`);
 console.log('');
-console.log(`  Then open: http://localhost:4096/admin`);
+console.log(`  Then open: http://localhost:${devPort}/admin`);
 console.log('');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "domma-cms",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "File-based CMS powered by Domma and Fastify. Run npx domma-cms my-site to create a new project.",
   "type": "module",
   "main": "server/server.js",
@@ -29,7 +29,7 @@
     "delete-users": "node -e \"import('fs').then(({readdirSync,rmSync})=>{const d='content/users';readdirSync(d).filter(f=>f.endsWith('.json')).forEach(f=>{rmSync(d+'/'+f);console.log('deleted',f)})})\"",
     "start": "node server/server.js",
     "start:cluster": "pm2 start server/server.js -i max --name domma-cms",
-    "dev": "PORT=4096 node --watch server/server.js",
+    "dev": "node --watch server/server.js",
     "prod": "node server/server.js",
     "setup": "node scripts/setup.js",
     "reset": "node scripts/reset.js",

package/scripts/setup.js

@@ -10,6 +10,7 @@
  *   2. Create admin account (skips if users already exist)
  *   3. Set site title and tagline
  *   4. Pick a theme
+ *   5. Set server port
  */
 import {createInterface} from 'node:readline/promises';
 import {randomBytes} from 'node:crypto';
@@ -43,8 +44,11 @@ const THEMES = [
     'christmas-dark', 'christmas-light',
     'unicorn-dark', 'unicorn-light',
     'dreamy-dark', 'dreamy-light',
+    'wedding-dark', 'wedding-light',
 ];
 
+const SERVER_CONFIG = path.join(ROOT, 'config', 'server.json');
+
 // ---------------------------------------------------------------------------
 // Utilities
 // ---------------------------------------------------------------------------
@@ -256,6 +260,26 @@ THEMES.forEach((t, i) => {
     console.log(`  ✓ Theme set to "${theme}"`);
 }
 
+// ---------------------------------------------------------------------------
+// Step 5 — Port
+// ---------------------------------------------------------------------------
+section('5. Server Port');
+
+{
+    const rl = createInterface({input: process.stdin, output: process.stdout});
+    const input = (await rl.question('  Port (Enter = 4096): ')).trim();
+    rl.close();
+
+    const parsed = parseInt(input, 10);
+    const port = (parsed >= 1024 && parsed <= 65535) ? parsed : 4096;
+
+    const server = JSON.parse(await readFile(SERVER_CONFIG, 'utf8'));
+    server.port = port;
+    await writeFile(SERVER_CONFIG, JSON.stringify(server, null, 4) + '\n', 'utf8');
+
+    console.log(`  ✓ Port set to ${port}`);
+}
+
 // ---------------------------------------------------------------------------
 // Done
 // ---------------------------------------------------------------------------

package/server/services/renderer.js

@@ -113,7 +113,6 @@ export async function renderPage(page) {
             site.cookieConsent?.enabled ? '<script src="/public/js/cookie-consent.js"></script>' : ''
         ].filter(Boolean).join('\n'),
         dconfigScript,
-        autoThemeScript: autoTheme ? buildAutoThemeScript(autoTheme) : '',
     };
 
     const finalVars = applyTransforms('render:beforeRender', vars, {page});
@@ -206,23 +205,6 @@ function buildFontVars(fontFamily, fontSize) {
     return {fontLink, fontOverride: rules.length ? rules.join(' ') : null};
 }
 
-/**
- * Build a self-executing inline script that applies the correct day/night theme
- * before the page uncloak — eliminates any flash of wrong theme.
- *
- * @param {object} at - autoTheme config object
- * @returns {string}
- */
-function buildAutoThemeScript(at) {
-    const json = JSON.stringify(at).replace(/<\/script>/gi, '<\\/script>');
-    return `(function(){var c=${json},n=new Date(),m=n.getHours()*60+n.getMinutes(),`
-        + `ds=(c.dayStart||"07:00").split(":"),ns=(c.nightStart||"19:00").split(":"),`
-        + `d=+ds[0]*60+(+ds[1]||0),e=+ns[0]*60+(+ns[1]||0),`
-        + `t=(m>=d&&m<e)?c.dayTheme:c.nightTheme;`
-        + `if(window.Domma&&window.Domma.theme)window.Domma.theme.set(t);`
-        + `}());`;
-}
-
 /**
  * Simple template interpolation.
  * Handles {{variable}}, {{#if flag}}...{{/if}}.

package/server/templates/page.html

@@ -101,13 +101,16 @@
         if (window.Domma && window.Domma.theme) {
             window.Domma.theme.init({ theme: '{{theme}}', persist: false });
         }
-      {
-          {
-              autoThemeScript
-          }
-      }
         window.__CMS_NAV__ = {{navJson}};
         window.__CMS_SITE__ = {{siteJson}};
+      (function () {
+          var c = window.__CMS_SITE__ && window.__CMS_SITE__.autoTheme;
+          if (!c || !c.enabled) return;
+          var n = new Date(), m = n.getHours() * 60 + n.getMinutes(), ds = (c.dayStart || "07:00").split(":"),
+              ns = (c.nightStart || "19:00").split(":"), d = +ds[0] * 60 + (+ds[1] || 0),
+              e = +ns[0] * 60 + (+ns[1] || 0), t = (m >= d && m < e) ? c.dayTheme : c.nightTheme;
+          if (window.Domma && window.Domma.theme) window.Domma.theme.set(t);
+      }());
       {{dconfigScript}}
     </script>