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

package/incrementalBuilder.proc.js

@@ -2794,8 +2794,8 @@ class Executor {
       return filePath;
     if (filePath.startsWith("."))
       return path7.join(this.cwdPath, filePath);
-    const baseParts = this.cwdPath.split("/").filter(Boolean);
-    const targetParts = filePath.split("/").filter(Boolean);
+    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++) {
       let isOverlap = true;
@@ -2807,8 +2807,7 @@ class Executor {
       if (isOverlap)
         overlapLength = i;
     }
-    const result = overlapLength > 0 ? `/${[...baseParts, ...targetParts.slice(overlapLength)].join("/")}` : `${this.cwdPath}/${filePath}`;
-    return result.replace(/\/+/g, "/");
+    return path7.join(this.cwdPath, ...targetParts.slice(overlapLength));
   }
   async mkdir(dirPath) {
     const writePath = this.getPath(dirPath);
@@ -10285,8 +10284,8 @@ class PagesEntrySourceGenerator {
   }
   generate() {
     const lines = this.#pageEntries.map(({ key, moduleAbsPath }) => {
-      const absPath = path23.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 = {
 ${lines.join(`
@@ -10299,8 +10298,8 @@ ${lines.join(`
   }
   generateStatic() {
     const imports = this.#pageEntries.map(({ moduleAbsPath }, index) => {
-      const absPath = path23.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);
@@ -10314,6 +10313,9 @@ ${entries.join(`
 };
 `;
   }
+  static #toImportSpecifier(moduleAbsPath) {
+    return path23.resolve(moduleAbsPath).split(path23.sep).join("/");
+  }
   static #hasAsyncDefaultExport(moduleAbsPath) {
     try {
       const source2 = fs3.readFileSync(path23.resolve(moduleAbsPath), "utf8");
@@ -12180,11 +12182,11 @@ class SsrBaseArtifactBuilder {
   }
   async#buildRuntimeClientEntries() {
     const akanServerPath = await this.#resolveAkanServerPath();
-    const rscClientEntry = `${akanServerPath}/rscClient.tsx`;
-    const rscSegmentOutletEntry = `${akanServerPath}/rscSegmentOutlet.tsx`;
+    const rscClientEntry = path35.resolve(akanServerPath, "rscClient.tsx");
+    const rscSegmentOutletEntry = path35.resolve(akanServerPath, "rscSegmentOutlet.tsx");
     const vendorEntries = VENDOR_SPECIFIERS.map((specifier) => ({
       specifier,
-      absPath: `${akanServerPath}/vendor/${specifier.replaceAll("/", "-").replaceAll(".", "-")}.ts`
+      absPath: path35.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/index.js

@@ -2792,8 +2792,8 @@ class Executor {
       return filePath;
     if (filePath.startsWith("."))
       return path7.join(this.cwdPath, filePath);
-    const baseParts = this.cwdPath.split("/").filter(Boolean);
-    const targetParts = filePath.split("/").filter(Boolean);
+    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++) {
       let isOverlap = true;
@@ -2805,8 +2805,7 @@ class Executor {
       if (isOverlap)
         overlapLength = i;
     }
-    const result = overlapLength > 0 ? `/${[...baseParts, ...targetParts.slice(overlapLength)].join("/")}` : `${this.cwdPath}/${filePath}`;
-    return result.replace(/\/+/g, "/");
+    return path7.join(this.cwdPath, ...targetParts.slice(overlapLength));
   }
   async mkdir(dirPath) {
     const writePath = this.getPath(dirPath);
@@ -10283,8 +10282,8 @@ class PagesEntrySourceGenerator {
   }
   generate() {
     const lines = this.#pageEntries.map(({ key, moduleAbsPath }) => {
-      const absPath = path23.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 = {
 ${lines.join(`
@@ -10297,8 +10296,8 @@ ${lines.join(`
   }
   generateStatic() {
     const imports = this.#pageEntries.map(({ moduleAbsPath }, index) => {
-      const absPath = path23.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);
@@ -10312,6 +10311,9 @@ ${entries.join(`
 };
 `;
   }
+  static #toImportSpecifier(moduleAbsPath) {
+    return path23.resolve(moduleAbsPath).split(path23.sep).join("/");
+  }
   static #hasAsyncDefaultExport(moduleAbsPath) {
     try {
       const source2 = fs3.readFileSync(path23.resolve(moduleAbsPath), "utf8");
@@ -12178,11 +12180,11 @@ class SsrBaseArtifactBuilder {
   }
   async#buildRuntimeClientEntries() {
     const akanServerPath = await this.#resolveAkanServerPath();
-    const rscClientEntry = `${akanServerPath}/rscClient.tsx`;
-    const rscSegmentOutletEntry = `${akanServerPath}/rscSegmentOutlet.tsx`;
+    const rscClientEntry = path35.resolve(akanServerPath, "rscClient.tsx");
+    const rscSegmentOutletEntry = path35.resolve(akanServerPath, "rscSegmentOutlet.tsx");
     const vendorEntries = VENDOR_SPECIFIERS.map((specifier) => ({
       specifier,
-      absPath: `${akanServerPath}/vendor/${specifier.replaceAll("/", "-").replaceAll(".", "-")}.ts`
+      absPath: path35.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/cli",
-  "version": "2.3.10-rc.0",
+  "version": "2.3.10-rc.2",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -34,7 +34,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",