Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@jimbrig
jimbrig authored Oct 3, 2024
1 parent 8deba78 commit 86d5e12
Show file tree
Hide file tree
Showing 6 changed files with 8,733 additions and 177 deletions.
162 changes: 11 additions & 151 deletions app/app/entry.server.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,159 +1,19 @@
import { PassThrough } from "node:stream";

import type { AppLoadContext, EntryContext } from "@remix-run/node";
import { createReadableStreamFromReadable } from "@remix-run/node";
import type { EntryContext } from "@remix-run/node";
import { RemixServer } from "@remix-run/react";
import { config } from "dotenv";
import * as isbotModule from "isbot";
import { renderToPipeableStream } from "react-dom/server";

// Load .env variables
config();

const ABORT_DELAY = 5_000;
import { renderToString } from "react-dom/server";

export default function handleRequest(
request: Request,
responseStatusCode: number,
responseHeaders: Headers,
remixContext: EntryContext,
loadContext: AppLoadContext,
) {
const prohibitOutOfOrderStreaming =
isBotRequest(request.headers.get("user-agent")) || remixContext.isSpaMode;

return prohibitOutOfOrderStreaming
? handleBotRequest(
request,
responseStatusCode,
responseHeaders,
remixContext,
)
: handleBrowserRequest(
request,
responseStatusCode,
responseHeaders,
remixContext,
);
}

// We have some Remix apps in the wild already running with isbot@3 so we need
// to maintain backwards compatibility even though we want new apps to use
// isbot@4. That way, we can ship this as a minor Semver update to @remix-run/dev.
function isBotRequest(userAgent: string | null) {
if (!userAgent) {
return false;
}

// isbot >= 3.8.0, >4
if ("isbot" in isbotModule && typeof isbotModule.isbot === "function") {
return isbotModule.isbot(userAgent);
}

// isbot < 3.8.0
if ("default" in isbotModule && typeof isbotModule.default === "function") {
return isbotModule.default(userAgent);
}

return false;
}

function handleBotRequest(
request: Request,
responseStatusCode: number,
responseHeaders: Headers,
remixContext: EntryContext,
remixContext: EntryContext
) {
return new Promise((resolve, reject) => {
let shellRendered = false;
const { pipe, abort } = renderToPipeableStream(
<RemixServer
context={remixContext}
url={request.url}
abortDelay={ABORT_DELAY}
/>,
{
onAllReady() {
shellRendered = true;
const body = new PassThrough();
const stream = createReadableStreamFromReadable(body);

responseHeaders.set("Content-Type", "text/html");

resolve(
new Response(stream, {
headers: responseHeaders,
status: responseStatusCode,
}),
);

pipe(body);
},
onShellError(error: unknown) {
reject(error);
},
onError(error: unknown) {
responseStatusCode = 500;
// Log streaming rendering errors from inside the shell. Don't log
// errors encountered during initial shell rendering since they'll
// reject and get logged in handleDocumentRequest.
if (shellRendered) {
console.error(error);
}
},
},
);

setTimeout(abort, ABORT_DELAY);
});
}

function handleBrowserRequest(
request: Request,
responseStatusCode: number,
responseHeaders: Headers,
remixContext: EntryContext,
) {
return new Promise((resolve, reject) => {
let shellRendered = false;
const { pipe, abort } = renderToPipeableStream(
<RemixServer
context={remixContext}
url={request.url}
abortDelay={ABORT_DELAY}
/>,
{
onShellReady() {
shellRendered = true;
const body = new PassThrough();
const stream = createReadableStreamFromReadable(body);

responseHeaders.set("Content-Type", "text/html");

resolve(
new Response(stream, {
headers: responseHeaders,
status: responseStatusCode,
}),
);

pipe(body);
},
onShellError(error: unknown) {
reject(error);
},
onError(error: unknown) {
responseStatusCode = 500;
// Log streaming rendering errors from inside the shell. Don't log
// errors encountered during initial shell rendering since they'll
// reject and get logged in handleDocumentRequest.
if (shellRendered) {
console.error(error);
}
},
},
);

setTimeout(abort, ABORT_DELAY);
let html = renderToString(
<RemixServer context={remixContext} url={request.url} />
);
html = "<!DOCTYPE html>\n" + html;
return new Response(html, {
headers: { "Content-Type": "text/html" },
status: responseStatusCode,
});
}
}
8 changes: 0 additions & 8 deletions app/app/root.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@ import './styles/global.css';
import ScrollToTopButton from "./components/ScrollToTopButton";
// import ChatbotScript from "./components/ChatBot";

// Load the GA tracking id from the .env
export const loader = async () => {
return json({ gaTrackingId: "G-BQBBSBFGZG" });
};

export const meta: MetaFunction = () => {
return [
{title: "Bastien Law"},
Expand Down Expand Up @@ -89,6 +84,3 @@ export default function App() {
return <Outlet />;
}

export function HydrateFallback() {
return <p>Loading...</p>;
}
10 changes: 0 additions & 10 deletions app/app/routes/$.tsx
View file

This file was deleted.

6 changes: 3 additions & 3 deletions app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
"scripts": {
"preinstall": "pnpm dlx only-allow pnpm",
"build": "remix vite:build",
"dev": "remix vite:dev",
"dev": "remix vite:dev --port 8080",
"lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
"preview": "npx vite preview",
"serve": "npx sirv-cli build/client --single",
"preview": "pnpm dlx vite preview",
"serve": "pnpm dlx sirv-cli build/client --single",
"start": "remix-serve ./build/client",
"typecheck": "tsc"
},
Expand Down
Loading

1 comment on commit 86d5e12

@vercel
Copy link

@vercel vercel bot commented on 86d5e12 Oct 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

bastienlaw-dev – ./app

bastienlaw-dev.vercel.app
bastienlaw-dev-no-clocks.vercel.app
bastienlaw-dev-git-main-no-clocks.vercel.app
dev.bastienlaw.com
bastienlaw.noclocks.dev

Please sign in to comment.