Skip to content

patch require("react-dom/server.edge") calls in pages.runtime.prod.js so that they are try-catched #235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 8, 2025
Merged

patch require("react-dom/server.edge") calls in pages.runtime.prod.js so that they are try-catched #235

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75ddc40
patch `require("react-dom/server.edge")` calls in `pages.runtime.prod…
dario-piotrowicz Jan 8, 2025
f1676af
negate if conditions
dario-piotrowicz Jan 8, 2025
4bdbc21
simplify if conditions
dario-piotrowicz Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions packages/cloudflare/src/cli/build/patches/to-investigate/wrangler-deps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,18 +107,22 @@ function patchRequireReactDomServerEdge(config: Config) {
const parameterName = p[0]!.getName();
const bodyChildren = arrowFunction.getBody().getChildren();
if (
bodyChildren.length !== 3 ||
bodyChildren[0]!.getFullText() !== "{" ||
bodyChildren[2]!.getFullText() !== "}"
!(
bodyChildren.length === 3 &&
bodyChildren[0]!.getFullText() === "{" &&
bodyChildren[2]!.getFullText() === "}"
)
) {
return;
}
const bodyStatements = bodyChildren[1]?.getChildren();

// the function has only two statements: "use strict" and e.exports=require("react-dom/server.edge")
if (
bodyStatements?.length !== 2 ||
bodyStatements.some((statement) => !statement.isKind(ts.SyntaxKind.ExpressionStatement))
!(
bodyStatements?.length === 2 &&
bodyStatements.every((statement) => statement.isKind(ts.SyntaxKind.ExpressionStatement))
)
) {
return;
}
Expand All @@ -129,13 +133,13 @@ function patchRequireReactDomServerEdge(config: Config) {
);

// the first statement needs to be "use strict"
if (!stringLiteralExpression || stringLiteralExpression.getText() !== '"use strict"') {
if (stringLiteralExpression?.getText() !== '"use strict"') {
return;
}

// the second statement (e.exports=require("react-dom/server.edge")) needs to be a binary expression
const binaryExpression = bodyExpressionStatements[1].getExpressionIfKind(ts.SyntaxKind.BinaryExpression);
if (!binaryExpression || !binaryExpression.getOperatorToken().isKind(ts.SyntaxKind.EqualsToken)) {
if (!binaryExpression?.getOperatorToken().isKind(ts.SyntaxKind.EqualsToken)) {
return;
}

Expand Down
Loading