@opennextjs/cloudflare 1.0.4 → 1.2.0

package/dist/cli/build/patches/investigated/patch-cache.js

@@ -1,40 +0,0 @@
-import path from "node:path";
-import { getPackagePath } from "@opennextjs/aws/build/helper.js";
-import { normalizePath } from "../../utils/index.js";
-/**
- * Sets up the OpenNext cache handler in a Next.js build.
- *
- * The cache handler used by Next.js is normally defined in the config file as a path. At runtime,
- * Next.js would then do a dynamic require on a transformed version of the path to retrieve the
- * cache handler and create a new instance of it.
- *
- * This is problematic in workerd due to the dynamic import of the file that is not known from
- * build-time. Therefore, we have to manually override the default way that the cache handler is
- * instantiated with a dynamic require that uses a string literal for the path.
- */
-export async function patchCache(code, buildOpts) {
-    const { outputDir } = buildOpts;
-    // TODO: switch to cache.mjs
-    const outputPath = path.join(outputDir, "server-functions/default");
-    const cacheFile = path.join(outputPath, getPackagePath(buildOpts), "cache.cjs");
-    return code.replace("const { cacheHandler } = this.nextConfig;", `
-const cacheHandler = null;
-CacheHandler = require('${normalizePath(cacheFile)}').default;
-`);
-}
-export async function patchComposableCache(code, buildOpts) {
-    const { outputDir } = buildOpts;
-    // TODO: switch to mjs
-    const outputPath = path.join(outputDir, "server-functions/default");
-    const cacheFile = path.join(outputPath, getPackagePath(buildOpts), "composable-cache.cjs");
-    //TODO: Do we want to move this to the new CodePatcher ?
-    return code.replace("const { cacheHandlers } = this.nextConfig.experimental", `
-const cacheHandlers = null;
-const handlersSymbol = Symbol.for('@next/cache-handlers');
-const handlersMapSymbol = Symbol.for('@next/cache-handlers-map');
-const handlersSetSymbol = Symbol.for('@next/cache-handlers-set');
-globalThis[handlersMapSymbol] = new Map();
-globalThis[handlersMapSymbol].set("default", require('${normalizePath(cacheFile)}').default);
-globalThis[handlersSetSymbol] = new Set(globalThis[handlersMapSymbol].values());
-`);
-}

package/dist/cli/build/patches/plugins/build-id.d.ts

@@ -1,6 +0,0 @@
-/**
- * Inline `getBuildId` as it relies on `readFileSync` that is not supported by workerd.
- */
-import type { ContentUpdater, Plugin } from "@opennextjs/aws/plugins/content-updater.js";
-export declare function inlineBuildId(updater: ContentUpdater): Plugin;
-export declare const rule = "\nrule:\n  kind: method_definition\n  has:\n    field: name\n    regex: ^getBuildId$\nfix: |-\n  getBuildId() {\n    return process.env.NEXT_BUILD_ID;\n  }\n";

package/dist/cli/build/patches/plugins/build-id.js

@@ -1,29 +0,0 @@
-/**
- * Inline `getBuildId` as it relies on `readFileSync` that is not supported by workerd.
- */
-import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
-import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
-export function inlineBuildId(updater) {
-    return updater.updateContent("inline-build-id", [
-        {
-            field: {
-                filter: getCrossPlatformPathRegex(String.raw `/next/dist/server/next-server\.js$`, {
-                    escape: false,
-                }),
-                contentFilter: /getBuildId\(/,
-                callback: ({ contents }) => patchCode(contents, rule),
-            },
-        },
-    ]);
-}
-export const rule = `
-rule:
-  kind: method_definition
-  has:
-    field: name
-    regex: ^getBuildId$
-fix: |-
-  getBuildId() {
-    return process.env.NEXT_BUILD_ID;
-  }
-`;

package/dist/cli/build/patches/plugins/build-id.spec.js

@@ -1,82 +0,0 @@
-import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
-import { describe, expect, test } from "vitest";
-import { rule } from "./build-id.js";
-describe("getBuildId", () => {
-    test("patch", () => {
-        const code = `
-class NextNodeServer extends _baseserver.default {
-    constructor(options){
-        // Initialize super class
-        super(options);
-        this.handleNextImageRequest = async (req, res, parsedUrl) => { /* ... */ };
-    }
-    async handleUpgrade() {
-    // The web server does not support web sockets, it's only used for HMR in
-    // development.
-    }
-    loadEnvConfig({ dev, forceReload, silent }) {
-        (0, _env.loadEnvConfig)(this.dir, dev, silent ? {
-            info: ()=>{},
-            error: ()=>{}
-        } : _log, forceReload);
-    }
-    async hasPage(pathname) {
-        var _this_nextConfig_i18n;
-        return !!(0, _require.getMaybePagePath)(pathname, this.distDir, (_this_nextConfig_i18n = this.nextConfig.i18n) == null ? void 0 : _this_nextConfig_i18n.locales, this.enabledDirectories.app);
-    }
-    getBuildId() {
-        const buildIdFile = (0, _path.join)(this.distDir, _constants.BUILD_ID_FILE);
-        try {
-            return _fs.default.readFileSync(buildIdFile, "utf8").trim();
-        } catch (err) {
-            if (err.code === "ENOENT") {
-                throw new Error(\`Could not find a production build in the '\${this.distDir}' directory. Try building your app with 'next build' before starting the production server. https://nextjs.org/docs/messages/production-start-no-build-id\`);
-            }
-            throw err;
-        }
-    }
-    getEnabledDirectories(dev) {
-        const dir = dev ? this.dir : this.serverDistDir;
-        return {
-            app: (0, _findpagesdir.findDir)(dir, "app") ? true : false,
-            pages: (0, _findpagesdir.findDir)(dir, "pages") ? true : false
-        };
-    }
-    // ...
-}`;
-        expect(patchCode(code, rule)).toMatchInlineSnapshot(`
-      "class NextNodeServer extends _baseserver.default {
-          constructor(options){
-              // Initialize super class
-              super(options);
-              this.handleNextImageRequest = async (req, res, parsedUrl) => { /* ... */ };
-          }
-          async handleUpgrade() {
-          // The web server does not support web sockets, it's only used for HMR in
-          // development.
-          }
-          loadEnvConfig({ dev, forceReload, silent }) {
-              (0, _env.loadEnvConfig)(this.dir, dev, silent ? {
-                  info: ()=>{},
-                  error: ()=>{}
-              } : _log, forceReload);
-          }
-          async hasPage(pathname) {
-              var _this_nextConfig_i18n;
-              return !!(0, _require.getMaybePagePath)(pathname, this.distDir, (_this_nextConfig_i18n = this.nextConfig.i18n) == null ? void 0 : _this_nextConfig_i18n.locales, this.enabledDirectories.app);
-          }
-          getBuildId() {
-        return process.env.NEXT_BUILD_ID;
-      }
-          getEnabledDirectories(dev) {
-              const dir = dev ? this.dir : this.serverDistDir;
-              return {
-                  app: (0, _findpagesdir.findDir)(dir, "app") ? true : false,
-                  pages: (0, _findpagesdir.findDir)(dir, "pages") ? true : false
-              };
-          }
-          // ...
-      }"
-    `);
-    });
-});

package/dist/cli/build/patches/plugins/eval-manifest.d.ts

@@ -1,7 +0,0 @@
-/**
- * Inline `evalManifest` as it relies on `readFileSync` and `runInNewContext`
- * that are not supported by workerd.
- */
-import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
-import type { ContentUpdater, Plugin } from "@opennextjs/aws/plugins/content-updater.js";
-export declare function inlineEvalManifest(updater: ContentUpdater, buildOpts: BuildOptions): Plugin;

package/dist/cli/build/patches/plugins/eval-manifest.js

@@ -1,61 +0,0 @@
-/**
- * Inline `evalManifest` as it relies on `readFileSync` and `runInNewContext`
- * that are not supported by workerd.
- */
-import { join, posix, relative, sep } from "node:path";
-import { getPackagePath } from "@opennextjs/aws/build/helper.js";
-import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
-import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
-import { glob } from "glob";
-import { normalizePath } from "../../utils/normalize-path.js";
-export function inlineEvalManifest(updater, buildOpts) {
-    return updater.updateContent("inline-eval-manifest", [
-        {
-            field: {
-                filter: getCrossPlatformPathRegex(String.raw `/next/dist/server/load-manifest(\.external)?\.js$`, {
-                    escape: false,
-                }),
-                contentFilter: /function evalManifest\(/,
-                callback: async ({ contents }) => patchCode(contents, await getRule(buildOpts)),
-            },
-        },
-    ]);
-}
-async function getRule(buildOpts) {
-    const { outputDir } = buildOpts;
-    const baseDir = join(outputDir, "server-functions/default", getPackagePath(buildOpts), ".next");
-    const appDir = join(baseDir, "server/app");
-    const manifests = await glob(join(baseDir, "**/*_client-reference-manifest.js"), {
-        windowsPathsNoEscape: true,
-    });
-    const returnManifests = manifests
-        .map((manifest) => {
-        const endsWith = normalizePath(relative(baseDir, manifest));
-        const key = normalizePath("/" + relative(appDir, manifest)).replace("_client-reference-manifest.js", "");
-        return `
-          if ($PATH.endsWith("${endsWith}")) {
-            require(${JSON.stringify(manifest)});
-            return {
-              __RSC_MANIFEST: {
-              "${key}": globalThis.__RSC_MANIFEST["${key}"],
-              },
-            };
-          }
-        `;
-    })
-        .join("\n");
-    return {
-        rule: {
-            pattern: `
-function evalManifest($PATH, $$$ARGS) {
-  $$$_
-}`,
-        },
-        fix: `
-function evalManifest($PATH, $$$ARGS) {
-  $PATH = $PATH.replaceAll(${JSON.stringify(sep)}, ${JSON.stringify(posix.sep)});
-  ${returnManifests}
-  throw new Error(\`Unexpected evalManifest(\${$PATH}) call!\`);
-}`,
-    };
-}

package/dist/cli/build/patches/to-investigate/inline-middleware-manifest.d.ts

@@ -1,6 +0,0 @@
-import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
-/**
- * Inlines the middleware manifest from the build output to prevent a dynamic require statement
- * as they result in runtime failures.
- */
-export declare function inlineMiddlewareManifestRequire(code: string, buildOpts: BuildOptions): string;

package/dist/cli/build/patches/to-investigate/inline-middleware-manifest.js

@@ -1,15 +0,0 @@
-import { existsSync, readFileSync } from "node:fs";
-import { join } from "node:path";
-import { getPackagePath } from "@opennextjs/aws/build/helper.js";
-/**
- * Inlines the middleware manifest from the build output to prevent a dynamic require statement
- * as they result in runtime failures.
- */
-export function inlineMiddlewareManifestRequire(code, buildOpts) {
-    const { outputDir } = buildOpts;
-    const middlewareManifestPath = join(outputDir, "server-functions/default", getPackagePath(buildOpts), ".next/server/middleware-manifest.json");
-    const middlewareManifest = existsSync(middlewareManifestPath)
-        ? JSON.parse(readFileSync(middlewareManifestPath, "utf-8"))
-        : {};
-    return code.replace("require(this.middlewareManifestPath)", JSON.stringify(middlewareManifest));
-}