@farm.js/core 0.1.0-beta.75 → 0.1.0-beta.76

package/dist/client.mjs

@@ -62,7 +62,7 @@ import {
   createClientPluginManager,
   installChunkErrorRecovery,
   isChunkLoadError
-} from "./chunk-TWN6IBIL.mjs";
+} from "./chunk-ENS436YL.mjs";
 import "./chunk-RCNUKRBF.mjs";
 import "./chunk-GQVQESLY.mjs";
 import {
@@ -82,7 +82,7 @@ import "./chunk-RBRLLZL5.mjs";
 import "./chunk-WZ5QFROO.mjs";
 import "./chunk-ZRBCBOEX.mjs";
 import "./chunk-FXG2PS27.mjs";
-import "./chunk-IIKQBOGZ.mjs";
+import "./chunk-MV5WATSI.mjs";
 import "./chunk-44ZCFSKE.mjs";
 import "./chunk-CGILA3WO.mjs";
 export {

package/dist/index.cjs

@@ -11661,6 +11661,31 @@ var init_route_manager = __esm({
   }
 });
 
+// src/server/dev-styles.ts
+function collectDevStylesheetUrls(modules) {
+  const seen = /* @__PURE__ */ new Set();
+  for (const mod of modules) {
+    const id = mod.id ?? mod.file ?? "";
+    if (!STYLE_EXTENSIONS.test(id)) continue;
+    if (id.includes(".module.")) continue;
+    const url = mod.url;
+    if (!url || !url.startsWith("/")) continue;
+    const bare = url.split("?")[0];
+    if (bare === ALREADY_LINKED) continue;
+    seen.add(bare);
+  }
+  return [...seen].sort();
+}
+var STYLE_EXTENSIONS, ALREADY_LINKED;
+var init_dev_styles = __esm({
+  "src/server/dev-styles.ts"() {
+    "use strict";
+    STYLE_EXTENSIONS = /\.(css|scss|sass|less|styl|stylus)(?:$|\?)/;
+    ALREADY_LINKED = "/src/app/globals.css";
+    __name(collectDevStylesheetUrls, "collectDevStylesheetUrls");
+  }
+});
+
 // src/server/full-document.ts
 function stripContentsWrappers(markup) {
   let out = markup.replace(/^\s+/, "");
@@ -15777,7 +15802,7 @@ var init_server3 = __esm({
 var version;
 var init_package = __esm({
   "package.json"() {
-    version = "0.1.0-beta.75";
+    version = "0.1.0-beta.76";
   }
 });
 
@@ -16139,6 +16164,7 @@ var init_renderer2 = __esm({
     fs4 = __toESM(require("fs"));
     path12 = __toESM(require("path"));
     init_utils();
+    init_dev_styles();
     init_full_document();
     init_client_component();
     import_stream = require("stream");
@@ -16256,6 +16282,18 @@ var init_renderer2 = __esm({
           pageElement
         );
       }
+      /// Stylesheets the app imported through JS (fontsource packages, component
+      /// CSS) that the document must link alongside globals.css — see #658.
+      collectDevStyleHrefs() {
+        const graph = this.viteServer?.moduleGraph;
+        if (!graph) return [];
+        return collectDevStylesheetUrls(graph.idToModuleMap.values());
+      }
+      collectDevStyleLinks() {
+        return this.collectDevStyleHrefs().map(
+          (href) => `<link rel="stylesheet" href="${escapeHtmlAttribute2(href)}">`
+        );
+      }
       createLayoutBoundary(pattern, layoutElement) {
         return this.rendererRuntime.createElement(
           "div",
@@ -17470,7 +17508,11 @@ var init_renderer2 = __esm({
               {
                 tag: "link",
                 attrs: { rel: "stylesheet", href: "/src/app/globals.css" }
-              }
+              },
+              ...this.collectDevStyleHrefs().map((href) => ({
+                tag: "link",
+                attrs: { rel: "stylesheet", href }
+              }))
             ]
           };
           for (const routeEntry of manifest.routes) {
@@ -17566,6 +17608,7 @@ ${getFarmI18nClientSnapshot() ? `window.__FARM_I18N__ = ${serializeInlineValue2(
                 rendererHead,
                 renderFarmFontDevHead(this.config.root || process.cwd()),
                 `<link rel="stylesheet" href="/src/app/globals.css">`,
+                ...this.collectDevStyleLinks(),
                 `<script type="module" src="/@vite/client"></script>`,
                 rendererHydrationScript,
                 bootstrapScript
@@ -17584,7 +17627,8 @@ ${getFarmI18nClientSnapshot() ? `window.__FARM_I18N__ = ${serializeInlineValue2(
   ${documentTitleTag}${metaTags}${alternateTags}${rendererHead ? `
   ${rendererHead}` : ""}
   ${renderFarmFontDevHead(this.config.root || process.cwd())}
-  <link rel="stylesheet" href="/src/app/globals.css">
+  <link rel="stylesheet" href="/src/app/globals.css">${this.collectDevStyleLinks().map((l) => `
+  ${l}`).join("")}
   <script type="module" src="/@vite/client"></script>
   ${rendererHydrationScript}
   ${bootstrapScript}
@@ -17649,7 +17693,11 @@ ${getFarmI18nClientSnapshot() ? `window.__FARM_I18N__ = ${serializeInlineValue2(
               {
                 tag: "link",
                 attrs: { rel: "stylesheet", href: "/src/app/globals.css" }
-              }
+              },
+              ...this.collectDevStyleHrefs().map((href) => ({
+                tag: "link",
+                attrs: { rel: "stylesheet", href }
+              }))
             ]
           };
           for (const routeEntry of manifest.routes) {
@@ -17736,6 +17784,7 @@ ${getFarmI18nClientSnapshot() ? `window.__FARM_I18N__ = ${serializeInlineValue2(
             { style: { display: "contents" } },
             element
           );
+          const devStyleLinks = this.collectDevStyleLinks();
           const { pipe } = renderToPipeableStream2(streamRoot, {
             onShellReady() {
               const shellReadyMs = Date.now() - streamStartTime;
@@ -17757,7 +17806,8 @@ ${getFarmI18nClientSnapshot() ? `window.__FARM_I18N__ = ${serializeInlineValue2(
   ${hasFavicon ? "" : '<link rel="icon" href="data:,">'}
   <title>${title}</title>${metaTags}${i18nAlternateTags}
   ${fontHead}
-  <link rel="stylesheet" href="/src/app/globals.css" />
+  <link rel="stylesheet" href="/src/app/globals.css" />${devStyleLinks.map((l) => `
+  ${l}`).join("")}
   <script type="module" src="/@vite/client"></script>
   ${propsScript}
   ${hydrationClickQueueScript}
@@ -17984,6 +18034,7 @@ ${i18nSnapshot ? `window.__FARM_I18N__ = ${serializeInlineValue2(i18nSnapshot)};
               alternateLinks,
               fontHead,
               `<link rel="stylesheet" href="/src/app/globals.css" />`,
+              ...this.collectDevStyleLinks(),
               `<script type="module" src="/@vite/client"></script>`,
               rendererHydrationScript,
               integrationManifestScript
@@ -18001,7 +18052,8 @@ ${i18nSnapshot ? `window.__FARM_I18N__ = ${serializeInlineValue2(i18nSnapshot)};
   <link rel="icon" href="data:,">
   <title>${escapeHtmlAttribute2(documentTitle)}</title>${alternateLinks}
   ${fontHead}
-  <link rel="stylesheet" href="/src/app/globals.css" />
+  <link rel="stylesheet" href="/src/app/globals.css" />${this.collectDevStyleLinks().map((l) => `
+  ${l}`).join("")}
   <script type="module" src="/@vite/client"></script>
   ${rendererHydrationScript}
   ${integrationManifestScript}
@@ -36257,17 +36309,18 @@ function selectEncoding(header) {
   return brotli >= gzip ? "br" : "gzip";
 }
 __name(selectEncoding, "selectEncoding");
-function canCompress(request, response) {
-  if (request.method === "HEAD" || !response.body || response.status === 204 || response.status === 205 || response.status === 304 || response.headers.has("content-encoding") || response.headers.has("content-range") || response.headers.get("cache-control")?.toLowerCase().includes("no-transform")) {
+function isCompressionEligible(request, response) {
+  if (request.method !== "HEAD" && !response.body || response.status === 204 || response.status === 205 || response.status === 304 || response.headers.has("content-encoding") || response.headers.has("content-range") || response.headers.get("cache-control")?.toLowerCase().includes("no-transform")) {
     return false;
   }
   const contentType = response.headers.get("content-type")?.toLowerCase() ?? "";
   return contentType !== "text/event-stream";
 }
-__name(canCompress, "canCompress");
+__name(isCompressionEligible, "isCompressionEligible");
 function appendVary(headers2, value) {
   const current = headers2.get("vary");
   const values = current ? current.split(",").map((item) => item.trim()).filter(Boolean) : [];
+  if (values.includes("*")) return;
   if (!values.some((item) => item.toLowerCase() === value.toLowerCase())) {
     values.push(value);
   }
@@ -36293,6 +36346,16 @@ function compressResponse(response, encoding) {
   });
 }
 __name(compressResponse, "compressResponse");
+function varyIdentityResponse(response) {
+  const headers2 = new Headers(response.headers);
+  appendVary(headers2, "Accept-Encoding");
+  return new Response(response.body, {
+    status: response.status,
+    statusText: response.statusText,
+    headers: headers2
+  });
+}
+__name(varyIdentityResponse, "varyIdentityResponse");
 function createCompressionPlugin({
   beforeRequest: overrideBeforeRequest,
   afterResponse: overrideAfterResponse
@@ -36302,9 +36365,10 @@ function createCompressionPlugin({
     enforce: "post",
     runtime: {
       after({ request, response, isProd }) {
-        if (!isProd || !canCompress(request, response)) return;
+        if (!isProd || !isCompressionEligible(request, response)) return;
+        if (request.method === "HEAD") return varyIdentityResponse(response);
         const encoding = selectEncoding(request.headers.get("accept-encoding") ?? "");
-        if (!encoding) return;
+        if (!encoding) return varyIdentityResponse(response);
         return compressResponse(response, encoding);
       }
     },