@decocms/start 0.32.2 → 0.32.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/start",
-  "version": "0.32.2",
+  "version": "0.32.3",
   "type": "module",
   "description": "Deco framework for TanStack Start - CMS bridge, admin protocol, hooks, schema generation",
   "main": "./src/index.ts",

package/scripts/migrate/phase-scaffold.ts

@@ -38,6 +38,7 @@ export function scaffold(ctx: MigrationContext): void {
   writeFile(ctx, "vite.config.ts", generateViteConfig(ctx));
   writeFile(ctx, "wrangler.jsonc", generateWrangler(ctx));
   writeFile(ctx, "knip.config.ts", generateKnipConfig());
+  writeFile(ctx, ".gitignore", generateGitignore());
   writeFile(ctx, ".prettierrc", JSON.stringify({
     semi: true,
     singleQuote: false,
@@ -113,6 +114,45 @@ function generateAppCss(_ctx: MigrationContext): string {
 `;
 }
 
+function generateGitignore(): string {
+  return `# Dependencies
+node_modules/
+
+# Build output
+dist/
+.cache/
+
+# Cloudflare Workers
+.wrangler/
+.dev.vars
+
+# TanStack Router (auto-generated)
+src/routeTree.gen.ts
+.tanstack/
+
+# Vite
+vite.config.timestamp_*
+*.local
+
+# Environment
+.env
+.env.*
+
+# OS
+.DS_Store
+
+# Deco CMS
+.deco/metadata/*
+
+# Bun lock file (if using npm, keep package-lock.json instead)
+# package-lock.json
+
+# IDE
+.vscode/
+.idea/
+`;
+}
+
 function generateSiteApp(ctx: MigrationContext): string {
   return `export type Platform =
   | "vtex"

package/scripts/migrate/templates/package-json.ts

@@ -8,10 +8,13 @@ function extractNpmDeps(importMap: Record<string, string>): Record<string, strin
   const deps: Record<string, string> = {};
   for (const [key, value] of Object.entries(importMap)) {
     if (!value.startsWith("npm:")) continue;
-    // Skip preact, deco, and other framework deps we handle ourselves
+    // Skip framework deps we handle ourselves
     if (key.startsWith("preact") || key.startsWith("@preact/")) continue;
     if (key.startsWith("@deco/")) continue;
-    if (key === "daisyui") continue; // we pin our own version
+    if (key === "daisyui") continue;
+    if (key === "preact-render-to-string") continue;
+    if (key === "simple-git") continue; // dev tool, not needed in runtime
+    if (key === "fast-json-patch") continue; // used by old deco runtime
 
     const raw = value.slice(4); // remove "npm:"
     const atIdx = raw.lastIndexOf("@");
@@ -19,8 +22,13 @@ function extractNpmDeps(importMap: Record<string, string>): Record<string, strin
       deps[raw] = "*";
     } else {
       const name = raw.slice(0, atIdx);
-      const version = raw.slice(atIdx + 1);
-      deps[name] = `^${version}`;
+      let version = raw.slice(atIdx + 1);
+      // Don't double-prefix with ^ if version already has a range prefix
+      if (/^[~^>=<]/.test(version)) {
+        deps[name] = version;
+      } else {
+        deps[name] = `^${version}`;
+      }
     }
   }
   return deps;
@@ -39,6 +47,8 @@ export function generatePackageJson(ctx: MigrationContext): string {
     description: `${ctx.siteName} storefront powered by TanStack Start`,
     scripts: {
       dev: "vite dev",
+      "dev:clean":
+        "rm -rf node_modules/.vite .wrangler/state .tanstack && vite dev",
       "generate:blocks":
         "tsx node_modules/@decocms/start/scripts/generate-blocks.ts",
       "generate:routes": "tsr generate",

package/scripts/migrate/templates/setup.ts

@@ -21,9 +21,13 @@ if (typeof document === "undefined") {
 }
 
 // -- Section Registry --
-// Discovers all .tsx files under src/sections/ and registers them as CMS blocks.
-const sectionModules = import.meta.glob("./sections/**/*.tsx");
-registerSections(sectionModules);
+// CMS blocks reference sections as "site/sections/X.tsx", so we remap the glob keys.
+const sectionGlob = import.meta.glob("./sections/**/*.tsx") as Record<string, () => Promise<any>>;
+const sections: Record<string, () => Promise<any>> = {};
+for (const [path, loader] of Object.entries(sectionGlob)) {
+  sections["site/" + path.slice(2)] = loader;
+}
+registerSections(sections);
 
 // -- Matchers --
 registerBuiltinMatchers();

package/scripts/migrate.ts

@@ -24,7 +24,8 @@
  */
 
 import * as path from "node:path";
-import { createContext } from "./migrate/types.ts";
+import { execSync } from "node:child_process";
+import { createContext, logPhase } from "./migrate/types.ts";
 import { analyze } from "./migrate/phase-analyze.ts";
 import { scaffold } from "./migrate/phase-scaffold.ts";
 import { transform } from "./migrate/phase-transform.ts";
@@ -126,10 +127,49 @@ async function main() {
     if (!ok) {
       process.exit(2);
     }
+
+    // Phase 7: Bootstrap (install + generate)
+    if (!ctx.dryRun) {
+      bootstrap(ctx);
+    }
   } catch (error) {
     console.error(`\n  ${red("Migration failed:")}`, error);
     process.exit(1);
   }
 }
 
+function bootstrap(ctx: { sourceDir: string }) {
+  logPhase("Bootstrap (install + generate)");
+
+  let failures = 0;
+  const run = (cmd: string, label: string, critical = false) => {
+    console.log(`  Running: ${label}...`);
+    try {
+      execSync(cmd, { cwd: ctx.sourceDir, stdio: "pipe" });
+      console.log(`  ${green("✓")} ${label}`);
+    } catch (e: any) {
+      failures++;
+      const icon = critical ? red("✗") : yellow("⚠");
+      console.log(`  ${icon} ${label} failed: ${e.message?.split("\n")[0]}`);
+      if (critical) {
+        console.log(`\n  ${red("Bootstrap aborted.")} Fix the error above and run manually.\n`);
+        return false;
+      }
+    }
+    return true;
+  };
+
+  // Detect package manager
+  const pm = process.env.npm_execpath?.includes("bun") ? "bun" : "npm";
+  if (!run(`${pm} install`, "Install dependencies", true)) return;
+  run("npx tsx node_modules/@decocms/start/scripts/generate-blocks.ts", "Generate CMS blocks");
+  run("npx tsr generate", "Generate TanStack routes");
+
+  if (failures > 0) {
+    console.log(`\n  ${yellow("Bootstrap completed with warnings.")} Check errors above before running dev.\n`);
+  } else {
+    console.log(`\n  ${green("Ready!")} Run \`${pm} run dev\` to start the dev server.\n`);
+  }
+}
+
 main();