Merge branch 'dev' into IN-831-edit-organization-page

weareinreach · Dec 4, 2023 · 2924d07 · 2924d07
2 parents 6ab5d23 + 982970c
commit 2924d07
Show file tree

Hide file tree

Showing 25 changed files with 51 additions and 38 deletions.
diff --git a/InReach.code-workspace b/InReach.code-workspace
@@ -178,7 +178,9 @@
 		},
 		"files.exclude": {
 			".next/": true,
+			".trace/": true,
 			".turbo/": true,
+			".vercel/": true,
 			"*.tsbuildinfo": true,
 			"**/.DS_Store": true,
 			"**/.git": true,

diff --git a/apps/app/next.config.mjs b/apps/app/next.config.mjs
@@ -30,14 +30,15 @@ const nextConfig = {
 	reactStrictMode: true,
 	swcMinify: true,
 	transpilePackages: [
-		// '@weareinreach/analytics',
+		'@weareinreach/analytics',
 		'@weareinreach/api',
 		'@weareinreach/auth',
-		// '@weareinreach/crowdin',
+		'@weareinreach/config',
+		'@weareinreach/crowdin',
 		'@weareinreach/db',
-		// '@weareinreach/env',
+		'@weareinreach/env',
 		'@weareinreach/ui',
-		// '@weareinreach/util',
+		'@weareinreach/util',
 	],
 	compiler: {
 		...(isVercelProd ? { removeConsole: { exclude: ['error'] } } : {}),

diff --git a/apps/app/src/utils/api.ts b/apps/app/src/utils/api.ts
@@ -7,8 +7,8 @@ import { type inferRouterInputs, type inferRouterOutputs } from '@trpc/server'
 import { devtoolsLink } from 'trpc-client-devtools-link'
 
 import { type AppRouter } from '@weareinreach/api'
-import { transformer } from '@weareinreach/api/lib/transformer'
 import { getEnv } from '@weareinreach/env'
+import { transformer } from '@weareinreach/util/transformer'
 // import { createLoggerInstance } from '@weareinreach/util/logger'
 
 // const log = createLoggerInstance('tRPC')

diff --git a/packages/api/lib/index.ts b/packages/api/lib/index.ts
@@ -9,6 +9,5 @@ export * from './milliseconds'
 export * from './nanoIdUrl'
 export * from './permissions'
 export * from './prismaErrorCodes'
-export * from './transformer'
 export * from './trpc'
 // codegen:end
diff --git a/packages/api/lib/initTRPC.ts b/packages/api/lib/initTRPC.ts
@@ -1,9 +1,9 @@
 import { initTRPC } from '@trpc/server'
-import superjson from 'superjson'
 import { type TRPCPanelMeta } from 'trpc-panel'
 import { ZodError } from 'zod'
 
 import { type Permission } from '@weareinreach/db/generated/permission'
+import { transformer } from '@weareinreach/util/transformer'
 
 import { type Context } from './context'
 
@@ -15,7 +15,7 @@ export const t = initTRPC
 	.context<Context>()
 	.meta<Meta>()
 	.create({
-		transformer: superjson,
+		transformer,
 		errorFormatter({ shape, error }) {
 			return {
 				...shape,

diff --git a/packages/api/lib/transformer.ts b/packages/api/lib/transformer.ts
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -43,7 +43,6 @@
 		"luxon": "3.4.4",
 		"nanoid": "5.0.4",
 		"slugify": "1.6.6",
-		"superjson": "2.2.1",
 		"tiny-invariant": "1.3.1",
 		"zod": "3.22.4"
 	},

diff --git a/packages/api/router/organization/query.getIntlCrisis.handler.ts b/packages/api/router/organization/query.getIntlCrisis.handler.ts
@@ -1,8 +1,7 @@
-import superjson from 'superjson'
-import { type SuperJSONResult } from 'superjson/dist/types'
 import { z } from 'zod'
 
 import { prisma } from '@weareinreach/db'
+import { superjson, type SuperJSONResult } from '@weareinreach/util/transformer'
 import { type TRPCHandlerParams } from '~api/types/handler'
 
 import { type TGetIntlCrisisSchema } from './query.getIntlCrisis.schema'

diff --git a/packages/api/router/organization/query.getNatlCrisis.handler.ts b/packages/api/router/organization/query.getNatlCrisis.handler.ts
@@ -1,8 +1,6 @@
-import superjson from 'superjson'
-import { type SuperJSONResult } from 'superjson/dist/types'
-
 import { prisma } from '@weareinreach/db'
 import { accessInstructions } from '@weareinreach/db/zod_util/attributeSupplement'
+import { superjson, type SuperJSONResult } from '@weareinreach/util/transformer'
 import { isPublic } from '~api/schemas/selects/common'
 import { type TRPCHandlerParams } from '~api/types/handler'
 

diff --git a/packages/api/router/service/query.forServiceDrawer.handler.ts b/packages/api/router/service/query.forServiceDrawer.handler.ts
@@ -1,7 +1,7 @@
 import mapObjectVals from 'just-map-values'
 
 import { prisma } from '@weareinreach/db'
-import { transformer } from '~api/lib/transformer'
+import { transformer } from '@weareinreach/util/transformer'
 import { globalSelect, globalWhere } from '~api/selects/global'
 import { type TRPCHandlerParams } from '~api/types/handler'
 

diff --git a/packages/api/router/service/query.forServiceEditDrawer.handler.ts b/packages/api/router/service/query.forServiceEditDrawer.handler.ts
@@ -1,5 +1,5 @@
 import { prisma } from '@weareinreach/db'
-import { transformer } from '~api/lib/transformer'
+import { transformer } from '@weareinreach/util/transformer'
 import { globalSelect } from '~api/selects/global'
 import { type TRPCHandlerParams } from '~api/types/handler'
 

diff --git a/packages/api/router/system/mutation.updateInactiveCountryEdgeConfig.handler.ts b/packages/api/router/system/mutation.updateInactiveCountryEdgeConfig.handler.ts
@@ -1,7 +1,6 @@
-import superjson from 'superjson'
-
 import { prisma } from '@weareinreach/db'
 import { getEnv } from '@weareinreach/env'
+import { superjson } from '@weareinreach/util/transformer'
 
 export const updateInactiveCountryEdgeConfig = async () => {
 	const active = await prisma.country.findMany({

diff --git a/packages/api/schemas/attributeSupplements/accessInstructions.ts b/packages/api/schemas/attributeSupplements/accessInstructions.ts
@@ -1,7 +1,7 @@
-import superjson from 'superjson'
-import { type SuperJSONResult } from 'superjson/dist/types'
 import { z } from 'zod'
 
+import { superjson, type SuperJSONResult } from '@weareinreach/util/transformer'
+
 const isURL = (string: string) => z.string().url().safeParse(string).success
 
 const email = z.object({

diff --git a/packages/api/schemas/common.ts b/packages/api/schemas/common.ts
@@ -1,4 +1,3 @@
-import superjson from 'superjson'
 import { z } from 'zod'
 
 import {
@@ -7,6 +6,7 @@ import {
 	JsonInputOrNull,
 	JsonNullValueInputSchema,
 } from '@weareinreach/db/zod_util'
+import { superjson } from '@weareinreach/util/transformer'
 import { nanoUrlRegex } from '~api/lib/nanoIdUrl'
 
 /**

diff --git a/packages/api/trpc/client.ts b/packages/api/trpc/client.ts
@@ -5,8 +5,8 @@ import { type inferRouterInputs, type inferRouterOutputs } from '@trpc/server'
 import { devtoolsLink } from 'trpc-client-devtools-link'
 
 import { getEnv } from '@weareinreach/env'
+import { transformer } from '@weareinreach/util/transformer'
 
-import { transformer } from '../lib/transformer'
 import { type AppRouter } from '../router'
 
 const getBaseUrl = () => {

diff --git a/packages/api/trpc/ssr.ts b/packages/api/trpc/ssr.ts
@@ -3,8 +3,8 @@ import { type GetServerSidePropsContext, type NextApiRequest, type NextApiRespon
 
 import { getServerSession } from '@weareinreach/auth/next-auth/get-session'
 import { type Session } from '@weareinreach/auth/next-auth/types'
+import { transformer } from '@weareinreach/util/transformer'
 import { createContextInner } from '~api/lib/context'
-import { transformer } from '~api/lib/transformer'
 import { appRouter } from '~api/router'
 
 interface SSRContext {

diff --git a/packages/db/lib/superjsonMiddleware.ts b/packages/db/lib/superjsonMiddleware.ts
@@ -1,9 +1,8 @@
 import { Prisma } from '@prisma/client'
-import superjson from 'superjson'
-import { type SuperJSONResult } from 'superjson/dist/types'
 import { z } from 'zod'
 
 import { createLoggerInstance } from '@weareinreach/util/logger'
+import { superjson, type SuperJSONResult } from '@weareinreach/util/transformer'
 
 import { NullableJsonValue } from './zod'
 

diff --git a/packages/db/zod_util/prismaJson.ts b/packages/db/zod_util/prismaJson.ts
@@ -1,6 +1,7 @@
-import superjson from 'superjson'
 import { z } from 'zod'
 
+import { superjson } from '@weareinreach/util/transformer'
+
 import { type Prisma } from '..'
 
 export const InputJsonValue: z.ZodType<Prisma.InputJsonValue> = z.union([

diff --git a/packages/ui/.storybook/decorators.tsx b/packages/ui/.storybook/decorators.tsx
@@ -9,7 +9,7 @@ import { StrictMode, useEffect, useState } from 'react'
 import { I18nextProvider } from 'react-i18next'
 import { devtoolsLink } from 'trpc-client-devtools-link'
 
-import { transformer } from '@weareinreach/api/lib/transformer'
+import { transformer } from '@weareinreach/util/transformer'
 import { BodyGrid } from '~ui/layouts/BodyGrid'
 import { type StorybookTRPC, trpc } from '~ui/lib/trpcClient'
 import { GoogleMapsProvider } from '~ui/providers/GoogleMaps'

diff --git a/packages/ui/components/sections/ServicesInfo.tsx b/packages/ui/components/sections/ServicesInfo.tsx
@@ -2,7 +2,7 @@ import { Card, createStyles, Group, rem, Skeleton, Stack, Text } from '@mantine/
 import { useRouter } from 'next/router'
 import { useTranslation } from 'next-i18next'
 
-import { transformer } from '@weareinreach/api/lib/transformer'
+import { transformer } from '@weareinreach/util/transformer'
 import { Badge, BadgeGroup } from '~ui/components/core/Badge'
 import { useCustomVariant, useScreenSize } from '~ui/hooks'
 import { Icon } from '~ui/icon'

diff --git a/packages/ui/lib/getTrpcMock.ts b/packages/ui/lib/getTrpcMock.ts
@@ -5,7 +5,7 @@ import path from 'path'
 import querystring from 'querystring'
 
 import { type ApiInput, type ApiOutput } from '@weareinreach/api'
-import { transformer } from '@weareinreach/api/lib/transformer'
+import { transformer } from '@weareinreach/util/transformer'
 
 import { getBaseUrl } from './trpcClient'
 import { type ErrorInput, jsonRpcErrorResponse, jsonRpcSuccessResponse } from './trpcResponse'

diff --git a/packages/ui/lib/trpcClient.ts b/packages/ui/lib/trpcClient.ts
@@ -9,8 +9,8 @@ import { createTRPCReact } from '@trpc/react-query'
 import { devtoolsLink } from 'trpc-client-devtools-link'
 
 import { type AppRouter } from '@weareinreach/api'
-import { transformer } from '@weareinreach/api/lib/transformer'
 import { getEnv } from '@weareinreach/env'
+import { transformer } from '@weareinreach/util/transformer'
 
 export const getBaseUrl = () => {
 	if (typeof window !== 'undefined') return '' // browser should use relative url

diff --git a/packages/ui/lib/trpcResponse.ts b/packages/ui/lib/trpcResponse.ts
@@ -3,7 +3,7 @@ import prettyBytes from 'pretty-bytes'
 
 import { type ApiInput, type ApiOutput } from '@weareinreach/api'
 import { getHTTPStatusCodeFromError, TRPC_ERROR_CODES_BY_KEY } from '@weareinreach/api/errorTypes'
-import { type SuperJSONResult, transformer } from '@weareinreach/api/lib/transformer'
+import { type SuperJSONResult, transformer } from '@weareinreach/util/transformer'
 
 const byteSize = (str: string) => Buffer.from(str).byteLength
 export type RpcResponse<Data> = RpcSuccessResponse<Data> | RpcErrorResponse

diff --git a/packages/util/transformer/index.ts b/packages/util/transformer/index.ts
@@ -0,0 +1,23 @@
+import { DateTime, Interval } from 'luxon'
+import superjson from 'superjson'
+
+superjson.registerCustom<DateTime, string>(
+	{
+		isApplicable: DateTime.isDateTime,
+		serialize: (v) => v.toJSON() ?? '',
+		deserialize: (v) => DateTime.fromISO(v),
+	},
+	'LuxonDateTime'
+)
+superjson.registerCustom(
+	{
+		isApplicable: Interval.isInterval,
+		serialize: (v) => v.toISO() ?? '',
+		deserialize: (v) => Interval.fromISO(v),
+	},
+	'LuxonInterval'
+)
+
+export { type SuperJSONResult } from 'superjson/dist/types'
+export const transformer = superjson
+export { superjson }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml