Skip to content

Commit 74d160c

Browse files
committed
Revert back to old Next setup
1 parent 927c74f commit 74d160c

File tree

2 files changed

+4
-15
lines changed

2 files changed

+4
-15
lines changed

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
<a href="https://stackblitz.com/edit/nextjs-j2wba3?file=pages/index.tsx">Playground</a>
2727
</p>
2828

29-
> 🗣️ There was a little breaking change introduced in 0.36 for Next.js Pages dir setup:
30-
> See how to migrate [here](https://github.com/garronej/react-dsfr-next-demo/commit/04f570c1bc6360b6e2d0e6771c50e9619c4fb379).
31-
3229
👉 Version française du README [ici](https://github.com/codegouvfr/react-dsfr/blob/main/README.fr.md).
3330

3431
> WARNING: This Design System is only meant to be used for official French's public service websites and apps.

src/next-pagesdir.tsx

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ import Head from "next/head";
33
import type { NextComponentType } from "next";
44
import DefaultApp from "next/app";
55
import type { AppProps, AppContext } from "next/app";
6-
import type DefaultDocument from "next/document";
7-
import { DocumentProps, DocumentContext } from "next/document";
6+
import type { DocumentProps, DocumentContext } from "next/document";
87
import { rootColorSchemeStyleTagId, data_fr_scheme, data_fr_theme } from "./useIsDark/constants";
98
import { getScriptToRunAsap } from "./useIsDark/scriptToRunAsap";
109
import { SsrIsDarkProvider } from "./useIsDark/server";
@@ -15,6 +14,7 @@ import { fontUrlByFileBasename } from "./next-appdir/fontUrlByFileBasename";
1514
import AppleTouchIcon from "./dsfr/favicon/apple-touch-icon.png";
1615
import FaviconSvg from "./dsfr/favicon/favicon.svg";
1716
import FaviconIco from "./dsfr/favicon/favicon.ico";
17+
import DefaultDocument from "next/document";
1818
import { getAssetUrl } from "./tools/getAssetUrl";
1919
import { getColors } from "./fr/colors";
2020
import { start } from "./start";
@@ -70,10 +70,7 @@ export type NextDsfrIntegrationApi = {
7070
App: AppComponent
7171
) => AppComponent;
7272
dsfrDocumentApi: {
73-
augmentDocumentForDsfr: (params: {
74-
DefaultDocument: typeof DefaultDocument;
75-
Document?: NextComponentType<any, any, any>;
76-
}) => void;
73+
augmentDocumentForDsfr: (Document: NextComponentType<any, any, any>) => void;
7774
getColorSchemeHtmlAttributes: (
7875
props: DocumentProps
7976
) =>
@@ -235,12 +232,7 @@ export function createNextDsfrIntegrationApi(
235232
return AppWithDsfr as any;
236233
}
237234

238-
function augmentDocumentForDsfr(params: {
239-
DefaultDocument: typeof DefaultDocument;
240-
Document?: NextComponentType<any, any, any>;
241-
}): void {
242-
const { DefaultDocument, Document = DefaultDocument } = params;
243-
235+
function augmentDocumentForDsfr(Document: NextComponentType<any, any, any>): void {
244236
const super_getInitialProps =
245237
Document.getInitialProps?.bind(Document) ??
246238
DefaultDocument.getInitialProps.bind(DefaultDocument);

0 commit comments

Comments
 (0)