@opennextjs/cloudflare 0.4.6 → 0.4.7

package/dist/cli/build/patches/plugins/load-instrumentation.spec.js

@@ -0,0 +1,45 @@
+import { describe, expect, test } from "vitest";
+import { patchCode } from "../ast/util.js";
+import { instrumentationRule } from "./load-instrumentation.js";
+describe("LoadInstrumentationModule", () => {
+    test("patch", () => {
+        const code = `
+export default class NextNodeServer extends BaseServer<
+  Options,
+  NodeNextRequest,
+  NodeNextResponse
+> {
+  protected async loadInstrumentationModule() {
+    if (!this.serverOptions.dev) {
+      try {
+        this.instrumentation = await dynamicRequire(
+          resolve(
+            this.serverOptions.dir || '.',
+            this.serverOptions.conf.distDir!,
+            'server',
+            INSTRUMENTATION_HOOK_FILENAME
+          )
+        )
+      } catch (err: any) {
+        if (err.code !== 'MODULE_NOT_FOUND') {
+          throw new Error(
+            'An error occurred while loading the instrumentation hook',
+            { cause: err }
+          )
+        }
+      }
+    }
+    return this.instrumentation
+  }
+}`;
+        expect(patchCode(code, instrumentationRule)).toMatchInlineSnapshot(`
+      "export default class NextNodeServer extends BaseServer<
+        Options,
+        NodeNextRequest,
+        NodeNextResponse
+      > {
+        async loadInstrumentationModule() { }
+      }"
+    `);
+    });
+});

package/dist/cli/build/patches/plugins/require-hook.d.ts

@@ -0,0 +1,3 @@
+import type { BuildOptions } from "@opennextjs/aws/build/helper.js";
+import type { Plugin } from "esbuild";
+export declare function shimRequireHook(options: BuildOptions): Plugin;

package/dist/cli/build/patches/plugins/require-hook.js

@@ -0,0 +1,13 @@
+import { join } from "node:path";
+import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
+export function shimRequireHook(options) {
+    return {
+        name: "replaceRelative",
+        setup(build) {
+            // Note: we (empty) shim require-hook modules as they generate problematic code that uses requires
+            build.onResolve({ filter: getCrossPlatformPathRegex(String.raw `^\./require-hook$`, { escape: false }) }, () => ({
+                path: join(options.outputDir, "cloudflare-templates/shims/empty.js"),
+            }));
+        },
+    };
+}

package/dist/cli/build/patches/plugins/require-page.d.ts

@@ -1,6 +1,3 @@
 import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
-import type { PluginBuild } from "esbuild";
-export declare function inlineRequirePagePlugin(buildOpts: BuildOptions): {
-    name: string;
-    setup: (build: PluginBuild) => Promise<void>;
-};
+import type { ContentUpdater } from "./content-updater.js";
+export declare function inlineRequirePagePlugin(updater: ContentUpdater, buildOpts: BuildOptions): import("esbuild").Plugin;

package/dist/cli/build/patches/plugins/require-page.js

@@ -1,46 +1,47 @@
-import { existsSync, readFileSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 import { getPackagePath } from "@opennextjs/aws/build/helper.js";
 import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
 import { patchCode } from "../ast/util.js";
-export function inlineRequirePagePlugin(buildOpts) {
-    return {
-        name: "inline-require-page",
-        setup: async (build) => {
-            build.onLoad({
-                filter: getCrossPlatformPathRegex(String.raw `/next/dist/server/require\.js$`, { escape: false }),
-            }, async ({ path }) => {
-                const jsCode = await readFile(path, "utf8");
-                if (/function requirePage\(/.test(jsCode)) {
-                    return { contents: patchCode(jsCode, getRule(buildOpts)) };
-                }
-            });
-        },
-    };
+export function inlineRequirePagePlugin(updater, buildOpts) {
+    return updater.updateContent("inline-require-page", {
+        filter: getCrossPlatformPathRegex(String.raw `/next/dist/server/require\.js$`, { escape: false }),
+    }, async ({ contents }) => {
+        if (/function requirePage\(/.test(contents)) {
+            return patchCode(contents, await getRule(buildOpts));
+        }
+    });
 }
-function getRule(buildOpts) {
+async function getRule(buildOpts) {
     const { outputDir } = buildOpts;
     const serverDir = join(outputDir, "server-functions/default", getPackagePath(buildOpts), ".next/server");
     const pagesManifestFile = join(serverDir, "pages-manifest.json");
     const appPathsManifestFile = join(serverDir, "app-paths-manifest.json");
-    const pagesManifests = existsSync(pagesManifestFile)
-        ? Object.values(JSON.parse(readFileSync(pagesManifestFile, "utf-8")))
-        : [];
-    const appPathsManifests = existsSync(appPathsManifestFile)
-        ? Object.values(JSON.parse(readFileSync(appPathsManifestFile, "utf-8")))
-        : [];
+    let pagesManifests = [];
+    try {
+        pagesManifests = Object.values(JSON.parse(await readFile(pagesManifestFile, "utf-8")));
+    }
+    catch {
+        // The file does not exists
+        pagesManifests = [];
+    }
+    let appPathsManifests;
+    try {
+        appPathsManifests = Object.values(JSON.parse(await readFile(appPathsManifestFile, "utf-8")));
+    }
+    catch {
+        // The file does not exists
+        appPathsManifests = [];
+    }
     const manifests = pagesManifests.concat(appPathsManifests);
     const htmlFiles = manifests.filter((file) => file.endsWith(".html"));
     const jsFiles = manifests.filter((file) => file.endsWith(".js"));
     // Inline fs access and dynamic require that are not supported by workerd.
     const fnBody = `
 // html
-${htmlFiles
-        .map((file) => `if (pagePath.endsWith("${file}")) {
-        return ${JSON.stringify(readFileSync(join(serverDir, file), "utf-8"))};
-      }`)
-        .join("\n")}
+${(await Promise.all(htmlFiles.map(async (file) => `if (pagePath.endsWith("${file}")) {
+        return ${JSON.stringify(await readFile(join(serverDir, file), "utf-8"))};
+      }`))).join("\n")}
 // js
 process.env.__NEXT_PRIVATE_RUNTIME_TYPE = isAppPath ? 'app' : 'pages';
 try {
@@ -56,13 +57,13 @@ try {
     return {
         rule: {
             pattern: `
-function requirePage($PAGE, $DIST_DIR, $IS_APPP_ATH) {
+function requirePage($PAGE, $DIST_DIR, $IS_APP_PATH) {
   const $_ = getPagePath($$$ARGS);
   $$$_BODY
 }`,
         },
         fix: `
-function requirePage($PAGE, $DIST_DIR, $IS_APPP_ATH) {
+function requirePage($PAGE, $DIST_DIR, $IS_APP_PATH) {
   const pagePath = getPagePath($$$ARGS);
   ${fnBody}
 }`,

package/dist/cli/build/patches/plugins/require.d.ts

@@ -1,5 +1,2 @@
-import type { PluginBuild } from "esbuild";
-export declare function fixRequire(): {
-    name: string;
-    setup: (build: PluginBuild) => Promise<void>;
-};
+import type { ContentUpdater } from "./content-updater";
+export declare function fixRequire(updater: ContentUpdater): import("esbuild").Plugin;

package/dist/cli/build/patches/plugins/require.js

@@ -1,44 +1,37 @@
-import fs from "node:fs/promises";
-export function fixRequire() {
-    return {
-        name: "fix-require",
-        setup: async (build) => {
-            build.onLoad({ filter: /\.(js|mjs|cjs|jsx|ts|tsx)$/ }, async ({ path }) => {
-                let contents = await fs.readFile(path, "utf-8");
-                // `eval(...)` is not supported by workerd.
-                contents = contents.replaceAll(`eval("require")`, "require");
-                // `@opentelemetry` has a few issues.
-                //
-                // Next.js has the following code in `next/dist/server/lib/trace/tracer.js`:
-                //
-                //     try {
-                //       api = require('@opentelemetry/api');
-                //     } catch (err) {
-                //       api = require('next/dist/compiled/@opentelemetry/api');
-                //     }
-                //
-                // The intent is to allow users to install their own version of `@opentelemetry/api`.
-                //
-                // The problem is that even when users do not explicitely install `@opentelemetry/api`,
-                // `require('@opentelemetry/api')` resolves to the package which is a dependency
-                // of Next.
-                //
-                // The second problem is that when Next traces files, it would not copy the `api/build/esm`
-                // folder (used by the `module` conditions in package.json) it would only copy `api/build/src`.
-                // This could be solved by updating the next config:
-                //
-                //     const nextConfig: NextConfig = {
-                //       // ...
-                //       outputFileTracingIncludes: {
-                //         "*": ["./node_modules/@opentelemetry/api/build/**/*"],
-                //       },
-                //     };
-                //
-                // We can consider doing that when we want to enable users to install their own version
-                // of `@opentelemetry/api`. For now we simply use the pre-compiled version.
-                contents = contents.replace(/require\(.@opentelemetry\/api.\)/g, `require("next/dist/compiled/@opentelemetry/api")`);
-                return { contents };
-            });
-        },
-    };
+export function fixRequire(updater) {
+    return updater.updateContent("fix-require", { filter: /\.(js|mjs|cjs|jsx|ts|tsx)$/ }, ({ contents }) => {
+        // `eval(...)` is not supported by workerd.
+        contents = contents.replaceAll(`eval("require")`, "require");
+        // `@opentelemetry` has a few issues.
+        //
+        // Next.js has the following code in `next/dist/server/lib/trace/tracer.js`:
+        //
+        //     try {
+        //       api = require('@opentelemetry/api');
+        //     } catch (err) {
+        //       api = require('next/dist/compiled/@opentelemetry/api');
+        //     }
+        //
+        // The intent is to allow users to install their own version of `@opentelemetry/api`.
+        //
+        // The problem is that even when users do not explicitely install `@opentelemetry/api`,
+        // `require('@opentelemetry/api')` resolves to the package which is a dependency
+        // of Next.
+        //
+        // The second problem is that when Next traces files, it would not copy the `api/build/esm`
+        // folder (used by the `module` conditions in package.json) it would only copy `api/build/src`.
+        // This could be solved by updating the next config:
+        //
+        //     const nextConfig: NextConfig = {
+        //       // ...
+        //       outputFileTracingIncludes: {
+        //         "*": ["./node_modules/@opentelemetry/api/build/**/*"],
+        //       },
+        //     };
+        //
+        // We can consider doing that when we want to enable users to install their own version
+        // of `@opentelemetry/api`. For now we simply use the pre-compiled version.
+        contents = contents.replace(/require\(.@opentelemetry\/api.\)/g, `require("next/dist/compiled/@opentelemetry/api")`);
+        return contents;
+    });
 }

package/dist/cli/build/patches/to-investigate/index.d.ts

@@ -2,5 +2,4 @@ export * from "./inline-eval-manifest.js";
 export * from "./inline-middleware-manifest-require.js";
 export * from "./patch-exception-bubbling.js";
 export * from "./patch-find-dir.js";
-export * from "./patch-load-instrumentation-module.js";
 export * from "./patch-read-file.js";

package/dist/cli/build/patches/to-investigate/index.js

@@ -2,5 +2,4 @@ export * from "./inline-eval-manifest.js";
 export * from "./inline-middleware-manifest-require.js";
 export * from "./patch-exception-bubbling.js";
 export * from "./patch-find-dir.js";
-export * from "./patch-load-instrumentation-module.js";
 export * from "./patch-read-file.js";

package/dist/cli/build/utils/ensure-cf-config.js

@@ -1,3 +1,4 @@
+import logger from "@opennextjs/aws/logger.js";
 /**
  * Ensures open next is configured for cloudflare.
  *
@@ -9,13 +10,17 @@ export function ensureCloudflareConfig(config) {
         dftUseEdgeConverter: config.default?.override?.converter === "edge",
         dftMaybeUseCache: config.default?.override?.incrementalCache === "dummy" ||
             typeof config.default?.override?.incrementalCache === "function",
-        dftUseDummyTagCacheAndQueue: config.default?.override?.tagCache === "dummy" && config.default?.override?.queue === "dummy",
+        dftUseDummyTagCache: config.default?.override?.tagCache === "dummy",
+        dftMaybeUseQueue: config.default?.override?.queue === "dummy" || config.default?.override?.queue === "direct",
         disableCacheInterception: config.dangerous?.enableCacheInterception !== true,
         mwIsMiddlewareExternal: config.middleware?.external == true,
         mwUseCloudflareWrapper: config.middleware?.override?.wrapper === "cloudflare-edge",
         mwUseEdgeConverter: config.middleware?.override?.converter === "edge",
         mwUseFetchProxy: config.middleware?.override?.proxyExternalRequest === "fetch",
     };
+    if (config.default?.override?.queue === "direct") {
+        logger.warn("The direct mode queue is not recommended for use in production.");
+    }
     if (Object.values(requirements).some((satisfied) => !satisfied)) {
         throw new Error("The `open-next.config.ts` should have a default export like this:\n\n" +
             `{
@@ -25,7 +30,7 @@ export function ensureCloudflareConfig(config) {
               converter: "edge",
               incrementalCache: "dummy" | function,
               tagCache: "dummy",
-              queue: "dummy",
+              queue: "dummy" | "direct",
             },
           },
 

package/dist/cli/build/utils/index.d.ts

@@ -3,4 +3,3 @@ export * from "./create-config-files.js";
 export * from "./ensure-cf-config.js";
 export * from "./extract-project-env-vars.js";
 export * from "./normalize-path.js";
-export * from "./ts-parse-file.js";

package/dist/cli/build/utils/index.js

@@ -3,4 +3,3 @@ export * from "./create-config-files.js";
 export * from "./ensure-cf-config.js";
 export * from "./extract-project-env-vars.js";
 export * from "./normalize-path.js";
-export * from "./ts-parse-file.js";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"
@@ -63,14 +63,13 @@
   "dependencies": {
     "@ast-grep/napi": "^0.34.1",
     "@dotenvx/dotenvx": "1.31.0",
-    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@724",
+    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@727",
     "enquirer": "^2.4.1",
     "glob": "^11.0.0",
-    "ts-morph": "^23.0.0",
     "yaml": "^2.7.0"
   },
   "peerDependencies": {
-    "wrangler": "^3.107.0"
+    "wrangler": "^3.107.3"
   },
   "scripts": {
     "clean": "rimraf dist",

package/templates/defaults/open-next.config.ts

@@ -1,6 +1,6 @@
 // default open-next.config.ts file created by @opennextjs/cloudflare
 
-import cache from "@opennextjs/cloudflare/kvCache";
+import cache from "@opennextjs/cloudflare/kv-cache";
 
 const config = {
   default: {

package/dist/cli/build/patches/investigated/update-webpack-chunks-file/get-chunk-installation-identifiers.d.ts

@@ -1,13 +0,0 @@
-import * as ts from "ts-morph";
-/**
- * Gets the names of the variables that in the unminified webpack runtime file are called `installedChunks` and `installChunk`.
- *
- * Variables example: https://github.com/webpack/webpack/blob/dae16ad11e/examples/module-worker/README.md?plain=1#L256-L282
- *
- * @param sourceFile the webpack runtime file parsed with ts-morph
- * @returns an object containing the two variable names
- */
-export declare function getChunkInstallationIdentifiers(sourceFile: ts.SourceFile): Promise<{
-    installedChunks: string;
-    installChunk: string;
-}>;

package/dist/cli/build/patches/investigated/update-webpack-chunks-file/get-chunk-installation-identifiers.js

@@ -1,82 +0,0 @@
-import * as ts from "ts-morph";
-/**
- * Gets the names of the variables that in the unminified webpack runtime file are called `installedChunks` and `installChunk`.
- *
- * Variables example: https://github.com/webpack/webpack/blob/dae16ad11e/examples/module-worker/README.md?plain=1#L256-L282
- *
- * @param sourceFile the webpack runtime file parsed with ts-morph
- * @returns an object containing the two variable names
- */
-export async function getChunkInstallationIdentifiers(sourceFile) {
-    const installChunkDeclaration = getInstallChunkDeclaration(sourceFile);
-    const installedChunksDeclaration = getInstalledChunksDeclaration(sourceFile, installChunkDeclaration);
-    return {
-        installChunk: installChunkDeclaration.getName(),
-        installedChunks: installedChunksDeclaration.getName(),
-    };
-}
-/**
- * Gets the declaration for what in the unminified webpack runtime file is called `installChunk`(which is a function that registers the various chunks.
- *
- * `installChunk` example: https://github.com/webpack/webpack/blob/dae16ad11e/examples/module-worker/README.md?plain=1#L263-L282
- *
- * @param sourceFile the webpack runtime file parsed with ts-morph
- * @returns the `installChunk` declaration
- */
-function getInstallChunkDeclaration(sourceFile) {
-    const installChunkDeclaration = sourceFile
-        .getDescendantsOfKind(ts.SyntaxKind.VariableDeclaration)
-        .find((declaration) => {
-        const arrowFunction = declaration.getInitializerIfKind(ts.SyntaxKind.ArrowFunction);
-        // we're looking for an arrow function
-        if (!arrowFunction)
-            return false;
-        const functionParameters = arrowFunction.getParameters();
-        // the arrow function we're looking for has a single parameter (the chunkId)
-        if (functionParameters.length !== 1)
-            return false;
-        const arrowFunctionBodyBlock = arrowFunction.getFirstChildByKind(ts.SyntaxKind.Block);
-        // the arrow function we're looking for has a block body
-        if (!arrowFunctionBodyBlock)
-            return false;
-        const statementKinds = arrowFunctionBodyBlock.getStatements().map((statement) => statement.getKind());
-        // the function we're looking for has 2 for loops (a standard one and a for-in one)
-        const forInStatements = statementKinds.filter((s) => s === ts.SyntaxKind.ForInStatement);
-        const forStatements = statementKinds.filter((s) => s === ts.SyntaxKind.ForStatement);
-        if (forInStatements.length !== 1 || forStatements.length !== 1)
-            return false;
-        // the function we're looking for accesses its parameter three times, and it
-        // accesses its `modules`, `ids` and `runtime` properties (in this order)
-        const parameterName = functionParameters[0].getText();
-        const functionParameterAccessedProperties = arrowFunctionBodyBlock
-            .getDescendantsOfKind(ts.SyntaxKind.PropertyAccessExpression)
-            .filter((propertyAccessExpression) => propertyAccessExpression.getExpression().getText() === parameterName)
-            .map((propertyAccessExpression) => propertyAccessExpression.getName());
-        if (functionParameterAccessedProperties.join(", ") !== "modules, ids, runtime")
-            return false;
-        return true;
-    });
-    if (!installChunkDeclaration) {
-        throw new Error("ERROR: unable to find the installChunk function declaration");
-    }
-    return installChunkDeclaration;
-}
-/**
- * Gets the declaration for what in the unminified webpack runtime file is called `installedChunks` which is an object that holds the various registered chunks.
- *
- * `installedChunks` example: https://github.com/webpack/webpack/blob/dae16ad11e/examples/module-worker/README.md?plain=1#L256-L261
- *
- * @param sourceFile the webpack runtime file parsed with ts-morph
- * @param installChunkDeclaration the declaration for the `installChunk` variable
- * @returns the `installedChunks` declaration
- */
-function getInstalledChunksDeclaration(sourceFile, installChunkDeclaration) {
-    const allVariableDeclarations = sourceFile.getDescendantsOfKind(ts.SyntaxKind.VariableDeclaration);
-    const installChunkDeclarationIdx = allVariableDeclarations.findIndex((declaration) => declaration === installChunkDeclaration);
-    // the installedChunks declaration comes right before the installChunk one
-    const installedChunksDeclaration = allVariableDeclarations[installChunkDeclarationIdx - 1];
-    if (!installedChunksDeclaration?.getInitializer()?.isKind(ts.SyntaxKind.ObjectLiteralExpression)) {
-        throw new Error("ERROR: unable to find the installedChunks declaration");
-    }
-    return installedChunksDeclaration;
-}

package/dist/cli/build/patches/investigated/update-webpack-chunks-file/get-chunk-installation-identifiers.test.js

@@ -1,20 +0,0 @@
-import { readFile } from "node:fs/promises";
-import { describe, expect, test } from "vitest";
-import { tsParseFile } from "../../../utils/index.js";
-import { getChunkInstallationIdentifiers } from "./get-chunk-installation-identifiers.js";
-describe("getChunkInstallationIdentifiers", () => {
-    test("gets chunk identifiers from unminified code", async () => {
-        const fileContent = await readFile(`${import.meta.dirname}/test-fixtures/unminified-webpacks-file.js`, "utf8");
-        const tsSourceFile = tsParseFile(fileContent);
-        const { installChunk, installedChunks } = await getChunkInstallationIdentifiers(tsSourceFile);
-        expect(installChunk).toEqual("installChunk");
-        expect(installedChunks).toEqual("installedChunks");
-    });
-    test("gets chunk identifiers from minified code", async () => {
-        const fileContent = await readFile(`${import.meta.dirname}/test-fixtures/minified-webpacks-file.js`, "utf8");
-        const tsSourceFile = tsParseFile(fileContent);
-        const { installChunk, installedChunks } = await getChunkInstallationIdentifiers(tsSourceFile);
-        expect(installChunk).toEqual("r");
-        expect(installedChunks).toEqual("e");
-    });
-});

package/dist/cli/build/patches/investigated/update-webpack-chunks-file/get-file-content-with-updated-webpack-f-require-code.d.ts

@@ -1,19 +0,0 @@
-import * as ts from "ts-morph";
-/**
- * Updates the function that in the unminified webpack runtime file appears as `__webpack_require__.f.require` which is a function that
- * installs chunks by importing/requiring them at runtime.
- *
- * `__webpack_require__.f.require` example: https://github.com/webpack/webpack/blob/dae16ad11e/examples/module-worker/README.md?plain=1#L284-L304
- *
- * This function needs to be updated so that it requires chunks using the standard `require` function and not webpack's custom `require` logic
- * which fails in the workerd runtime.
- *
- * @param sourceFile the webpack runtime file parsed with ts-morph (note: this gets side-effectfully updated)
- * @param chunkInstallationIdentifiers the names of the `installedChunks` and `installChunk` variables
- * @param chunks the identifiers of the chunks (found on the filesystem)
- * @returns the content of the sourceFile but with the require function updated
- */
-export declare function getFileContentWithUpdatedWebpackFRequireCode(sourceFile: ts.SourceFile, { installedChunks, installChunk }: {
-    installedChunks: string;
-    installChunk: string;
-}, chunks: string[]): Promise<string>;

package/dist/cli/build/patches/investigated/update-webpack-chunks-file/get-file-content-with-updated-webpack-f-require-code.js

@@ -1,84 +0,0 @@
-import * as ts from "ts-morph";
-/**
- * Updates the function that in the unminified webpack runtime file appears as `__webpack_require__.f.require` which is a function that
- * installs chunks by importing/requiring them at runtime.
- *
- * `__webpack_require__.f.require` example: https://github.com/webpack/webpack/blob/dae16ad11e/examples/module-worker/README.md?plain=1#L284-L304
- *
- * This function needs to be updated so that it requires chunks using the standard `require` function and not webpack's custom `require` logic
- * which fails in the workerd runtime.
- *
- * @param sourceFile the webpack runtime file parsed with ts-morph (note: this gets side-effectfully updated)
- * @param chunkInstallationIdentifiers the names of the `installedChunks` and `installChunk` variables
- * @param chunks the identifiers of the chunks (found on the filesystem)
- * @returns the content of the sourceFile but with the require function updated
- */
-export async function getFileContentWithUpdatedWebpackFRequireCode(sourceFile, { installedChunks, installChunk }, chunks) {
-    const webpackFRequireFunction = sourceFile
-        .getDescendantsOfKind(ts.SyntaxKind.ArrowFunction)
-        .find((arrowFunction) => {
-        // the function is declared assigned in a binary expression, so let's check the binary expression
-        // to get more confidence that we've got the right arrow function
-        const binaryExpression = arrowFunction.getFirstAncestorByKind(ts.SyntaxKind.BinaryExpression);
-        if (!binaryExpression)
-            return false;
-        // the variable being assigned always ends with .f.require (even in unminified files)
-        const binaryExpressionLeft = binaryExpression.getLeft();
-        if (!binaryExpressionLeft.getText().endsWith(".f.require"))
-            return false;
-        // the binary expression is an assignment
-        const binaryExpressionOperator = binaryExpression.getOperatorToken();
-        if (binaryExpressionOperator.getText() !== "=")
-            return false;
-        // the right side of the expression is our arrow function
-        const binaryExpressionRight = binaryExpression.getRight();
-        if (binaryExpressionRight !== arrowFunction)
-            return false;
-        const arrowFunctionBody = arrowFunction.getBody();
-        if (!arrowFunctionBody.isKind(ts.SyntaxKind.Block))
-            return false;
-        const arrowFunctionBodyText = arrowFunctionBody.getText();
-        const functionUsesChunkInstallationVariables = arrowFunctionBodyText.includes(installChunk) && arrowFunctionBodyText.includes(installedChunks);
-        if (!functionUsesChunkInstallationVariables)
-            return false;
-        const functionParameters = arrowFunction.getParameters();
-        if (functionParameters.length !== 2)
-            return false;
-        const callsInstallChunk = arrowFunctionBody
-            .getDescendantsOfKind(ts.SyntaxKind.CallExpression)
-            .some((callExpression) => callExpression.getExpression().getText() === installChunk);
-        if (!callsInstallChunk)
-            return false;
-        const functionFirstParameterName = functionParameters[0]?.getName();
-        const accessesInstalledChunksUsingItsFirstParameter = arrowFunctionBody
-            .getDescendantsOfKind(ts.SyntaxKind.ElementAccessExpression)
-            .some((elementAccess) => {
-            return (elementAccess.getExpression().getText() === installedChunks &&
-                elementAccess.getArgumentExpression()?.getText() === functionFirstParameterName);
-        });
-        if (!accessesInstalledChunksUsingItsFirstParameter)
-            return false;
-        return true;
-    });
-    if (!webpackFRequireFunction) {
-        throw new Error("ERROR: unable to find the webpack f require function declaration");
-    }
-    const functionParameterNames = webpackFRequireFunction
-        .getParameters()
-        .map((parameter) => parameter.getName());
-    const chunkId = functionParameterNames[0];
-    const functionBody = webpackFRequireFunction.getBody();
-    functionBody.replaceWithText(`
-{
-  if (${installedChunks}[${chunkId}]) {
-    return;
-  }${chunks
-        .map((chunk) => `
-  if(${chunkId} === ${chunk}) {
-    return ${installChunk}(require("./chunks/${chunk}.js"));
-  }`)
-        .join("")}
-  throw new Error(\`Unknown chunk \${${chunkId}}\`);
-}`);
-    return sourceFile.print();
-}

package/dist/cli/build/patches/investigated/update-webpack-chunks-file/get-file-content-with-updated-webpack-f-require-code.test.js

@@ -1,25 +0,0 @@
-import { readFile } from "node:fs/promises";
-import { describe, expect, test } from "vitest";
-import { tsParseFile } from "../../../utils/index.js";
-import { getFileContentWithUpdatedWebpackFRequireCode } from "./get-file-content-with-updated-webpack-f-require-code";
-describe("getFileContentWithUpdatedWebpackFRequireCode", () => {
-    test("returns the updated content of the f.require function from unminified webpack runtime code", async () => {
-        const fileContent = await readFile(`${import.meta.dirname}/test-fixtures/unminified-webpacks-file.js`, "utf8");
-        const tsSourceFile = tsParseFile(fileContent);
-        const updatedFCode = await getFileContentWithUpdatedWebpackFRequireCode(tsSourceFile, { installChunk: "installChunk", installedChunks: "installedChunks" }, ["658"]);
-        expect(unstyleCode(updatedFCode)).toContain(`if (installedChunks[chunkId]) { return; }`);
-        expect(unstyleCode(updatedFCode)).toContain(`if (chunkId === 658) { return installChunk(require("./chunks/658.js")); }`);
-        expect(unstyleCode(updatedFCode)).not.toContain(`require("./chunks/" +`);
-    });
-    test("returns the updated content of the f.require function from minified webpack runtime code", async () => {
-        const fileContent = await readFile(`${import.meta.dirname}/test-fixtures/minified-webpacks-file.js`, "utf8");
-        const tsSourceFile = tsParseFile(fileContent);
-        const updatedFCode = await getFileContentWithUpdatedWebpackFRequireCode(tsSourceFile, { installChunk: "r", installedChunks: "e" }, ["658"]);
-        expect(unstyleCode(updatedFCode)).toContain("if (e[o]) { return; }");
-        expect(unstyleCode(updatedFCode)).toContain(`if (o === 658) { return r(require("./chunks/658.js")); }`);
-        expect(unstyleCode(updatedFCode)).not.toContain(`require("./chunks/" +`);
-    });
-});
-function unstyleCode(text) {
-    return text.replace(/\n\s+/g, "\n").replace(/\n/g, " ");
-}

package/dist/cli/build/patches/investigated/update-webpack-chunks-file/get-updated-webpack-chunks-file-content.d.ts

@@ -1,14 +0,0 @@
-/**
- * Updates the content of the webpack runtime file in a manner so that it doesn't perform runtime dynamic `require` calls which fail in our runtime.
- *
- * It does so by appropriately updating a function that in the unminified webpack runtime file appears as `__webpack_require__.f.require` which is
- * the one that normally would cause dynamic requires to happen at runtime.
- *
- * `__webpack_require__.f.require` example: https://github.com/webpack/webpack/blob/dae16ad11e/examples/module-worker/README.md?plain=1#L284-L304
- *
- *
- * @param fileContent the content of the webpack runtime file
- * @param chunks the identifiers of the chunks (found on the filesystem)
- * @returns the content of the webpack runtime file updated with our custom logic
- */
-export declare function getUpdatedWebpackChunksFileContent(fileContent: string, chunks: string[]): Promise<string>;