@flight-framework/cli 0.4.6 → 0.4.8

package/dist/bin.js

@@ -510,7 +510,7 @@ Happy flying!
 }
 
 // src/commands/dev.ts
-import { resolve as resolve3, join as join3 } from "path";
+import { resolve as resolve3, join as join3, relative } from "path";
 import { readFileSync as readFileSync3, existsSync as existsSync3 } from "fs";
 import { consola as consola2 } from "consola";
 import { loadConfig } from "@flight-framework/core/config";
@@ -918,8 +918,10 @@ async function devCommand(options) {
       const http = await import("http");
       const fs = await import("fs/promises");
       const path = await import("path");
+      const { createRequire } = await import("module");
       const indexHtmlPath = path.join(root, "index.html");
       const publicIndexPath = path.join(root, "public", "index.html");
+      const require2 = createRequire(root + "/");
       const server = http.createServer(async (req, res) => {
         const url = req.url || "/";
         const isSpaRoute = url === "/" || url === "/index.html" || !url.includes(".") && !url.startsWith("/@") && !url.startsWith("/__") && !url.startsWith("/src/") && !url.startsWith("/node_modules/");
@@ -946,7 +948,7 @@ async function devCommand(options) {
           }
           return;
         }
-        const proxyRequest = (targetUrl, originalRes, attemptExtensions = false) => {
+        const proxyRequest = async (targetUrl, originalRes, retry = true) => {
           const proxyReq = http.request(
             {
               hostname: "localhost",
@@ -955,45 +957,46 @@ async function devCommand(options) {
               method: req.method,
               headers: req.headers
             },
-            (proxyRes) => {
-              if (proxyRes.statusCode !== 404 || !attemptExtensions) {
+            async (proxyRes) => {
+              if (proxyRes.statusCode !== 404 || !retry) {
                 res.writeHead(proxyRes.statusCode || 200, proxyRes.headers);
                 proxyRes.pipe(res);
                 return;
               }
               proxyRes.resume();
-              const commonExtensions = [".mjs", ".js", ".ts", ".tsx", ".jsx", "/index.js"];
-              const tryNextExtension = (index) => {
-                if (index >= commonExtensions.length) {
-                  res.writeHead(404, proxyRes.headers);
-                  res.end("Not Found");
-                  return;
+              try {
+                let resolvedUrl = null;
+                if (targetUrl.startsWith("/node_modules/")) {
+                  const importPath = targetUrl.replace("/node_modules/", "");
+                  try {
+                    const resolvedPath = require2.resolve(importPath);
+                    if (resolvedPath.startsWith(root)) {
+                      let rel = relative(root, resolvedPath);
+                      resolvedUrl = "/" + rel.replace(/\\/g, "/");
+                    }
+                  } catch (e) {
+                  }
                 }
-                const ext = commonExtensions[index];
-                const fallbackUrl = targetUrl + ext;
-                const fallbackReq = http.request(
-                  {
-                    hostname: "localhost",
-                    port: transformPort,
-                    path: fallbackUrl,
-                    method: "GET",
-                    // Always GET for fallbacks
-                    headers: req.headers
-                  },
-                  (fallbackRes) => {
-                    if (fallbackRes.statusCode === 200) {
-                      res.writeHead(200, fallbackRes.headers);
-                      fallbackRes.pipe(res);
-                    } else {
-                      fallbackRes.resume();
-                      tryNextExtension(index + 1);
+                if (!resolvedUrl && !targetUrl.includes(".")) {
+                  const commonExtensions = [".mjs", ".js", ".ts", ".tsx", ".jsx", "/index.js"];
+                  const relPath = targetUrl.startsWith("/") ? targetUrl.slice(1) : targetUrl;
+                  const absBase = join3(root, relPath);
+                  for (const ext of commonExtensions) {
+                    if (existsSync3(absBase + ext)) {
+                      resolvedUrl = targetUrl + ext;
+                      break;
                     }
                   }
-                );
-                fallbackReq.on("error", () => tryNextExtension(index + 1));
-                fallbackReq.end();
-              };
-              tryNextExtension(0);
+                }
+                if (resolvedUrl && resolvedUrl !== targetUrl) {
+                  return proxyRequest(resolvedUrl, originalRes, false);
+                }
+                res.writeHead(404, proxyRes.headers);
+                res.end("Not Found");
+              } catch (resolveError) {
+                res.writeHead(404, proxyRes.headers);
+                res.end("Not Found");
+              }
             }
           );
           proxyReq.on("error", (err) => {
@@ -1009,8 +1012,7 @@ async function devCommand(options) {
             proxyReq.end();
           }
         };
-        const shouldTryExtensions = !url.includes(".") && !url.endsWith("/");
-        proxyRequest(url, res, shouldTryExtensions);
+        proxyRequest(url, res);
       });
       const cliPort = port;
       await new Promise((resolve10) => server.listen(cliPort, () => resolve10()));