@cedarjs/cli 8.0.0-canary.3595 → 8.0.0-canary.3598

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "8.0.0-canary.3595",
+  "version": "8.0.0-canary.3598",
   "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.3595",
-    "@cedarjs/babel-config": "8.0.0-canary.3595",
-    "@cedarjs/cli-helpers": "8.0.0-canary.3595",
-    "@cedarjs/internal": "8.0.0-canary.3595",
-    "@cedarjs/prerender": "8.0.0-canary.3595",
-    "@cedarjs/project-config": "8.0.0-canary.3595",
-    "@cedarjs/structure": "8.0.0-canary.3595",
-    "@cedarjs/telemetry": "8.0.0-canary.3595",
-    "@cedarjs/utils": "8.0.0-canary.3595",
-    "@cedarjs/vite": "8.0.0-canary.3595",
-    "@cedarjs/web-server": "8.0.0-canary.3595",
+    "@cedarjs/api-server": "8.0.0-canary.3598",
+    "@cedarjs/babel-config": "8.0.0-canary.3598",
+    "@cedarjs/cli-helpers": "8.0.0-canary.3598",
+    "@cedarjs/internal": "8.0.0-canary.3598",
+    "@cedarjs/prerender": "8.0.0-canary.3598",
+    "@cedarjs/project-config": "8.0.0-canary.3598",
+    "@cedarjs/structure": "8.0.0-canary.3598",
+    "@cedarjs/telemetry": "8.0.0-canary.3598",
+    "@cedarjs/utils": "8.0.0-canary.3598",
+    "@cedarjs/vite": "8.0.0-canary.3598",
+    "@cedarjs/web-server": "8.0.0-canary.3598",
     "@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.3595",
+    "@cedarjs/framework-tools": "8.0.0-canary.3598",
     "@prisma/dmmf": "7.10.1",
     "@types/archiver": "^7.0.0",
     "memfs": "4.80.0",