Merge pull request #518 from dnum-mi/tech/remove-duplicate-css

laruiss · web-flow · commit e21212a44cfd · 2023-03-28T12:18:47.000+02:00
Tech/remove duplicate css
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -85,26 +85,26 @@
     "@rollup/plugin-replace": "^5.0.2",
     "@rollup/plugin-url": "^8.0.1",
     "@rushstack/eslint-patch": "^1.2.0",
-    "@storybook/addon-actions": "^7.0.0-rc.7",
-    "@storybook/addon-docs": "^7.0.0-rc.7",
+    "@storybook/addon-actions": "^7.0.0-rc.8",
+    "@storybook/addon-docs": "^7.0.0-rc.8",
     "@storybook/addon-essentials": "^7.0.0-rc.7",
-    "@storybook/addon-interactions": "^7.0.0-rc.7",
+    "@storybook/addon-interactions": "^7.0.0-rc.8",
     "@storybook/addon-links": "^7.0.0-rc.7",
     "@storybook/addon-postcss": "^2.0.0",
     "@storybook/addon-styling": "^0.3.2-next.0",
-    "@storybook/client-api": "^7.0.0-rc.7",
-    "@storybook/client-logger": "^7.0.0-rc.7",
-    "@storybook/core-common": "^7.0.0-rc.7",
+    "@storybook/client-api": "^7.0.0-rc.8",
+    "@storybook/client-logger": "^7.0.0-rc.8",
+    "@storybook/core-common": "^7.0.0-rc.8",
     "@storybook/jest": "^0.0.10",
     "@storybook/testing-library": "^0.0.13",
-    "@storybook/vue3": "^7.0.0-rc.7",
-    "@storybook/vue3-vite": "^7.0.0-rc.7",
+    "@storybook/vue3": "^7.0.0-rc.8",
+    "@storybook/vue3-vite": "^7.0.0-rc.8",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/user-event": "^14.4.3",
     "@testing-library/vue": "^7.0.0",
     "@types/jest": "^29.5.0",
     "@types/jsdom": "^21.1.1",
-    "@types/node": "^18.15.5",
+    "@types/node": "^18.15.10",
     "@types/vue": "^2.0.0",
     "@typescript-eslint/eslint-plugin": "^5.56.0",
     "@typescript-eslint/parser": "^5.56.0",
@@ -143,12 +143,12 @@
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-import": "^15.1.0",
     "postcss-nested": "^6.0.1",
-    "postcss-preset-env": "^8.0.1",
+    "postcss-preset-env": "^8.1.0",
     "postcss-url": "^10.1.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "rimraf": "^4.4.1",
-    "rollup": "^3.20.1",
+    "rollup": "^3.20.2",
     "rollup-plugin-css-only": "^4.3.0",
     "rollup-plugin-postcss": "^4.0.2",
     "rollup-plugin-scss": "^4.0.0",
@@ -157,7 +157,7 @@
     "rollup-plugin-vue": "^6.0.0",
     "semantic-release": "^20.1.3",
     "start-server-and-test": "^2.0.0",
-    "storybook": "^7.0.0-rc.7",
+    "storybook": "^7.0.0-rc.8",
     "tsd-jsdoc": "^2.5.0",
     "typescript": "^5.0.2",
     "vite": "~4.1.0",
diff --git a/src/components/DsfrAccordion/DsfrAccordion.vue b/src/components/DsfrAccordion/DsfrAccordion.vue
@@ -115,5 +115,3 @@ export default defineComponent({
     </div>
   </section>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/accordion/accordion.main.min.css" />
diff --git a/src/components/DsfrAlert/DsfrAlert.vue b/src/components/DsfrAlert/DsfrAlert.vue
@@ -98,5 +98,3 @@ export default defineComponent({
     </div>
   </transition>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/alert/alert.main.min.css" />
diff --git a/src/components/DsfrBadge/DsfrBadge.vue b/src/components/DsfrBadge/DsfrBadge.vue
@@ -29,5 +29,3 @@ defineProps({
     </span>
   </p>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/badge/badge.main.min.css" />
diff --git a/src/components/DsfrBreadcrumb/DsfrBreadcrumb.vue b/src/components/DsfrBreadcrumb/DsfrBreadcrumb.vue
@@ -76,5 +76,3 @@ export default defineComponent({
     </div>
   </nav>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/breadcrumb/breadcrumb.main.min.css" />
diff --git a/src/components/DsfrButton/DsfrButton.vue b/src/components/DsfrButton/DsfrButton.vue
@@ -93,8 +93,6 @@ export default defineComponent({
   </button>
 </template>
 
-<style src="@gouvfr/dsfr/dist/component/button/button.main.min.css" />
-
 <style scoped>
 .inline-flex {
   display: inline-flex;
diff --git a/src/components/DsfrButton/DsfrButtonGroup.vue b/src/components/DsfrButton/DsfrButtonGroup.vue
@@ -102,5 +102,3 @@ export default defineComponent({
     </li>
   </ul>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/button/button.main.min.css"  />
diff --git a/src/components/DsfrCallout/DsfrCallout.vue b/src/components/DsfrCallout/DsfrCallout.vue
@@ -64,8 +64,6 @@ export default defineComponent({
   </div>
 </template>
 
-<style src="@gouvfr/dsfr/dist/component/callout/callout.main.min.css"></style>
-
 <style scoped>
 .fr-callout__text {
   color: var(--text-default-grey);
diff --git a/src/components/DsfrCard/DsfrCard.vue b/src/components/DsfrCard/DsfrCard.vue
@@ -90,5 +90,3 @@ export default defineComponent({
     </div>
   </div>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/card/card.main.min.css" />
diff --git a/src/components/DsfrCheckbox/DsfrCheckbox.vue b/src/components/DsfrCheckbox/DsfrCheckbox.vue
@@ -103,5 +103,3 @@ export default defineComponent({
     </div>
   </div>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/checkbox/checkbox.main.min.css" />
diff --git a/src/components/DsfrConsent/DsfrConsent.vue b/src/components/DsfrConsent/DsfrConsent.vue
@@ -80,5 +80,3 @@ export default defineComponent({
     </li>
   </ul>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/consent/consent.main.min.css" />
diff --git a/src/components/DsfrFileDownload/DsfrFileDownload.vue b/src/components/DsfrFileDownload/DsfrFileDownload.vue
@@ -54,5 +54,3 @@ export default defineComponent({
     </p>
   </div>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/download/download.min.css" />
diff --git a/src/components/DsfrFileDownload/DsfrFileDownloadList.vue b/src/components/DsfrFileDownload/DsfrFileDownloadList.vue
@@ -44,5 +44,3 @@ export default defineComponent({
     </ul>
   </div>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/download/download.min.css" />
diff --git a/src/components/DsfrFileUpload/DsfrFileUpload.vue b/src/components/DsfrFileUpload/DsfrFileUpload.vue
@@ -94,5 +94,3 @@ export default defineComponent({
     </div>
   </div>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/upload/upload.css" />
diff --git a/src/components/DsfrFollow/DsfrFollow.vue b/src/components/DsfrFollow/DsfrFollow.vue
@@ -61,5 +61,3 @@ export default defineComponent({
     </div>
   </div>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/follow/follow.main.min.css" />
diff --git a/src/components/DsfrFooter/DsfrFooter.vue b/src/components/DsfrFooter/DsfrFooter.vue
@@ -273,8 +273,6 @@ export default defineComponent({
   </footer>
 </template>
 
-<style src="@gouvfr/dsfr/dist/component/footer/footer.main.min.css" />
-
 <style scoped>
 .fr-footer {
   color: var(--text-default-grey);
diff --git a/src/components/DsfrFranceConnect/DsfrFranceConnect.vue b/src/components/DsfrFranceConnect/DsfrFranceConnect.vue
@@ -31,5 +31,3 @@ export default defineComponent({
     </p>
   </div>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/connect/connect.main.min.css" />
diff --git a/src/components/DsfrHeader/DsfrHeader.vue b/src/components/DsfrHeader/DsfrHeader.vue
@@ -276,5 +276,3 @@ export default defineComponent({
     </div>
   </header>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/header/header.main.min.css" />
diff --git a/src/components/DsfrHighlight/DsfrHighlight.vue b/src/components/DsfrHighlight/DsfrHighlight.vue
@@ -29,5 +29,3 @@ export default defineComponent({
     </p>
   </div>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/highlight/highlight.main.min.css" />
diff --git a/src/components/DsfrInput/DsfrInput.vue b/src/components/DsfrInput/DsfrInput.vue
@@ -135,8 +135,6 @@ export default defineComponent({
   </div>
 </template>
 
-<style src="@gouvfr/dsfr/dist/component/input/input.main.min.css" />
-
 <style scoped>
 .invisible {
   position: absolute;
diff --git a/src/components/DsfrInput/DsfrInputGroup.vue b/src/components/DsfrInput/DsfrInputGroup.vue
@@ -103,5 +103,3 @@ export default defineComponent({
     </div>
   </div>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/input/input.main.min.css" />
diff --git a/src/components/DsfrLanguageSelector/DsfrLanguageSelector.vue b/src/components/DsfrLanguageSelector/DsfrLanguageSelector.vue
@@ -101,5 +101,3 @@ export default defineComponent({
     </div>
   </nav>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/translate/translate.main.min.css" />
diff --git a/src/components/DsfrLogo/DsfrLogo.vue b/src/components/DsfrLogo/DsfrLogo.vue
@@ -31,5 +31,3 @@ export default defineComponent({
     v-html="text"
   />
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/logo/logo.main.min.css" />
diff --git a/src/components/DsfrMedia/DsfrPicture.vue b/src/components/DsfrMedia/DsfrPicture.vue
@@ -62,5 +62,3 @@ export default defineComponent({
     </figcaption>
   </figure>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/content/content.main.min.css" />
diff --git a/src/components/DsfrMedia/DsfrVideo.vue b/src/components/DsfrMedia/DsfrVideo.vue
@@ -69,5 +69,3 @@ export default defineComponent({
     />
   </figure>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/content/content.main.min.css" />
diff --git a/src/components/DsfrModal/DsfrModal.vue b/src/components/DsfrModal/DsfrModal.vue
@@ -161,8 +161,6 @@ export default defineComponent({
   </focus-trap>
 </template>
 
-<style src="@gouvfr/dsfr/dist/component/modal/modal.main.min.css" />
-
 <style scoped>
 .fr-modal {
   color: var(--text-default-grey);
diff --git a/src/components/DsfrNavigation/DsfrNavigation.vue b/src/components/DsfrNavigation/DsfrNavigation.vue
@@ -126,5 +126,3 @@ export default defineComponent({
   --collapse-max-height: none;
 }
 </style>
-
-<style src="@gouvfr/dsfr/dist/component/navigation/navigation.main.min.css" />
diff --git a/src/components/DsfrPagination/DsfrPagination.vue b/src/components/DsfrPagination/DsfrPagination.vue
@@ -140,8 +140,6 @@ export default defineComponent({
   </nav>
 </template>
 
-<style src="@gouvfr/dsfr/dist/component/pagination/pagination.main.min.css" />
-
 <style scoped>
 .fr-pagination__link:hover {
   background-image: linear-gradient(
diff --git a/src/components/DsfrQuote/DsfrQuote.vue b/src/components/DsfrQuote/DsfrQuote.vue
@@ -68,7 +68,10 @@ export default defineComponent({
         </li>
       </ul>
 
-      <div class="fr-quote__image" v-if="quoteImage">
+      <div
+        v-if="quoteImage"
+        class="fr-quote__image"
+      >
         <img
           :src="quoteImage"
           class="fr-responsive-img"
@@ -79,5 +82,3 @@ export default defineComponent({
     </figcaption>
   </figure>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/quote/quote.main.min.css" />
diff --git a/src/components/DsfrRadioButton/DsfrRadioButton.stories.js b/src/components/DsfrRadioButton/DsfrRadioButton.stories.js
@@ -41,12 +41,23 @@ export const RadioButton = (args, { argTypes }) => ({
     return args
   },
   template: `
-    <DsfrRadioButton
-      v-for="option of options"
-      :modelValue="modelValue"
-      v-bind="option"
-      @update:modelValue="updateCheckedValue($event)"
-    />
+  <div class="fr-form-group">
+    <fieldset
+      class="fr-fieldset"
+    >
+      <div
+        class="fr-fieldset__content"
+        role="radiogroup"
+      >
+        <DsfrRadioButton
+          v-for="option of options"
+          :modelValue="modelValue"
+          v-bind="option"
+          @update:modelValue="updateCheckedValue($event)"
+        />
+      </div>
+    </fieldset>
+  </div>
   `,
   methods: {
     updateCheckedValue (val) {
diff --git a/src/components/DsfrRadioButton/DsfrRadioButton.vue b/src/components/DsfrRadioButton/DsfrRadioButton.vue
@@ -96,5 +96,3 @@ export default defineComponent({
     </div>
   </div>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/radio/radio.main.min.css" />
diff --git a/src/components/DsfrSearchBar/DsfrSearchBar.vue b/src/components/DsfrSearchBar/DsfrSearchBar.vue
@@ -78,8 +78,6 @@ export default defineComponent({
   </div>
 </template>
 
-<style src="@gouvfr/dsfr/dist/component/search/search.main.min.css" />
-
 <style>
 .fr-search-bar > .fr-label + .fr-input {
   margin: 0;
diff --git a/src/components/DsfrSelect/DsfrSelect.vue b/src/components/DsfrSelect/DsfrSelect.vue
@@ -120,5 +120,3 @@ export default defineComponent({
     </p>
   </div>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/select/select.main.min.css" />
diff --git a/src/components/DsfrShare/DsfrShare.vue b/src/components/DsfrShare/DsfrShare.vue
@@ -82,5 +82,3 @@ export default defineComponent({
     </ul>
   </div>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/share/share.main.min.css" />
diff --git a/src/components/DsfrSideMenu/DsfrSideMenu.vue b/src/components/DsfrSideMenu/DsfrSideMenu.vue
@@ -89,5 +89,3 @@ watch(expanded, (isExpanded) => {
     </div>
   </nav>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/sidemenu/sidemenu.main.min.css" />
diff --git a/src/components/DsfrSideMenu/DsfrSideMenuList.vue b/src/components/DsfrSideMenu/DsfrSideMenuList.vue
@@ -90,8 +90,6 @@ export default defineComponent({
   </ul>
 </template>
 
-<style src="@gouvfr/dsfr/dist/component/sidemenu/sidemenu.main.min.css" />
-
 <style>
 .fr-collapse--expanded {
   max-height: none;
diff --git a/src/components/DsfrSkipLinks/DsfrSkipLinks.vue b/src/components/DsfrSkipLinks/DsfrSkipLinks.vue
@@ -42,5 +42,3 @@ export default defineComponent({
     </nav>
   </div>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/skiplink/skiplink.main.min.css" />
diff --git a/src/components/DsfrStepper/DsfrStepper.vue b/src/components/DsfrStepper/DsfrStepper.vue
@@ -35,5 +35,3 @@ export default defineComponent({
     </p>
   </div>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/stepper/stepper.css" />
diff --git a/src/components/DsfrSummary/DsfrSummary.vue b/src/components/DsfrSummary/DsfrSummary.vue
@@ -41,5 +41,3 @@ export default defineComponent({
     </ol>
   </nav>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/summary/summary.main.min.css" />
diff --git a/src/components/DsfrTable/DsfrTable.vue b/src/components/DsfrTable/DsfrTable.vue
@@ -71,5 +71,3 @@ export default defineComponent({
     </table>
   </div>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/table/table.main.min.css" />
diff --git a/src/components/DsfrTabs/DsfrTabs.vue b/src/components/DsfrTabs/DsfrTabs.vue
@@ -176,5 +176,3 @@ export default defineComponent({
     <slot />
   </div>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/tab/tab.main.min.css" />
diff --git a/src/components/DsfrTag/DsfrTag.vue b/src/components/DsfrTag/DsfrTag.vue
@@ -74,8 +74,6 @@ export default defineComponent({
   </component>
 </template>
 
-<style src="@gouvfr/dsfr/dist/component/tag/tag.main.min.css" />
-
 <style scoped>
 .ov-icon {
   margin-top: 0.1rem;
diff --git a/src/components/DsfrTile/DsfrTile.vue b/src/components/DsfrTile/DsfrTile.vue
@@ -86,7 +86,6 @@ export default defineComponent({
   </div>
 </template>
 
-<style src="@gouvfr/dsfr/dist/component/tile/tile.main.min.css" />
 <style scoped>
 .fr-tile.fr-tile--disabled {
   background-color: var(--background-disabled-grey);
diff --git a/src/components/DsfrToggleSwitch/DsfrToggleSwitch.vue b/src/components/DsfrToggleSwitch/DsfrToggleSwitch.vue
@@ -68,5 +68,3 @@ export default defineComponent({
     </p>
   </div>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/toggle/toggle.main.min.css" />
diff --git a/src/components/DsfrTranscription/DsfrTranscription.vue b/src/components/DsfrTranscription/DsfrTranscription.vue
@@ -124,5 +124,3 @@ export default defineComponent({
     </Teleport>
   </div>
 </template>
-
-<style src="@gouvfr/dsfr/dist/component/transcription/transcription.main.min.css" />
diff --git a/src/demo-app/main.js b/src/demo-app/main.js
diff --git a/src/demo-app/views/AppForm.vue b/src/demo-app/views/AppForm.vue
diff --git a/src/index.js b/src/index.js
diff --git a/src/stories/docs/02-guide.stories.mdx b/src/stories/docs/02-guide.stories.mdx
diff --git a/src/stories/docs/04-migration.stories.mdx b/src/stories/docs/04-migration.stories.mdx
