Merge branch 'dev' into IN-920-update-crowdin

weareinreach · Apr 24, 2024 · 5d579b8 · 5d579b8
2 parents 427d210 + 29b4663
commit 5d579b8
Show file tree

Hide file tree

Showing 203 changed files with 226 additions and 286 deletions.
diff --git a/apps/app/.eslintignore b/apps/app/.eslintignore
@@ -1 +1,2 @@
 *.spec.ts
+webpack-stats.json
diff --git a/apps/app/.gitignore b/apps/app/.gitignore
@@ -44,3 +44,5 @@ yarn-error.log*
 
 # Sentry Auth Token
 .sentryclirc
+
+webpack-stats.json
diff --git a/apps/app/.prettierignore b/apps/app/.prettierignore
@@ -12,3 +12,4 @@ pnpm-lock.yaml
 .DS_Store
 .eslintignore
 .trace/*.json
+webpack-stats.json
diff --git a/apps/app/next.config.mjs b/apps/app/next.config.mjs
@@ -67,7 +67,11 @@ const nextConfig = {
 			config.plugins = [...config.plugins, new PrismaPlugin()]
 		}
 		if (!dev && !isServer) {
-			config.plugins.push(new RelativeCiAgentWebpackPlugin())
+			config.plugins.push(
+				new RelativeCiAgentWebpackPlugin({
+					stats: { excludeAssets: [/.*\/webpack-stats\.json/, /build-manifest\.json/] },
+				})
+			)
 		}
 		if (dev && !isServer) {
 			/** WDYR */

diff --git a/apps/app/package.json b/apps/app/package.json
@@ -119,7 +119,6 @@
 		"@types/node": "20.12.7",
 		"@types/react": "18.2.79",
 		"@types/react-dom": "18.2.25",
-		"@types/umami": "0.1.5",
 		"@typescript-eslint/eslint-plugin": "7.7.1",
 		"@typescript-eslint/parser": "7.7.1",
 		"@weareinreach/config": "workspace:*",
@@ -132,7 +131,6 @@
 		"i18next-hmr": "3.1.2",
 		"listr2": "8.2.1",
 		"prettier": "3.2.5",
-		"trpc-client-devtools-link": "0.2.1-next",
 		"trpc-panel": "1.3.4",
 		"trpc-playground": "1.0.4",
 		"type-fest": "4.16.0",

diff --git a/apps/app/src/utils/api.ts b/apps/app/src/utils/api.ts
@@ -4,7 +4,6 @@ import {
 } from '@trpc/client'
 import { createTRPCNext } from '@trpc/next'
 import { type inferRouterInputs, type inferRouterOutputs } from '@trpc/server'
-import { devtoolsLink } from 'trpc-client-devtools-link'
 
 import { type AppRouter } from '@weareinreach/api'
 import { getEnv } from '@weareinreach/env'
@@ -34,9 +33,6 @@ export const api = createTRPCNext<AppRouter>({
 			links: [
 				...(isDev
 					? [
-							devtoolsLink({
-								enabled: isDev,
-							}),
 							loggerLink({
 								enabled: () => isDev,
 							}),

diff --git a/knip.config.ts b/knip.config.ts
@@ -1,4 +1,6 @@
 import { type KnipConfig } from 'knip'
 
-const config: KnipConfig = {}
+const config: KnipConfig = {
+	ignore: ['./lambdas/*/dist/*'],
+}
 export default config
diff --git a/package.json b/package.json
@@ -76,6 +76,7 @@
 			}
 		},
 		"overrides": {
+			"@tanstack/[email protected]": "@tanstack/[email protected]",
 			"better-sqlite3@<9": "^9.0.0",
 			"sourcemap-codec": "npm:@jridgewell/sourcemap-codec"
 		},

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -68,7 +68,6 @@
 		"just-pascal-case": "3.2.0",
 		"next": "14.2.2",
 		"prettier": "3.2.5",
-		"trpc-client-devtools-link": "0.2.1-next",
 		"trpc-panel": "1.3.4",
 		"type-fest": "4.16.0",
 		"typescript": "5.4.5"

diff --git a/packages/api/router/attribute/query.getFilterOptions.handler.ts b/packages/api/router/attribute/query.getFilterOptions.handler.ts
@@ -1,6 +1,6 @@
 import { prisma } from '@weareinreach/db'
 
-export const getFilterOptions = async () => {
+const getFilterOptions = async () => {
 	const result = await prisma.attribute.findMany({
 		where: {
 			AND: {

diff --git a/packages/api/router/attribute/query.getOne.handler.ts b/packages/api/router/attribute/query.getOne.handler.ts
@@ -3,7 +3,7 @@ import { type TRPCHandlerParams } from '~api/types/handler'
 
 import { type TGetOneSchema } from './query.getOne.schema'
 
-export const getOne = async ({ input }: TRPCHandlerParams<TGetOneSchema>) => {
+const getOne = async ({ input }: TRPCHandlerParams<TGetOneSchema>) => {
 	const result = await prisma.attribute.findUniqueOrThrow({
 		where: input,
 		select: {

diff --git a/packages/api/router/attribute/query.map.handler.ts b/packages/api/router/attribute/query.map.handler.ts
@@ -4,7 +4,7 @@ import { prisma } from '@weareinreach/db'
 import { handleError } from '~api/lib/errorHandler'
 import { type TRPCHandlerParams } from '~api/types/handler'
 
-export const map = async ({ ctx: _ }: TRPCHandlerParams) => {
+const map = async ({ ctx: _ }: TRPCHandlerParams) => {
 	try {
 		const result = await prisma.attribute.findMany({
 			where: {

diff --git a/packages/api/router/component/mutation.AttributeEditWrapper.handler.ts b/packages/api/router/component/mutation.AttributeEditWrapper.handler.ts
@@ -4,7 +4,7 @@ import { type TRPCHandlerParams } from '~api/types/handler'
 
 import { type TAttributeEditWrapperSchema } from './mutation.AttributeEditWrapper.schema'
 
-export const AttributeEditWrapper = async ({
+const AttributeEditWrapper = async ({
 	ctx,
 	input,
 }: TRPCHandlerParams<TAttributeEditWrapperSchema, 'protected'>) => {

diff --git a/packages/api/router/component/mutation.EditModeBarDelete.handler.ts b/packages/api/router/component/mutation.EditModeBarDelete.handler.ts
@@ -4,7 +4,7 @@ import { type TRPCHandlerParams } from '~api/types/handler'
 
 import { type TEditModeBarDeleteSchema } from './mutation.EditModeBarDelete.schema'
 
-export const EditModeBarDelete = async ({
+const EditModeBarDelete = async ({
 	ctx,
 	input,
 }: TRPCHandlerParams<TEditModeBarDeleteSchema, 'protected'>) => {

diff --git a/packages/api/router/component/mutation.EditModeBarPublish.handler.ts b/packages/api/router/component/mutation.EditModeBarPublish.handler.ts
@@ -4,7 +4,7 @@ import { type TRPCHandlerParams } from '~api/types/handler'
 
 import { type TEditModeBarPublishSchema } from './mutation.EditModeBarPublish.schema'
 
-export const EditModeBarPublish = async ({
+const EditModeBarPublish = async ({
 	ctx,
 	input,
 }: TRPCHandlerParams<TEditModeBarPublishSchema, 'protected'>) => {

diff --git a/packages/api/router/component/mutation.EditModeBarReverify.handler.ts b/packages/api/router/component/mutation.EditModeBarReverify.handler.ts
@@ -4,7 +4,7 @@ import { type TRPCHandlerParams } from '~api/types/handler'
 
 import { type TEditModeBarReverifySchema } from './mutation.EditModeBarReverify.schema'
 
-export const EditModeBarReverify = async ({
+const EditModeBarReverify = async ({
 	ctx,
 	input,
 }: TRPCHandlerParams<TEditModeBarReverifySchema, 'protected'>) => {

diff --git a/packages/api/router/component/query.EditModeBar.handler.ts b/packages/api/router/component/query.EditModeBar.handler.ts
@@ -4,7 +4,7 @@ import { type TRPCHandlerParams } from '~api/types/handler'
 
 import { type TEditModeBarSchema } from './query.EditModeBar.schema'
 
-export const EditModeBar = async ({ input }: TRPCHandlerParams<TEditModeBarSchema>) => {
+const EditModeBar = async ({ input }: TRPCHandlerParams<TEditModeBarSchema>) => {
 	try {
 		const { orgLocationId, orgServiceId, slug } = input
 

diff --git a/packages/api/router/component/query.ServiceSelect.handler.ts b/packages/api/router/component/query.ServiceSelect.handler.ts
@@ -2,7 +2,7 @@ import { prisma } from '@weareinreach/db'
 import { handleError } from '~api/lib/errorHandler'
 import { type TRPCHandlerParams } from '~api/types/handler'
 
-export const ServiceSelect = async ({ ctx: _ctx }: TRPCHandlerParams) => {
+const ServiceSelect = async ({ ctx: _ctx }: TRPCHandlerParams) => {
 	try {
 		const result = await prisma.serviceCategory.findMany({
 			where: {

diff --git a/packages/api/router/component/query.serviceModal.handler.ts b/packages/api/router/component/query.serviceModal.handler.ts
@@ -4,7 +4,7 @@ import { type TRPCHandlerParams } from '~api/types/handler'
 
 import { type TServiceModalSchema } from './query.serviceModal.schema'
 
-export const serviceModal = async ({ ctx, input }: TRPCHandlerParams<TServiceModalSchema>) => {
+const serviceModal = async ({ ctx, input }: TRPCHandlerParams<TServiceModalSchema>) => {
 	try {
 		return null
 	} catch (error) {

diff --git a/packages/api/router/fieldOpt/query.attributeCategories.handler.ts b/packages/api/router/fieldOpt/query.attributeCategories.handler.ts
@@ -3,7 +3,7 @@ import { type TRPCHandlerParams } from '~api/types/handler'
 
 import { type TAttributeCategoriesSchema } from './query.attributeCategories.schema'
 
-export const attributeCategories = async ({ input }: TRPCHandlerParams<TAttributeCategoriesSchema>) => {
+const attributeCategories = async ({ input }: TRPCHandlerParams<TAttributeCategoriesSchema>) => {
 	const results = await prisma.attributeCategory.findMany({
 		where: { active: true, ...(input?.length ? { tag: { in: input } } : {}) },
 		select: {

diff --git a/packages/api/router/fieldOpt/query.attributesByCategory.handler.ts b/packages/api/router/fieldOpt/query.attributesByCategory.handler.ts
@@ -14,7 +14,7 @@ const validateJsonSchema = (schema: unknown): schema is JSONSchemaType<unknown>
 	return false
 }
 
-export const attributesByCategory = async ({ input }: TRPCHandlerParams<TAttributesByCategorySchema>) => {
+const attributesByCategory = async ({ input }: TRPCHandlerParams<TAttributesByCategorySchema>) => {
 	console.log(input)
 	const result = await prisma.attributesByCategory.findMany({
 		where: {

diff --git a/packages/api/router/fieldOpt/query.ccaMap.handler.ts b/packages/api/router/fieldOpt/query.ccaMap.handler.ts
@@ -4,7 +4,7 @@ import { type TRPCHandlerParams } from '~api/types/handler'
 
 import { type TCcaMapSchema } from './query.ccaMap.schema'
 
-export const ccaMap = async ({ input }: TRPCHandlerParams<TCcaMapSchema>) => {
+const ccaMap = async ({ input }: TRPCHandlerParams<TCcaMapSchema>) => {
 	try {
 		const data = await prisma.country.findMany({
 			where: input.activeForOrgs

diff --git a/packages/api/router/fieldOpt/query.countries.handler.ts b/packages/api/router/fieldOpt/query.countries.handler.ts
@@ -3,7 +3,7 @@ import { type TRPCHandlerParams } from '~api/types/handler'
 
 import { type TCountriesSchema } from './query.countries.schema'
 
-export const countries = async ({ input }: TRPCHandlerParams<TCountriesSchema>) => {
+const countries = async ({ input }: TRPCHandlerParams<TCountriesSchema>) => {
 	const { where } = input ?? {}
 	const result = await prisma.country.findMany({
 		where,

diff --git a/packages/api/router/fieldOpt/query.countryGovDistMap.handler.ts b/packages/api/router/fieldOpt/query.countryGovDistMap.handler.ts
@@ -1,6 +1,6 @@
 import { prisma } from '@weareinreach/db'
 
-export const countryGovDistMap = async () => {
+const countryGovDistMap = async () => {
 	const fields = { id: true, tsKey: true, tsNs: true }
 
 	const countries = await prisma.country.findMany({

diff --git a/packages/api/router/fieldOpt/query.getSubDistricts.handler.ts b/packages/api/router/fieldOpt/query.getSubDistricts.handler.ts
@@ -4,7 +4,7 @@ import { type TRPCHandlerParams } from '~api/types/handler'
 
 import { type TGetSubDistrictsSchema } from './query.getSubDistricts.schema'
 
-export const getSubDistricts = async ({ input }: TRPCHandlerParams<TGetSubDistrictsSchema>) => {
+const getSubDistricts = async ({ input }: TRPCHandlerParams<TGetSubDistrictsSchema>) => {
 	try {
 		const results = await prisma.govDist.findMany({
 			where: {

diff --git a/packages/api/router/fieldOpt/query.govDists.handler.ts b/packages/api/router/fieldOpt/query.govDists.handler.ts
@@ -4,7 +4,7 @@ import { type TRPCHandlerParams } from '~api/types/handler'
 
 import { type TGovDistsSchema } from './query.govDists.schema'
 
-export const govDists = async ({ input }: TRPCHandlerParams<TGovDistsSchema>) => {
+const govDists = async ({ input }: TRPCHandlerParams<TGovDistsSchema>) => {
 	try {
 		const results = await prisma.govDist.findMany({
 			where: input,

diff --git a/packages/api/router/fieldOpt/query.govDistsByCountry.handler.ts b/packages/api/router/fieldOpt/query.govDistsByCountry.handler.ts
@@ -3,7 +3,7 @@ import { type TRPCHandlerParams } from '~api/types/handler'
 
 import { type TGovDistsByCountrySchema } from './query.govDistsByCountry.schema'
 
-export const govDistsByCountry = async ({ input }: TRPCHandlerParams<TGovDistsByCountrySchema>) => {
+const govDistsByCountry = async ({ input }: TRPCHandlerParams<TGovDistsByCountrySchema>) => {
 	const data = await prisma.country.findMany({
 		where: {
 			cca2: input?.cca2,

diff --git a/packages/api/router/fieldOpt/query.govDistsByCountryNoSub.handler.ts b/packages/api/router/fieldOpt/query.govDistsByCountryNoSub.handler.ts
@@ -3,7 +3,7 @@ import { type TRPCHandlerParams } from '~api/types/handler'
 
 import { type TGovDistsByCountryNoSubSchema } from './query.govDistsByCountryNoSub.schema'
 
-export const govDistsByCountryNoSub = async ({ input }: TRPCHandlerParams<TGovDistsByCountryNoSubSchema>) => {
+const govDistsByCountryNoSub = async ({ input }: TRPCHandlerParams<TGovDistsByCountryNoSubSchema>) => {
 	const data = await prisma.country.findMany({
 		where: {
 			cca2: input?.cca2,

diff --git a/packages/api/router/fieldOpt/query.languages.handler.ts b/packages/api/router/fieldOpt/query.languages.handler.ts
@@ -3,7 +3,7 @@ import { type TRPCHandlerParams } from '~api/types/handler'
 
 import { type TLanguagesSchema } from './query.languages.schema'
 
-export const languages = async ({ input }: TRPCHandlerParams<TLanguagesSchema>) => {
+const languages = async ({ input }: TRPCHandlerParams<TLanguagesSchema>) => {
 	const results = await prisma.language.findMany({
 		where: input,
 		select: {

diff --git a/packages/api/router/fieldOpt/query.orgBadges.handler.ts b/packages/api/router/fieldOpt/query.orgBadges.handler.ts
@@ -4,7 +4,7 @@ import { type TRPCHandlerParams } from '~api/types/handler'
 
 import { type TOrgBadgesSchema } from './query.orgBadges.schema'
 
-export const orgBadges = async ({ input }: TRPCHandlerParams<TOrgBadgesSchema>) => {
+const orgBadges = async ({ input }: TRPCHandlerParams<TOrgBadgesSchema>) => {
 	try {
 		const badges = await prisma.attribute.findMany({
 			where: {

diff --git a/packages/api/router/fieldOpt/query.phoneTypes.handler.ts b/packages/api/router/fieldOpt/query.phoneTypes.handler.ts
@@ -1,6 +1,6 @@
 import { prisma } from '@weareinreach/db'
 
-export const phoneTypes = async () => {
+const phoneTypes = async () => {
 	const result = await prisma.phoneType.findMany({
 		where: { active: true },
 		select: {

diff --git a/packages/api/router/fieldOpt/query.userTitle.handler.ts b/packages/api/router/fieldOpt/query.userTitle.handler.ts
@@ -1,6 +1,6 @@
 import { prisma } from '@weareinreach/db'
 
-export const userTitle = async () => {
+const userTitle = async () => {
 	const results = await prisma.userTitle.findMany({
 		where: { searchable: true },
 		select: { id: true, title: true },

diff --git a/packages/api/router/geo/query.autocomplete.handler.ts b/packages/api/router/geo/query.autocomplete.handler.ts
@@ -24,7 +24,7 @@ const getTypes = (input: TAutocompleteSchema): PlaceAutocompleteType => {
 	] as unknown as PlaceAutocompleteType
 }
 
-export const autocomplete = async ({ input }: TRPCHandlerParams<TAutocompleteSchema>) => {
+const autocomplete = async ({ input }: TRPCHandlerParams<TAutocompleteSchema>) => {
 	const types = getTypes(input)
 
 	const { data } = await googleMapsApi.placeAutocomplete({

diff --git a/packages/api/router/geo/query.geoByPlaceId.handler.ts b/packages/api/router/geo/query.geoByPlaceId.handler.ts
@@ -6,7 +6,7 @@ import { type TRPCHandlerParams } from '~api/types/handler'
 
 import { type TGeoByPlaceIdSchema } from './query.geoByPlaceId.schema'
 
-export const geoByPlaceId = async ({ input }: TRPCHandlerParams<TGeoByPlaceIdSchema>) => {
+const geoByPlaceId = async ({ input }: TRPCHandlerParams<TGeoByPlaceIdSchema>) => {
 	const { data } = await googleMapsApi.geocode({
 		params: {
 			key: process.env.GOOGLE_PLACES_API_KEY as string,

diff --git a/packages/api/router/internalNote/mutation.create.handler.ts b/packages/api/router/internalNote/mutation.create.handler.ts
@@ -3,7 +3,7 @@ import { type TRPCHandlerParams } from '~api/types/handler'
 
 import { type TCreateSchema } from './mutation.create.schema'
 
-export const create = async ({ ctx, input }: TRPCHandlerParams<TCreateSchema, 'protected'>) => {
+const create = async ({ ctx, input }: TRPCHandlerParams<TCreateSchema, 'protected'>) => {
 	const prisma = getAuditedClient(ctx.actorId)
 	const { id } = await prisma.internalNote.create(input)
 

diff --git a/packages/api/router/internalNote/query.byId.handler.ts b/packages/api/router/internalNote/query.byId.handler.ts
@@ -3,7 +3,7 @@ import { type TRPCHandlerParams } from '~api/types/handler'
 
 import { type TByIdSchema } from './query.byId.schema'
 
-export const byId = async ({ input }: TRPCHandlerParams<TByIdSchema, 'protected'>) => {
+const byId = async ({ input }: TRPCHandlerParams<TByIdSchema, 'protected'>) => {
 	const result = await prisma.internalNote.findFirstOrThrow({ where: { id: input } })
 	return result
 }

diff --git a/packages/api/router/internalNote/query.getAllForRecord.handler.ts b/packages/api/router/internalNote/query.getAllForRecord.handler.ts
@@ -3,7 +3,7 @@ import { type TRPCHandlerParams } from '~api/types/handler'
 
 import { type TGetAllForRecordSchema } from './query.getAllForRecord.schema'
 
-export const getAllForRecord = async ({ input }: TRPCHandlerParams<TGetAllForRecordSchema, 'protected'>) => {
+const getAllForRecord = async ({ input }: TRPCHandlerParams<TGetAllForRecordSchema, 'protected'>) => {
 	const results = prisma.internalNote.findMany({ where: input })
 	return results
 }

diff --git a/packages/api/router/location/mutation.create.handler.ts b/packages/api/router/location/mutation.create.handler.ts
@@ -3,7 +3,7 @@ import { type TRPCHandlerParams } from '~api/types/handler'
 
 import { type TCreateSchema } from './mutation.create.schema'
 
-export const create = async ({ ctx, input }: TRPCHandlerParams<TCreateSchema, 'protected'>) => {
+const create = async ({ ctx, input }: TRPCHandlerParams<TCreateSchema, 'protected'>) => {
 	const prisma = getAuditedClient(ctx.actorId)
 	const result = await prisma.orgLocation.create(input)
 

diff --git a/packages/api/router/location/mutation.update.handler.ts b/packages/api/router/location/mutation.update.handler.ts
@@ -3,7 +3,7 @@ import { type TRPCHandlerParams } from '~api/types/handler'
 
 import { type TUpdateSchema } from './mutation.update.schema'
 
-export const update = async ({ ctx, input }: TRPCHandlerParams<TUpdateSchema, 'protected'>) => {
+const update = async ({ ctx, input }: TRPCHandlerParams<TUpdateSchema, 'protected'>) => {
 	const prisma = getAuditedClient(ctx.actorId)
 	const { where, data } = input
 

diff --git a/packages/api/router/location/query.forGoogleMaps.handler.ts b/packages/api/router/location/query.forGoogleMaps.handler.ts
@@ -21,7 +21,7 @@ const getCenter = (coords: { latitude: number; longitude: number }[]): google.ma
 	return { lat: center.latitude, lng: center.longitude }
 }
 
-export const forGoogleMaps = async ({ input }: TRPCHandlerParams<TForGoogleMapsSchema>) => {
+const forGoogleMaps = async ({ input }: TRPCHandlerParams<TForGoogleMapsSchema>) => {
 	const result = await prisma.orgLocation.findMany({
 		where: {
 			...globalWhere.isPublic(),

diff --git a/packages/api/router/location/query.forLocationCard.handler.ts b/packages/api/router/location/query.forLocationCard.handler.ts
@@ -4,7 +4,7 @@ import { type TRPCHandlerParams } from '~api/types/handler'
 
 import { type TForLocationCardSchema } from './query.forLocationCard.schema'
 
-export const forLocationCard = async ({ input }: TRPCHandlerParams<TForLocationCardSchema>) => {
+const forLocationCard = async ({ input }: TRPCHandlerParams<TForLocationCardSchema>) => {
 	const result = await prisma.orgLocation.findUniqueOrThrow({
 		where: {
 			id: input,

diff --git a/packages/api/router/location/query.forLocationPage.handler.ts b/packages/api/router/location/query.forLocationPage.handler.ts
@@ -5,7 +5,7 @@ import { type TRPCHandlerParams } from '~api/types/handler'
 
 import { type TForLocationPageSchema } from './query.forLocationPage.schema'
 
-export const forLocationPage = async ({ input }: TRPCHandlerParams<TForLocationPageSchema>) => {
+const forLocationPage = async ({ input }: TRPCHandlerParams<TForLocationPageSchema>) => {
 	const location = await prisma.orgLocation.findUniqueOrThrow({
 		where: {
 			id: input.id,

diff --git a/packages/api/router/location/query.forLocationPageEdits.handler.ts b/packages/api/router/location/query.forLocationPageEdits.handler.ts
@@ -5,7 +5,7 @@ import { type TRPCHandlerParams } from '~api/types/handler'
 
 import { type TForLocationPageEditsSchema } from './query.forLocationPageEdits.schema'
 
-export const forLocationPageEdits = async ({ input }: TRPCHandlerParams<TForLocationPageEditsSchema>) => {
+const forLocationPageEdits = async ({ input }: TRPCHandlerParams<TForLocationPageEditsSchema>) => {
 	try {
 		const location = await prisma.orgLocation.findUniqueOrThrow({
 			where: {

diff --git a/packages/api/router/location/query.forVisitCard.handler.ts b/packages/api/router/location/query.forVisitCard.handler.ts
@@ -5,7 +5,7 @@ import { type TRPCHandlerParams } from '~api/types/handler'
 
 import { type TForVisitCardSchema } from './query.forVisitCard.schema'
 
-export const forVisitCard = async ({ input }: TRPCHandlerParams<TForVisitCardSchema>) => {
+const forVisitCard = async ({ input }: TRPCHandlerParams<TForVisitCardSchema>) => {
 	try {
 		const result = await prisma.orgLocation.findUnique({
 			where: {