create-smoodly-app 0.0.42 → 0.0.44

package/dist/index.js

@@ -489,12 +489,23 @@ async function run(answers2, deps) {
           await sh("supabase", ["init"], { stdin: "ignore" });
           const configPath = join2(cwd, "supabase/config.toml");
           const toml = withoutSeedSql(await deps.fs.readFile(configPath));
-          const base = await findFreeBlock(blockPorts(toml), deps.isPortFree);
+          const ports = blockPorts(toml);
+          const base = await findFreeBlock(ports, deps.isPortFree);
           await deps.fs.writeFile(configPath, base !== DEFAULT_BASE ? shiftBlock(toml, base) : toml);
           if (base !== DEFAULT_BASE) {
             deps.log(`Ports ${DEFAULT_BASE / 100}xx are busy (another Supabase project running?), using ${base / 100}xx.`);
           }
-          await sh("supabase", LOCAL_START_ARGS);
+          try {
+            await sh("supabase", LOCAL_START_ARGS);
+          } catch (e) {
+            const shifted = ports.map((p3) => base + (p3 - DEFAULT_BASE));
+            const taken = (await Promise.all(shifted.map(deps.isPortFree))).some((free) => !free);
+            if (!taken) throw e;
+            const next = await findFreeBlock(ports, deps.isPortFree);
+            await deps.fs.writeFile(configPath, shiftBlock(toml, next));
+            deps.log(`Ports ${base / 100}xx were taken while starting (another Supabase project?), retrying on ${next / 100}xx.`);
+            await sh("supabase", LOCAL_START_ARGS);
+          }
           ctx.keys = parseStatusEnv((await sh("supabase", ["status", "-o", "env"], { capture: true })).stdout);
           break;
         }
@@ -540,7 +551,7 @@ var withoutSeedSql = (toml) => toml.replace(/(\[db\.seed\]\n(?:#.*\n)*enabled =
 function fallbackFor(step, answers2, keys) {
   const envLines = keys ? `Write ${answers2.dir}/.env.local:
 
-${renderEnv(keys).split("\n").filter((l) => !l.startsWith("#")).join("\n").trimEnd()}` : `Write ${answers2.dir}/.env.local with SMOODLY_URL, SMOODLY_SECRET_KEY and SMOODLY_PUBLISHABLE_KEY (from \`supabase status\`).`;
+${renderEnv(keys).split("\n").filter((l) => !l.startsWith("#")).join("\n").trimEnd()}` : `Write ${answers2.dir}/.env.local with SMOODLY_URL, SMOODLY_SECRET_KEY and SMOODLY_PUBLISHABLE_KEY (from \`supabase status\`), and SITE_URL=http://localhost:3000.`;
   const editorLines = [
     "Create the first editor, then the starter content:",
     "",
@@ -549,7 +560,7 @@ ${renderEnv(keys).split("\n").filter((l) => !l.startsWith("#")).join("\n").trimE
   ].join("\n");
   switch (step) {
     case "supabaseLocal":
-      return [`cd ${answers2.dir} && supabase init && supabase ${LOCAL_START_ARGS.join(" ")}`, "", envLines, "", editorLines].join("\n");
+      return [`cd ${answers2.dir} && supabase ${LOCAL_START_ARGS.join(" ")}`, "", envLines, "", editorLines].join("\n");
     case "supabaseInit": {
       const commands = answers2.hosted?.linkAndPush ? [`cd ${answers2.dir} && supabase init && ${linkCommand(answers2)} && supabase db push`] : [`cd ${answers2.dir} && supabase init`, "", `When you are ready: ${linkCommand(answers2)} && supabase db push`];
       return [...commands, "", envLines, "", editorLines].join("\n");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-smoodly-app",
-  "version": "0.0.42",
+  "version": "0.0.44",
   "description": "Create a Smoodly site: a fresh Next.js app with the admin mounted, a Supabase schema, an env file and a first editor.",
   "license": "MIT",
   "repository": {

package/templates/blank/package.json

@@ -14,7 +14,7 @@
     "next": "^16.3.4",
     "react": "^19",
     "react-dom": "^19",
-    "smoodly": "0.0.42"
+    "smoodly": "0.0.44"
   },
   "devDependencies": {
     "@next/env": "^16.3.4",

package/templates/blank/smoodly/server.ts

@@ -18,6 +18,7 @@ import {
 // shell in every live page's JavaScript.
 import { createSmoodlyContent, supabaseAdminAuth, type AdminAuth, type AuthConfig, type SmoodlyContent } from "smoodly/admin";
 import { createPageRenderer, createSmoodlyQueries, type PageRegistration } from "smoodly/next";
+import { connection } from "next/server";
 import type { SupabaseClient } from "@supabase/supabase-js";
 import { collections, config, elements, sections, globals } from "./config";
 
@@ -115,10 +116,19 @@ export const href = (path: string, _locale: string) => path;
  * { locale })`, `q().getPageTree({ locale })`. Typed by the registry, the
  * live draft in the editor preview, cached under tags the admin expires.
  * Rename it if `q` is not to your taste — this file is yours. */
-export const q = (): Queries => bound().q;
+export const q = (): Queries =>
+  new Proxy({} as Queries, {
+    get: (_, name) => async (...args: unknown[]) => {
+      await connection();
+      return (bound().q as unknown as Record<string | symbol, (...a: unknown[]) => unknown>)[name](...args);
+    },
+  });
 
+// A request first, then the env: `await connection()` makes the route dynamic before bound()
+// reads SMOODLY_*, so `next build` prerenders nothing here and needs no keys — a layout
+// reading a global through q() included (2026-10-02, tester round 6).
 /** The two route files call these. */
-export const renderSmoodlyPath: Renderer["renderSmoodlyPath"] = (...args) => bound().renderer.renderSmoodlyPath(...args);
-export const smoodlyMetadata: Renderer["smoodlyMetadata"] = (...args) => bound().renderer.smoodlyMetadata(...args);
-export const renderSmoodlyPage: Renderer["renderSmoodlyPage"] = (...args) => bound().renderer.renderSmoodlyPage(...args);
-export const smoodlyPageMetadata: Renderer["smoodlyPageMetadata"] = (...args) => bound().renderer.smoodlyPageMetadata(...args);
+export const renderSmoodlyPath: Renderer["renderSmoodlyPath"] = async (...args) => { await connection(); return bound().renderer.renderSmoodlyPath(...args); };
+export const smoodlyMetadata: Renderer["smoodlyMetadata"] = async (...args) => { await connection(); return bound().renderer.smoodlyMetadata(...args); };
+export const renderSmoodlyPage: Renderer["renderSmoodlyPage"] = async (...args) => { await connection(); return bound().renderer.renderSmoodlyPage(...args); };
+export const smoodlyPageMetadata: Renderer["smoodlyPageMetadata"] = async (...args) => { await connection(); return bound().renderer.smoodlyPageMetadata(...args); };

package/templates/blank-intl/package.json

@@ -14,7 +14,7 @@
     "next": "^16.3.4",
     "react": "^19",
     "react-dom": "^19",
-    "smoodly": "0.0.42",
+    "smoodly": "0.0.44",
     "next-intl": "^4.14.2"
   },
   "devDependencies": {

package/templates/blank-intl/smoodly/server.ts

@@ -18,6 +18,7 @@ import {
 // shell in every live page's JavaScript.
 import { createSmoodlyContent, supabaseAdminAuth, type AdminAuth, type AuthConfig, type SmoodlyContent } from "smoodly/admin";
 import { createPageRenderer, createSmoodlyQueries, type PageRegistration } from "smoodly/next";
+import { connection } from "next/server";
 import type { SupabaseClient } from "@supabase/supabase-js";
 import { getPathname } from "@/i18n/navigation";
 import { collections, config, elements, sections, globals } from "./config";
@@ -116,10 +117,19 @@ export const href = (path: string, locale: string) => getPathname({ locale, href
  * { locale })`, `q().getPageTree({ locale })`. Typed by the registry, the
  * live draft in the editor preview, cached under tags the admin expires.
  * Rename it if `q` is not to your taste — this file is yours. */
-export const q = (): Queries => bound().q;
+export const q = (): Queries =>
+  new Proxy({} as Queries, {
+    get: (_, name) => async (...args: unknown[]) => {
+      await connection();
+      return (bound().q as unknown as Record<string | symbol, (...a: unknown[]) => unknown>)[name](...args);
+    },
+  });
 
+// A request first, then the env: `await connection()` makes the route dynamic before bound()
+// reads SMOODLY_*, so `next build` prerenders nothing here and needs no keys — a layout
+// reading a global through q() included (2026-10-02, tester round 6).
 /** The two route files call these. */
-export const renderSmoodlyPath: Renderer["renderSmoodlyPath"] = (...args) => bound().renderer.renderSmoodlyPath(...args);
-export const smoodlyMetadata: Renderer["smoodlyMetadata"] = (...args) => bound().renderer.smoodlyMetadata(...args);
-export const renderSmoodlyPage: Renderer["renderSmoodlyPage"] = (...args) => bound().renderer.renderSmoodlyPage(...args);
-export const smoodlyPageMetadata: Renderer["smoodlyPageMetadata"] = (...args) => bound().renderer.smoodlyPageMetadata(...args);
+export const renderSmoodlyPath: Renderer["renderSmoodlyPath"] = async (...args) => { await connection(); return bound().renderer.renderSmoodlyPath(...args); };
+export const smoodlyMetadata: Renderer["smoodlyMetadata"] = async (...args) => { await connection(); return bound().renderer.smoodlyMetadata(...args); };
+export const renderSmoodlyPage: Renderer["renderSmoodlyPage"] = async (...args) => { await connection(); return bound().renderer.renderSmoodlyPage(...args); };
+export const smoodlyPageMetadata: Renderer["smoodlyPageMetadata"] = async (...args) => { await connection(); return bound().renderer.smoodlyPageMetadata(...args); };

package/templates/lorem/package.json

@@ -14,7 +14,7 @@
     "next": "^16.3.4",
     "react": "^19",
     "react-dom": "^19",
-    "smoodly": "0.0.42"
+    "smoodly": "0.0.44"
   },
   "devDependencies": {
     "@next/env": "^16.3.4",

package/templates/lorem/smoodly/server.ts

@@ -18,6 +18,7 @@ import {
 // shell in every live page's JavaScript.
 import { createSmoodlyContent, supabaseAdminAuth, type AdminAuth, type AuthConfig, type SmoodlyContent } from "smoodly/admin";
 import { createPageRenderer, createSmoodlyQueries, type PageRegistration } from "smoodly/next";
+import { connection } from "next/server";
 import type { SupabaseClient } from "@supabase/supabase-js";
 import { collections, config, elements, sections, globals } from "./config";
 
@@ -115,10 +116,19 @@ export const href = (path: string, _locale: string) => path;
  * { locale })`, `q().getPageTree({ locale })`. Typed by the registry, the
  * live draft in the editor preview, cached under tags the admin expires.
  * Rename it if `q` is not to your taste — this file is yours. */
-export const q = (): Queries => bound().q;
+export const q = (): Queries =>
+  new Proxy({} as Queries, {
+    get: (_, name) => async (...args: unknown[]) => {
+      await connection();
+      return (bound().q as unknown as Record<string | symbol, (...a: unknown[]) => unknown>)[name](...args);
+    },
+  });
 
+// A request first, then the env: `await connection()` makes the route dynamic before bound()
+// reads SMOODLY_*, so `next build` prerenders nothing here and needs no keys — a layout
+// reading a global through q() included (2026-10-02, tester round 6).
 /** The two route files call these. */
-export const renderSmoodlyPath: Renderer["renderSmoodlyPath"] = (...args) => bound().renderer.renderSmoodlyPath(...args);
-export const smoodlyMetadata: Renderer["smoodlyMetadata"] = (...args) => bound().renderer.smoodlyMetadata(...args);
-export const renderSmoodlyPage: Renderer["renderSmoodlyPage"] = (...args) => bound().renderer.renderSmoodlyPage(...args);
-export const smoodlyPageMetadata: Renderer["smoodlyPageMetadata"] = (...args) => bound().renderer.smoodlyPageMetadata(...args);
+export const renderSmoodlyPath: Renderer["renderSmoodlyPath"] = async (...args) => { await connection(); return bound().renderer.renderSmoodlyPath(...args); };
+export const smoodlyMetadata: Renderer["smoodlyMetadata"] = async (...args) => { await connection(); return bound().renderer.smoodlyMetadata(...args); };
+export const renderSmoodlyPage: Renderer["renderSmoodlyPage"] = async (...args) => { await connection(); return bound().renderer.renderSmoodlyPage(...args); };
+export const smoodlyPageMetadata: Renderer["smoodlyPageMetadata"] = async (...args) => { await connection(); return bound().renderer.smoodlyPageMetadata(...args); };

package/templates/lorem-intl/package.json

@@ -14,7 +14,7 @@
     "next": "^16.3.4",
     "react": "^19",
     "react-dom": "^19",
-    "smoodly": "0.0.42",
+    "smoodly": "0.0.44",
     "next-intl": "^4.14.2"
   },
   "devDependencies": {

package/templates/lorem-intl/smoodly/server.ts

@@ -18,6 +18,7 @@ import {
 // shell in every live page's JavaScript.
 import { createSmoodlyContent, supabaseAdminAuth, type AdminAuth, type AuthConfig, type SmoodlyContent } from "smoodly/admin";
 import { createPageRenderer, createSmoodlyQueries, type PageRegistration } from "smoodly/next";
+import { connection } from "next/server";
 import type { SupabaseClient } from "@supabase/supabase-js";
 import { getPathname } from "@/i18n/navigation";
 import { collections, config, elements, sections, globals } from "./config";
@@ -116,10 +117,19 @@ export const href = (path: string, locale: string) => getPathname({ locale, href
  * { locale })`, `q().getPageTree({ locale })`. Typed by the registry, the
  * live draft in the editor preview, cached under tags the admin expires.
  * Rename it if `q` is not to your taste — this file is yours. */
-export const q = (): Queries => bound().q;
+export const q = (): Queries =>
+  new Proxy({} as Queries, {
+    get: (_, name) => async (...args: unknown[]) => {
+      await connection();
+      return (bound().q as unknown as Record<string | symbol, (...a: unknown[]) => unknown>)[name](...args);
+    },
+  });
 
+// A request first, then the env: `await connection()` makes the route dynamic before bound()
+// reads SMOODLY_*, so `next build` prerenders nothing here and needs no keys — a layout
+// reading a global through q() included (2026-10-02, tester round 6).
 /** The two route files call these. */
-export const renderSmoodlyPath: Renderer["renderSmoodlyPath"] = (...args) => bound().renderer.renderSmoodlyPath(...args);
-export const smoodlyMetadata: Renderer["smoodlyMetadata"] = (...args) => bound().renderer.smoodlyMetadata(...args);
-export const renderSmoodlyPage: Renderer["renderSmoodlyPage"] = (...args) => bound().renderer.renderSmoodlyPage(...args);
-export const smoodlyPageMetadata: Renderer["smoodlyPageMetadata"] = (...args) => bound().renderer.smoodlyPageMetadata(...args);
+export const renderSmoodlyPath: Renderer["renderSmoodlyPath"] = async (...args) => { await connection(); return bound().renderer.renderSmoodlyPath(...args); };
+export const smoodlyMetadata: Renderer["smoodlyMetadata"] = async (...args) => { await connection(); return bound().renderer.smoodlyMetadata(...args); };
+export const renderSmoodlyPage: Renderer["renderSmoodlyPage"] = async (...args) => { await connection(); return bound().renderer.renderSmoodlyPage(...args); };
+export const smoodlyPageMetadata: Renderer["smoodlyPageMetadata"] = async (...args) => { await connection(); return bound().renderer.smoodlyPageMetadata(...args); };