Skip to content

Commit

Permalink
Merge branch 'dev' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@JoeKarow
JoeKarow authored Sep 1, 2023
2 parents 6ec0fed + 4719c01 commit 09119e5
Show file tree
Hide file tree
Showing 60 changed files with 915 additions and 1,706 deletions.
19 changes: 6 additions & 13 deletions InReach.code-workspace
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,6 @@
"name": "🛠️ Utilities (@weareinreach/util)",
"path": "./packages/util"
},
{
"name": "🐑 AWS User Migration (@weareinreach/aws-user-migrate)",
"path": "./packages/aws-user-migrate"
},
{
"name": "🐑 AWS Cognito Messaging (@weareinreach/aws-messaging)",
"path": "./packages/aws-messaging"
},
{
"name": "🐑 AWS i18n Cache (@weareinreach/aws-i18n-cache)",
"path": "./packages/aws-cache"
},
{
"name": "⚙️ Environment Variables (@weareinreach/env)",
"path": "./packages/env"
Expand All @@ -76,6 +64,10 @@
"name": "✨ InReach (root)",
"path": "./"
},
{
"name": "🐑 AWS Lambdas",
"path": "./lambdas"
},
{
"name": "🛠️ Patched packages",
"path": "./patches"
Expand Down Expand Up @@ -185,7 +177,8 @@
"node_modules/": true,
"packages/": true,
"patches/": true,
"storybook-static/": true
"storybook-static/": true,
"lambdas/": true
},
"files.watcherExclude": {
"**/.git/objects/**": true,
Expand Down
27 changes: 13 additions & 14 deletions apps/app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@crowdin/ota-client": "1.0.0",
"@emotion/react": "11.11.1",
"@emotion/server": "11.11.0",
"@hookform/resolvers": "3.2.0",
"@hookform/resolvers": "3.3.1",
"@iconify/react": "4.1.1",
"@mantine/carousel": "6.0.19",
"@mantine/core": "6.0.19",
Expand All @@ -53,18 +53,18 @@
"@opentelemetry/sdk-trace-node": "1.15.2",
"@opentelemetry/semantic-conventions": "1.15.2",
"@prisma/instrumentation": "5.2.0",
"@sentry/nextjs": "7.64.0",
"@sentry/opentelemetry-node": "7.64.0",
"@sentry/profiling-node": "1.1.2",
"@sentry/nextjs": "7.66.0",
"@sentry/opentelemetry-node": "7.66.0",
"@sentry/profiling-node": "1.1.3",
"@tanstack/react-query": "4.33.0",
"@tanstack/react-table": "8.9.3",
"@tiptap/extension-link": "2.1.7",
"@tiptap/react": "2.1.7",
"@tiptap/starter-kit": "2.1.7",
"@trpc/client": "10.38.0",
"@trpc/next": "10.38.0",
"@trpc/react-query": "10.38.0",
"@trpc/server": "10.38.0",
"@trpc/client": "10.38.1",
"@trpc/next": "10.38.1",
"@trpc/react-query": "10.38.1",
"@trpc/server": "10.38.1",
"@vercel/analytics": "1.0.2",
"@vercel/edge-config": "0.2.1",
"@vercel/kv": "0.2.2",
Expand All @@ -74,7 +74,7 @@
"@weareinreach/env": "workspace:*",
"@weareinreach/ui": "workspace:*",
"@weareinreach/util": "workspace:*",
"cookies-next": "2.1.2",
"cookies-next": "3.0.0",
"core-js": "3.32.1",
"dayjs": "1.11.9",
"embla-carousel-autoplay": "7.1.0",
Expand Down Expand Up @@ -102,7 +102,7 @@
"react-error-boundary": "4.0.11",
"react-hook-form": "7.45.4",
"react-hook-form-mantine": "2.0.0",
"react-i18next": "13.2.0",
"react-i18next": "13.2.1",
"zod": "3.22.2"
},
"devDependencies": {
Expand All @@ -116,20 +116,19 @@
"@types/flat": "5.0.2",
"@types/luxon": "3.3.1",
"@types/node": "18.17.12",
"@types/prettier": "2.7.3",
"@types/react": "18.2.21",
"@types/react-dom": "18.2.7",
"@types/umami": "0.1.2",
"@typescript-eslint/eslint-plugin": "6.4.1",
"@typescript-eslint/parser": "6.4.1",
"@typescript-eslint/eslint-plugin": "6.5.0",
"@typescript-eslint/parser": "6.5.0",
"@weareinreach/config": "workspace:*",
"@weareinreach/eslint-config": "0.100.0",
"commander": "11.0.0",
"dotenv": "16.3.1",
"eslint": "8.48.0",
"eslint-plugin-i18next": "6.0.3",
"listr2": "6.6.1",
"prettier": "3.0.2",
"prettier": "3.0.3",
"trpc-client-devtools-link": "0.2.1-next",
"trpc-panel": "1.3.4",
"trpc-playground": "1.0.4",
Expand Down
2 changes: 1 addition & 1 deletion apps/web/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"next": "13.4.19",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-i18next": "13.2.0"
"react-i18next": "13.2.1"
},
"devDependencies": {
"@next/bundle-analyzer": "13.4.19",
Expand Down
0 packages/aws-messaging/.eslintignore → lambdas/cognito-messaging/.eslintignore
View file
File renamed without changes.
0 packages/aws-cache/.eslintrc.js → lambdas/cognito-messaging/.eslintrc.js
View file
File renamed without changes.
0 packages/aws-cache/.gitignore → lambdas/cognito-messaging/.gitignore
View file
File renamed without changes.
0 packages/aws-cache/.lintstagedrc.cjs → lambdas/cognito-messaging/.lintstagedrc.cjs
View file
File renamed without changes.
0 packages/aws-messaging/.prettierignore → lambdas/cognito-messaging/.prettierignore
View file
File renamed without changes.
3 changes: 1 addition & 2 deletions packages/aws-messaging/package.json → lambdas/cognito-messaging/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,12 @@
"@types/aws-lambda": "8.10.119",
"@types/eslint": "8.44.2",
"@types/node": "18.17.12",
"@types/prettier": "2.7.3",
"@vercel/ncc": "0.36.1",
"@weareinreach/config": "workspace:*",
"@weareinreach/eslint-config": "0.100.0",
"aws-lambda": "1.0.7",
"eslint": "8.48.0",
"prettier": "3.0.2",
"prettier": "3.0.3",
"typescript": "5.2.2"
}
}
0 packages/aws-messaging/samconfig.toml → lambdas/cognito-messaging/samconfig.toml
View file
File renamed without changes.
0 packages/aws-messaging/src/index.ts → lambdas/cognito-messaging/src/index.ts
View file
File renamed without changes.
0 packages/aws-messaging/template.yaml → lambdas/cognito-messaging/template.yaml
View file
File renamed without changes.
0 packages/aws-messaging/tsconfig.json → lambdas/cognito-messaging/tsconfig.json
View file
File renamed without changes.
0 packages/aws-messaging/turbo.json → lambdas/cognito-messaging/turbo.json
View file
File renamed without changes.
0 packages/aws-user-migrate/.eslintignore → lambdas/cognito-user-migrate/.eslintignore
View file
File renamed without changes.
0 packages/aws-user-migrate/.eslintrc.js → lambdas/cognito-user-migrate/.eslintrc.js
View file
File renamed without changes.
0 packages/aws-user-migrate/.gitignore → lambdas/cognito-user-migrate/.gitignore
View file
File renamed without changes.
0 packages/aws-messaging/.lintstagedrc.cjs → ...as/cognito-user-migrate/.lintstagedrc.cjs
View file
File renamed without changes.
0 packages/aws-user-migrate/.prettierignore → lambdas/cognito-user-migrate/.prettierignore
View file
File renamed without changes.
0 packages/aws-user-migrate/Makefile → lambdas/cognito-user-migrate/Makefile
View file
File renamed without changes.
0 packages/aws-user-migrate/build.sh → lambdas/cognito-user-migrate/build.sh
View file
File renamed without changes.
3 changes: 1 addition & 2 deletions packages/aws-user-migrate/package.json → lambdas/cognito-user-migrate/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,12 @@
"@types/aws-lambda": "8.10.119",
"@types/eslint": "8.44.2",
"@types/node": "18.17.12",
"@types/prettier": "2.7.3",
"@vercel/ncc": "0.36.1",
"@weareinreach/config": "workspace:*",
"@weareinreach/eslint-config": "0.100.0",
"aws-lambda": "1.0.7",
"eslint": "8.48.0",
"prettier": "3.0.2",
"prettier": "3.0.3",
"prisma": "5.2.0",
"typescript": "5.2.2"
}
Expand Down
0 packages/aws-user-migrate/samconfig.toml → lambdas/cognito-user-migrate/samconfig.toml
View file
File renamed without changes.
0 packages/aws-user-migrate/src/client.ts → lambdas/cognito-user-migrate/src/client.ts
View file
File renamed without changes.
0 packages/aws-user-migrate/src/getUser.ts → lambdas/cognito-user-migrate/src/getUser.ts
View file
File renamed without changes.
0 packages/aws-user-migrate/src/index.ts → lambdas/cognito-user-migrate/src/index.ts
View file
File renamed without changes.
0 packages/aws-user-migrate/src/logger.ts → lambdas/cognito-user-migrate/src/logger.ts
View file
File renamed without changes.
0 packages/aws-user-migrate/src/verifyUser.ts → ...as/cognito-user-migrate/src/verifyUser.ts
View file
File renamed without changes.
0 packages/aws-user-migrate/template.yaml → lambdas/cognito-user-migrate/template.yaml
View file
File renamed without changes.
0 packages/aws-user-migrate/trust-policy.json → ...as/cognito-user-migrate/trust-policy.json
View file
File renamed without changes.
0 packages/aws-user-migrate/tsconfig.json → lambdas/cognito-user-migrate/tsconfig.json
View file
File renamed without changes.
0 packages/aws-user-migrate/turbo.json → lambdas/cognito-user-migrate/turbo.json
View file
File renamed without changes.
0 ...s/aws-user-migrate/types/environment.d.ts → ...gnito-user-migrate/types/environment.d.ts
View file
File renamed without changes.
2 changes: 0 additions & 2 deletions lib/postinstall.ts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
/* eslint-disable @typescript-eslint/ban-ts-comment */
/* eslint-disable @typescript-eslint/no-var-requires */
/* eslint-disable turbo/no-undeclared-env-vars */
/* eslint-disable import/no-unused-modules */
/* eslint-disable node/no-process-env */
// @ts-ignore
const isCi = process.env.CI !== undefined
Expand Down
3 changes: 1 addition & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,13 @@
"@manypkg/cli": "0.21.0",
"@types/lint-staged": "13.2.0",
"@types/node": "18.17.12",
"@types/prettier": "2.7.3",
"@weareinreach/config": "workspace:*",
"@weareinreach/eslint-config": "0.100.0",
"boxen": "7.1.1",
"dotenv": "16.3.1",
"husky": "8.0.3",
"lint-staged": "14.0.1",
"prettier": "3.0.2",
"prettier": "3.0.3",
"prettier-plugin-jsdoc": "1.0.1",
"prettier-plugin-packagejson": "2.4.5",
"prettier-plugin-prisma": "5.0.0",
Expand Down
13 changes: 6 additions & 7 deletions packages/api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
"@crowdin/ota-client": "1.0.0",
"@googlemaps/google-maps-services-js": "3.3.36",
"@opentelemetry/api": "1.4.1",
"@sentry/node": "7.64.0",
"@sentry/node": "7.66.0",
"@tanstack/react-query": "4.33.0",
"@terraformer/wkt": "2.2.0",
"@trpc/client": "10.38.0",
"@trpc/next": "10.38.0",
"@trpc/react-query": "10.38.0",
"@trpc/server": "10.38.0",
"@trpc/client": "10.38.1",
"@trpc/next": "10.38.1",
"@trpc/react-query": "10.38.1",
"@trpc/server": "10.38.1",
"@vercel/edge-config": "0.2.1",
"@vercel/kv": "0.2.2",
"@weareinreach/auth": "workspace:*",
Expand Down Expand Up @@ -59,7 +59,6 @@
"@types/google.maps": "3.54.0",
"@types/luxon": "3.3.1",
"@types/node": "18.17.12",
"@types/prettier": "2.7.3",
"@types/terraformer__wkt": "2.0.0",
"@weareinreach/config": "workspace:*",
"@weareinreach/eslint-config": "0.100.0",
Expand All @@ -70,7 +69,7 @@
"listr2": "6.6.1",
"next": "13.4.19",
"p-queue": "7.3.4",
"prettier": "3.0.2",
"prettier": "3.0.3",
"prisma": "5.2.0",
"trpc-client-devtools-link": "0.2.1-next",
"trpc-panel": "1.3.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/auth/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"with-env": "dotenv -e ../../.env --"
},
"dependencies": {
"@aws-sdk/client-cognito-identity-provider": "3.398.0",
"@aws-sdk/client-cognito-identity-provider": "3.402.0",
"@next-auth/prisma-adapter": "1.0.7",
"@weareinreach/db": "workspace:*",
"@weareinreach/env": "workspace:*",
Expand Down
38 changes: 0 additions & 38 deletions packages/aws-cache/README.TOOLKIT.md
View file

This file was deleted.

128 changes: 0 additions & 128 deletions packages/aws-cache/README.md
View file

This file was deleted.

Loading

1 comment on commit 09119e5

@vercel
Copy link

@vercel vercel bot commented on 09119e5 Sep 1, 2023

Choose a reason for hiding this comment

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

Successfully deployed to the following URLs:

inreach-app – ./apps/app

inreach-app.vercel.app
inreach-app-weareinreach.vercel.app
inreach-app-git-main-weareinreach.vercel.app
app.inreach.org
www.app.inreach.org
beta.inreach.org
admin.inreach.org

Please sign in to comment.