@cedarjs/cli 8.0.0-canary.3386 → 8.0.0-canary.3387

package/dist/commands/setup/cache/templates/memcached.ts.template

@@ -10,21 +10,18 @@ const memJsFormattedLogger = {
   log: (msg: string) => logger.error(msg),
 }
 
-export let client: InMemoryClient | MemcachedClient
+// The client connects to Memcached the first time it's used. If it can't
+// connect, the error is logged and `cache()` runs the uncached function
+// instead
+export const client =
+  process.env.NODE_ENV === 'test'
+    ? new InMemoryClient()
+    : new MemcachedClient(process.env.CACHE_HOST, {
+        logger: memJsFormattedLogger,
+      })
 
-if (process.env.NODE_ENV === 'test') {
-  client = new InMemoryClient()
-} else {
-  try {
-    client = new MemcachedClient(process.env.CACHE_HOST, {
-      logger: memJsFormattedLogger,
-    })
-  } catch (e) {
-    logger.error(`Could not connect to cache: ${e.message}`)
-  }
-}
-
-export const { cache, cacheFindMany, cacheClient, deleteCacheKey } = createCache(client, {
-  logger,
-  timeout: 500,
-})
+export const { cache, cacheFindMany, cacheClient, deleteCacheKey } =
+  createCache(client, {
+    logger,
+    timeout: 500,
+  })

package/dist/commands/setup/cache/templates/redis.ts.template

@@ -1,24 +1,16 @@
-import {
-  createCache,
-  InMemoryClient,
-  RedisClient,
-} from '@cedarjs/api/cache'
+import { createCache, InMemoryClient, RedisClient } from '@cedarjs/api/cache'
 
 import { logger } from './logger'
 
-export let client: InMemoryClient | RedisClient
+// The client connects to Redis the first time it's used. If it can't connect,
+// the error is logged and `cache()` runs the uncached function instead
+export const client =
+  process.env.NODE_ENV === 'test'
+    ? new InMemoryClient()
+    : new RedisClient({ url: process.env.CACHE_HOST, logger })
 
-if (process.env.NODE_ENV === 'test') {
-  client = new InMemoryClient()
-} else {
-  try {
-    client = new RedisClient({ url: process.env.CACHE_HOST, logger })
-  } catch (e) {
-    logger.error(`Could not connect to cache: ${e.message}`)
-  }
-}
-
-export const { cache, cacheFindMany, cacheClient, deleteCacheKey } = createCache(client, {
-  logger,
-  timeout: 500,
-})
+export const { cache, cacheFindMany, cacheClient, deleteCacheKey } =
+  createCache(client, {
+    logger,
+    timeout: 500,
+  })

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

@@ -76,7 +76,6 @@ const handler = async ({ force }) => {
           "export const handler = createGraphQLHandler({",
           "extraPlugins: [useSentry({",
           "  includeRawResult: true,",
-          "  includeResolverArgs: true,",
           "  includeExecuteVariables: true,",
           "})],"
         );
@@ -112,7 +111,11 @@ const handler = async ({ force }) => {
         contentLines.splice(
           boundaryOpenIndex,
           1,
-          "<Sentry.ErrorBoundary fallback={FatalErrorPage}>"
+          "<Sentry.ErrorBoundary",
+          "  fallback={({ error }) => (",
+          "    <FatalErrorPage error={error instanceof Error ? error : undefined} />",
+          "  )}",
+          ">"
         );
         const boundaryCloseIndex = contentLines.findLastIndex(
           (line) => line.includes("</FatalErrorBoundary>")

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

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

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

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

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

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

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

@@ -48,7 +48,7 @@ const newMessage = {
 
       return pubSub.subscribe('newMessage', roomId)
     },
-    resolve: (payload) => {
+    resolve: (payload: NewMessageChannel['newMessage'][1]) => {
       logger.debug({ payload }, 'newMessage subscription resolve')
 
       return payload

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

@@ -52,7 +52,8 @@ function wrapCreateCall(fn) {
           ),
           j.objectProperty(
             j.identifier("invitationToken"),
-            j.memberExpression(
+            // `userAttributes` is optional in dbAuth's signup handler options
+            j.optionalMemberExpression(
               j.identifier("userAttributes"),
               j.identifier("invitationToken")
             )

package/dist/commands/setup/tenancy/templates/InvitePage.tsx.template

@@ -1,11 +1,20 @@
 import { useEffect, useState } from 'react'
 
+import type {
+  AcceptInvitationMutation,
+  AcceptInvitationMutationVariables,
+} from 'types/graphql'
+
 import { navigate, routes, useParams } from '@cedarjs/router'
 import { Metadata, useMutation } from '@cedarjs/web'
+import type { TypedDocumentNode } from '@cedarjs/web'
 
 import { useAuth } from 'src/auth'
 
-const ACCEPT_INVITATION_MUTATION = gql`
+const ACCEPT_INVITATION_MUTATION: TypedDocumentNode<
+  AcceptInvitationMutation,
+  AcceptInvitationMutationVariables
+> = gql`
   mutation AcceptInvitationMutation($token: String!) {
     acceptInvitation(token: $token) {
       id

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/uploads/uploadsHandler.js

@@ -40,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
@@ -56,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/',
   }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "8.0.0-canary.3386",
+  "version": "8.0.0-canary.3387",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -36,17 +36,17 @@
     "@babel/preset-typescript": "7.29.7",
     "@babel/traverse": "7.29.10",
     "@babel/types": "7.29.8",
-    "@cedarjs/api-server": "8.0.0-canary.3386",
-    "@cedarjs/babel-config": "8.0.0-canary.3386",
-    "@cedarjs/cli-helpers": "8.0.0-canary.3386",
-    "@cedarjs/internal": "8.0.0-canary.3386",
-    "@cedarjs/prerender": "8.0.0-canary.3386",
-    "@cedarjs/project-config": "8.0.0-canary.3386",
-    "@cedarjs/structure": "8.0.0-canary.3386",
-    "@cedarjs/telemetry": "8.0.0-canary.3386",
-    "@cedarjs/utils": "8.0.0-canary.3386",
-    "@cedarjs/vite": "8.0.0-canary.3386",
-    "@cedarjs/web-server": "8.0.0-canary.3386",
+    "@cedarjs/api-server": "8.0.0-canary.3387",
+    "@cedarjs/babel-config": "8.0.0-canary.3387",
+    "@cedarjs/cli-helpers": "8.0.0-canary.3387",
+    "@cedarjs/internal": "8.0.0-canary.3387",
+    "@cedarjs/prerender": "8.0.0-canary.3387",
+    "@cedarjs/project-config": "8.0.0-canary.3387",
+    "@cedarjs/structure": "8.0.0-canary.3387",
+    "@cedarjs/telemetry": "8.0.0-canary.3387",
+    "@cedarjs/utils": "8.0.0-canary.3387",
+    "@cedarjs/vite": "8.0.0-canary.3387",
+    "@cedarjs/web-server": "8.0.0-canary.3387",
     "@listr2/prompt-adapter-enquirer": "4.3.3",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "2.12.0",
@@ -94,7 +94,7 @@
     "yargs": "17.7.3"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "8.0.0-canary.3386",
+    "@cedarjs/framework-tools": "8.0.0-canary.3387",
     "@prisma/dmmf": "7.10.0",
     "@types/archiver": "^7.0.0",
     "memfs": "4.80.0",