@farm.js/plugin 0.1.60 → 0.1.61

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (40) hide show
  1. package/dist/index.d.ts +1 -1
  2. package/dist/index.js +1 -1
  3. package/dist/middleware/index.d.ts +1 -8
  4. package/dist/middleware/index.d.ts.map +1 -1
  5. package/dist/middleware/index.js +10 -16
  6. package/dist/middleware/matching.d.ts +2 -4
  7. package/dist/middleware/matching.d.ts.map +1 -1
  8. package/dist/middleware/matching.js +47 -7
  9. package/dist/rsc/entries/client.d.ts.map +1 -1
  10. package/dist/rsc/entries/client.js +15 -85
  11. package/dist/rsc/entries/rsc.d.ts.map +1 -1
  12. package/dist/rsc/entries/rsc.js +45 -563
  13. package/dist/rsc/entries/ssr.d.ts.map +1 -1
  14. package/dist/rsc/entries/ssr.js +6 -7
  15. package/dist/rsc/index.d.ts +3 -38
  16. package/dist/rsc/index.d.ts.map +1 -1
  17. package/dist/rsc/index.js +292 -279
  18. package/dist/rsc/middleware-config-module.d.ts +0 -3
  19. package/dist/rsc/middleware-config-module.d.ts.map +1 -1
  20. package/dist/rsc/middleware-config-module.js +28 -41
  21. package/dist/rsc/nitro-build.d.ts.map +1 -1
  22. package/dist/rsc/nitro-build.js +81 -268
  23. package/dist/rsc/server-fn-transform.d.ts +5 -1
  24. package/dist/rsc/server-fn-transform.d.ts.map +1 -1
  25. package/dist/rsc/server-fn-transform.js +338 -3
  26. package/dist/rsc/types.d.ts +0 -39
  27. package/dist/rsc/types.d.ts.map +1 -1
  28. package/dist/rsc/vite-plugin-nitro.d.ts +0 -2
  29. package/dist/rsc/vite-plugin-nitro.d.ts.map +1 -1
  30. package/dist/rsc/vite-plugin-nitro.js +2 -12
  31. package/package.json +3 -3
  32. package/dist/rsc/client-sourcemaps.d.ts +0 -13
  33. package/dist/rsc/client-sourcemaps.d.ts.map +0 -1
  34. package/dist/rsc/client-sourcemaps.js +0 -52
  35. package/dist/rsc/document-layouts.d.ts +0 -16
  36. package/dist/rsc/document-layouts.d.ts.map +0 -1
  37. package/dist/rsc/document-layouts.js +0 -82
  38. package/dist/rsc/mobile-client.d.ts +0 -67
  39. package/dist/rsc/mobile-client.d.ts.map +0 -1
  40. package/dist/rsc/mobile-client.js +0 -148
@@ -1 +1 @@
1
- {"version":3,"file":"ssr.d.ts","sourceRoot":"","sources":["../../../src/rsc/entries/ssr.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAgN1D"}
1
+ {"version":3,"file":"ssr.d.ts","sourceRoot":"","sources":["../../../src/rsc/entries/ssr.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CA+M1D"}
@@ -10,8 +10,9 @@
10
10
  */
11
11
  export function generateSsrEntry(ctx) {
12
12
  const debugLog = `// Debug disabled`;
13
- // Only a global stylesheet the build found: a guessed path 404s in apps that import their CSS.
14
- const globalsCssPath = ctx.globalCssPath ?? "";
13
+ const routesDir = ctx.routesDir === undefined ? "app" : ctx.routesDir.trim();
14
+ const routesPath = routesDir ? `/${routesDir}` : "";
15
+ const globalsCssPath = ctx.globalCssPath ?? `/${ctx.srcDir}${routesPath}/globals.css`;
15
16
  return `
16
17
  import React from 'react';
17
18
  import { createFromReadableStream } from '@vitejs/plugin-rsc/ssr';
@@ -116,8 +117,6 @@ export async function renderHTML(firstArg, options = {}) {
116
117
  // calls client references on the server (for example, a "use client" Counter).
117
118
  const payload = await createFromReadableStream(s1);
118
119
  const rootElement = payload.root;
119
- // The route's resolved metadata as head tags (core's renderMetadataHead), then the stylesheet.
120
- const headTags = (typeof payload.metadataHead === 'string' ? payload.metadataHead : '') + cssLinkTag;
121
120
 
122
121
  function Root() {
123
122
  return rootElement;
@@ -172,7 +171,7 @@ export async function renderHTML(firstArg, options = {}) {
172
171
  passThrough.on('error', (e) => controller.error(e));
173
172
  }
174
173
  });
175
- let out = webStream.pipeThrough(injectIntoHeadStream(headTags));
174
+ let out = webStream.pipeThrough(injectIntoHeadStream(cssLinkTag));
176
175
  out = out.pipeThrough(injectRSCPayload(s2));
177
176
  out = out.pipeThrough(streamingClientScriptInjector);
178
177
  return out;
@@ -182,8 +181,8 @@ export async function renderHTML(firstArg, options = {}) {
182
181
  debug('Rendering to HTML stream (then buffering)');
183
182
  const fullHtmlRaw = await pipeableStreamToString(passThrough);
184
183
  let fullHtml = fullHtmlRaw;
185
- if (headTags && fullHtml.includes("</head>")) {
186
- fullHtml = fullHtml.replace("</head>", () => headTags + "</head>");
184
+ if (cssLinkTag && fullHtml.includes("</head>")) {
185
+ fullHtml = fullHtml.replace("</head>", cssLinkTag + "</head>");
187
186
  }
188
187
  ${ctx.actionsEnabled
189
188
  ? `// Ensure __viteRscCallServer is set before any module runs (fixes "is not a function" when form submits)
@@ -22,22 +22,17 @@
22
22
  * ```
23
23
  */
24
24
  import { type Plugin, type UserConfig } from "vite";
25
- import type { FarmRscPluginOptions, EntryContext, FarmRscMobileClient } from "./types.js";
25
+ import type { FarmRscPluginOptions, EntryContext } from "./types.js";
26
26
  import type { FarmServerActionsConfig } from "@farm.js/core/server-action-security";
27
27
  import type { FarmAPIConfig } from "@farm.js/core/api";
28
28
  import type { FarmMiddlewareConfig } from "@farm.js/core/middleware";
29
29
  import type { FarmServerConfig } from "@farm.js/core/internal/production-runtime";
30
30
  import type { FarmLayerEntry, ResolvedFarmLayer } from "@farm.js/core/server";
31
- import { resolveFarmImageConfig } from "@farm.js/core/vite";
32
- import { type FarmMarkdownUserConfig } from "@farm.js/core/markdown";
33
- import type { FarmLlmsTxtUserConfig } from "@farm.js/core/internal/production-runtime";
34
- import type { FarmMCPUserConfig } from "@farm.js/core/server";
35
31
  export type { FarmRscPluginOptions, EntryContext };
36
32
  export { buildRscNitro, waitForRscManifest, waitForRscOutputs } from "./nitro-build.js";
37
33
  export type { BuildRscNitroOptions } from "./nitro-build.js";
38
34
  export { default as nitro } from "./vite-plugin-nitro.js";
39
35
  export type { NitroPluginOptions } from "./vite-plugin-nitro.js";
40
- type FarmImageConfig = NonNullable<Parameters<typeof resolveFarmImageConfig>[0]>;
41
36
  export interface FarmRscConfig {
42
37
  srcDir?: string;
43
38
  extends?: readonly FarmLayerEntry[];
@@ -47,18 +42,13 @@ export interface FarmRscConfig {
47
42
  api?: FarmAPIConfig;
48
43
  server?: FarmServerConfig;
49
44
  middleware?: FarmMiddlewareConfig;
50
- /** Same options as core's `images`: `<Image>` URLs and the optimizer at `images.path`. */
51
- images?: FarmImageConfig;
52
45
  port?: number;
53
46
  experimental?: {
54
47
  /**
55
- * Enable React Server Components rendering. `{ mode: "rsc" }` is the same as `true`; this
56
- * pipeline is the `"rsc"` engine of core's `experimental.serverComponents`.
48
+ * Enable React Server Components rendering.
57
49
  * @default true
58
50
  */
59
- serverComponents?: boolean | {
60
- mode: "rsc";
61
- };
51
+ serverComponents?: boolean;
62
52
  /**
63
53
  * Enable React Server Actions and their public POST decoder.
64
54
  * @default false
@@ -87,31 +77,6 @@ export interface FarmRscConfig {
87
77
  };
88
78
  /** Extra Vite plugins (e.g. rsc() with entries so client build resolves virtual:vite-rsc/client-references). */
89
79
  plugins?: any[];
90
- /**
91
- * Markdown mirrors for agents: `/page.md` and `Accept: text/markdown`, with
92
- * `?outline`, `?section`, `?max_tokens`, and `?actions`. Same options as core's `md`.
93
- * @default true
94
- */
95
- md?: FarmMarkdownUserConfig | boolean;
96
- /**
97
- * Agent-facing files. `llmsTxt` serves `/llms.txt`, an index of the app's
98
- * static pages that links to their Markdown mirrors, and with `full: true`
99
- * also `/llms-full.txt`, which inlines them. Same options as core's
100
- * `agent.llmsTxt`; `false` turns it off.
101
- * @default { llmsTxt: { full: false } }
102
- */
103
- agent?: {
104
- llmsTxt?: boolean | FarmLlmsTxtUserConfig;
105
- };
106
- /**
107
- * An MCP endpoint for agents, with the same options as core's top-level
108
- * `mcp`. Requires `@farm.js/mcp`. Declare it directly in this config object:
109
- * the server reads it, and only the bindings it uses, from this file.
110
- * `oauth` is not supported in RSC apps yet.
111
- */
112
- mcp?: FarmMCPUserConfig;
113
- /** @internal See `FarmRscPluginOptions.mobileClient`; set by `farm dev` and `farm build`. */
114
- mobileClient?: FarmRscMobileClient;
115
80
  }
116
81
  /**
117
82
  * Define a Farm.js RSC configuration
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/rsc/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/rsc/index.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAIL,KAAK,MAAM,EACX,KAAK,UAAU,EAChB,MAAM,MAAM,CAAC;AAEd,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACrE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AACpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAClF,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AA6D9E,YAAY,EAAE,oBAAoB,EAAE,YAAY,EAAE,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAExF,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC1D,YAAY,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAGjE,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,SAAS,cAAc,EAAE,CAAC;IACpC,MAAM,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,aAAa,CAAC;IACpB,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,UAAU,CAAC,EAAE,oBAAoB,CAAC;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE;QACb;;;WAGG;QACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B;;;WAGG;QACH,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB;;;;;;;WAOG;QACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;KAC7B,CAAC;IACF,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE,uBAAuB,CAAC;IACxC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACjD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE;QACR,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,gHAAgH;IAChH,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,GAAE,aAAkB,GAAG,UAAU,CA2DnE;AAuXD;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,GAAE,oBAAyB,GAAG,MAAM,EAAE,CAuyC5E"}