Upgrade Packages (#207)

* chore: patches upgrade

* chore: minor upgrades

* chore: upgrade nuxt

* chore: upgrade nuxt icons

* chore: upgrade @vueuse/core and @vueuse/nuxt

* chore: upgrade @unhead/vue

* chore: update @nuxt/scripts to version 1.3.2

* chore: pin versions for @primeuix/themes, primevue, and @primevue/nuxt-module

PrimeVue is now pinned to v4 (4.5.4 / 4.5.4 / 1.2.5). v5 is now a commercial license with no benefit for our usage; pinning prevents an accidental ^-drift to v5.

* chore: remove deprecated matomo analytics configs

* chore: upgrade eslint

* chore: add ts

* lint: fix eslint issues

* chore: upgrade prettier-plugin-tailwindcss

* lint: apply prettier

* chore: remove vue-router as a direct dependency

* chore: upgrade nuxt-auth-utils

* chore: upgrade @nuxt/icon

* fix: update matomo siteid

Author: itsmohmans

.sample.env

@@ -82,7 +82,3 @@ NUXT_PUBLIC_CMS_PREFIX=/api
 
 #samplr#NUXT_PUBLIC_SCRIPTS_MATOMO_ANALYTICS_MATOMO_URL=
 NUXT_PUBLIC_SCRIPTS_MATOMO_ANALYTICS_MATOMO_URL=
-#samplr#NUXT_PUBLIC_SCRIPTS_MATOMO_ANALYTICS_SITE_ID=
-NUXT_PUBLIC_SCRIPTS_MATOMO_ANALYTICS_SITE_ID=
-#samplr#NUXT_PUBLIC_SCRIPTS_MATOMO_ANALYTICS_TRACKER_URL=
-NUXT_PUBLIC_SCRIPTS_MATOMO_ANALYTICS_TRACKER_URL=

.woodpecker/build-latest-image.yaml

@@ -6,9 +6,9 @@ when:
     evaluate: 'CI_COMMIT_TARGET_BRANCH != "main"'
 
 variables:
-  - &registry_url "https://registry.cloud.josa.ngo"
-  - &docker_repo "registry.cloud.josa.ngo/library/nuha-web"
-  - &slack_channel "builds"
+  - &registry_url 'https://registry.cloud.josa.ngo'
+  - &docker_repo 'registry.cloud.josa.ngo/library/nuha-web'
+  - &slack_channel 'builds'
   - &success_message >
     ✅ *SUCCESS* - Latest Build #{{ build.number }}
 
@@ -34,8 +34,8 @@ steps:
   - name: run-pre-commit-hooks
     image: registry.cloud.josa.ngo/library/pre-commit-runner
     settings:
-      args: "--all-files"
-      skip: "end-of-file-fixer, run-samplr"
+      args: '--all-files'
+      skip: 'end-of-file-fixer, run-samplr'
 
   - name: build-latest-image
     image: woodpeckerci/plugin-docker-buildx

.woodpecker/build-stable-image.yaml

@@ -7,9 +7,9 @@ when:
       exclude: [main]
 
 variables:
-  - &registry_url "https://registry.cloud.josa.ngo"
-  - &docker_repo "registry.cloud.josa.ngo/library/nuha-web"
-  - &slack_channel "builds"
+  - &registry_url 'https://registry.cloud.josa.ngo'
+  - &docker_repo 'registry.cloud.josa.ngo/library/nuha-web'
+  - &slack_channel 'builds'
   - &success_message >
     ✅ *SUCCESS* - Stable Build #{{ build.number }}
 
@@ -35,8 +35,8 @@ steps:
   - name: run-pre-commit-hooks
     image: registry.cloud.josa.ngo/library/pre-commit-runner
     settings:
-      args: "--all-files"
-      skip: "end-of-file-fixer, run-samplr"
+      args: '--all-files'
+      skip: 'end-of-file-fixer, run-samplr'
 
   - name: build-stable-image
     image: woodpeckerci/plugin-docker-buildx

composables/useLinks.ts

@@ -1,9 +1,5 @@
 export type LinkGroup =
-  | 'desktop-header'
-  | 'footer'
-  | 'mobile-header'
-  | 'social'
-  | 'info'
+  'desktop-header' | 'footer' | 'mobile-header' | 'social' | 'info'
 
 export interface Link {
   title(): string

eslint.config.mjs

@@ -1,4 +1,13 @@
 import withNuxt from './.nuxt/eslint.config.mjs'
 import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended'
 
-export default withNuxt([eslintPluginPrettierRecommended])
+export default withNuxt([
+  eslintPluginPrettierRecommended,
+  {
+    name: 'nuha/primevue-pt-hyphenation',
+    rules: {
+      // PrimeVue passthrough (`pt:`) attributes must stay camelCase to match
+      'vue/attribute-hyphenation': ['warn', 'always', { ignore: ['pt:'] }],
+    },
+  },
+])

i18n/locales/ar.json

@@ -220,7 +220,7 @@
       "excelNoData": "ملف Excel لا يحتوي على بيانات",
       "excelRowError": "الصف {row}: يفتقد تعليقًا",
       "excelParseError": "خلل في تحليل ملف Excel",
-    "missingCommentHeader": "عنوان التعليق مفقود",
+      "missingCommentHeader": "عنوان التعليق مفقود",
       "unsupportedFileType": "نوع الملف غير مدعوم",
       "noFileUploaded": "لم يُرفَع أي ملف",
       "fileIsRequired": "الملف مطلوب",

middleware/geolocation.global.ts

@@ -14,7 +14,6 @@ export default defineNuxtRouteMiddleware(async (to) => {
 
   // region code in URL param has the priority over auto-detection
   const countryCode = (to.params.region as string)?.toLowerCase()
-  let isRegionSet = false
   const regionSupported = isRegionSupported(countryCode)
 
   if (countryCode) {
@@ -30,7 +29,7 @@ export default defineNuxtRouteMiddleware(async (to) => {
       (r) => r.countryCode === countryCode
     )?.dialectName as Record<StrapiLocale, string>
 
-    isRegionSet =
+    const isRegionSet =
       (
         await setRegion({
           countryCode,

nuxt.config.ts

@@ -69,8 +69,9 @@ export default defineNuxtConfig({
   scripts: {
     registry: {
       matomoAnalytics: {
+        trigger: 'onNuxtReady',
         matomoUrl: 'https://track.josa.ngo/',
-        siteId: 2,
+        siteId: 25,
         trackerUrl: 'https://track.josa.ngo/matomo.php',
         enableLinkTracking: true,
         watch: true,
@@ -145,10 +146,6 @@ export default defineNuxtConfig({
         matomoAnalytics: {
           // NUXT_PUBLIC_SCRIPTS_MATOMO_ANALYTICS_MATOMO_URL
           matomoUrl: 'https://track.josa.ngo/',
-          // NUXT_PUBLIC_SCRIPTS_MATOMO_ANALYTICS_SITE_ID
-          siteId: 2,
-          // NUXT_PUBLIC_SCRIPTS_MATOMO_ANALYTICS_TRACKER_URL
-          trackerUrl: 'https://track.josa.ngo/matomo.php',
         },
       },
       authEmailEnabled: true,

package.json

@@ -13,40 +13,40 @@
     "lint:fix": "prettier --write --list-different . && npm run lint --fix"
   },
   "dependencies": {
-    "@nuxt/eslint": "1.5.2",
-    "@nuxt/icon": "1.15.0",
-    "@nuxt/scripts": "0.13.2",
-    "@nuxtjs/i18n": "10.0.0",
-    "@primeuix/themes": "^1.2.5",
+    "@nuxt/eslint": "1.16.0",
+    "@nuxt/icon": "2.4.1",
+    "@nuxt/scripts": "1.3.2",
+    "@nuxtjs/i18n": "10.5.0",
+    "@primeuix/themes": "1.2.5",
     "@types/ioredis": "^5.0.0",
     "@types/jsonwebtoken": "^9.0.10",
-    "@unhead/vue": "^2.0.3",
-    "chart.js": "^4.5.0",
-    "eslint": "^9.0.0",
+    "@unhead/vue": "^3.2.3",
+    "chart.js": "^4.5.1",
+    "eslint": "^10.8.0",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-prettier": "^5.5.4",
+    "eslint-plugin-prettier": "^5.5.6",
     "i18n-iso-countries": "^7.14.0",
-    "ioredis": "^5.7.0",
-    "jsonwebtoken": "^9.0.2",
-    "nuxt": "^3.20.2",
+    "ioredis": "^5.11.1",
+    "jsonwebtoken": "^9.0.3",
+    "nuxt": "^4.5.1",
     "nuxt-api-party": "3.4.2",
-    "nuxt-auth-utils": "^0.5.24",
-    "prettier": "^3.7.4",
-    "prettier-plugin-tailwindcss": "^0.7.2",
-    "primevue": "^4.3.9",
-    "qs": "^6.14.0",
-    "vue": "^3.5.17",
-    "vue-chartjs": "^5.3.2",
-    "vue-router": "^4.5.1",
+    "nuxt-auth-utils": "^0.5.29",
+    "prettier": "^3.9.6",
+    "prettier-plugin-tailwindcss": "^0.8.1",
+    "primevue": "4.5.4",
+    "qs": "^6.15.3",
+    "vue": "^3.5.40",
+    "vue-chartjs": "^5.3.4",
     "xlsx": "^0.18.5"
   },
   "devDependencies": {
-    "@iconify-json/circle-flags": "^1.2.8",
+    "@iconify-json/circle-flags": "^1.2.10",
     "@iconify-json/mdi": "^1.2.3",
     "@nuxtjs/tailwindcss": "^6.14.0",
-    "@primevue/nuxt-module": "^4.3.9",
-    "@types/qs": "^6.14.0",
-    "@vueuse/core": "^13.6.0",
-    "@vueuse/nuxt": "^13.6.0"
+    "@primevue/nuxt-module": "4.5.4",
+    "@types/qs": "^6.15.1",
+    "@vueuse/core": "^14.3.0",
+    "@vueuse/nuxt": "^14.3.0",
+    "typescript": "^5"
   }
 }

server/utils/input-parser.ts

@@ -206,7 +206,7 @@ export const parseJsonFile = async (file: File): Promise<CommentData[]> => {
     })
   } catch (error) {
     if (error instanceof SyntaxError) {
-      throw new Error(ERROR_KEYS.JSON_INVALID_FORMAT)
+      throw new Error(ERROR_KEYS.JSON_INVALID_FORMAT, { cause: error })
     }
     throw error
   }