@cedarjs/cli 7.0.1-next.314 → 7.0.1-next.466

package/dist/commands/setup/uploads/templates/uploads.ts.template

@@ -1,8 +1,8 @@
 import {
+  acceptedContentType,
   confirmUpload as confirmUploadRecord,
   createPresignedUpload,
   getUploadTokenPayload,
-  isMimeTypeAllowed,
   issueUploadToken,
   resolveProfile,
   resolveTarget,
@@ -71,18 +71,27 @@ export const uploadFile = async ({
     )
   }
 
-  if (!isMimeTypeAllowed(profile.allowedMimeTypes, input.mimeType)) {
+  // Checked by what the bytes are, not the type the client claimed, and
+  // stored under the type returned
+  const data = Buffer.from(input.data, 'base64')
+  const mimeType = acceptedContentType(
+    data,
+    profile.allowedMimeTypes,
+    input.mimeType,
+  )
+
+  if (!mimeType) {
     throw new UploadError(
       'MIME_TYPE_NOT_ALLOWED',
-      `File type '${input.mimeType}' is not allowed for upload profile '${profile.name}'.`,
+      `That file is not a type allowed for upload profile '${profile.name}'.`,
     )
   }
 
   return storeFile(target, {
     db,
     filename: input.filename,
-    mimeType: input.mimeType,
-    data: Buffer.from(input.data, 'base64'),
+    mimeType,
+    data,
     maxSize: profile.maxFileSize,
     userId: context.currentUser ? String(context.currentUser.id) : undefined,
   })

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

@@ -18,6 +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 { addUploadModel } from "./schemaPrisma.js";
 import {
   addUploadsPlugin,
@@ -39,6 +40,12 @@ const S3_CLIENT = `
 export const s3Client = new S3Client({
   region: process.env.AWS_REGION,
 })
+
+const s3Bucket = process.env.S3_BUCKET_UPLOADS
+
+if (!s3Bucket) {
+  throw new Error('Set S3_BUCKET_UPLOADS in .env to use the S3 storage target')
+}
 `;
 const TARGET_BLOCKS = {
   fs: `  // Files uploaded through the api server and stored on local disk. Good for
@@ -55,7 +62,7 @@ const TARGET_BLOCKS = {
   s3: `  // Files uploaded straight from the browser to S3 with presigned URLs.
   files: createS3Provider({
     client: s3Client,
-    bucket: process.env.S3_BUCKET_UPLOADS,
+    bucket: s3Bucket,
     region: process.env.AWS_REGION,
     keyPrefix: 'uploads/',
   }),
@@ -264,6 +271,20 @@ const handler = async ({ targets, force }) => {
           }
         }
       },
+      {
+        title: "Adding the fs upload directory to .gitignore...",
+        skip: () => wantsFs ? false : "No fs target selected; skipping.",
+        task: (_ctx, task) => {
+          const gitignorePath = path.join(paths.base, ".gitignore");
+          const source = fs.existsSync(gitignorePath) ? fs.readFileSync(gitignorePath, "utf-8") : "";
+          const updated = transformGitignore(source);
+          if (updated === source) {
+            task.skip(".gitignore already up to date");
+            return;
+          }
+          fs.writeFileSync(gitignorePath, updated, "utf-8");
+        }
+      },
       {
         title: "Prettifying changed files",
         task: async (_ctx, task) => {

package/dist/lib/index.js

@@ -286,18 +286,17 @@ const cleanupEmptyDirsTask = (files) => {
     })
   );
 };
-function wrapWithSet(routesContent, layout, routes, newLineAndIndent, props = {}, privateSetProps) {
+function wrapWithSet(routesContent, layout, routes, newLineAndIndent, privateSetProps) {
   const [_, indentOne, indentTwo] = routesContent.match(
     /([ \t]*)<Router.*?>[^<]*[\r\n]+([ \t]+)/
   ) || ["", "", ""];
   const oneLevelIndent = indentTwo.slice(0, indentTwo.length - indentOne.length);
-  const propsString = Object.entries(props).map((values) => `${values[0]}="${values[1]}"`).join(" ");
   if (!privateSetProps) {
     const newRoutesWithExtraIndent2 = routes.map(
       (route) => oneLevelIndent + route
     );
     return [
-      `<Set wrap={${layout}}${propsString && " " + propsString}>`,
+      `<Set wrap={${layout}}>`,
       ...newRoutesWithExtraIndent2,
       `</Set>`
     ].join(newLineAndIndent);
@@ -308,13 +307,13 @@ function wrapWithSet(routesContent, layout, routes, newLineAndIndent, props = {}
   );
   return [
     `<PrivateSet${privateSetPropsString && " " + privateSetPropsString}>`,
-    `${oneLevelIndent}<Set wrap={${layout}}${propsString && " " + propsString}>`,
+    `${oneLevelIndent}<Set wrap={${layout}}>`,
     ...newRoutesWithExtraIndent,
     `${oneLevelIndent}</Set>`,
     `</PrivateSet>`
   ].join(newLineAndIndent);
 }
-function addRoutesToRouterTask(routes, layout, setProps = {}, privateSetProps) {
+function addRoutesToRouterTask(routes, layout, privateSetProps) {
   const cedarPaths = getPaths();
   const routesContent = readFile(cedarPaths.web.routes).toString();
   let newRoutes = routes.filter((route) => !routesContent.match(route));
@@ -338,7 +337,6 @@ ${route}`);
       layout,
       newRoutes,
       newLineAndIndent,
-      setProps,
       privateSetProps
     ) : newRoutes.join(newLineAndIndent);
     const newRoutesContent = routesContent.replace(
@@ -377,6 +375,12 @@ function removeEmtpySet(routesContent, layout) {
   if (child.length > 0) {
     return routesContent;
   }
+  const privateSetWithLayoutReg = new RegExp(
+    `\\s*<PrivateSet[^>]*>\\s*<Set[^>]*wrap={${layout}}[^<]*>\\s*</Set>\\s*</PrivateSet>`
+  );
+  if (privateSetWithLayoutReg.test(routesContent)) {
+    return routesContent.replace(privateSetWithLayoutReg, "");
+  }
   return routesContent.replace(setWithLayoutReg, "");
 }
 function removeRoutesFromRouterTask(routes, layout) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "7.0.1-next.314",
+  "version": "7.0.1-next.466",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -34,25 +34,25 @@
     "@babel/core": "^7.26.10",
     "@babel/parser": "7.29.9",
     "@babel/preset-typescript": "7.29.7",
-    "@babel/traverse": "7.29.8",
+    "@babel/traverse": "7.29.10",
     "@babel/types": "7.29.8",
-    "@cedarjs/api-server": "7.0.1-next.314",
-    "@cedarjs/babel-config": "7.0.1-next.314",
-    "@cedarjs/cli-helpers": "7.0.1-next.314",
-    "@cedarjs/internal": "7.0.1-next.314",
-    "@cedarjs/prerender": "7.0.1-next.314",
-    "@cedarjs/project-config": "7.0.1-next.314",
-    "@cedarjs/structure": "7.0.1-next.314",
-    "@cedarjs/telemetry": "7.0.1-next.314",
-    "@cedarjs/utils": "7.0.1-next.314",
-    "@cedarjs/vite": "7.0.1-next.314",
-    "@cedarjs/web-server": "7.0.1-next.314",
-    "@listr2/prompt-adapter-enquirer": "4.3.2",
+    "@cedarjs/api-server": "7.0.1-next.466",
+    "@cedarjs/babel-config": "7.0.1-next.466",
+    "@cedarjs/cli-helpers": "7.0.1-next.466",
+    "@cedarjs/internal": "7.0.1-next.466",
+    "@cedarjs/prerender": "7.0.1-next.466",
+    "@cedarjs/project-config": "7.0.1-next.466",
+    "@cedarjs/structure": "7.0.1-next.466",
+    "@cedarjs/telemetry": "7.0.1-next.466",
+    "@cedarjs/utils": "7.0.1-next.466",
+    "@cedarjs/vite": "7.0.1-next.466",
+    "@cedarjs/web-server": "7.0.1-next.466",
+    "@listr2/prompt-adapter-enquirer": "4.3.3",
     "@opentelemetry/api": "1.9.1",
-    "@opentelemetry/core": "2.11.0",
-    "@opentelemetry/exporter-trace-otlp-http": "0.222.0",
-    "@opentelemetry/resources": "2.11.0",
-    "@opentelemetry/sdk-trace-node": "2.11.0",
+    "@opentelemetry/core": "2.12.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.223.0",
+    "@opentelemetry/resources": "2.12.0",
+    "@opentelemetry/sdk-trace-node": "2.12.0",
     "@opentelemetry/semantic-conventions": "1.43.0",
     "@prisma/internals": "7.10.0",
     "ansis": "4.4.0",
@@ -62,7 +62,7 @@
     "camelcase": "6.3.0",
     "change-case": "4.1.2",
     "ci-info": "4.4.0",
-    "concurrently": "9.2.4",
+    "concurrently": "9.2.5",
     "configstore": "7.1.0",
     "decamelize": "6.0.1",
     "dotenv-defaults": "5.0.2",
@@ -79,13 +79,13 @@
     "pascalcase": "1.0.0",
     "pluralize": "8.0.0",
     "portfinder": "1.0.38",
-    "prettier": "3.9.9",
+    "prettier": "3.9.10",
     "prisma": "7.10.0",
     "prompts": "2.4.2",
-    "smol-toml": "1.9.0",
+    "smol-toml": "1.9.1",
     "srvx": "0.12.8",
     "string-env-interpolation": "1.0.1",
-    "systeminformation": "5.33.13",
+    "systeminformation": "5.33.15",
     "termi-link": "1.1.0",
     "title-case": "3.0.3",
     "unionfs": "4.6.0",
@@ -94,10 +94,10 @@
     "yargs": "17.7.3"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "7.0.1-next.314",
+    "@cedarjs/framework-tools": "7.0.1-next.466",
     "@prisma/dmmf": "7.10.0",
     "@types/archiver": "^7.0.0",
-    "memfs": "4.79.0",
+    "memfs": "4.80.0",
     "node-ssh": "13.2.1",
     "ts-dedent": "2.3.0",
     "typescript": "5.9.3",

package/dist/commands/setup/ui/templates/postcss.config.cjs.template

@@ -1,9 +0,0 @@
-const path = require('path')
-
-module.exports = {
-  plugins: [
-    require('tailwindcss/nesting'),
-    require('tailwindcss')(path.resolve(__dirname, 'tailwind.config.cjs')),
-    require('autoprefixer'),
-  ],
-}