@flight-framework/cli 0.4.7 → 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 = async (targetUrl, originalRes) => {
+        const proxyRequest = async (targetUrl, originalRes, retry = true) => {
           const proxyReq = http.request(
             {
               hostname: "localhost",
@@ -956,37 +958,45 @@ async function devCommand(options) {
               headers: req.headers
             },
             async (proxyRes) => {
-              if (proxyRes.statusCode !== 404) {
+              if (proxyRes.statusCode !== 404 || !retry) {
                 res.writeHead(proxyRes.statusCode || 200, proxyRes.headers);
                 proxyRes.pipe(res);
                 return;
               }
-              if (targetUrl.startsWith("/node_modules/")) {
-                proxyRes.resume();
-                try {
-                  const { createRequire } = await import("module");
-                  const require2 = createRequire(root + "/");
+              proxyRes.resume();
+              try {
+                let resolvedUrl = null;
+                if (targetUrl.startsWith("/node_modules/")) {
                   const importPath = targetUrl.replace("/node_modules/", "");
-                  const resolvedPath = require2.resolve(importPath);
-                  const content = await fs.readFile(resolvedPath);
-                  let contentType = "application/javascript";
-                  if (resolvedPath.endsWith(".json")) contentType = "application/json";
-                  if (resolvedPath.endsWith(".css")) contentType = "text/css";
-                  res.writeHead(200, {
-                    "Content-Type": contentType,
-                    "Access-Control-Allow-Origin": "*",
-                    "Cache-Control": "no-cache"
-                  });
-                  res.end(content);
-                  return;
-                } catch (resolveError) {
-                  res.writeHead(404, proxyRes.headers);
-                  res.end("Not Found");
-                  return;
+                  try {
+                    const resolvedPath = require2.resolve(importPath);
+                    if (resolvedPath.startsWith(root)) {
+                      let rel = relative(root, resolvedPath);
+                      resolvedUrl = "/" + rel.replace(/\\/g, "/");
+                    }
+                  } catch (e) {
+                  }
                 }
+                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;
+                    }
+                  }
+                }
+                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");
               }
-              res.writeHead(proxyRes.statusCode || 404, proxyRes.headers);
-              proxyRes.pipe(res);
             }
           );
           proxyReq.on("error", (err) => {