From 01c9031a7e66bfa7de0c55ffff65bd081fbf877b Mon Sep 17 00:00:00 2001 From: Enguerran Weiss Date: Wed, 15 Feb 2023 10:07:13 +0100 Subject: [PATCH 1/2] updated imports to run vite test project --- package.json | 1 + test/integration/vite/src/Home.tsx | 2 +- test/integration/vite/src/Mui.tsx | 6 ++++-- test/integration/vite/src/main.tsx | 6 +++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index ffce67b4b..a86c5d034 100644 --- a/package.json +++ b/package.json @@ -148,6 +148,7 @@ "./Highlight": "./dist/Highlight.js", "./Header": "./dist/Header.js", "./Footer": "./dist/Footer.js", + "./File": "./dist/File.js", "./Download": "./dist/Download.js", "./Display": "./dist/Display.js", "./Checkbox": "./dist/Checkbox.js", diff --git a/test/integration/vite/src/Home.tsx b/test/integration/vite/src/Home.tsx index c58b7175a..befac071c 100644 --- a/test/integration/vite/src/Home.tsx +++ b/test/integration/vite/src/Home.tsx @@ -1,6 +1,6 @@ import { Alert } from "@codegouvfr/react-dsfr/Alert"; import { fr } from "@codegouvfr/react-dsfr"; -import { useIsDark } from "@codegouvfr/react-dsfr/useIsDark"; +import { useIsDark } from "@codegouvfr/react-dsfr"; export function Home() { const { isDark, setIsDark } = useIsDark(); diff --git a/test/integration/vite/src/Mui.tsx b/test/integration/vite/src/Mui.tsx index 29db8f26f..57519e777 100644 --- a/test/integration/vite/src/Mui.tsx +++ b/test/integration/vite/src/Mui.tsx @@ -1,7 +1,7 @@ import * as React from "react"; -import { MuiDsfrThemeProvider } from "@codegouvfr/react-dsfr/mui"; +import { createMuiDsfrThemeProvider } from "@codegouvfr/react-dsfr/mui"; import { ThemeProvider, createTheme } from "@mui/material/styles"; -import { useIsDark } from "@codegouvfr/react-dsfr/useIsDark"; +import { useIsDark } from "@codegouvfr/react-dsfr"; import TextField from '@mui/material/TextField'; import Autocomplete from '@mui/material/Autocomplete'; import Stack from '@mui/material/Stack'; @@ -43,6 +43,8 @@ const muiDefaultLightTheme = createTheme({ } }); +const { MuiDsfrThemeProvider } = createMuiDsfrThemeProvider(); + export function Mui() { const { isDark, setIsDark } = useIsDark(); diff --git a/test/integration/vite/src/main.tsx b/test/integration/vite/src/main.tsx index 484ec72e1..09ef1326e 100644 --- a/test/integration/vite/src/main.tsx +++ b/test/integration/vite/src/main.tsx @@ -2,7 +2,7 @@ import React from "react"; import ReactDOM from "react-dom/client"; import { Home } from "./Home"; import { Mui } from "./Mui"; -import { startReactDsfr } from "@codegouvfr/react-dsfr/spa"; +import { startReactDsfr } from "@codegouvfr/react-dsfr"; import { Header } from "@codegouvfr/react-dsfr/Header"; import { BrowserRouter } from "react-router-dom"; import { Routes, Route, Link, useLocation } from "react-router-dom"; @@ -11,7 +11,7 @@ import { fr } from "@codegouvfr/react-dsfr"; startReactDsfr({ "defaultColorScheme": "system", Link }); -declare module "@codegouvfr/react-dsfr/spa" { +declare module "@codegouvfr/react-dsfr" { interface RegisterLink { Link: typeof Link; } @@ -36,7 +36,7 @@ function Root() { serviceTitle="Nom du site / service" homeLinkProps={{ "to": "/", "title": "Accueil - Nom de l’entité (ministère, secrétariat d‘état, gouvernement)" }} quickAccessItems={[headerFooterDisplayItem]} - navigation={[ + navItems={[ { "text": "Home", "linkProps": { From 92fa0d8919f544837bd1f033ed29fbe57118d3be Mon Sep 17 00:00:00 2001 From: Enguerran Weiss Date: Wed, 15 Feb 2023 10:11:18 +0100 Subject: [PATCH 2/2] updated package.json --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index a86c5d034..ffce67b4b 100644 --- a/package.json +++ b/package.json @@ -148,7 +148,6 @@ "./Highlight": "./dist/Highlight.js", "./Header": "./dist/Header.js", "./Footer": "./dist/Footer.js", - "./File": "./dist/File.js", "./Download": "./dist/Download.js", "./Display": "./dist/Display.js", "./Checkbox": "./dist/Checkbox.js",