create-kide-app 0.1.10 → 0.2.3

package/README.md

@@ -11,17 +11,19 @@ pnpm create kide-app my-project
 The CLI asks for:
 
 1. **Project name** — directory to create
-2. **Deploy target** — Local/Node.js or Cloudflare
-3. **Seed demo content** — local target only
+2. **Distribution mode** — Package (recommended: thin project + `@kidecms/core` npm dependency; `pnpm exec kide eject` converts to embedded later, one-way) or Embedded (full CMS source in `src/cms/`, yours to modify)
+3. **Deploy target** — Local/Node.js or Cloudflare
+
+Every project starts bare-bones: one `pages` collection (`title`, `slug`, `body`) and a minimal public page — no demo content, no seeds.
 
 ## What it does
 
-- Clones the latest Kide CMS from GitHub.
+- Clones the latest Kide CMS release from GitHub (package mode then swaps the embedded runtime for the published `@kidecms/core` at the same version).
 - Applies target-specific configuration (Node.js adapter, or Cloudflare D1/R2/Workers).
 - Installs dependencies with pnpm.
 - Optionally creates a GitHub repo (if the `gh` CLI is installed and authenticated).
 - Generates the CMS schema.
-- For **local**: optionally seeds demo content, then starts the dev server.
+- For **local**: starts the dev server.
 - For **Cloudflare**: logs into wrangler (if needed), creates a D1 database and R2 bucket, applies migrations, builds and deploys, and prints the live URL + admin URL.
 
 ## Requirements

package/index.js

@@ -51,6 +51,8 @@ const CLEANUP = [
   "docs",
   "CLAUDE.md",
   ".claude/settings.local.json",
+  ".github/workflows", // upstream CI + @kidecms/core release pipeline — wrong in any scaffold
+  "scripts/verify-cloudflare.mjs", // needs the adapters/ overlay, which every scaffold deletes
   "data",
   ".cms-data",
   "dist",
@@ -58,6 +60,20 @@ const CLEANUP = [
   ".DS_Store",
 ];
 
+// Managed runtime dirs inside src/cms — the contents of the @kidecms/core
+// package. Deleted in package mode (the npm dependency provides them);
+// everything else in src/cms (cms.config, collections, adapters, fields,
+// runtime.ts, migrations) is project-owned and stays in both modes.
+const MANAGED_DIRS = [
+  "admin",
+  "client",
+  "core",
+  "internals",
+  "middleware",
+  "platform",
+  "routes",
+];
+
 // The project name reaches shell commands (git, wrangler) and path.resolve, so it is
 // validated before either. Restricting it to one path segment of safe characters keeps
 // `$(...)`, backticks, `;` and separators out of those commands and out of the target
@@ -126,7 +142,30 @@ async function main() {
     process.exit(1);
   }
 
-  // 2. Deploy target
+  // 2. Distribution mode — package is the recommended default; embedded stays
+  // first-class for teams that want to own and modify the runtime source.
+  const mode = await p.select({
+    message: "How do you want the CMS runtime?",
+    options: [
+      {
+        label: "Package",
+        value: "package",
+        hint: "@kidecms/core dependency",
+      },
+      {
+        label: "Embedded",
+        value: "embedded",
+        hint: "full CMS source in src/cms/, yours to modify",
+      },
+    ],
+  });
+
+  if (p.isCancel(mode)) {
+    p.cancel("Setup cancelled.");
+    process.exit(0);
+  }
+
+  // 3. Deploy target
   const target = await p.select({
     message: "Where will you deploy?",
     options: [
@@ -140,21 +179,6 @@ async function main() {
     process.exit(0);
   }
 
-  // 3. Demo content (local only — Cloudflare uses remote D1)
-  let seedDemo = false;
-  if (target === "local") {
-    const seed = await p.confirm({
-      message: "Seed database with demo content?",
-      initialValue: false,
-    });
-
-    if (p.isCancel(seed)) {
-      p.cancel("Setup cancelled.");
-      process.exit(0);
-    }
-    seedDemo = seed;
-  }
-
   const s = p.spinner();
 
   // --- Scaffold via git clone ---
@@ -197,10 +221,46 @@ async function main() {
     rmSync(path.join(projectDir, f), { recursive: true, force: true });
   }
 
+  // Both modes scaffold the same template at the same tag; package mode then
+  // deletes the managed runtime dirs and swaps the workspace link for the
+  // published @kidecms/core at exactly that version — same source either way.
+  const corePkgPath = path.join(projectDir, "src/cms/package.json");
+  let coreVersion = null;
+  if (existsSync(corePkgPath)) {
+    coreVersion = JSON.parse(readFileSync(corePkgPath, "utf-8")).version;
+  }
+
+  if (mode === "package") {
+    if (!coreVersion) {
+      s.stop("Scaffolding failed");
+      p.cancel(
+        "This template release predates package mode — choose Embedded, or wait for the next release.",
+      );
+      process.exit(1);
+    }
+    for (const managed of MANAGED_DIRS) {
+      rmSync(path.join(projectDir, "src/cms", managed), {
+        recursive: true,
+        force: true,
+      });
+    }
+    rmSync(corePkgPath, { force: true });
+    rmSync(path.join(projectDir, "pnpm-workspace.yaml"), { force: true });
+    // Upstream distribution tooling that assumes the embedded workspace package.
+    rmSync(path.join(projectDir, "scripts/verify-pack.mjs"), { force: true });
+    rmSync(path.join(projectDir, "scripts/verify-package-mode.mjs"), {
+      force: true,
+    });
+    // Worker tests and the Cloudflare type profile live in the deleted
+    // src/cms/platform — their configs would match zero files.
+    rmSync(path.join(projectDir, "vitest.workers.config.ts"), { force: true });
+    rmSync(path.join(projectDir, "tsconfig.cloudflare.json"), { force: true });
+  }
+
   s.stop(
     templateRef
-      ? `Project scaffolded from ${templateRef}`
-      : "Project scaffolded",
+      ? `Project scaffolded from ${templateRef} (${mode})`
+      : `Project scaffolded (${mode})`,
   );
 
   // --- Apply target-specific files ---
@@ -224,12 +284,18 @@ async function main() {
     );
     writeFileSync(
       path.join(projectDir, "src/cms/adapters/db.ts"),
-      'export * from "../platform/cloudflare/database";\n',
+      'export * from "@kidecms/core/platform/cloudflare/database";\n',
     );
     writeFileSync(
       path.join(projectDir, "src/cms/adapters/storage.ts"),
-      'export * from "../platform/cloudflare/storage";\n',
+      'export * from "@kidecms/core/platform/cloudflare/storage";\n',
     );
+    // The adapter test asserts Node filesystem storage — meaningless (and failing)
+    // once the adapter re-exports the R2 profile.
+    rmSync(path.join(projectDir, "src/cms/adapters/__tests__"), {
+      recursive: true,
+      force: true,
+    });
   }
 
   const pkgPath = path.join(projectDir, "package.json");
@@ -237,6 +303,31 @@ async function main() {
 
   pkg.name = projectName;
 
+  // Upstream-repo tooling that no scaffold can run (needs the deleted adapters/ overlay).
+  delete pkg.scripts["verify:cloudflare"];
+
+  if (mode === "package" && pkg.dependencies["@kidecms/core"]) {
+    pkg.dependencies["@kidecms/core"] = `^${coreVersion}`;
+    delete pkg.scripts["verify:pack"];
+    delete pkg.scripts["verify:package"];
+    // The runtime (and its worker tests + Cloudflare type profile) now lives in
+    // node_modules — keep check/test scoped to project code, and let vitest pass
+    // until the project has tests of its own.
+    delete pkg.scripts["test:workers"];
+    delete pkg.scripts["check:cloudflare"];
+    pkg.scripts.check = "astro check && eslint .";
+    pkg.scripts.test = "pnpm cms:generate && vitest run --passWithNoTests";
+    // Upstream test-fixture tooling lives in the deleted core/__tests__ tree.
+    delete pkg.scripts["test:fixtures"];
+    rmSync(path.join(projectDir, "scripts/generate-test-fixtures.ts"), {
+      force: true,
+    });
+    // Dev tooling for the deleted worker tests / Cloudflare type profile.
+    delete pkg.devDependencies["@cloudflare/vitest-pool-workers"];
+    delete pkg.devDependencies["@cloudflare/workers-types"];
+    delete pkg.devDependencies["jsdom"];
+  }
+
   if (target === "cloudflare") {
     delete pkg.dependencies["@astrojs/node"];
     pkg.dependencies["@astrojs/cloudflare"] = "~14.1.7";
@@ -268,7 +359,7 @@ async function main() {
     );
     writeFileSync(path.join(projectDir, "wrangler.toml"), wranglerContent);
 
-    pkg.devDependencies.wrangler = "^4.83.0";
+    pkg.devDependencies.wrangler = "^4.121.0";
 
     pkg.scripts.dev = "astro dev";
     pkg.scripts.build = "astro build";
@@ -308,10 +399,11 @@ async function main() {
   }
   const versionStamp = {
     template: REPO.replace(/\.git$/, ""),
-    kideVersion: pkg.version ?? null,
+    kideVersion: coreVersion ?? pkg.version ?? null,
     ref: templateRef ?? "HEAD",
     commit: templateCommit,
     target,
+    mode,
     corePath: "src/cms",
     scaffoldedAt: new Date().toISOString(),
     createKideApp: cliVersion,
@@ -475,41 +567,6 @@ async function main() {
     s.stop("Schema generation failed — run `cms:generate` manually");
   }
 
-  // --- Seed demo content ---
-
-  if (seedDemo && target === "local") {
-    s.start("Pushing schema to database");
-    // The guarded sync script (exits non-zero on failure, creates data/ itself) —
-    // same path the dev server and deploys use.
-    try {
-      execSync(`${pm.run} cms:push`, { cwd: projectDir, stdio: "pipe" });
-      s.stop("Schema pushed");
-    } catch {
-      s.stop("Schema push failed — run `pnpm cms:push` manually");
-    }
-    s.start("Seeding demo content");
-    try {
-      execSync(`${pm.run} cms:seed`, { cwd: projectDir, stdio: "pipe" });
-      s.stop("Demo content seeded");
-    } catch (err) {
-      s.stop("Seeding failed — run `pnpm cms:seed` manually");
-      if (err.stderr) console.error(err.stderr.toString());
-      if (err.stdout) console.error(err.stdout.toString());
-    }
-  } else if (seedDemo && target === "cloudflare") {
-    p.note(
-      [
-        "Seeding for Cloudflare requires a D1 database.",
-        "",
-        `  ${pm.dlx} wrangler d1 create ${projectName}-db`,
-        "  # then replace the placeholder database_id in wrangler.toml",
-        `  ${pm.dlx} wrangler d1 migrations apply ${projectName}-db --local`,
-        `  ${pm.run} cms:seed`,
-      ].join("\n"),
-      "Seed manually",
-    );
-  }
-
   // --- Cloudflare resource setup ---
 
   const cf = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-kide-app",
-  "version": "0.1.10",
+  "version": "0.2.3",
   "description": "Scaffold a new Kide CMS project",
   "author": "Matti Hernesniemi",
   "license": "MIT",