@opennextjs/cloudflare 0.3.10 → 0.4.0

package/dist/cli/build/patches/to-investigate/wrangler-deps.js

@@ -1,60 +1,30 @@
-import { readFileSync, statSync, writeFileSync } from "node:fs";
+import { readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
+import { getPackagePath } from "@opennextjs/aws/build/helper.js";
 import * as ts from "ts-morph";
 import { tsParseFile } from "../../utils/index.js";
-export function patchWranglerDeps(config) {
+export function patchWranglerDeps(buildOpts) {
     console.log("# patchWranglerDeps");
-    const distPath = getDistPath(config);
-    // Patch .next/standalone/node_modules/next/dist/compiled/next-server/pages.runtime.prod.js
-    //
-    // Remove the need for an alias in wrangler.toml:
-    //
-    // [alias]
-    // # critters is `require`d from `pages.runtime.prod.js` when running wrangler dev, so we need to stub it out
-    // "critters" = "./.next/standalone/node_modules/cf/templates/shims/empty.ts"
-    const pagesRuntimeFile = join(distPath, "compiled/next-server/pages.runtime.prod.js");
-    const patchedPagesRuntime = readFileSync(pagesRuntimeFile, "utf-8").replace(`e.exports=require("critters")`, `e.exports={}`);
+    const { outputDir } = buildOpts;
+    const nextDistDir = join(outputDir, "server-functions/default", getPackagePath(buildOpts), "node_modules/next/dist");
+    const pagesRuntimeFile = join(nextDistDir, "compiled/next-server/pages.runtime.prod.js");
+    const patchedPagesRuntime = readFileSync(pagesRuntimeFile, "utf-8").replace(`e.exports=require("critters")`, `
+try {
+  e.exports=require("critters");
+}
+catch {
+  console.error('critters is not installed');
+}
+`);
     writeFileSync(pagesRuntimeFile, patchedPagesRuntime);
-    patchRequireReactDomServerEdge(config);
-    // Patch .next/standalone/node_modules/next/dist/server/lib/trace/tracer.js
-    //
-    // Remove the need for an alias in wrangler.toml:
-    //
-    // [alias]
-    // # @opentelemetry/api is `require`d when running wrangler dev, so we need to stub it out
-    // # IMPORTANT: we shim @opentelemetry/api to the throwing shim so that it will throw right away, this is so that we throw inside the
-    // #            try block here: https://github.com/vercel/next.js/blob/9e8266a7/packages/next/src/server/lib/trace/tracer.ts#L27-L31
-    // #            causing the code to require the 'next/dist/compiled/@opentelemetry/api' module instead (which properly works)
-    // #"@opentelemetry/api" = "./.next/standalone/node_modules/cf/templates/shims/throw.ts"
-    const tracerFile = join(distPath, "server/lib/trace/tracer.js");
+    patchRequireReactDomServerEdge(nextDistDir);
+    // we shim @opentelemetry/api to the throwing shim so that it will throw right away, this is so that we throw inside the
+    // try block here: https://github.com/vercel/next.js/blob/9e8266a7/packages/next/src/server/lib/trace/tracer.ts#L27-L31
+    // causing the code to require the 'next/dist/compiled/@opentelemetry/api' module instead (which properly works)
+    const tracerFile = join(nextDistDir, "server/lib/trace/tracer.js");
     const patchedTracer = readFileSync(tracerFile, "utf-8").replaceAll(/\w+\s*=\s*require\([^/]*opentelemetry.*\)/g, `throw new Error("@opentelemetry/api")`);
     writeFileSync(tracerFile, patchedTracer);
 }
-/**
- * Next.js saves the node_modules/next/dist directory in either the standaloneApp path or in the
- * standaloneRoot path, this depends on where the next dependency is actually saved (
- * https://github.com/vercel/next.js/blob/39e06c75/packages/next/src/build/webpack-config.ts#L103-L104
- * ) and can depend on the package manager used, if it is using workspaces, etc...
- *
- * This function checks the two potential paths for the dist directory and returns the first that it finds,
- * it throws an error if it can't find either
- *
- * @param config
- * @returns the node_modules/next/dist directory path
- */
-function getDistPath(config) {
-    for (const root of [config.paths.output.standaloneApp, config.paths.output.standaloneRoot]) {
-        try {
-            const distPath = join(root, "node_modules/next/dist");
-            if (statSync(distPath).isDirectory())
-                return distPath;
-        }
-        catch {
-            /* empty */
-        }
-    }
-    throw new Error("Unexpected error: unable to detect the node_modules/next/dist directory");
-}
 /**
  * `react-dom` v>=19 has a `server.edge` export: https://github.com/facebook/react/blob/a160102f3/packages/react-dom/package.json#L79
  * but version of `react-dom` <= 18 do not have this export but have a `server.browser` export instead: https://github.com/facebook/react/blob/8a015b68/packages/react-dom/package.json#L49
@@ -70,10 +40,9 @@ function getDistPath(config) {
  * it's not clear what code and how might be rely on this require call)
  *
  */
-function patchRequireReactDomServerEdge(config) {
-    const distPath = getDistPath(config);
+function patchRequireReactDomServerEdge(nextDistDir) {
     // Patch .next/standalone/node_modules/next/dist/compiled/next-server/pages.runtime.prod.js
-    const pagesRuntimeFile = join(distPath, "compiled/next-server/pages.runtime.prod.js");
+    const pagesRuntimeFile = join(nextDistDir, "compiled/next-server/pages.runtime.prod.js");
     const code = readFileSync(pagesRuntimeFile, "utf-8");
     const file = tsParseFile(code);
     // we need to update this function: `e=>{"use strict";e.exports=require("react-dom/server.edge")}`
@@ -125,21 +94,21 @@ function patchRequireReactDomServerEdge(config) {
             return;
         }
         arrowFunction.setBodyText(`
-      "use strict";
-      let ReactDOMServer;
-      try {
-          ReactDOMServer = require('react-dom/server.edge');
-      } catch (error) {
-          if (
-          error.code !== 'MODULE_NOT_FOUND' &&
-          error.code !== 'ERR_PACKAGE_PATH_NOT_EXPORTED'
-          ) {
-          throw error;
-          }
-          ReactDOMServer = require('react-dom/server.browser');
-      }
-      ${parameterName}.exports = ReactDOMServer;
-      `.replace(/\ns*/g, " "));
+// OpenNext patch
+let ReactDOMServer;
+try {
+  ReactDOMServer = require('react-dom/server.edge');
+} catch (error) {
+  if (
+    error.code !== 'MODULE_NOT_FOUND' &&
+    error.code !== 'ERR_PACKAGE_PATH_NOT_EXPORTED'
+  ) {
+    throw error;
+  }
+  ReactDOMServer = require('react-dom/server.browser');
+}
+${parameterName}.exports = ReactDOMServer;
+`);
     });
     const updatedCode = file.print();
     writeFileSync(pagesRuntimeFile, updatedCode);

package/dist/cli/build/utils/create-config-files.d.ts

@@ -1,4 +1,4 @@
-import type { ProjectOptions } from "../../config.js";
+import type { ProjectOptions } from "../../project-options.js";
 /**
  * Creates a `wrangler.json` file for the user if a wrangler config file doesn't already exist,
  * but only after asking for the user's confirmation.

package/dist/cli/project-options.d.ts

@@ -0,0 +1,7 @@
+export type ProjectOptions = {
+    sourceDir: string;
+    outputDir: string;
+    skipNextBuild: boolean;
+    skipWranglerConfigCheck: boolean;
+    minify: boolean;
+};

package/dist/cli/project-options.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "0.3.10",
+  "version": "0.4.0",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"
@@ -61,16 +61,16 @@
     "vitest": "^2.1.1"
   },
   "dependencies": {
-    "@ast-grep/napi": "^0.33.1",
+    "@ast-grep/napi": "^0.34.1",
     "@dotenvx/dotenvx": "1.31.0",
-    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@704",
+    "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@712",
     "enquirer": "^2.4.1",
     "glob": "^11.0.0",
     "ts-morph": "^23.0.0",
     "yaml": "^2.7.0"
   },
   "peerDependencies": {
-    "wrangler": "^3.103.0"
+    "wrangler": "^3.105.0"
   },
   "scripts": {
     "clean": "rimraf dist",

package/dist/api/get-cloudflare-context.js

@@ -1,42 +0,0 @@
-// Note: this symbol needs to be kept in sync with the one used in `src/cli/templates/worker.ts`
-const cloudflareContextSymbol = Symbol.for("__cloudflare-context__");
-/**
- * Utility to get the current Cloudflare context
- *
- * @returns the cloudflare context
- */
-export async function getCloudflareContext() {
-    const global = globalThis;
-    const cloudflareContext = global[cloudflareContextSymbol];
-    if (!cloudflareContext) {
-        // the cloudflare context is initialized by the worker and is always present in production/preview,
-        // so, it not being present means that the application is running under `next dev`
-        return getCloudflareContextInNextDev();
-    }
-    return cloudflareContext;
-}
-const cloudflareContextInNextDevSymbol = Symbol.for("__next-dev/cloudflare-context__");
-/**
- * Gets a local proxy version of the cloudflare context (created using `getPlatformProxy`) when
- * running in the standard next dev server (via `next dev`)
- *
- * @returns the local proxy version of the cloudflare context
- */
-async function getCloudflareContextInNextDev() {
-    const global = globalThis;
-    if (!global[cloudflareContextInNextDevSymbol]) {
-        // Note: we never want wrangler to be bundled in the Next.js app, that's why the import below looks like it does
-        const { getPlatformProxy } = await import(
-        /* webpackIgnore: true */ `${"__wrangler".replaceAll("_", "")}`);
-        const { env, cf, ctx } = await getPlatformProxy({
-            // This allows the selection of a wrangler environment while running in next dev mode
-            environment: process.env.NEXT_DEV_WRANGLER_ENV,
-        });
-        global[cloudflareContextInNextDevSymbol] = {
-            env,
-            cf: cf,
-            ctx: ctx,
-        };
-    }
-    return global[cloudflareContextInNextDevSymbol];
-}

package/dist/cli/config.d.ts

@@ -1,42 +0,0 @@
-export type Config = {
-    build: {
-        skipNextBuild: boolean;
-        shouldMinify: boolean;
-    };
-    paths: {
-        source: {
-            root: string;
-            dotNext: string;
-            standaloneRoot: string;
-        };
-        output: {
-            root: string;
-            assets: string;
-            dotNext: string;
-            standaloneRoot: string;
-            standaloneApp: string;
-            standaloneAppDotNext: string;
-            standaloneAppServer: string;
-        };
-        internal: {
-            package: string;
-            templates: string;
-        };
-    };
-    internalPackageName: string;
-};
-/**
- * Computes the configuration.
- *
- * @param projectOpts The options for the project
- * @returns The configuration, see `Config`
- */
-export declare function getConfig(projectOpts: ProjectOptions): Config;
-export declare function containsDotNextDir(folder: string): boolean;
-export type ProjectOptions = {
-    sourceDir: string;
-    outputDir: string;
-    skipNextBuild: boolean;
-    skipWranglerConfigCheck: boolean;
-    minify: boolean;
-};

package/dist/cli/config.js

@@ -1,92 +0,0 @@
-import { readdirSync, statSync } from "node:fs";
-import { join, relative } from "node:path";
-const PACKAGE_NAME = "@opennextjs/cloudflare";
-/**
- * Computes the configuration.
- *
- * @param projectOpts The options for the project
- * @returns The configuration, see `Config`
- */
-export function getConfig(projectOpts) {
-    const sourceDirDotNext = join(projectOpts.sourceDir, ".next");
-    const dotNext = join(projectOpts.outputDir, ".next");
-    const appPath = getNextjsApplicationPath(dotNext).replace(/\/$/, "");
-    const standaloneRoot = join(dotNext, "standalone");
-    const standaloneApp = join(standaloneRoot, appPath);
-    const standaloneAppDotNext = join(standaloneApp, ".next");
-    const standaloneAppServer = join(standaloneAppDotNext, "server");
-    const nodeModules = join(standaloneApp, "node_modules");
-    const internalPackage = join(nodeModules, ...PACKAGE_NAME.split("/"));
-    const internalTemplates = join(internalPackage, "cli/templates");
-    return {
-        build: {
-            skipNextBuild: projectOpts.skipNextBuild,
-            shouldMinify: projectOpts.minify,
-        },
-        paths: {
-            source: {
-                root: projectOpts.sourceDir,
-                dotNext: sourceDirDotNext,
-                standaloneRoot: join(sourceDirDotNext, "standalone"),
-            },
-            output: {
-                root: projectOpts.outputDir,
-                assets: join(projectOpts.outputDir, "assets"),
-                dotNext,
-                standaloneRoot,
-                standaloneApp,
-                standaloneAppDotNext,
-                standaloneAppServer,
-            },
-            internal: {
-                package: internalPackage,
-                templates: internalTemplates,
-            },
-        },
-        internalPackageName: PACKAGE_NAME,
-    };
-}
-export function containsDotNextDir(folder) {
-    try {
-        return statSync(join(folder, ".next")).isDirectory();
-    }
-    catch {
-        return false;
-    }
-}
-/**
- * It basically tries to find the path that the application is under inside the `.next/standalone` directory, using the `.next/server` directory
- * presence as the condition that needs to be met.
- *
- * For example:
- *  When I build the api application the `.next/server` directory is located in:
- *  `<dotNextDir>/standalone/next-apps/api/.next/server`
- *  and the function here given the `dotNextDir` returns `next-apps/api`
- */
-function getNextjsApplicationPath(dotNextDir) {
-    const serverPath = findServerParentPath(dotNextDir);
-    if (!serverPath) {
-        throw new Error(`Unexpected Error: no \`.next/server\` folder could be found in \`${serverPath}\``);
-    }
-    return relative(join(dotNextDir, "standalone"), serverPath);
-}
-function findServerParentPath(parentPath) {
-    try {
-        if (statSync(join(parentPath, ".next/server")).isDirectory()) {
-            return parentPath;
-        }
-    }
-    catch {
-        /* empty */
-    }
-    const folders = readdirSync(parentPath);
-    for (const folder of folders) {
-        const subFolder = join(parentPath, folder);
-        if (statSync(join(parentPath, folder)).isDirectory()) {
-            const dirServerPath = findServerParentPath(subFolder);
-            if (dirServerPath) {
-                return dirServerPath;
-            }
-        }
-    }
-}