From 8fe44b7dff894f4193537b866815ba62c3114181 Mon Sep 17 00:00:00 2001 From: Sylvain Lafay Date: Fri, 26 Sep 2025 15:57:59 +0200 Subject: [PATCH 1/2] chore: upgrade to dsfr 1.14.2 and update the patch-package --- package.json | 8 ++++---- ...gouvfr+dsfr+1.13.2.patch => @gouvfr+dsfr+1.14.2.patch} | 4 ++-- yarn.lock | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) rename patches/{@gouvfr+dsfr+1.13.2.patch => @gouvfr+dsfr+1.14.2.patch} (92%) diff --git a/package.json b/package.json index 9dcca7475..b7d43bcfe 100644 --- a/package.json +++ b/package.json @@ -76,11 +76,11 @@ } }, "devDependencies": { - "@gouvfr/dsfr-chart": "^1.0.0", "@babel/core": "^7.20.2", "@emotion/react": "^11.10.4", "@emotion/styled": "^11.10.4", - "@gouvfr/dsfr": "1.13.2", + "@gouvfr/dsfr": "1.14.2", + "@gouvfr/dsfr-chart": "^1.0.0", "@mui/icons-material": "^5.14.18", "@mui/material": "^5.14.18", "@storybook/addon-a11y": "^6.5.16", @@ -117,6 +117,7 @@ "mustache": "^4.2.0", "next": "13.5.1", "parse-numeric-range": "^1.3.0", + "patch-package": "^8.0.0", "powerhooks": "^0.22.0", "prettier": "^2.3.0", "react": "18.2.0", @@ -128,8 +129,7 @@ "tss-react": "^4.9.1", "type-route": "^1.0.1", "typescript": "^4.9.1", - "vitest": "^0.24.3", - "patch-package": "^8.0.0" + "vitest": "^0.24.3" }, "main": "dist/fr/index.js", "types": "dist/fr/index.d.ts", diff --git a/patches/@gouvfr+dsfr+1.13.2.patch b/patches/@gouvfr+dsfr+1.14.2.patch similarity index 92% rename from patches/@gouvfr+dsfr+1.13.2.patch rename to patches/@gouvfr+dsfr+1.14.2.patch index 80dd896da..9f7764bef 100644 --- a/patches/@gouvfr+dsfr+1.13.2.patch +++ b/patches/@gouvfr+dsfr+1.14.2.patch @@ -8,10 +8,10 @@ index e4d335c..6c53dce 100644 + diff --git a/node_modules/@gouvfr/dsfr/dist/dsfr.module.js b/node_modules/@gouvfr/dsfr/dist/dsfr.module.js -index 3566bc7..e58a87f 100644 +index fcde523..7996e40 100644 --- a/node_modules/@gouvfr/dsfr/dist/dsfr.module.js +++ b/node_modules/@gouvfr/dsfr/dist/dsfr.module.js -@@ -6453,9 +6453,11 @@ class HeaderLinks extends api.core.Instance { +@@ -6461,9 +6461,11 @@ class HeaderLinks extends api.core.Instance { case api.Modes.ANGULAR: case api.Modes.REACT: case api.Modes.VUE: diff --git a/yarn.lock b/yarn.lock index f5aceb8a8..241200b13 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1436,10 +1436,10 @@ vue-custom-element "^3.2.14" vuex "^3.6.0" -"@gouvfr/dsfr@1.13.2": - version "1.13.2" - resolved "https://registry.npmjs.org/@gouvfr/dsfr/-/dsfr-1.13.2.tgz" - integrity sha512-4Q9ggFFzwD/KFr37sJO1hFH9PcqlZ7F3jMiFJXnBLJfkH1+s28vnQp/oXoY8TosWsLMSjdhNCrxvrUdm5XzBlg== +"@gouvfr/dsfr@1.14.2": + version "1.14.2" + resolved "https://registry.yarnpkg.com/@gouvfr/dsfr/-/dsfr-1.14.2.tgz#cbd893eba6bb2151234ae484ac426f3c5ff16b19" + integrity sha512-EJ/ZZMLmSN4KISuuXp0X0lGf+gKVqYATyqgcM5IPhMQAkJ8s5pjzvthjv+Hu6zYk4jwf2NRVt+jQz7JRpw1yiA== "@humanwhocodes/config-array@^0.5.0": version "0.5.0" From da4060d898531ad9a4f818c6784835fbe6e92beb Mon Sep 17 00:00:00 2001 From: Sylvain Lafay Date: Fri, 26 Sep 2025 16:10:20 +0200 Subject: [PATCH 2/2] fix: update placeholder img urls --- stories/Card.stories.tsx | 2 +- stories/Quote.stories.tsx | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/stories/Card.stories.tsx b/stories/Card.stories.tsx index 41024388d..31e12e857 100644 --- a/stories/Card.stories.tsx +++ b/stories/Card.stories.tsx @@ -124,7 +124,7 @@ const defaultProps = { "href": "#" }, "desc": "Lorem ipsum dolor sit amet, consectetur adipiscing, incididunt, ut labore et dolore magna aliqua. Vitae sapien pellentesque habitant morbi tristique senectus et", - "imageUrl": "https://www.systeme-de-design.gouv.fr/img/placeholder.16x9.png", + "imageUrl": "https://www.systeme-de-design.gouv.fr/v1.14/storybook/img/placeholder.16x9.png", "imageAlt": "texte alternatif de l’image" }; diff --git a/stories/Quote.stories.tsx b/stories/Quote.stories.tsx index be16f9c41..12531c8eb 100644 --- a/stories/Quote.stories.tsx +++ b/stories/Quote.stories.tsx @@ -35,7 +35,7 @@ export const Default = getStory({ ), - imageUrl: "//www.systeme-de-design.gouv.fr/img/placeholder.1x1.png", + imageUrl: "//www.systeme-de-design.gouv.fr/v1.14/storybook/img/placeholder.1x1.png", size: "xlarge", className: "" }); @@ -61,7 +61,7 @@ export const QuoteMediumAndAccent = getStory({ ), - imageUrl: "//www.systeme-de-design.gouv.fr/img/placeholder.1x1.png", + imageUrl: "//www.systeme-de-design.gouv.fr/v1.14/storybook/img/placeholder.1x1.png", size: "medium", accentColor: "pink-macaron" }); @@ -69,12 +69,12 @@ export const QuoteMediumAndAccent = getStory({ export const QuoteWithoutDetails = getStory({ text: "Lorem [...] elit ut. ", author: "Auteur", - imageUrl: "//www.systeme-de-design.gouv.fr/img/placeholder.1x1.png" + imageUrl: "//www.systeme-de-design.gouv.fr/v1.14/storybook/img/placeholder.1x1.png" }); export const QuoteWithoutSource = getStory({ text: "Lorem [...] elit ut. ", - imageUrl: "//www.systeme-de-design.gouv.fr/img/placeholder.1x1.png" + imageUrl: "//www.systeme-de-design.gouv.fr/v1.14/storybook/img/placeholder.1x1.png" }); export const QuoteWithoutIllustration = getStory({ @@ -102,7 +102,7 @@ export const QuoteWithoutIllustration = getStory({ export const QuoteWithAccent = getStory({ text: "Lorem [...] elit ut. ", - imageUrl: "//www.systeme-de-design.gouv.fr/img/placeholder.1x1.png", + imageUrl: "//www.systeme-de-design.gouv.fr/v1.14/storybook/img/placeholder.1x1.png", accentColor: "yellow-moutarde", author: "Someone" });