@cedarjs/cli 8.0.0-canary.3592 → 8.0.0-canary.3597

package/dist/commands/build/buildHandler.js

@@ -24,6 +24,7 @@ import { timedTelemetry } from "@cedarjs/telemetry";
 import { buildCedarApp } from "@cedarjs/vite/build";
 import { generatePrismaCommand } from "../../lib/generatePrismaClient.js";
 import { getPaths, getConfig } from "../../lib/index.js";
+import { workspacesForTelemetry } from "../../lib/telemetryWorkspaces.js";
 import { buildPackagesTask } from "./buildPackagesTask.js";
 function checkWorkspacePackageEntryPoints(cedarPaths) {
   const packagesDir = cedarPaths.packages;
@@ -84,11 +85,11 @@ const handler = async ({
 }) => {
   recordTelemetryAttributes({
     command: "build",
-    workspace: JSON.stringify(workspace),
+    workspace: workspacesForTelemetry(workspace),
     verbose,
     prisma,
     prerender,
-    apiRootPath
+    apiRootPath: apiRootPath !== void 0
   });
   const cedarPaths = getPaths();
   const cedarConfig = getConfig();

package/dist/commands/dev/devHandler.js

@@ -16,6 +16,7 @@ import { generatePrismaClient } from "../../lib/generatePrismaClient.js";
 import { getPaths } from "../../lib/index.js";
 import { getFreePort } from "../../lib/ports.js";
 import { serverFileExists } from "../../lib/project.js";
+import { workspacesForTelemetry } from "../../lib/telemetryWorkspaces.js";
 import { getApiDebugFlag } from "./apiDebugFlag.js";
 import { getPackageWatchCommands } from "./packageWatchCommands.js";
 const createdRequire = createRequire(import.meta.url);
@@ -54,7 +55,7 @@ const handler = async ({
 }) => {
   recordTelemetryAttributes({
     command: "dev",
-    workspace: JSON.stringify(workspace),
+    workspace: workspacesForTelemetry(workspace),
     generate
   });
   const cedarPaths = getPaths();

package/dist/commands/serve.js

@@ -80,8 +80,8 @@ const builder = async (yargs) => {
       recordTelemetryAttributes({
         command: "serve",
         port: argv.port,
-        host: argv.host,
-        socket: argv.socket
+        host: argv.host !== void 0,
+        socket: argv.socket !== void 0
       });
       if (argv.ud) {
         if (argv.port) {
@@ -210,9 +210,11 @@ const builder = async (yargs) => {
       recordTelemetryAttributes({
         command: "serve",
         port: argv.port,
-        host: argv.host,
-        socket: argv.socket,
-        apiRootPath: argv.apiRootPath
+        host: argv.host !== void 0,
+        socket: argv.socket !== void 0,
+        // `--apiRootPath` defaults to '/', so a custom root path is anything
+        // else
+        apiRootPath: argv.apiRootPath !== void 0 && argv.apiRootPath !== "/"
       });
       const { getAPIHost, getAPIPort } = await import("@cedarjs/api-server/cliHelpers");
       const apiPort = argv.port ?? getAPIPort({ isPublicSide: true });
@@ -257,9 +259,9 @@ const builder = async (yargs) => {
       recordTelemetryAttributes({
         command: "serve",
         port: argv.port,
-        host: argv.host,
-        socket: argv.socket,
-        apiHost: argv.apiHost
+        host: argv.host !== void 0,
+        socket: argv.socket !== void 0,
+        apiHost: argv.apiHost !== void 0
       });
       if (streamingEnabled) {
         await webSsrServerHandler(rscEnabled);

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

@@ -117,12 +117,8 @@ const handler = async ({
   force,
   monitor: monitorOption
 }) => {
-  recordTelemetryAttributes({
-    command: "setup deploy baremetal",
-    force,
-    monitor: monitorOption
-  });
   if (monitorOption !== void 0 && !isMonitor(monitorOption)) {
+    recordTelemetryAttributes({ command: "setup deploy baremetal", force });
     console.error(
       c.error(
         `Unknown monitor "${monitorOption}". Use one of ${MONITORS.join(", ")}.`
@@ -130,6 +126,11 @@ const handler = async ({
     );
     process.exit(1);
   }
+  recordTelemetryAttributes({
+    command: "setup deploy baremetal",
+    force,
+    monitor: monitorOption
+  });
   const monitor = monitorOption ?? await promptForMonitor();
   if (!monitor) {
     console.log("Aborting baremetal setup.");

package/dist/commands/setup/tenancy/tenancy.js

@@ -16,7 +16,6 @@ const builder = (yargs) => {
 const handler = async (options) => {
   recordTelemetryAttributes({
     command: "setup tenancy",
-    tenantField: options.tenantField,
     force: options.force
   });
   const { handler: handler2 } = await import("./tenancyHandler.js");

package/dist/commands/setup/uploads/gitignore.js

@@ -1,3 +1,4 @@
+import execa from "execa";
 const UPLOADS_GITIGNORE_ENTRY = "api/.uploads";
 function transformGitignore(source) {
   const activeLines = source.split("\n").map((line) => line.trimEnd()).filter((line) => line.length > 0 && !line.startsWith("#"));
@@ -11,7 +12,23 @@ ${UPLOADS_GITIGNORE_ENTRY}`);
   const prefix = source === "" || source.endsWith("\n") ? source : source + "\n";
   return prefix + UPLOADS_GITIGNORE_ENTRY + "\n";
 }
+async function findIgnoredPaths(cwd, paths) {
+  if (paths.length === 0) {
+    return [];
+  }
+  try {
+    const { stdout } = await execa("git", ["check-ignore", "-z", "--stdin"], {
+      cwd,
+      input: paths.join("\0") + "\0",
+      reject: false
+    });
+    return stdout.split("\0").filter(Boolean);
+  } catch {
+    return [];
+  }
+}
 export {
   UPLOADS_GITIGNORE_ENTRY,
+  findIgnoredPaths,
   transformGitignore
 };

package/dist/commands/setup/uploads/uploadsHandler.js

@@ -18,7 +18,7 @@ import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";
 import { isTypeScriptProject } from "../../../lib/project.js";
 import { generateSecret } from "../../generate/secret/secret.js";
 import { setupServerFileTasks } from "../server-file/serverFileHandler.js";
-import { transformGitignore } from "./gitignore.js";
+import { findIgnoredPaths, transformGitignore } from "./gitignore.js";
 import { addUploadModel } from "./schemaPrisma.js";
 import {
   addUploadsPlugin,
@@ -102,6 +102,8 @@ const handler = async ({ targets, force }) => {
   const packageJson = await import(pathToFileURL(path.join(paths.base, "package.json")).href, { with: { type: "json" } });
   const cedarVersion = packageJson.default.devDependencies["@cedarjs/core"] ?? "latest";
   const serverFilePath = path.join(paths.api.src, `server.${ext}`);
+  const generatedFilePaths = [];
+  let ignoredFilesWarning;
   const writeTemplateFile = async (templateFile, outputPath, replacements = {}) => {
     const templatePath = path.resolve(
       import.meta.dirname,
@@ -113,6 +115,7 @@ const handler = async ({ targets, force }) => {
       templateContent = templateContent.replaceAll(token, value);
     }
     const content = projectIsTypescript ? templateContent : await transformTSToJS(outputPath, templateContent);
+    generatedFilePaths.push(outputPath);
     return writeFile(outputPath, content, { overwriteExisting: force });
   };
   const apiPackages = [`@cedarjs/uploads@${cedarVersion}`];
@@ -285,6 +288,24 @@ const handler = async ({ targets, force }) => {
           fs.writeFileSync(gitignorePath, updated, "utf-8");
         }
       },
+      {
+        title: "Checking the generated files are tracked by git...",
+        task: async () => {
+          const ignoredPaths = await findIgnoredPaths(paths.base, [
+            ...generatedFilePaths,
+            serverFilePath
+          ]);
+          if (ignoredPaths.length === 0) {
+            return;
+          }
+          const relativePaths = ignoredPaths.map((ignoredPath) => path.relative(paths.base, ignoredPath)).join("\n");
+          ignoredFilesWarning = `A .gitignore rule is hiding generated file(s) from git:
+
+${relativePaths}
+
+This usually happens after migrating from @cedarjs/storage, which left behind an unanchored \`uploads\` or \`uploads/\` rule. Anchor it (e.g. \`/uploads/\`) or remove it, then make sure the file(s) above get committed.`;
+        }
+      },
       {
         title: "Prettifying changed files",
         task: async (_ctx, task) => {
@@ -349,6 +370,11 @@ const handler = async ({ targets, force }) => {
   );
   try {
     await tasks.run();
+    if (ignoredFilesWarning) {
+      console.warn(`
+${c.warning(ignoredFilesWarning)}
+`);
+    }
   } catch (e) {
     const message = e instanceof Error ? e.message : String(e);
     const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;

package/dist/commands/type-checkHandler.js

@@ -6,6 +6,7 @@ import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { generatePrismaClient } from "../lib/generatePrismaClient.js";
 import { getPaths } from "../lib/index.js";
+import { workspacesForTelemetry } from "../lib/telemetryWorkspaces.js";
 const isConcurrentlyErrorArray = (value) => {
   return Array.isArray(value);
 };
@@ -20,7 +21,7 @@ const handler = async ({
   );
   recordTelemetryAttributes({
     command: "type-check",
-    sides: JSON.stringify(selectedSides),
+    sides: workspacesForTelemetry(selectedSides),
     verbose,
     prisma,
     generate

package/dist/lib/telemetryWorkspaces.js

@@ -0,0 +1,11 @@
+const KNOWN_WORKSPACES = /* @__PURE__ */ new Set(["api", "web", "packages/*"]);
+function workspacesForTelemetry(workspaces) {
+  return JSON.stringify(
+    workspaces.map(
+      (workspace) => KNOWN_WORKSPACES.has(workspace) ? workspace : "package"
+    )
+  );
+}
+export {
+  workspacesForTelemetry
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "8.0.0-canary.3592",
+  "version": "8.0.0-canary.3597",
   "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.3592",
-    "@cedarjs/babel-config": "8.0.0-canary.3592",
-    "@cedarjs/cli-helpers": "8.0.0-canary.3592",
-    "@cedarjs/internal": "8.0.0-canary.3592",
-    "@cedarjs/prerender": "8.0.0-canary.3592",
-    "@cedarjs/project-config": "8.0.0-canary.3592",
-    "@cedarjs/structure": "8.0.0-canary.3592",
-    "@cedarjs/telemetry": "8.0.0-canary.3592",
-    "@cedarjs/utils": "8.0.0-canary.3592",
-    "@cedarjs/vite": "8.0.0-canary.3592",
-    "@cedarjs/web-server": "8.0.0-canary.3592",
+    "@cedarjs/api-server": "8.0.0-canary.3597",
+    "@cedarjs/babel-config": "8.0.0-canary.3597",
+    "@cedarjs/cli-helpers": "8.0.0-canary.3597",
+    "@cedarjs/internal": "8.0.0-canary.3597",
+    "@cedarjs/prerender": "8.0.0-canary.3597",
+    "@cedarjs/project-config": "8.0.0-canary.3597",
+    "@cedarjs/structure": "8.0.0-canary.3597",
+    "@cedarjs/telemetry": "8.0.0-canary.3597",
+    "@cedarjs/utils": "8.0.0-canary.3597",
+    "@cedarjs/vite": "8.0.0-canary.3597",
+    "@cedarjs/web-server": "8.0.0-canary.3597",
     "@listr2/prompt-adapter-enquirer": "4.4.3",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "2.12.0",
@@ -93,7 +93,7 @@
     "yargs": "18.2.0"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "8.0.0-canary.3592",
+    "@cedarjs/framework-tools": "8.0.0-canary.3597",
     "@prisma/dmmf": "7.10.1",
     "@types/archiver": "^7.0.0",
     "memfs": "4.80.0",