feat: update dsfr vue to 2.0, and migrate (#486)

SocialGouv · Sep 12, 2024 · 5825cf1 · 5825cf1
2 parents 4f56d82 + 645e213
commit 5825cf1
Show file tree

Hide file tree

Showing 26 changed files with 2,226 additions and 20,093 deletions.
diff --git a/.talismanrc b/.talismanrc
@@ -242,7 +242,7 @@ fileignoreconfig:
 - filename: packages/shared/src/components/Chat.vue
   checksum: f2dbbf72bf098c7abd2c3aee230d220f5a5a106952883c0e116eb49f4f9d4db7
 - filename: packages/shared/src/components/PasswordInput.vue
-  checksum: 6d60a6028edc072a3300ac06e693436bc38405cb5847bf32c5ef67448cb60ceb
+  checksum: af4fe62dc455e943fcfacaa6ee0495e1ab20f9ed2094ad70c457b7a27ab46759
 - filename: pg/scripts/01-init.sql
   checksum: 20dd5b8d36b1b0517fe185d30003af7866ef5678eed4e7571a6d9797ec3b2a46
 - filename: pg/scripts/02/02-1-geo-init.sql
@@ -268,5 +268,3 @@ fileignoreconfig:
 scopeconfig:
 - scope: node
 version: "1.0"
-e
-version: "1.0"
diff --git a/packages/frontend-bo/Dockerfile b/packages/frontend-bo/Dockerfile
@@ -9,7 +9,7 @@ WORKDIR /app
 
 COPY package.json yarn.lock ./
 COPY packages/shared/package.json packages/shared/
-COPY packages/frontend-bo/package.json packages/frontend-bo/yarn.lock packages/frontend-bo/
+COPY packages/frontend-bo/package.json packages/frontend-bo/
 RUN yarn workspace @vao/frontend-bo install --frozen-lockfile
 
 # these variables are needed at build time because we produce a *static* app

diff --git a/packages/frontend-bo/nuxt.config.ts b/packages/frontend-bo/nuxt.config.ts
@@ -19,10 +19,11 @@ export default defineNuxtConfig({
     "@/assets/css/main.css",
   ],
   modules: [
-    "nuxt-security",
     "@pinia/nuxt",
     "@socialgouv/dsfr-toaster-nuxt-module",
     "nuxt-maplibre",
+    "nuxt-security",
+    "vue-dsfr-nuxt-module",
   ],
   runtimeConfig: {
     public: {

diff --git a/packages/frontend-bo/package.json b/packages/frontend-bo/package.json
@@ -15,11 +15,11 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@gouvfr/dsfr": "~1.12.0",
-    "@gouvminint/vue-dsfr": "~5.18.0",
+    "@gouvfr/dsfr": "~1.12.1",
+    "@gouvminint/vue-dsfr": "~6.0.1",
     "@pinia/nuxt": "~0.5.1",
     "@sentry/vue": "~8.17.0",
-    "@socialgouv/dsfr-toaster-nuxt-module": "~1.3.0",
+    "@socialgouv/dsfr-toaster-nuxt-module": "~1.3.5",
     "@vao/shared": "1.0.0",
     "@vee-validate/i18n": "~4.13.0",
     "@vee-validate/rules": "~4.13.0",
@@ -29,12 +29,13 @@
     "debug": "~4.3.4",
     "nuxt": "~3.12.4",
     "nuxt-maplibre": "^1.0.0",
-    "nuxt-security": "~1.4.0",
-    "oh-vue-icons": "~1.0.0-rc3",
+    "nuxt-security": "^2.0.0-rc.9",
     "pinia": "~2.1.7",
     "ufo": "^1.5.4",
     "vee-validate": "~4.13.0",
+    "vue": "latest",
     "vue-matomo": "~4.2.0",
+    "vue-router": "latest",
     "yup": "~1.4.0"
   },
   "devDependencies": {
@@ -47,7 +48,8 @@
     "prettier": "^3.2.5",
     "sass": "~1.77.0",
     "sass-loader": "~14.2.0",
-    "typescript": "~5.4.3"
+    "typescript": "~5.4.3",
+    "vue-dsfr-nuxt-module": "^2.0.0"
   },
   "lint-staged": {
     "src/**/*.{js,vue,ts}": "npx eslint --cache --max-warnings=0"

diff --git a/packages/frontend-bo/src/components/utils/FileUpload.vue b/packages/frontend-bo/src/components/utils/FileUpload.vue
@@ -53,7 +53,7 @@ const rows = computed(() => {
 
     const buttons = [
       {
-        icon: "ri-delete-bin-2-line",
+        icon: "ri:delete-bin-2-line",
         iconOnly: true,
         tertiary: true,
         noOutline: true,

diff --git a/packages/frontend-bo/src/layouts/default.vue b/packages/frontend-bo/src/layouts/default.vue
@@ -12,22 +12,22 @@ const header = computed(() => ({
     {
       label: "Aide",
       href: "https://vao-assistance.atlassian.net/servicedesk/customer/portals",
-      icon: "ri-question-line",
+      icon: "ri:question-line",
       iconRight: false,
       target: "_blank",
       rel: "noopener noreferrer",
     },
     {
       label: "Mon compte",
       to: `/comptes/mon-compte`,
-      icon: "ri-account-circle-line",
+      icon: "ri:account-circle-line",
       iconRight: false,
       class: userStore.isConnected ? "" : "fr-hidden",
     },
     {
       label: "Se déconnecter",
       onclick: logout,
-      icon: "ri-logout-box-line",
+      icon: "ri:logout-box-line",
       iconRight: false,
       button: true,
       class: userStore.isConnected ? "" : "fr-hidden",

diff --git a/packages/frontend-bo/src/pages/sejours/[declarationId].vue b/packages/frontend-bo/src/pages/sejours/[declarationId].vue
@@ -314,7 +314,7 @@ const tabTitles = computed(() => [
   { title: "Historique de la déclaration" },
   {
     title: `Messagerie ${unreadMessages.value}`,
-    icon: `${unreadMessages.value ? "ri-feedback-line" : ""}`,
+    icon: `${unreadMessages.value ? "ri:feedback-line" : ""}`,
   },
   // TODO(eig): unhide when ok
   /*

diff --git a/packages/frontend-bo/src/plugins/vue-dsfr.js b/packages/frontend-bo/src/plugins/vue-dsfr.js