Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: ⬆️ met à jour DSFR 1.12.x #844

Merged
merged 44 commits into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
ff71c18
chore: ⬆️ met à jour DSFR 1.12.x
laruiss Jul 3, 2024
e5b0912
test: 🐛 corrige les tests e2e
laruiss Jul 5, 2024
070fe04
feat: :sparkles: Maj 1.12.0 le composant transcription sort de la bal…
DaBadBunny Jul 5, 2024
49c03f1
feat: :sparkles: Maj 1.12.0 composant Card
DaBadBunny Jul 5, 2024
0f616aa
feat: :sparkles: Maj 1.12.0 le composant tuile
DaBadBunny Jul 5, 2024
b346af3
feat: :sparkles: Maj 1.12.0 les liens du composant footer ne sont plu…
DaBadBunny Jul 5, 2024
30e0712
feat!: ✨ utilise iconify au lieu de oh-vue-icons
laruiss Aug 30, 2024
99f2eb6
test(DsfrAccordion): ✅ use storybook play function
laruiss Sep 1, 2024
cd0aea5
chore: 👷 run storybook tests in CI
laruiss Aug 30, 2024
508d1aa
test(DsfrAlert): ✅ use storybook play function
laruiss Aug 31, 2024
7b14568
test(DsfrBreadcrumb): ✅ use storybook play
laruiss Aug 31, 2024
47494c3
test(DsfrButton): ✅ use storybook play function
laruiss Aug 31, 2024
c29c47b
chore: 🧑‍💻 add snippets for play function
laruiss Aug 31, 2024
fd0078b
test(DsfrCallout): ✅ use storybook play
laruiss Aug 31, 2024
abe4f00
test(DsfrCard): ✅ use storybook play
laruiss Sep 1, 2024
d5537f1
chore: ➖ remove cypress and related dependencies
laruiss Sep 1, 2024
2f4b095
docs(DsfrCallout): 📝 ajoute de la documentation
laruiss Sep 2, 2024
df45ccd
test(DsfrCheckbox): ✅ use storybook play
laruiss Sep 2, 2024
f1e87ae
test(DsfrFollow): ✅ use storybook play
laruiss Sep 2, 2024
bc97084
test(DsfrFooter): ✅ use storybook play
laruiss Sep 2, 2024
ccc86e3
test(DsfrHeader): ✅ use storybook play
laruiss Sep 2, 2024
9f47758
test(DsfrHighlight): ✅ use storybook play
laruiss Sep 2, 2024
fc8e0ac
test(DsfrInput): ✅ use storybook play
laruiss Sep 2, 2024
e9c52db
test(DsfrLogo): ✅ use storybook play
laruiss Sep 2, 2024
400304f
test(DsfrPicture|DsfrVideo): ✅ use storybook play
laruiss Sep 2, 2024
39f626d
test(DsfrModal): ✅ use storybook play
laruiss Sep 2, 2024
c64a2ca
test(DsfrNotice): ✅ remove cypress tests
laruiss Sep 2, 2024
9de8888
test(DsfrPagination): ✅ use storybook play
laruiss Sep 2, 2024
0c93083
test: ✅ use storybook play
laruiss Sep 2, 2024
02003b3
test(DsfrRadioButton|DsfrRadioButtonSet): ✅ use storybook play
laruiss Sep 2, 2024
f00ebdb
feat: :sparkles: remanie DsfrTabs pour pouvoir utiliser v-model
laruiss Aug 9, 2024
663ba97
feat(DsfrAccordion): ✨ permet d’utiliser `v-model`
laruiss Aug 9, 2024
5e010bd
docs: 📝 améliore la documentation
laruiss Sep 3, 2024
074ca42
feat: ✨ Mettre à jour DsfrNotice avec l'udpate du Dsfr en 1.12
iNeoO Jul 5, 2024
bfda45d
feat: :sparkles: Mise en place composant DataTable v.1.12.0
DaBadBunny Jul 5, 2024
89ff17f
feat: ✨ ajoute le composant DsfrDataTable
laruiss Sep 3, 2024
cc663da
feat(DsfrDataTable): ✨ permet de sélectionner toutes lignes
laruiss Sep 4, 2024
3600d48
feat(DsfrDataTable): permet le tri par une colonne
laruiss Sep 4, 2024
7620472
feat(DsfrDataTable): ♿ permet de parcourir les cellules au clavier
laruiss Sep 4, 2024
8da2d8b
feat(DsfrDataTable): ✨ permet de sélectionner les colonnes triables
laruiss Sep 4, 2024
419d47a
docs(DsfrDataTable): 📝 ajoute des précisions dans la doc
laruiss Sep 4, 2024
20f6069
docs: 📝 🐛 corrige bug de la doc vitepress
laruiss Sep 4, 2024
f93cdd6
docs: 🐛 corrige bug du build de l’app demo
laruiss Sep 4, 2024
1217a4a
chore(DsfrInputGroup): 🐛 simplifie le DOM
laruiss Sep 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: 18
node-version: 20
- name: Install pnpm
run: npm i -g pnpm
- name: Install dependencies
Expand All @@ -32,5 +32,16 @@ jobs:
run: pnpm lint --quiet
- name: Test
run: pnpm test
- name: Install Playwright
run: pnpx playwright install --with-deps
- name: Build Storybook
run: pnpm build-storybook --quiet
- name: Serve Storybook and run tests
env:
TEST_STORYBOOK_URL: http://localhost:6006
run: |
pnpx concurrently -k -s first -n "SB,TEST" -c "magenta,blue" \
"pnpx http-server storybook-static --port 6006 --silent" \
"pnpx wait-on tcp:6006 && pnpm test-storybook"
- name: Build
run: pnpm build
5 changes: 1 addition & 4 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx --no -- commitlint --edit "$1"
pnpx commitlint --edit "$1"
5 changes: 1 addition & 4 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx lint-staged
pnpx lint-staged
5 changes: 1 addition & 4 deletions .husky/pre-push
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npm test
pnpm test
2 changes: 1 addition & 1 deletion .storybook/preview.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { themes } from '@storybook/theming'
import { withThemeByDataAttribute } from '@storybook/addon-styling'
import { FocusTrap } from 'focus-trap-vue'
import { defineComponent } from 'vue'
import { OhVueIcon as VIcon } from 'oh-vue-icons'
import VIcon from '../src/components/VIcon/VIcon.vue'

import VueDsfrTheme from './vue-dsfr-theme.js'
import '../src/assets/variables-fdr.css'
Expand Down
20 changes: 20 additions & 0 deletions .vitepress/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ const guideItems = [
text: 'Les icônes',
link: '/guide/icones.md',
},
{
text: 'Migrations',
link: '/guide/migrations.md',
},
{
text: 'Guide du développeur',
link: '/guide/guide-developpeur.md',
Expand Down Expand Up @@ -95,6 +99,10 @@ const composants = [
text: 'DsfrAccordion',
link: '/composants/DsfrAccordion.md',
},
{
text: 'DsfrAccordionsGroup',
link: '/composants/DsfrAccordionsGroup.md',
},
{
text: 'DsfrAlert',
link: '/composants/DsfrAlert.md',
Expand All @@ -119,6 +127,10 @@ const composants = [
text: 'DsfrButtonGroup',
link: '/composants/DsfrButtonGroup.md',
},
{
text: 'DsfrCallout',
link: '/composants/DsfrCallout.md',
},
{
text: 'DsfrCard',
link: '/composants/DsfrCard.md',
Expand All @@ -135,6 +147,10 @@ const composants = [
text: 'DsfrConsent',
link: '/composants/DsfrConsent.md',
},
{
text: 'DsfrDataTable',
link: '/composants/DsfrDataTable.md',
},
{
text: 'DsfrErrorPage',
link: '/composants/DsfrErrorPage.md',
Expand Down Expand Up @@ -271,6 +287,10 @@ const composants = [
text: 'DsfrTooltip',
link: '/composants/DsfrTooltip.md',
},
{
text: 'VIcon',
link: '/composants/VIcon.md',
},
]

// https://vitepress.dev/reference/site-config
Expand Down
2 changes: 1 addition & 1 deletion .vitepress/theme/VIconLink.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import type { OhVueIcon as VIcon } from 'oh-vue-icons'
import type VIcon from '../../src/components/VIcon.vue'

withDefaults(defineProps<{
href: string
Expand Down
17 changes: 0 additions & 17 deletions .vitepress/theme/icons.ts

This file was deleted.

5 changes: 1 addition & 4 deletions .vitepress/theme/index.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
import type { Theme } from 'vitepress'
import DefaultTheme from 'vitepress/theme'
import { OhVueIcon as VIcon, addIcons } from 'oh-vue-icons'
import { RouterLink } from 'vue-router'

import Story from './Story.vue'
import AppColors from './AppColors.vue'
import AppIcons from './AppIcons.vue'
import VIconLink from './VIconLink.vue'
import * as vpIcons from './icons'

import './official-icons.css'
import '@gouvfr/dsfr/dist/utility/icons/icons.main.css'
import './style.css'

addIcons(...Object.values(vpIcons))
import VIcon from '../../src/components/VIcon/VIcon.vue'

export default {
extends: DefaultTheme,
Expand Down
1 change: 0 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
// Language support for Vue 3
// https://github.com/johnsoncodehk/volar
"vue.volar",
"vue.vscode-typescript-vue-plugin",

// Language support for PostCSS
// https://github.com/csstools/postcss-language
Expand Down
12 changes: 12 additions & 0 deletions .vscode/vue.code-snippets
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@
// $1, $2 for tab stops, $0 for the final cursor position, and \${1:label}, \${2:another} for placeholders. Placeholders with the
// same ids are connected.
// Example:
"play": {
"scope": "typescript",
"prefix": "play",
"body": [
"$1play = async ({ canvasElement }) => {",
" const canvas = within(canvasElement)",
" const $2 = canvas.get$3",
" expect($4).to$5",
"}"
],
"description": "Crée un début de fonction play de storybook"
},
"vbase": {
"scope": "vue",
"prefix": "vbase",
Expand Down
23 changes: 0 additions & 23 deletions cypress.config.ts

This file was deleted.

39 changes: 0 additions & 39 deletions cypress/support/commands.ts

This file was deleted.

12 changes: 0 additions & 12 deletions cypress/support/component-index.html

This file was deleted.

47 changes: 0 additions & 47 deletions cypress/support/component.ts

This file was deleted.

20 changes: 0 additions & 20 deletions cypress/support/e2e.ts

This file was deleted.

24 changes: 0 additions & 24 deletions cypress/support/index.ts

This file was deleted.

20 changes: 16 additions & 4 deletions demo-app/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,6 @@ const navItems: DsfrNavigationProps['navItems'] = [
to: { name: 'Modal' },
text: 'Modales',
},
{
to: { name: 'Tabs' },
text: 'Onglets',
},
{
to: { name: 'Forms' },
text: 'Formulaires',
Expand All @@ -95,6 +91,22 @@ const navItems: DsfrNavigationProps['navItems'] = [
to: { name: 'Languages' },
text: 'Languages',
},
{
title: 'Accordéons et Onglets',
get active () {
return ['Accordéons', 'Onglets'].includes(route.name as string)
},
links: [
{
to: { name: 'Accordions' },
text: 'Accordéons',
},
{
to: { name: 'Tabs' },
text: 'Onglets',
},
],
},
{
title: 'Alertes et Bandeau',
get active () {
Expand Down
Loading
Loading