@cedarjs/cli 5.0.0-canary.2358 → 5.0.0-canary.2360

package/dist/commands/serve.js

@@ -103,25 +103,45 @@ const builder = async (yargs) => {
         const webPort = argv.webPort ?? getWebPort();
         const webHost = argv.webHost ?? getWebHost();
         const apiRootPath = argv.apiRootPath ?? "/";
-        const apiProxyTarget = [
-          "http://",
-          apiHost.includes(":") ? `[${apiHost}]` : apiHost,
-          ":",
-          apiPort,
-          apiRootPath
-        ].join("");
-        const { redwoodFastifyWeb } = await import("@cedarjs/fastify-web");
-        const { createFastifyInstance } = await import("@cedarjs/api-server/fastify");
-        const webFastify = await createFastifyInstance();
-        webFastify.register(redwoodFastifyWeb, {
-          redwood: {
-            apiProxyTarget
-          }
-        });
-        await webFastify.listen({
+        const apiTarget = `http://${apiHost.includes(":") ? `[${apiHost}]` : apiHost}:${apiPort}`;
+        const { serveStatic } = await import("srvx/static");
+        const apiUrl = getConfig().web.apiUrl;
+        const webDist = getPaths().web.dist;
+        const indexHtml = fs.readFileSync(
+          path.join(webDist, "index.html"),
+          "utf-8"
+        );
+        const webServer = serveSrvx({
+          // Dummy fetch handler. All requests are handled by middleware
+          fetch: async () => new Response("Not Found", { status: 404 }),
+          middleware: [
+            serveStatic({ dir: webDist }),
+            async (req, next) => {
+              const url = new URL(req.url, "http://localhost");
+              if (!url.pathname.startsWith(apiUrl)) {
+                return next();
+              }
+              const targetPath = url.pathname.slice(apiUrl.length) || "/";
+              const root = apiRootPath === "/" ? "" : apiRootPath;
+              const targetUrl = `${apiTarget}${root}${targetPath}${url.search}`;
+              return fetch(targetUrl, {
+                method: req.method,
+                headers: req.headers,
+                body: req.body
+              });
+            },
+            () => {
+              const headers = { "Content-Type": "text/html" };
+              return new Response(indexHtml, { headers });
+            }
+          ],
           port: webPort,
-          host: webHost
+          hostname: webHost,
+          gracefulShutdown: false,
+          manual: true
         });
+        webServer.serve();
+        await webServer.ready();
         console.log(`Web server listening at http://${webHost}:${webPort}`);
         process.stdout.write(
           `API server starting at http://${apiHost}:${apiPort}...`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "5.0.0-canary.2358",
+  "version": "5.0.0-canary.2360",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -33,17 +33,17 @@
   "dependencies": {
     "@babel/parser": "7.29.3",
     "@babel/preset-typescript": "7.28.5",
-    "@cedarjs/api-server": "5.0.0-canary.2358",
-    "@cedarjs/cli-helpers": "5.0.0-canary.2358",
-    "@cedarjs/fastify-web": "5.0.0-canary.2358",
-    "@cedarjs/internal": "5.0.0-canary.2358",
-    "@cedarjs/prerender": "5.0.0-canary.2358",
-    "@cedarjs/project-config": "5.0.0-canary.2358",
-    "@cedarjs/structure": "5.0.0-canary.2358",
-    "@cedarjs/telemetry": "5.0.0-canary.2358",
-    "@cedarjs/utils": "5.0.0-canary.2358",
-    "@cedarjs/vite": "5.0.0-canary.2358",
-    "@cedarjs/web-server": "5.0.0-canary.2358",
+    "@cedarjs/api-server": "5.0.0-canary.2360",
+    "@cedarjs/cli-helpers": "5.0.0-canary.2360",
+    "@cedarjs/fastify-web": "5.0.0-canary.2360",
+    "@cedarjs/internal": "5.0.0-canary.2360",
+    "@cedarjs/prerender": "5.0.0-canary.2360",
+    "@cedarjs/project-config": "5.0.0-canary.2360",
+    "@cedarjs/structure": "5.0.0-canary.2360",
+    "@cedarjs/telemetry": "5.0.0-canary.2360",
+    "@cedarjs/utils": "5.0.0-canary.2360",
+    "@cedarjs/vite": "5.0.0-canary.2360",
+    "@cedarjs/web-server": "5.0.0-canary.2360",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",