Next appdir finally supported

garronej · garronej · commit 1af094a925b9 · 2022-12-28T04:21:01.000+01:00
diff --git a/package.json b/package.json
@@ -138,7 +138,7 @@
         "./Quote": "./dist/Quote.js",
         "./Notice": "./dist/Notice.js",
         "./Highlight": "./dist/Highlight.js",
-        "./Header": "./dist/Header/index.js",
+        "./Header": "./dist/Header/Header.js",
         "./Footer": "./dist/Footer.js",
         "./Display": "./dist/Display.js",
         "./Card": "./dist/Card.js",
diff --git a/src/Header/Header.tsx b/src/Header/Header.tsx
@@ -371,6 +371,8 @@ export const Header = memo(
 
 Header.displayName = symToStr({ Header });
 
+export default Header;
+
 const { useTranslation, addHeaderTranslations } = createComponentI18nApi({
     "componentName": symToStr({ Header }),
     "frMessages": {
diff --git a/src/Header/MainNavigation/Menu.tsx b/src/Header/MainNavigation/Menu.tsx
@@ -1,3 +1,5 @@
+"use client";
+
 import React, { memo, forwardRef } from "react";
 import type { ReactNode } from "react";
 import { symToStr } from "tsafe/symToStr";
diff --git a/src/Header/MainNavigation/index.ts b/src/Header/MainNavigation/index.ts
@@ -1 +1,5 @@
 export * from "./MainNavigation";
+
+import { MainNavigation } from "./MainNavigation";
+
+export default MainNavigation;
diff --git a/src/Header/index.ts b/src/Header/index.ts
@@ -1 +1,5 @@
 export * from "./Header";
+
+import { Header } from "./Header";
+
+export default Header;
diff --git a/src/scripts/list-exports.ts b/src/scripts/list-exports.ts
@@ -39,7 +39,8 @@ const newExports = {
 
                 if (fs.lstatSync(path).isDirectory()) {
                     for (const ext of [".ts", ".tsx"] as const) {
-                        const relativePath = pathJoin(basename, `index${ext}`);
+                        //const relativePath = pathJoin(basename, `index${ext}`);
+                        const relativePath = pathJoin(basename, `${basename}${ext}`);
 
                         if (!fs.existsSync(pathJoin(srcDirPath, relativePath))) {
                             continue;
diff --git a/test/integration/next-appdir/app/layout.tsx b/test/integration/next-appdir/app/layout.tsx
@@ -5,9 +5,9 @@ import { getColorSchemeHtmlAttributes } from "@codegouvfr/react-dsfr/next-appdir
 import StartDsfr from "./StartDsfr";
 import { defaultColorScheme } from "./defaultColorScheme";
 import { MuiDsfrThemeProvider } from "@codegouvfr/react-dsfr/mui";
-//import { Header } from "@codegouvfr/react-dsfr/Header";
+import { Header } from "@codegouvfr/react-dsfr/Header";
 import { Footer } from "@codegouvfr/react-dsfr/Footer";
-//import { Display, headerFooterDisplayItem } from "@codegouvfr/react-dsfr/Display";
+import { Display, headerFooterDisplayItem } from "@codegouvfr/react-dsfr/Display";
 import { fr } from "@codegouvfr/react-dsfr";
 
 const brandTop = <>INTITULE<br />OFFICIEL</>;
@@ -37,27 +37,16 @@ export default function RootLayout({ children }: { children: JSX.Element; }) {
 				/>
 			</head>
 			<body>
-				{/*
-				<DsfrProvider defaultColorScheme={defaultColorScheme}>
-					<NextAppDirEmotionCacheProvider options={{ "key": "css" }}>
-						<MuiDsfrThemeProvider>
-							{children}
-						</MuiDsfrThemeProvider>
-					</NextAppDirEmotionCacheProvider>
-				</DsfrProvider>
-				*/}
 				<DsfrProvider defaultColorScheme={defaultColorScheme}>
 					<NextAppDirEmotionCacheProvider options={{ "key": "css" }}>
 						<MuiDsfrThemeProvider>
 
-							{/*
 							<Header
 								brandTop={brandTop}
 								serviceTitle="Nom du site / service"
 								homeLinkProps={homeLinkPops}
-								//quickAccessItems={[headerFooterDisplayItem]}
+								quickAccessItems={[headerFooterDisplayItem]}
 							/>
-							*/}
 							<div style={{
 								"margin": "auto",
 								"maxWidth": 1000,
@@ -78,9 +67,9 @@ export default function RootLayout({ children }: { children: JSX.Element; }) {
                     eu fugiat nulla pariatur. 
                 `}
 								homeLinkProps={homeLinkPops}
-								//bottomItems={[headerFooterDisplayItem]}
+								bottomItems={[headerFooterDisplayItem]}
 							/>
-							{/*<Display />*/}
+							<Display />
 
 						</MuiDsfrThemeProvider>
 					</NextAppDirEmotionCacheProvider>

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+"use client";`
	`2`	`+`
`1`	`3`	`import React, { memo, forwardRef } from "react";`
`2`	`4`	`import type { ReactNode } from "react";`
`3`	`5`	`import { symToStr } from "tsafe/symToStr";`