@cedarjs/cli 8.0.0-canary.3601 → 8.0.0-canary.3604

package/dist/commands/experimental/setupOpentelemetryHandler.js

@@ -129,7 +129,23 @@ const handler = async ({
       },
       rendererOptions: { persistentOutput: true }
     },
-    addApiPackages(opentelemetryPackages)
+    addApiPackages(opentelemetryPackages),
+    {
+      title: "Notice: running under your own process manager...",
+      task: (_ctx, task) => {
+        task.output = [
+          "The setup file is loaded automatically by `cedar dev`, `cedar serve`, `cedarjs-server` and the job workers.",
+          "If you run the API server under your own process manager, load it yourself:",
+          "",
+          c.info(
+            "node --import ./api/dist/opentelemetry.js path/to/your/server.js"
+          ),
+          "",
+          "(or set the same flag in NODE_OPTIONS)"
+        ].join("\n");
+      },
+      rendererOptions: { persistentOutput: true }
+    }
   ];
   const prismaTasks = [
     {

package/dist/commands/serve.js

@@ -31,6 +31,11 @@ function resolveUDEntryPath() {
   return null;
 }
 async function startUDServer(entryPath, host, port) {
+  const { getOTelSetupFileUrl } = await import("@cedarjs/project-config");
+  const otelSetupFileUrl = getOTelSetupFileUrl();
+  if (otelSetupFileUrl !== void 0) {
+    await import(otelSetupFileUrl);
+  }
   const mod = await import(pathToFileURL(entryPath).href);
   const fetchable = mod.default ?? mod;
   if (!fetchable || typeof fetchable.fetch !== "function") {

package/dist/commands/serveApiHandler.js

@@ -1,7 +1,12 @@
 import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
-import { getPaths } from "@cedarjs/project-config";
+import { getOTelImportArgs, getPaths } from "@cedarjs/project-config";
 async function apiServerFileHandler(argv) {
-  const args = ["server.js", "--apiRootPath", argv.apiRootPath ?? "/"];
+  const args = [
+    ...getOTelImportArgs(),
+    "server.js",
+    "--apiRootPath",
+    argv.apiRootPath ?? "/"
+  ];
   if (argv.port) {
     args.push("--apiPort", String(argv.port));
   }

package/dist/commands/serveBothHandler.js

@@ -10,7 +10,12 @@ import {
 } from "@cedarjs/api-server/cliHelpers";
 import { formatRunBinCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
-import { getConfig, getPaths } from "@cedarjs/project-config";
+import {
+  getConfig,
+  getOTelImportArgs,
+  getPaths,
+  quoteOTelImportArgs
+} from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { exitWithError } from "../lib/exit.js";
 const hasStringMessage = (error) => {
@@ -41,7 +46,13 @@ const bothServerFileHandler = async (argv) => {
       [
         {
           name: "api",
-          command: `${formatRunBinCommand("node", [path.join("dist", "server.js"), "--apiPort", String(argv.apiPort), "--apiHost", argv.apiHost, "--apiRootPath", apiRootPath])}`,
+          // The `--import` argument is a `file://` URL, which can contain
+          // characters that are special to the shell `concurrently` runs
+          // this command through. `quoteOTelImportArgs` picks the quoting
+          // that suits the platform's shell: single quotes (with embedded
+          // quotes escaped) for POSIX `sh`, double quotes for Windows
+          // `cmd.exe`.
+          command: `${formatRunBinCommand("node", [...quoteOTelImportArgs(getOTelImportArgs()), path.join("dist", "server.js"), "--apiPort", String(argv.apiPort), "--apiHost", argv.apiHost, "--apiRootPath", apiRootPath])}`,
           cwd: getPaths().api.base,
           prefixColor: "cyan"
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "8.0.0-canary.3601",
+  "version": "8.0.0-canary.3604",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -36,17 +36,17 @@
     "@babel/preset-typescript": "7.29.7",
     "@babel/traverse": "7.29.12",
     "@babel/types": "7.29.11",
-    "@cedarjs/api-server": "8.0.0-canary.3601",
-    "@cedarjs/babel-config": "8.0.0-canary.3601",
-    "@cedarjs/cli-helpers": "8.0.0-canary.3601",
-    "@cedarjs/internal": "8.0.0-canary.3601",
-    "@cedarjs/prerender": "8.0.0-canary.3601",
-    "@cedarjs/project-config": "8.0.0-canary.3601",
-    "@cedarjs/structure": "8.0.0-canary.3601",
-    "@cedarjs/telemetry": "8.0.0-canary.3601",
-    "@cedarjs/utils": "8.0.0-canary.3601",
-    "@cedarjs/vite": "8.0.0-canary.3601",
-    "@cedarjs/web-server": "8.0.0-canary.3601",
+    "@cedarjs/api-server": "8.0.0-canary.3604",
+    "@cedarjs/babel-config": "8.0.0-canary.3604",
+    "@cedarjs/cli-helpers": "8.0.0-canary.3604",
+    "@cedarjs/internal": "8.0.0-canary.3604",
+    "@cedarjs/prerender": "8.0.0-canary.3604",
+    "@cedarjs/project-config": "8.0.0-canary.3604",
+    "@cedarjs/structure": "8.0.0-canary.3604",
+    "@cedarjs/telemetry": "8.0.0-canary.3604",
+    "@cedarjs/utils": "8.0.0-canary.3604",
+    "@cedarjs/vite": "8.0.0-canary.3604",
+    "@cedarjs/web-server": "8.0.0-canary.3604",
     "@listr2/prompt-adapter-enquirer": "4.4.3",
     "@prisma/internals": "7.10.1",
     "ansis": "4.4.0",
@@ -87,7 +87,7 @@
     "yargs": "18.2.0"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "8.0.0-canary.3601",
+    "@cedarjs/framework-tools": "8.0.0-canary.3604",
     "@prisma/dmmf": "7.10.1",
     "@types/archiver": "^7.0.0",
     "memfs": "4.80.0",