diff --git a/apps/docs-bootstrap-v5/package.json b/apps/docs-bootstrap-v5/package.json index b67ee86..ba3230f 100644 --- a/apps/docs-bootstrap-v5/package.json +++ b/apps/docs-bootstrap-v5/package.json @@ -24,6 +24,7 @@ "@storybook/html-vite": "7.0.17", "@storybook/manager-api": "7.0.17", "bootstrap": "^5.3.0-alpha3", + "dsfr-connect": "workspace:dsfr-connect@*", "eslint": "7.32.0", "eslint-config-custom": "workspace:*", "glob": "^10.2.6", diff --git a/apps/docs-infima-v1/package.json b/apps/docs-infima-v1/package.json index e524d4f..59af987 100644 --- a/apps/docs-infima-v1/package.json +++ b/apps/docs-infima-v1/package.json @@ -23,6 +23,7 @@ "@storybook/html": "7.0.17", "@storybook/html-vite": "7.0.17", "@storybook/manager-api": "7.0.17", + "dsfr-connect": "workspace:dsfr-connect@*", "eslint": "7.32.0", "eslint-config-custom": "workspace:*", "glob": "^10.2.6", diff --git a/apps/docs-mui-v5/package.json b/apps/docs-mui-v5/package.json index ecd48bb..e8b7196 100644 --- a/apps/docs-mui-v5/package.json +++ b/apps/docs-mui-v5/package.json @@ -42,6 +42,7 @@ "autosuggest-highlight": "^3.3.4", "clsx": "^1.2.1", "css-mediaquery": "^0.1.2", + "dsfr-connect": "workspace:dsfr-connect@*", "eslint": "7.32.0", "eslint-config-custom": "workspace:*", "fg-loadcss": "^3.1.0", diff --git a/apps/docs-mui-v5/tsconfig.json b/apps/docs-mui-v5/tsconfig.json index b44927e..cfbebc7 100644 --- a/apps/docs-mui-v5/tsconfig.json +++ b/apps/docs-mui-v5/tsconfig.json @@ -3,7 +3,8 @@ "compilerOptions": { "paths": { "@dsfrc/docs/*": ["../../apps/docs/*"], - "@dsfrc/dsfr-connect/*": ["../../packages/dsfr-connect/*"] + "@dsfrc/dsfr-connect/*": ["../../packages/dsfr-connect/*"], + "dsfr-connect/*": ["../../packages/dsfr-connect/*"] } }, "include": [".storybook/**/*.ts", ".storybook/**/*.tsx", "stories/**/*.ts", "stories/**/*.tsx"], diff --git a/apps/docs-vuetify-v3/package.json b/apps/docs-vuetify-v3/package.json index c6108b4..aad9711 100644 --- a/apps/docs-vuetify-v3/package.json +++ b/apps/docs-vuetify-v3/package.json @@ -30,6 +30,7 @@ "@vuelidate/validators": "^2.0.2", "bootstrap": "^5.3.0-alpha3", "date-fns": "^2.30.0", + "dsfr-connect": "workspace:dsfr-connect@*", "eslint": "7.32.0", "eslint-config-custom": "workspace:*", "glob": "^10.2.6", diff --git a/apps/docs-vuetify-v3/tsconfig.json b/apps/docs-vuetify-v3/tsconfig.json index db066a8..c507d89 100644 --- a/apps/docs-vuetify-v3/tsconfig.json +++ b/apps/docs-vuetify-v3/tsconfig.json @@ -4,7 +4,8 @@ "paths": { "@dsfrc/docs/*": ["../../apps/docs/*"], "@dsfrc/dsfr-connect/*": ["../../packages/dsfr-connect/*"], - "@/util/*": ["stories/framework/util/*"] + "@/util/*": ["stories/framework/util/*"], + "dsfr-connect/*": ["../../packages/dsfr-connect/*"] }, "types": ["vite/client"] }, diff --git a/apps/docs/package.json b/apps/docs/package.json index f5dafea..334689f 100644 --- a/apps/docs/package.json +++ b/apps/docs/package.json @@ -20,6 +20,7 @@ "deploy": "netlify deploy --filter docs --dir=dist --prod" }, "devDependencies": { + "@codegouvfr/react-dsfr": "^0.60.0", "@dsfrc/dsfr-connect": "workspace:dsfr-connect@*", "@gouvfr/dsfr": "^1.9.3", "@storybook/addon-docs": "7.0.17", @@ -48,6 +49,7 @@ "commander": "^10.0.1", "concurrently": "^8.0.1", "crisp-sdk-web": "^1.0.18", + "dsfr-connect": "workspace:dsfr-connect@*", "eslint": "7.32.0", "eslint-config-custom": "workspace:*", "fs-extra": "^11.1.1", diff --git a/apps/docs/stories/introduction.mdx b/apps/docs/stories/introduction.stories.mdx similarity index 95% rename from apps/docs/stories/introduction.mdx rename to apps/docs/stories/introduction.stories.mdx index 92d55c6..cbe6fb3 100644 --- a/apps/docs/stories/introduction.mdx +++ b/apps/docs/stories/introduction.stories.mdx @@ -1,4 +1,5 @@ -import { Meta } from '@storybook/blocks'; +import { Tabs } from '@codegouvfr/react-dsfr/Tabs'; +import { Meta, Source } from '@storybook/blocks'; @@ -44,17 +45,13 @@ _L'équipe du DSFR n'est pas à l'origine de cette librairie, les auteurs de `ds ### Projet JavaScript/TypeScript -Avec NPM : - -``` -npm install dsfr-connect -``` - -Avec Yarn : - -``` -yarn add dsfr-connect -``` + }, + { label: 'yarn', isDefault: false, content: }, + { label: 'pnpm', isDefault: false, content: }, + ]} +/> Vous êtes ensuite en mesure d'importer les styles nécessaires pour adapter l'instance de votre framework UI. diff --git a/apps/docs/stories/prerequisites.mdx b/apps/docs/stories/prerequisites.stories.mdx similarity index 100% rename from apps/docs/stories/prerequisites.mdx rename to apps/docs/stories/prerequisites.stories.mdx diff --git a/apps/docs/stories/usage/bootstrap-v5-css.mdx b/apps/docs/stories/usage/bootstrap-v5-css.mdx new file mode 100644 index 0000000..a343bbb --- /dev/null +++ b/apps/docs/stories/usage/bootstrap-v5-css.mdx @@ -0,0 +1,11 @@ +Le fichier CSS statique : + +- Contient tout le style Bootstrap compilé avec nos personnalisations +- Est facile à importer +- Rend par contre difficile la sur-personnalisation si jamais vous vouliez changer des choses + +Pour s'en servir, remplacez juste l'import de style Bootstrap officiel par : + +```ts +import 'dsfr-connect/dist/bootstrap-v5/index.css'; +``` diff --git a/apps/docs/stories/usage/bootstrap-v5-scss.mdx b/apps/docs/stories/usage/bootstrap-v5-scss.mdx new file mode 100644 index 0000000..39356d0 --- /dev/null +++ b/apps/docs/stories/usage/bootstrap-v5-scss.mdx @@ -0,0 +1,14 @@ +import DsfrScssExplanation from '@dsfrc/docs/stories/usage/dsfr-scss.mdx'; + +Le fichier SCSS : + +- Vous permet d'étendre ou de surcharger nos personnalisations pour qu'elles se répercutent sur tous les composants Bootstrap +- Nécessite un peu plus de configuration du fait de compiler le style final dans votre projet + +Pour s'en servir, remplacez l'import de style Bootstrap officiel par : + +```ts +import 'dsfr-connect/src/bootstrap-v5/index.scss'; +``` + + diff --git a/apps/docs/stories/usage/bootstrap-v5.mdx b/apps/docs/stories/usage/bootstrap-v5.mdx deleted file mode 100644 index 55e5b8c..0000000 --- a/apps/docs/stories/usage/bootstrap-v5.mdx +++ /dev/null @@ -1,19 +0,0 @@ -import { Meta } from '@storybook/blocks'; - - - -# bootstrap-v5 - -Remplacez l'import du style par défaut de Bootstrap au sein de votre applicatif. - -Si vous utilisez le préprocesseur SASS vous pouvez importer le style : - -``` -dsfr-connect/src/bootstrap-v5/index.scss -``` - -Sinon pour du CSS "statique" : - -``` -dsfr-connect/dist/bootstrap-v5/index.css -``` diff --git a/apps/docs/stories/usage/bootstrap-v5.stories.mdx b/apps/docs/stories/usage/bootstrap-v5.stories.mdx new file mode 100644 index 0000000..f4b2934 --- /dev/null +++ b/apps/docs/stories/usage/bootstrap-v5.stories.mdx @@ -0,0 +1,18 @@ +import { Tabs } from '@codegouvfr/react-dsfr/Tabs'; +import { Meta } from '@storybook/blocks'; + +import CssTab from '@dsfrc/docs/stories/usage/bootstrap-v5-css.mdx'; +import ScssTab from '@dsfrc/docs/stories/usage/bootstrap-v5-scss.mdx'; + + + +# bootstrap-v5 + +Remplacez l'import du style par défaut de Bootstrap au sein de votre applicatif. + + }, + { label: 'SCSS (thème flexible)', isDefault: false, content: }, + ]} +/> diff --git a/apps/docs/stories/usage/dsfr-scss-vite.mdx b/apps/docs/stories/usage/dsfr-scss-vite.mdx new file mode 100644 index 0000000..aeecece --- /dev/null +++ b/apps/docs/stories/usage/dsfr-scss-vite.mdx @@ -0,0 +1,18 @@ +Dans votre fichier `vite.config.js` vous devez déclarez l'alias suivant au sein de votre configuration actuelle : + +```ts +const path = require('path'); + +// ... + +const viteConfig = { + // ... + resolve: { + // ... + alias: { + // ... + module: path.resolve(__dirname, './node_modules/@gouvfr/dsfr/module'), + }, + }, +}; +``` diff --git a/apps/docs/stories/usage/dsfr-scss-webpack.mdx b/apps/docs/stories/usage/dsfr-scss-webpack.mdx new file mode 100644 index 0000000..d3b37d5 --- /dev/null +++ b/apps/docs/stories/usage/dsfr-scss-webpack.mdx @@ -0,0 +1,18 @@ +Dans votre fichier `webpack.config.js` vous devez déclarez l'alias suivant au sein de votre configuration actuelle : + +```ts +const path = require('path'); + +// ... + +const webpackConfig = { + // ... + resolve: { + // ... + alias: { + // ... + module: path.resolve(__dirname, './node_modules/@gouvfr/dsfr/module'), + }, + }, +}; +``` diff --git a/apps/docs/stories/usage/dsfr-scss.mdx b/apps/docs/stories/usage/dsfr-scss.mdx new file mode 100644 index 0000000..f492441 --- /dev/null +++ b/apps/docs/stories/usage/dsfr-scss.mdx @@ -0,0 +1,24 @@ +import { Tabs } from '@codegouvfr/react-dsfr/Tabs'; +import { Source } from '@storybook/blocks'; + +import ViteTab from '@dsfrc/docs/stories/usage/dsfr-scss-vite.mdx'; +import WebpackTab from '@dsfrc/docs/stories/usage/dsfr-scss-webpack.mdx'; + +Mais comme le fichier `.scss` du thème importe des variables directement depuis le DSFR, vous devez installer leur librairie : + + }, + { label: 'yarn', isDefault: false, content: }, + { label: 'pnpm', isDefault: false, content: }, + ]} +/> + +Et comme la librairie DSFR utilise des alias lors de ces imports de style, nous somme obligés d'en définir un minimum pour que la compilation SCSS fonctionne dans le préprocesseur : + + }, + { label: 'Projet utilisant Vite', isDefault: false, content: }, + ]} +/> diff --git a/apps/docs/stories/usage/email.mdx b/apps/docs/stories/usage/email.stories.mdx similarity index 100% rename from apps/docs/stories/usage/email.mdx rename to apps/docs/stories/usage/email.stories.mdx diff --git a/apps/docs/stories/usage/infima-v1-css.mdx b/apps/docs/stories/usage/infima-v1-css.mdx new file mode 100644 index 0000000..f3527f6 --- /dev/null +++ b/apps/docs/stories/usage/infima-v1-css.mdx @@ -0,0 +1,19 @@ +Spécifiez le thème CSS dans Docusaurus v2 : + +```ts +// docusaurus.config.js + +module.exports = { + // ... + presets: [ + [ + '@docusaurus/preset-classic', + { + theme: { + customCss: [require.resolve('dsfr-connect/dist/infima-v1/index.css')], + }, + }, + ], + ], +}; +``` diff --git a/apps/docs/stories/usage/infima-v1-scss.mdx b/apps/docs/stories/usage/infima-v1-scss.mdx new file mode 100644 index 0000000..4ba80b3 --- /dev/null +++ b/apps/docs/stories/usage/infima-v1-scss.mdx @@ -0,0 +1,25 @@ +import DsfrScssExplanation from '@dsfrc/docs/stories/usage/dsfr-scss.mdx'; + +Pour utiliser du SCSS il faut d'abord suivre leurs instructions sur [https://docusaurus.io/docs/styling-layout#sassscss](https://docusaurus.io/docs/styling-layout#sassscss). + +Puis spécifiez le thème SCSS : + +```ts +// docusaurus.config.js + +module.exports = { + // ... + presets: [ + [ + '@docusaurus/preset-classic', + { + theme: { + customCss: [require.resolve('dsfr-connect/src/infima-v1/index.scss')], + }, + }, + ], + ], +}; +``` + + diff --git a/apps/docs/stories/usage/infima-v1.stories.mdx b/apps/docs/stories/usage/infima-v1.stories.mdx new file mode 100644 index 0000000..24c0e4c --- /dev/null +++ b/apps/docs/stories/usage/infima-v1.stories.mdx @@ -0,0 +1,18 @@ +import { Tabs } from '@codegouvfr/react-dsfr/Tabs'; +import { Meta } from '@storybook/blocks'; + +import CssTab from '@dsfrc/docs/stories/usage/infima-v1-css.mdx'; +import ScssTab from '@dsfrc/docs/stories/usage/infima-v1-scss.mdx'; + + + +# infima-v1 + +_Note: il est peu probable que vous utilisiez Infima hors du cadre d'usage de Docusaurus, c'est pourquoi cet outil est mentionné ci-dessous._ + + }, + { label: 'SCSS (thème flexible)', isDefault: false, content: }, + ]} +/> diff --git a/apps/docs/stories/usage/infirma-v1.mdx b/apps/docs/stories/usage/infirma-v1.mdx deleted file mode 100644 index 3ca56b8..0000000 --- a/apps/docs/stories/usage/infirma-v1.mdx +++ /dev/null @@ -1,33 +0,0 @@ -import { Meta } from '@storybook/blocks'; - - - -# infima-v1 - -_Note: il est peu probable que vous utilisiez Infima hors du cadre d'usage de Docusaurus, c'est pourquoi cet outil est mentionné ci-dessous._ - -Définissez un style CSS dans Docusaurus v2 : - -```ts -// docusaurus.config.js - -module.exports = { - // ... - presets: [ - [ - '@docusaurus/preset-classic', - { - theme: { - customCss: [require.resolve('dsfr-connect/dist/infima-v1/index.css')], - }, - }, - ], - ], -}; -``` - -Si jamais vous voulez utilisez du SASS pour une quelconque raison, veuillez suivre leurs instructions sur [https://docusaurus.io/docs/styling-layout#sassscss](https://docusaurus.io/docs/styling-layout#sassscss) et utiliser le fichier : - -``` -dsfr-connect/src/infima-v1/index.scss -``` diff --git a/apps/docs/stories/usage/mastodon-v4.mdx b/apps/docs/stories/usage/mastodon-v4.stories.mdx similarity index 100% rename from apps/docs/stories/usage/mastodon-v4.mdx rename to apps/docs/stories/usage/mastodon-v4.stories.mdx diff --git a/apps/docs/stories/usage/mui-v5.mdx b/apps/docs/stories/usage/mui-v5.stories.mdx similarity index 100% rename from apps/docs/stories/usage/mui-v5.mdx rename to apps/docs/stories/usage/mui-v5.stories.mdx diff --git a/apps/docs/stories/usage/pdf.mdx b/apps/docs/stories/usage/pdf.stories.mdx similarity index 100% rename from apps/docs/stories/usage/pdf.mdx rename to apps/docs/stories/usage/pdf.stories.mdx diff --git a/apps/docs/stories/usage/storybook-v7.mdx b/apps/docs/stories/usage/storybook-v7.stories.mdx similarity index 99% rename from apps/docs/stories/usage/storybook-v7.mdx rename to apps/docs/stories/usage/storybook-v7.stories.mdx index 454a8ee..a7808f2 100644 --- a/apps/docs/stories/usage/storybook-v7.mdx +++ b/apps/docs/stories/usage/storybook-v7.stories.mdx @@ -80,6 +80,7 @@ _N'hésitez pas à aller voir l'interface `ThemeVars` dans `dsfr-connect/src/sto // .storybook/preview.ts import '@gouvfr/dsfr/dist/dsfr/dsfr.css'; import '@gouvfr/dsfr/dist/utility/utility.css'; + import 'dsfr-connect/dist/fonts/index.css'; ``` diff --git a/apps/docs/stories/usage/vuetify-v3-vite.mdx b/apps/docs/stories/usage/vuetify-v3-vite.mdx new file mode 100644 index 0000000..e13833e --- /dev/null +++ b/apps/docs/stories/usage/vuetify-v3-vite.mdx @@ -0,0 +1,8 @@ +Dans votre fichier `vite.config.js` vous devez adapter votre configuration actuelle pour avoir : + +```ts +vuetify({ + // ... + styles: { configFile: 'node_modules/dsfr-connect/src/vuetify-v3/settings.scss' }, +}); +``` diff --git a/apps/docs/stories/usage/vuetify-v3-webpack.mdx b/apps/docs/stories/usage/vuetify-v3-webpack.mdx new file mode 100644 index 0000000..c7677b6 --- /dev/null +++ b/apps/docs/stories/usage/vuetify-v3-webpack.mdx @@ -0,0 +1,8 @@ +Dans votre fichier `webpack.config.js` vous devez adapter votre configuration actuelle pour avoir : + +```ts +new VuetifyPlugin({ + // ... + styles: { configFile: 'node_modules/dsfr-connect/src/vuetify-v3/settings.scss' }, +}); +``` diff --git a/apps/docs/stories/usage/vuetify-v3.mdx b/apps/docs/stories/usage/vuetify-v3.stories.mdx similarity index 57% rename from apps/docs/stories/usage/vuetify-v3.mdx rename to apps/docs/stories/usage/vuetify-v3.stories.mdx index 262111e..bf3c0c3 100644 --- a/apps/docs/stories/usage/vuetify-v3.mdx +++ b/apps/docs/stories/usage/vuetify-v3.stories.mdx @@ -1,5 +1,10 @@ +import { Tabs } from '@codegouvfr/react-dsfr/Tabs'; import { Meta } from '@storybook/blocks'; +import DsfrScssExplanation from '@dsfrc/docs/stories/usage/dsfr-scss.mdx'; +import ViteTab from '@dsfrc/docs/stories/usage/vuetify-v3-vite.mdx'; +import WebpackTab from '@dsfrc/docs/stories/usage/vuetify-v3-webpack.mdx'; + # vuetify-v3 @@ -7,19 +12,20 @@ import { Meta } from '@storybook/blocks'; Personnaliser Vuetify se fait en 2 temps : 1. on utilise un thème JavaScript pour définir les couleurs principales -2. on utilise un thème SASS/CSS pour modifier la composition de l'application et des composants +2. on utilise un thème SASS/SCSS pour modifier la composition de l'application et des composants Tout d'abord, adaptez votre initialisation du plugin Vuetify : ```ts import '@mdi/font/css/materialdesignicons.css'; -import { getVuetifyOptions } from 'dsfr-connect/src/vuetify-v3'; import { createVuetify } from 'vuetify'; import * as components from 'vuetify/components'; import * as directives from 'vuetify/directives'; import * as labsComponents from 'vuetify/labs/components'; import 'vuetify/styles'; +import { getVuetifyOptions } from 'dsfr-connect/dist/vuetify-v3'; + export default createVuetify({ components: { components, labsComponents }, directives, @@ -29,18 +35,15 @@ export default createVuetify({ Si besoin, se référer à la documentation officielle : [https://v3.vuetifyjs.com/en/getting-started/installation/](https://v3.vuetifyjs.com/en/getting-started/installation/) -Ensuite la partie plus compliqué est que le style des composants est géré différemment de celui de l'application. Il faut modifier le préprocesseur que vous utilisez (Vite/Webpack) afin de lui dire d'utiliser une feuille de style spécifique pour compiler les composants Vuetify. Cela devrait ressembler à : - -```ts -// Vite/Nuxt -vuetify({ - styles: { configFile: 'dsfr-connect/src/vuetify-v3/settings.scss' }, -}); +Ensuite il faut modifier le préprocesseur que vous utilisez afin de lui dire d'utiliser une feuille de style spécifique pour compiler les composants Vuetify. -// Webpack/Vue CLI -new VuetifyPlugin({ - styles: { configFile: 'dsfr-connect/src/vuetify-v3/settings.scss' }, -}); -``` + }, + { label: 'Projet utilisant Vite', isDefault: false, content: }, + ]} +/> Les démarches pour importer ces helpers sont détaillées sur [https://vuetifyjs.com/en/features/sass-variables/#component-specific-variables](https://vuetifyjs.com/en/features/sass-variables/#component-specific-variables). + + diff --git a/apps/docs/tsconfig.json b/apps/docs/tsconfig.json index c1f5714..5a882c3 100644 --- a/apps/docs/tsconfig.json +++ b/apps/docs/tsconfig.json @@ -5,7 +5,8 @@ "baseUrl": ".", "paths": { "@dsfrc/docs/*": ["../../apps/docs/*"], - "@dsfrc/dsfr-connect/*": ["../../packages/dsfr-connect/*"] + "@dsfrc/dsfr-connect/*": ["../../packages/dsfr-connect/*"], + "dsfr-connect/*": ["../../packages/dsfr-connect/*"] }, "composite": false, "declaration": false, diff --git a/apps/docs/utils/storybook/main.ts b/apps/docs/utils/storybook/main.ts index e933f4f..9ee92a4 100644 --- a/apps/docs/utils/storybook/main.ts +++ b/apps/docs/utils/storybook/main.ts @@ -29,8 +29,7 @@ export function getConfig(framework?: string): StorybookConfig { if (framework) { stories.push(path.resolve(__dirname, `../../../../apps/docs-${framework}/stories/**/*.stories.@(js|ts|jsx|tsx|mdx)`)); } else { - stories.push(path.resolve(__dirname, `../../../../apps/docs/stories/**/*.@(mdx)`)); - stories.push(path.resolve(__dirname, `../../../../apps/docs/stories/**/*.stories.@(js|ts|jsx|tsx)`)); + stories.push(path.resolve(__dirname, `../../../../apps/docs/stories/**/*.stories.@(js|ts|jsx|tsx|mdx)`)); } const addons: Preset[] = [ @@ -171,6 +170,10 @@ export function viteFinalFactory(factoryOptions?: ViteFinalFactoryOptions) { find: '@dsfrc/dsfr-connect', replacement: path.resolve(__dirname, '../../../../packages/dsfr-connect'), }, + { + find: 'dsfr-connect', + replacement: path.resolve(__dirname, '../../../../packages/dsfr-connect'), + }, // When using SASS DSFR imports it's unable to find for example `module/string` // so we define here the alias (it should not conflict with other JavaScript librairies) { diff --git a/apps/docs/utils/targets.ts b/apps/docs/utils/targets.ts index 62c677c..a79a6e0 100644 --- a/apps/docs/utils/targets.ts +++ b/apps/docs/utils/targets.ts @@ -1,7 +1,7 @@ import chalk, { Chalk } from 'chalk'; import { build as bootstrapV5Build, downloadAndExtract as bootstrapV5DownloadAndExtract } from '@dsfrc/docs/scripts/bootstrap-v5/actions'; -import { build as infirmaV1Build, downloadAndExtract as infirmaV1DownloadAndExtract } from '@dsfrc/docs/scripts/infima-v1/actions'; +import { build as infimaV1Build, downloadAndExtract as infimaV1DownloadAndExtract } from '@dsfrc/docs/scripts/infima-v1/actions'; import { build as muiV5Build, downloadAndExtract as muiV5DownloadAndExtract } from '@dsfrc/docs/scripts/mui-v5/actions'; import { build as mainBuild, downloadAndExtract as mainDownloadAndExtract } from '@dsfrc/docs/scripts/raw/actions'; import { build as vuetifyV3Build, downloadAndExtract as vuetifyV3DownloadAndExtract } from '@dsfrc/docs/scripts/vuetify-v3/actions'; @@ -49,8 +49,8 @@ export const frameworks: Target[] = [ { name: 'infima-v1', port: 6010, - download: infirmaV1DownloadAndExtract, - extract: infirmaV1Build, + download: infimaV1DownloadAndExtract, + extract: infimaV1Build, terminalFormatter: chalk.red, }, ]; diff --git a/packages/dsfr-connect/src/index.ts b/packages/dsfr-connect/src/index.ts index e807119..9ce3873 100644 --- a/packages/dsfr-connect/src/index.ts +++ b/packages/dsfr-connect/src/index.ts @@ -10,5 +10,5 @@ export default { vuetifyV3: vuetifyV3, muiV5: muiV5, storybookV7: storybookV7, - infirmaV1: {}, + infimaV1: {}, }; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f58ba6d..5264f19 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -60,6 +60,9 @@ importers: apps/docs: devDependencies: + '@codegouvfr/react-dsfr': + specifier: ^0.60.0 + version: 0.60.0 '@dsfrc/dsfr-connect': specifier: workspace:dsfr-connect@* version: link:../../packages/dsfr-connect @@ -144,6 +147,9 @@ importers: crisp-sdk-web: specifier: ^1.0.18 version: 1.0.18 + dsfr-connect: + specifier: workspace:dsfr-connect@* + version: link:../../packages/dsfr-connect eslint: specifier: 7.32.0 version: 7.32.0 @@ -258,6 +264,9 @@ importers: bootstrap: specifier: ^5.3.0-alpha3 version: 5.3.0-alpha3(@popperjs/core@2.11.8) + dsfr-connect: + specifier: workspace:dsfr-connect@* + version: link:../../packages/dsfr-connect eslint: specifier: 7.32.0 version: 7.32.0 @@ -336,6 +345,9 @@ importers: '@storybook/manager-api': specifier: 7.0.17 version: 7.0.17(react-dom@18.2.0)(react@18.2.0) + dsfr-connect: + specifier: workspace:dsfr-connect@* + version: link:../../packages/dsfr-connect eslint: specifier: 7.32.0 version: 7.32.0 @@ -474,6 +486,9 @@ importers: css-mediaquery: specifier: ^0.1.2 version: 0.1.2 + dsfr-connect: + specifier: workspace:dsfr-connect@* + version: link:../../packages/dsfr-connect eslint: specifier: 7.32.0 version: 7.32.0 @@ -615,6 +630,9 @@ importers: date-fns: specifier: ^2.30.0 version: 2.30.0 + dsfr-connect: + specifier: workspace:dsfr-connect@* + version: link:../../packages/dsfr-connect eslint: specifier: 7.32.0 version: 7.32.0