glashjs 0.13.3 → 0.13.5

package/bin/glash.mjs

@@ -42,6 +42,20 @@ function firstPositional(args = rest) {
   return undefined;
 }
 
+// A compact terminal rendering of the glashjs favicon — the metallic glash mark
+// (a rounded square). Shown in the dev/serve banner so the brand favicon is
+// visible right in the CLI. ANSI-colored on a TTY; plain blocks otherwise.
+function glashMark() {
+  const tty = process.stdout.isTTY;
+  const hi = (s) => (tty ? `\x1b[97m${s}\x1b[0m` : s);   // bright white highlight
+  const mid = (s) => (tty ? `\x1b[38;5;250m${s}\x1b[0m` : s); // light grey shading
+  return [
+    '  ' + hi('▟██████▙'),
+    '  ' + hi('██') + mid('████') + hi('██'),
+    '  ' + hi('▜██████▛'),
+  ];
+}
+
 // LAN IPv4 addresses, so the dev server prints a Network URL you can open from
 // your phone or another device on the same network.
 function lanAddresses() {
@@ -62,7 +76,9 @@ async function serve(dev) {
   const port = await listenOnAvailablePort(listen, preferredPort);
   const pages = routes.filter((r) => !r.isApi).length;
   const apis = routes.filter((r) => r.isApi).length;
-  console.log(`\nglashjs ${dev ? 'dev' : 'serve'} — "${cfg.name}"`);
+  console.log('');
+  for (const line of glashMark()) console.log(line);
+  console.log(`  glashjs ${dev ? 'dev' : 'serve'} — "${cfg.name}"`);
   if (port !== preferredPort) console.log(`  Port ${preferredPort} is in use; using ${port} instead.`);
   console.log(`  ${pages} page route(s), ${apis} api route(s)`);
   routes.forEach((r) => console.log(`    ${r.isApi ? 'api ' : 'page'}  ${r.pattern}`));
@@ -157,7 +173,7 @@ async function main() {
       console.log('glashjs ' + VERSION);
       break;
     default:
-      console.log(`glashjs — fast, offline-capable, hard-to-hack sites
+      console.log(`glashjs — fast, offline-capable, secure-by-default sites
 
 Usage: (run as "glashjs <cmd>"; "glash <cmd>" also works unless the glashdb deploy CLI owns that name)
   glashjs run dev               Alias for glashjs dev (also: glash run dev)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "glashjs",
-  "version": "0.13.3",
+  "version": "0.13.5",
   "description": "glashjs — The Postgres-native full-stack framework for builders who want to ship without DevOps. Framework, hosting, database, auth, and deploy in one GlashDB-native runtime.",
   "type": "module",
   "bin": {

package/src/create.mjs

@@ -4,9 +4,10 @@
 
 import { spawn } from 'node:child_process';
 import { randomBytes } from 'node:crypto';
-import { promises as fs } from 'node:fs';
+import { promises as fs, readFileSync } from 'node:fs';
 import { createInterface } from 'node:readline/promises';
 import path from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { generateTypedRoutes } from './typed-routes.mjs';
 
 const CSS_CHOICES = new Set(['tailwind', 'plain', 'none']);
@@ -475,12 +476,18 @@ function tailwindInput() {
 }
 
 function faviconSvg() {
-  return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
-  <rect width="64" height="64" rx="14" fill="#050505"/>
-  <circle cx="32" cy="32" r="17" fill="#f97316"/>
-  <circle cx="32" cy="32" r="7" fill="#050505"/>
+  // Use the bundled glash mark (the official metallic glash favicon) so a new
+  // app ships the real brand favicon, not a placeholder. Single source of truth:
+  // glashjs/templates/favicon.svg.
+  try {
+    return readFileSync(fileURLToPath(new URL('../templates/favicon.svg', import.meta.url)), 'utf8');
+  } catch {
+    return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <rect width="64" height="64" rx="14" fill="#0a0a0a"/>
+  <rect x="13" y="13" width="38" height="38" rx="11" fill="#d4d4d4"/>
 </svg>
 `;
+  }
 }
 
 function gitignore() {

package/src/server/jsx.mjs

@@ -54,6 +54,15 @@ const REACT_ALIAS = {
   'next/headers': path.join(pkgRoot, 'next/headers.mjs'),
 };
 
+// CJS deps bundled into an ESM server module (e.g. lucide-react -> require('react')
+// -> aliased preact/compat, which is external) emit a dynamic require that ESM
+// can't run ("Dynamic require of X is not supported"). Defining `require` via
+// createRequire makes esbuild's __require shim use the real Node require, so those
+// runtime requires resolve from the app's node_modules.
+const NODE_ESM_REQUIRE_BANNER = {
+  js: "import { createRequire as __glashCreateRequire } from 'node:module';\nconst require = __glashCreateRequire(import.meta.url);",
+};
+
 export function isComponentRoute(file) {
   return /\.(jsx|tsx)$/.test(file);
 }
@@ -76,7 +85,7 @@ export async function compileModule(file, root, dev) {
     entryPoints: [file], bundle: true, platform: 'node', format: 'esm',
     jsx: 'automatic', jsxImportSource: 'preact',
     external: ['preact', 'preact/*', 'preact-render-to-string'],
-    alias: REACT_ALIAS, outfile: out, logLevel: 'silent',
+    alias: REACT_ALIAS, banner: NODE_ESM_REQUIRE_BANNER, outfile: out, logLevel: 'silent',
   });
   return import(pathToFileURL(out).href + (dev ? `?t=${Date.now()}` : ''));
 }
@@ -158,7 +167,7 @@ export async function loadComponentRoute(pageFile, layouts, root, dev, force = f
     stdin: { contents: serverEntry(pageFile, layouts), resolveDir: path.dirname(pageFile), loader: 'js', sourcefile: 'glash-server-entry.js' },
     bundle: true, platform: 'node', format: 'esm', jsx: 'automatic', jsxImportSource: 'preact',
     external: ['preact', 'preact/*', 'preact-render-to-string'],
-    alias: REACT_ALIAS,
+    alias: REACT_ALIAS, banner: NODE_ESM_REQUIRE_BANNER,
     outfile: out, logLevel: 'silent',
   });
   const mod = await import(pathToFileURL(out).href + (dev ? `?t=${Date.now()}` : ''));