Merge pull request #704 from dnum-mi/fix/corrige-build

laruiss · web-flow · commit e28cff01db98 · 2023-12-25T18:44:55.000+01:00
fix/corrige build
diff --git a/demo-app/main.js b/demo-app/main.js
@@ -4,7 +4,7 @@ import { createApp } from 'vue'
 import {
   RiCheckboxCircleLine,
   RiNotification3Line,
-} from 'oh-vue-icons/icons/ri/index.js'
+} from 'oh-vue-icons/icons'
 
 import '@gouvfr/dsfr/dist/core/core.main.min.css'
 import '@gouvfr/dsfr/dist/scheme/scheme.min.css'
diff --git a/src/components/DsfrAlert/DsfrAlert.spec.ts b/src/components/DsfrAlert/DsfrAlert.spec.ts
@@ -3,7 +3,7 @@ import { fireEvent, render } from '@testing-library/vue'
 
 import DsfrAlert from './DsfrAlert.vue'
 
-import { RiCloseLine } from 'oh-vue-icons/icons/ri/index.js'
+import { RiCloseLine } from 'oh-vue-icons/icons'
 
 addIcons(RiCloseLine)
 
diff --git a/src/components/DsfrAlert/DsfrAlert.stories.ts b/src/components/DsfrAlert/DsfrAlert.stories.ts
@@ -2,7 +2,7 @@ import DsfrAlert from './DsfrAlert.vue'
 
 import { addIcons } from 'oh-vue-icons'
 
-import { RiCloseLine } from 'oh-vue-icons/icons/ri/index.js'
+import { RiCloseLine } from 'oh-vue-icons/icons'
 
 addIcons(RiCloseLine)
 
diff --git a/src/components/DsfrButton/DsfrButton.stories.ts b/src/components/DsfrButton/DsfrButton.stories.ts
@@ -1,6 +1,6 @@
 import { OhVueIcon as VIcon, addIcons } from 'oh-vue-icons'
 
-import { RiCheckboxCircleLine, RiLoader4Line, RiSearchLine } from 'oh-vue-icons/icons/ri/index.js'
+import { RiCheckboxCircleLine, RiLoader4Line, RiSearchLine } from 'oh-vue-icons/icons'
 
 import DsfrButton from './DsfrButton.vue'
 
diff --git a/src/components/DsfrButton/DsfrButton.vue b/src/components/DsfrButton/DsfrButton.vue
@@ -47,7 +47,7 @@ const iconProps = computed(() => typeof props.icon === 'string'
       'inline-flex': !dsfrIcon,
       'reverse': iconRight && !dsfrIcon,
       'justify-center': !dsfrIcon && iconOnly,
-      [icon]: dsfrIcon,
+      [icon as string]: dsfrIcon,
     }"
     :title="iconOnly ? label : undefined"
     :disabled="disabled"
diff --git a/src/components/DsfrButton/DsfrButtonGroup.stories.ts b/src/components/DsfrButton/DsfrButtonGroup.stories.ts
@@ -1,7 +1,6 @@
 import { OhVueIcon as VIcon, addIcons } from 'oh-vue-icons'
 
-import { RiCheckboxCircleLine } from 'oh-vue-icons/icons/ri/index.js'
-
+import { RiCheckboxCircleLine } from 'oh-vue-icons/icons'
 import DsfrButtonGroup from './DsfrButtonGroup.vue'
 
 addIcons(RiCheckboxCircleLine)
diff --git a/src/components/DsfrButton/DsfrButtonGroup.vue b/src/components/DsfrButton/DsfrButtonGroup.vue
@@ -32,7 +32,8 @@ const groupStyle = computed(() => `--equisized-width: ${equisizedWidth.value};`)
 const computeEquisizedWidth = async () => {
   let maxWidth = 0
   await new Promise((resolve) => setTimeout(resolve, 100))
-  buttonsEl.value?.querySelectorAll('.fr-btn').forEach((button: Element) => {
+  buttonsEl.value?.querySelectorAll('.fr-btn').forEach((btn: Element) => {
+    const button = btn as HTMLButtonElement
     const width = button.offsetWidth
     const buttonStyle = window.getComputedStyle(button)
     const marginLeft = +buttonStyle.marginLeft.replace('px', '')
diff --git a/src/components/DsfrCallout/DsfrCallout.stories.ts b/src/components/DsfrCallout/DsfrCallout.stories.ts
@@ -3,7 +3,7 @@ import { expect, fn } from '@storybook/test'
 import { OhVueIcon as VIcon, addIcons } from 'oh-vue-icons'
 import { within, userEvent } from '@storybook/testing-library'
 
-import { RiInformationLine } from 'oh-vue-icons/icons/ri/index.js'
+import { RiInformationLine } from 'oh-vue-icons/icons'
 
 import DsfrCallout from './DsfrCallout.vue'
 
diff --git a/src/components/DsfrFooter/DsfrFooter.spec.ts b/src/components/DsfrFooter/DsfrFooter.spec.ts
@@ -2,8 +2,7 @@ import { OhVueIcon as VIcon, addIcons } from 'oh-vue-icons'
 import { render } from '@testing-library/vue'
 import { createRouter, createWebHistory } from 'vue-router'
 
-import { RiExternalLinkLine } from 'oh-vue-icons/icons/ri/index.js'
-
+import { RiExternalLinkLine } from 'oh-vue-icons/icons'
 import DsfrFooter from './DsfrFooter.vue'
 
 addIcons(RiExternalLinkLine)
diff --git a/src/components/DsfrFooter/DsfrFooter.stories.ts b/src/components/DsfrFooter/DsfrFooter.stories.ts
@@ -1,6 +1,6 @@
 import { OhVueIcon as VIcon, addIcons } from 'oh-vue-icons'
 
-import { RiExternalLinkLine } from 'oh-vue-icons/icons/ri/index.js'
+import { RiExternalLinkLine } from 'oh-vue-icons/icons'
 
 import DsfrFooter from './DsfrFooter.vue'
 import DsfrFooterLinkList from './DsfrFooterLinkList.vue'
diff --git a/src/components/DsfrHeader/DsfrHeader.spec.ts b/src/components/DsfrHeader/DsfrHeader.spec.ts
@@ -7,7 +7,7 @@ import { createRouter, createWebHistory } from 'vue-router'
 
 import DsfrHeader from './DsfrHeader.vue'
 
-import { RiNotification3Line, RiPhoneLine, RiSearchLine } from 'oh-vue-icons/icons/ri/index.js'
+import { RiNotification3Line, RiPhoneLine, RiSearchLine } from 'oh-vue-icons/icons'
 
 addIcons(RiNotification3Line, RiPhoneLine, RiSearchLine)
 
diff --git a/src/components/DsfrHeader/DsfrHeader.stories.ts b/src/components/DsfrHeader/DsfrHeader.stories.ts
@@ -7,8 +7,7 @@ import {
   RiAddCircleLine,
   RiLockLine,
   RiAccountCircleLine,
-} from 'oh-vue-icons/icons/ri/index.js'
-
+} from 'oh-vue-icons/icons'
 addIcons(
   RiAddCircleLine,
   RiLockLine,
diff --git a/src/components/DsfrInput/DsfrInput.stories.ts b/src/components/DsfrInput/DsfrInput.stories.ts
@@ -5,8 +5,7 @@ import DsfrInputGroup from './DsfrInputGroup.vue'
 
 import { OhVueIcon as VIcon, addIcons } from 'oh-vue-icons'
 
-import { RiQuestionFill } from 'oh-vue-icons/icons/ri/index.js'
-
+import { RiQuestionFill } from 'oh-vue-icons/icons'
 addIcons(RiQuestionFill)
 
 /**
diff --git a/src/components/DsfrModal/DsfrModal.stories.ts b/src/components/DsfrModal/DsfrModal.stories.ts
@@ -6,7 +6,7 @@ import DsfrButton from '../DsfrButton/DsfrButton.vue'
 
 import { OhVueIcon as VIcon, addIcons } from 'oh-vue-icons'
 
-import { RiCheckboxCircleLine } from 'oh-vue-icons/icons/ri/index.js'
+import { RiCheckboxCircleLine } from 'oh-vue-icons/icons'
 import { setup } from '@storybook/vue3'
 
 addIcons(RiCheckboxCircleLine)
diff --git a/src/components/DsfrNavigation/DsfrNavigationMenuLink.stories.ts b/src/components/DsfrNavigation/DsfrNavigationMenuLink.stories.ts
@@ -2,7 +2,7 @@ import DsfrNavigationMenuLink from './DsfrNavigationMenuLink.vue'
 import DsfrNavigation from './DsfrNavigation.vue'
 
 import { addIcons } from 'oh-vue-icons'
-import { RiHome2Line } from 'oh-vue-icons/icons/ri/index.js'
+import { RiHome2Line } from 'oh-vue-icons/icons'
 
 addIcons(RiHome2Line)
 
diff --git a/src/components/DsfrNavigation/DsfrNavigationMenuLink.vue b/src/components/DsfrNavigation/DsfrNavigationMenuLink.vue
@@ -25,7 +25,7 @@ const iconProps = computed(() => (dsfrIcon.value || !props.icon)
   ? undefined
   : (typeof props.icon === 'string')
       ? { scale: defaultScale, name: props.icon }
-      : { scale: defaultScale, ...(props.icon || {}) },
+      : { scale: defaultScale, ...((props.icon as Record<string, string>) || {}) },
 )
 </script>
 
diff --git a/src/components/DsfrRange/DsfrRange.vue b/src/components/DsfrRange/DsfrRange.vue
@@ -135,7 +135,7 @@ onMounted(() => {
         :disabled="disabled"
         :aria-labelledby="`${id}-label`"
         :aria-describedby="`${id}-messages`"
-        @input="emit('update:lowerValue', +$event.target?.value)"
+        @input="emit('update:lowerValue', +($event.target as HTMLInputElement)?.value)"
       >
       <input
         :id="id"
@@ -148,7 +148,7 @@ onMounted(() => {
         :disabled="disabled"
         :aria-labelledby="`${id}-label`"
         :aria-describedby="`${id}-messages`"
-        @input="emit('update:modelValue', +$event.target?.value)"
+        @input="emit('update:modelValue', +($event.target as HTMLInputElement)?.value)"
       >
 
       <span
diff --git a/src/components/DsfrTable/DsfrTableHeader.stories.ts b/src/components/DsfrTable/DsfrTableHeader.stories.ts
@@ -2,7 +2,7 @@ import DsfrTable from './DsfrTable.vue'
 import DsfrTableHeader from './DsfrTableHeader.vue'
 
 import { OhVueIcon as VIcon, addIcons } from 'oh-vue-icons'
-import { RiSortAsc, RiSortDesc } from 'oh-vue-icons/icons/ri/index.js'
+import { RiSortAsc, RiSortDesc } from 'oh-vue-icons/icons'
 
 import './table.stories.css'
 
diff --git a/src/components/DsfrTabs/DsfrTabs.stories.ts b/src/components/DsfrTabs/DsfrTabs.stories.ts
@@ -6,7 +6,7 @@ import DsfrTabContent from './DsfrTabContent.vue'
 
 import { addIcons } from 'oh-vue-icons'
 
-import { RiCheckboxCircleLine } from 'oh-vue-icons/icons/ri/index.js'
+import { RiCheckboxCircleLine } from 'oh-vue-icons/icons'
 import DsfrAccordionsGroup from '../DsfrAccordion/DsfrAccordionsGroup.vue'
 import DsfrAccordion from '../DsfrAccordion/DsfrAccordion.vue'
 
diff --git a/src/components/DsfrTag/DsfrTag.spec.ts b/src/components/DsfrTag/DsfrTag.spec.ts
@@ -5,7 +5,7 @@ import { render } from '@testing-library/vue'
 import DsfrTag from './DsfrTag.vue'
 import DsfrTags from './DsfrTags.vue'
 
-import { RiArrowLeftLine } from 'oh-vue-icons/icons/ri/index.js'
+import { RiArrowLeftLine } from 'oh-vue-icons/icons'
 
 addIcons(RiArrowLeftLine)
 
diff --git a/src/components/DsfrTag/DsfrTags.stories.ts b/src/components/DsfrTag/DsfrTags.stories.ts
@@ -8,7 +8,7 @@ import {
   RiArrowRightFill,
   RiArrowLeftLine,
   RiArrowRightLine,
-} from 'oh-vue-icons/icons/ri/index.js'
+} from 'oh-vue-icons/icons'
 
 addIcons(
   RiArrowLeftFill,
diff --git a/src/components/DsfrTooltip/DsfrTooltip.vue b/src/components/DsfrTooltip/DsfrTooltip.vue
@@ -32,12 +32,12 @@ watch(show, async (value) => {
 
   opacity.value = 0
   await new Promise(resolve => setTimeout(resolve, 100))
-  const sourceTop = source.value?.offsetTop
-  const sourceHeight = source.value?.offsetHeight
-  const sourceWidth = source.value?.offsetWidth
-  const sourceLeft = source.value?.offsetLeft
-  const tooltipHeight = tooltip.value?.offsetHeight
-  const tooltipWidth = tooltip.value?.offsetWidth
+  const sourceTop = source.value?.offsetTop as number
+  const sourceHeight = source.value?.offsetHeight as number
+  const sourceWidth = source.value?.offsetWidth as number
+  const sourceLeft = source.value?.offsetLeft as number
+  const tooltipHeight = tooltip.value?.offsetHeight as number
+  const tooltipWidth = tooltip.value?.offsetWidth as number
   const isSourceAtTop = (sourceTop - tooltipHeight) < 0
   const isSourceAtBottom = !isSourceAtTop && (sourceTop + sourceHeight + tooltipHeight) >= document.documentElement.offsetHeight
   top.value = isSourceAtBottom
diff --git a/src/stories/fondamentaux/icones-personnalisees.stories.mdx b/src/stories/fondamentaux/icones-personnalisees.stories.mdx
@@ -39,7 +39,7 @@ export {
   RiFlagLine,
   RiHome2Line,
   RiRefreshLine,
-} from 'oh-vue-icons/icons/ri/index.js'  // Import de quelques icônes de Remix Icon (ri)
+} from 'oh-vue-icons/icons'  // Import de quelques icônes de Remix Icon (ri)
 ```
 
 ## Autres icônes
@@ -60,7 +60,7 @@ export {
   RiFlagLine,
   RiHome2Line,
   RiRefreshLine,
-} from 'oh-vue-icons/icons/ri/index.js'  // Export de quelques icônes de Remix Icon (ri)
+} from 'oh-vue-icons/icons'  // Export de quelques icônes de Remix Icon (ri)
 
 export {
   FaFlag,
@@ -83,7 +83,7 @@ import {
   RiFlagLine,
   RiHome2Line,
   RiRefreshLine,
-} from 'oh-vue-icons/icons/ri/index.js'  // Import de quelques icônes de Remix Icon (ri)
+} from 'oh-vue-icons/icons'  // Import de quelques icônes de Remix Icon (ri)
 
 const icons = [
   RiCloseLine,
diff --git a/tests/unit/vitest-setup.ts b/tests/unit/vitest-setup.ts
@@ -4,4 +4,4 @@ import '@testing-library/jest-dom'
 window.matchMedia = function () { return { matches: false } }
 
 // jest.mock('oh-vue-icons/dist/v3/icon.es', () => ({ add () {}, template: '<span />' }))
-// jest.mock('oh-vue-icons/icons/ri/index.js', () => ({}))
+// jest.mock('oh-vue-icons/icons', () => ({}))
