@cedarjs/cli 7.0.1-next.467 → 7.1.0-rc.34

package/dist/commands/setup/monitoring/sentry/sentryHandler.js

@@ -1,17 +1,16 @@
 import fs from "node:fs";
 import path from "path";
 import { Listr } from "listr2";
-import { colors } from "@cedarjs/cli-helpers/colors";
-import { prettify, writeFilesTask } from "@cedarjs/cli-helpers/fileHelpers";
 import {
   addApiPackages,
-  addWebPackages
-} from "@cedarjs/cli-helpers/installHelpers";
-import { getPaths } from "@cedarjs/cli-helpers/paths";
-import {
   addEnvVarTask,
-  isTypeScriptProject
-} from "@cedarjs/cli-helpers/project";
+  addWebPackages,
+  colors,
+  getPaths,
+  isTypeScriptProject,
+  prettify,
+  writeFilesTask
+} from "@cedarjs/cli-helpers";
 import { getConfigPath } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 const rwPaths = getPaths();
@@ -76,6 +75,7 @@ const handler = async ({ force }) => {
           "export const handler = createGraphQLHandler({",
           "extraPlugins: [useSentry({",
           "  includeRawResult: true,",
+          "  includeResolverArgs: true,",
           "  includeExecuteVariables: true,",
           "})],"
         );
@@ -111,11 +111,7 @@ const handler = async ({ force }) => {
         contentLines.splice(
           boundaryOpenIndex,
           1,
-          "<Sentry.ErrorBoundary",
-          "  fallback={({ error }) => (",
-          "    <FatalErrorPage error={error instanceof Error ? error : undefined} />",
-          "  )}",
-          ">"
+          "<Sentry.ErrorBoundary fallback={FatalErrorPage}>"
         );
         const boundaryCloseIndex = contentLines.findLastIndex(
           (line) => line.includes("</FatalErrorBoundary>")

package/dist/commands/setup/monitoring/sentry/templates/sentryApi.ts.template

@@ -3,7 +3,10 @@ import * as Sentry from '@sentry/node'
 Sentry.init({
   dsn: process.env.SENTRY_DSN,
   environment: process.env.NODE_ENV,
-  integrations: [Sentry.prismaIntegration(), Sentry.httpIntegration()],
+  integrations: [
+    Sentry.prismaIntegration(),
+    Sentry.httpIntegration(),
+  ],
   tracesSampleRate: 1.0,
 })
 

package/dist/commands/setup/monitoring/sentry/templates/sentryWeb.ts.template

@@ -1,12 +1,9 @@
 import * as Sentry from '@sentry/react'
 
-const sentryDsn =
-  typeof process === 'undefined' ? undefined : process.env?.SENTRY_DSN
-
 let dsn = ''
 let environment = 'development'
 
-if (!sentryDsn) {
+if (typeof process === 'undefined' || !process.env?.SENTRY_DSN) {
   console.error(
     'Missing SENTRY_DSN environment variable. Did you forget to add it to ' +
       'your cedar.toml (or redwood.toml) in `includeEnvironmentVariables`?'
@@ -20,14 +17,14 @@ if (!sentryDsn) {
   `)
   console.error('Sentry is disabled for now')
 } else {
-  dsn = sentryDsn
-  environment = process.env.NODE_ENV ?? 'development'
+  dsn = process.env.SENTRY_DSN
+  environment = process.env.NODE_ENV
 }
 
 Sentry.init({
   dsn,
   environment,
-  integrations: [Sentry.browserTracingIntegration()],
+  integrations: [ Sentry.browserTracingIntegration() ],
   tracesSampleRate: 1.0,
 })
 

package/dist/commands/setup/neon/neon.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "neon";
 const description = "Provision a Neon Postgres database and configure your project";
 function builder(yargs) {

package/dist/commands/setup/neon/neonHandler.js

@@ -3,11 +3,8 @@ import path from "node:path";
 import execa from "execa";
 import { Listr } from "listr2";
 import prompts from "prompts";
-import { colors } from "@cedarjs/cli-helpers/colors";
-import { installPackages } from "@cedarjs/cli-helpers/installHelpers";
+import { colors, getPaths, installPackages } from "@cedarjs/cli-helpers";
 import { prettyPrintCedarCommand } from "@cedarjs/cli-helpers/packageManager";
-import { getPaths } from "@cedarjs/cli-helpers/paths";
-import { requireTTYOrExit } from "@cedarjs/cli-helpers/tty";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {
   checkProjectShape,
@@ -57,7 +54,14 @@ async function handler({ force, migrations, verbose }) {
   }
   let runMigrations = migrations;
   if (!skipProvisioning && runMigrations === void 0) {
-    requireTTYOrExit("--migrations or --no-migrations");
+    if (!process.stdin.isTTY) {
+      const error = new Error(
+        "Cannot prompt for confirmation in a non-interactive terminal. Please pass --migrations or --no-migrations explicitly."
+      );
+      errorTelemetry(process.argv, error.message);
+      console.error(colors.error(error.message));
+      process.exit(1);
+    }
     const response = await prompts({
       type: "toggle",
       name: "runMigrations",

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

@@ -1,5 +1,5 @@
 import { terminalLink } from "termi-link";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "package <npm-package>";
 const description = "Run a bin from an NPM package with version compatibility checks";
 const builder = (yargs) => {

package/dist/commands/setup/package/packageHandler.js

@@ -1,7 +1,7 @@
 import enq from "enquirer";
-import { isGreaterThanOrEqual, isLessThan, tryParse } from "verkit";
+import semver from "semver";
+import { getCompatibilityData } from "@cedarjs/cli-helpers";
 import { dlx } from "@cedarjs/cli-helpers/packageManager/exec";
-import { getCompatibilityData } from "@cedarjs/cli-helpers/version";
 import { getPaths } from "@cedarjs/project-config";
 async function handler({
   npmPackage,
@@ -16,7 +16,7 @@ async function handler({
     console.log(
       "No compatibility check will be performed because you used the --force flag."
     );
-    if (tryParse(packageVersion) !== null && isLessThan(packageVersion, "1.0.0")) {
+    if (semver.parse(packageVersion) !== null && semver.lt(packageVersion, "1.0.0")) {
       console.log(
         "Be aware that this package is under version 1.0.0 and so should be considered experimental."
       );
@@ -86,7 +86,7 @@ The latest version compatible with your project is ${latestCompatibleVersionText
   await runPackage(packageName, versionToUse, additionalOptionsToForward);
 }
 async function showExperimentalWarning(version) {
-  if (version === void 0 || tryParse(version) === null || isGreaterThanOrEqual(version, "1.0.0")) {
+  if (version === void 0 || semver.parse(version) === null || semver.gte(version, "1.0.0")) {
     return;
   }
   const decision = await promptWithChoices(

package/dist/commands/setup/realtime/addRealtimeToGraphql.js

@@ -1,6 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
-import { isTypeScriptProject } from "@cedarjs/cli-helpers/project";
+import { isTypeScriptProject } from "@cedarjs/cli-helpers";
 import { getPaths } from "@cedarjs/project-config";
 function addRealtimeToGraphqlHandler(ctx, task, force) {
   const graphqlHandlerPath = path.join(

package/dist/commands/setup/realtime/realtime.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "realtime";
 const description = "Setup RedwoodJS Realtime";
 function builder(yargs) {

package/dist/commands/setup/realtime/realtimeHandler.js

@@ -2,10 +2,10 @@ import fs from "node:fs";
 import path from "path";
 import { Listr } from "listr2";
 import prompts from "prompts";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { addApiPackages } from "@cedarjs/cli-helpers/installHelpers";
+import { addApiPackages, colors as c } from "@cedarjs/cli-helpers";
 import { runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
+import { projectIsEsm } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths, transformTSToJS, writeFile } from "../../../lib/index.js";
 import { isTypeScriptProject, serverFileExists } from "../../../lib/project.js";
@@ -77,7 +77,7 @@ async function handler(args) {
         title: "Adding Countdown example subscription...",
         enabled: () => includeExamples,
         task: async () => {
-          const exampleSubscriptionTemplateContent = fs.readFileSync(
+          let exampleSubscriptionTemplateContent = fs.readFileSync(
             path.resolve(
               import.meta.dirname,
               "templates",
@@ -87,6 +87,12 @@ async function handler(args) {
             ),
             "utf-8"
           );
+          if (projectIsEsm()) {
+            exampleSubscriptionTemplateContent = exampleSubscriptionTemplateContent.replace(
+              "import gql from 'graphql-tag'",
+              "import { gql } from 'graphql-tag'"
+            );
+          }
           const exampleFile = path.join(
             cedarPaths.api.subscriptions,
             "countdown",
@@ -138,7 +144,7 @@ async function handler(args) {
             `rooms.${isTypeScriptProject() ? "ts" : "js"}`
           );
           const serviceContent = ts ? exampleServiceTemplateContent : await transformTSToJS(serviceFile, exampleServiceTemplateContent);
-          const exampleSubscriptionTemplateContent = fs.readFileSync(
+          let exampleSubscriptionTemplateContent = fs.readFileSync(
             path.resolve(
               import.meta.dirname,
               "templates",
@@ -148,6 +154,12 @@ async function handler(args) {
             ),
             "utf-8"
           );
+          if (projectIsEsm()) {
+            exampleSubscriptionTemplateContent = exampleSubscriptionTemplateContent.replace(
+              "import gql from 'graphql-tag'",
+              "import { gql } from 'graphql-tag'"
+            );
+          }
           const exampleFile = path.join(
             cedarPaths.api.subscriptions,
             "newMessage",

package/dist/commands/setup/realtime/templates/defer/fastAndSlowFields/fastAndSlowFields.ts.template

@@ -7,10 +7,7 @@ export const fastField = async () => {
   return 'I am fast'
 }
 
-export const slowField = async (
-  _: unknown,
-  { waitFor = 5000 }: { waitFor?: number }
-) => {
+export const slowField = async (_, { waitFor = 5000 }) => {
   logger.debug('waiting on slowField')
   await wait(waitFor)
   return 'I am slow'

package/dist/commands/setup/realtime/templates/liveQueries/auctions/auctions.ts.template

@@ -1,16 +1,8 @@
-import type { BidInput } from 'types/graphql'
-
 import type { LiveQueryStorageMechanism } from '@cedarjs/realtime'
 
 import { logger } from 'src/lib/logger'
 
-interface AuctionData {
-  id: string
-  title: string
-  bids: { amount: number }[]
-}
-
-const auctions: AuctionData[] = [
+const auctions = [
   { id: '1', title: 'RedwoodJS Logo Shirt', bids: [{ amount: 20 }] },
   { id: '2', title: 'RedwoodJS Lapel Pin', bids: [{ amount: 5 }] },
   { id: '3', title: 'RedwoodJS Beanie', bids: [{ amount: 15 }] },
@@ -42,14 +34,14 @@ const auctions: AuctionData[] = [
  *   }
  * }
  */
-export const auction = async ({ id }: { id: string }) => {
+export const auction = async ({ id }) => {
   const foundAuction = auctions.find((a) => a.id === id)
   logger.debug({ id, auction: foundAuction }, 'auction')
   return foundAuction
 }
 
 export const bid = async (
-  { input }: { input: BidInput },
+  { input },
   { context }: { context: { liveQueryStore: LiveQueryStorageMechanism } }
 ) => {
   const { auctionId, amount } = input
@@ -70,7 +62,7 @@ export const bid = async (
 }
 
 export const Auction = {
-  highestBid: (obj: unknown, { root }: { root: AuctionData }) => {
+  highestBid: (obj, { root }) => {
     const [max] = root.bids.sort((a, b) => b.amount - a.amount)
 
     logger.debug({ obj, root }, 'highestBid')

package/dist/commands/setup/realtime/templates/subscriptions/countdown/countdown.ts.template

@@ -1,4 +1,4 @@
-import { gql } from 'graphql-tag'
+import gql from 'graphql-tag'
 
 import { Repeater } from '@cedarjs/realtime'
 

package/dist/commands/setup/realtime/templates/subscriptions/newMessage/newMessage.ts.template

@@ -1,4 +1,4 @@
-import { gql } from 'graphql-tag'
+import gql from 'graphql-tag'
 
 import type { PubSub } from '@cedarjs/realtime'
 
@@ -48,7 +48,7 @@ const newMessage = {
 
       return pubSub.subscribe('newMessage', roomId)
     },
-    resolve: (payload: NewMessageChannel['newMessage'][1]) => {
+    resolve: (payload) => {
       logger.debug({ payload }, 'newMessage subscription resolve')
 
       return payload

package/dist/commands/setup/server-file/serverFile.js

@@ -1,4 +1,4 @@
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
+import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "server-file";
 const description = "Setup the server file";
 function builder(yargs) {

package/dist/commands/setup/server-file/serverFileHandler.js

@@ -1,8 +1,7 @@
 import fs from "node:fs";
 import path from "path";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
-import { addApiPackages } from "@cedarjs/cli-helpers/installHelpers";
+import { addApiPackages, 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";

package/dist/commands/setup/ui/libraries/chakra-uiHandler.js

@@ -1,8 +1,7 @@
 import path from "path";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { addWorkspacePackages } from "@cedarjs/cli-helpers/packageManager/packages";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import extendStorybookConfiguration from "../../../../lib/configureStorybook.js";
 import { extendJSXFile, fileIncludes } from "../../../../lib/extendFile.js";
 import { getPaths, writeFile } from "../../../../lib/index.js";

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

@@ -1,9 +1,8 @@
 import fs from "node:fs";
 import path from "node:path";
 import { Listr } from "listr2";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { addWorkspacePackages } from "@cedarjs/cli-helpers/packageManager/packages";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import extendStorybookConfiguration from "../../../../lib/configureStorybook.js";
 import { extendJSXFile, fileIncludes } from "../../../../lib/extendFile.js";
 import { getPaths, writeFile } from "../../../../lib/index.js";

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

@@ -4,33 +4,45 @@ import { ListrEnquirerPromptAdapter } from "@listr2/prompt-adapter-enquirer";
 import execa from "execa";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
-import { colors as c } from "@cedarjs/cli-helpers/colors";
+import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
+import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
 import {
   addRootPackages,
   addWorkspacePackages
 } from "@cedarjs/cli-helpers/packageManager/packages";
-import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths, usingVSCode } from "../../../../lib/index.js";
-import { insertPluginsBeforeCedar } from "../../deploy/helpers/index.js";
-const tailwindImport = "@import 'tailwindcss';";
-const tailwindImportRegExp = /@import\s+['"]tailwindcss['"]/;
-const tailwindImportAndNotes = [
+const tailwindDirectives = [
+  "@tailwind base;",
+  "@tailwind components;",
+  "@tailwind utilities;"
+];
+const tailwindDirectivesExist = (indexCSS) => tailwindDirectives.every(
+  (tailwindDirective) => indexCSS.includes(tailwindDirective)
+);
+const tailwindImportsAndNotes = [
   "/**",
   " * START --- SETUP TAILWINDCSS EDIT",
   " *",
-  ` * \`${formatCedarCommand(["setup", "ui", "tailwindcss"])}\` placed this import here`,
+  ` * \`${formatCedarCommand(["setup", "ui", "tailwindcss"])}\` placed these directives here`,
   " * to inject Tailwind's styles into your CSS.",
   " * For more information, see: https://tailwindcss.com/docs/installation",
   " */",
-  tailwindImport,
+  ...tailwindDirectives,
   "/**",
   " * END --- SETUP TAILWINDCSS EDIT",
   " */\n"
 ];
-const recommendedVSCodeExtensions = ["bradlc.vscode-tailwindcss"];
+const recommendedVSCodeExtensions = [
+  "csstools.postcss",
+  "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"
@@ -74,8 +86,9 @@ const handler = async ({
   const rwPaths = getPaths();
   const projectPackages = ["prettier-plugin-tailwindcss@^0.8.0"];
   const webWorkspacePackages = [
-    "tailwindcss@^4.3.3",
-    "@tailwindcss/vite@^4.3.3"
+    "postcss",
+    "tailwindcss@^3.4.17",
+    "autoprefixer"
   ];
   const tasks = new Listr(
     [
@@ -126,45 +139,62 @@ const handler = async ({
         }
       },
       {
-        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) {
+        title: "Configuring PostCSS...",
+        task: () => {
+          const postCSSConfigPath = rwPaths.web.postcss;
+          if (!force && fs.existsSync(postCSSConfigPath)) {
             throw new Error(
-              `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.`
+              "PostCSS config already exists.\nUse --force to override existing config."
             );
+          } 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);
           }
-          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)
+        }
+      },
+      {
+        title: "Initializing Tailwind CSS...",
+        task: async () => {
+          const tailwindConfigPath = path.join(
+            rwPaths.web.config,
+            "tailwind.config.cjs"
           );
+          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 Tailwind CSS import to index.css...",
+        title: "Adding directives 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 (tailwindImportRegExp.test(indexCSS)) {
-            task.skip("Tailwind CSS import already exists in index.css");
+          if (tailwindDirectivesExist(indexCSS)) {
+            task.skip("Directives already exist in index.css");
           } else {
-            const newIndexCSS = tailwindImportAndNotes.join("\n") + indexCSS;
+            const newIndexCSS = tailwindImportsAndNotes.join("\n") + indexCSS;
             fs.writeFileSync(INDEX_CSS_PATH, newIndexCSS);
           }
         }
@@ -245,9 +275,7 @@ Add \`import tailwindcss from '@tailwindcss/vite'\` to the top of the file and \
             "activeClassName",
             "errorClassName"
           ];
-          const fileAssociations = { "*.css": "tailwindcss" };
           let newSettingsJson = {
-            ["files.associations"]: fileAssociations,
             ["tailwindCSS.classAttributes"]: classAttributes
           };
           if (fs.existsSync(VS_CODE_SETTINGS_PATH)) {
@@ -265,13 +293,8 @@ Add \`import tailwindcss from '@tailwindcss/vite'\` to the top of the file and \
             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
             };
           }
@@ -282,38 +305,34 @@ Add \`import tailwindcss from '@tailwindcss/vite'\` to the top of the file and \
         }
       },
       {
-        title: "Adding tailwind stylesheet entry in prettier...",
+        title: "Adding tailwind config entry in prettier...",
         task: async (_ctx) => {
           const prettierConfigPath = path.join(
             rwPaths.base,
             "prettier.config.cjs"
           );
           const prettierConfig = fs.readFileSync(prettierConfigPath, "utf-8");
-          const tailwindStylesheetPath = path.relative(rwPaths.base, path.join(rwPaths.web.src, "index.css")).replaceAll("\\", "/");
-          const tailwindStylesheetEntry = `tailwindStylesheet: './${tailwindStylesheetPath}',`;
+          const tailwindConfigPath = path.relative(
+            rwPaths.base,
+            path.posix.join(rwPaths.web.config, "tailwind.config.cjs")
+          ).replaceAll("\\", "/");
           let newPrettierConfig = prettierConfig;
-          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."
+          if (newPrettierConfig.includes("tailwindConfig: ")) {
+            if (force) {
+              newPrettierConfig = newPrettierConfig.replace(
+                /tailwindConfig: .*(,)?/,
+                `tailwindConfig: './${tailwindConfigPath}',`
               );
-            }
-            if (!stringEntryRegExp.test(newPrettierConfig)) {
+            } else {
               throw new Error(
-                `Could not update the tailwindStylesheet setting in ${prettierConfigPath}.
-Set it to './${tailwindStylesheetPath}' yourself.`
+                "tailwindConfig setting already exists in prettier configuration.\nUse --force to override existing config."
               );
             }
-            newPrettierConfig = newPrettierConfig.replace(
-              stringEntryRegExp,
-              tailwindStylesheetEntry
-            );
           } else {
             newPrettierConfig = newPrettierConfig.replace(
               /,(\n\s*)(\}\n?)$/,
               `,
-  ${tailwindStylesheetEntry}$1$2`
+  tailwindConfig: './${tailwindConfigPath}',$1$2`
             );
           }
           fs.writeFileSync(prettierConfigPath, newPrettierConfig);

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

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

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

@@ -0,0 +1,28 @@
+import j from "jscodeshift";
+function transform(fileInfo) {
+  const root = j(fileInfo.source);
+  const imports = root.find(j.ImportDeclaration);
+  imports.at(-1).insertAfter(
+    j.importDeclaration(
+      [j.importSpecifier(j.identifier("storagePrismaExtension"))],
+      j.literal("./uploads.js")
+    )
+  );
+  root.find(j.VariableDeclaration, { declarations: [{ id: { name: "db" } }] }).forEach((path) => {
+    const dbDeclaration = path.node.declarations[0];
+    if (j.VariableDeclarator.check(dbDeclaration) && j.NewExpression.check(dbDeclaration.init)) {
+      throw new Error("RW_CODEMOD_ERR_OLD_FORMAT");
+    }
+    if (j.VariableDeclarator.check(dbDeclaration) && j.Expression.check(dbDeclaration.init)) {
+      const newInit = j.callExpression(
+        j.memberExpression(dbDeclaration.init, j.identifier("$extends")),
+        [j.identifier("storagePrismaExtension")]
+      );
+      dbDeclaration.init = newInit;
+    }
+  });
+  return root.toSource();
+}
+export {
+  transform as default
+};

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

@@ -0,0 +1,21 @@
+import type { APIGatewayEvent, Context } from 'aws-lambda'
+
+import type { SignatureValidationArgs } from '@cedarjs/storage/UrlSigner'
+
+import { urlSigner, fsStorage } from 'src/lib/uploads'
+
+export const handler = async (event: APIGatewayEvent, _context: Context) => {
+  const fileToReturn = urlSigner.validateSignature(
+    event.queryStringParameters as SignatureValidationArgs
+  )
+
+  const { contents, type } = await fsStorage.read(fileToReturn)
+
+  return {
+    statusCode: 200,
+    headers: {
+      'Content-Type': type,
+    },
+    body: contents,
+  }
+}