Skip to content

Commit 3ad1ae9

Browse files
kodiakhq[bot]JoeKarowrenovate[bot]
authored
release: 2023-06-22 (#628)
PR-URL: #628 Co-authored-by: Joe Karow <58997957+JoeKarow@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2 parents 548f9a1 + 0e79b00 commit 3ad1ae9

28 files changed

+1374
-1331
lines changed

‎.github/workflows/chromatic.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ jobs:
1717
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
1818
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
1919
DATABASE_URL: ${{ secrets.DATABASE_URL }}
20+
DB_DIRECT_URL: ${{ secrets.DB_DIRECT_URL }}
2021
CI: true
2122
OVERRIDE_CI: true
2223
FORCE_COLOR: true
24+
SKIP_ENV_VALIDATION: true
2325
runs-on: ubuntu-latest
2426
defaults:
2527
run:
@@ -57,7 +59,7 @@ jobs:
5759

5860
# 👇 Runs Chromatic CLI in ./packages/ui
5961
- name: Publish to Chromatic
60-
uses: chromaui/action@422cd01724d9a94e7d32d3d1e04ed5b044e90ba3 # v1
62+
uses: chromaui/action@44caff7e88d584b04f79f04e31e819f9a95d4d8f # v1
6163
with:
6264
workingDir: packages/ui
6365
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}

‎.github/workflows/codeql.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ jobs:
2121
- name: ⤵️ Check out code from GitHub
2222
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
2323
- name: 🏗 Initialize CodeQL
24-
uses: github/codeql-action/init@6c089f53dd51dc3fc7e599c3cb5356453a52ca9e # v2
24+
uses: github/codeql-action/init@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2
2525
- name: 🚀 Perform CodeQL Analysis
26-
uses: github/codeql-action/analyze@6c089f53dd51dc3fc7e599c3cb5356453a52ca9e # v2
26+
uses: github/codeql-action/analyze@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2

‎apps/app/package.json

+16-16
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
},
2323
"dependencies": {
2424
"@aws-crypto/sha256-js": "4.0.0",
25-
"@aws-sdk/client-s3": "3.354.0",
26-
"@aws-sdk/signature-v4": "3.354.0",
27-
"@crowdin/crowdin-api-client": "1.23.1",
25+
"@aws-sdk/client-s3": "3.358.0",
26+
"@aws-sdk/signature-v4": "3.357.0",
27+
"@crowdin/crowdin-api-client": "1.23.2",
2828
"@crowdin/ota-client": "1.0.0",
2929
"@emotion/react": "11.11.1",
3030
"@emotion/server": "11.11.0",
31-
"@iconify/react": "4.1.0",
31+
"@iconify/react": "4.1.1",
3232
"@mantine/carousel": "6.0.14",
3333
"@mantine/core": "6.0.14",
3434
"@mantine/dates": "6.0.14",
@@ -43,7 +43,7 @@
4343
"@mantine/spotlight": "6.0.14",
4444
"@mantine/tiptap": "6.0.14",
4545
"@mantine/utils": "6.0.14",
46-
"@next/bundle-analyzer": "13.4.6",
46+
"@next/bundle-analyzer": "13.4.7",
4747
"@opentelemetry/api": "1.4.1",
4848
"@opentelemetry/exporter-trace-otlp-http": "0.40.0",
4949
"@opentelemetry/instrumentation": "0.40.0",
@@ -54,19 +54,19 @@
5454
"@opentelemetry/sdk-trace-base": "1.14.0",
5555
"@opentelemetry/sdk-trace-node": "1.14.0",
5656
"@opentelemetry/semantic-conventions": "1.14.0",
57-
"@prisma/instrumentation": "4.16.0",
57+
"@prisma/instrumentation": "4.16.1",
5858
"@sentry/nextjs": "7.56.0",
5959
"@tanstack/react-query": "4.29.15",
6060
"@tanstack/react-table": "8.9.2",
6161
"@tiptap/extension-link": "2.0.3",
6262
"@tiptap/react": "2.0.3",
6363
"@tiptap/starter-kit": "2.0.3",
64-
"@trpc/client": "10.31.0",
65-
"@trpc/next": "10.31.0",
66-
"@trpc/react-query": "10.31.0",
67-
"@trpc/server": "10.31.0",
64+
"@trpc/client": "10.32.0",
65+
"@trpc/next": "10.32.0",
66+
"@trpc/react-query": "10.32.0",
67+
"@trpc/server": "10.32.0",
6868
"@vercel/analytics": "1.0.1",
69-
"@vercel/kv": "0.2.1",
69+
"@vercel/kv": "0.2.2",
7070
"@weareinreach/api": "workspace:*",
7171
"@weareinreach/auth": "workspace:*",
7272
"@weareinreach/db": "workspace:*",
@@ -81,7 +81,7 @@
8181
"embla-carousel-autoplay": "7.1.0",
8282
"embla-carousel-react": "7.1.0",
8383
"flat": "5.0.2",
84-
"i18next": "23.2.1",
84+
"i18next": "23.2.3",
8585
"i18next-browser-languagedetector": "7.0.2",
8686
"i18next-chained-backend": "4.4.0",
8787
"i18next-http-backend": "2.2.1",
@@ -92,23 +92,23 @@
9292
"just-compact": "3.2.0",
9393
"just-compare": "2.3.0",
9494
"luxon": "3.3.0",
95-
"next": "13.4.6",
95+
"next": "13.4.7",
9696
"next-auth": "4.22.1",
9797
"next-i18next": "14.0.0",
98-
"next-seo": "6.0.0",
98+
"next-seo": "6.1.0",
9999
"nextjs-routes": "1.0.9",
100100
"object-sizeof": "2.6.1",
101101
"pretty-bytes": "6.1.0",
102102
"react": "18.2.0",
103103
"react-dom": "18.2.0",
104104
"react-error-boundary": "4.0.10",
105-
"react-i18next": "13.0.0",
105+
"react-i18next": "13.0.1",
106106
"tslog": "4.8.2",
107107
"zod": "3.21.4"
108108
},
109109
"devDependencies": {
110110
"@playwright/test": "1.35.1",
111-
"@prisma/nextjs-monorepo-workaround-plugin": "4.16.0",
111+
"@prisma/nextjs-monorepo-workaround-plugin": "4.16.1",
112112
"@tanstack/react-query-devtools": "4.29.15",
113113
"@tanstack/react-table-devtools": "8.7.6",
114114
"@total-typescript/ts-reset": "0.4.2",

‎apps/app/src/pages/org/[slug]/index.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ const OrganizationPage: NextPage = () => {
6868
{ parentId: data?.id ?? '', remoteOnly: true },
6969
{
7070
enabled: !!data?.id && data?.locations.length > 1,
71-
// @ts-expect-error trpc/trpc#4519
7271
select: (data) => data.length !== 0,
7372
}
7473
)

‎apps/web/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
"@weareinreach/ui": "workspace:*",
3636
"dayjs": "1.11.8",
3737
"embla-carousel-react": "7.1.0",
38-
"i18next": "23.2.1",
39-
"next": "13.4.6",
38+
"i18next": "23.2.3",
39+
"next": "13.4.7",
4040
"react": "18.2.0",
4141
"react-dom": "18.2.0",
42-
"react-i18next": "13.0.0"
42+
"react-i18next": "13.0.1"
4343
},
4444
"devDependencies": {
45-
"@next/bundle-analyzer": "13.4.6",
45+
"@next/bundle-analyzer": "13.4.7",
4646
"@types/eslint": "8.40.2",
4747
"@types/node": "18.16.18",
4848
"@types/react": "18.2.13",

‎apps/web/turbo.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"extends": ["//"],
44
"pipeline": {
55
"build": {
6-
"dependsOn": ["^build"],
6+
"dependsOn": [],
77
"env": [
88
"WEB_SENTRY_DSN",
99
"SANITY_TOKEN",

‎apps/web/vercel.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
{
22
"$schema": "https://openapi.vercel.sh/vercel.json",
33
"git": {
4-
"deploymentEnabled": {
5-
"l10n_*": false,
6-
"renovate/github_actions": false
7-
}
4+
"deploymentEnabled": false
85
}
96
}

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"prettier-plugin-packagejson": "2.4.3",
5151
"prettier-plugin-prisma": "4.13.0",
5252
"tsx": "3.12.7",
53-
"turbo": "1.10.3",
53+
"turbo": "1.10.5",
5454
"typescript": "5.1.3",
5555
"typesync": "0.11.1"
5656
},

‎packages/api/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
"with-env": "dotenv -e ../../.env --"
1616
},
1717
"dependencies": {
18-
"@crowdin/crowdin-api-client": "1.23.1",
18+
"@crowdin/crowdin-api-client": "1.23.2",
1919
"@crowdin/ota-client": "1.0.0",
2020
"@googlemaps/google-maps-services-js": "3.3.32",
2121
"@tanstack/react-query": "4.29.15",
2222
"@terraformer/wkt": "2.2.0",
23-
"@trpc/client": "10.31.0",
24-
"@trpc/next": "10.31.0",
25-
"@trpc/react-query": "10.31.0",
26-
"@trpc/server": "10.31.0",
23+
"@trpc/client": "10.32.0",
24+
"@trpc/next": "10.32.0",
25+
"@trpc/react-query": "10.32.0",
26+
"@trpc/server": "10.32.0",
2727
"@weareinreach/auth": "workspace:*",
2828
"@weareinreach/db": "workspace:*",
2929
"@weareinreach/env": "workspace:*",
@@ -60,10 +60,10 @@
6060
"eslint": "8.43.0",
6161
"just-capitalize": "3.2.0",
6262
"listr2": "6.6.0",
63-
"next": "13.4.6",
63+
"next": "13.4.7",
6464
"p-queue": "7.3.4",
6565
"prettier": "2.8.8",
66-
"prisma": "4.16.0",
66+
"prisma": "4.16.1",
6767
"trpc-client-devtools-link": "0.2.1-next",
6868
"trpc-panel": "1.3.4",
6969
"type-fest": "3.12.0",

‎packages/auth/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"with-env": "dotenv -e ../../.env --"
1515
},
1616
"dependencies": {
17-
"@aws-sdk/client-cognito-identity-provider": "3.354.0",
17+
"@aws-sdk/client-cognito-identity-provider": "3.358.0",
1818
"@next-auth/prisma-adapter": "1.0.7",
1919
"@weareinreach/db": "workspace:*",
2020
"@weareinreach/env": "workspace:*",
@@ -31,7 +31,7 @@
3131
"@weareinreach/config": "workspace:*",
3232
"@weareinreach/eslint-config": "0.100.0",
3333
"eslint": "8.43.0",
34-
"next": "13.4.6",
34+
"next": "13.4.7",
3535
"next-auth": "4.22.1",
3636
"react": "18.2.0",
3737
"react-dom": "18.2.0",

‎packages/aws-user-migrate/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
},
2323
"dependencies": {
2424
"@aws-lambda-powertools/logger": "1.9.0",
25-
"@prisma/client": "4.16.0",
25+
"@prisma/client": "4.16.1",
2626
"@weareinreach/db": "workspace:*"
2727
},
2828
"devDependencies": {
@@ -36,7 +36,7 @@
3636
"aws-lambda": "1.0.7",
3737
"eslint": "8.43.0",
3838
"prettier": "2.8.8",
39-
"prisma": "4.16.0",
39+
"prisma": "4.16.1",
4040
"typescript": "5.1.3"
4141
}
4242
}

‎packages/db/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@
4848
"@opentelemetry/sdk-trace-base": "1.14.0",
4949
"@opentelemetry/sdk-trace-node": "1.14.0",
5050
"@opentelemetry/semantic-conventions": "1.14.0",
51-
"@prisma/client": "4.16.0",
52-
"@prisma/instrumentation": "4.16.0",
53-
"@vercel/kv": "0.2.1",
54-
"@vercel/postgres-kysely": "0.3.1",
51+
"@prisma/client": "4.16.1",
52+
"@prisma/instrumentation": "4.16.1",
53+
"@vercel/kv": "0.2.2",
54+
"@vercel/postgres-kysely": "0.4.0",
5555
"@weareinreach/env": "workspace:*",
5656
"kysely": "0.25.0",
5757
"prisma-kysely": "1.4.2",
@@ -106,7 +106,7 @@
106106
"papaparse": "5.4.1",
107107
"prettier": "2.8.8",
108108
"pretty-bytes": "6.1.0",
109-
"prisma": "4.16.0",
109+
"prisma": "4.16.1",
110110
"prisma-dbml-generator": "0.10.0",
111111
"prisma-query-inspector": "1.4.4",
112112
"prisma-query-log": "3.2.0",

‎packages/env/index.ts

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/* eslint-disable node/no-process-env */
22
import { createEnv } from '@t3-oss/env-nextjs'
3+
import isChromatic from 'chromatic/isChromatic'
34
import { z } from 'zod'
45

56
export const env = createEnv({
@@ -88,7 +89,14 @@ export const env = createEnv({
8889
// eslint-disable-next-line turbo/no-undeclared-env-vars
8990
NEXT_PUBLIC_VERCEL_ENV: process.env.NEXT_PUBLIC_VERCEL_ENV,
9091
},
91-
skipValidation: process.env.NODE_ENV === 'development',
92+
skipValidation:
93+
// eslint-disable-next-line turbo/no-undeclared-env-vars
94+
process.env.NODE_ENV === 'development' ||
95+
// eslint-disable-next-line turbo/no-undeclared-env-vars
96+
process.env.SKIP_ENV_VALIDATION === 'true' ||
97+
// eslint-disable-next-line turbo/no-undeclared-env-vars
98+
Boolean(process.env.CI) ||
99+
isChromatic(),
92100
})
93101

94102
export const getEnv = <T extends keyof typeof env>(envVar: T): (typeof env)[T] => env[envVar]

‎packages/env/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"scripts": {},
1111
"dependencies": {
1212
"@t3-oss/env-nextjs": "0.4.1",
13+
"chromatic": "6.19.9",
1314
"zod": "3.21.4"
1415
},
1516
"devDependencies": {

‎packages/eslint-config/base.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ const config = {
44
plugins: ['codegen', 'turbo', 'node', 'import', '@tanstack/query'],
55
extends: [
66
'eslint:recommended',
7-
'plugin:turbo/recommended',
7+
// disable turbo plugin until vercel/turbo#5355 is resolved
8+
// 'plugin:turbo/recommended',
89
'plugin:@tanstack/eslint-plugin-query/recommended',
910
'plugin:@typescript-eslint/recommended',
1011
'plugin:import/typescript',
@@ -33,7 +34,7 @@ const config = {
3334
'codegen/codegen': 'error',
3435
'react/jsx-key': 'off',
3536
'react/no-unescaped-entities': ['off'],
36-
'turbo/no-undeclared-env-vars': 'warn',
37+
// 'turbo/no-undeclared-env-vars': 'warn',
3738
'import/first': 'error',
3839
'import/newline-after-import': 'error',
3940
'import/no-absolute-path': 'error',

‎packages/eslint-config/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
"preinstall": "npx only-allow pnpm"
1515
},
1616
"devDependencies": {
17-
"@next/eslint-plugin-next": "13.4.6",
17+
"@next/eslint-plugin-next": "13.4.7",
1818
"@tanstack/eslint-plugin-query": "4.29.9",
1919
"@types/eslint": "8.40.2",
2020
"@types/eslint-config-prettier": "6.11.0",
2121
"@types/node": "18.16.18",
2222
"@typescript-eslint/eslint-plugin": "5.60.0",
2323
"@typescript-eslint/parser": "5.60.0",
2424
"eslint": "8.43.0",
25-
"eslint-config-next": "13.4.6",
25+
"eslint-config-next": "13.4.7",
2626
"eslint-config-prettier": "8.8.0",
2727
"eslint-formatter-github": "1.1.4",
2828
"eslint-import-resolver-typescript": "3.5.5",
@@ -32,8 +32,8 @@
3232
"eslint-plugin-node": "11.1.0",
3333
"eslint-plugin-react": "7.32.2",
3434
"eslint-plugin-storybook": "0.6.12",
35-
"eslint-plugin-turbo": "1.10.3",
36-
"next": "13.4.6",
35+
"eslint-plugin-turbo": "1.10.5",
36+
"next": "13.4.7",
3737
"resolve-pkg-maps": "1.0.0",
3838
"typescript": "5.1.3"
3939
},

‎packages/ui/.storybook/main.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* eslint-disable turbo/no-undeclared-env-vars */
22
/* eslint-disable node/no-process-env */
33
import { type StorybookConfig } from '@storybook/nextjs'
4+
import isChromatic from 'chromatic/isChromatic'
45
import { mergeAndConcat } from 'merge-anything'
56
import { type PropItem } from 'react-docgen-typescript'
67

@@ -112,13 +113,17 @@ const config: StorybookConfig = {
112113
stats: {
113114
colors: true,
114115
},
115-
// devtool: isDev ? 'eval-source-map' : 'cheap-module-source-map',
116116
}
117117
const mergedConfig = mergeAndConcat(config, configAdditions)
118118
return mergedConfig
119119
},
120120
docs: {
121121
autodocs: true,
122122
},
123+
env: isChromatic()
124+
? {
125+
SKIP_ENV_VALIDATION: 'true',
126+
}
127+
: {},
123128
}
124129
export default config

0 commit comments

Comments
 (0)