@netlify/plugin-nextjs 4.11.1 → 4.12.1

package/lib/helpers/edge.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateConfig = exports.writeEdgeFunctions = exports.loadMiddlewareManifest = void 0;
+/* eslint-disable max-lines */
 const fs_1 = require("fs");
 const path_1 = require("path");
 const fs_extra_1 = require("fs-extra");
@@ -80,7 +81,10 @@ const writeEdgeFunctions = async (netlifyConfig) => {
         if (!process.env.NEXT_USE_NETLIFY_EDGE) {
             console.log('Using Netlify Edge Functions for image format detection. Set env var "NEXT_DISABLE_EDGE_IMAGES=true" to disable.');
         }
-        await copyEdgeSourceFile({ edgeFunctionDir: edgeFunctionRoot, file: 'ipx.ts' });
+        const edgeFunctionDir = (0, path_1.join)(edgeFunctionRoot, 'ipx');
+        await (0, fs_extra_1.ensureDir)(edgeFunctionDir);
+        await copyEdgeSourceFile({ edgeFunctionDir, file: 'ipx.ts', target: 'index.ts' });
+        await (0, fs_extra_1.copyFile)((0, path_1.join)('.netlify', 'functions-internal', '_ipx', 'imageconfig.json'), (0, path_1.join)(edgeFunctionDir, 'imageconfig.json'));
         manifest.functions.push({
             function: 'ipx',
             path: '/_next/image*',
@@ -124,3 +128,4 @@ const updateConfig = async (publish) => {
     await (0, fs_extra_1.writeJSON)(configFile, config);
 };
 exports.updateConfig = updateConfig;
+/* eslint-enable max-lines */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.11.1",
+  "version": "4.12.1",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "lib/index.js",
   "files": [
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^27.3.2",
+    "@netlify/build": "^27.3.3",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/node": "^17.0.25",

package/src/templates/edge/ipx.ts

@@ -1,11 +1,16 @@
 import { Accepts } from "https://deno.land/x/accepts@2.1.1/mod.ts";
 import type { Context } from "netlify:edge";
-import imageconfig from "../functions-internal/_ipx/imageconfig.json" assert {
+// Available at build time
+import imageconfig from "./imageconfig.json" assert {
   type: "json",
 };
 
 const defaultFormat = "webp"
 
+interface ImageConfig extends Record<string, unknown> {
+  formats?: string[];
+}
+
 /**
  * Implement content negotiation for images
  */
@@ -14,7 +19,7 @@ const defaultFormat = "webp"
 const handler = async (req: Request, context: Context) => {
   const { searchParams } = new URL(req.url);
   const accept = new Accepts(req.headers);
-  const { formats = [defaultFormat] } = imageconfig;
+  const { formats = [defaultFormat] } = imageconfig as ImageConfig;
   if (formats.length === 0) {
     formats.push(defaultFormat);
   }

package/src/templates/edge/runtime.ts

@@ -47,7 +47,7 @@ const handler = async (req: Request, context: Context) => {
     },
     url: url.toString(),
     method: req.method,
-    ip: req.headers.get('x-nf-client-address') ?? undefined,
+    ip: context.ip,
     body: req.body ?? undefined,
   }