@tschk/moonshine-compiler 0.3.1 → 0.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tschk/moonshine-compiler",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "license": "ISC",
   "type": "module",
   "main": "./src/index.ts",
@@ -15,8 +15,8 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@tschk/moonshine-framework": "^0.3.1",
-    "@tschk/moonshine-router": "^0.3.1"
+    "@tschk/moonshine-framework": "^0.3.2",
+    "@tschk/moonshine-router": "^0.3.2"
   },
   "devDependencies": {
     "@types/bun": "1.3.14",

package/src/build.ts

@@ -1,6 +1,6 @@
 import { mkdir, writeFile } from "node:fs/promises";
 import { join, relative, resolve } from "node:path";
-import type { RouteArtifact } from "@tschk/moonshine-framework";
+import { PUBLIC_DIR, type RouteArtifact } from "@tschk/moonshine-framework";
 import { toPosix } from "./path.js";
 
 export type BundleAsset = {
@@ -125,13 +125,14 @@ function toOutRelative(outDir: string, outputPath: string): string {
 async function buildBundleAssets(
   outDir: string,
   outputPaths: string[],
+  urlBase?: string,
 ): Promise<BundleAsset[]> {
   const assets: BundleAsset[] = [];
   for (const outputPath of outputPaths) {
     const file = toOutRelative(outDir, outputPath);
     assets.push({
       file,
-      path: `/${file}`,
+      path: `/${toOutRelative(urlBase ?? outDir, outputPath)}`,
       integrity: await hashFile(outputPath),
     });
   }
@@ -159,6 +160,11 @@ export async function buildBundles(options: {
   const distDir = resolve(options.outDir, "dist");
   await mkdir(distDir, { recursive: true });
 
+  // Client output goes in its own directory because that directory is what the
+  // server exposes over HTTP; the server bundle must never sit inside it.
+  const publicDir = resolve(options.outDir, PUBLIC_DIR);
+  await mkdir(publicDir, { recursive: true });
+
   const serverOutputs = await runBuild(
     serverEntry,
     distDir,
@@ -166,11 +172,15 @@ export async function buildBundles(options: {
     "bun",
   );
   const clientOutputs = clientEntry
-    ? await runBuild(clientEntry, distDir, options.root, "browser")
+    ? await runBuild(clientEntry, publicDir, options.root, "browser")
     : [];
 
   const serverAssets = await buildBundleAssets(options.outDir, serverOutputs);
-  const clientAssets = await buildBundleAssets(options.outDir, clientOutputs);
+  const clientAssets = await buildBundleAssets(
+    options.outDir,
+    clientOutputs,
+    publicDir,
+  );
 
   return {
     server: serverAssets,

package/test/manifest.test.ts

@@ -48,14 +48,19 @@ describe("buildProject", () => {
     ]);
     expect(manifest.routes.every((r) => r.runtime === "bun")).toBe(true);
     expect(manifest.entries.server).toBe("dist/server.js");
-    expect(manifest.entries.client).toBe("/dist/client.js");
+    expect(manifest.entries.client).toBe("/client.js");
     expect(manifest.capabilities).toEqual(["islands", "streaming"]);
+    // Client assets build into public/ because that is the only directory the
+    // server exposes; the server bundle must stay outside it.
     expect(manifest.assets.map((a) => a.file)).toEqual([
-      "dist/client.js",
       "dist/server.js",
+      "public/client.js",
     ]);
     for (const asset of manifest.assets) {
-      expect(asset.path).toBe(`/${asset.file}`);
+      const served = asset.file.startsWith("public/");
+      expect(asset.path).toBe(
+        served ? `/${asset.file.slice("public/".length)}` : `/${asset.file}`,
+      );
       expect(asset.integrity).toMatch(/^sha256-[A-Za-z0-9+/]+=?$/);
     }