@lolyjs/core 0.2.0-alpha.22 → 0.2.0-alpha.24

package/dist/cli.js

@@ -11464,22 +11464,36 @@ function copyStaticAssets(projectRoot, outDir) {
   const assetsSrc = path10.join(projectRoot, "assets");
   const assetsDest = path10.join(outDir, "assets");
   copyDirRecursive(assetsSrc, assetsDest);
-  const appDir = path10.join(projectRoot, "app");
+  const publicDir = path10.join(projectRoot, "public");
   const candidates = ["favicon.ico", "favicon.png"];
   for (const name of candidates) {
-    const fromApp = path10.join(appDir, name);
-    const fromRoot = path10.join(projectRoot, name);
-    let src = null;
-    if (fs10.existsSync(fromApp)) src = fromApp;
-    else if (fs10.existsSync(fromRoot)) src = fromRoot;
-    if (src) {
+    const fromPublic = path10.join(publicDir, name);
+    if (fs10.existsSync(fromPublic)) {
       const dest = path10.join(outDir, name);
       ensureDir(path10.dirname(dest));
-      fs10.copyFileSync(src, dest);
+      fs10.copyFileSync(fromPublic, dest);
       break;
     }
   }
 }
+function getFaviconInfo(projectRoot, staticDir = "public", isDev = false) {
+  const candidates = [
+    { name: "favicon.ico", type: "image/x-icon" },
+    { name: "favicon.png", type: "image/png" }
+  ];
+  const publicDir = path10.join(projectRoot, staticDir);
+  for (const candidate of candidates) {
+    const publicPath = path10.join(publicDir, candidate.name);
+    if (fs10.existsSync(publicPath)) {
+      return {
+        path: `/${candidate.name}`,
+        // Served at root from public/
+        type: candidate.type
+      };
+    }
+  }
+  return null;
+}
 function generateAssetManifest(outDir, stats) {
   const manifest = {
     client: {
@@ -11964,8 +11978,12 @@ function createDocumentTree(options) {
     clientJsPath = "/static/client.js",
     clientCssPath = "/static/client.css",
     nonce,
-    includeInlineScripts = true
+    includeInlineScripts = true,
     // Default true - scripts inline in body for both SSR and SSG
+    faviconPath = FAVICON_PATH,
+    // Default to /static/favicon.png for backward compatibility
+    faviconType = "image/png"
+    // Default to PNG for backward compatibility
   } = options;
   const metaObj = meta ?? null;
   const title = metaObj?.title ?? titleFallback ?? "My Framework Dev";
@@ -12272,10 +12290,11 @@ function createDocumentTree(options) {
         href: chunkHref,
         as: "script"
       }),
-      React.createElement("link", {
+      faviconPath && React.createElement("link", {
+        key: "favicon",
         rel: "icon",
-        href: FAVICON_PATH,
-        type: "image/png"
+        href: faviconPath,
+        type: faviconType || (faviconPath.endsWith(".ico") ? "image/x-icon" : "image/png")
       }),
       React.createElement("link", {
         rel: "stylesheet",
@@ -12805,7 +12824,7 @@ async function handlePageRequest(options) {
     const { errorPage, req, res, routeChunks, theme, projectRoot } = options;
     const reqLogger = getRequestLogger(req);
     if (errorPage) {
-      await renderErrorPageWithStream(errorPage, req, res, error, routeChunks || {}, theme, projectRoot, options.env);
+      await renderErrorPageWithStream(errorPage, req, res, error, routeChunks || {}, theme, projectRoot, options.env, options.config);
     } else {
       reqLogger.error("Unhandled error in page request", error, {
         urlPath: options.urlPath,
@@ -12831,11 +12850,13 @@ async function handlePageRequestInternal(options) {
     env = "dev",
     ssgOutDir,
     theme,
-    projectRoot
+    projectRoot,
+    config
   } = options;
   const clientJsPath = env === "dev" ? "/static/client.js" : projectRoot ? getClientJsPath(projectRoot) : "/static/client.js";
   const clientCssPath = env === "dev" ? "/static/client.css" : projectRoot ? getClientCssPath(projectRoot) : "/static/client.css";
   const assetManifest = env === "prod" && projectRoot ? loadAssetManifest(projectRoot) : null;
+  const faviconInfo = projectRoot && config ? getFaviconInfo(projectRoot, config.directories.static, env === "dev") : null;
   const isDataReq = isDataRequest(req);
   const skipLayoutHooks = isDataReq && req.headers["x-skip-layout-hooks"] === "true";
   if (env === "prod" && ssgOutDir) {
@@ -12950,7 +12971,9 @@ async function handlePageRequestInternal(options) {
         theme,
         clientJsPath,
         clientCssPath,
-        nonce: nonce2
+        nonce: nonce2,
+        faviconPath: faviconInfo?.path || null,
+        faviconType: faviconInfo?.type || null
       });
       let didError2 = false;
       const { pipe: pipe2, abort: abort2 } = renderToPipeableStream(documentTree2, {
@@ -12965,7 +12988,7 @@ async function handlePageRequestInternal(options) {
           const reqLogger2 = getRequestLogger(req);
           reqLogger2.error("SSR shell error", err, { route: "not-found" });
           if (!res.headersSent && errorPage) {
-            renderErrorPageWithStream(errorPage, req, res, err, routeChunks, theme, projectRoot, env);
+            renderErrorPageWithStream(errorPage, req, res, err, routeChunks, theme, projectRoot, env, config);
           } else if (!res.headersSent) {
             res.statusCode = 500;
             res.setHeader("Content-Type", "text/html; charset=utf-8");
@@ -13080,7 +13103,7 @@ async function handlePageRequestInternal(options) {
       return;
     } else {
       if (errorPage) {
-        await renderErrorPageWithStream(errorPage, req, res, error, routeChunks, theme, projectRoot, env);
+        await renderErrorPageWithStream(errorPage, req, res, error, routeChunks, theme, projectRoot, env, config);
         return;
       } else {
         throw error;
@@ -13158,7 +13181,9 @@ async function handlePageRequestInternal(options) {
     theme,
     clientJsPath,
     clientCssPath,
-    nonce
+    nonce,
+    faviconPath: faviconInfo?.path || null,
+    faviconType: faviconInfo?.type || null
   });
   let didError = false;
   const { pipe, abort } = renderToPipeableStream(documentTree, {
@@ -13206,7 +13231,7 @@ async function handlePageRequestInternal(options) {
     abort();
   });
 }
-async function renderErrorPageWithStream(errorPage, req, res, error, routeChunks, theme, projectRoot, env = "dev") {
+async function renderErrorPageWithStream(errorPage, req, res, error, routeChunks, theme, projectRoot, env = "dev", config) {
   try {
     const isDataReq = isDataRequest(req);
     const skipLayoutHooks = isDataReq && req.headers["x-skip-layout-hooks"] === "true";
@@ -13217,6 +13242,7 @@ async function renderErrorPageWithStream(errorPage, req, res, error, routeChunks
       pathname: req.path,
       locals: { error }
     };
+    const faviconInfo = projectRoot && config ? getFaviconInfo(projectRoot, config.directories.static, env === "dev") : null;
     const layoutProps = {};
     const reqLogger = getRequestLogger(req);
     if (!skipLayoutHooks && errorPage.layoutServerHooks && errorPage.layoutServerHooks.length > 0) {
@@ -13322,7 +13348,9 @@ async function renderErrorPageWithStream(errorPage, req, res, error, routeChunks
       theme,
       clientJsPath,
       clientCssPath,
-      nonce
+      nonce,
+      faviconPath: faviconInfo?.path || null,
+      faviconType: faviconInfo?.type || null
     });
     let didError = false;
     const { pipe, abort } = renderToPipeableStream(documentTree, {
@@ -13366,11 +13394,12 @@ async function renderErrorPageWithStream(errorPage, req, res, error, routeChunks
 }
 
 // modules/build/ssg/renderer.ts
-async function renderStaticRoute(projectRoot, ssgOutDir, route, urlPath, params) {
+async function renderStaticRoute(projectRoot, ssgOutDir, route, urlPath, params, config) {
   const routeChunks = loadChunksFromManifest(projectRoot);
   const assetManifest = loadAssetManifest(projectRoot);
   const clientJsPath = getClientJsPath(projectRoot);
   const clientCssPath = getClientCssPath(projectRoot);
+  const faviconInfo = config ? getFaviconInfo(projectRoot, config.directories.static, false) : null;
   const chunkName = routeChunks[route.pattern];
   let chunkHref = null;
   if (chunkName != null) {
@@ -13478,8 +13507,10 @@ async function renderStaticRoute(projectRoot, ssgOutDir, route, urlPath, params)
     entrypointFiles,
     clientJsPath,
     clientCssPath,
-    includeInlineScripts: true
+    includeInlineScripts: true,
     // SSG needs inline scripts (renderToString doesn't support bootstrapScripts)
+    faviconPath: faviconInfo?.path || null,
+    faviconType: faviconInfo?.type || null
   });
   const html = "<!DOCTYPE html>" + renderToString(documentTree);
   const dir = pathToOutDir(ssgOutDir, urlPath);
@@ -13492,7 +13523,7 @@ async function renderStaticRoute(projectRoot, ssgOutDir, route, urlPath, params)
 
 // modules/build/ssg/builder.ts
 init_globals();
-async function buildStaticPages(projectRoot, routes) {
+async function buildStaticPages(projectRoot, routes, config) {
   const ssgOutDir = path19.join(projectRoot, BUILD_FOLDER_NAME, "ssg");
   ensureDir(ssgOutDir);
   for (const route of routes) {
@@ -13541,7 +13572,7 @@ async function buildStaticPages(projectRoot, routes) {
     }
     for (const params of allParams) {
       const urlPath = buildPathFromPattern(route.pattern, params);
-      await renderStaticRoute(projectRoot, ssgOutDir, route, urlPath, params);
+      await renderStaticRoute(projectRoot, ssgOutDir, route, urlPath, params, config);
     }
   }
   console.log(`\u2705 [framework][ssg] Finished building all static pages`);
@@ -14190,7 +14221,7 @@ async function buildApp(options = {}) {
   writeClientBoostrapManifest(projectRoot);
   writeClientRoutesManifest(routes, projectRoot);
   await buildClientBundle(projectRoot);
-  await buildStaticPages(projectRoot, routes);
+  await buildStaticPages(projectRoot, routes, config);
   delete process.env.LOLY_BUILD;
   console.log(`[framework][build] Build completed successfully`);
 }
@@ -16432,7 +16463,8 @@ function setupRoutes(options) {
       env: isDev ? "dev" : "prod",
       ssgOutDir,
       theme: req.cookies?.theme || "light",
-      projectRoot
+      projectRoot,
+      config
     });
   });
 }