@akanjs/devkit 2.2.12 → 2.2.13-rc.1

package/artifact/implicitRootLayout.test.ts

@@ -29,8 +29,14 @@ describe("resolveSsrPageEntries", () => {
     const groupedLayoutPath = path.join(pageRoot, "(home)", "_layout.tsx");
 
     await write(path.join(appRoot, "env", "env.client.ts"), "export const env = {};\n");
-    await write(rootLayoutPath, 'export const theme = "dark";\nexport const fonts = [{ name: "pretendard" }];\n');
-    await write(groupedLayoutPath, "export default function Layout({ children }) { return children; }\n");
+    await write(
+      rootLayoutPath,
+      'export const theme = "dark";\nexport const fonts = [{ name: "pretendard" }];\nexport const metadata = { title: "Root" };\n',
+    );
+    await write(
+      groupedLayoutPath,
+      'export function generateMetadata() { return { title: "Home" }; }\nexport default function Layout({ children }) { return children; }\n',
+    );
 
     const entries = await resolveSsrPageEntries({
       appCwdPath: appRoot,
@@ -46,6 +52,15 @@ describe("resolveSsrPageEntries", () => {
     const generatedSource = await Bun.file(groupedRoot?.moduleAbsPath ?? "").text();
     expect(generatedSource).toContain('import * as inheritedLayout from "../../../page/_layout.tsx";');
     expect(generatedSource).not.toContain("<System.Provider");
+    expect(generatedSource).toContain("export async function generateMetadata(props: PageProps)");
+    expect(generatedSource).toContain("if (userLayout.generateMetadata) return userLayout.generateMetadata(props);");
+    expect(generatedSource).toContain("if (userLayout.metadata !== undefined) return userLayout.metadata;");
+    expect(generatedSource).toContain(
+      "if (inheritedLayout.generateMetadata) return inheritedLayout.generateMetadata(props);",
+    );
+    expect(generatedSource).toContain("return inheritedLayout.metadata;");
+    expect(generatedSource).not.toContain("Object.keys(userLayout.metadata)");
+    expect(generatedSource).not.toContain("Object.keys(inheritedLayout.metadata)");
     expect(generatedSource).toContain("export const NotFound = userLayout.NotFound ?? inheritedLayout.NotFound;");
     expect(generatedSource).toContain("export const Error = userLayout.Error ?? inheritedLayout.Error;");
     expect(generatedSource).toContain(

package/artifact/implicitRootLayout.ts

@@ -179,6 +179,13 @@ export async function generateHead(props: PageProps) {
   return inheritedLayout.head;
 }
 
+export async function generateMetadata(props: PageProps) {
+  if (userLayout.generateMetadata) return userLayout.generateMetadata(props);
+  if (userLayout.metadata !== undefined) return userLayout.metadata;
+  if (inheritedLayout.generateMetadata) return inheritedLayout.generateMetadata(props);
+  return inheritedLayout.metadata;
+}
+
 export const NotFound = userLayout.NotFound ?? inheritedLayout.NotFound;
 export const Error = userLayout.Error ?? inheritedLayout.Error;
 
@@ -213,6 +220,13 @@ export async function generateHead(props: PageProps) {
   return inheritedLayout.head;
 }
 
+export async function generateMetadata(props: PageProps) {
+  if (userLayout.generateMetadata) return userLayout.generateMetadata(props);
+  if (userLayout.metadata !== undefined) return userLayout.metadata;
+  if (inheritedLayout.generateMetadata) return inheritedLayout.generateMetadata(props);
+  return inheritedLayout.metadata;
+}
+
 export const NotFound = userLayout.NotFound ?? inheritedLayout.NotFound;
 export const Error = userLayout.Error ?? inheritedLayout.Error;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/devkit",
-  "version": "2.2.12",
+  "version": "2.2.13-rc.1",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -32,7 +32,7 @@
     "@langchain/openai": "^1.4.6",
     "@tailwindcss/node": "^4.3.0",
     "@trapezedev/project": "^7.1.4",
-    "akanjs": "2.2.12",
+    "akanjs": "2.2.13-rc.1",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "daisyui": "^5.5.20",