diff --git a/packages/cloudflare/src/cli/build/bundle-server.ts b/packages/cloudflare/src/cli/build/bundle-server.ts index 3fabca37..050cbb7d 100644 --- a/packages/cloudflare/src/cli/build/bundle-server.ts +++ b/packages/cloudflare/src/cli/build/bundle-server.ts @@ -16,7 +16,6 @@ import { inlineFindDir } from "./patches/plugins/find-dir.js"; import { patchInstrumentation } from "./patches/plugins/instrumentation.js"; import { inlineLoadManifest } from "./patches/plugins/load-manifest.js"; import { patchNextServer } from "./patches/plugins/next-server.js"; -import { patchNodeEnvironment } from "./patches/plugins/node-environment.js"; import { patchResolveCache } from "./patches/plugins/open-next.js"; import { handleOptionalDependencies } from "./patches/plugins/optional-deps.js"; import { patchPagesRouterContext } from "./patches/plugins/pages-router-context.js"; @@ -108,7 +107,6 @@ export async function bundleServer(buildOpts: BuildOptions, projectOpts: Project patchRouteModules(updater, buildOpts), patchDepdDeprecations(updater), patchResolveCache(updater, buildOpts), - patchNodeEnvironment(updater), // Apply updater updates, must be the last plugin updater.plugin, ] as Plugin[], diff --git a/packages/cloudflare/src/cli/build/open-next/createServerBundle.ts b/packages/cloudflare/src/cli/build/open-next/createServerBundle.ts index 1cafb229..b78aafc0 100644 --- a/packages/cloudflare/src/cli/build/open-next/createServerBundle.ts +++ b/packages/cloudflare/src/cli/build/open-next/createServerBundle.ts @@ -206,6 +206,7 @@ async function generateBundle( awsPatches.patchNextServer, awsPatches.patchEnvVars, awsPatches.patchBackgroundRevalidation, + awsPatches.patchNodeEnvironment, // Cloudflare specific patches patchResRevalidate, patchUseCacheIO, diff --git a/packages/cloudflare/src/cli/build/patches/plugins/node-environment.spec.ts b/packages/cloudflare/src/cli/build/patches/plugins/node-environment.spec.ts deleted file mode 100644 index 57396af4..00000000 --- a/packages/cloudflare/src/cli/build/patches/plugins/node-environment.spec.ts +++ /dev/null @@ -1,52 +0,0 @@ -import { describe, expect, test } from "vitest"; - -import { computePatchDiff } from "../../utils/test-patch.js"; -import { errorInspectRule } from "./node-environment.js"; - -describe("NodeEnvironment", () => { - const code = ` -// This file should be imported before any others. It sets up the environment -// for later imports to work properly. -"use strict"; -Object.defineProperty(exports, "__esModule", { - value: true -}); -require("./node-environment-baseline"); -require("./node-environment-extensions/error-inspect"); -require("./node-environment-extensions/random"); -require("./node-environment-extensions/date"); -require("./node-environment-extensions/web-crypto"); -require("./node-environment-extensions/node-crypto"); -if (process.env.NODE_ENV === 'development') { - require('./node-environment-extensions/console-dev'); -} - -//# sourceMappingURL=node-environment.js.map -`; - - test("error inspect", () => { - expect(computePatchDiff("node-environment.js", code, errorInspectRule)).toMatchInlineSnapshot(` - "Index: node-environment.js - =================================================================== - --- node-environment.js - +++ node-environment.js - @@ -1,13 +1,13 @@ - - - // This file should be imported before any others. It sets up the environment - // for later imports to work properly. - "use strict"; - Object.defineProperty(exports, "__esModule", { - value: true - }); - require("./node-environment-baseline"); - -require("./node-environment-extensions/error-inspect"); - +// Removed by OpenNext - +// require("./node-environment-extensions/error-inspect"); - require("./node-environment-extensions/random"); - require("./node-environment-extensions/date"); - require("./node-environment-extensions/web-crypto"); - require("./node-environment-extensions/node-crypto"); - " - `); - }); -}); diff --git a/packages/cloudflare/src/cli/build/patches/plugins/node-environment.ts b/packages/cloudflare/src/cli/build/patches/plugins/node-environment.ts deleted file mode 100644 index 0a5cceb4..00000000 --- a/packages/cloudflare/src/cli/build/patches/plugins/node-environment.ts +++ /dev/null @@ -1,30 +0,0 @@ -/** - * Remove a dependency on Babel by dropping the require of error-inspect - */ - -import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js"; -import type { ContentUpdater, Plugin } from "@opennextjs/aws/plugins/content-updater.js"; -import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js"; - -export function patchNodeEnvironment(updater: ContentUpdater): Plugin { - return updater.updateContent("node-environment", [ - { - filter: getCrossPlatformPathRegex(String.raw`/next/dist/server/node-environment\.js$`, { - escape: false, - }), - contentFilter: /error-inspect/, - callback: async ({ contents }) => patchCode(contents, errorInspectRule), - }, - ]); -} - -/** - * Drops `require("./node-environment-extensions/error-inspect");` - */ -export const errorInspectRule = ` -rule: - pattern: require("./node-environment-extensions/error-inspect"); -fix: |- - // Removed by OpenNext - // require("./node-environment-extensions/error-inspect"); -`;