Skip to content

Commit

Permalink
release: 2023-08-17 (#727)
Browse files Browse the repository at this point in the history
PR-URL: #727
Co-authored-by: Joe Karow <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
  • Loading branch information
3 people authored Aug 18, 2023
2 parents 3da861f + 1a4eb64 commit 8dc0900
Show file tree
Hide file tree
Showing 31 changed files with 1,571 additions and 1,271 deletions.
8 changes: 1 addition & 7 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,7 @@
"packageRules": [
{
"groupName": "patched packages",
"matchPackageNames": [
"@crowdin/ota-client",
"eslint-plugin-node",
"iso-google-locales",
"trpc-panel",
"next-auth"
],
"matchPackageNames": ["@crowdin/ota-client", "eslint-plugin-node", "iso-google-locales", "trpc-panel"],
"matchUpdateTypes": ["major", "minor", "patch"]
}
],
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
with:
fetch-depth: 0
- name: Install Node.js
uses: actions/setup-node@bea5baf987ba7aa777a8a0b4ace377a21c45c381 # v3
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3
with:
node-version: 18
- uses: pnpm/action-setup@d882d12c64e032187b2edb46d3a0d003b7a43598 # v2.4.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
git_commit_gpgsign: true

- name: Install Node.js
uses: actions/setup-node@bea5baf987ba7aa777a8a0b4ace377a21c45c381 # v3
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3
with:
node-version: 18

Expand Down
11 changes: 11 additions & 0 deletions @types/locale-includes/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
declare module 'locale-includes' {
declare function localeIncludes(
string: string,
searchString: string,
options?: {
position?: number
locales?: string | string[]
} & Intl.CollatorOptions
): boolean
// export = localeIncludes
}
16 changes: 8 additions & 8 deletions apps/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@mantine/spotlight": "6.0.19",
"@mantine/tiptap": "6.0.19",
"@mantine/utils": "6.0.19",
"@next/bundle-analyzer": "13.4.16",
"@next/bundle-analyzer": "13.4.17",
"@opentelemetry/api": "1.4.1",
"@opentelemetry/exporter-trace-otlp-http": "0.41.2",
"@opentelemetry/instrumentation": "0.41.2",
Expand All @@ -60,9 +60,9 @@
"@sentry/opentelemetry-node": "7.64.0",
"@tanstack/react-query": "4.32.6",
"@tanstack/react-table": "8.9.3",
"@tiptap/extension-link": "2.0.4",
"@tiptap/react": "2.0.4",
"@tiptap/starter-kit": "2.0.4",
"@tiptap/extension-link": "2.1.1",
"@tiptap/react": "2.1.1",
"@tiptap/starter-kit": "2.1.1",
"@trpc/client": "10.37.1",
"@trpc/next": "10.37.1",
"@trpc/react-query": "10.37.1",
Expand Down Expand Up @@ -96,8 +96,8 @@
"just-compact": "3.2.0",
"just-compare": "2.3.0",
"luxon": "3.4.0",
"next": "13.4.16",
"next-auth": "4.23.0",
"next": "13.4.17",
"next-auth": "4.23.1",
"next-i18next": "14.0.0",
"next-seo": "6.1.0",
"nextjs-routes": "2.0.1",
Expand All @@ -108,14 +108,14 @@
"react-error-boundary": "4.0.11",
"react-i18next": "13.1.2",
"tslog": "4.9.1",
"zod": "3.22.0"
"zod": "3.22.1"
},
"devDependencies": {
"@playwright/test": "1.37.0",
"@prisma/nextjs-monorepo-workaround-plugin": "5.1.1",
"@tanstack/react-query-devtools": "4.32.6",
"@tanstack/react-table-devtools": "8.7.6",
"@total-typescript/ts-reset": "0.4.2",
"@total-typescript/ts-reset": "0.5.1",
"@types/eslint": "8.44.2",
"@types/flat": "5.0.2",
"@types/luxon": "3.3.1",
Expand Down
2 changes: 1 addition & 1 deletion apps/app/public/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
"no-results-adjust": "No results found for your search. Try adjusting your selected location or filters.",
"organization-placeholder": "Enter organization name...",
"organization-placeholder-searchby": "Search by organization name...",
"suggest-resource": "Can't find it? <1>Suggest an organization</1> you think should be included."
"suggest-resource": "Can't find it? <strong>Suggest an organization</strong> you think should be included."
},
"send-email": "Send email",
"service": {
Expand Down
10 changes: 5 additions & 5 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@
"@mantine/prism": "6.0.19",
"@mantine/spotlight": "6.0.19",
"@mantine/tiptap": "6.0.19",
"@tiptap/extension-link": "2.0.4",
"@tiptap/react": "2.0.4",
"@tiptap/starter-kit": "2.0.4",
"@tiptap/extension-link": "2.1.1",
"@tiptap/react": "2.1.1",
"@tiptap/starter-kit": "2.1.1",
"@weareinreach/env": "workspace:*",
"@weareinreach/ui": "workspace:*",
"dayjs": "1.11.9",
"embla-carousel-react": "7.1.0",
"i18next": "23.4.4",
"next": "13.4.16",
"next": "13.4.17",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-i18next": "13.1.2"
},
"devDependencies": {
"@next/bundle-analyzer": "13.4.16",
"@next/bundle-analyzer": "13.4.17",
"@types/eslint": "8.44.2",
"@types/node": "18.17.5",
"@types/react": "18.2.20",
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,7 @@
"@crowdin/[email protected]": "patches/@[email protected]",
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]"
"[email protected]": "patches/[email protected]"
},
"peerDependencyRules": {
"allowedVersions": {
Expand Down
6 changes: 3 additions & 3 deletions packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"superjson": "1.13.1",
"tiny-invariant": "1.3.1",
"tslog": "4.9.1",
"zod": "3.22.0"
"zod": "3.22.1"
},
"devDependencies": {
"@types/eslint": "8.44.2",
Expand All @@ -62,12 +62,12 @@
"@types/terraformer__wkt": "2.0.0",
"@weareinreach/config": "workspace:*",
"@weareinreach/eslint-config": "0.100.0",
"dotenv-cli": "7.2.1",
"dotenv-cli": "7.3.0",
"eslint": "8.47.0",
"just-capitalize": "3.2.0",
"just-pascal-case": "3.2.0",
"listr2": "6.6.1",
"next": "13.4.16",
"next": "13.4.17",
"p-queue": "7.3.4",
"prettier": "3.0.2",
"prisma": "5.1.1",
Expand Down
12 changes: 12 additions & 0 deletions packages/api/router/organization/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ type OrganizationHandlerCache = {
slugRedirect: typeof import('./query.slugRedirect.handler').slugRedirect
getIntlCrisis: typeof import('./query.getIntlCrisis.handler').getIntlCrisis
getNatlCrisis: typeof import('./query.getNatlCrisis.handler').getNatlCrisis
forOrganizationTable: typeof import('./query.forOrganizationTable.handler').forOrganizationTable
// #endregion

//
Expand Down Expand Up @@ -162,6 +163,17 @@ export const orgRouter = defineRouter({
if (!HandlerCache.getNatlCrisis) throw new Error('Failed to load handler')
return HandlerCache.getNatlCrisis({ ctx, input })
}),
forOrganizationTable: publicProcedure
.input(schema.ZForOrganizationTableSchema)
.query(async ({ ctx, input }) => {
if (!HandlerCache.forOrganizationTable)
HandlerCache.forOrganizationTable = await import('./query.forOrganizationTable.handler').then(
(mod) => mod.forOrganizationTable
)

if (!HandlerCache.forOrganizationTable) throw new Error('Failed to load handler')
return HandlerCache.forOrganizationTable({ ctx, input })
}),

// #endregion

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import { prisma } from '@weareinreach/db'
import { type TRPCHandlerParams } from '~api/types/handler'

import { type TForOrganizationTableSchema } from './query.forOrganizationTable.schema'

export const forOrganizationTable = async ({ input }: TRPCHandlerParams<TForOrganizationTableSchema>) => {
const results = await prisma.organization.findMany({
where: input,
select: {
id: true,
name: true,
slug: true,
lastVerified: true,
updatedAt: true,
createdAt: true,
published: true,
deleted: true,
locations: {
select: {
id: true,
name: true,
updatedAt: true,
createdAt: true,
published: true,
deleted: true,
},
},
},
orderBy: [{ deleted: 'desc' }, { name: 'asc' }],
})
return results
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { z } from 'zod'

export const ZForOrganizationTableSchema = z
.object({
published: z.boolean(),
deleted: z.boolean(),
})
.partial()
.optional()
export type TForOrganizationTableSchema = z.infer<typeof ZForOrganizationTableSchema>
1 change: 1 addition & 0 deletions packages/api/router/organization/schemas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export * from './mutation.createNewQuick.schema'
export * from './mutation.createNewSuggestion.schema'
export * from './query.checkForExisting.schema'
export * from './query.forLocationPage.schema'
export * from './query.forOrganizationTable.schema'
export * from './query.forOrgPage.schema'
export * from './query.generateSlug.schema'
export * from './query.getById.schema'
Expand Down
6 changes: 3 additions & 3 deletions packages/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"aws-jwt-verify": "4.0.0",
"tiny-invariant": "1.3.1",
"tslog": "4.9.1",
"zod": "3.22.0"
"zod": "3.22.1"
},
"devDependencies": {
"@types/eslint": "8.44.2",
Expand All @@ -32,8 +32,8 @@
"@weareinreach/config": "workspace:*",
"@weareinreach/eslint-config": "0.100.0",
"eslint": "8.47.0",
"next": "13.4.16",
"next-auth": "4.23.0",
"next": "13.4.17",
"next-auth": "4.23.1",
"react": "18.2.0",
"react-dom": "18.2.0",
"typescript": "5.1.6"
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cache/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"flat": "5.0.2",
"ioredis": "5.3.2",
"tslog": "4.9.1",
"zod": "3.22.0"
"zod": "3.22.1"
},
"devDependencies": {
"@types/aws-lambda": "8.10.119",
Expand Down
6 changes: 3 additions & 3 deletions packages/db/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@
"just-safe-set": "4.2.1",
"just-sort-by": "3.2.0",
"kysely": "0.26.1",
"pg": "8.11.2",
"pg": "8.11.3",
"prisma-kysely": "1.5.0",
"sql-bricks": "3.0.1",
"superjson": "1.13.1",
"tslog": "4.9.1",
"ulid": "2.3.0",
"zod": "3.22.0"
"zod": "3.22.1"
},
"devDependencies": {
"@faker-js/faker": "8.0.2",
Expand Down Expand Up @@ -107,7 +107,7 @@
"commander": "11.0.0",
"countries-languages": "1.0.3",
"dotenv": "16.3.1",
"dotenv-cli": "7.2.1",
"dotenv-cli": "7.3.0",
"eslint": "8.47.0",
"flat": "5.0.2",
"geojson": "0.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/env/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@t3-oss/env-nextjs": "0.6.0",
"@weareinreach/util": "workspace:*",
"chromatic": "6.22.0",
"zod": "3.22.0"
"zod": "3.22.1"
},
"devDependencies": {
"@weareinreach/config": "workspace:*"
Expand Down
8 changes: 4 additions & 4 deletions packages/eslint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,26 @@
"preinstall": "npx only-allow pnpm"
},
"devDependencies": {
"@next/eslint-plugin-next": "13.4.16",
"@next/eslint-plugin-next": "13.4.17",
"@tanstack/eslint-plugin-query": "4.32.5",
"@types/eslint": "8.44.2",
"@types/eslint-config-prettier": "6.11.0",
"@types/node": "18.17.5",
"@typescript-eslint/eslint-plugin": "6.4.0",
"@typescript-eslint/parser": "6.4.0",
"eslint": "8.47.0",
"eslint-config-next": "13.4.16",
"eslint-config-next": "13.4.17",
"eslint-config-prettier": "9.0.0",
"eslint-formatter-github": "1.1.4",
"eslint-import-resolver-typescript": "3.6.0",
"eslint-plugin-codegen": "0.17.0",
"eslint-plugin-i18next": "6.0.3",
"eslint-plugin-import": "2.28.0",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-react": "7.33.1",
"eslint-plugin-react": "7.33.2",
"eslint-plugin-storybook": "0.6.13",
"eslint-plugin-turbo": "1.10.12",
"next": "13.4.16",
"next": "13.4.17",
"resolve-pkg-maps": "1.0.0",
"typescript": "5.1.6"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/.storybook/decorators.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export const Layouts = (Story: StoryFn, context: StoryContext) => {
switch (layoutWrapper) {
case 'centeredFullscreen': {
return (
<Center h='100vh'>
<Center h='100vh' w='100vw'>
<Story />
</Center>
)
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/.storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const config: StorybookConfig = {
options: {
builder: {
lazyCompilation: Boolean(process.env.SB_LAZY),
fsCache: Boolean(process.env.SB_CACHE),
fsCache: true, // Boolean(process.env.SB_CACHE),
useSWC: true,
},
nextConfigPath: path.resolve(__dirname, '../../../apps/app/next.config.mjs'),
Expand Down
Loading

1 comment on commit 8dc0900

@vercel
Copy link

@vercel vercel bot commented on 8dc0900 Aug 18, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.