release: 2020-06-20 (#618)

PR-URL: #618
Co-authored-by: Joe Karow <58997957+JoeKarow@users.noreply.github.com>
Co-authored-by: InReach [Automated User] <108850934+InReach-svc@users.noreply.github.com>
Co-authored-by: trigal <10123216+trigal2012@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/renovate.json

@@ -1,5 +1,6 @@
 {
 	"$schema": "https://docs.renovatebot.com/renovate-schema.json",
+	"addLabels": ["dependencies", "automerge", "kodiak: merge.method = 'squash'"],
 	"baseBranches": ["dev"],
 	"extends": ["github>weareinreach/renovate-config"],
 	"packageRules": [

.github/workflows/chromatic.yml

@@ -57,7 +57,7 @@ jobs:
 
       # 👇 Runs Chromatic CLI in ./packages/ui
       - name: Publish to Chromatic
-        uses: chromaui/action@b60a089bc900b3158357f4fa511f6995827e0880 # v1
+        uses: chromaui/action@422cd01724d9a94e7d32d3d1e04ed5b044e90ba3 # v1
         with:
           workingDir: packages/ui
           projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}

.github/workflows/crowdin.yml

@@ -40,7 +40,7 @@ jobs:
 
       - name: Upload to Crowdin
         if: github.event_name != 'pull_request' && !startsWith(github.ref_name, 'l10n_')
-        uses: crowdin/github-action@3133cc916c35590475cf6705f482fb653d8e36e9 # v1.10.0
+        uses: crowdin/github-action@ee4ab4ea2feadc0fdc3b200729c7b1c4cf4b38f3 # v1.11.0
         env:
           GITHUB_TOKEN: ${{ secrets.GH_ACT_PAT }}
           CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
@@ -57,7 +57,7 @@ jobs:
 
       - name: Delete Crowdin Branch
         if: github.event_name == 'pull_request'
-        uses: crowdin/github-action@3133cc916c35590475cf6705f482fb653d8e36e9 # v1.10.0
+        uses: crowdin/github-action@ee4ab4ea2feadc0fdc3b200729c7b1c4cf4b38f3 # v1.11.0
         env:
           GITHUB_TOKEN: ${{ secrets.GH_ACT_PAT }}
           CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
@@ -66,4 +66,5 @@ jobs:
           upload_translations: false
           download_translations: false
           create_pull_request: false
-          delete_crowdin_branch: ${{ steps.sanitizebranch.outputs.value }}
+          command: branch delete
+          command_args: ${{ steps.sanitizebranch.outputs.value }}

.github/workflows/pr-labels.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 🏷 Verify PR has a valid label
-        uses: mheap/github-action-required-labels@8c23b2a5dd991324e5f37b3fea9dfce5afd7657e # v5
+        uses: mheap/github-action-required-labels@4e9ef4ce8c697cf55716ecbf7f13a3d9e0b6ac6a # v5
         with:
           labels: 'breaking-change, bugfix, documentation, enhancement, refactor, performance, new-feature, maintenance, ci, dependencies, translations, changelog-ignore, release'
           mode: minimum

.nvmrc

@@ -1 +1 @@
-18.16.0
+18.16.1

InReach.code-workspace

@@ -197,6 +197,11 @@
 			"**/.turbo/**": true,
 			"**/generated/**": true
 		},
+		"search.exclude": {
+			"**/node_modules": true,
+			"**/*.code-search": true,
+			"pnpm-lock.yaml": true
+		},
 		"i18n-ally.annotationInPlace": false,
 		"i18n-ally.defaultNamespace": "common",
 		"i18n-ally.displayLanguage": "en",
@@ -238,7 +243,7 @@
 			"projectKey": "weareinreach_InReach"
 		},
 		"tms.stringsCompletionFileExtensions": "ts,tsx,json",
-		"typescript.preferences.importModuleSpecifier": "relative",
+		"typescript.preferences.importModuleSpecifier": "non-relative",
 		"typescript.tsdk": "✨ InReach (root)/node_modules/typescript/lib",
 		"typescript.enablePromptUseWorkspaceTsdk": true,
 		"typescript.workspaceSymbols.scope": "allOpenProjects"

apps/app/nextjs-routes.d.ts

@@ -27,6 +27,7 @@ declare module "nextjs-routes" {
     | DynamicRoute<"/org/[slug]/[orgLocationId]", { "slug": string; "orgLocationId": string }>
     | DynamicRoute<"/org/[slug]/edit", { "slug": string }>
     | DynamicRoute<"/org/[slug]", { "slug": string }>
+    | DynamicRoute<"/org/[slug]/remote", { "slug": string }>
     | StaticRoute<"/profile">
     | StaticRoute<"/saved">
     | DynamicRoute<"/search/[...params]", { "params": string[] }>

apps/app/package.json

@@ -12,6 +12,7 @@
 		"generate:all": "tsx ./lib/generate.ts",
 		"generate:data": "tsx ./lib/generate.ts -d",
 		"generate:i18n": "tsx ./lib/generate.ts -t",
+		"generate:i18nTypes": "i18next-resources-for-ts interface -i ./public/locales/en -o ./src/types/resources.d.ts",
 		"preinstall": "npx only-allow pnpm",
 		"lint": "next lint",
 		"lint:fix": "next lint --fix",
@@ -21,27 +22,27 @@
 	},
 	"dependencies": {
 		"@aws-crypto/sha256-js": "4.0.0",
-		"@aws-sdk/client-s3": "3.353.0",
-		"@aws-sdk/signature-v4": "3.347.0",
+		"@aws-sdk/client-s3": "3.354.0",
+		"@aws-sdk/signature-v4": "3.354.0",
 		"@crowdin/crowdin-api-client": "1.23.1",
 		"@crowdin/ota-client": "1.0.0",
 		"@emotion/react": "11.11.1",
 		"@emotion/server": "11.11.0",
 		"@iconify/react": "4.1.0",
-		"@mantine/carousel": "6.0.13",
-		"@mantine/core": "6.0.13",
-		"@mantine/dates": "6.0.13",
-		"@mantine/dropzone": "6.0.13",
-		"@mantine/form": "6.0.13",
-		"@mantine/hooks": "6.0.13",
-		"@mantine/modals": "6.0.13",
-		"@mantine/next": "6.0.13",
-		"@mantine/notifications": "6.0.13",
-		"@mantine/nprogress": "6.0.13",
-		"@mantine/prism": "6.0.13",
-		"@mantine/spotlight": "6.0.13",
-		"@mantine/tiptap": "6.0.13",
-		"@mantine/utils": "6.0.13",
+		"@mantine/carousel": "6.0.14",
+		"@mantine/core": "6.0.14",
+		"@mantine/dates": "6.0.14",
+		"@mantine/dropzone": "6.0.14",
+		"@mantine/form": "6.0.14",
+		"@mantine/hooks": "6.0.14",
+		"@mantine/modals": "6.0.14",
+		"@mantine/next": "6.0.14",
+		"@mantine/notifications": "6.0.14",
+		"@mantine/nprogress": "6.0.14",
+		"@mantine/prism": "6.0.14",
+		"@mantine/spotlight": "6.0.14",
+		"@mantine/tiptap": "6.0.14",
+		"@mantine/utils": "6.0.14",
 		"@next/bundle-analyzer": "13.4.6",
 		"@opentelemetry/api": "1.4.1",
 		"@opentelemetry/exporter-trace-otlp-http": "0.40.0",
@@ -53,17 +54,17 @@
 		"@opentelemetry/sdk-trace-base": "1.14.0",
 		"@opentelemetry/sdk-trace-node": "1.14.0",
 		"@opentelemetry/semantic-conventions": "1.14.0",
-		"@prisma/instrumentation": "4.15.0",
-		"@sentry/nextjs": "7.55.2",
-		"@tanstack/react-query": "4.29.13",
+		"@prisma/instrumentation": "4.16.0",
+		"@sentry/nextjs": "7.56.0",
+		"@tanstack/react-query": "4.29.15",
 		"@tanstack/react-table": "8.9.2",
 		"@tiptap/extension-link": "2.0.3",
 		"@tiptap/react": "2.0.3",
 		"@tiptap/starter-kit": "2.0.3",
-		"@trpc/client": "10.30.0",
-		"@trpc/next": "10.30.0",
-		"@trpc/react-query": "10.30.0",
-		"@trpc/server": "10.30.0",
+		"@trpc/client": "10.31.0",
+		"@trpc/next": "10.31.0",
+		"@trpc/react-query": "10.31.0",
+		"@trpc/server": "10.31.0",
 		"@vercel/analytics": "1.0.1",
 		"@vercel/kv": "0.2.1",
 		"@weareinreach/api": "workspace:*",
@@ -80,7 +81,7 @@
 		"embla-carousel-autoplay": "7.1.0",
 		"embla-carousel-react": "7.1.0",
 		"flat": "5.0.2",
-		"i18next": "22.5.1",
+		"i18next": "23.2.1",
 		"i18next-browser-languagedetector": "7.0.2",
 		"i18next-chained-backend": "4.4.0",
 		"i18next-http-backend": "2.2.1",
@@ -93,45 +94,47 @@
 		"luxon": "3.3.0",
 		"next": "13.4.6",
 		"next-auth": "4.22.1",
-		"next-i18next": "13.3.0",
+		"next-i18next": "14.0.0",
 		"next-seo": "6.0.0",
 		"nextjs-routes": "1.0.9",
 		"object-sizeof": "2.6.1",
 		"pretty-bytes": "6.1.0",
 		"react": "18.2.0",
 		"react-dom": "18.2.0",
 		"react-error-boundary": "4.0.10",
-		"react-i18next": "12.3.1",
+		"react-i18next": "13.0.0",
 		"tslog": "4.8.2",
 		"zod": "3.21.4"
 	},
 	"devDependencies": {
 		"@playwright/test": "1.35.1",
-		"@prisma/nextjs-monorepo-workaround-plugin": "4.15.0",
-		"@tanstack/react-query-devtools": "4.29.13",
+		"@prisma/nextjs-monorepo-workaround-plugin": "4.16.0",
+		"@tanstack/react-query-devtools": "4.29.15",
 		"@tanstack/react-table-devtools": "8.7.6",
 		"@total-typescript/ts-reset": "0.4.2",
 		"@types/eslint": "8.40.2",
 		"@types/flat": "5.0.2",
 		"@types/luxon": "3.3.0",
 		"@types/node": "18.16.18",
 		"@types/prettier": "2.7.3",
-		"@types/react": "18.2.12",
-		"@types/react-dom": "18.2.5",
+		"@types/react": "18.2.13",
+		"@types/react-dom": "18.2.6",
 		"@types/umami": "0.1.1",
-		"@typescript-eslint/eslint-plugin": "5.59.11",
-		"@typescript-eslint/parser": "5.59.11",
+		"@typescript-eslint/eslint-plugin": "5.60.0",
+		"@typescript-eslint/parser": "5.60.0",
 		"@weareinreach/config": "workspace:*",
 		"@weareinreach/eslint-config": "0.100.0",
-		"commander": "10.0.1",
-		"dotenv": "16.1.4",
-		"eslint": "8.42.0",
+		"commander": "11.0.0",
+		"dotenv": "16.3.1",
+		"eslint": "8.43.0",
 		"eslint-plugin-i18next": "6.0.3",
+		"i18next-resources-for-ts": "1.2.1",
 		"listr2": "6.6.0",
 		"prettier": "2.8.8",
 		"trpc-client-devtools-link": "0.2.1-next",
 		"trpc-panel": "1.3.4",
 		"trpc-playground": "1.0.4",
+		"type-fest": "3.12.0",
 		"typescript": "5.1.3"
 	},
 	"ct3aMetadata": {

apps/app/public/locales/af/common.json

@@ -17,16 +17,19 @@
 		"title": "Anti-haat verbintenis"
 	},
 	"badge": {
+		"claimed-tool-tip": "Hierdie organisasie is deur 'n geverifieerde verteenwoordiger geëis. <link1>Kom meer te wete.</link1>",
 		"community-tool-tip": "Gemeenskap bedien deur hierdie organisasie.",
-		"service-tool-tip": "Diens (s) wat deur hierdie organisasie aangebied word."
+		"remote-tool-tip": "Beskikbaar op afstand",
+		"service-tool-tip": "Diens (s) wat deur hierdie organisasie aangebied word.",
+		"unclaimed-tool-tip": "Hierdie organisasie is nog nie deur 'n verteenwoordiger geëis nie. <link1>Eis hierdie organisasie</link1> om vertroue met ons gemeenskap op te bou, jou eie inligting op te dateer, en meer."
 	},
 	"breadcrumb": {
 		"back-to-dynamic": "Terug na <u>{{page}}</u>",
 		"back-to-search": "Terug na soek"
 	},
 	"cancel": "Kanselleer",
 	"claim-org-modal": {
-		"list": "<textUtility1>🔗 Claim your organization’s profile page and build trust with your audience on InReach</textUtility1>\n<textUtility1>✍🏾 Update your organization's information on InReach</textUtility1>\n<textUtility1>📨 Invite other staff to join your organization on InReach (coming soon!)</textUtility1>\n<textUtility1>🔑 Gain access to future features built specifically for affiliated service providers on InReach</textUtility1>",
+		"list": "<textUtility1>🔗 Claim your organization’s profile page and build trust with your audience on InReach</textUtility1>\n<textUtility1>✍🏾 Update your organization's information on InReach</textUtility1>\n<textUtility1>📨 Invite other staff to join your organization on InReach</textUtility1>\n<textUtility1>🔑 Gain access to future features built specifically for affiliated service providers on InReach</textUtility1>",
 		"title": "<emojiLg>🏠</emojiLg>\n<title2>Hierdie organisasie is nog nie deur 'n diensverskaffer geëis nie.</title2>\n<textDarkGray>U kan hierdie organisasie as diensverskaffer aanspraak maak op:</textDarkGray>"
 	},
 	"claimed": "Beweer",
@@ -186,9 +189,10 @@
 	"privatePractice": "Privaat praktyk",
 	"profile": "Profiel",
 	"questions": "Vrae?",
-	"quick-promo-body": "<textUtility1>💚 Save and share personalized resource lists</textUtility1>\n<textUtility1>💬 Leave public rating/reviews on organizations</textUtility1>\n<textUtility1>🏠 Suggest organizations in your area</textUtility1>\n<textUtility1>🔗 Claim your organization’s profile page</textUtility1>",
+	"quick-promo-body": "<textUtility1>💚 Save and share personalized resource lists</textUtility1>\n<textUtility1>💬 Leave public rating/reviews on organizations</textUtility1>\n<textUtility1>🏠 Suggest organizations in your area</textUtility1>\n<textUtility1>🔗 Claim your organization’s profile page (Coming soon!)</textUtility1>",
 	"quick-promo-heading": "<emojiLg>🌈</emojiLg>\n<title2>You need to log in to do that.</title2>\n<textDarkGray>With a free InReach account you can unlock additional features:</textDarkGray>",
 	"remote-services": "Dienste op afstand beskikbaar",
+	"remote-services-page-title": "Afgeleë dienste",
 	"reset-password": "Stel u wagwoord terug",
 	"reset-password-message": "Ons sal vir jou 'n e-pos stuur om jou wagwoord terug te stel",
 	"resource-saved": "Hulpbron gered.",

apps/app/public/locales/ar/common.json

@@ -17,8 +17,11 @@
 		"title": "الالتزام بمقاومة الكراهية"
 	},
 	"badge": {
+		"claimed-tool-tip": "تم المطالبة بهذه المنظمة من قبل ممثل تم التحقق منه. <link>اعرف المزيد</link>",
 		"community-tool-tip": "المجتمع المحلي الذي تخدمه هذه المنظمة.",
-		"service-tool-tip": "الخدمة (الخدمات) التي تقدمها هذه المنظمة."
+		"remote-tool-tip": "متوفر عن بعد",
+		"service-tool-tip": "الخدمة (الخدمات) التي تقدمها هذه المنظمة.",
+		"unclaimed-tool-tip": "ولم يطالب أحد الممثلين حتى الآن بهذه المنظمة. <link>اطلب هذه المؤسسة</link> لبناء الثقة مع مجتمعنا، قم بتحديث المعلومات الخاصة بك، وأكثر من ذلك."
 	},
 	"breadcrumb": {
 		"back-to-dynamic": "العودة إلى <u>{{page}}</u>",
@@ -193,6 +196,7 @@
 	"quick-promo-body": "<textUtility1>💚 حفظ وتقاسم قوائم الموارد المخصصة</textUtility1>\n<textUtility1>💬 اترك التقييم العام الخاص بالمنظمات</textUtility1>\n<textUtility1>🏠 اقترح منظمات في منطقتك</textUtility1>\n<textUtility1>🔗 اطلب الصفحة الشخصية لمؤسستك</textUtility1>",
 	"quick-promo-heading": "<emojiLg>🌈</emojiLg>\n<title2>تحتاج إلى تسجيل الدخول لتوفير الموارد.</title2>\n<textDarkGray>مع حساب InReach مجاني يمكنك فتح ميزات إضافية:</textDarkGray>",
 	"remote-services": "الخدمات المتاحة عن بعد",
+	"remote-services-page-title": "الخدمات عن بعد",
 	"reset-password": "إعادة تعيين كلمة المرور",
 	"reset-password-message": "سوف نرسل لك رسالة بريد إلكتروني لإعادة تعيين كلمة المرور",
 	"resource-saved": "تم حفظ المصدر.",

apps/app/public/locales/en/common.json

@@ -17,8 +17,11 @@
 		"title": "Anti-hate commitment"
 	},
 	"badge": {
+		"claimed-tool-tip": "This organization has been claimed by a verified representative.<br/><link1>Learn more.</link1>",
 		"community-tool-tip": "Community served by this organization.",
-		"service-tool-tip": "Service(s) offered by this organization."
+		"remote-tool-tip": "Available remotely",
+		"service-tool-tip": "Service(s) offered by this organization.",
+		"unclaimed-tool-tip": "This organization has not yet been claimed by a representative.<br/><link1>Claim this organization</link1> to build trust with our community, update your own information, and more."
 	},
 	"breadcrumb": {
 		"back-to-dynamic": "Back to <u>{{page}}</u>",
@@ -188,6 +191,7 @@
 	"quick-promo-body": "<textUtility1>💚 Save and share personalized resource lists</textUtility1>\n<textUtility1>💬 Leave public rating/reviews on organizations</textUtility1>\n<textUtility1>🏠 Suggest organizations in your area</textUtility1>\n<textUtility1>🔗 Claim your organization’s profile page (Coming soon!)</textUtility1>",
 	"quick-promo-heading": "<emojiLg>🌈</emojiLg>\n<title2>You need to log in to do that.</title2>\n<textDarkGray>With a free InReach account you can unlock additional features:</textDarkGray>",
 	"remote-services": "Services available remotely",
+	"remote-services-page-title": "Remote services",
 	"reset-password": "Reset your password",
 	"reset-password-message": "We will send you an email to reset your password",
 	"resource-saved": "Resource saved.",

apps/app/public/locales/es/common.json

@@ -17,8 +17,11 @@
 		"title": "Compromiso antiodio"
 	},
 	"badge": {
+		"claimed-tool-tip": "Esta organización ha sido reclamada por un representante verificado. <link>Más información.</link>",
 		"community-tool-tip": "Comunidad atendida por esta organización.",
-		"service-tool-tip": "Servicio(s) ofrecido(s) por esta organización."
+		"remote-tool-tip": "Disponible de forma remota",
+		"service-tool-tip": "Servicio(s) ofrecido(s) por esta organización.",
+		"unclaimed-tool-tip": "Esta organización aún no ha sido reclamada por un representante. <link>Reclama a esta organización</link> para generar confianza con nuestra comunidad, actualizar tu propia información y más."
 	},
 	"breadcrumb": {
 		"back-to-dynamic": "Volver a <u>{{page}}</u>",
@@ -189,6 +192,7 @@
 	"quick-promo-body": "<textUtility1>💚 Guardar y compartir listas de recursos personalizados</textUtility1>\n<textUtility1>: speech _balloon: Dejar calificaciones/opiniones públicas sobre las organizaciones</textUtility1>\n<textUtility1>🏠 Sugerir organizaciones en tu área</textUtility1>\n<textUtility1>🔗 Reclamar la página de perfil de su organización</textUtility1>",
 	"quick-promo-heading": "<emojiLg>🌈</emojiLg>\n<title2>Necesitas iniciar sesión para hacer eso.</title2>\n<textDarkGray>Con una cuenta gratuita de InReach puedes desbloquear características adicionales:</textDarkGray>",
 	"remote-services": "Servicios disponibles de forma remota",
+	"remote-services-page-title": "Servicios remotos",
 	"reset-password": "Restablece tu contraseña",
 	"reset-password-message": "Te enviaremos un correo electrónico para restablecer tu contraseña",
 	"resource-saved": "Recurso guardado.",