aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jarred Sumner <jarred@jarredsumner.com> 2021-09-02 11:54:38 -0700
committerGravatar Jarred Sumner <jarred@jarredsumner.com> 2021-09-02 11:54:38 -0700
commit336aa0d9a5047ae52f1371630b3d765448c7e5fc (patch)
tree097558fc250564c524f0d2729b5332adf50cd8f4
parentc015c0c0cd06506c4460dd27f88aaa1fc2109344 (diff)
downloadbun-336aa0d9a5047ae52f1371630b3d765448c7e5fc.tar.gz
bun-336aa0d9a5047ae52f1371630b3d765448c7e5fc.tar.zst
bun-336aa0d9a5047ae52f1371630b3d765448c7e5fc.zip
Commit latest bun-frmaework-next changes
Former-commit-id: ac2100b990eca4288201b070d0ba972484e57556
Diffstat
-rw-r--r--examples/hello-next/bun-framework-next/.npmignore2
-rw-r--r--examples/hello-next/bun-framework-next/renderDocument.tsx121
-rw-r--r--examples/hello-next/bun-framework-next/server.development.tsx2
3 files changed, 74 insertions, 51 deletions
diff --git a/examples/hello-next/bun-framework-next/.npmignore b/examples/hello-next/bun-framework-next/.npmignore
new file mode 100644
index 000000000..dc0954477
--- /dev/null
+++ b/examples/hello-next/bun-framework-next/.npmignore
@@ -0,0 +1,2 @@
+*.bun
+node_modules \ No newline at end of file
diff --git a/examples/hello-next/bun-framework-next/renderDocument.tsx b/examples/hello-next/bun-framework-next/renderDocument.tsx
index d55e35ed6..a79c4fdb2 100644
--- a/examples/hello-next/bun-framework-next/renderDocument.tsx
+++ b/examples/hello-next/bun-framework-next/renderDocument.tsx
@@ -16,12 +16,15 @@ import {
NextComponentType,
RenderPage,
RenderPageResult,
+ HtmlContext,
} from "next/dist/shared/lib/utils";
import * as NextDocument from "next/document";
import * as ReactDOMServer from "react-dom/server.browser";
import * as url from "url";
import * as React from "react";
import * as ReactIs from "react-is";
+import { BODY_RENDER_TARGET } from "next/constants";
+
const dev = process.env.NODE_ENV === "development";
type ParsedUrlQuery = Record<string, string | string[]>;
@@ -199,56 +202,59 @@ function renderDocument(
autoExport?: boolean;
}
): string {
+ const htmlProps = {
+ __NEXT_DATA__: {
+ props, // The result of getInitialProps
+ page: pathname, // The rendered page
+ query, // querystring parsed / passed by the user
+ buildId, // buildId is used to facilitate caching of page bundles, we send it to the client so that pageloader knows where to load bundles
+ assetPrefix: assetPrefix === "" ? undefined : assetPrefix, // send assetPrefix to the client side when configured, otherwise don't sent in the resulting HTML
+ runtimeConfig, // runtimeConfig if provided, otherwise don't sent in the resulting HTML
+ nextExport, // If this is a page exported by `next export`
+ autoExport, // If this is an auto exported page
+ isFallback,
+ dynamicIds:
+ dynamicImportsIds.length === 0 ? undefined : dynamicImportsIds,
+ err: err || undefined, // err: err ? serializeError(dev, err) : undefined, // Error if one happened, otherwise don't sent in the resulting HTML
+ gsp, // whether the page is getStaticProps
+ gssp, // whether the page is getServerSideProps
+ customServer, // whether the user is using a custom server
+ gip, // whether the page has getInitialProps
+ appGip, // whether the _app has getInitialProps
+ locale,
+ locales,
+ defaultLocale,
+ domainLocales,
+ isPreview,
+
+ pages: buildManifest.pages,
+ },
+ buildManifest,
+ docComponentsRendered,
+ dangerousAsPath,
+ canonicalBase,
+ ampPath,
+ inAmpMode,
+ isDevelopment: !!dev,
+ hybridAmp,
+ dynamicImports,
+ assetPrefix,
+ headTags,
+ unstable_runtimeJS,
+ unstable_JsPreload,
+ devOnlyCacheBusterQueryString,
+ scriptLoader,
+ locale,
+ disableOptimizedLoading,
+ ...docProps,
+ };
return (
"<!DOCTYPE html>" +
ReactDOMServer.renderToStaticMarkup(
<AmpStateContext.Provider value={ampState}>
- {Document.renderDocument(Document, {
- __NEXT_DATA__: {
- props, // The result of getInitialProps
- page: pathname, // The rendered page
- query, // querystring parsed / passed by the user
- buildId, // buildId is used to facilitate caching of page bundles, we send it to the client so that pageloader knows where to load bundles
- assetPrefix: assetPrefix === "" ? undefined : assetPrefix, // send assetPrefix to the client side when configured, otherwise don't sent in the resulting HTML
- runtimeConfig, // runtimeConfig if provided, otherwise don't sent in the resulting HTML
- nextExport, // If this is a page exported by `next export`
- autoExport, // If this is an auto exported page
- isFallback,
- dynamicIds:
- dynamicImportsIds.length === 0 ? undefined : dynamicImportsIds,
- err: err || undefined, // err: err ? serializeError(dev, err) : undefined, // Error if one happened, otherwise don't sent in the resulting HTML
- gsp, // whether the page is getStaticProps
- gssp, // whether the page is getServerSideProps
- customServer, // whether the user is using a custom server
- gip, // whether the page has getInitialProps
- appGip, // whether the _app has getInitialProps
- locale,
- locales,
- defaultLocale,
- domainLocales,
- isPreview,
-
- pages: buildManifest.pages,
- },
- buildManifest,
- docComponentsRendered,
- dangerousAsPath,
- canonicalBase,
- ampPath,
- inAmpMode,
- isDevelopment: !!dev,
- hybridAmp,
- dynamicImports,
- assetPrefix,
- headTags,
- unstable_runtimeJS,
- unstable_JsPreload,
- devOnlyCacheBusterQueryString,
- scriptLoader,
- locale,
- disableOptimizedLoading,
- ...docProps,
- })}
+ <HtmlContext.Provider value={htmlProps}>
+ <Document {...htmlProps} {...docProps}></Document>
+ </HtmlContext.Provider>
</AmpStateContext.Provider>
)
);
@@ -411,7 +417,12 @@ export async function render({
(DocumentNamespace && DocumentNamespace.default) || NextDocument.default;
// Document.Html.prototype.getScripts = getScripts;
// }
-
+ console.log(
+ "next",
+ typeof NextDocument.default,
+ "doc",
+ typeof NextDocument.default.renderDocument
+ );
const callMiddleware = async (method: string, args: any[], props = false) => {
let results: any = props ? {} : [];
@@ -701,8 +712,16 @@ export async function render({
isPreview: isPreview === true ? true : undefined,
autoExport: isAutoExport === true ? true : undefined,
nextExport: nextExport === true ? true : undefined,
- })
- .replaceAll("/_next/http://", "http://")
- .replaceAll("/_next/https://", "https://");
- return new Response(html);
+ });
+ const bodyRenderIdx = html.indexOf(BODY_RENDER_TARGET);
+ html =
+ html.substring(0, bodyRenderIdx) +
+ (false ? "<!-- __NEXT_DATA__ -->" : "") +
+ docProps.html +
+ html.substring(bodyRenderIdx + BODY_RENDER_TARGET.length);
+ return new Response(
+ html
+ .replaceAll("/_next/http://", "http://")
+ .replaceAll("/_next/https://", "https://")
+ );
}
diff --git a/examples/hello-next/bun-framework-next/server.development.tsx b/examples/hello-next/bun-framework-next/server.development.tsx
index 593ebbfa5..c6a7beebf 100644
--- a/examples/hello-next/bun-framework-next/server.development.tsx
+++ b/examples/hello-next/bun-framework-next/server.development.tsx
@@ -1,4 +1,6 @@
import * as React from "react";
+import { Buffer } from "buffer";
+globalThis.Buffer = Buffer;
class URL {
constructor(base, source) {
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-06 23:45:52 +0000