1.4.0: not_found, server-only response options, compression
- Server functions can return not_found: true to render the 404 page with status 404. - Page components and window.__PAGE_PROPS__ (and HMR updates) only get props, query, url and error. response_options, redirect, cache settings and res_transform stay on the server, so cookies and private headers no longer end up in the HTML. BunextPageProps is narrowed to match (breaking for code that read server-only fields from component props). - response_options headers go through a Headers object, so repeated headers such as several Set-Cookie survive. - Redirects: status_code wins over permanent; response_options headers and res_transform apply to redirects too. - Gzip for compressible text responses; compress: false to turn it off. - Files the router matches but never bundles (.server.ts, __root, excluded paths and directories) return 404 instead of looping through dev rebuild retries. - Missing public files return 404 rather than 403, so dotted page paths like /users/john.doe fall through to pages again. - importFresh detects rewrites within the filesystem's mtime granularity. - README: self-hosted React (not esm.sh), snake_case option names, static file serving, cache headers, the new options. Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
+7
-2
@@ -9,6 +9,7 @@ import { AppData } from "../../../data/app-data";
|
||||
import _ from "lodash";
|
||||
import grabDirNames from "../../../utils/grab-dir-names";
|
||||
import { NoSEORobotsValue } from "../../../utils/disable-seo";
|
||||
import grabClientPageProps from "../../../utils/grab-client-page-props";
|
||||
const { ROOT_DIR } = grabDirNames();
|
||||
export default async function genWebHTML({ component: Main, pageProps, bundledMap, module, routeParams, debug, root_module, }) {
|
||||
const { ClientRootElementIDName, ClientWindowPagePropsName } = grabContants();
|
||||
@@ -20,9 +21,13 @@ export default async function genWebHTML({ component: Main, pageProps, bundledMa
|
||||
if (!Main) {
|
||||
throw new Error(`Main Component not found!`);
|
||||
}
|
||||
// Only the client-safe part reaches the components and the HTML;
|
||||
// response_options (headers, cookies) etc. stay on the server. Head and
|
||||
// meta still get the full server result: they only render here.
|
||||
const client_props = grabClientPageProps(pageProps);
|
||||
let serializedProps = "{}";
|
||||
try {
|
||||
serializedProps = serializeForScript(pageProps || {});
|
||||
serializedProps = serializeForScript(client_props);
|
||||
}
|
||||
catch (error) { }
|
||||
const page_hydration_script = await grabWebPageHydrationScript();
|
||||
@@ -64,7 +69,7 @@ export default async function genWebHTML({ component: Main, pageProps, bundledMa
|
||||
__html: serializeForScript(global.BUNEXT_REACT_IMPORTS_MAP),
|
||||
}, defer: true, "data-bunext-head": true }), _jsx("script", { src: `/${bundledMap.path}`, type: "module", id: AppData["BunextClientHydrationScriptID"], defer: true, "data-bunext-head": true })] })) : null, is_dev ? (_jsx("script", { defer: true, dangerouslySetInnerHTML: {
|
||||
__html: page_hydration_script,
|
||||
}, "data-bunext-head": true })) : null] }), _jsx("body", { children: _jsx("div", { id: ClientRootElementIDName, suppressHydrationWarning: !dev, children: _jsx(Main, { ...pageProps }) }) })] }));
|
||||
}, "data-bunext-head": true })) : null] }), _jsx("body", { children: _jsx("div", { id: ClientRootElementIDName, suppressHydrationWarning: !dev, children: _jsx(Main, { ...client_props }) }) })] }));
|
||||
let html = `<!DOCTYPE html>\n`;
|
||||
// const stream = await renderToReadableStream(final_component, {
|
||||
// onError(error: any) {
|
||||
|
||||
+14
-15
@@ -3,12 +3,11 @@ import isDevelopment from "../../../utils/is-development";
|
||||
import { log } from "../../../utils/log";
|
||||
import genWebHTML from "./generate-web-html";
|
||||
import generateWebPageGetCachePage from "./generate-web-page-get-cache-page";
|
||||
import grabRedirectResponse from "../../../utils/grab-redirect-response";
|
||||
export default async function generateWebPageResponseFromComponentReturn({ component, module, bundledMap, routeParams, serverRes, debug, root_module, }) {
|
||||
const is_dev = isDevelopment();
|
||||
if (serverRes?.redirect?.destination) {
|
||||
return Response.redirect(serverRes.redirect.destination, serverRes.redirect.permanent
|
||||
? 301
|
||||
: serverRes.redirect.status_code || 302);
|
||||
return await grabRedirectResponse({ serverRes, routeParams });
|
||||
}
|
||||
const html = await genWebHTML({
|
||||
component,
|
||||
@@ -22,21 +21,21 @@ export default async function generateWebPageResponseFromComponentReturn({ compo
|
||||
if (debug) {
|
||||
log.info("html", html);
|
||||
}
|
||||
// A Headers object (not an object spread) so repeated headers such as
|
||||
// several Set-Cookie survive, whichever HeadersInit form was returned.
|
||||
const headers = new Headers(serverRes?.response_options?.headers);
|
||||
if (!headers.has("Content-Type")) {
|
||||
headers.set("Content-Type", "text/html");
|
||||
}
|
||||
if (is_dev) {
|
||||
headers.set("Cache-Control", "no-cache, no-store, must-revalidate");
|
||||
headers.set("Pragma", "no-cache");
|
||||
headers.set("Expires", "0");
|
||||
}
|
||||
const res_opts = {
|
||||
...serverRes?.response_options,
|
||||
headers: {
|
||||
"Content-Type": "text/html",
|
||||
...serverRes?.response_options?.headers,
|
||||
},
|
||||
headers,
|
||||
};
|
||||
if (is_dev) {
|
||||
res_opts.headers = {
|
||||
...res_opts.headers,
|
||||
"Cache-Control": "no-cache, no-store, must-revalidate",
|
||||
Pragma: "no-cache",
|
||||
Expires: "0",
|
||||
};
|
||||
}
|
||||
if (!is_dev) {
|
||||
await generateWebPageGetCachePage({
|
||||
html,
|
||||
|
||||
+10
-8
@@ -12,15 +12,11 @@ import grabDirNames from "../../../utils/grab-dir-names";
|
||||
import grabRelativePath from "../../../utils/grab-relative-path";
|
||||
import { logBuildErrorsOnce } from "../../../utils/build-error-log";
|
||||
import { RequestBodyTooLargeError } from "../../../utils/read-request-body";
|
||||
const { BUNX_BUNDLER_ERROR_EXIT_FILE, ROOT_DIR } = grabDirNames();
|
||||
class NotFoundError extends Error {
|
||||
status = 404;
|
||||
constructor(message) {
|
||||
super(message);
|
||||
this.name = "NotFoundError";
|
||||
}
|
||||
}
|
||||
import NotFoundError from "../../../utils/not-found-error";
|
||||
import isRoutablePage from "../../../utils/is-routable-page";
|
||||
const { ROOT_DIR } = grabDirNames();
|
||||
export default async function grabPageComponent(params) {
|
||||
const { BUNX_BUNDLER_ERROR_EXIT_FILE } = grabDirNames();
|
||||
const { req, file_path: passed_file_path, debug, return_server_res_only, skip_server_res, is_hydration, no_retry, } = params;
|
||||
const url = req?.url ? new URL(req.url) : undefined;
|
||||
const router = global.BUNEXT_ROUTER;
|
||||
@@ -46,6 +42,12 @@ export default async function grabPageComponent(params) {
|
||||
if (!match?.filePath && url?.pathname) {
|
||||
throw new NotFoundError(`Page ${url.pathname} not found`);
|
||||
}
|
||||
// The router also matches files that are never bundled (.server.ts
|
||||
// companions, __root, excluded paths). Without this they would sit
|
||||
// in the dev rebuild/retry loop and never respond.
|
||||
if (match?.filePath && !isRoutablePage(match.filePath)) {
|
||||
throw new NotFoundError(`Page ${url?.pathname} not found`);
|
||||
}
|
||||
const file_path = match?.filePath || passed_file_path;
|
||||
if (debug) {
|
||||
log.info(`file_path:`, file_path);
|
||||
|
||||
+7
-3
@@ -4,6 +4,8 @@ import { log } from "../../../utils/log";
|
||||
import grabRootFilePath from "./grab-root-file-path";
|
||||
import grabPageCombinedServerRes from "./grab-page-combined-server-res";
|
||||
import importFresh from "../../../utils/import-fresh";
|
||||
import grabRedirectResponse from "../../../utils/grab-redirect-response";
|
||||
import NotFoundError from "../../../utils/not-found-error";
|
||||
export default async function grabPageModules({ file_path, debug, url, query, routeParams, skip_server_res, }) {
|
||||
const { serverRes } = skip_server_res
|
||||
? {}
|
||||
@@ -15,9 +17,11 @@ export default async function grabPageModules({ file_path, debug, url, query, ro
|
||||
url,
|
||||
});
|
||||
if (serverRes?.redirect?.destination) {
|
||||
return Response.redirect(serverRes.redirect.destination, serverRes.redirect.permanent
|
||||
? 301
|
||||
: serverRes.redirect.status_code || 302);
|
||||
return await grabRedirectResponse({ serverRes, routeParams });
|
||||
}
|
||||
// Rendered as the 404 page by grabPageComponent's error path
|
||||
if (serverRes?.not_found) {
|
||||
throw new NotFoundError(`Page ${url?.pathname || file_path} not found`);
|
||||
}
|
||||
const { component, page_module, root_module: bundled_root_module, } = (await grabPageBundledReactComponent({
|
||||
file_path,
|
||||
|
||||
@@ -4,14 +4,16 @@ import grabDirNames from "../../../utils/grab-dir-names";
|
||||
import path from "path";
|
||||
import tailwindEsbuildPlugin from "./tailwind-esbuild-plugin";
|
||||
import { existsSync, rmSync, unlinkSync } from "fs";
|
||||
const { PAGES_DIR, BUNX_CWD_MODULE_CACHE_DIR, ROOT_DIR } = grabDirNames();
|
||||
const { PAGES_DIR, ROOT_DIR } = grabDirNames();
|
||||
function toModPath(page_file_path) {
|
||||
const { BUNX_CWD_MODULE_CACHE_DIR } = grabDirNames();
|
||||
return path.join(BUNX_CWD_MODULE_CACHE_DIR, page_file_path.replace(PAGES_DIR, "").replace(/\.(t|j)sx?$/, ".js"));
|
||||
}
|
||||
function isBatch(params) {
|
||||
return "tsx_map" in params;
|
||||
}
|
||||
async function buildEntries({ entries, clean_cache }) {
|
||||
const { BUNX_CWD_MODULE_CACHE_DIR } = grabDirNames();
|
||||
const dev = isDevelopment();
|
||||
const toBuild = [];
|
||||
for (const entry of entries) {
|
||||
|
||||
Reference in New Issue
Block a user