@decocms/start 0.34.0 → 0.35.0

package/package.json

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

package/scripts/migrate/phase-verify.ts

@@ -275,15 +275,19 @@ const checks: Check[] = [
     },
   },
   {
-    name: "No invoke.resend calls (should use sendEmail)",
+    name: "invoke.* calls have runtime.ts proxy available",
     severity: "warning",
     fn: (ctx) => {
       const srcDir = path.join(ctx.sourceDir, "src");
       if (!fs.existsSync(srcDir)) return true;
-      const bad = findFilesWithPattern(srcDir, /invoke\.resend\./);
-      if (bad.length > 0) {
-        console.log(`    Still uses invoke.resend: ${bad.join(", ")}`);
-        return false;
+      const hasInvoke = findFilesWithPattern(srcDir, /\binvoke\.\w+\.\w+/);
+      if (hasInvoke.length > 0) {
+        // Check that runtime.ts exists and has the invoke proxy
+        const runtimePath = path.join(srcDir, "runtime.ts");
+        if (!fs.existsSync(runtimePath)) {
+          console.log(`    Files use invoke.* but src/runtime.ts is missing: ${hasInvoke.join(", ")}`);
+          return false;
+        }
       }
       return true;
     },

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

@@ -1,5 +1,23 @@
+import { execSync } from "node:child_process";
 import type { MigrationContext } from "../types.ts";
 
+/**
+ * Get the latest published version of an npm package.
+ * Falls back to the provided default if the lookup fails.
+ */
+function getLatestVersion(pkg: string, fallback: string): string {
+  try {
+    const version = execSync(`npm view ${pkg} version`, {
+      encoding: "utf-8",
+      timeout: 10000,
+      stdio: ["pipe", "pipe", "pipe"],
+    }).trim();
+    return version || fallback;
+  } catch {
+    return fallback;
+  }
+}
+
 /**
  * Extract npm dependencies from deno.json import map.
  * Entries like `"fuse.js": "npm:fuse.js@7.0.0"` become `"fuse.js": "^7.0.0"`.
@@ -40,6 +58,10 @@ export function generatePackageJson(ctx: MigrationContext): string {
     ...ctx.discoveredNpmDeps,
   };
 
+  // Fetch latest versions from npm registry
+  const startVersion = getLatestVersion("@decocms/start", "0.34.0");
+  const appsVersion = getLatestVersion("@decocms/apps", "0.26.0");
+
   const pkg = {
     name: ctx.siteName,
     version: "0.1.0",
@@ -72,8 +94,8 @@ export function generatePackageJson(ctx: MigrationContext): string {
     author: "deco.cx",
     license: "MIT",
     dependencies: {
-      "@decocms/apps": "^0.25.2",
-      "@decocms/start": "^0.32.0",
+      "@decocms/apps": `^${appsVersion}`,
+      "@decocms/start": `^${startVersion}`,
       "@tanstack/react-query": "5.90.21",
       "@tanstack/react-router": "1.166.7",
       "@tanstack/react-start": "1.166.8",

package/scripts/migrate/templates/setup.ts

@@ -43,11 +43,14 @@ import {
   setBlocks,
 } from "@decocms/start/cms";
 import { registerBuiltinMatchers } from "@decocms/start/matchers/builtins";
+import { autoconfigApps } from "@decocms/start/apps/autoconfig";
 
 // -- CMS Blocks --
 // The Vite plugin intercepts the blocks.gen import and injects .deco/blocks/ data.
 if (typeof document === "undefined") {
   setBlocks(generatedBlocks);
+  // Auto-configure apps (Resend, etc.) from CMS blocks
+  autoconfigApps(generatedBlocks);
 }
 
 // -- Section Registry --

package/scripts/migrate/transforms/dead-code.ts

@@ -8,7 +8,10 @@ import type { TransformResult } from "../types.ts";
  * - `export const cacheKey = ...` (old cache key generation)
  * - `export const loader = (props, req, ctx) => ...` (old section loader pattern)
  * - `crypto.subtle.digestSync(...)` (Deno-only sync API)
- * - `invoke.resend.actions.emails.send(...)` → `sendEmail(...)` from @decocms/apps
+ *
+ * NOTE: invoke.* calls are NOT migrated — they are RPC calls to the server
+ * where the CMS config (API keys, etc.) is available. The runtime.ts invoke
+ * proxy handles routing them to /deco/invoke/*.
  */
 export function transformDeadCode(content: string): TransformResult {
   const notes: string[] = [];
@@ -68,33 +71,9 @@ export function transformDeadCode(content: string): TransformResult {
     notes.push("MANUAL: crypto.subtle.digestSync is Deno-only — replaced with crypto.subtle.digest (needs await)");
   }
 
-  // Migrate invoke.resend.actions.emails.send → sendEmail from @decocms/apps
-  if (result.includes("invoke.resend.actions.emails.send")) {
-    // Replace the invoke call with sendEmail
-    result = result.replace(
-      /(?:await\s+)?invoke\.resend\.actions\.emails\.send\(/g,
-      "await sendEmail(",
-    );
-
-    // Remove the old runtime import if only used for resend
-    result = result.replace(
-      /^import\s+\{\s*invoke\s*\}\s+from\s+["'][^"']*runtime["'];?\s*\n?/gm,
-      "",
-    );
-
-    // Add the sendEmail import if not present
-    if (!result.includes('"@decocms/apps/resend/actions/send"')) {
-      result = `import { sendEmail } from "@decocms/apps/resend/actions/send";\n${result}`;
-    }
-
-    changed = true;
-    notes.push("Migrated invoke.resend.actions.emails.send → sendEmail from @decocms/apps/resend");
-  }
-
-  // Generic invoke.X pattern — flag for manual review
-  if (/\binvoke\.\w+\.\w+/.test(result) && !result.includes("sendEmail")) {
-    notes.push("MANUAL: invoke.* calls found — need manual migration to server functions or @decocms/apps actions");
-  }
+  // invoke.* calls are server RPC via runtime.ts proxy → keep as-is
+  // The runtime.ts scaffolded file creates a proxy that routes to /deco/invoke/*
+  // where the CMS config (API keys, tokens) is available server-side.
 
   // Clean up blank lines
   result = result.replace(/\n{3,}/g, "\n\n");

package/src/apps/autoconfig.ts

@@ -0,0 +1,107 @@
+/**
+ * Auto-configures known apps from CMS blocks.
+ *
+ * Scans the decofile for known app block keys (e.g. "deco-resend") and:
+ * 1. Configures the app client with CMS-provided credentials
+ * 2. Registers invoke handlers so `invoke.app.actions.*` works via the proxy
+ *
+ * Usage in setup.ts:
+ *   import { autoconfigApps } from "@decocms/start/apps/autoconfig";
+ *   setBlocks(generatedBlocks);
+ *   await autoconfigApps(generatedBlocks);
+ */
+
+import { setInvokeActions, type InvokeAction } from "../admin/invoke";
+import { onChange } from "../cms/loader";
+
+// ---------------------------------------------------------------------------
+// Known app block keys → dynamic import + configure
+// ---------------------------------------------------------------------------
+
+interface AppAutoconfigurator {
+	/** Try to import, configure, and return invoke actions for this app */
+	(blockData: unknown): Promise<Record<string, InvokeAction>>;
+}
+
+const KNOWN_APPS: Record<string, AppAutoconfigurator> = {
+	"deco-resend": async (block: any) => {
+		try {
+			const [resendClient, resendActions] = await Promise.all([
+				import("@decocms/apps/resend/client" as string),
+				import("@decocms/apps/resend/actions/send" as string),
+			]);
+			const { configureResend } = resendClient as { configureResend: (cfg: any) => void };
+			const { sendEmail } = resendActions as { sendEmail: (props: any) => Promise<any> };
+
+			const apiKey =
+				typeof block.apiKey === "string"
+					? block.apiKey
+					: block.apiKey?.get?.() ?? "";
+
+			if (!apiKey) return {};
+
+			configureResend({
+				apiKey,
+				emailFrom: block.emailFrom
+					? `${block.emailFrom.name || "Contact"} ${block.emailFrom.domain || "<onboarding@resend.dev>"}`
+					: undefined,
+				emailTo: block.emailTo,
+				subject: block.subject,
+			});
+
+			return {
+				"resend/actions/emails/send.ts": async (props: any) =>
+					sendEmail(props),
+			};
+		} catch {
+			// @decocms/apps not installed or doesn't have resend — skip
+			return {};
+		}
+	},
+};
+
+// ---------------------------------------------------------------------------
+// Main
+// ---------------------------------------------------------------------------
+
+/**
+ * Auto-configure apps from CMS blocks.
+ * Call in setup.ts after setBlocks(). Also re-runs on admin hot-reload.
+ */
+export async function autoconfigApps(blocks: Record<string, unknown>) {
+	if (typeof document !== "undefined") return; // server-only
+
+	const actions: Record<string, InvokeAction> = {};
+
+	for (const [blockKey, configurator] of Object.entries(KNOWN_APPS)) {
+		const block = blocks[blockKey];
+		if (!block) continue;
+
+		try {
+			const appActions = await configurator(block);
+			Object.assign(actions, appActions);
+		} catch (e) {
+			console.warn(`[autoconfig] ${blockKey}:`, e);
+		}
+	}
+
+	if (Object.keys(actions).length > 0) {
+		setInvokeActions(() => ({ ...actions }));
+	}
+
+	// Re-configure on admin hot-reload
+	onChange(async (newBlocks) => {
+		if (typeof document !== "undefined") return;
+		const updatedActions: Record<string, InvokeAction> = {};
+		for (const [blockKey, configurator] of Object.entries(KNOWN_APPS)) {
+			const block = newBlocks[blockKey];
+			if (!block) continue;
+			try {
+				Object.assign(updatedActions, await configurator(block));
+			} catch {}
+		}
+		if (Object.keys(updatedActions).length > 0) {
+			setInvokeActions(() => ({ ...updatedActions }));
+		}
+	});
+}