@akanjs/devkit 2.3.10-rc.0 → 2.3.10-rc.2

package/executors.ts

@@ -437,8 +437,11 @@ export class Executor {
   getPath(filePath: string) {
     if (path.isAbsolute(filePath)) return filePath;
     if (filePath.startsWith(".")) return path.join(this.cwdPath, filePath);
-    const baseParts = this.cwdPath.split("/").filter(Boolean);
-    const targetParts = filePath.split("/").filter(Boolean);
+    // Split on both separators so a Windows/mixed cwdPath (e.g. "C:\repo/apps/name") is parsed
+    // correctly, then rebuild with path.join so the result stays OS-native instead of the
+    // invalid "/C:\repo/..." the previous forward-slash-only reconstruction produced.
+    const baseParts = this.cwdPath.split(/[\\/]/).filter(Boolean);
+    const targetParts = filePath.split(/[\\/]/).filter(Boolean);
 
     let overlapLength = 0;
     for (let i = 1; i <= Math.min(baseParts.length, targetParts.length); i++) {
@@ -450,11 +453,7 @@ export class Executor {
         }
       if (isOverlap) overlapLength = i;
     }
-    const result =
-      overlapLength > 0
-        ? `/${[...baseParts, ...targetParts.slice(overlapLength)].join("/")}`
-        : `${this.cwdPath}/${filePath}`;
-    return result.replace(/\/+/g, "/");
+    return path.join(this.cwdPath, ...targetParts.slice(overlapLength));
   }
   async mkdir(dirPath: string) {
     const writePath = this.getPath(dirPath);

package/frontendBuild/frontendBuild.test.ts

@@ -33,17 +33,21 @@ afterEach(async () => {
 });
 
 describe("PagesEntrySourceGenerator", () => {
-  test("generates dynamic import source using absolute module paths", () => {
+  const toSpecifier = (absPath: string) => path.resolve(absPath).split(path.sep).join("/");
+
+  test("generates dynamic import source using forward-slash module paths", () => {
+    const indexAbs = path.resolve("/repo/apps/demo/page/_index.tsx");
+    const adminAbs = path.resolve("/repo/apps/demo/page/admin.tsx");
     const source = PagesEntrySourceGenerator.generate([
-      { key: "./_index.tsx", moduleAbsPath: "/repo/apps/demo/page/_index.tsx" },
-      { key: "./admin.tsx", moduleAbsPath: "/repo/apps/demo/page/admin.tsx" },
+      { key: "./_index.tsx", moduleAbsPath: indexAbs },
+      { key: "./admin.tsx", moduleAbsPath: adminAbs },
     ]);
 
     expect(source).toBe(
       [
         "export const pages = {",
-        '  "./_index.tsx": () => import("/repo/apps/demo/page/_index.tsx"),',
-        '  "./admin.tsx": () => import("/repo/apps/demo/page/admin.tsx"),',
+        `  "./_index.tsx": () => import(${JSON.stringify(toSpecifier(indexAbs))}),`,
+        `  "./admin.tsx": () => import(${JSON.stringify(toSpecifier(adminAbs))}),`,
         "};",
         "",
       ].join("\n"),
@@ -51,15 +55,17 @@ describe("PagesEntrySourceGenerator", () => {
   });
 
   test("generates static import source for single-file CSR bundles", () => {
+    const indexAbs = path.resolve("/repo/apps/demo/page/_index.tsx");
+    const adminAbs = path.resolve("/repo/apps/demo/page/admin.tsx");
     const source = PagesEntrySourceGenerator.generateStatic([
-      { key: "./_index.tsx", moduleAbsPath: "/repo/apps/demo/page/_index.tsx" },
-      { key: "./admin.tsx", moduleAbsPath: "/repo/apps/demo/page/admin.tsx" },
+      { key: "./_index.tsx", moduleAbsPath: indexAbs },
+      { key: "./admin.tsx", moduleAbsPath: adminAbs },
     ]);
 
     expect(source).toBe(
       [
-        'import * as page0 from "/repo/apps/demo/page/_index.tsx";',
-        'import * as page1 from "/repo/apps/demo/page/admin.tsx";',
+        `import * as page0 from ${JSON.stringify(toSpecifier(indexAbs))};`,
+        `import * as page1 from ${JSON.stringify(toSpecifier(adminAbs))};`,
         "export const pages = {",
         '  "./_index.tsx": { loader: async () => page0, isAsyncDefault: false },',
         '  "./admin.tsx": { loader: async () => page1, isAsyncDefault: false },',

package/frontendBuild/pagesEntrySourceGenerator.ts

@@ -16,8 +16,8 @@ export class PagesEntrySourceGenerator {
 
   generate(): string {
     const lines = this.#pageEntries.map(({ key, moduleAbsPath }) => {
-      const absPath = path.resolve(moduleAbsPath);
-      return `  ${JSON.stringify(key)}: () => import(${JSON.stringify(absPath)}),`;
+      const specifier = PagesEntrySourceGenerator.#toImportSpecifier(moduleAbsPath);
+      return `  ${JSON.stringify(key)}: () => import(${JSON.stringify(specifier)}),`;
     });
     return `export const pages = {\n${lines.join("\n")}\n};\n`;
   }
@@ -28,8 +28,8 @@ export class PagesEntrySourceGenerator {
 
   generateStatic(): string {
     const imports = this.#pageEntries.map(({ moduleAbsPath }, index) => {
-      const absPath = path.resolve(moduleAbsPath);
-      return `import * as page${index} from ${JSON.stringify(absPath)};`;
+      const specifier = PagesEntrySourceGenerator.#toImportSpecifier(moduleAbsPath);
+      return `import * as page${index} from ${JSON.stringify(specifier)};`;
     });
     const entries = this.#pageEntries.map(({ key, moduleAbsPath }, index) => {
       const isAsyncDefault = PagesEntrySourceGenerator.#hasAsyncDefaultExport(moduleAbsPath);
@@ -37,6 +37,9 @@ export class PagesEntrySourceGenerator {
     });
     return `${imports.join("\n")}\nexport const pages = {\n${entries.join("\n")}\n};\n`;
   }
+  static #toImportSpecifier(moduleAbsPath: string): string {
+    return path.resolve(moduleAbsPath).split(path.sep).join("/");
+  }
 
   static #hasAsyncDefaultExport(moduleAbsPath: string): boolean {
     try {

package/frontendBuild/ssrBaseArtifactBuilder.ts

@@ -99,11 +99,15 @@ export class SsrBaseArtifactBuilder {
     }
   > {
     const akanServerPath = await this.#resolveAkanServerPath();
-    const rscClientEntry = `${akanServerPath}/rscClient.tsx`;
-    const rscSegmentOutletEntry = `${akanServerPath}/rscSegmentOutlet.tsx`;
+    // Normalize entry paths with path.resolve so they match the resolved map keys the bundler
+    // stores (see ClientEntriesBundler#createOpaqueEntryAliases). Raw string concatenation keeps
+    // forward slashes, which on Windows fail to match the `\`-separated resolved keys and silently
+    // yield empty import-map URLs, breaking hydration.
+    const rscClientEntry = path.resolve(akanServerPath, "rscClient.tsx");
+    const rscSegmentOutletEntry = path.resolve(akanServerPath, "rscSegmentOutlet.tsx");
     const vendorEntries = VENDOR_SPECIFIERS.map((specifier) => ({
       specifier,
-      absPath: `${akanServerPath}/vendor/${specifier.replaceAll("/", "-").replaceAll(".", "-")}.ts`,
+      absPath: path.resolve(akanServerPath, "vendor", `${specifier.replaceAll("/", "-").replaceAll(".", "-")}.ts`),
     }));
     const entries = [rscClientEntry, rscSegmentOutletEntry, ...vendorEntries.map((v) => v.absPath)];
     const clientBundle = await new ClientEntriesBundler({ app: this.#app, entries, command: this.#command }).bundle();

package/package.json

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