Reduce bundle size without introducing API changes

Author: garronej

package.json

@@ -108,7 +108,7 @@
         "remixicon": "^2.5.0",
         "storybook-dark-mode": "^1.1.2",
         "ts-node": "^10.9.1",
-        "tss-react": "^4.7.0",
+        "tss-react": "^4.7.1",
         "type-route": "^1.0.1",
         "typescript": "^4.9.1-beta",
         "vitest": "^0.24.3"

src/next-pagesdir.tsx

@@ -14,14 +14,14 @@ import { fontUrlByFileBasename } from "./next-appdir/fontUrlByFileBasename";
 import AppleTouchIcon from "./dsfr/favicon/apple-touch-icon.png";
 import FaviconSvg from "./dsfr/favicon/favicon.svg";
 import FaviconIco from "./dsfr/favicon/favicon.ico";
-import DefaultDocument from "next/document";
 import { getAssetUrl } from "./tools/getAssetUrl";
 import { getColors } from "./fr/colors";
 import { start } from "./start";
 import type { RegisterLink, RegisteredLinkProps } from "./link";
 import { setLink } from "./link";
 import { setUseLang } from "./i18n";
 import Script from "next/script";
+import { assert } from "tsafe/assert";
 import "./dsfr/dsfr.css";
 import "./dsfr/utility/icons/icons.css";
 
@@ -233,9 +233,14 @@ export function createNextDsfrIntegrationApi(
     }
 
     function augmentDocumentForDsfr(Document: NextComponentType<any, any, any>): void {
-        const super_getInitialProps =
-            Document.getInitialProps?.bind(Document) ??
-            DefaultDocument.getInitialProps.bind(DefaultDocument);
+        let super_getInitialProps = Document.getInitialProps?.bind(Document);
+
+        if (super_getInitialProps === undefined) {
+            import("next/document").then(
+                ({ default: DefaultDocument }) =>
+                    (super_getInitialProps = DefaultDocument.getInitialProps.bind(DefaultDocument))
+            );
+        }
 
         (Document as any).getInitialProps = async (documentContext: DocumentContext) => {
             const { isDark } = (() => {
@@ -275,6 +280,11 @@ export function createNextDsfrIntegrationApi(
                     });
             }
 
+            assert(
+                super_getInitialProps !== undefined,
+                "Default document not yet loaded. Please submit an issue to the tss-react repo"
+            );
+
             const initialProps = await super_getInitialProps(documentContext);
 
             return { ...initialProps, [isDarkPropKey]: isDark };

test/integration/next-pagesdir/package.json

@@ -18,7 +18,7 @@
         "next-transpile-modules": "^10.0.0",
         "@emotion/react": "^11.10.5",
         "@emotion/server": "^11.10.0",
-        "tss-react": "^4.7.0",
+        "tss-react": "^4.7.1",
         "@mui/material": "^5.11.0",
         "@mui/icons-material": "^5.11.0",
         "@emotion/styled": "^11.10.5",

test/integration/next-pagesdir/pages/_document.tsx

@@ -1,4 +1,4 @@
-import DefaultDocument, { Html, Head, Main, NextScript } from "next/document";
+import { Html, Head, Main, NextScript } from "next/document";
 import type { DocumentProps } from "next/document";
 import { dsfrDocumentApi, augmentDocumentWithEmotionCache } from "./_app";
 
@@ -16,12 +16,6 @@ export default function Document(props: DocumentProps) {
     );
 }
 
-augmentDocumentForDsfr({
-    DefaultDocument,
-    Document
-});
+augmentDocumentForDsfr(Document);
 
-augmentDocumentWithEmotionCache({
-    DefaultDocument,
-    Document
-});
+augmentDocumentWithEmotionCache(Document);

test/integration/next-pagesdir/yarn.lock

@@ -79,7 +79,7 @@
     to-fast-properties "^2.0.0"
 
 "@codegouvfr/react-dsfr@file:../../../dist":
-  version "0.35.1"
+  version "0.36.0"
   dependencies:
     tsafe "^1.4.0"
 
@@ -2406,10 +2406,10 @@ tslib@^2.4.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
   integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
 
-tss-react@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/tss-react/-/tss-react-4.7.0.tgz#fdc7925c4b8b2842d37f8e54ae20aa5980fd6e44"
-  integrity sha512-8U1Jgthn7FFvVgpyaLu4rIZYxcmdlohX3oGGxHpgQbRxt8gR1B+LoKVhFi+fL6fvM0daIB7ZMrwEoPuvzUmg5g==
+tss-react@^4.7.1:
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/tss-react/-/tss-react-4.7.1.tgz#52f973924e6e4468fb67b4ed73881d8fb139d5d0"
+  integrity sha512-xlKTTkN232rK16nBPlyvfesVBDbyk17oo+clEB3Wm77VyrBChAakYJ8NcqmzXHzW6QbvyqiSS6AR2Zzd/Ul1ew==
   dependencies:
     "@emotion/cache" "*"
     "@emotion/serialize" "*"

yarn.lock

@@ -10983,10 +10983,10 @@ tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
   integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
 
-tss-react@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/tss-react/-/tss-react-4.7.0.tgz#fdc7925c4b8b2842d37f8e54ae20aa5980fd6e44"
-  integrity sha512-8U1Jgthn7FFvVgpyaLu4rIZYxcmdlohX3oGGxHpgQbRxt8gR1B+LoKVhFi+fL6fvM0daIB7ZMrwEoPuvzUmg5g==
+tss-react@^4.7.1:
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/tss-react/-/tss-react-4.7.1.tgz#52f973924e6e4468fb67b4ed73881d8fb139d5d0"
+  integrity sha512-xlKTTkN232rK16nBPlyvfesVBDbyk17oo+clEB3Wm77VyrBChAakYJ8NcqmzXHzW6QbvyqiSS6AR2Zzd/Ul1ew==
   dependencies:
     "@emotion/cache" "*"
     "@emotion/serialize" "*"