Merge pull request #340 from dnum-mi/develop

RC14

Author: DaBadBunny

build-css.mjs

@@ -3,26 +3,13 @@ import fs from 'fs'
 import mkdirp from 'mkdirp'
 import postcss from 'postcss'
 import atImport from 'postcss-import'
-import postcssNested from 'postcss-nested'
-import postcssPresetEnv from 'postcss-preset-env'
 import postcssUrl from 'postcss-url'
 import csso from 'postcss-csso'
 
 const postcssPlugins = [
   atImport(),
-  postcssNested,
   postcssUrl({ url: 'inline' }),
-  postcssPresetEnv({
-    autoprefixer: {
-      flexbox: 'no-2009',
-    },
-    stage: 1,
-    features: {
-      'custom-properties': false,
-      'focus-visible-pseudo-class': false,
-    },
-  }),
-  csso,
+  csso(),
 ]
 
 mkdirp.sync('dist')
@@ -56,39 +43,3 @@ fs.readFile('./src/main.css', 'utf8', (err, css) => {
       }
     })
 })
-
-fs.readFile('src/assets/fonts-dsfr.css', 'utf8', (err, css) => {
-  if (err) {
-    console.error(err)
-    throw err
-  }
-  postcss(postcssPlugins)
-    .process(css, {
-      from: 'src/assets/fonts-dsfr.css',
-      to: 'dist/fonts-dsfr.css',
-    })
-    .then(result => {
-      fs.writeFile('dist/vue-dsfr-fonts.css', result.css, () => true)
-      if (result.map) {
-        fs.writeFile('dist/vue-dsfr-fonts.css.map', result.map.toString(), () => true)
-      }
-    })
-})
-
-fs.readFile('src/assets/fonts-essential-dsfr.css', 'utf8', (err, css) => {
-  if (err) {
-    console.error(err)
-    throw err
-  }
-  postcss(postcssPlugins)
-    .process(css, {
-      from: 'src/assets/fonts-dsfr.css',
-      to: 'dist/fonts-dsfr.css',
-    })
-    .then(result => {
-      fs.writeFile('dist/vue-dsfr-fonts-essential.css', result.css, () => true)
-      if (result.map) {
-        fs.writeFile('dist/vue-dsfr-fonts-essential.css.map', result.map.toString(), () => true)
-      }
-    })
-})

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@laruiss/vue-dsfr",
-  "version": "1.0.0-beta.35",
+  "version": "1.0.0-beta.53",
   "files": [
     "dist",
     "types",
@@ -24,25 +24,9 @@
       "require": "./dist/vue-dsfr.css",
       "import": "./dist/vue-dsfr.css"
     },
-    "./dist/vue-dsfr-fonts.css": {
-      "require": "./dist/vue-dsfr-fonts.css",
-      "import": "./dist/vue-dsfr-fonts.css"
-    },
-    "./dist/vue-dsfr-fonts-essentials.css": {
-      "require": "./dist/vue-dsfr-fonts-essentials.css",
-      "import": "./dist/vue-dsfr-fonts-essentials.css"
-    },
     "./styles": {
       "require": "./dist/vue-dsfr.css",
       "import": "./dist/vue-dsfr.css"
-    },
-    "./fonts": {
-      "require": "./dist/vue-dsfr-fonts.css",
-      "import": "./dist/vue-dsfr-fonts.css"
-    },
-    "./fonts-essentials": {
-      "require": "./dist/vue-dsfr-fonts-essentials.css",
-      "import": "./dist/vue-dsfr-fonts-essentials.css"
     }
   },
   "publishConfig": {

rollup.config.js

@@ -30,12 +30,6 @@ const postcssPlugins = [
 const baseOutput = {
   globals: {
     vue: 'vue',
-    'oh-vue-icons': 'VIcon',
-    'oh-vue-icons/icons': 'oh-vue-icons/icons',
-    'oh-vue-icons/icons/ri/index.js': 'oh-vue-icons/icons/ri/index.js',
-    'vue-router': 'vue-router',
-    'focus-trap': 'focus-trap',
-    'focus-trap-vue': 'focus-trap-vue',
   },
 }
 

src/components/DsfrAccordion/DsfrAccordion.vue

@@ -48,6 +48,7 @@ export default defineComponent({
         class="fr-accordion__btn"
         :aria-expanded="expanded"
         :aria-controls="id"
+        type="button"
         @click="toggleExpanded()"
       >
         <!-- @slot Slot pour le contenu personnalisé du titre de l’accordéon. Une props du même nom est utilisable pour du texte simple sans mise en forme. -->

src/components/DsfrBreadcrumb/DsfrBreadcrumb.vue

@@ -27,12 +27,6 @@ export default defineComponent({
       hideButton: false,
     }
   },
-
-  computed: {
-    linkComponent () {
-      return '$nuxt' in this ? 'nuxt-link' : 'router-link'
-    },
-  },
 })
 </script>
 
@@ -64,7 +58,7 @@ export default defineComponent({
           :data-testid="`lis`"
         >
           <component
-            :is="linkComponent"
+            :is="'router-link'"
             v-if="link.to"
             class="fr-breadcrumb__link"
             :to="link.to"

src/components/DsfrButton/DsfrButton.vue

@@ -1,11 +1,16 @@
 <script>
 import { defineComponent } from 'vue'
+import { OhVueIcon as VIcon } from 'oh-vue-icons'
 
 // import '@gouvfr/dsfr/dist/component/button/button.module.js'
 
 export default defineComponent({
   name: 'DsfrButton',
 
+  components: {
+    VIcon,
+  },
+
   props: {
     disabled: Boolean,
     label: {

src/components/DsfrCard/DsfrCard.vue

@@ -33,12 +33,6 @@ export default defineComponent({
     horizontal: Boolean,
   },
 
-  computed: {
-    linkComponent () {
-      return '$nuxt' in this ? 'nuxt-link' : 'router-link'
-    },
-  },
-
   methods: {
     goToTargetLink () {
       this.$refs.title.querySelector('.fr-card__link').click()
@@ -59,15 +53,14 @@ export default defineComponent({
         ref="title"
         class="fr-card__title"
       >
-        <component
-          :is="linkComponent"
+        <router-link
           :to="link"
           class="fr-card__link"
           data-testid="card-link"
           @click="$event.stopPropagation()"
         >
           {{ title }}
-        </component>
+        </router-link>
       </h4>
       <p class="fr-card__desc">
         {{ description }}

src/components/DsfrConsent/DsfrConsent.vue

@@ -17,11 +17,8 @@ export default defineComponent({
     isExternalLink () {
       return typeof this.url === 'string' && this.url.startsWith('http')
     },
-    linkComponent () {
-      return '$nuxt' in this ? 'nuxt-link' : 'router-link'
-    },
     is () {
-      return this.url ? (this.isExternalLink ? 'a' : this.linkComponent) : 'a'
+      return this.url ? (this.isExternalLink ? 'a' : 'router-link') : 'a'
     },
     linkProps () {
       return { [this.isExternalLink ? 'href' : 'to']: this.url }

src/components/DsfrFooter/DsfrFooter.vue

@@ -1,5 +1,6 @@
 <script>
 import { defineComponent } from 'vue'
+import { OhVueIcon as VIcon } from 'oh-vue-icons'
 
 import DsfrLogo from '../DsfrLogo/DsfrLogo.vue'
 import DsfrFooterPartners from '../DsfrFooter/DsfrFooterPartners.vue'
@@ -10,6 +11,7 @@ export default defineComponent({
   components: {
     DsfrFooterPartners,
     DsfrLogo,
+    VIcon,
   },
 
   props: {
@@ -110,9 +112,6 @@ export default defineComponent({
         ...this.afterMandatoryLinks,
       ]
     },
-    linkComponent () {
-      return '$nuxt' in this ? 'nuxt-link' : 'router-link'
-    },
     isWithSlotLinkLists () {
       return this.$slots['footer-link-lists']?.().length
     },
@@ -143,15 +142,14 @@ export default defineComponent({
     <div class="fr-container">
       <div class="fr-footer__body">
         <div class="fr-footer__brand fr-enlarge-link">
-          <component
-            :is="linkComponent"
+          <router-link
             :to="homeLink"
             title="Retour à l’accueil"
           >
             <DsfrLogo
               :logo-text="logoText"
             />
-          </component>
+          </router-link>
         </div>
         <div class="fr-footer__content">
           <p
@@ -189,14 +187,13 @@ export default defineComponent({
             :key="index"
             class="fr-footer__bottom-item"
           >
-            <component
-              :is="linkComponent"
+            <router-link
               class="fr-footer__bottom-link"
               :to="link.to"
               :data-testid="link.to"
             >
               {{ link.label }}
-            </component>
+            </router-link>
           </li>
         </ul>
         <div class="fr-footer__bottom-copy">

src/components/DsfrFooter/DsfrFooterLinkList.vue

@@ -14,12 +14,6 @@ export default defineComponent({
       default: () => [],
     },
   },
-
-  computed: {
-    linkComponent () {
-      return '$nuxt' in this ? 'nuxt-link' : 'router-link'
-    },
-  },
 })
 </script>
 
@@ -38,14 +32,13 @@ export default defineComponent({
           class="fr-footer__top-link"
           :to="link.to"
         >{{ link.label }}</a>
-        <component
-          :is="linkComponent"
+        <router-link
           v-else
           class="fr-footer__top-link"
           :to="link.to"
         >
           {{ link.label }}
-        </component>
+        </router-link>
       </li>
     </ul>
   </div>