Skip to content

make sure patchFindDir works with Next.js 15 and add patching validation check #184

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 2 commits into from
Dec 17, 2024
Merged

make sure patchFindDir works with Next.js 15 and add patching validation check #184

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5412d1
make sure `patchFindDir` works with Next.js 15 and add patching valid…
dario-piotrowicz Dec 17, 2024
9d8ccd5
use named capturing groups in regex replacement
dario-piotrowicz Dec 17, 2024
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
20 changes: 13 additions & 7 deletions packages/cloudflare/src/cli/build/patches/to-investigate/patch-find-dir.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,24 @@ import { Config } from "../../../config";
*/
export function patchFindDir(code: string, config: Config): string {
console.log("# patchFindDir");
return code.replace(
"function findDir(dir, name) {",
`function findDir(dir, name) {
if (dir.endsWith(".next/server")) {
if (name === "app") {
const patchedCode = code.replace(
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe add a comment here with the pre-15.1 code and 15.1 code

Copy link
Contributor Author

Choose a reason for hiding this comment

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

are you sure? it feels a bit overkill to me here 😕

Copy link
Contributor

Choose a reason for hiding this comment

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

It might help if we later need to convert the patch to AST but your call :)

Copy link
Contributor

Choose a reason for hiding this comment

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

(and to be clear I meant fn signature, not the whole function)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'd leave it as is if it's ok by you 🙂

but if you do prefer a comment, could you please add a code suggestion here and I'd be happy to just go with whatever you'd fine useful here 🙂

/function findDir\((?<dir>dir\d*), (?<name>name\d*)\) {/,
`function findDir($dir, $name) {
if ($dir.endsWith(".next/server")) {
if ($name === "app") {
return ${existsSync(`${join(config.paths.output.standaloneAppServer, "app")}`)};
}
if (name === "pages") {
if ($name === "pages") {
return ${existsSync(`${join(config.paths.output.standaloneAppServer, "pages")}`)};
}
}
throw new Error("Unknown findDir call: " + dir + " " + name);
throw new Error("Unknown findDir call: " + $dir + " " + $name);
`
);

if (patchedCode === code) {
throw new Error("Patch `patchFindDir` not applied");
}

return patchedCode;
}
Loading