Skip to content

Commit

Permalink
release: 2024-03-28 (#1192)
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Mar 28, 2024
2 parents 027a356 + d8400b4 commit 32aeac8
Show file tree
Hide file tree
Showing 14 changed files with 586 additions and 586 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.11.1
20.12.0
12 changes: 6 additions & 6 deletions apps/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
"react-dom": "18.2.0",
"react-error-boundary": "4.0.13",
"react-hook-consent": "3.5.3",
"react-hook-form": "7.51.1",
"react-hook-form": "7.51.2",
"react-hook-form-mantine": "2.0.0",
"react-i18next": "14.1.0",
"zod": "3.22.4"
Expand All @@ -115,11 +115,11 @@
"@types/gtag.js": "0.0.19",
"@types/luxon": "3.4.2",
"@types/node": "20.11.30",
"@types/react": "18.2.67",
"@types/react": "18.2.73",
"@types/react-dom": "18.2.22",
"@types/umami": "0.1.5",
"@typescript-eslint/eslint-plugin": "7.3.1",
"@typescript-eslint/parser": "7.3.1",
"@typescript-eslint/eslint-plugin": "7.4.0",
"@typescript-eslint/parser": "7.4.0",
"@weareinreach/config": "workspace:*",
"@weareinreach/eslint-config": "0.100.0",
"@welldone-software/why-did-you-render": "8.0.1",
Expand All @@ -128,12 +128,12 @@
"eslint": "8.57.0",
"eslint-plugin-i18next": "6.0.3",
"i18next-hmr": "3.0.4",
"listr2": "8.0.2",
"listr2": "8.1.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.13.1",
"type-fest": "4.14.0",
"typescript": "5.4.3",
"webpack-bundle-analyzer": "4.10.1"
},
Expand Down
39 changes: 21 additions & 18 deletions apps/app/src/pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ import { type AppProps, type NextWebVitalsMetric } from 'next/app'
import dynamic from 'next/dynamic'
import Head from 'next/head'
import { useRouter } from 'next/router'
import Script from 'next/script'
import { type Session } from 'next-auth'
import { appWithTranslation, type UserConfig } from 'next-i18next'
import { appWithTranslation } from 'next-i18next'
import { DefaultSeo, type DefaultSeoProps } from 'next-seo'
import { GoogleAnalytics } from 'nextjs-google-analytics'

Expand Down Expand Up @@ -51,27 +52,24 @@ export function reportWebVitals(stats: NextWebVitalsMetric) {
appEvent.webVitals(stats)
}

const PageContent = ({ Component, ...pageProps }: AppPropsWithGridSwitch) => {
const router = useRouter()
const autoResetState = Component.autoResetState ? { key: router.asPath } : {}
return Component.omitGrid ? (
<Component {...autoResetState} {...pageProps} />
) : (
<BodyGrid>
<Component {...autoResetState} {...pageProps} />
</BodyGrid>
)
}

const MyApp = (appProps: AppPropsWithGridSwitch) => {
const {
Component,
pageProps: { session, ...pageProps },
pageProps: { session },
} = appProps

const router = useRouter()

const { isMobile, isTablet } = useScreenSize()

const autoResetState = Component.autoResetState ? { key: router.asPath } : {}

const PageContent = () =>
Component.omitGrid ? (
<Component {...autoResetState} {...pageProps} />
) : (
<BodyGrid>
<Component {...autoResetState} {...pageProps} />
</BodyGrid>
)

return (
<>
<Head>
Expand All @@ -80,9 +78,14 @@ const MyApp = (appProps: AppPropsWithGridSwitch) => {
<Providers session={session}>
<DefaultSeo {...defaultSEO} />
<GoogleAnalytics trackPageViews defaultConsent='granted' />
<Script id='gtm_conversion'>
{`
gtag?.('config','G-RL8CR7T4EP')
`}
</Script>
<PageLoadProgress />
<Navbar />
<PageContent />
<PageContent {...appProps} />
{(isMobile || isTablet) && <Space h={80} />}
<Footer />
<Notifications transitionDuration={500} />
Expand Down
8 changes: 4 additions & 4 deletions apps/app/src/pages/_document.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { createStylesServer, ServerStyles } from '@mantine/next'
import Document, { type DocumentContext, Head, Html, Main, NextScript } from 'next/document'
import NextDocument, { type DocumentContext, Head, Html, Main, NextScript } from 'next/document'
import Script from 'next/script'

import { appCache } from '@weareinreach/ui/theme'

import i18nextConfig from '../../next-i18next.config.mjs'

const stylesServer = createStylesServer(appCache)
export default class _Document extends Document {
export default class Document extends NextDocument {
static async getInitialProps(ctx: DocumentContext) {
const initialProps = await Document.getInitialProps(ctx)
const initialProps = await NextDocument.getInitialProps(ctx)
return {
...initialProps,
styles: [
Expand All @@ -20,7 +20,7 @@ export default class _Document extends Document {
}

render() {
const currentLocale = this.props.__NEXT_DATA__.locale || i18nextConfig.i18n.defaultLocale
const currentLocale = this.props.__NEXT_DATA__.locale ?? i18nextConfig.i18n.defaultLocale
return (
<Html lang={currentLocale}>
<Head>
Expand Down
2 changes: 1 addition & 1 deletion apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@next/bundle-analyzer": "14.1.4",
"@types/eslint": "8.56.6",
"@types/node": "20.11.30",
"@types/react": "18.2.67",
"@types/react": "18.2.73",
"@types/react-dom": "18.2.22",
"@weareinreach/config": "workspace:*",
"@weareinreach/eslint-config": "0.100.0",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@
"dotenv": "16.4.5",
"dotenv-expand": "11.0.6",
"husky": "9.0.11",
"knip": "5.2.2",
"knip": "5.7.0",
"lint-staged": "15.2.2",
"prettier": "3.2.5",
"prettier-plugin-jsdoc": "1.3.0",
"prettier-plugin-packagejson": "2.4.12",
"prettier-plugin-packagejson": "2.4.13",
"prettier-plugin-prisma": "5.0.0",
"sherif": "0.8.1",
"tsx": "4.7.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/analytics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@weareinreach/eslint-config": "workspace:*",
"next": "14.1.4",
"nextjs-google-analytics": "2.3.3",
"type-fest": "4.13.1"
"type-fest": "4.14.0"
},
"peerDependencies": {
"next": "14.1.4",
Expand Down
4 changes: 2 additions & 2 deletions packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"just-map-values": "3.2.0",
"just-omit": "2.2.0",
"just-pick": "4.2.0",
"libphonenumber-js": "1.10.58",
"libphonenumber-js": "1.10.59",
"luxon": "3.4.4",
"nanoid": "5.0.6",
"slugify": "1.6.6",
Expand All @@ -67,7 +67,7 @@
"prettier": "3.2.5",
"trpc-client-devtools-link": "0.2.1-next",
"trpc-panel": "1.3.4",
"type-fest": "4.13.1",
"type-fest": "4.14.0",
"typescript": "5.4.3"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"with-env": "dotenv -e ../../.env --"
},
"dependencies": {
"@aws-sdk/client-cognito-identity-provider": "3.535.0",
"@aws-sdk/client-cognito-identity-provider": "3.540.0",
"@next-auth/prisma-adapter": "1.0.7",
"@weareinreach/db": "workspace:*",
"@weareinreach/env": "workspace:*",
Expand All @@ -68,7 +68,7 @@
"devDependencies": {
"@types/eslint": "8.56.6",
"@types/node": "20.11.30",
"@types/react": "18.2.67",
"@types/react": "18.2.73",
"@types/react-dom": "18.2.22",
"@weareinreach/config": "workspace:*",
"@weareinreach/eslint-config": "0.100.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/crowdin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"with-env": "dotenv -e ../../.env --"
},
"dependencies": {
"@crowdin/crowdin-api-client": "1.30.0",
"@crowdin/crowdin-api-client": "1.31.0",
"@crowdin/ota-client": "1.0.0",
"@opentelemetry/api": "1.8.0",
"@vercel/kv": "1.0.1",
Expand Down
12 changes: 6 additions & 6 deletions packages/db/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"devDependencies": {
"@octokit/core": "5.1.0",
"@snaplet/copycat": "5.0.0",
"@snaplet/seed": "0.89.4",
"@snaplet/seed": "0.89.6",
"@terraformer/wkt": "2.2.0",
"@turbo/gen": "1.13.0",
"@turf/helpers": "7.0.0-alpha.114",
Expand All @@ -88,8 +88,8 @@
"inquirer-autocomplete-prompt": "3.0.1",
"just-compact": "3.2.0",
"kysely-codegen": "0.14.1",
"libphonenumber-js": "1.10.58",
"listr2": "8.0.2",
"libphonenumber-js": "1.10.59",
"listr2": "8.1.1",
"luxon": "3.4.4",
"p-queue": "8.0.1",
"p-retry": "6.2.0",
Expand All @@ -102,16 +102,16 @@
"prisma-query-inspector": "1.4.4",
"prisma-query-log": "3.2.0",
"slugify": "1.6.6",
"snaplet": "0.89.4",
"snaplet": "0.89.6",
"social-links": "1.14.0",
"sql-bricks-postgres": "0.6.0",
"string-byte-length": "3.0.0",
"tiny-invariant": "1.3.3",
"tsx": "4.7.1",
"type-fest": "4.13.1",
"type-fest": "4.14.0",
"typescript": "5.4.3",
"zod-prisma-types": "3.1.6",
"zod-to-json-schema": "3.22.4"
"zod-to-json-schema": "3.22.5"
},
"prisma": {
"seed": "turbo run db:run-seed"
Expand Down
4 changes: 2 additions & 2 deletions packages/eslint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"@types/eslint": "8.56.6",
"@types/eslint-config-prettier": "6.11.3",
"@types/node": "20.11.30",
"@typescript-eslint/eslint-plugin": "7.3.1",
"@typescript-eslint/parser": "7.3.1",
"@typescript-eslint/eslint-plugin": "7.4.0",
"@typescript-eslint/parser": "7.4.0",
"eslint": "8.57.0",
"eslint-config-next": "14.1.4",
"eslint-config-prettier": "9.1.0",
Expand Down
16 changes: 8 additions & 8 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"just-filter-object": "3.2.0",
"just-group-by": "2.2.0",
"just-map-values": "3.2.0",
"libphonenumber-js": "1.10.58",
"libphonenumber-js": "1.10.59",
"locale-includes": "1.0.6",
"localized-address-format": "1.3.1",
"nextjs-routes": "2.1.0",
Expand All @@ -70,7 +70,7 @@
"@iconify-json/fluent-mdl2": "1.1.6",
"@iconify-json/mdi": "1.1.64",
"@iconify-json/ph": "1.1.11",
"@iconify-json/simple-icons": "1.1.96",
"@iconify-json/simple-icons": "1.1.97",
"@iconify/react": "4.1.1",
"@iconify/types": "2.0.0",
"@iconify/utils": "2.1.22",
Expand Down Expand Up @@ -103,8 +103,8 @@
"@storybook/testing-library": "0.2.2",
"@storybook/theming": "7.6.17",
"@storybook/types": "7.6.17",
"@swc/core": "1.4.8",
"@swc/helpers": "0.5.7",
"@swc/core": "1.4.11",
"@swc/helpers": "0.5.8",
"@tanstack/react-query": "4.36.1",
"@tanstack/react-query-devtools": "4.36.1",
"@tanstack/react-table": "8.15.0",
Expand All @@ -118,7 +118,7 @@
"@types/luxon": "3.4.2",
"@types/node": "20.11.30",
"@types/probe-image-size": "7.2.4",
"@types/react": "18.2.67",
"@types/react": "18.2.73",
"@types/react-dom": "18.2.22",
"@types/terraformer__wkt": "2.0.3",
"@weareinreach/api": "workspace:*",
Expand All @@ -141,7 +141,7 @@
"luxon": "3.4.4",
"mantine-react-table": "1.3.4",
"merge-anything": "5.1.7",
"msw": "2.2.10",
"msw": "2.2.13",
"msw-storybook-addon": "2.0.0-beta.0",
"next": "14.1.4",
"next-auth": "4.24.7",
Expand All @@ -153,7 +153,7 @@
"react-docgen-typescript": "2.2.2",
"react-dom": "18.2.0",
"react-error-boundary": "4.0.13",
"react-hook-form": "7.51.1",
"react-hook-form": "7.51.2",
"react-hook-form-mantine": "2.0.0",
"react-hook-tracer": "1.4.0",
"react-i18next": "14.1.0",
Expand All @@ -167,7 +167,7 @@
"trpc-client-devtools-link": "0.2.1-next",
"tsconfig-paths-webpack-plugin": "4.1.0",
"tsx": "4.7.1",
"type-fest": "4.13.1",
"type-fest": "4.14.0",
"typescript": "5.4.3",
"webpack": "5.91.0",
"zod": "3.22.4"
Expand Down
Loading

1 comment on commit 32aeac8

@vercel
Copy link

@vercel vercel bot commented on 32aeac8 Mar 28, 2024

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.