create-shibumi 0.2.7 → 0.2.9

package/src/templates/ship.ts

@@ -25,7 +25,7 @@ const SERVER_HOSTNAME = /^[A-Za-z0-9](?:[A-Za-z0-9.-]{0,251}[A-Za-z0-9])?$/;
 const COMMIT = /^[a-f0-9]{40}$/;
 const SERVER_CLI = "~/.local/bin/shibumi-server";
 const LATEST_SOURCE = "https://shibumistack.dev/ship/latest.ts";
-const CURRENT_SOURCE = "https://shibumistack.dev/ship/v46.ts";
+const CURRENT_SOURCE = "https://shibumistack.dev/ship/v47.ts";
 let sshControlDirectory: string | undefined;
 let sshControlTarget: string | undefined;
 
@@ -96,6 +96,7 @@ interface ShipOptions {
   outputDir?: string;
   buildScript?: string;
   spa: boolean;
+  noSpa?: boolean;
 }
 
 export interface StaticSiteConfig {
@@ -160,6 +161,7 @@ export function parseShipArgs(args: string[]): ShipOptions {
     else if (argument === "--yes" || argument === "-y") parsed.yes = true;
     else if (argument === "--static") parsed.staticSite = true;
     else if (argument === "--spa") parsed.spa = true;
+    else if (argument === "--no-spa") parsed.noSpa = true;
     else if (argument === "--server" || argument === "--domain" || argument === "--trigger" || argument === "--output-dir" || argument === "--build-script") {
       const value = args[index + 1];
       if (!value || value.startsWith("-")) throw new Error(`${argument} requires a value`);
@@ -175,8 +177,9 @@ export function parseShipArgs(args: string[]): ShipOptions {
   if ([parsed.setup, parsed.update, parsed.rollback, parsed.logs, parsed.status, parsed.dev].filter(Boolean).length > 1) throw new Error("choose only one ship action");
   if (parsed.rebuild && (parsed.setup || parsed.update || parsed.rollback || parsed.logs || parsed.status || parsed.dev)) throw new Error("--rebuild applies only to shipping");
   if (parsed.trigger && !parsed.setup) throw new Error("--trigger requires --setup");
-  if ((parsed.staticSite || parsed.outputDir || parsed.buildScript || parsed.spa) && !parsed.setup) throw new Error("--static, --output-dir, --build-script, and --spa require --setup");
-  if ((parsed.outputDir || parsed.buildScript || parsed.spa) && !parsed.staticSite) throw new Error("--output-dir, --build-script, and --spa require --static");
+  if (parsed.spa && parsed.noSpa) throw new Error("--spa and --no-spa are mutually exclusive");
+  if ((parsed.staticSite || parsed.outputDir || parsed.buildScript || parsed.spa || parsed.noSpa) && !parsed.setup) throw new Error("--static, --output-dir, --build-script, and --spa require --setup");
+  if ((parsed.outputDir || parsed.buildScript || parsed.spa || parsed.noSpa) && !parsed.staticSite) throw new Error("--output-dir, --build-script, and --spa require --static");
   if (parsed.outputDir) {
     const problem = staticOutputDirProblem(parsed.outputDir);
     if (problem) throw new Error(problem);
@@ -483,7 +486,6 @@ CMD ["bun", "run", "start"]
     environment:
       HOST: 0.0.0.0
       PORT: "3000"
-    init: true
     restart: unless-stopped
     healthcheck:
       test: ["CMD", "bun", "-e", "fetch('http://127.0.0.1:3000/').then(r=>process.exit(r.ok?0:1)).catch(()=>process.exit(1))"]
@@ -657,7 +659,6 @@ ENTRYPOINT ["/busybox", "httpd", "-f", "-p", "3000", "-h", "/www", "-c", "/www/h
       - "127.0.0.1:\${SHIBUMI_PORT:-9001}:3000"
     labels:
 ${staticComposeLabels(config)}
-    init: true
     restart: unless-stopped
     healthcheck:
       test: ${healthcheck}
@@ -806,6 +807,7 @@ async function prepareCompose(): Promise<boolean> {
 
   if (wantStatic) {
     await generateStaticDeployment();
+    if (await offerGeneratedCommit(["Dockerfile", "compose.yaml", ".dockerignore", "scripts/static-server.ts", "package.json", "bun.lock"])) return false;
     outro("Review generated deployment files.\n\nNext: commit and push these changes, then run bun ship:setup.");
     return true;
   }
@@ -824,6 +826,8 @@ async function prepareCompose(): Promise<boolean> {
     written.push(name);
   }
   log.success(`Generated ${written.join(", ")}`);
+  log.info("Verify the app binds to 0.0.0.0 and reads PORT before shipping.");
+  if (await offerGeneratedCommit(written)) return false;
   outro("Review generated deployment files and verify app binds to 0.0.0.0 and reads PORT.\n\nNext: commit and push these changes, then run bun ship:setup.");
   return true;
 }
@@ -836,6 +840,23 @@ const SHIP_SCRIPTS = {
   "ship:logs": "bun scripts/ship.ts --logs",
 };
 
+
+// After generating deployment files interactively, offer to commit and push
+// them in the same run so setup continues without a manual rerun. Returns
+// true when the files are committed and pushed.
+async function offerGeneratedCommit(files: string[]): Promise<boolean> {
+  if (agentRun || !process.stdin.isTTY || !process.stdout.isTTY) return false;
+  const accepted = await confirm({ message: "Commit and push the generated files, then continue setup?", initialValue: true });
+  if (isCancel(accepted) || !accepted) return false;
+  const present: string[] = [];
+  for (const file of files) if (await Bun.file(join(root, file)).exists()) present.push(file);
+  await run(["git", "add", "--", ...present]);
+  await run(["git", "commit", "--only", "-m", "Add deployment configuration", "--", ...present], { inherit: true });
+  await run(["git", "push"], { inherit: true });
+  log.success("Committed and pushed deployment files");
+  return true;
+}
+
 async function generateStaticDeployment(): Promise<void> {
   // Script-less generators (Jekyll) have no package.json; create a minimal one
   // so bun ship commands and an optional build script have a home.
@@ -880,7 +901,7 @@ async function generateStaticDeployment(): Promise<void> {
   if (problem) throw new Error(problem);
 
   let spa = options.spa;
-  if (!spa && !agentRun && !options.yes) {
+  if (!spa && !options.noSpa && !agentRun && !options.yes) {
     const answer = await confirm({ message: "Single-page app? (unknown paths serve index.html)", initialValue: false });
     if (isCancel(answer)) throw new Error("setup cancelled");
     spa = answer;

package/src/templates/static/bun.lock

@@ -0,0 +1,25 @@
+{
+  "lockfileVersion": 2,
+  "configVersion": 1,
+  "workspaces": {
+    "": {
+      "name": "shibumi-static-site",
+      "devDependencies": {
+        "@clack/prompts": "1.7.0",
+      },
+    },
+  },
+  "packages": {
+    "@clack/core": ["@clack/core@1.4.3", "", { "dependencies": { "fast-wrap-ansi": "^0.2.0", "sisteransi": "^1.0.5" } }, "sha512-/kr3UWNtdJfxZtPgDqUOmG2pvwlmcLGheex5yiZKdwbzZJxhV+HMNR9QNmyY5cGwTNV6LrR7Jtp+KjhUAP1qBQ=="],
+
+    "@clack/prompts": ["@clack/prompts@1.7.0", "", { "dependencies": { "@clack/core": "1.4.3", "fast-string-width": "^3.0.2", "fast-wrap-ansi": "^0.2.0", "sisteransi": "^1.0.5" } }, "sha512-y7/yvZ2TPAnR9+jnc00klvNNLkJiXFFrQA/hlLCcxA9a2A4zQIOimyFQ9XfwYKiGD1fb5GY8vbKIIgO8d5Tb2A=="],
+
+    "fast-string-truncated-width": ["fast-string-truncated-width@3.0.3", "", {}, "sha512-0jjjIEL6+0jag3l2XWWizO64/aZVtpiGE3t0Zgqxv0DPuxiMjvB3M24fCyhZUO4KomJQPj3LTSUnDP3GpdwC0g=="],
+
+    "fast-string-width": ["fast-string-width@3.0.2", "", { "dependencies": { "fast-string-truncated-width": "^3.0.2" } }, "sha512-gX8LrtNEI5hq8DVUfRQMbr5lpaS4nMIWV+7XEbXk2b8kiQIizgnlr12B4dA3ZEx3308ze0O4Q1R+cHts8kyUJg=="],
+
+    "fast-wrap-ansi": ["fast-wrap-ansi@0.2.2", "", { "dependencies": { "fast-string-width": "^3.0.2" } }, "sha512-7F2Fl+TjRSenLqlU3UjSH0iyqopqoZIu7eZVpEirP2g1GtWa2G/ecEmBdgz31+Mxr+ELclgg6sokpSFIQiZ02Q=="],
+
+    "sisteransi": ["sisteransi@1.0.5", "", {}, "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="],
+  }
+}

package/src/templates/static/package.json

@@ -6,12 +6,15 @@
   "scripts": {
     "dev": "bun scripts/preview.ts",
     "ship": "bun scripts/ship.ts",
-    "ship:setup": "bun scripts/ship.ts --setup --static --output-dir public",
+    "ship:setup": "bun scripts/ship.ts --setup --static --output-dir public --no-spa",
     "ship:update": "bun scripts/ship.ts --update",
     "ship:status": "bun scripts/ship.ts --status",
     "ship:logs": "bun scripts/ship.ts --logs"
   },
   "engines": {
     "bun": ">=1.4.0"
+  },
+  "devDependencies": {
+    "@clack/prompts": "1.7.0"
   }
 }

package/src/templates/static/public/favicon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><style>text{fill:#e95f19;font-family:"Hiragino Sans","Noto Sans JP",sans-serif}@media (prefers-color-scheme:dark){text{fill:#ff8648}}</style><text x="50" y="55" font-size="62" text-anchor="middle" dominant-baseline="central">渋</text></svg>

package/src/templates/static/public/index.html

@@ -3,14 +3,22 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>Shibumi static site</title>
+    <title>It ships · shibumi static</title>
+    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+    <meta name="generator" content="create-shibumi (shibumistack.dev)" />
     <link rel="stylesheet" href="/style.css" />
   </head>
   <body>
     <main>
+      <p class="masthead"><span class="masthead-mark">渋み</span> shibumi static</p>
       <h1>It ships.</h1>
-      <p>To get started, open <code>public/index.html</code>; this page is that file. Edit, commit, run <code>bun ship</code>.</p>
-      <p>Using Astro, Jekyll, Eleventy, or another generator? Point its output here, or run <code>bun ship:setup</code> in that project instead; the Ship client packages any verified build directory.</p>
+      <p class="lede">Every file in <code>public/</code> is a page on your site. You are looking at <code>public/index.html</code>.</p>
+      <ol class="steps">
+        <li>Edit this file. <code>bun dev</code> shows it locally.</li>
+        <li>Connect your server once with <code>bun ship:setup</code>.</li>
+        <li>After that, every deploy is <code>git commit</code> and <code>bun ship</code>.</li>
+      </ol>
+      <p class="aside">Writing with Astro, Jekyll, or Eleventy instead? Run <code>bun ship:setup</code> inside that project; Ship deploys any build folder it can verify.</p>
     </main>
   </body>
 </html>

package/src/templates/static/public/style.css

@@ -1,36 +1,71 @@
+/* Self-contained styles on the shibumi palette. Yours to edit. */
 :root {
   color-scheme: light dark;
-  --paper: #f5f0e4;
-  --ink: #1b130f;
-  --accent: #e95f19;
-}
-
-@media (prefers-color-scheme: dark) {
-  :root {
-    --paper: #1b130f;
-    --ink: #f5f0e4;
-    --accent: #ff8648;
-  }
+  --paper: light-dark(#f5f0e4, #1b130f);
+  --ink: light-dark(#272016, #eee5d7);
+  --muted: light-dark(#746b5d, #aaa092);
+  --faint: light-dark(rgba(39, 32, 22, 0.055), rgba(238, 229, 215, 0.07));
+  --line: light-dark(rgba(39, 32, 22, 0.14), rgba(238, 229, 215, 0.16));
+  --accent: light-dark(#e95f19, #ff8648);
+  --font-serif: ui-serif, Georgia, "Iowan Old Style", Cambria, serif;
+  --font-mono: ui-monospace, "SF Mono", Menlo, Consolas, monospace;
 }
 
 body {
   margin: 0;
   background: var(--paper);
   color: var(--ink);
-  font-family: system-ui, sans-serif;
+  font-family: ui-sans-serif, system-ui, sans-serif;
   font-size: 1.125rem;
-  line-height: 1.6;
+  line-height: 1.65;
 }
 
 main {
-  max-width: 40rem;
+  max-width: 40.625rem;
   margin: 0 auto;
-  padding: 4rem 1.5rem;
+  padding: clamp(3rem, 9vh, 6.5rem) 1.5rem 4rem;
+}
+
+.masthead {
+  display: flex;
+  align-items: baseline;
+  gap: 0.6rem;
+  margin: 0 0 3.5rem;
+  padding-bottom: 1rem;
+  border-bottom: 1px solid var(--line);
+  color: var(--muted);
+  font-size: 0.875rem;
+  letter-spacing: 0.04em;
+}
+
+.masthead-mark {
+  color: var(--accent);
+  font-size: 1rem;
 }
 
 h1 {
-  font-family: Georgia, "Times New Roman", serif;
-  font-weight: 500;
+  margin: 0 0 0.75rem;
+  font-family: var(--font-serif);
+  font-size: clamp(2.6rem, 7vw, 3.8rem);
+  font-weight: 450;
+  letter-spacing: -0.03em;
+  line-height: 1.05;
+}
+
+.lede {
+  margin: 0 0 3rem;
+  max-width: 34rem;
+  color: var(--muted);
+  font-size: 1.3125rem;
+  line-height: 1.55;
+}
+
+code {
+  padding: 0.12em 0.42em;
+  border-radius: 0.35rem;
+  background: var(--faint);
+  font-family: var(--font-mono);
+  font-size: 0.85em;
 }
 
 a {
@@ -44,7 +79,18 @@ a:hover {
   text-decoration-color: var(--accent);
 }
 
-code {
-  font-family: ui-monospace, monospace;
-  font-size: 0.9em;
+.steps {
+  margin: 0 0 2.5rem;
+  padding-left: 1.4rem;
+}
+
+.steps li {
+  margin-bottom: 0.6rem;
+}
+
+.aside {
+  padding-top: 1.5rem;
+  border-top: 1px solid var(--line);
+  color: var(--muted);
+  font-size: 1rem;
 }

package/src/templates/web/public/favicon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><style>text{fill:#e95f19;font-family:"Hiragino Sans","Noto Sans JP",sans-serif}@media (prefers-color-scheme:dark){text{fill:#ff8648}}</style><text x="50" y="55" font-size="62" text-anchor="middle" dominant-baseline="central">渋</text></svg>

package/src/templates/web/public/style.css

@@ -2,6 +2,12 @@
    Edit freely; this file is yours. Tokens: --paper --ink --muted --line
    --accent, type scale --text-xs..--text-2xl, --font-sans/serif/mono. */
 
+/* The vendored shibumi.css sets a kozo paper background for the sites; apps
+   stay flat, and this override also stops the browser fetching the image. */
+body {
+  background-image: none;
+}
+
 .scaffold {
   max-width: 40.625rem;
   margin: 0 auto;
@@ -83,7 +89,7 @@
   border-top: 1px solid var(--line);
 }
 
-main .endpoints a {
+main .endpoints a:not(.btn):not(.button) {
   display: flex;
   align-items: baseline;
   justify-content: space-between;
@@ -95,13 +101,12 @@ main .endpoints a {
   transition: background 160ms ease;
 }
 
-main .endpoints a:hover,
-main .endpoints a:focus-visible {
+main .endpoints a:not(.btn):not(.button):hover,
+main .endpoints a:not(.btn):not(.button):focus-visible {
   background: var(--faint);
 }
 
-.endpoint-path {
-  font-family: var(--font-mono);
+main .endpoints code {
   font-size: var(--text-sm);
 }
 /* Inline code as rounded chips on the faint layer. */
@@ -114,7 +119,7 @@ main .endpoints a:focus-visible {
 }
 
 
-main .endpoints a:hover .endpoint-path {
+main .endpoints a:hover code {
   color: var(--accent);
 }
 

package/src/templates/web/public/vendor/shibumi.css

@@ -60,19 +60,23 @@ body {
     background: var(--bg);
 }
 
-h1, h2, h3 {
-    font-family: var(--font-serif);
+/* Kozo paper texture, light theme only; dark stays flat ink. The image lives
+   next to this stylesheet in every consumer, hence the relative URL. */
+body {
+    background-image: url("kozo.webp");
+    background-size: cover;
+    background-position: center;
+    background-attachment: fixed;
+    background-repeat: no-repeat;
 }
+@media (prefers-color-scheme: dark) {
+    body { background-image: none; }
+}
+[data-theme="light"] body { background-image: url("kozo.webp"); }
+[data-theme="dark"] body { background-image: none; }
 
-/* theme-independent noise texture, copied from shibumi-server */
-body::before {
-    content: "";
-    position: fixed;
-    inset: 0;
-    z-index: -1;
-    pointer-events: none;
-    opacity: 0.33;
-    background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 180 180' xmlns='http://www.w3.org/2000/svg'%3E%3Cfilter id='n'%3E%3CfeTurbulence type='fractalNoise' baseFrequency='.88' numOctaves='3' stitchTiles='stitch'/%3E%3C/filter%3E%3Crect width='100%25' height='100%25' filter='url(%23n)' opacity='.08'/%3E%3C/svg%3E");
+h1, h2, h3 {
+    font-family: var(--font-serif);
 }
 
 a { color: inherit; }
@@ -123,9 +127,9 @@ main a:not(.btn):not(.button):focus-visible {
     width: 100vw;
     height: 100%;
     transform: translateX(-50%);
-    background: light-dark(rgb(245 240 228 / 78%), rgb(27 19 15 / 72%));
-    backdrop-filter: blur(1.125rem);
-    -webkit-backdrop-filter: blur(1.125rem);
+    background: light-dark(rgb(245 240 228 / 0%), rgb(27 19 15 / 72%));
+    backdrop-filter: blur(1.25rem);
+    -webkit-backdrop-filter: blur(1.25rem);
 }
 
 .mark {

package/src/templates/web/src/app.ts

@@ -63,6 +63,8 @@ const page = `<!doctype html>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>Web app · shibumi</title>
+    <link rel="icon" type="image/svg+xml" href="/public/favicon.svg" />
+    <meta name="generator" content="create-shibumi (shibumistack.dev)" />
     <link rel="stylesheet" href="/public/vendor/shibumi.css" />
     <link rel="stylesheet" href="/public/style.css" />
     <!-- app.js must load before Alpine so the alpine:init listener exists
@@ -81,8 +83,8 @@ const page = `<!doctype html>
         <span class="demo-hint">client state without a build step</span>
       </section>
       <ul class="endpoints">
-        <li><a href="/api/hello?name=you"><span class="endpoint-path">GET /api/hello</span><span>query validated with Zod</span></a></li>
-        <li><a href="/healthz"><span class="endpoint-path">GET /healthz</span><span>the check every deploy waits for</span></a></li>
+        <li><a href="/api/hello?name=you"><code>GET /api/hello</code><span>query validated with Zod</span></a></li>
+        <li><a href="/healthz"><code>GET /healthz</code><span>the check every deploy waits for</span></a></li>
       </ul>
       <footer class="colophon">
         <p>This page lives in <code>src/app.ts</code>. House rules for coding agents are in <code>agents.md</code>. Add features with <code>bun shi add email</code>.</p>