@akanjs/devkit 2.2.0-rc.4 → 2.2.0

package/artifact/implicitRootLayout.test.ts

@@ -73,9 +73,15 @@ describe("resolveSsrPageEntries", () => {
     const generatedSource = await Bun.file(groupedRoot?.moduleAbsPath ?? "").text();
     expect(generatedSource).toContain("<System.Provider");
     expect(generatedSource).toContain("theme={userLayout.theme ?? inheritedLayout.theme}");
-    expect(generatedSource).toContain("const getActiveLocaleDictionary =");
-    expect(generatedSource).toContain('await import("@apps/demo/lib/dict")');
-    expect(generatedSource).toContain("dictionary={getActiveLocaleDictionary ? getActiveLocaleDictionary(params.lang) : undefined}");
+    expect(generatedSource).toContain('import { allDictionary } from "../dict/useDict.ts";');
+    expect(generatedSource).toContain("dictionary={allDictionary[params.lang]}");
+    expect(generatedSource).not.toContain("getAllDictionary");
     expect(generatedSource).not.toContain("// export default function GeneratedLayout");
+
+    const generatedDictMacro = await Bun.file(path.join(appRoot, ".akan", "generated", "dict", "useDict.ts")).text();
+    expect(generatedDictMacro).toContain(
+      'import { getAllDictionary } from "@apps/demo/lib/dict" with { type: "macro" };',
+    );
+    expect(generatedDictMacro).toContain("export const allDictionary = getAllDictionary();");
   });
 });

package/artifact/implicitRootLayout.ts

@@ -15,6 +15,7 @@ async function appHasStModule(appCwdPath: string): Promise<boolean> {
 }
 
 const IMPLICIT_LAYOUT_DIR = path.join(".akan", "generated", "root-layouts");
+const IMPLICIT_DICT_DIR = path.join(".akan", "generated", "dict");
 
 interface RootBoundary {
   sourceKey: string | null;
@@ -39,6 +40,10 @@ function implicitRootLayoutAbsPath(appCwdPath: string, segments: string[]): stri
   return path.join(path.resolve(appCwdPath), IMPLICIT_LAYOUT_DIR, filename);
 }
 
+function implicitDictionaryMacroAbsPath(appCwdPath: string): string {
+  return path.join(path.resolve(appCwdPath), IMPLICIT_DICT_DIR, "useDict.ts");
+}
+
 function isRootBoundarySegments(segments: string[], basePaths: Iterable<string>): boolean {
   const firstVisibleIndex = segments.findIndex((segment) => !/^\(.+\)$/.test(segment));
   if (firstVisibleIndex === -1) return segments.length <= 1;
@@ -99,6 +104,19 @@ async function assertEnvClientConvention(appCwdPath: string, appName: string) {
   }
 }
 
+async function writeGeneratedDictionaryMacroFile(appCwdPath: string, appName: string): Promise<string> {
+  const absPath = implicitDictionaryMacroAbsPath(appCwdPath);
+  await mkdir(path.dirname(absPath), { recursive: true });
+  await Bun.write(
+    absPath,
+    `import { getAllDictionary } from "@apps/${appName}/lib/dict" with { type: "macro" };
+
+export const allDictionary = getAllDictionary();
+`,
+  );
+  return absPath;
+}
+
 async function writeGeneratedRootLayoutFile(opts: {
   appCwdPath: string;
   appName: string;
@@ -108,8 +126,15 @@ async function writeGeneratedRootLayoutFile(opts: {
   includeSystemProvider: boolean;
 }): Promise<string> {
   await assertEnvClientConvention(opts.appCwdPath, opts.appName);
+  const dictMacroAbsPath = opts.includeSystemProvider
+    ? await writeGeneratedDictionaryMacroFile(opts.appCwdPath, opts.appName)
+    : null;
   const absPath = implicitRootLayoutAbsPath(opts.appCwdPath, opts.boundary.segments);
   await mkdir(path.dirname(absPath), { recursive: true });
+  const dictMacroRel = dictMacroAbsPath
+    ? path.relative(path.dirname(absPath), dictMacroAbsPath).split(path.sep).join("/")
+    : null;
+  const dictMacroSpecifier = dictMacroRel ? (dictMacroRel.startsWith(".") ? dictMacroRel : `./${dictMacroRel}`) : null;
   const sourceRel = opts.boundary.sourceAbsPath
     ? path.relative(path.dirname(absPath), opts.boundary.sourceAbsPath).split(path.sep).join("/")
     : null;
@@ -139,12 +164,8 @@ async function writeGeneratedRootLayoutFile(opts: {
 import { loadFonts } from "akanjs/client";
 import { System } from "akanjs/ui";
 import { env } from "@apps/${opts.appName}/env/env.client";
+import { allDictionary } from ${JSON.stringify(dictMacroSpecifier)};
 ${clientImport}${inheritedImport}${userImport}
-// SSR builds (target=bun) load the full dictionary server-side and pass only the active locale to the client.
-// CSR builds (target=browser) fold this branch to undefined, so the macro-seeded dictionary is used and the
-// server-only dict module (which pulls @libs/*/server) is dead-code-eliminated out of the browser bundle.
-const getActiveLocaleDictionary =
-  process.env.AKAN_PUBLIC_RENDER_ENV === "ssr" ? (await import("@apps/${opts.appName}/lib/dict")).getDictionary : undefined;
 const userFonts = userLayout.fonts ?? inheritedLayout.fonts ?? [];
 const defaultFonts = userFonts.filter((font) => font.default);
 if (defaultFonts.length > 1) throw new Error("[route-convention] only one default font is allowed per root layout");
@@ -175,7 +196,7 @@ export default function GeneratedLayout({ children, params, searchParams }: Layo
       gaTrackingId={userLayout.gaTrackingId ?? inheritedLayout.gaTrackingId}
       layoutStyle={userLayout.layoutStyle ?? inheritedLayout.layoutStyle}
       reconnect={userLayout.reconnect ?? inheritedLayout.reconnect ?? false}
-      dictionary={getActiveLocaleDictionary ? getActiveLocaleDictionary(params.lang) : undefined}
+      dictionary={allDictionary[params.lang]}
     >
       <UserLayout params={params} searchParams={searchParams}>{children}</UserLayout>
     </System.Provider>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/devkit",
-  "version": "2.2.0-rc.4",
+  "version": "2.2.0",
   "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.0-rc.4",
+    "akanjs": "2.2.0",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "daisyui": "^5.5.20",