packages/server/src/http.ts

@@ -1,5 +1,5 @@
 import { HttpMiddleware, HttpRouter, HttpServer, HttpServerResponse, Path } from "@effect/platform"
-import { Effect, flow, Layer } from "effect"
+import { Console, Effect, flow, Layer } from "effect"
 
 
 const router = HttpRouter.empty.pipe(
@@ -13,15 +13,21 @@ export const HttpAppDevelopment = router.pipe(
     HttpServer.withLogAddress,
 )
 
-export const HttpAppProduction = Effect.all([
+export const HttpAppProduction = Effect.Do.pipe(
-    Path.Path,
+    Effect.bind("path", () => Path.Path),
-    Effect.succeed(import.meta.resolve("@website/webapp")),
+    Effect.bind("webappDist", ({ path }) => Effect.map(
-]).pipe(
+        path.fromFileUrl(new URL(".", import.meta.resolve("@website/webapp"))),
-    Effect.map(([path, webappDist]) => router.pipe(
+        v => path.join(v, "dist"),
+    )),
+
+    Effect.map(({ path, webappDist }) => router.pipe(
         HttpRouter.all("/", HttpServerResponse.file(path.join(webappDist, "index.html"))),
         HttpRouter.all("/assets", HttpServerResponse.file(path.join(webappDist, "assets"))),
 
-        HttpServer.serve(HttpMiddleware.xForwardedHeaders),
+        HttpServer.serve(flow(
+            HttpMiddleware.logger,
+            HttpMiddleware.xForwardedHeaders,
+        )),
         HttpServer.withLogAddress,
     )),
 

packages/webapp/package.json

@@ -2,7 +2,7 @@
   "name": "@website/webapp",
   "private": true,
   "type": "module",
-  "module": "./dist",
+  "module": "./stub.ts",
   "scripts": {
     "dev": "vite",
     "build": "tsc -b && vite build",

packages/webapp/stub.ts

@@ -0,0 +1 @@
+export {}