Skip to content

prevent eval patch from failing build #190

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 1 commit into from
Dec 18, 2024
Merged

prevent eval patch from failing build #190

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions packages/cloudflare/src/cli/build/bundle-server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,11 @@ async function updateWorkerBundledCode(
// TODO: implement for cf (possibly in @opennextjs/aws)
.replace("patchAsyncStorage();", "//patchAsyncStorage();"),
],
['`eval("require")` calls', (code) => code.replaceAll('eval("require")', "require")],
[
'`eval("require")` calls',
(code) => code.replaceAll('eval("require")', "require"),
{ isOptional: true },
],
[
"`require.resolve` call",
// workers do not support dynamic require nor require.resolve
Expand Down Expand Up @@ -204,18 +208,18 @@ function createFixRequiresESBuildPlugin(config: Config): Plugin {
*/
async function patchCodeWithValidations(
code: string,
patches: [string, (code: string) => string | Promise<string>][]
patches: [string, (code: string) => string | Promise<string>, opts?: { isOptional?: boolean }][]
): Promise<string> {
console.log(`Applying code patches:`);
let patchedCode = code;

for (const [target, patchFunction] of patches) {
for (const [target, patchFunction, opts] of patches) {
console.log(` - patching ${target}`);

const prePatchCode = patchedCode;
patchedCode = await patchFunction(patchedCode);

if (prePatchCode === patchedCode) {
if (!opts?.isOptional && prePatchCode === patchedCode) {
throw new Error(`Failed to patch ${target}`);
}
}
Expand Down
Loading