@jk2908/solas 0.11.0 → 0.11.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.11.1
+
+### Fixes
+
+- A document request is now served as HTML by default. Solas only returns the RSC payload when the client asks for `text/x-component` (and not `text/html`); a request to a page without that, such as `Accept: */*` or no `Accept` header, used to receive the RSC payload — and, for a page with no endpoint, an error.
+
 ## 0.11.0
 
 ### Breaking

package/dist/internal/env/rsc.js

@@ -6,7 +6,7 @@ import * as Config from '../../config.js';
 import * as RuntimeManifest from '../../manifest.js';
 import { createHttpRouter } from '../http-router/create-http-router.js';
 import { HttpRouter } from '../http-router/router.js';
-import { normaliseTrailingSlash } from '../http-router/utils.js';
+import { isRscRequest, normaliseTrailingSlash } from '../http-router/utils.js';
 import { Metadata } from '../metadata.js';
 import { HttpException, isHttpException, toHttpException, toHttpExceptionLike, } from '../navigation/http-exception.js';
 import { isRedirect, toRedirect } from '../navigation/redirect.js';
@@ -190,7 +190,7 @@ export function createHandler(config, manifest, importMap, options = {}) {
         }
         const { stream: rscStream, status, ppr, } = await createPayload(req, manifest, importMap, config.metadata, opts.returnValue, opts.formState, opts.temporaryReferences);
         const stream = await rscStream;
-        if (!req.headers.get('accept')?.includes('text/html')) {
+        if (isRscRequest(req)) {
             return new Response(stream, {
                 headers: {
                     'Cache-Control': 'private, no-store',
@@ -338,14 +338,13 @@ export function createHandler(config, manifest, importMap, options = {}) {
     /**
      * Serve the saved HTML for a fully prerendered route. Runs as the route
      * handler, after middleware, so middleware applies to static routes too. It
-     * returns null for anything else (a route without a saved prerender, an RSC
-     * navigation, or a request without an HTML accept header), so the caller
-     * falls back to rendering.
+     * returns null for anything else (a route without a saved prerender or an RSC
+     * navigation), so the caller falls back to rendering.
      */
     async function serveFullPrerender(req) {
         if (import.meta.env.DEV)
             return null;
-        if (!(req.headers.get('accept') ?? '').includes('text/html'))
+        if (isRscRequest(req))
             return null;
         if (req.headers.get(`x-${Config.SLUG}-prerender-artifact`) === '1')
             return null;

package/dist/internal/http-router/create-http-router.js

@@ -1,4 +1,5 @@
 import { HttpRouter } from './router.js';
+import { isRscRequest } from './utils.js';
 function callEndpoint(fn, req) {
     // endpoint modules may export either a zero-arg handler or one that expects the request
     if (fn.length === 0)
@@ -82,12 +83,12 @@ export function createHttpRouter(config, manifest, importMap, rsc, serveFullPrer
         const middlewares = mergeMiddlewares(importMap[page.__id]?.middlewares, endpointEntry ? importMap[endpointEntry.__id]?.middlewares : undefined);
         router.add(page.__path, 'GET', async req => {
             const accept = req.headers.get('accept') ?? '';
-            if (accept.includes('text/html') || accept.includes('text/x-component')) {
+            // a request that asks for a document or the RSC payload is rendered,
+            // as is any request to a page with no endpoint; anything else is the
+            // endpoint's own body
+            if (isRscRequest(req) || accept.includes('text/html') || !endpoint) {
                 return (await serveFullPrerender?.(req)) ?? rsc(req);
             }
-            if (!endpoint) {
-                throw new Error(`Missing unified endpoint handler for ${page.__path}`);
-            }
             return callEndpoint(endpoint, req);
         }, page.__params, middlewares);
     }

package/dist/internal/http-router/utils.d.ts

@@ -1,4 +1,12 @@
 import type { PluginConfig } from '../../types.js';
+/**
+ * Whether a request wants the RSC payload rather than a document.
+ *
+ * The client asks for `text/x-component` on navigations. Anything else (a
+ * browser, or a fetch with no explicit preference) should get HTML, so a plain
+ * request to a page never receives the RSC payload.
+ */
+export declare function isRscRequest(req: Request): boolean;
 export type PathPattern = {
     path: string;
     wildcardNames: Set<string>;

package/dist/internal/http-router/utils.js

@@ -1,3 +1,14 @@
+/**
+ * Whether a request wants the RSC payload rather than a document.
+ *
+ * The client asks for `text/x-component` on navigations. Anything else (a
+ * browser, or a fetch with no explicit preference) should get HTML, so a plain
+ * request to a page never receives the RSC payload.
+ */
+export function isRscRequest(req) {
+    const accept = req.headers.get('accept') ?? '';
+    return accept.includes('text/x-component') && !accept.includes('text/html');
+}
 /**
  * Escape a literal path segment so it can be used safely in a
  * path-to-regexp pattern.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@jk2908/solas",
-	"version": "0.11.0",
+	"version": "0.11.1",
 	"description": "A Vite + React meta-framework exploring streaming, Server Components, and partial prerendering. Designed for simplicity and lightness",
 	"keywords": [
 		"framework",