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

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

@@ -7,8 +7,9 @@ import * as setupDeployFlightcontrol from "./providers/flightcontrol.js";
 import * as setupDeployNetlify from "./providers/netlify.js";
 import * as setupDeployRender from "./providers/render.js";
 import * as setupDeployServerless from "./providers/serverless.js";
+import * as setupDeployUniversalDeploy from "./providers/universal-deploy.js";
 import * as setupDeployVercel from "./providers/vercel.js";
-const builder = (yargs) => yargs.command(setupDeployBaremetal).command(setupDeployCoherence).command(setupDeployFlightcontrol).command(setupDeployNetlify).command(setupDeployRender).command(setupDeployServerless).command(setupDeployVercel).demandCommand().option("force", {
+const builder = (yargs) => yargs.command(setupDeployBaremetal).command(setupDeployCoherence).command(setupDeployFlightcontrol).command(setupDeployNetlify).command(setupDeployRender).command(setupDeployServerless).command(setupDeployUniversalDeploy).command(setupDeployVercel).demandCommand().option("force", {
   alias: "f",
   default: false,
   description: "Overwrite existing configuration",

package/dist/commands/setup/deploy/providers/universal-deploy.js

@@ -0,0 +1,11 @@
+const command = "universal-deploy";
+const description = "Setup Universal Deploy";
+async function handler() {
+  const { handler: handler2 } = await import("./universalDeployHandler.js");
+  return handler2();
+}
+export {
+  command,
+  description,
+  handler
+};

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

@@ -0,0 +1,182 @@
+import fs from "node:fs";
+import path from "node:path";
+import { Listr } from "listr2";
+import {
+  colors as c,
+  getPaths,
+  isTypeScriptProject,
+  recordTelemetryAttributes
+} from "@cedarjs/cli-helpers";
+import { errorTelemetry } from "@cedarjs/telemetry";
+import { printSetupNotes } from "../../../../lib/index.js";
+const notes = [
+  "Universal Deploy is set up!",
+  "",
+  "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`
+];
+async function handler() {
+  recordTelemetryAttributes({
+    command: "setup deploy universal-deploy"
+  });
+  const tasks = new Listr(
+    [addUniversalDeployPluginToViteConfig(), printSetupNotes(notes)],
+    { rendererOptions: { collapseSubtasks: false } }
+  );
+  try {
+    await tasks.run();
+  } catch (e) {
+    errorTelemetry(process.argv, e.message);
+    console.error(c.error(e.message));
+    process.exit(e.exitCode || 1);
+  }
+}
+function addUniversalDeployPluginToViteConfig() {
+  return {
+    title: "Adding cedarUniversalDeployPlugin to vite config...",
+    task: async (_ctx, task) => {
+      const projectIsTS = isTypeScriptProject();
+      const viteConfigPath = path.join(
+        getPaths().web.base,
+        `vite.config.${projectIsTS ? "ts" : "js"}`
+      );
+      if (!fs.existsSync(viteConfigPath)) {
+        task.skip(`${viteConfigPath} not found`);
+        return;
+      }
+      let content = fs.readFileSync(viteConfigPath, "utf-8");
+      if (content.includes("cedarUniversalDeployPlugin")) {
+        task.skip("cedarUniversalDeployPlugin is already configured.");
+        return;
+      }
+      content = mergeImport(content);
+      content = addPluginToConfig(content);
+      fs.writeFileSync(viteConfigPath, content);
+    }
+  };
+}
+function findCedarViteImportLine(lines) {
+  for (let i = 0; i < lines.length; i++) {
+    if (/^import\b/.test(lines[i]) && /from\s+['"]@cedarjs\/vite['"]/.test(lines[i])) {
+      return i;
+    }
+  }
+  for (let i = 0; i < lines.length; i++) {
+    if (/from\s+['"]@cedarjs\/vite['"]/.test(lines[i])) {
+      for (let j = i; j >= 0; j--) {
+        if (/^import\b/.test(lines[j])) {
+          return j;
+        }
+      }
+      return i;
+    }
+  }
+  return -1;
+}
+function mergeImport(content) {
+  const lines = content.split("\n");
+  const importIndex = findCedarViteImportLine(lines);
+  if (importIndex === -1) {
+    throw new Error("No import from @cedarjs/vite found");
+  }
+  const importLine = lines[importIndex];
+  const singleLineNamed = importLine.match(
+    /^(import\s*\{\s*)([^}]*?)(\s*\}\s*from\s+['"]@cedarjs\/vite['"];?)$/
+  );
+  if (singleLineNamed) {
+    const specifiers = singleLineNamed[2].trim();
+    if (specifiers.includes("cedarUniversalDeployPlugin")) {
+      return content;
+    }
+    lines[importIndex] = specifiers ? `${singleLineNamed[1]}${specifiers}, cedarUniversalDeployPlugin${singleLineNamed[3]}` : `${singleLineNamed[1]}cedarUniversalDeployPlugin${singleLineNamed[3]}`;
+    return lines.join("\n");
+  }
+  let closeIndex = importIndex;
+  for (let i = importIndex + 1; i < lines.length; i++) {
+    if (/}\s*from\s+['"]@cedarjs\/vite['"]/.test(lines[i])) {
+      closeIndex = i;
+      break;
+    }
+  }
+  if (closeIndex > importIndex) {
+    const specifiersLines = lines.slice(importIndex + 1, closeIndex);
+    const allSpecifiers = specifiersLines.join(" ");
+    if (allSpecifiers.includes("cedarUniversalDeployPlugin")) {
+      return content;
+    }
+    const indentMatch = specifiersLines[0]?.match(/^(\s+)/);
+    const indent = indentMatch?.[1] || "  ";
+    lines.splice(closeIndex, 0, `${indent}cedarUniversalDeployPlugin,`);
+    return lines.join("\n");
+  }
+  const defaultMatch = importLine.match(
+    /^import\s+(\w+)\s+from\s+['"]@cedarjs\/vite['"];?\s*$/
+  );
+  if (defaultMatch) {
+    lines[importIndex] = importLine.replace(
+      /(import\s+\w+)(\s+from\s+['"]@cedarjs\/vite['"];?)/,
+      "$1, { cedarUniversalDeployPlugin }$2"
+    );
+    return lines.join("\n");
+  }
+  return content;
+}
+function addPluginToConfig(content) {
+  const lines = content.split("\n");
+  const pluginsLineIndex = lines.findIndex(
+    (line) => /plugins\s*:\s*\[/.test(line)
+  );
+  if (pluginsLineIndex === -1) {
+    return content;
+  }
+  const pluginsLine = lines[pluginsLineIndex];
+  const inlineMatch = pluginsLine.trim().match(/^plugins\s*:\s*\[([\s\S]*?)\]\s*,?\s*$/);
+  if (inlineMatch) {
+    const inner = inlineMatch[1].trimEnd();
+    const indentation = pluginsLine.match(/^\s*/)?.[0] || "  ";
+    lines[pluginsLineIndex] = inner ? `${indentation}plugins: [${inner}, cedarUniversalDeployPlugin()],` : `${indentation}plugins: [cedarUniversalDeployPlugin()],`;
+    return lines.join("\n");
+  }
+  let closeIndex = -1;
+  for (let i = pluginsLineIndex + 1; i < lines.length; i++) {
+    const trimmed = lines[i].trim();
+    if (trimmed === "]" || trimmed === "],") {
+      closeIndex = i;
+      break;
+    }
+  }
+  if (closeIndex === -1) {
+    return content;
+  }
+  const pluginsLineIndent = pluginsLine.match(/^\s*/)?.[0] || "";
+  const firstEntryIndent = (() => {
+    for (let i = pluginsLineIndex + 1; i < closeIndex; i++) {
+      const trimmed = lines[i].trim();
+      if (trimmed) {
+        return lines[i].match(/^\s*/)?.[0] || "  ";
+      }
+    }
+    return pluginsLineIndent + "  ";
+  })();
+  const prevLine = lines[closeIndex - 1]?.trimEnd();
+  if (prevLine && !prevLine.endsWith(",") && prevLine !== "[" && !prevLine.endsWith("[")) {
+    const commentIdx = prevLine.search(/\s+\/\/|(?<!\\)\/\*/);
+    if (commentIdx !== -1) {
+      lines[closeIndex - 1] = prevLine.slice(0, commentIdx) + "," + prevLine.slice(commentIdx);
+    } else {
+      lines[closeIndex - 1] = prevLine + ",";
+    }
+  }
+  lines.splice(
+    closeIndex,
+    0,
+    `${firstEntryIndent}cedarUniversalDeployPlugin(),`
+  );
+  return lines.join("\n");
+}
+export {
+  addPluginToConfig,
+  handler,
+  mergeImport
+};

package/package.json

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