@tschk/moonshine-deploy-bun 0.4.1 → 0.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tschk/moonshine-deploy-bun",
-  "version": "0.4.1",
+  "version": "0.4.4",
   "license": "ISC",
   "type": "module",
   "main": "./src/index.ts",
@@ -15,17 +15,23 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@tschk/moonshine-compiler": "^0.4.1",
-    "@tschk/moonshine-framework": "^0.4.1",
-    "@tschk/moonshine-react": "^0.4.1",
-    "@tschk/moonshine-server": "^0.4.1"
+    "@tschk/moonshine-framework": "^0.4.4",
+    "@tschk/moonshine-server": "^0.4.4"
   },
   "devDependencies": {
     "@types/bun": "1.3.14",
     "typescript": "7.0.2",
-    "@tschk/moonshine-adapter-conformance": "^0.4.1"
+    "@tschk/moonshine-adapter-conformance": "^0.4.4"
   },
   "files": [
     "src"
-  ]
+  ],
+  "peerDependencies": {
+    "@tschk/moonshine-react": "^0.4.4"
+  },
+  "peerDependenciesMeta": {
+    "@tschk/moonshine-react": {
+      "optional": true
+    }
+  }
 }

package/src/index.ts

@@ -1,10 +1,12 @@
-import { copyFile, mkdir, writeFile } from "node:fs/promises";
-import { dirname, isAbsolute, resolve } from "node:path";
+import { mkdir, writeFile } from "node:fs/promises";
+import { resolve } from "node:path";
 import {
   type DeploymentAdapter,
   type MoonshineManifest,
   type Harness,
   type HarnessFactory,
+  copyAsset,
+  validateRuntime,
 } from "@tschk/moonshine-framework";
 import { tryServeStatic } from "@tschk/moonshine-server";
 
@@ -29,7 +31,12 @@ export function createBunServer(options: BunServerOptions): BunServer {
       (request.method === "GET" || request.method === "HEAD") &&
       pathname !== "/"
     ) {
-      const res = await tryServeStatic(options.staticDir, pathname);
+      const res = await tryServeStatic(
+        options.staticDir,
+        pathname,
+        undefined,
+        request.method,
+      );
       if (res) return res;
     }
     return options.fetch(request);
@@ -56,29 +63,12 @@ export const bunHarness: HarnessFactory = (fetch, options) => {
   } as Harness;
 };
 
-async function copyAsset(
-  asset: MoonshineManifest["assets"][number],
-  outDir: string,
-): Promise<string> {
-  const source = isAbsolute(asset.file)
-    ? asset.file
-    : resolve(outDir, asset.file);
-  const target = resolve(
-    outDir,
-    (asset.path ?? asset.file).replace(/^\/+/, ""),
-  );
-  await mkdir(dirname(target), { recursive: true });
-  if (source !== target) {
-    await copyFile(source, target);
-  }
-  return (asset.path ?? asset.file).replace(/^\/+/, "");
-}
-
 export const bunAdapter: DeploymentAdapter = {
   name: "bun",
   runtimes: ["bun"],
   capabilities: ["streaming", "islands", "revalidation"],
   build: async (manifest, outDir) => {
+    validateRuntime(bunAdapter, manifest);
     await mkdir(outDir, { recursive: true });
     const assets: MoonshineManifest["assets"] = await Promise.all(
       manifest.assets.map(async (asset) => {
@@ -91,12 +81,16 @@ export const bunAdapter: DeploymentAdapter = {
       resolve(outDir, "manifest.json"),
       JSON.stringify(builtManifest, null, 2) + "\n",
     );
+    const native = manifest.renderer === "native";
+    const rendererImport = native
+      ? 'import { modules, renderer } from "./dist/server.js";'
+      : 'import { modules } from "./dist/server.js";\nimport { reactRenderer as renderer } from "@tschk/moonshine-react";';
     const entry = `import { createRequestHandler } from "@tschk/moonshine-server";
-import { reactRenderer } from "@tschk/moonshine-react";
 import { createBunServer } from "@tschk/moonshine-deploy-bun";
 import { resolve } from "node:path";
 import manifest from "./manifest.json" with { type: "json" };
-import { modules } from "./dist/server.js";
+${rendererImport}
+${manifest.requestContext ? 'import { requestScope } from "./dist/server.js";' : ""}
 
 const projectDir = resolve(import.meta.dir, "..");
 const abs = (p) => (p ? resolve(projectDir, p) : undefined);
@@ -113,15 +107,15 @@ const resolvedManifest = {
 };
 
 const fetch = createRequestHandler({
-  manifest: resolvedManifest,
+  manifest: ${native ? "manifest" : "resolvedManifest"},
   modules,
-  renderer: reactRenderer,
+  renderer,${manifest.requestContext ? "\n  requestScope," : ""}
   staticDir: import.meta.dir + "/public",
 });
-const server = createBunServer({
+const envPort = Number(process.env.PORT);
+export const server = createBunServer({
   fetch,
-  port: Number(process.env.PORT) || 0,
-  staticDir: import.meta.dir + "/public",
+  port: Number.isInteger(envPort) && envPort >= 0 && envPort <= 65535 ? envPort : 0,
 });
 `;
     await writeFile(resolve(outDir, "server.ts"), entry);