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

[dario-piotrowicz]

resolves #172

---

The patchFindDir function:

opennextjs-cloudflare/packages/cloudflare/src/cli/build/patches/to-investigate/patch-find-dir.ts

Line 12 in acec1c3

export function patchFindDir(code: string, config: Config): string {

Stopped working since a new name variable got introduced in the Next.js source code, causing the bundled code to rename the function's name parameter to name2 instead:

I fixed this by updating the code replacement to also accept the variables with a numerical suffix. I also added a check to make sure that the patching is applied (if we already had the check in place that would have saved me lots of time here! 😭)

A few notes:

• I wanted to update the code to use AST manipulation, but since this patch is in the to-investigate directory I guess that we assume that this is temporary, so maybe it's not worth investing time to update the code to use ASTs? (if it is I am more than happy to do so!)
• again, having the patchedCode !== code check would have saved me lots of time here, we need to add it to all the patch functions to avoid wasting time again, I will do that in a followup PR
• potentially we can hit this issue with other patching functions, I can update those as well to accept numerical suffixes in their variables/paramenters, but I think that adding the patchedCode !== code check would be good enough for now

[changeset-bot]

⚠️ No Changeset found

Latest commit: 9d8ccd5

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

[pkg-pr-new]

Open in Stackblitz

pnpm add https://pkg.pr.new/@opennextjs/cloudflare@184

commit: 9d8ccd5

[vicb]

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

[dario-piotrowicz]

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

[vicb]

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

[vicb]

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

[dario-piotrowicz]

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 🙂

[vicb]

Thanks Dario 🙏

Does this also resolve the warnings (eval(require)...?)

Feel to to assign #28 to yourself and add it to the board :)

[dario-piotrowicz]

Does this also resolve the warnings (eval(require)...?)

no 🥲

I can look into those if you want, but since they are only warnings I assumed that they are lower priority

Regarding warnings we also get this one:

[vicb]

Does this also resolve the warnings (eval(require)...?)

no 🥲

I can look into those if you want, but since they are only warnings I assumed that they are lower priority

Regarding warnings we also get this one:

Maybe create an issue for eval(require)... so that we look into it at some point.

process.env.NODE_ENV is because Open Next set the value to "production" while we also force a define with the same value with ESBuild. No big deal but something we should fix. It is listed as a KI in the readme for now.