Add warning about withAppDsfr requirement to be the last transformation

Author: garronej

src/next.tsx

@@ -126,6 +126,7 @@ export function getColorSchemeSsrUtils() {
     return { getColorSchemeHtmlAttributes, augmentDocumentByReadingColorSchemeFromCookie };
 }
 
+/** the App returned by witAppDsfr should be directly exported default as is */
 export function withAppDsfr<AppComponent extends NextComponentType<any, any, any>>(
     App: AppComponent,
     params: Params
@@ -170,40 +171,38 @@ export function withAppDsfr<AppComponent extends NextComponentType<any, any, any
         );
     }
 
-    Object.keys(App).forEach(
-        staticMethod => ((AppWithDsfr as any)[staticMethod] = (App as any)[staticMethod])
-    );
-
-    $overwriteGetInitialProps.current = () => {
+    {
         const super_getInitialProps =
-            (AppWithDsfr as any).getInitialProps.bind(AppWithDsfr) ??
-            App.getInitialProps?.bind(App) ??
-            DefaultApp.getInitialProps.bind(DefaultApp);
-
-        (AppWithDsfr as any).getInitialProps = async (appContext: AppContext) => {
-            const initialProps = await super_getInitialProps(appContext);
-
-            if (!isBrowser) {
-                $colorScheme.current =
-                    (() => {
-                        const cookie = appContext.ctx.req?.headers.cookie;
-
-                        return cookie === undefined ? undefined : readColorSchemeInCookie(cookie);
-                    })() ??
-                    (() => {
-                        switch (startDsfrReactParams.defaultColorScheme) {
-                            case "dark":
-                            case "light":
-                                return startDsfrReactParams.defaultColorScheme;
-                            case "system":
-                                return "light";
-                        }
-                    })();
-            }
-
-            return { ...initialProps };
+            App.getInitialProps?.bind(App) ?? DefaultApp.getInitialProps.bind(DefaultApp);
+
+        $overwriteGetInitialProps.current = () => {
+            (AppWithDsfr as any).getInitialProps = async (appContext: AppContext) => {
+                const initialProps = await super_getInitialProps(appContext);
+
+                if (!isBrowser) {
+                    $colorScheme.current =
+                        (() => {
+                            const cookie = appContext.ctx.req?.headers.cookie;
+
+                            return cookie === undefined
+                                ? undefined
+                                : readColorSchemeInCookie(cookie);
+                        })() ??
+                        (() => {
+                            switch (startDsfrReactParams.defaultColorScheme) {
+                                case "dark":
+                                case "light":
+                                    return startDsfrReactParams.defaultColorScheme;
+                                case "system":
+                                    return "light";
+                            }
+                        })();
+                }
+
+                return { ...initialProps };
+            };
         };
-    };
+    }
 
     AppWithDsfr.displayName = AppWithDsfr.name;
 

test/integration/next/yarn.lock

@@ -39,9 +39,9 @@
     regenerator-runtime "^0.13.10"
 
 "@codegouvfr/react-dsfr@file:../../../dist":
-  version "0.0.19"
+  version "0.0.33"
   dependencies:
-    "@gouvfr/dsfr" "1.7.2"
+    "@gouvfr/dsfr" "1.8.1"
     remixicon "^2.5.0"
     tsafe "^1.1.1"
 
@@ -60,10 +60,10 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@gouvfr/dsfr@1.7.2":
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/@gouvfr/dsfr/-/dsfr-1.7.2.tgz#c522fce21a14989a10e30583160118c39c9c05d1"
-  integrity sha512-hPNtz+gHcc8m7ZPANxSOFMz4Ap+M9FHOudqoMR/+Kjl5FCOqwA6u/aoYnMJ8KqedS1k5XThFMp7jiktr53qXYw==
+"@gouvfr/dsfr@1.8.1":
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/@gouvfr/dsfr/-/dsfr-1.8.1.tgz#2484eb8ad9a73b5f01c5f41f49146d1aa8a71b7b"
+  integrity sha512-XpVFdvhtalA5jSAhzzNaMd+/Hvf8Ef9jCdAZhuukEEMo2/cWvCgzz9tfbE+9QTJDIVP+EwJ7aCGWcXUSWkOHJg==
 
 "@humanwhocodes/config-array@^0.5.0":
   version "0.5.0"