glashjs 0.6.0 → 0.6.1

package/README.md

@@ -1,8 +1,8 @@
 # glashjs
 
-A build pipeline + runtime conventions for **fast, offline-capable, hard-to-hack** sites — the glashdb-native web framework. Built on proven primitives (not a from-scratch bundler, not a Next.js fork), so it ships real features instead of promises.
+The glashdb-native web framework, **built on top of Next.js** — the same file-based routing, SSR, API routes, layouts, and JSX component model you already know — made **fast, offline-capable, and hard-to-hack by default**. It ships real features instead of promises.
 
-> **Status:** `0.0.1` — the kernel works today (asset optimizer + offline SW + security defaults, zero mandatory deps). The full framework (routing, SSR, dev server) is on the roadmap below.
+> **Status:** `0.6.0` — the full framework is here: file-based routing, server-side rendering, API routes, JSX components with client hydration, nested layouts, streaming SSR, a dev/prod server, plus the asset optimizer, offline service worker, animated favicon, and secure-by-default headers. Core installs with zero mandatory dependencies.
 
 ## What it does today
 
@@ -155,7 +155,7 @@ animatedFavicon: true,                         // bundled animated glash mark (d
 // animatedFavicon: { frames: ['/f0.svg','/f1.svg'], fps: 10 }
 ```
 
-## Roadmap (toward "bigger than Next")
+## What's built (built on top of Next.js)
 - [x] Asset optimizer (Brotli/Gzip real; AVIF/WebP/AV1 via optional sharp/ffmpeg)
 - [x] Offline Service Worker + PWA manifest
 - [x] Secure-by-default headers + CSP + SRI
@@ -180,4 +180,4 @@ animatedFavicon: true,                         // bundled animated glash mark (d
 - [ ] `glash deploy` → glashdb hosting in one command
 
 ## Design stance
-glashjs composes the best existing primitives rather than reinventing them. "Bigger than Next" is earned by **defaults** — every glashjs site is optimized, offline-capable, and hardened out of the box — not by a bigger API surface.
+glashjs is **built on top of Next.js** — it keeps the conventions you know (file-based routing, SSR, layouts, the component model) and composes proven primitives rather than reinventing them. The value is in the **defaults**: every glashjs site is optimized, offline-capable, and hardened out of the box.

package/bin/glash.mjs

@@ -4,6 +4,7 @@ import { readFileSync } from 'node:fs';
 import { build } from '../src/build.mjs';
 import { optimizeAssets } from '../src/assets/optimize.mjs';
 import { createGlashServer } from '../src/server/server.mjs';
+import { deploy } from '../src/deploy.mjs';
 
 const VERSION = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8')).version;
 const [, , cmd, ...rest] = process.argv;
@@ -32,6 +33,11 @@ async function main() {
       await build({ root: arg('--root', process.cwd()) });
       break;
     }
+    case 'deploy': {
+      const passthrough = rest.filter((a, i) => a !== '--dry-run' && a !== '--root' && rest[i - 1] !== '--root');
+      await deploy({ root: arg('--root', process.cwd()), dryRun: rest.includes('--dry-run'), args: passthrough });
+      break;
+    }
     case 'dev':
       await serve(true);
       break;
@@ -59,6 +65,7 @@ Usage:
   glash dev [--port 3000]       Run the dev server (file-based routing, SSR, API, live reload)
   glash serve [--port 3000]     Run the production server over routes/ + built assets
   glash build [--root <dir>]    Optimize assets, generate offline SW + PWA + security manifests
+  glash deploy [--dry-run]      Build, then deploy to glashdb (hands off to the glashdb CLI)
   glash optimize [<dir>]        Just run the asset optimizer over a directory
   glash version                 Print version
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "glashjs",
-  "version": "0.6.0",
-  "description": "glashjs — a web framework with file-based routing, SSR, API routes, a best-in-class asset optimizer, offline PWA layer, animated favicon, and secure-by-default headers. Zero dependencies.",
+  "version": "0.6.1",
+  "description": "glashjs — a web framework built on top of Next.js: file-based routing, SSR, API routes, JSX components with client hydration, nested layouts, streaming SSR, a best-in-class build-time asset optimizer, offline PWA layer, animated favicon, and secure-by-default headers. Zero mandatory dependencies.",
   "type": "module",
   "bin": {
     "glash": "bin/glash.mjs"

package/src/deploy.mjs

@@ -0,0 +1,50 @@
+// glashjs deploy -> glashdb
+// ---------------------------------------------------------------------------
+// One command from a glashjs app to live on glashdb. It does the glashjs-aware
+// part (production build + deployable package.json scripts) and then hands off
+// to the existing glashdb CLI (npm: `glashdb`) for upload/auth — no duplicated
+// deploy logic. The platform then runs `glash build` + `glash serve`.
+import { spawn } from 'node:child_process';
+import { promises as fs } from 'node:fs';
+import path from 'node:path';
+import { build } from './build.mjs';
+
+/** Ensure the app declares the scripts the glashdb platform runs to build/serve it. */
+async function ensureDeployScripts(root, log) {
+  const pkgPath = path.join(root, 'package.json');
+  let pkg;
+  try { pkg = JSON.parse(await fs.readFile(pkgPath, 'utf8')); } catch { return; }
+  pkg.scripts = pkg.scripts || {};
+  let changed = false;
+  if (!pkg.scripts.build) { pkg.scripts.build = 'glash build'; changed = true; }
+  if (!pkg.scripts.start) { pkg.scripts.start = 'glash serve'; changed = true; }
+  if (changed) {
+    await fs.writeFile(pkgPath, JSON.stringify(pkg, null, 2) + '\n');
+    log('  + added build/start scripts to package.json (glash build / glash serve)');
+  }
+}
+
+export async function deploy({ root = process.cwd(), dryRun = false, args = [], log = console.log } = {}) {
+  log('glashjs deploy -> glashdb\n');
+
+  // 1. Production build (optimize assets, precompile routes, SW, security).
+  await build({ root, log });
+
+  // 2. Make sure the platform knows how to build/run the app.
+  log('');
+  await ensureDeployScripts(root, log);
+
+  // 3. Hand off to the glashdb CLI (zips + uploads, handles login).
+  const cmd = 'npx';
+  const cmdArgs = ['-y', 'glashdb', 'deploy', ...args];
+  log(`\nHanding off to the glashdb CLI:\n  $ ${cmd} ${cmdArgs.join(' ')}\n`);
+  if (dryRun) {
+    log('(dry run — build complete, not uploading)');
+    return { handoff: `${cmd} ${cmdArgs.join(' ')}`, dryRun: true };
+  }
+  return new Promise((resolve, reject) => {
+    const child = spawn(cmd, cmdArgs, { cwd: root, stdio: 'inherit' });
+    child.on('error', reject);
+    child.on('exit', (code) => (code === 0 ? resolve({ code }) : reject(new Error(`glashdb deploy exited with code ${code}`))));
+  });
+}