@cedarjs/cli 5.0.0-canary.2376 → 5.0.0-canary.2377

package/dist/commands/setup/deploy/helpers/index.js

@@ -64,6 +64,26 @@ const addFilesTask = ({
     }
   };
 };
+const verifyUDSetupTask = () => {
+  return {
+    title: "Checking if Universal Deploy is set up...",
+    task: () => {
+      const paths = getPaths();
+      const viteConfigTs = path.join(paths.web.base, "vite.config.ts");
+      const viteConfigJs = path.join(paths.web.base, "vite.config.js");
+      const viteConfigPath = fs.existsSync(viteConfigTs) ? viteConfigTs : viteConfigJs;
+      if (!fs.existsSync(viteConfigPath)) {
+        throw new Error("Vite config file not found");
+      }
+      const content = fs.readFileSync(viteConfigPath, "utf-8");
+      if (!content.includes("cedarUniversalDeployPlugin")) {
+        throw new Error(
+          "Universal Deploy is not set up. Please run `yarn cedar setup deploy universal-deploy` first."
+        );
+      }
+    }
+  };
+};
 const addToGitIgnoreTask = ({ paths }) => {
   return {
     title: "Updating .gitignore...",
@@ -106,5 +126,6 @@ export {
   addToGitIgnoreTask,
   getUserApiUrl,
   preRequisiteCheckTask,
-  updateApiURLTask
+  updateApiURLTask,
+  verifyUDSetupTask
 };

package/dist/commands/setup/deploy/providers/netlify.js

@@ -1,8 +1,14 @@
 import { createHandler } from "../helpers/helpers.js";
 const command = "netlify";
 const description = "Setup Netlify deploy";
+const builder = (yargs) => yargs.option("ud", {
+  description: "Setup for use with Universal Deploy",
+  type: "boolean",
+  default: false
+});
 const handler = createHandler("netlify");
 export {
+  builder,
   command,
   description,
   handler

package/dist/commands/setup/deploy/providers/netlifyHandler.js

@@ -1,31 +1,129 @@
+import fs from "node:fs";
 import path from "path";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
-import { getPaths, printSetupNotes } from "../../../../lib/index.js";
-import { addFilesTask, updateApiURLTask } from "../helpers/index.js";
+import {
+  addPackagesTask,
+  getPaths,
+  printSetupNotes
+} from "../../../../lib/index.js";
+import {
+  addFilesTask,
+  updateApiURLTask,
+  verifyUDSetupTask
+} from "../helpers/index.js";
 import { NETLIFY_TOML } from "../templates/netlify.js";
+import { NETLIFY_UD_TOML } from "../templates/netlifyUD.js";
 const files = [
   {
     path: path.join(getPaths().base, "netlify.toml"),
     content: NETLIFY_TOML
   }
 ];
+const filesUd = [
+  {
+    path: path.join(getPaths().base, "netlify.toml"),
+    content: NETLIFY_UD_TOML
+  }
+];
 const notes = [
   "You are ready to deploy to Netlify!",
   "See: https://cedarjs.com/docs/deploy/netlify"
 ];
-const handler = async ({ force }) => {
+const udNotes = [
+  "You are ready to deploy to Netlify with Universal Deploy!",
+  "Build with: yarn cedar build --ud",
+  "See: https://cedarjs.com/docs/deploy/netlify"
+];
+function addNetlifyPluginsToViteConfigTask() {
+  return {
+    title: "Adding Netlify plugins to vite config...",
+    task: async (_ctx, task) => {
+      const paths = getPaths();
+      const viteConfigTs = path.join(paths.web.base, "vite.config.ts");
+      const viteConfigJs = path.join(paths.web.base, "vite.config.js");
+      const viteConfigPath = fs.existsSync(viteConfigTs) ? viteConfigTs : viteConfigJs;
+      if (!fs.existsSync(viteConfigPath)) {
+        task.skip(`${viteConfigPath} not found`);
+        return;
+      }
+      let content = fs.readFileSync(viteConfigPath, "utf-8");
+      const hasNetlifyPlugin = content.includes("@netlify/vite-plugin");
+      const hasNetlifyCompat = content.includes(
+        "@universal-deploy/netlify/vite"
+      );
+      if (hasNetlifyPlugin && hasNetlifyCompat && content.includes("netlifyCompat(")) {
+        task.skip("Netlify plugins are already configured.");
+        return;
+      }
+      if (!hasNetlifyPlugin || !hasNetlifyCompat) {
+        const newContent = content.replace(
+          /(import\s+\{[^}]*\}\s+from\s+['"]vite['"];?)/,
+          (match) => {
+            let result = match;
+            if (!hasNetlifyPlugin) {
+              result = `import netlify from '@netlify/vite-plugin'
+${result}`;
+            }
+            if (!hasNetlifyCompat) {
+              result = `import netlifyCompat from '@universal-deploy/netlify/vite'
+${result}`;
+            }
+            return result;
+          }
+        );
+        if (newContent === content) {
+          let prepend = "";
+          if (!hasNetlifyPlugin) {
+            prepend += "import netlify from '@netlify/vite-plugin'\n";
+          }
+          if (!hasNetlifyCompat) {
+            prepend += "import netlifyCompat from '@universal-deploy/netlify/vite'\n";
+          }
+          content = prepend + content;
+        } else {
+          content = newContent;
+        }
+      }
+      if (!content.includes("netlifyCompat(")) {
+        content = content.replace(
+          /(\s*)(plugins:\s*\[)([\s\S]*?)(cedar\s*\()/,
+          (_match, leadingWs, prefix, beforeCedar, cedarCall) => {
+            const indent = beforeCedar.includes("\n") ? beforeCedar.match(/\n(\s*)$/)?.[1] || leadingWs + "  " : leadingWs + "  ";
+            const before = beforeCedar.replace(/\s*$/, "");
+            return `${leadingWs}${prefix}
+${indent}netlify({ build: { enabled: true } }),
+${indent}netlifyCompat(),${before}
+${indent}${cedarCall}`;
+          }
+        );
+      }
+      fs.writeFileSync(viteConfigPath, content);
+    }
+  };
+}
+function installNetlifyPackagesTask() {
+  return addPackagesTask({
+    packages: ["@netlify/vite-plugin", "@universal-deploy/netlify"],
+    devDependency: true
+  });
+}
+const handler = async ({ force, ud }) => {
   recordTelemetryAttributes({
     command: "setup deploy netlify",
-    force
+    force,
+    ud
   });
   const tasks = new Listr(
     [
-      updateApiURLTask("/.netlify/functions"),
-      addFilesTask({ files, force }),
-      printSetupNotes(notes)
-    ],
+      ud && verifyUDSetupTask(),
+      ud && installNetlifyPackagesTask(),
+      ud && addNetlifyPluginsToViteConfigTask(),
+      !ud && updateApiURLTask("/.netlify/functions"),
+      addFilesTask({ files: ud ? filesUd : files, force }),
+      printSetupNotes(ud ? udNotes : notes)
+    ].filter(Boolean),
     { rendererOptions: { collapseSubtasks: false } }
   );
   try {

package/dist/commands/setup/deploy/providers/universalDeployHandler.js

@@ -14,7 +14,13 @@ const notes = [
   "",
   "Next steps:",
   `  ${c.highlight("yarn cedar build --ud")} \u2014 build the Universal Deploy server entry`,
-  `  ${c.highlight("yarn cedar serve --ud")} \u2014 serve it locally`
+  `  ${c.highlight("yarn cedar serve --ud")} \u2014 serve it locally`,
+  "",
+  "To deploy, pick a deployment target, for example:",
+  `  ${c.highlight("yarn cedar setup deploy netlify --ud")}`,
+  `  ${c.highlight("yarn cedar setup deploy vercel --ud")}`,
+  "",
+  "See: https://cedarjs.com/docs/deploy#universal-deploy"
 ];
 async function handler() {
   recordTelemetryAttributes({

package/dist/commands/setup/deploy/providers/vercel.js

@@ -1,8 +1,14 @@
 import { createHandler } from "../helpers/helpers.js";
 const command = "vercel";
 const description = "Setup Vercel deploy";
+const builder = (yargs) => yargs.option("ud", {
+  description: "Setup for use with Universal Deploy",
+  type: "boolean",
+  default: false
+});
 const handler = createHandler("vercel");
 export {
+  builder,
   command,
   description,
   handler

package/dist/commands/setup/deploy/providers/vercelHandler.js

@@ -1,19 +1,30 @@
+import fs from "node:fs";
 import path from "path";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
-import { getPaths, printSetupNotes, writeFile } from "../../../../lib/index.js";
-import { updateApiURLTask } from "../helpers/index.js";
-async function handler(options) {
+import {
+  addPackagesTask,
+  getPaths,
+  printSetupNotes,
+  writeFile
+} from "../../../../lib/index.js";
+import { updateApiURLTask, verifyUDSetupTask } from "../helpers/index.js";
+async function handler({ force, ud }) {
   recordTelemetryAttributes({
-    command: "setup deploy vercel"
+    command: "setup deploy vercel",
+    force,
+    ud
   });
   const tasks = new Listr(
     [
-      updateApiURLTask("/api"),
-      writeVercelConfigTask({ overwriteExisting: options.force }),
-      printSetupNotes(notes)
-    ],
+      ud && verifyUDSetupTask(),
+      ud && installVercelPackagesTask(),
+      ud && addVercelPluginToViteConfigTask(),
+      !ud && updateApiURLTask("/api"),
+      ud ? writeVercelUDConfigTask({ overwriteExisting: force }) : writeVercelConfigTask({ overwriteExisting: force }),
+      printSetupNotes(ud ? udNotes : notes)
+    ].filter(Boolean),
     {
       rendererOptions: { collapseSubtasks: false }
     }
@@ -26,6 +37,52 @@ async function handler(options) {
     process.exit(e?.exitCode || 1);
   }
 }
+function addVercelPluginToViteConfigTask() {
+  return {
+    title: "Adding Vercel plugin to vite config...",
+    task: async (_ctx, task) => {
+      const paths = getPaths();
+      const viteConfigTs = path.join(paths.web.base, "vite.config.ts");
+      const viteConfigJs = path.join(paths.web.base, "vite.config.js");
+      const viteConfigPath = fs.existsSync(viteConfigTs) ? viteConfigTs : viteConfigJs;
+      if (!fs.existsSync(viteConfigPath)) {
+        task.skip(`${viteConfigPath} not found`);
+        return;
+      }
+      let content = fs.readFileSync(viteConfigPath, "utf-8");
+      if (content.includes("vite-plugin-vercel") && content.includes("vercel(")) {
+        task.skip("Vercel plugin is already configured.");
+        return;
+      }
+      const newContent = content.replace(
+        /(import\s+\{[^}]*\}\s+from\s+['"]vite['"];?)/,
+        "import { vercel } from 'vite-plugin-vercel/vite'\n$1"
+      );
+      if (newContent === content) {
+        content = "import { vercel } from 'vite-plugin-vercel/vite'\n" + content;
+      } else {
+        content = newContent;
+      }
+      content = content.replace(
+        /(\s*)(plugins:\s*\[)([\s\S]*?)(cedar\s*\()/,
+        (_match, leadingWs, prefix, beforeCedar, cedarCall) => {
+          const indent = beforeCedar.includes("\n") ? beforeCedar.match(/\n(\s*)$/)?.[1] || leadingWs + "  " : leadingWs + "  ";
+          const before = beforeCedar.replace(/\s*$/, "");
+          return `${leadingWs}${prefix}
+${indent}vercel(),${before}
+${indent}${cedarCall}`;
+        }
+      );
+      fs.writeFileSync(viteConfigPath, content);
+    }
+  };
+}
+function installVercelPackagesTask() {
+  return addPackagesTask({
+    packages: ["vite-plugin-vercel"],
+    devDependency: true
+  });
+}
 function writeVercelConfigTask({ overwriteExisting = false } = {}) {
   return {
     title: "Writing vercel.json...",
@@ -46,10 +103,36 @@ const vercelConfig = {
     }
   }
 };
+const vercelUDConfig = {
+  build: {
+    command: "yarn cedar build --ud --verbose",
+    env: {
+      ENABLE_EXPERIMENTAL_COREPACK: "1"
+    }
+  }
+};
 const notes = [
   "You are ready to deploy to Vercel!",
   "See: https://cedarjs.com/docs/deploy#vercel-deploy"
 ];
+const udNotes = [
+  "You are ready to deploy to Vercel with Universal Deploy!",
+  "Build with: yarn cedar build --ud",
+  "See: https://cedarjs.com/docs/deploy#vercel-deploy"
+];
+function writeVercelUDConfigTask({ overwriteExisting = false } = {}) {
+  return {
+    title: "Writing vercel.json for Universal Deploy...",
+    task: (_ctx, task) => {
+      writeFile(
+        path.join(getPaths().base, "vercel.json"),
+        JSON.stringify(vercelUDConfig, null, 2),
+        { overwriteExisting },
+        task
+      );
+    }
+  };
+}
 export {
   handler
 };

package/dist/commands/setup/deploy/templates/netlifyUD.js

@@ -0,0 +1,30 @@
+import { getConfig } from "../../../../lib/index.js";
+const config = getConfig();
+const NETLIFY_UD_TOML = `[build]
+command = "yarn cedar build --ud --apiRootPath=/.api/functions && yarn cedar prisma migrate deploy && yarn cedar data-migrate up"
+publish = "web/dist"
+
+[build.environment]
+NODE_VERSION = "24"
+
+[functions]
+directory = "api/dist/functions"
+
+# To use Netlify Dev, install Netlify's CLI (\`netlify-cli\`) from NPM and use
+# \`netlify link\` to connect your local project to a site on Netlify. Then run
+# \`netlify dev\`.
+#
+# Quick links to the docs:
+# - Netlify Dev https://docs.netlify.com/api-and-cli-guides/cli-guides/local-development
+# - Netlify's CLI https://docs.netlify.com/api-and-cli-guides/cli-guides/get-started-with-cli/
+# - \`netlify link\` https://cli.netlify.com/commands/link/
+[dev]
+framework = "cedarjs"
+# Make sure \`targetPort\` matches \`web.port\` in your cedar.toml file
+targetPort = ${config.web.port}
+# Point your browser to this port to access your app
+port = 8888
+`;
+export {
+  NETLIFY_UD_TOML
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "5.0.0-canary.2376",
+  "version": "5.0.0-canary.2377",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -33,17 +33,17 @@
   "dependencies": {
     "@babel/parser": "7.29.3",
     "@babel/preset-typescript": "7.28.5",
-    "@cedarjs/api-server": "5.0.0-canary.2376",
-    "@cedarjs/cli-helpers": "5.0.0-canary.2376",
-    "@cedarjs/fastify-web": "5.0.0-canary.2376",
-    "@cedarjs/internal": "5.0.0-canary.2376",
-    "@cedarjs/prerender": "5.0.0-canary.2376",
-    "@cedarjs/project-config": "5.0.0-canary.2376",
-    "@cedarjs/structure": "5.0.0-canary.2376",
-    "@cedarjs/telemetry": "5.0.0-canary.2376",
-    "@cedarjs/utils": "5.0.0-canary.2376",
-    "@cedarjs/vite": "5.0.0-canary.2376",
-    "@cedarjs/web-server": "5.0.0-canary.2376",
+    "@cedarjs/api-server": "5.0.0-canary.2377",
+    "@cedarjs/cli-helpers": "5.0.0-canary.2377",
+    "@cedarjs/fastify-web": "5.0.0-canary.2377",
+    "@cedarjs/internal": "5.0.0-canary.2377",
+    "@cedarjs/prerender": "5.0.0-canary.2377",
+    "@cedarjs/project-config": "5.0.0-canary.2377",
+    "@cedarjs/structure": "5.0.0-canary.2377",
+    "@cedarjs/telemetry": "5.0.0-canary.2377",
+    "@cedarjs/utils": "5.0.0-canary.2377",
+    "@cedarjs/vite": "5.0.0-canary.2377",
+    "@cedarjs/web-server": "5.0.0-canary.2377",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",