@netlify/plugin-nextjs 5.6.0 → 5.7.0-ipx.0

package/dist/build/functions/edge.js

@@ -392,6 +392,7 @@ var import_path_to_regexp = __toESM(require_dist(), 1);
 import { cp, mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
 import { EDGE_HANDLER_NAME } from "../plugin-context.js";
+import { createIpxEdgeAcceptHandler } from "./ipx.js";
 var writeEdgeManifest = async (ctx, manifest) => {
   await mkdir(ctx.edgeFunctionsDir, { recursive: true });
   await writeFile(join(ctx.edgeFunctionsDir, "manifest.json"), JSON.stringify(manifest, null, 2));
@@ -513,6 +514,9 @@ var createEdgeHandlers = async (ctx) => {
     version: 1,
     functions: netlifyDefinitions
   };
+  if (ctx.imageService === "ipx") {
+    await createIpxEdgeAcceptHandler(ctx, netlifyManifest);
+  }
   await writeEdgeManifest(ctx, netlifyManifest);
 };
 export {

package/dist/build/functions/ipx.js

@@ -0,0 +1,83 @@
+
+      var require = await (async () => {
+        var { createRequire } = await import("node:module");
+        return createRequire(import.meta.url);
+      })();
+    
+import "../../esm-chunks/chunk-OEQOKJGE.js";
+
+// src/build/functions/ipx.ts
+import { cp, mkdir, writeFile } from "fs/promises";
+import { join } from "path";
+import { IPX_HANDLER_NAME } from "../plugin-context.js";
+var sanitizeEdgePath = (imagesPath) => new URL(imagesPath, process.env.URL || "http://n").pathname;
+var getAdjustedImageConfig = (ctx) => {
+  return {
+    ...ctx.buildConfig.images,
+    basePath: [ctx.buildConfig.basePath, IPX_HANDLER_NAME].join("/")
+  };
+};
+var createIpxHandler = async (ctx) => {
+  await mkdir(ctx.ipxHandlerRootDir, { recursive: true });
+  await cp(
+    join(ctx.pluginDir, "dist/build/templates/ipx.ts"),
+    join(ctx.ipxHandlerRootDir, "_ipx.ts")
+  );
+  await writeFile(
+    join(ctx.ipxHandlerRootDir, "imageconfig.json"),
+    JSON.stringify(getAdjustedImageConfig(ctx))
+  );
+  await writeFile(
+    join(ctx.ipxHandlerRootDir, "_ipx.json"),
+    JSON.stringify({
+      version: 1,
+      config: {
+        name: "next/image handler",
+        generator: `${ctx.pluginName}@${ctx.pluginVersion}`,
+        timeout: 120
+      }
+    })
+  );
+  ctx.netlifyConfig.redirects.push(
+    {
+      from: ctx.buildConfig.images.path,
+      // eslint-disable-next-line id-length
+      query: { url: ":url", w: ":width", q: ":quality" },
+      to: `${ctx.buildConfig.basePath}/${IPX_HANDLER_NAME}/w_:width,q_:quality/:url`,
+      status: 301
+    },
+    {
+      from: `${ctx.buildConfig.basePath}/${IPX_HANDLER_NAME}/*`,
+      to: `/.netlify/builders/${IPX_HANDLER_NAME}`,
+      status: 200
+    }
+  );
+};
+var createIpxEdgeAcceptHandler = async (ctx, netlifyManifest) => {
+  await mkdir(ctx.ipxEdgeHandlerRootDir, { recursive: true });
+  await cp(
+    join(ctx.pluginDir, "dist/build/templates/ipx-edge-accept-handler.ts"),
+    join(ctx.ipxEdgeHandlerRootDir, "index.ts")
+  );
+  await writeFile(
+    join(ctx.ipxEdgeHandlerRootDir, "imageconfig.json"),
+    JSON.stringify(getAdjustedImageConfig(ctx))
+  );
+  netlifyManifest.functions.push({
+    function: IPX_HANDLER_NAME,
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    name: "next/image handler",
+    path: ctx.buildConfig.images.path ? sanitizeEdgePath(ctx.buildConfig.images.path) : "/_next/image",
+    generator: `${ctx.pluginName}@${ctx.pluginVersion}`
+  });
+  netlifyManifest.layers ??= [];
+  netlifyManifest.layers.push({
+    name: `https://ipx-edge-function-layer.netlify.app/mod.ts`,
+    flag: "ipx-edge-function-layer-url"
+  });
+};
+export {
+  createIpxEdgeAcceptHandler,
+  createIpxHandler
+};

package/dist/build/image-cdn.js

@@ -1528,6 +1528,7 @@ var require_picomatch2 = __commonJS({
 
 // src/build/image-cdn.ts
 var import_picomatch = __toESM(require_picomatch2(), 1);
+import { createIpxHandler } from "./functions/ipx.js";
 function generateRegexFromPattern(pattern) {
   return (0, import_picomatch.makeRe)(pattern).source;
 }
@@ -1538,67 +1539,71 @@ var setImageConfig = async (ctx) => {
   if (imageLoader !== "default") {
     return;
   }
-  ctx.netlifyConfig.redirects.push(
-    {
-      from: imageEndpointPath,
-      // w and q are too short to be used as params with id-length rule
-      // but we are forced to do so because of the next/image loader decides on their names
-      // eslint-disable-next-line id-length
-      query: { url: ":url", w: ":width", q: ":quality" },
-      to: "/.netlify/images?url=:url&w=:width&q=:quality",
-      status: 200
-    },
-    // when migrating from @netlify/plugin-nextjs@4 image redirect to ipx might be cached in the browser
-    {
-      from: "/_ipx/*",
-      // w and q are too short to be used as params with id-length rule
-      // but we are forced to do so because of the next/image loader decides on their names
-      // eslint-disable-next-line id-length
-      query: { url: ":url", w: ":width", q: ":quality" },
-      to: "/.netlify/images?url=:url&w=:width&q=:quality",
-      status: 200
-    }
-  );
-  if (remotePatterns?.length !== 0 || domains?.length !== 0) {
-    ctx.netlifyConfig.images ||= { remote_images: [] };
-    ctx.netlifyConfig.images.remote_images ||= [];
-    if (remotePatterns && remotePatterns.length !== 0) {
-      for (const remotePattern of remotePatterns) {
-        let { protocol, hostname, port, pathname } = remotePattern;
-        if (pathname) {
-          pathname = pathname.startsWith("/") ? pathname : `/${pathname}`;
-        }
-        const combinedRemotePattern = `${protocol ?? "http?(s)"}://${hostname}${port ? `:${port}` : ""}${pathname ?? "/**"}`;
-        try {
-          ctx.netlifyConfig.images.remote_images.push(
-            generateRegexFromPattern(combinedRemotePattern)
-          );
-        } catch (error) {
-          ctx.failBuild(
-            `Failed to generate Image CDN remote image regex from Next.js remote pattern: ${JSON.stringify(
-              { remotePattern, combinedRemotePattern },
-              null,
-              2
-            )}`,
-            error
-          );
+  if (ctx.imageService === "ipx") {
+    await createIpxHandler(ctx);
+  } else {
+    ctx.netlifyConfig.redirects.push(
+      {
+        from: imageEndpointPath,
+        // w and q are too short to be used as params with id-length rule
+        // but we are forced to do so because of the next/image loader decides on their names
+        // eslint-disable-next-line id-length
+        query: { url: ":url", w: ":width", q: ":quality" },
+        to: "/.netlify/images?url=:url&w=:width&q=:quality",
+        status: 200
+      },
+      // when migrating from @netlify/plugin-nextjs@4 image redirect to ipx might be cached in the browser
+      {
+        from: "/_ipx/*",
+        // w and q are too short to be used as params with id-length rule
+        // but we are forced to do so because of the next/image loader decides on their names
+        // eslint-disable-next-line id-length
+        query: { url: ":url", w: ":width", q: ":quality" },
+        to: "/.netlify/images?url=:url&w=:width&q=:quality",
+        status: 200
+      }
+    );
+    if (remotePatterns?.length !== 0 || domains?.length !== 0) {
+      ctx.netlifyConfig.images ||= { remote_images: [] };
+      ctx.netlifyConfig.images.remote_images ||= [];
+      if (remotePatterns && remotePatterns.length !== 0) {
+        for (const remotePattern of remotePatterns) {
+          let { protocol, hostname, port, pathname } = remotePattern;
+          if (pathname) {
+            pathname = pathname.startsWith("/") ? pathname : `/${pathname}`;
+          }
+          const combinedRemotePattern = `${protocol ?? "http?(s)"}://${hostname}${port ? `:${port}` : ""}${pathname ?? "/**"}`;
+          try {
+            ctx.netlifyConfig.images.remote_images.push(
+              generateRegexFromPattern(combinedRemotePattern)
+            );
+          } catch (error) {
+            ctx.failBuild(
+              `Failed to generate Image CDN remote image regex from Next.js remote pattern: ${JSON.stringify(
+                { remotePattern, combinedRemotePattern },
+                null,
+                2
+              )}`,
+              error
+            );
+          }
         }
       }
-    }
-    if (domains && domains.length !== 0) {
-      for (const domain of domains) {
-        const patternFromDomain = `http?(s)://${domain}/**`;
-        try {
-          ctx.netlifyConfig.images.remote_images.push(generateRegexFromPattern(patternFromDomain));
-        } catch (error) {
-          ctx.failBuild(
-            `Failed to generate Image CDN remote image regex from Next.js domain: ${JSON.stringify(
-              { domain, patternFromDomain },
-              null,
-              2
-            )}`,
-            error
-          );
+      if (domains && domains.length !== 0) {
+        for (const domain of domains) {
+          const patternFromDomain = `http?(s)://${domain}/**`;
+          try {
+            ctx.netlifyConfig.images.remote_images.push(generateRegexFromPattern(patternFromDomain));
+          } catch (error) {
+            ctx.failBuild(
+              `Failed to generate Image CDN remote image regex from Next.js domain: ${JSON.stringify(
+                { domain, patternFromDomain },
+                null,
+                2
+              )}`,
+              error
+            );
+          }
         }
       }
     }

package/dist/build/plugin-context.js

@@ -23,6 +23,7 @@ var MODULE_DIR = fileURLToPath(new URL(".", import.meta.url));
 var PLUGIN_DIR = join(MODULE_DIR, "../..");
 var DEFAULT_PUBLISH_DIR = ".next";
 var SERVER_HANDLER_NAME = "___netlify-server-handler";
+var IPX_HANDLER_NAME = "_ipx";
 var EDGE_HANDLER_NAME = "___netlify-edge-handler";
 var PluginContext = class {
   featureFlags;
@@ -116,6 +117,9 @@ var PluginContext = class {
     const REQUIRED_BUILD_VERSION = ">=29.41.5";
     return (0, import_semver.satisfies)(this.buildVersion, REQUIRED_BUILD_VERSION, { includePrerelease: true });
   }
+  get imageService() {
+    return "ipx";
+  }
   /**
    * Absolute path of the directory containing the files for the serverless lambda function
    * `.netlify/functions-internal`
@@ -127,6 +131,10 @@ var PluginContext = class {
   get serverHandlerRootDir() {
     return join(this.serverFunctionsDir, SERVER_HANDLER_NAME);
   }
+  /** Absolute path of the ipx handler */
+  get ipxHandlerRootDir() {
+    return join(this.serverFunctionsDir, IPX_HANDLER_NAME);
+  }
   get serverHandlerDir() {
     if (this.relativeAppDir.length === 0) {
       return this.serverHandlerRootDir;
@@ -153,6 +161,10 @@ var PluginContext = class {
   get edgeHandlerDir() {
     return join(this.edgeFunctionsDir, EDGE_HANDLER_NAME);
   }
+  /** Absolute path of the ipx edge handler */
+  get ipxEdgeHandlerRootDir() {
+    return join(this.edgeFunctionsDir, IPX_HANDLER_NAME);
+  }
   constructor(options) {
     this.constants = options.constants;
     this.featureFlags = options.featureFlags;
@@ -276,6 +288,7 @@ var PluginContext = class {
 };
 export {
   EDGE_HANDLER_NAME,
+  IPX_HANDLER_NAME,
   PluginContext,
   SERVER_HANDLER_NAME
 };

package/dist/build/templates/ipx-edge-accept-handler.ts

@@ -0,0 +1,13 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+import { getHandler } from 'https://ipx-edge-function-layer.netlify.app/mod.ts'
+
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore Injected at build time
+import imageconfig from './imageconfig.json' assert { type: 'json' }
+
+export default getHandler({
+  formats: imageconfig?.formats,
+  basePath: imageconfig?.basePath,
+  imageCDNCompat: true,
+})

package/dist/build/templates/ipx.ts

@@ -0,0 +1,11 @@
+import { createIPXHandler } from '@netlify/ipx'
+
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore Injected at build time
+import { basePath, domains, remotePatterns } from './imageconfig.json'
+
+export const handler = createIPXHandler({
+  basePath,
+  domains,
+  remotePatterns,
+})

package/dist/esm-chunks/{package-OHGYB5OD.js → package-O63J727E.js}

@@ -8,7 +8,7 @@ import "./chunk-OEQOKJGE.js";
 
 // package.json
 var name = "@netlify/plugin-nextjs";
-var version = "5.6.0";
+var version = "5.7.0-ipx.0";
 var description = "Run Next.js seamlessly on Netlify";
 var main = "./dist/index.js";
 var type = "module";
@@ -55,6 +55,9 @@ var bugs = {
   url: "https://github.com/netlify/next-runtime/issues"
 };
 var homepage = "https://github.com/netlify/next-runtime#readme";
+var dependencies = {
+  "@netlify/ipx": "^1.4.6"
+};
 var devDependencies = {
   "@fastly/http-compute-js": "1.1.4",
   "@netlify/blobs": "^7.3.0",
@@ -104,7 +107,6 @@ var clean_package = {
   indent: 2,
   remove: [
     "clean-package",
-    "dependencies",
     "devDependencies",
     "scripts"
   ]
@@ -123,6 +125,7 @@ var package_default = {
   license,
   bugs,
   homepage,
+  dependencies,
   devDependencies,
   "clean-package": clean_package
 };
@@ -130,6 +133,7 @@ export {
   bugs,
   clean_package as "clean-package",
   package_default as default,
+  dependencies,
   description,
   devDependencies,
   engines,

package/dist/index.js

@@ -62,7 +62,7 @@ var onBuild = async (options) => {
       await saveBuildCache(ctx);
     }
     if (ctx.buildConfig.output === "export") {
-      return copyStaticExport(ctx);
+      return Promise.all([copyStaticExport(ctx), setImageConfig(ctx)]);
     }
     await verifyAdvancedAPIRoutes(ctx);
     await verifyNetlifyFormsWorkaround(ctx);

package/dist/run/handlers/tracing.js

@@ -67385,7 +67385,7 @@ var import_semantic_conventions = __toESM(require_src(), 1);
 import { getLogger } from "./request-context.cjs";
 var {
   default: { version, name }
-} = await import("../../esm-chunks/package-OHGYB5OD.js");
+} = await import("../../esm-chunks/package-O63J727E.js");
 var sdk = new import_sdk_node.NodeSDK({
   resource: new import_resources.Resource({
     [import_semantic_conventions.SEMRESATTRS_SERVICE_NAME]: name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "5.6.0",
+  "version": "5.7.0-ipx.0",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "./dist/index.js",
   "type": "module",
@@ -26,5 +26,8 @@
   "bugs": {
     "url": "https://github.com/netlify/next-runtime/issues"
   },
-  "homepage": "https://github.com/netlify/next-runtime#readme"
+  "homepage": "https://github.com/netlify/next-runtime#readme",
+  "dependencies": {
+    "@netlify/ipx": "^1.4.6"
+  }
 }