From 3d7865acf3592545960fad4d49f3650ec8a6f5b6 Mon Sep 17 00:00:00 2001 From: Colin Darie Date: Wed, 17 Apr 2024 10:46:38 +0200 Subject: [PATCH] chore(bun): dsfr 1.10.1 => 1.11.2 Custom patches are not necessary anymore --- bun.lockb | Bin 548972 -> 548972 bytes package.json | 2 +- patches/@gouvfr+dsfr+1.10.1.patch | 156 ------------------------------ 3 files changed, 1 insertion(+), 157 deletions(-) delete mode 100644 patches/@gouvfr+dsfr+1.10.1.patch diff --git a/bun.lockb b/bun.lockb index 13c2b586f4f66b995b42213ec85e0a26a40c0450..1270c43db627142dc5a0201423b57db9637dc88b 100755 GIT binary patch delta 267 zcmV+m0rdXtz#;6wA&@R0P`hBYPSxrGZfehW(;tfM3mI8b_HtGD-q5|G*SO}Yfljqf z0TvCDq**kVm<<6C0YH-xRVR~BRS1XJ4FR{<4FYxRKufrtPm00|4vf~Cu_Z4u;&l?M z^lr1_u5yT7%sh5rU0vJG| z(Kr|TWhK|Yb5|-JaE}jk`}=83&>$_%a#^}G`Y)51n%YK13pB!-Ox0Wo_OVD1dY<1T zTVdwTM12E5=Q(hP<@o}K<@p1*<@p4MrUNl9GKX)V1-EaY2DtN;(FY=zNt6dT0XCPx Reg`3!uayT1x2=>1zssMWf2#lh delta 268 zcmV+n0rURsz#;6wA&@R0@U|SJju{}}e`Wa4cjwP%gUIY#qx%DUmcua{<}V^nfljqf z0TvCDBy%*Em<<6C0X35mRVR~BRS1XJ4FR{<4FYxRKzfj4v0rnUqn^LyuiCoR_BaZC z%QREy4pu7dh4H%+DV`}sSJC3oir=ei+^Y{V;FF1_?U@#TFZvbf4!GDO*O!g?0vJH6 z#WAKg9|%t}z<{5|n5L14OjZs!y`TlX84cE=$^6Z?x|r(d_gQFqZa7L?a6SZiUsWX4 z2G#oc4k|oM^DOs=<@o}K<@p1*<@p4MrUNi8F^6xU1-EaY2DtN=Vf+Rnmr0ZdH~}@6 S0pSKAm#>uv3b(D42fxc!=6`$u diff --git a/package.json b/package.json index a6ea11bca..f0414606a 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "@coldwired/turbo-stream": "^0.11.1", "@coldwired/utils": "^0.11.4", "@frsource/autoresize-textarea": "^2.0.53", - "@gouvfr/dsfr": "^1.10.1", + "@gouvfr/dsfr": "^1.11.2", "@graphiql/plugin-explorer": "^1.0.3", "@graphiql/toolkit": "^0.9.1", "@headlessui/react": "^1.6.6", diff --git a/patches/@gouvfr+dsfr+1.10.1.patch b/patches/@gouvfr+dsfr+1.10.1.patch deleted file mode 100644 index 26eb17322..000000000 --- a/patches/@gouvfr+dsfr+1.10.1.patch +++ /dev/null @@ -1,156 +0,0 @@ -diff --git a/node_modules/@gouvfr/dsfr/dist/dsfr.module.js b/node_modules/@gouvfr/dsfr/dist/dsfr.module.js -index 1ddc56c..2b489ff 100644 ---- a/node_modules/@gouvfr/dsfr/dist/dsfr.module.js -+++ b/node_modules/@gouvfr/dsfr/dist/dsfr.module.js -@@ -3711,7 +3711,7 @@ const COLLAPSE$2 = api.internals.ns.selector('collapse'); - const AccordionSelector = { - GROUP: api.internals.ns.selector('accordions-group'), - ACCORDION: ACCORDION, -- COLLAPSE: `${ACCORDION} > ${COLLAPSE$2}, ${ACCORDION} > *:not(${ACCORDION}, ${COLLAPSE$2}) > ${COLLAPSE$2}, ${ACCORDION} > *:not(${ACCORDION}, ${COLLAPSE$2}) > *:not(${ACCORDION}, ${COLLAPSE$2}) > ${COLLAPSE$2}`, -+ COLLAPSE: `${ACCORDION} > ${COLLAPSE$2}, ${ACCORDION} > *:not(${ACCORDION}):not(${COLLAPSE$2}) > ${COLLAPSE$2}, ${ACCORDION} > *:not(${ACCORDION}):not(${COLLAPSE$2}) > *:not(${ACCORDION}):not(${COLLAPSE$2}) > ${COLLAPSE$2}`, - COLLAPSE_LEGACY: `${ACCORDION} ${COLLAPSE$2}`, - BUTTON: `${ACCORDION}__btn` - }; -@@ -4114,7 +4114,7 @@ const COLLAPSE$1 = api.internals.ns.selector('collapse'); - - const SidemenuSelector = { - LIST: api.internals.ns.selector('sidemenu__list'), -- COLLAPSE: `${ITEM$1} > ${COLLAPSE$1}, ${ITEM$1} > *:not(${ITEM$1}, ${COLLAPSE$1}) > ${COLLAPSE$1}, ${ITEM$1} > *:not(${ITEM$1}, ${COLLAPSE$1}) > *:not(${ITEM$1}, ${COLLAPSE$1}) > ${COLLAPSE$1}`, -+ COLLAPSE: `${ITEM$1} > ${COLLAPSE$1}, ${ITEM$1} > *:not(${ITEM$1}):not(${COLLAPSE$1}) > ${COLLAPSE$1}, ${ITEM$1} > *:not(${ITEM$1}):not(${COLLAPSE$1}) > *:not(${ITEM$1}):not(${COLLAPSE$1}) > ${COLLAPSE$1}`, - COLLAPSE_LEGACY: `${ITEM$1} ${COLLAPSE$1}`, - ITEM: api.internals.ns.selector('sidemenu__item'), - BUTTON: api.internals.ns.selector('sidemenu__btn') -@@ -4731,7 +4731,7 @@ const COLLAPSE = api.internals.ns.selector('collapse'); - - const NavigationSelector = { - NAVIGATION: api.internals.ns.selector('nav'), -- COLLAPSE: `${ITEM} > ${COLLAPSE}, ${ITEM} > *:not(${ITEM}, ${COLLAPSE}) > ${COLLAPSE}, ${ITEM} > *:not(${ITEM}, ${COLLAPSE}) > *:not(${ITEM}, ${COLLAPSE}) > ${COLLAPSE}`, -+ COLLAPSE: `${ITEM} > ${COLLAPSE}, ${ITEM} > *:not(${ITEM}):not(${COLLAPSE}) > ${COLLAPSE}, ${ITEM} > *:not(${ITEM}):not(${COLLAPSE}) > *:not(${ITEM}):not(${COLLAPSE}) > ${COLLAPSE}`, - COLLAPSE_LEGACY: `${ITEM} ${COLLAPSE}`, - ITEM: ITEM, - ITEM_RIGHT: `${ITEM}--align-right`, -diff --git a/node_modules/@gouvfr/dsfr/dist/dsfr.nomodule.js b/node_modules/@gouvfr/dsfr/dist/dsfr.nomodule.js -index ab11d6e..1acad53 100644 ---- a/node_modules/@gouvfr/dsfr/dist/dsfr.nomodule.js -+++ b/node_modules/@gouvfr/dsfr/dist/dsfr.nomodule.js -@@ -4219,7 +4219,7 @@ - var AccordionSelector = { - GROUP: api.internals.ns.selector('accordions-group'), - ACCORDION: ACCORDION, -- COLLAPSE: (ACCORDION + " > " + COLLAPSE$2 + ", " + ACCORDION + " > *:not(" + ACCORDION + ", " + COLLAPSE$2 + ") > " + COLLAPSE$2 + ", " + ACCORDION + " > *:not(" + ACCORDION + ", " + COLLAPSE$2 + ") > *:not(" + ACCORDION + ", " + COLLAPSE$2 + ") > " + COLLAPSE$2), -+ COLLAPSE: (ACCORDION + " > " + COLLAPSE$2 + ", " + ACCORDION + " > *:not(" + ACCORDION + "):not(" + COLLAPSE$2 + ") > " + COLLAPSE$2 + ", " + ACCORDION + " > *:not(" + ACCORDION + "):not(" + COLLAPSE$2 + ") > *:not(" + ACCORDION + "):not(" + COLLAPSE$2 + ") > " + COLLAPSE$2), - COLLAPSE_LEGACY: (ACCORDION + " " + COLLAPSE$2), - BUTTON: (ACCORDION + "__btn") - }; -@@ -4736,7 +4736,7 @@ - - var SidemenuSelector = { - LIST: api.internals.ns.selector('sidemenu__list'), -- COLLAPSE: (ITEM$1 + " > " + COLLAPSE$1 + ", " + ITEM$1 + " > *:not(" + ITEM$1 + ", " + COLLAPSE$1 + ") > " + COLLAPSE$1 + ", " + ITEM$1 + " > *:not(" + ITEM$1 + ", " + COLLAPSE$1 + ") > *:not(" + ITEM$1 + ", " + COLLAPSE$1 + ") > " + COLLAPSE$1), -+ COLLAPSE: (ITEM$1 + " > " + COLLAPSE$1 + ", " + ITEM$1 + " > *:not(" + ITEM$1 + "):not(" + COLLAPSE$1 + ") > " + COLLAPSE$1 + ", " + ITEM$1 + " > *:not(" + ITEM$1 + "):not(" + COLLAPSE$1 + ") > *:not(" + ITEM$1 + "):not(" + COLLAPSE$1 + ") > " + COLLAPSE$1), - COLLAPSE_LEGACY: (ITEM$1 + " " + COLLAPSE$1), - ITEM: api.internals.ns.selector('sidemenu__item'), - BUTTON: api.internals.ns.selector('sidemenu__btn') -@@ -5493,7 +5493,7 @@ - - var NavigationSelector = { - NAVIGATION: api.internals.ns.selector('nav'), -- COLLAPSE: (ITEM + " > " + COLLAPSE + ", " + ITEM + " > *:not(" + ITEM + ", " + COLLAPSE + ") > " + COLLAPSE + ", " + ITEM + " > *:not(" + ITEM + ", " + COLLAPSE + ") > *:not(" + ITEM + ", " + COLLAPSE + ") > " + COLLAPSE), -+ COLLAPSE: (ITEM + " > " + COLLAPSE + ", " + ITEM + " > *:not(" + ITEM + "):not(" + COLLAPSE + ") > " + COLLAPSE + ", " + ITEM + " > *:not(" + ITEM + "):not(" + COLLAPSE + ") > *:not(" + ITEM + "):not(" + COLLAPSE + ") > " + COLLAPSE), - COLLAPSE_LEGACY: (ITEM + " " + COLLAPSE), - ITEM: ITEM, - ITEM_RIGHT: (ITEM + "--align-right"), -diff --git a/node_modules/@gouvfr/dsfr/src/analytics/script/integration/component/transcription/transcription-selector.js b/node_modules/@gouvfr/dsfr/src/analytics/script/integration/component/transcription/transcription-selector.js -index 3df9aff..b8462b9 100644 ---- a/node_modules/@gouvfr/dsfr/src/analytics/script/integration/component/transcription/transcription-selector.js -+++ b/node_modules/@gouvfr/dsfr/src/analytics/script/integration/component/transcription/transcription-selector.js -@@ -5,7 +5,7 @@ const COLLAPSE = api.internals.ns.selector('collapse'); - - export const TranscriptionSelector = { - TRANSCRIPTION: TRANSCRIPTION, -- COLLAPSE: `${TRANSCRIPTION} > ${COLLAPSE}, ${TRANSCRIPTION} > *:not(${TRANSCRIPTION}, ${COLLAPSE}) > ${COLLAPSE}, ${TRANSCRIPTION} > *:not(${TRANSCRIPTION}, ${COLLAPSE}) > *:not(${TRANSCRIPTION}, ${COLLAPSE}) > ${COLLAPSE}`, -+ COLLAPSE: `${TRANSCRIPTION} > ${COLLAPSE}, ${TRANSCRIPTION} > *:not(${TRANSCRIPTION}):not(${COLLAPSE}) > ${COLLAPSE}, ${TRANSCRIPTION} > *:not(${TRANSCRIPTION}):not(${COLLAPSE}) > *:not(${TRANSCRIPTION}):not(${COLLAPSE}) > ${COLLAPSE}`, - COLLAPSE_LEGACY: `${TRANSCRIPTION} ${COLLAPSE}`, - TITLE: `${TRANSCRIPTION}__title` - }; -diff --git a/node_modules/@gouvfr/dsfr/src/analytics/script/integration/component/translate/translate-selector.js b/node_modules/@gouvfr/dsfr/src/analytics/script/integration/component/translate/translate-selector.js -index a39f6b4..8c0c07d 100644 ---- a/node_modules/@gouvfr/dsfr/src/analytics/script/integration/component/translate/translate-selector.js -+++ b/node_modules/@gouvfr/dsfr/src/analytics/script/integration/component/translate/translate-selector.js -@@ -5,6 +5,6 @@ const COLLAPSE = api.internals.ns.selector('collapse'); - - export const TranslateSelector = { - BUTTON: `${TRANSLATE}__btn`, -- COLLAPSE: `${TRANSLATE} > ${COLLAPSE}, ${TRANSLATE} > *:not(${TRANSLATE}, ${COLLAPSE}) > ${COLLAPSE}, ${TRANSLATE} > *:not(${TRANSLATE}, ${COLLAPSE}) > *:not(${TRANSLATE}, ${COLLAPSE}) > ${COLLAPSE}`, -+ COLLAPSE: `${TRANSLATE} > ${COLLAPSE}, ${TRANSLATE} > *:not(${TRANSLATE}):not(${COLLAPSE}) > ${COLLAPSE}, ${TRANSLATE} > *:not(${TRANSLATE}):not(${COLLAPSE}) > *:not(${TRANSLATE}):not(${COLLAPSE}) > ${COLLAPSE}`, - COLLAPSE_LEGACY: `${TRANSLATE} ${COLLAPSE}` - }; -diff --git a/node_modules/@gouvfr/dsfr/src/component/accordion/script/accordion/accordion-selector.js b/node_modules/@gouvfr/dsfr/src/component/accordion/script/accordion/accordion-selector.js -index f0d42e0..8adffc7 100644 ---- a/node_modules/@gouvfr/dsfr/src/component/accordion/script/accordion/accordion-selector.js -+++ b/node_modules/@gouvfr/dsfr/src/component/accordion/script/accordion/accordion-selector.js -@@ -6,7 +6,7 @@ const COLLAPSE = api.internals.ns.selector('collapse'); - export const AccordionSelector = { - GROUP: api.internals.ns.selector('accordions-group'), - ACCORDION: ACCORDION, -- COLLAPSE: `${ACCORDION} > ${COLLAPSE}, ${ACCORDION} > *:not(${ACCORDION}, ${COLLAPSE}) > ${COLLAPSE}, ${ACCORDION} > *:not(${ACCORDION}, ${COLLAPSE}) > *:not(${ACCORDION}, ${COLLAPSE}) > ${COLLAPSE}`, -+ COLLAPSE: `${ACCORDION} > ${COLLAPSE}, ${ACCORDION} > *:not(${ACCORDION}):not(${COLLAPSE}) > ${COLLAPSE}, ${ACCORDION} > *:not(${ACCORDION}):not(${COLLAPSE}) > *:not(${ACCORDION}):not(${COLLAPSE}) > ${COLLAPSE}`, - COLLAPSE_LEGACY: `${ACCORDION} ${COLLAPSE}`, - BUTTON: `${ACCORDION}__btn` - }; -diff --git a/node_modules/@gouvfr/dsfr/src/component/navigation/script/navigation/navigation-selector.js b/node_modules/@gouvfr/dsfr/src/component/navigation/script/navigation/navigation-selector.js -index 6e33241..388dbd3 100644 ---- a/node_modules/@gouvfr/dsfr/src/component/navigation/script/navigation/navigation-selector.js -+++ b/node_modules/@gouvfr/dsfr/src/component/navigation/script/navigation/navigation-selector.js -@@ -5,7 +5,7 @@ const COLLAPSE = api.internals.ns.selector('collapse'); - - export const NavigationSelector = { - NAVIGATION: api.internals.ns.selector('nav'), -- COLLAPSE: `${ITEM} > ${COLLAPSE}, ${ITEM} > *:not(${ITEM}, ${COLLAPSE}) > ${COLLAPSE}, ${ITEM} > *:not(${ITEM}, ${COLLAPSE}) > *:not(${ITEM}, ${COLLAPSE}) > ${COLLAPSE}`, -+ COLLAPSE: `${ITEM} > ${COLLAPSE}, ${ITEM} > *:not(${ITEM}):not(${COLLAPSE}) > ${COLLAPSE}, ${ITEM} > *:not(${ITEM}):not(${COLLAPSE}) > *:not(${ITEM}):not(${COLLAPSE}) > ${COLLAPSE}`, - COLLAPSE_LEGACY: `${ITEM} ${COLLAPSE}`, - ITEM: ITEM, - ITEM_RIGHT: `${ITEM}--align-right`, -diff --git a/node_modules/@gouvfr/dsfr/src/component/sidemenu/script/sidemenu/sidemenu-selector.js b/node_modules/@gouvfr/dsfr/src/component/sidemenu/script/sidemenu/sidemenu-selector.js -index 19921b7..29f207d 100644 ---- a/node_modules/@gouvfr/dsfr/src/component/sidemenu/script/sidemenu/sidemenu-selector.js -+++ b/node_modules/@gouvfr/dsfr/src/component/sidemenu/script/sidemenu/sidemenu-selector.js -@@ -5,7 +5,7 @@ const COLLAPSE = api.internals.ns.selector('collapse'); - - export const SidemenuSelector = { - LIST: api.internals.ns.selector('sidemenu__list'), -- COLLAPSE: `${ITEM} > ${COLLAPSE}, ${ITEM} > *:not(${ITEM}, ${COLLAPSE}) > ${COLLAPSE}, ${ITEM} > *:not(${ITEM}, ${COLLAPSE}) > *:not(${ITEM}, ${COLLAPSE}) > ${COLLAPSE}`, -+ COLLAPSE: `${ITEM} > ${COLLAPSE}, ${ITEM} > *:not(${ITEM}):not(${COLLAPSE}) > ${COLLAPSE}, ${ITEM} > *:not(${ITEM}):not(${COLLAPSE}) > *:not(${ITEM}):not(${COLLAPSE}) > ${COLLAPSE}`, - COLLAPSE_LEGACY: `${ITEM} ${COLLAPSE}`, - ITEM: api.internals.ns.selector('sidemenu__item'), - BUTTON: api.internals.ns.selector('sidemenu__btn') -diff --git a/node_modules/@gouvfr/dsfr/dist/dsfr.module.js b/node_modules/@gouvfr/dsfr/dist/dsfr.module.js -index 1ddc56c..bee3c5a 100644 ---- a/node_modules/@gouvfr/dsfr/dist/dsfr.module.js -+++ b/node_modules/@gouvfr/dsfr/dist/dsfr.module.js -@@ -5506,12 +5506,6 @@ class HeaderLinks extends api.core.Instance { - const copySuffix = '-mobile'; - - const toolsHtml = this.toolsLinks.innerHTML.replace(/ +/g, ' '); -- const menuHtml = this.menuLinks.innerHTML.replace(/ +/g, ' '); -- // Pour éviter de dupliquer des id, on ajoute un suffixe aux id et aria-controls duppliqués. -- let toolsHtmlDuplicateId = toolsHtml.replace(/id="(.*?)"/gm, 'id="$1' + copySuffix + '"'); -- toolsHtmlDuplicateId = toolsHtmlDuplicateId.replace(/()/gm, '$1 aria-controls="$2' + copySuffix + '"$3'); -- -- if (toolsHtmlDuplicateId === menuHtml) return; - - switch (api.mode) { - case api.Modes.ANGULAR: -@@ -5523,7 +5517,11 @@ ${api.header.doc}`); - break; - - default: -- this.menuLinks.innerHTML = toolsHtmlDuplicateId; -+ this.menuLinks.innerHTML = toolsHtml; -+ for (const element of this.menuLinks.querySelectorAll('[id]')) element.id = `${element.id}${copySuffix}`; -+ for (const element of this.menuLinks.querySelectorAll('[aria-controls]')) { -+ element.setAttribute('aria-controls', `${element.getAttribute('aria-controls')}${copySuffix}`); -+ } - } - } - }