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

package/dist/index.d.mts

@@ -4,7 +4,7 @@ export { FarmRenderer, FarmRendererCapabilities, FarmRendererCapabilitiesInput,
 export { f as fileExists, g as globFiles, l as logger, m as matchRoute, a as matchRoutePrefix, p as parseRoutePath, d as parseSearchParams, r as resolveAppPath, s as segmentsToPattern, b as toPosixPath, t as toRootRelativeUrlPath, c as toViteModuleId } from './utils-CebML94V.mjs';
 export { createFarmStorage, createStorageClient, databaseStorage, defineStorageClient, disposeStorage, driverStorage, getStorage, initStorage, libsqlStorage, localStorage, memoryStorage, mongodbStorage, mysql2Storage, mysqlStorage, netlifyBlobsStorage, pgStorage, pgliteStorage, planetscaleStorage, postgresStorage, redisStorage, resolveStorageRuntimeClient, s3Storage, sqliteStorage, upstashStorage, vercelBlobStorage, vercelKVStorage } from './storage.mjs';
 export { D as DEFAULT_FARM_API_BASE_PATH, l as FarmAPIConfig, j as FarmAPIConfigResolverContext, k as FarmAPIConfigValue, F as FarmIntegrationAPI, e as FarmIntegrationAPIBodyFormat, f as FarmIntegrationAPIMethod, a as FarmIntegrationAPIOperation, g as FarmIntegrationAPIResponseFormat, h as FarmIntegrationRouteOperationCarrier, I as InferIntegrationAPIFromRoutes, R as ResolvedFarmAPIConfig, b as api, d as defineIntegrationAPI, c as defineIntegrationAPIOperation, i as endpoint, o as getFarmAPIBaseURL, m as normalizeFarmAPIBasePath, n as normalizeFarmAPIConfig, r as resolveFarmAPIConfig, p as resolveFarmAPIRequestURL } from './config-C0N_7HJ6.mjs';
-export { c as createFarmApp } from './app-BkCh7H09.mjs';
+export { c as createFarmApp } from './app-Bq-Tr90H.mjs';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { ReactNode } from 'react';
 export { ComponentType, FC, PropsWithChildren, ReactElement, ReactNode } from 'react';

package/dist/index.d.ts

@@ -4,7 +4,7 @@ export { FarmRenderer, FarmRendererCapabilities, FarmRendererCapabilitiesInput,
 export { f as fileExists, g as globFiles, l as logger, m as matchRoute, a as matchRoutePrefix, p as parseRoutePath, d as parseSearchParams, r as resolveAppPath, s as segmentsToPattern, b as toPosixPath, t as toRootRelativeUrlPath, c as toViteModuleId } from './utils-DVGmTVdc.js';
 export { createFarmStorage, createStorageClient, databaseStorage, defineStorageClient, disposeStorage, driverStorage, getStorage, initStorage, libsqlStorage, localStorage, memoryStorage, mongodbStorage, mysql2Storage, mysqlStorage, netlifyBlobsStorage, pgStorage, pgliteStorage, planetscaleStorage, postgresStorage, redisStorage, resolveStorageRuntimeClient, s3Storage, sqliteStorage, upstashStorage, vercelBlobStorage, vercelKVStorage } from './storage.js';
 export { D as DEFAULT_FARM_API_BASE_PATH, l as FarmAPIConfig, j as FarmAPIConfigResolverContext, k as FarmAPIConfigValue, F as FarmIntegrationAPI, e as FarmIntegrationAPIBodyFormat, f as FarmIntegrationAPIMethod, a as FarmIntegrationAPIOperation, g as FarmIntegrationAPIResponseFormat, h as FarmIntegrationRouteOperationCarrier, I as InferIntegrationAPIFromRoutes, R as ResolvedFarmAPIConfig, b as api, d as defineIntegrationAPI, c as defineIntegrationAPIOperation, i as endpoint, o as getFarmAPIBaseURL, m as normalizeFarmAPIBasePath, n as normalizeFarmAPIConfig, r as resolveFarmAPIConfig, p as resolveFarmAPIRequestURL } from './config-B6GcJfNA.js';
-export { c as createFarmApp } from './app-CZIEOZIa.js';
+export { c as createFarmApp } from './app-CQ6uhLEj.js';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { ReactNode } from 'react';
 export { ComponentType, FC, PropsWithChildren, ReactElement, ReactNode } from 'react';

package/dist/index.mjs

@@ -9,7 +9,7 @@ import {
 } from "./chunk-HEOT63FC.mjs";
 import {
   build
-} from "./chunk-DKD7DGTE.mjs";
+} from "./chunk-OL7GH5ZC.mjs";
 import "./chunk-SL6HTIOK.mjs";
 import "./chunk-4S3ORGFA.mjs";
 import {
@@ -208,7 +208,7 @@ import {
   createClientPluginManager,
   installChunkErrorRecovery,
   isChunkLoadError
-} from "./chunk-TWN6IBIL.mjs";
+} from "./chunk-ENS436YL.mjs";
 import {
   analyzeStaticRouteCandidate,
   collectSSGPages,
@@ -227,7 +227,7 @@ import {
   parseRouteRenderingDirective,
   resolveRouteRenderingConfig,
   resolveRouteRenderingConfigFromFile
-} from "./chunk-S6FO7OXA.mjs";
+} from "./chunk-NN6KJF7I.mjs";
 import {
   APITypeGenerator
 } from "./chunk-4RDYOSFE.mjs";
@@ -570,14 +570,14 @@ import {
   runWithFarmSpan
 } from "./chunk-ZRBCBOEX.mjs";
 import "./chunk-FXG2PS27.mjs";
-import "./chunk-IIKQBOGZ.mjs";
+import "./chunk-MV5WATSI.mjs";
 import {
   createCompressionPlugin,
   createEnvPlugin,
   createHeadersPlugin,
   createLoggerPlugin,
   createRedirectsPlugin
-} from "./chunk-UGK7TW2V.mjs";
+} from "./chunk-P57PPOQL.mjs";
 import {
   createRewritesPlugin
 } from "./chunk-I3FMD5VJ.mjs";

package/dist/internal/build-runtime.cjs

@@ -12242,6 +12242,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+/, "");
@@ -15811,7 +15836,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";
   }
 });
 
@@ -16173,6 +16198,7 @@ var init_renderer2 = __esm({
     fs4 = __toESM(require("fs"));
     path15 = __toESM(require("path"));
     init_utils();
+    init_dev_styles();
     init_full_document();
     init_client_component();
     import_stream = require("stream");
@@ -16290,6 +16316,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",
@@ -17504,7 +17542,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) {
@@ -17600,6 +17642,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
@@ -17618,7 +17661,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}
@@ -17683,7 +17727,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) {
@@ -17770,6 +17818,7 @@ ${getFarmI18nClientSnapshot() ? `window.__FARM_I18N__ = ${serializeInlineValue2(
             { style: { display: "contents" } },
             element
           );
+          const devStyleLinks = this.collectDevStyleLinks();
           const { pipe } = renderToPipeableStream2(streamRoot, {
             onShellReady() {
               const shellReadyMs = Date.now() - streamStartTime;
@@ -17791,7 +17840,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}
@@ -18018,6 +18068,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
@@ -18035,7 +18086,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}