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

package/dist/commands/setup/tenancy/templates/organizations.ts.template

@@ -321,7 +321,7 @@ export const removeMember: MutationResolvers['removeMember'] = async ({
 
 export const Membership: MembershipRelationResolvers = {
   organization: (_obj, { root }) =>
-    db.membership.findUnique({ where: { id: root?.id } }).organization(),
+    db.membership.findUniqueOrThrow({ where: { id: root.id } }).organization(),
 }
 
 interface EnsureDefaultOrganizationArgs {

package/dist/commands/setup/tenancy/templates/requireMembership.test.ts.template

@@ -7,7 +7,7 @@ import requireMembership from './requireMembership.js'
  * selects more fields than these tests need.
  */
 const asCurrentUser = (user: { id: string; memberships?: unknown[] }) =>
-  user as unknown as typeof context.currentUser
+  user as unknown as NonNullable<typeof context.currentUser>
 
 describe('requireMembership directive', () => {
   it('declares the directive sdl as schema, with the correct name', () => {

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

@@ -57,7 +57,7 @@ const SIGNUP_SNIPPET = `
 
     await ensureDefaultOrganization({
       currentUser: user,
-      invitationToken: userAttributes.invitationToken,
+      invitationToken: userAttributes?.invitationToken,
     })
 
     return user

package/dist/commands/setup/ui/libraries/tailwindcssHandler.js

@@ -6,7 +6,6 @@ import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
 import { colors as c } from "@cedarjs/cli-helpers/colors";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
-import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
 import {
   addRootPackages,
   addWorkspacePackages
@@ -14,36 +13,24 @@ import {
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths, usingVSCode } from "../../../../lib/index.js";
-const tailwindDirectives = [
-  "@tailwind base;",
-  "@tailwind components;",
-  "@tailwind utilities;"
-];
-const tailwindDirectivesExist = (indexCSS) => tailwindDirectives.every(
-  (tailwindDirective) => indexCSS.includes(tailwindDirective)
-);
-const tailwindImportsAndNotes = [
+import { insertPluginsBeforeCedar } from "../../deploy/helpers/index.js";
+const tailwindImport = "@import 'tailwindcss';";
+const tailwindImportRegExp = /@import\s+['"]tailwindcss['"]/;
+const tailwindImportAndNotes = [
   "/**",
   " * START --- SETUP TAILWINDCSS EDIT",
   " *",
-  ` * \`${formatCedarCommand(["setup", "ui", "tailwindcss"])}\` placed these directives here`,
+  ` * \`${formatCedarCommand(["setup", "ui", "tailwindcss"])}\` placed this import here`,
   " * to inject Tailwind's styles into your CSS.",
   " * For more information, see: https://tailwindcss.com/docs/installation",
   " */",
-  ...tailwindDirectives,
+  tailwindImport,
   "/**",
   " * END --- SETUP TAILWINDCSS EDIT",
   " */\n"
 ];
-const recommendedVSCodeExtensions = [
-  "csstools.postcss",
-  "bradlc.vscode-tailwindcss"
-];
+const recommendedVSCodeExtensions = ["bradlc.vscode-tailwindcss"];
 const recommendationTexts = {
-  "csstools.postcss": terminalLink(
-    "PostCSS Language Support",
-    "https://marketplace.visualstudio.com/items?itemName=csstools.postcss"
-  ),
   "bradlc.vscode-tailwindcss": terminalLink(
     "Tailwind CSS IntelliSense",
     "https://marketplace.visualstudio.com/items?itemName=bradlc.vscode-tailwindcss"
@@ -87,9 +74,8 @@ const handler = async ({
   const rwPaths = getPaths();
   const projectPackages = ["prettier-plugin-tailwindcss@^0.8.0"];
   const webWorkspacePackages = [
-    "postcss",
-    "tailwindcss@^3.4.17",
-    "autoprefixer"
+    "tailwindcss@^4.3.3",
+    "@tailwindcss/vite@^4.3.3"
   ];
   const tasks = new Listr(
     [
@@ -140,62 +126,45 @@ const handler = async ({
         }
       },
       {
-        title: "Configuring PostCSS...",
-        task: () => {
-          const postCSSConfigPath = rwPaths.web.postcss;
-          if (!force && fs.existsSync(postCSSConfigPath)) {
+        title: "Adding the Tailwind CSS plugin to the Vite config...",
+        task: (_ctx, task) => {
+          const viteConfigPath = rwPaths.web.viteConfig;
+          if (!viteConfigPath || !fs.existsSync(viteConfigPath)) {
+            throw new Error("Could not find web/vite.config.{ts,js}");
+          }
+          const viteConfig = fs.readFileSync(viteConfigPath, "utf-8");
+          if (viteConfig.includes("@tailwindcss/vite")) {
+            task.skip("The Tailwind CSS Vite plugin is already configured");
+            return;
+          }
+          const viteConfigWithPlugin = insertPluginsBeforeCedar({
+            content: viteConfig,
+            pluginCodes: ["tailwindcss()"]
+          });
+          if (!viteConfigWithPlugin) {
             throw new Error(
-              "PostCSS config already exists.\nUse --force to override existing config."
+              `Could not find \`cedar()\` in the plugins array in ${viteConfigPath}.
+Add \`import tailwindcss from '@tailwindcss/vite'\` to the top of the file and \`tailwindcss()\` to the plugins array yourself, and then run this command again.`
             );
-          } else {
-            const postCSSConfig = fs.readFileSync(
-              path.join(
-                import.meta.dirname,
-                "../templates/postcss.config.cjs.template"
-              ),
-              "utf-8"
-            );
-            fs.mkdirSync(path.dirname(postCSSConfigPath), { recursive: true });
-            return fs.writeFileSync(postCSSConfigPath, postCSSConfig);
           }
-        }
-      },
-      {
-        title: "Initializing Tailwind CSS...",
-        task: async () => {
-          const tailwindConfigPath = path.join(
-            rwPaths.web.config,
-            "tailwind.config.cjs"
+          const tailwindPluginImport = "import tailwindcss from '@tailwindcss/vite'\n";
+          const importAnchor = /^import .* from ['"]vite['"]/m.exec(viteConfigWithPlugin) ?? /^import /m.exec(viteConfigWithPlugin);
+          const insertAt = importAnchor?.index ?? 0;
+          fs.writeFileSync(
+            viteConfigPath,
+            viteConfigWithPlugin.slice(0, insertAt) + tailwindPluginImport + viteConfigWithPlugin.slice(insertAt)
           );
-          if (fs.existsSync(tailwindConfigPath)) {
-            if (force) {
-              fs.unlinkSync(tailwindConfigPath);
-            } else {
-              throw new Error(
-                "Tailwind CSS config already exists.\nUse --force to override existing config."
-              );
-            }
-          }
-          await runBin("tailwindcss", ["init", tailwindConfigPath], {
-            cwd: rwPaths.web.base
-          });
-          const tailwindConfig = fs.readFileSync(tailwindConfigPath, "utf-8");
-          const newTailwindConfig = 'const { join } = require("node:path");\n\n' + tailwindConfig.replace(
-            "content: []",
-            "content: [join(__dirname, '../src/**/*.{js,jsx,ts,tsx}')]"
-          ).replace("export default {", "module.exports = {");
-          fs.writeFileSync(tailwindConfigPath, newTailwindConfig);
         }
       },
       {
-        title: "Adding directives to index.css...",
+        title: "Adding Tailwind CSS import to index.css...",
         task: (_ctx, task) => {
           const INDEX_CSS_PATH = path.join(rwPaths.web.src, "index.css");
           const indexCSS = fs.readFileSync(INDEX_CSS_PATH, "utf-8");
-          if (tailwindDirectivesExist(indexCSS)) {
-            task.skip("Directives already exist in index.css");
+          if (tailwindImportRegExp.test(indexCSS)) {
+            task.skip("Tailwind CSS import already exists in index.css");
           } else {
-            const newIndexCSS = tailwindImportsAndNotes.join("\n") + indexCSS;
+            const newIndexCSS = tailwindImportAndNotes.join("\n") + indexCSS;
             fs.writeFileSync(INDEX_CSS_PATH, newIndexCSS);
           }
         }
@@ -276,7 +245,9 @@ const handler = async ({
             "activeClassName",
             "errorClassName"
           ];
+          const fileAssociations = { "*.css": "tailwindcss" };
           let newSettingsJson = {
+            ["files.associations"]: fileAssociations,
             ["tailwindCSS.classAttributes"]: classAttributes
           };
           if (fs.existsSync(VS_CODE_SETTINGS_PATH)) {
@@ -294,8 +265,13 @@ const handler = async ({
             const mergedClassAttributes = Array.from(
               /* @__PURE__ */ new Set([...classAttributes, ...originalTwClassAttributesJson])
             );
+            const existingAssociations = originalSettingsJson["files.associations"];
             newSettingsJson = {
               ...originalSettingsJson,
+              ["files.associations"]: {
+                ...existingAssociations && typeof existingAssociations === "object" && !Array.isArray(existingAssociations) ? existingAssociations : {},
+                ...fileAssociations
+              },
               ["tailwindCSS.classAttributes"]: mergedClassAttributes
             };
           }
@@ -306,34 +282,38 @@ const handler = async ({
         }
       },
       {
-        title: "Adding tailwind config entry in prettier...",
+        title: "Adding tailwind stylesheet entry in prettier...",
         task: async (_ctx) => {
           const prettierConfigPath = path.join(
             rwPaths.base,
             "prettier.config.cjs"
           );
           const prettierConfig = fs.readFileSync(prettierConfigPath, "utf-8");
-          const tailwindConfigPath = path.relative(
-            rwPaths.base,
-            path.posix.join(rwPaths.web.config, "tailwind.config.cjs")
-          ).replaceAll("\\", "/");
+          const tailwindStylesheetPath = path.relative(rwPaths.base, path.join(rwPaths.web.src, "index.css")).replaceAll("\\", "/");
+          const tailwindStylesheetEntry = `tailwindStylesheet: './${tailwindStylesheetPath}',`;
           let newPrettierConfig = prettierConfig;
-          if (newPrettierConfig.includes("tailwindConfig: ")) {
-            if (force) {
-              newPrettierConfig = newPrettierConfig.replace(
-                /tailwindConfig: .*(,)?/,
-                `tailwindConfig: './${tailwindConfigPath}',`
+          const stringEntryRegExp = /tailwindStylesheet:\s*(['"`])[^'"`\n]*\1,?/;
+          if (newPrettierConfig.includes("tailwindStylesheet")) {
+            if (!force) {
+              throw new Error(
+                "tailwindStylesheet setting already exists in prettier configuration.\nUse --force to override existing config."
               );
-            } else {
+            }
+            if (!stringEntryRegExp.test(newPrettierConfig)) {
               throw new Error(
-                "tailwindConfig setting already exists in prettier configuration.\nUse --force to override existing config."
+                `Could not update the tailwindStylesheet setting in ${prettierConfigPath}.
+Set it to './${tailwindStylesheetPath}' yourself.`
               );
             }
+            newPrettierConfig = newPrettierConfig.replace(
+              stringEntryRegExp,
+              tailwindStylesheetEntry
+            );
           } else {
             newPrettierConfig = newPrettierConfig.replace(
               /,(\n\s*)(\}\n?)$/,
               `,
-  tailwindConfig: './${tailwindConfigPath}',$1$2`
+  ${tailwindStylesheetEntry}$1$2`
             );
           }
           fs.writeFileSync(prettierConfigPath, newPrettierConfig);

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

@@ -0,0 +1,17 @@
+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("#"));
+  if (activeLines.includes(UPLOADS_GITIGNORE_ENTRY)) {
+    return source;
+  }
+  if (/^dev\.db\*$/m.test(source)) {
+    return source.replace(/^(dev\.db\*)$/m, `$1
+${UPLOADS_GITIGNORE_ENTRY}`);
+  }
+  const prefix = source === "" || source.endsWith("\n") ? source : source + "\n";
+  return prefix + UPLOADS_GITIGNORE_ENTRY + "\n";
+}
+export {
+  UPLOADS_GITIGNORE_ENTRY,
+  transformGitignore
+};

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.333",
+  "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.333",
-    "@cedarjs/babel-config": "7.0.1-next.333",
-    "@cedarjs/cli-helpers": "7.0.1-next.333",
-    "@cedarjs/internal": "7.0.1-next.333",
-    "@cedarjs/prerender": "7.0.1-next.333",
-    "@cedarjs/project-config": "7.0.1-next.333",
-    "@cedarjs/structure": "7.0.1-next.333",
-    "@cedarjs/telemetry": "7.0.1-next.333",
-    "@cedarjs/utils": "7.0.1-next.333",
-    "@cedarjs/vite": "7.0.1-next.333",
-    "@cedarjs/web-server": "7.0.1-next.333",
-    "@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.333",
+    "@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'),
-  ],
-}