@cedarjs/cli 4.2.1-next.0 → 4.2.1-next.269

package/dist/telemetry/resource.js

@@ -8,9 +8,11 @@ import { v4 as uuidv4, validate as validateUUID } from "uuid";
 import { getPaths, getRawConfig } from "@cedarjs/project-config";
 import { RWProject } from "@cedarjs/structure/dist/model/RWProject";
 import {
-  name as packageName,
-  version as packageVersion
+  name as _packageName,
+  version as _packageVersion
 } from "../../package.js";
+const packageName = _packageName;
+const packageVersion = _packageVersion;
 async function getResources() {
   let UID = uuidv4();
   try {
@@ -29,7 +31,7 @@ async function getResources() {
         fs.writeFileSync(telemetryFile, UID);
       }
     }
-  } catch (_error) {
+  } catch {
   }
   const info = JSON.parse(
     await envinfo.run(
@@ -57,7 +59,9 @@ async function getResources() {
   const experiments = Object.keys(getRawConfig()["experimental"] || {});
   const project = new RWProject();
   const routes = project.getRouter().routes;
-  const prerenderedRoutes = routes.filter((route) => route.hasPrerender);
+  const prerenderedRoutes = routes.filter(
+    (route) => route.hasPrerender
+  );
   const complexity = [
     routes.length,
     prerenderedRoutes.length,
@@ -79,7 +83,7 @@ async function getResources() {
     "cpu.count": cpu.physicalCores,
     "memory.gb": Math.round(mem.total / 1073741824),
     "env.node_env": process.env.NODE_ENV || null,
-    "ci.redwood": !!process.env.REDWOOD_CI,
+    "ci.redwood": !!process.env.CEDAR_CI,
     "ci.isci": ci.isCI,
     "dev.environment": developmentEnvironment,
     complexity,

package/dist/telemetry/send.js

@@ -1,15 +1,16 @@
 import fs from "node:fs";
 import path from "path";
+import { ExportResultCode } from "@opentelemetry/core";
 import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
 import { Resource } from "@opentelemetry/resources";
 import { getPaths } from "@cedarjs/project-config";
 import { getResources } from "./resource.js";
 async function main() {
   console.log(
-    "You can disable telemetry by:\n - setting the 'REDWOOD_DISABLE_TELEMETRY' environment variable\n - passing the '--no-telemetry' flag when using the CLI"
+    "You can disable telemetry by:\n - setting the 'CEDAR_DISABLE_TELEMETRY' environment variable\n - passing the '--no-telemetry' flag when using the CLI"
   );
   console.log(
-    "Information about Redwood telemetry can be found at:\n - https://telemetry.redwoodjs.com\n"
+    "Information about Cedar telemetry can be found at:\n - https://telemetry.redwoodjs.com\n"
   );
   const telemetryDir = path.join(getPaths().generated.base, "telemetry");
   fs.mkdirSync(telemetryDir, { recursive: true });
@@ -20,7 +21,7 @@ async function main() {
   const customResourceData = await getResources();
   console.timeEnd("Computed resource information");
   const resource = Resource.default().merge(new Resource(customResourceData));
-  const url = process.env.REDWOOD_REDIRECT_TELEMETRY || "https://quark.quantumparticle.io/v1/traces";
+  const url = process.env.CEDAR_REDIRECT_TELEMETRY || process.env.REDWOOD_REDIRECT_TELEMETRY || "https://quark.quantumparticle.io/v1/traces";
   const traceExporter = new OTLPTraceExporter({
     url
   });
@@ -53,14 +54,17 @@ async function main() {
       span.spanContext = () => span._spanContext;
       span.events = [];
     }
-    traceExporter.export(spans, ({ code, error }) => {
-      if (code !== 0) {
-        console.error("Encountered:");
-        console.error(error);
-        console.error("while exporting the following spans:");
-        console.error(spans);
+    traceExporter.export(
+      spans,
+      ({ code, error }) => {
+        if (code !== ExportResultCode.SUCCESS) {
+          console.error("Encountered:");
+          console.error(error);
+          console.error("while exporting the following spans:");
+          console.error(spans);
+        }
       }
-    });
+    );
     fs.writeFileSync(
       path.join(telemetryDir, `_${file}`),
       JSON.stringify(spans, null, 2)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "4.2.1-next.0",
+  "version": "4.2.1-next.269",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -20,7 +20,7 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsx ./build.mts",
+    "build": "node ./build.mts",
     "build:pack": "yarn pack -o cedarjs-cli.tgz",
     "build:types": "tsc --build --verbose ./tsconfig.build.json",
     "build:watch": "nodemon --watch src --ext \"js,jsx,ts,tsx,template\" --ignore dist --exec \"yarn build && yarn fix:permissions\"",
@@ -31,8 +31,8 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@babel/parser": "7.29.3",
-    "@babel/preset-typescript": "7.28.5",
+    "@babel/parser": "7.29.7",
+    "@babel/preset-typescript": "7.29.7",
     "@cedarjs/api-server": "4.2.0",
     "@cedarjs/cli-helpers": "4.2.0",
     "@cedarjs/fastify-web": "4.2.0",
@@ -45,16 +45,17 @@
     "@cedarjs/vite": "4.2.0",
     "@cedarjs/web-server": "4.2.0",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
-    "@opentelemetry/api": "1.9.0",
+    "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "1.30.1",
     "@opentelemetry/exporter-trace-otlp-http": "0.57.2",
     "@opentelemetry/resources": "1.30.1",
     "@opentelemetry/sdk-trace-node": "1.30.1",
-    "@opentelemetry/semantic-conventions": "1.38.0",
+    "@opentelemetry/semantic-conventions": "1.41.1",
     "@prisma/internals": "7.8.0",
     "ansis": "4.2.0",
     "archiver": "7.0.1",
     "boxen": "5.1.2",
+    "camel-case": "4.1.2",
     "camelcase": "6.3.0",
     "change-case": "4.1.2",
     "ci-info": "4.4.0",
@@ -76,15 +77,16 @@
     "pascalcase": "1.0.0",
     "pluralize": "8.0.0",
     "portfinder": "1.0.38",
-    "prettier": "3.8.3",
+    "prettier": "3.8.4",
     "prisma": "7.8.0",
     "prompts": "2.4.2",
     "recast": "0.23.11",
     "rimraf": "6.1.3",
     "semver": "7.7.4",
     "smol-toml": "1.6.1",
+    "srvx": "0.11.16",
     "string-env-interpolation": "1.0.1",
-    "systeminformation": "5.31.5",
+    "systeminformation": "5.31.7",
     "termi-link": "1.1.0",
     "title-case": "3.0.3",
     "unionfs": "4.6.0",
@@ -92,15 +94,15 @@
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@babel/cli": "7.28.6",
+    "@babel/cli": "7.29.7",
     "@babel/core": "^7.26.10",
+    "@prisma/dmmf": "7.8.0",
     "@types/archiver": "^7.0.0",
-    "memfs": "4.57.2",
+    "memfs": "4.57.7",
     "node-ssh": "13.2.1",
-    "ts-dedent": "2.2.0",
-    "tsx": "4.21.0",
+    "ts-dedent": "2.3.0",
     "typescript": "5.9.3",
-    "vitest": "3.2.4"
+    "vitest": "3.2.6"
   },
   "engines": {
     "node": ">=24"

package/dist/commands/setup/vite/templates/vite.config.ts.template

@@ -1,19 +0,0 @@
-import dns from 'dns'
-
-import { defineConfig, UserConfig } from 'vite'
-
-import redwood from '@cedarjs/vite'
-
-// See: https://vitejs.dev/config/server-options.html#server-host
-// So that Vite will load on local instead of 127.0.0.1
-dns.setDefaultResultOrder('verbatim')
-
-/**
- * https://vitejs.dev/config/
- * @type {import('vite').UserConfig}
- */
-const viteConfig: UserConfig = {
-  plugins: [redwood()],
-}
-
-export default defineConfig(viteConfig)

package/dist/commands/setup/vite/vite.js

@@ -1,38 +0,0 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
-const command = "vite";
-const description = "Configure the web side to use Vite";
-const builder = (yargs) => {
-  yargs.option("force", {
-    alias: "f",
-    default: false,
-    description: "Overwrite existing configuration",
-    type: "boolean"
-  });
-  yargs.option("verbose", {
-    alias: "v",
-    default: false,
-    description: "Print more logs",
-    type: "boolean"
-  });
-  yargs.option("add-package", {
-    default: true,
-    description: "Allows you to skip adding the @cedarjs/vite package. Useful for testing",
-    type: "boolean"
-  });
-};
-const handler = async (options) => {
-  recordTelemetryAttributes({
-    command: "setup vite",
-    force: options.force,
-    verbose: options.verbose,
-    addPackage: options.addPackage
-  });
-  const { handler: handler2 } = await import("./viteHandler.js");
-  return handler2(options);
-};
-export {
-  builder,
-  command,
-  description,
-  handler
-};

package/dist/commands/setup/vite/viteHandler.js

@@ -1,82 +0,0 @@
-import fs from "node:fs";
-import path from "path";
-import { Listr } from "listr2";
-import { addWebPackages, colors as c } from "@cedarjs/cli-helpers";
-import { errorTelemetry } from "@cedarjs/telemetry";
-import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";
-import { isTypeScriptProject } from "../../../lib/project.js";
-const { version } = JSON.parse(
-  fs.readFileSync(
-    path.resolve(import.meta.dirname, "../../../../package.json"),
-    "utf-8"
-  )
-);
-const handler = async ({ force, verbose, addPackage }) => {
-  const ts = isTypeScriptProject();
-  const tasks = new Listr(
-    [
-      {
-        title: "Adding vite.config.js...",
-        task: async () => {
-          const viteConfigPath = `${getPaths().web.base}/vite.config.${ts ? "ts" : "js"}`;
-          const templateContent = fs.readFileSync(
-            path.resolve(
-              import.meta.dirname,
-              "templates",
-              "vite.config.ts.template"
-            ),
-            "utf-8"
-          );
-          const viteConfigContent = ts ? templateContent : await transformTSToJS(viteConfigPath, templateContent);
-          return writeFile(viteConfigPath, viteConfigContent, {
-            overwriteExisting: force
-          });
-        }
-      },
-      {
-        title: "Creating new entry point in `web/src/entry.client.{jsx,tsx}`...",
-        task: () => {
-          const entryPointFile = path.join(
-            getPaths().web.src,
-            `entry.client.${ts ? "tsx" : "jsx"}`
-          );
-          const content = fs.readFileSync(
-            path.join(
-              getPaths().base,
-              // NOTE we're copying over the index.js before babel transform
-              "node_modules/@cedarjs/web/src/entry/index.js"
-            ),
-            "utf-8"
-          ).replace("~redwood-app-root", "./App");
-          return writeFile(entryPointFile, content, {
-            overwriteExisting: force
-          });
-        }
-      },
-      {
-        // @NOTE: make sure its added as a dev package.
-        ...addWebPackages(["-D", `@cedarjs/vite@${version}`]),
-        title: "Adding @cedarjs/vite dev dependency to web side...",
-        skip: () => {
-          if (!addPackage) {
-            return "Skipping package install, you will need to add @cedarjs/vite manaually as a dev-dependency on the web workspace";
-          }
-        }
-      }
-    ],
-    {
-      rendererOptions: { collapseSubtasks: false },
-      renderer: verbose ? "verbose" : "default"
-    }
-  );
-  try {
-    await tasks.run();
-  } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
-  }
-};
-export {
-  handler
-};