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

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

@@ -1,7 +1,10 @@
 import fs from "node:fs";
 import path from "node:path";
+import * as parser from "@babel/parser";
+import * as t from "@babel/types";
 import execa from "execa";
 import { Listr } from "listr2";
+import * as recast from "recast";
 import { getConfigPath, getConfig } from "@cedarjs/project-config";
 import { getPaths, writeFilesTask } from "../../../../lib/index.js";
 const updateApiURLTask = (apiUrl) => {
@@ -84,6 +87,91 @@ const verifyUDSetupTask = () => {
     }
   };
 };
+function posToIndex(str, line, column) {
+  const lines = str.split("\n");
+  let index = 0;
+  for (let i = 0; i < line - 1; i++) {
+    index += lines[i].length + 1;
+  }
+  return index + column;
+}
+function insertPluginsBeforeCedar({ content, pluginCodes }) {
+  const ast = recast.parse(content, {
+    parser: {
+      parse(source) {
+        return parser.parse(source, {
+          sourceType: "module",
+          plugins: ["typescript", "jsx"]
+        });
+      }
+    }
+  });
+  const defaultExport = ast.program.body.find(
+    (node) => t.isExportDefaultDeclaration(node) && t.isCallExpression(node.declaration) && t.isIdentifier(node.declaration.callee) && node.declaration.callee.name === "defineConfig"
+  );
+  if (!defaultExport) {
+    return null;
+  }
+  const configArg = defaultExport.declaration.arguments[0];
+  if (!t.isObjectExpression(configArg)) {
+    return null;
+  }
+  const pluginsProp = configArg.properties.find(
+    (prop) => t.isObjectProperty(prop) && t.isIdentifier(prop.key) && prop.key.name === "plugins" && t.isArrayExpression(prop.value)
+  );
+  if (!pluginsProp) {
+    return null;
+  }
+  const elements = pluginsProp.value.elements;
+  const cedarIndex = elements.findIndex(
+    (el) => t.isCallExpression(el) && t.isIdentifier(el.callee) && el.callee.name === "cedar"
+  );
+  if (cedarIndex === -1) {
+    return null;
+  }
+  const cedarNode = elements[cedarIndex];
+  const arrayNode = pluginsProp.value;
+  const isInline = cedarNode.loc.start.line === arrayNode.loc.start.line;
+  if (isInline) {
+    const startPos = posToIndex(
+      content,
+      arrayNode.loc.start.line,
+      arrayNode.loc.start.column
+    );
+    const endPos = posToIndex(
+      content,
+      arrayNode.loc.end.line,
+      arrayNode.loc.end.column
+    );
+    const precedingText = content.slice(0, startPos);
+    const followingText = content.slice(endPos);
+    const existingCodes = elements.map(
+      (el) => content.slice(
+        posToIndex(content, el.loc.start.line, el.loc.start.column),
+        posToIndex(content, el.loc.end.line, el.loc.end.column)
+      )
+    );
+    const lines2 = content.split("\n");
+    const pluginsLine = pluginsProp.loc.start.line;
+    const pluginsIndent = lines2[pluginsLine - 1].match(/^\s*/)[0];
+    const elemIndent = pluginsIndent + "  ";
+    const allCodes = [...existingCodes];
+    allCodes.splice(cedarIndex, 0, ...pluginCodes);
+    const multiline = [
+      "[",
+      ...allCodes.map((code) => `${elemIndent}${code},`),
+      `${pluginsIndent}]`
+    ].join("\n");
+    return precedingText + multiline + followingText;
+  }
+  const cedarLine = cedarNode.loc.start.line;
+  const insertPos = posToIndex(content, cedarLine, 0);
+  const lines = content.split("\n");
+  const indent = lines[cedarLine - 1].match(/^\s*/)[0];
+  const insertion = pluginCodes.map((code) => `${indent}${code},
+`).join("");
+  return content.slice(0, insertPos) + insertion + content.slice(insertPos);
+}
 const addToGitIgnoreTask = ({ paths }) => {
   return {
     title: "Updating .gitignore...",
@@ -125,6 +213,7 @@ export {
   addToDotEnvTask,
   addToGitIgnoreTask,
   getUserApiUrl,
+  insertPluginsBeforeCedar,
   preRequisiteCheckTask,
   updateApiURLTask,
   verifyUDSetupTask

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

@@ -10,6 +10,7 @@ import {
 } from "../../../../lib/index.js";
 import {
   addFilesTask,
+  insertPluginsBeforeCedar,
   updateApiURLTask,
   verifyUDSetupTask
 } from "../helpers/index.js";
@@ -87,17 +88,16 @@ ${result}`;
         }
       }
       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}`;
-          }
-        );
+        const result = insertPluginsBeforeCedar({
+          content,
+          pluginCodes: [
+            "netlify({ build: { enabled: true } })",
+            "netlifyCompat()"
+          ]
+        });
+        if (result) {
+          content = result;
+        }
       }
       fs.writeFileSync(viteConfigPath, content);
     }
@@ -118,7 +118,7 @@ const handler = async ({ force, ud }) => {
   const tasks = new Listr(
     [
       ud && verifyUDSetupTask(),
-      ud && installNetlifyPackagesTask(),
+      ud && await installNetlifyPackagesTask(),
       ud && addNetlifyPluginsToViteConfigTask(),
       !ud && updateApiURLTask("/.netlify/functions"),
       addFilesTask({ files: ud ? filesUd : files, force }),

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

@@ -20,7 +20,7 @@ const notes = [
   `  ${c.highlight("yarn cedar setup deploy netlify --ud")}`,
   `  ${c.highlight("yarn cedar setup deploy vercel --ud")}`,
   "",
-  "See: https://cedarjs.com/docs/deploy#universal-deploy"
+  "See: https://cedarjs.com/docs/deploy/universal-deploy"
 ];
 async function handler() {
   recordTelemetryAttributes({

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

@@ -9,7 +9,11 @@ import {
   printSetupNotes,
   writeFile
 } from "../../../../lib/index.js";
-import { updateApiURLTask, verifyUDSetupTask } from "../helpers/index.js";
+import {
+  insertPluginsBeforeCedar,
+  updateApiURLTask,
+  verifyUDSetupTask
+} from "../helpers/index.js";
 async function handler({ force, ud }) {
   recordTelemetryAttributes({
     command: "setup deploy vercel",
@@ -19,7 +23,7 @@ async function handler({ force, ud }) {
   const tasks = new Listr(
     [
       ud && verifyUDSetupTask(),
-      ud && installVercelPackagesTask(),
+      ud && await installVercelPackagesTask(),
       ud && addVercelPluginToViteConfigTask(),
       !ud && updateApiURLTask("/api"),
       ud ? writeVercelUDConfigTask({ overwriteExisting: force }) : writeVercelConfigTask({ overwriteExisting: force }),
@@ -50,29 +54,31 @@ function addVercelPluginToViteConfigTask() {
         return;
       }
       let content = fs.readFileSync(viteConfigPath, "utf-8");
-      if (content.includes("vite-plugin-vercel") && content.includes("vercel(")) {
+      const hasVercelPlugin = content.includes("vite-plugin-vercel");
+      if (hasVercelPlugin && 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;
+      if (!hasVercelPlugin) {
+        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}`;
+      if (!content.includes("vercel(")) {
+        const result = insertPluginsBeforeCedar({
+          content,
+          pluginCodes: ["vercel()"]
+        });
+        if (result) {
+          content = result;
         }
-      );
+      }
       fs.writeFileSync(viteConfigPath, content);
     }
   };

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

@@ -8,7 +8,7 @@ publish = "web/dist"
 NODE_VERSION = "24"
 
 [functions]
-directory = "api/dist/functions"
+directory = "api/dist/ud"
 
 # 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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "5.0.0-canary.2377",
+  "version": "5.0.0-canary.2382",
   "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.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",
+    "@cedarjs/api-server": "5.0.0-canary.2382",
+    "@cedarjs/cli-helpers": "5.0.0-canary.2382",
+    "@cedarjs/fastify-web": "5.0.0-canary.2382",
+    "@cedarjs/internal": "5.0.0-canary.2382",
+    "@cedarjs/prerender": "5.0.0-canary.2382",
+    "@cedarjs/project-config": "5.0.0-canary.2382",
+    "@cedarjs/structure": "5.0.0-canary.2382",
+    "@cedarjs/telemetry": "5.0.0-canary.2382",
+    "@cedarjs/utils": "5.0.0-canary.2382",
+    "@cedarjs/vite": "5.0.0-canary.2382",
+    "@cedarjs/web-server": "5.0.0-canary.2382",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",