release: 2024-03-25 (#1186)

.github/workflows/chromatic.yml

@@ -50,7 +50,7 @@ jobs:
 
       # 👇 Runs Chromatic CLI in ./packages/ui
       - name: Publish to Chromatic
-        uses: chromaui/action@306092d42c0743800aadf544ee263cbc56598b1b # v11
+        uses: chromaui/action@ea1eee60c663ccb7e5d4cfd7a05fcc3a25b7c494 # v11
         with:
           workingDir: packages/ui
           projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}

.github/workflows/codeql.yml

@@ -25,6 +25,6 @@ jobs:
       - name: ⤵️ Check out code from GitHub
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: 🏗 Initialize CodeQL
-        uses: github/codeql-action/init@05963f47d870e2cb19a537396c1f668a348c7d8f # v3
+        uses: github/codeql-action/init@1b1aada464948af03b950897e5eb522f92603cc2 # v3
       - name: 🚀 Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@05963f47d870e2cb19a537396c1f668a348c7d8f # v3
+        uses: github/codeql-action/analyze@1b1aada464948af03b950897e5eb522f92603cc2 # v3

.github/workflows/nextjs_bundle_analysis.yml

@@ -54,7 +54,7 @@ jobs:
         run: pnpm install
 
       - name: Restore next build
-        uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
         id: restore-build-cache
         env:
           cache-name: cache-next-build

.github/workflows/njsscan.yml

@@ -37,6 +37,6 @@ jobs:
         with:
           args: '. --sarif --output results.sarif || true'
       - name: Upload njsscan report
-        uses: github/codeql-action/upload-sarif@05963f47d870e2cb19a537396c1f668a348c7d8f # v3
+        uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3
         with:
           sarif_file: results.sarif

.github/workflows/pr-labels.yml

@@ -13,7 +13,7 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GH_ACT_PAT }}
     steps:
       - name: 🏷 Verify PR has a valid label
-        uses: mheap/github-action-required-labels@80a96a4863886addcbc9f681b5b295ba7f5424e1 # v5
+        uses: mheap/github-action-required-labels@132879b972cb7f2ac593006455875098e73cc7f2 # v5
         with:
           labels: 'breaking-change, bugfix, documentation, enhancement, refactor, performance, new-feature, maintenance, ci, dependencies, translations, changelog-ignore, release'
           mode: minimum

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+	"sonarlint.connectedMode.project": {
+		"connectionId": "inreach",
+		"projectKey": "weareinreach_InReach"
+	}
+}

apps/app/.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+	"sonarlint.connectedMode.project": {
+		"connectionId": "inreach",
+		"projectKey": "weareinreach_InReach"
+	}
+}

apps/app/lib/generators/translationKeys.ts

@@ -62,9 +62,9 @@ export const generateTranslationKeys = async (task: PassedTask) => {
 					if (typeof value !== 'string') throw new Error('Invalid nested plural item')
 					outputData[`${item.key}_${key}`] = value
 				}
-			} else {
-				outputData[item.key] = item.text
-			}
+			} //else {
+			if (item.ns === 'attribute') outputData[item.key] = item.text
+			//}
 		}
 		const filename = `${localePath}/${namespace.name}.json`
 

apps/app/next-i18next.config.mjs

@@ -35,14 +35,26 @@ const getUrl = (path) => {
 
 const apiPath = '/api/i18n/load?lng={{lng}}&ns={{ns}}'
 
-const multi = new MultiBackend(null, {
-	backend: HttpBackend,
-	// debounceInterval: 200,
-	backendOption: {
-		loadPath: getUrl(apiPath),
-		allowMultiLoading: true,
+const backendConfig = {
+	CrowdinOTA: {
+		backend: HttpBackend,
+		// debounceInterval: 200,
+		backendOption: {
+			loadPath: getUrl(apiPath),
+			allowMultiLoading: true,
+		},
+	},
+	LocalHTTP: {
+		backend: HttpBackend,
+		backendOption: {
+			loadPath: getUrl('/locales/{{lng}}/{{ns}}.json'),
+			allowMultiLoading: true,
+		},
 	},
-})
+}
+
+const CrowdinOTA = new MultiBackend(null, backendConfig.CrowdinOTA)
+const LocalHTTP = new MultiBackend(null, backendConfig.LocalHTTP)
 
 const plugins = () => {
 	/** @type {any[]} */
@@ -87,17 +99,8 @@ const config = {
 
 	backend: isBrowser
 		? {
-				backendOptions: [
-					{
-						backend: HttpBackend,
-						// debounceInterval: 200,
-						backendOption: {
-							loadPath: getUrl(apiPath),
-							allowMultiLoading: true,
-						},
-					},
-				],
-				backends: [multi],
+				backendOptions: [backendConfig.CrowdinOTA, backendConfig.LocalHTTP],
+				backends: [CrowdinOTA, LocalHTTP],
 			}
 		: undefined,
 	serializeConfig: false,

apps/app/package.json

@@ -36,8 +36,8 @@
 		"@mantine/notifications": "6.0.21",
 		"@mantine/nprogress": "6.0.21",
 		"@mantine/utils": "6.0.21",
-		"@next/bundle-analyzer": "14.1.3",
-		"@next/third-parties": "14.1.3",
+		"@next/bundle-analyzer": "14.1.4",
+		"@next/third-parties": "14.1.4",
 		"@opentelemetry/api": "1.8.0",
 		"@opentelemetry/core": "1.22.0",
 		"@opentelemetry/exporter-trace-otlp-http": "0.49.1",
@@ -47,14 +47,14 @@
 		"@opentelemetry/sdk-trace-node": "1.22.0",
 		"@opentelemetry/semantic-conventions": "1.22.0",
 		"@prisma/instrumentation": "5.11.0",
-		"@sentry/browser": "7.107.0",
-		"@sentry/nextjs": "7.107.0",
-		"@sentry/node": "7.107.0",
-		"@sentry/opentelemetry": "7.107.0",
-		"@sentry/opentelemetry-node": "7.107.0",
-		"@sentry/profiling-node": "7.107.0",
+		"@sentry/browser": "7.108.0",
+		"@sentry/nextjs": "7.108.0",
+		"@sentry/node": "7.108.0",
+		"@sentry/opentelemetry": "7.108.0",
+		"@sentry/opentelemetry-node": "7.108.0",
+		"@sentry/profiling-node": "7.108.0",
 		"@tanstack/react-query": "4.36.1",
-		"@tanstack/react-table": "8.13.2",
+		"@tanstack/react-table": "8.15.0",
 		"@trpc/client": "10.45.2",
 		"@trpc/next": "10.45.2",
 		"@trpc/react-query": "10.45.2",
@@ -87,7 +87,7 @@
 		"just-compare": "2.3.0",
 		"luxon": "3.4.4",
 		"mantine-react-table": "1.3.4",
-		"next": "14.1.3",
+		"next": "14.1.4",
 		"next-auth": "4.24.7",
 		"next-i18next": "15.2.0",
 		"next-seo": "6.5.0",
@@ -109,17 +109,17 @@
 		"@playwright/test": "1.42.1",
 		"@prisma/nextjs-monorepo-workaround-plugin": "5.11.0",
 		"@tanstack/react-query-devtools": "4.36.1",
-		"@tanstack/react-table-devtools": "8.13.2",
+		"@tanstack/react-table-devtools": "8.15.0",
 		"@total-typescript/ts-reset": "0.5.1",
-		"@types/eslint": "8.56.5",
+		"@types/eslint": "8.56.6",
 		"@types/gtag.js": "0.0.19",
 		"@types/luxon": "3.4.2",
-		"@types/node": "20.11.28",
+		"@types/node": "20.11.30",
 		"@types/react": "18.2.67",
 		"@types/react-dom": "18.2.22",
 		"@types/umami": "0.1.5",
-		"@typescript-eslint/eslint-plugin": "7.2.0",
-		"@typescript-eslint/parser": "7.2.0",
+		"@typescript-eslint/eslint-plugin": "7.3.1",
+		"@typescript-eslint/parser": "7.3.1",
 		"@weareinreach/config": "workspace:*",
 		"@weareinreach/eslint-config": "0.100.0",
 		"@welldone-software/why-did-you-render": "8.0.1",
@@ -133,8 +133,8 @@
 		"trpc-client-devtools-link": "0.2.1-next",
 		"trpc-panel": "1.3.4",
 		"trpc-playground": "1.0.4",
-		"type-fest": "4.12.0",
-		"typescript": "5.4.2",
+		"type-fest": "4.13.1",
+		"typescript": "5.4.3",
 		"webpack-bundle-analyzer": "4.10.1"
 	},
 	"ct3aMetadata": {

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

@@ -9,6 +9,7 @@
 		"private-practice": "Private Practice",
 		"religiously-affiliated": "Is godsdienstig geaffilieer",
 		"time-walk-in": "Het inloop-ure",
+		"wheelchair-accessible": "Accessible",
 		"wheelchair-accessible_false": "Nie toeganklik nie",
 		"wheelchair-accessible_true": "Toeganklik"
 	},
@@ -76,6 +77,7 @@
 	},
 	"eligibility": {
 		"CATEGORYNAME": "Geskiktheidsvereistes",
+		"elig-age": "Age eligibility",
 		"elig-age_max": "Under {{max}}",
 		"elig-age_min": "{{min}} and older",
 		"elig-age_range": "{{min}} - {{max}}",
@@ -138,6 +140,9 @@
 		"CATEGORYNAME": "Stelsel",
 		"incompatible-info": "Onverenigbare inligting"
 	},
+	"tpop": {
+		"other": "Target Population - Other"
+	},
 	"userlawpractice": {
 		"CATEGORYNAME": "Regspraktyk Opsies",
 		"corp-law-firm": "Korporatiewe regsfirma",

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

@@ -9,6 +9,7 @@
 		"private-practice": "تدريب خاص",
 		"religiously-affiliated": "منتسب دينيا",
 		"time-walk-in": "له مباريات في الساعات",
+		"wheelchair-accessible": "متيسر",
 		"wheelchair-accessible_false": "لا يمكن الوصول إليها",
 		"wheelchair-accessible_true": "متيسر"
 	},
@@ -76,6 +77,7 @@
 	},
 	"eligibility": {
 		"CATEGORYNAME": "متطلبات الأهلية",
+		"elig-age": "الأهلية للعمر",
 		"elig-age_max": "تحت {{max}}",
 		"elig-age_min": "{{min}} وأقدم",
 		"elig-age_range": "{{min}} - {{max}}",
@@ -138,6 +140,9 @@
 		"CATEGORYNAME": "النظام",
 		"incompatible-info": "معلومات غير متوافقة"
 	},
+	"tpop": {
+		"other": "السكان المستهدفون - غير ذلك"
+	},
 	"userlawpractice": {
 		"CATEGORYNAME": "خيارات الممارسة القانونية",
 		"corp-law-firm": "مكتب محاماة الشركات",

apps/app/public/locales/de-DE/attribute.json

@@ -9,6 +9,7 @@
 		"private-practice": "Private Praxis",
 		"religiously-affiliated": "Ist religiös verbunden",
 		"time-walk-in": "Hat eingehende Stunden",
+		"wheelchair-accessible": "Barrierefrei",
 		"wheelchair-accessible_false": "Nicht zugänglich",
 		"wheelchair-accessible_true": "Barrierefrei"
 	},
@@ -76,6 +77,7 @@
 	},
 	"eligibility": {
 		"CATEGORYNAME": "Anspruchsvoraussetzungen",
+		"elig-age": "Altersberechtigung",
 		"elig-age_max": "Unter {{max}}",
 		"elig-age_min": "{{min}} und älter",
 		"elig-age_range": "{{min}} - {{max}}",
@@ -138,6 +140,9 @@
 		"CATEGORYNAME": "System",
 		"incompatible-info": "Inkompatible Informationen"
 	},
+	"tpop": {
+		"other": "Zielbevölkerung - Andere"
+	},
 	"userlawpractice": {
 		"CATEGORYNAME": "Rechtspraktikoptionen",
 		"corp-law-firm": "Kanzlei",

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

@@ -9,6 +9,7 @@
 		"private-practice": "Private Practice",
 		"religiously-affiliated": "Is religiously affiliated",
 		"time-walk-in": "Has Walk-In Hours",
+		"wheelchair-accessible": "Accessible",
 		"wheelchair-accessible_false": "Not Accessible",
 		"wheelchair-accessible_true": "Accessible"
 	},
@@ -76,6 +77,7 @@
 	},
 	"eligibility": {
 		"CATEGORYNAME": "Eligibility Requirements",
+		"elig-age": "Age eligibility",
 		"elig-age_max": "Under {{max}}",
 		"elig-age_min": "{{min}} and older",
 		"elig-age_range": "{{min}} - {{max}}",
@@ -138,6 +140,9 @@
 		"CATEGORYNAME": "System",
 		"incompatible-info": "Incompatible Information"
 	},
+	"tpop": {
+		"other": "Target Population - Other"
+	},
 	"userlawpractice": {
 		"CATEGORYNAME": "Law Practice Options",
 		"corp-law-firm": "Corporate law firm",

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

@@ -9,6 +9,7 @@
 		"private-practice": "Práctica privada",
 		"religiously-affiliated": "Está afiliado religiosamente",
 		"time-walk-in": "Tiene Horas de Entrada",
+		"wheelchair-accessible": "Accesible",
 		"wheelchair-accessible_false": "No accesible",
 		"wheelchair-accessible_true": "Accesible"
 	},
@@ -76,6 +77,7 @@
 	},
 	"eligibility": {
 		"CATEGORYNAME": "Requisitos de Elegibilidad",
+		"elig-age": "Edad elegible",
 		"elig-age_max": "Menos de {{max}}",
 		"elig-age_min": "{{min}} y mayor",
 		"elig-age_range": "{{min}} - {{max}}",
@@ -138,6 +140,9 @@
 		"CATEGORYNAME": "Sistema",
 		"incompatible-info": "Información Incompatible"
 	},
+	"tpop": {
+		"other": "Población objetivo - Otros"
+	},
 	"userlawpractice": {
 		"CATEGORYNAME": "Opciones de Prácticas de Ley",
 		"corp-law-firm": "Bufete de derecho corporativo",

apps/app/public/locales/fa/attribute.json

@@ -9,6 +9,7 @@
 		"private-practice": "تمرین خصوصی",
 		"religiously-affiliated": "وابسته به مذهب است",
 		"time-walk-in": "ساعت پیاده‌ روی دارد",
+		"wheelchair-accessible": "قابل دسترسی",
 		"wheelchair-accessible_false": "قابل دسترسی نیست",
 		"wheelchair-accessible_true": "قابل دسترسی"
 	},
@@ -76,6 +77,7 @@
 	},
 	"eligibility": {
 		"CATEGORYNAME": "الزامات واجد شرایط بودن",
+		"elig-age": "Age eligibility",
 		"elig-age_max": "زیر {{max}}",
 		"elig-age_min": "{{min}} و قدیمی تر",
 		"elig-age_range": "{{min}} - {{max}}",
@@ -138,6 +140,9 @@
 		"CATEGORYNAME": "سیستم",
 		"incompatible-info": "اطلاعات ناسازگار"
 	},
+	"tpop": {
+		"other": "Target Population - Other"
+	},
 	"userlawpractice": {
 		"CATEGORYNAME": "گزینه های تمرین قانون",
 		"corp-law-firm": "شرکت حقوقی شرکت",

apps/app/public/locales/fr/attribute.json

@@ -9,6 +9,7 @@
 		"private-practice": "Cabinet privé",
 		"religiously-affiliated": "Est affilié à une religion",
 		"time-walk-in": "A des heures d'ouverture sans rendez-vous",
+		"wheelchair-accessible": "Accessible",
 		"wheelchair-accessible_false": "Non Accessible",
 		"wheelchair-accessible_true": "Accessible"
 	},
@@ -76,6 +77,7 @@
 	},
 	"eligibility": {
 		"CATEGORYNAME": "Critères d'admissibilité",
+		"elig-age": "Éligibilité à l'âge",
 		"elig-age_max": "Plus jeune que {{max}}",
 		"elig-age_min": "{{min}} et plus",
 		"elig-age_range": "{{min}} - {{max}}",
@@ -138,6 +140,9 @@
 		"CATEGORYNAME": "Système",
 		"incompatible-info": "Informations incompatibles"
 	},
+	"tpop": {
+		"other": "Population cible - Autres"
+	},
 	"userlawpractice": {
 		"CATEGORYNAME": "Options de cabinets d'avocat",
 		"corp-law-firm": "Cabinet d'avocats d'affaires",

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

@@ -132,7 +132,7 @@
 		"share-feedback": "Partager vos commentaires",
 		"subscribe-newsletter": "S'abonner à notre lettre d'information",
 		"suggest-org": "Suggérer une organisation",
-		"tagline": "Rechercher des ressources LGBTQ+.<br/>\nAtteindre la sécurité.<br/>\nTrouver l'appartenance.",
+		"tagline": "Recherchez des ressources LGBTQ+.<br/>\nAtteignez la sécurité.<br/>\nTrouvez l'appartenance.",
 		"vetting-process": "La procédure de vérification"
 	},
 	"forgot-password": "Mot de passe oublié ?",