@netlify/plugin-nextjs 4.33.1-lazy-server-import.0 → 4.34.0

package/lib/helpers/edge.js

@@ -189,6 +189,7 @@ const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, }) => {
     var _a;
     const manifest = {
         functions: [],
+        layers: [],
         version: 1,
     };
     const edgeFunctionRoot = (0, path_1.resolve)('.netlify', 'edge-functions');
@@ -291,7 +292,11 @@ const writeEdgeFunctions = async ({ netlifyConfig, routesManifest, }) => {
         manifest.functions.push({
             function: 'ipx',
             name: 'next/image handler',
-            path: '/_next/image*',
+            path: nextConfig.images.path || '/_next/image',
+        });
+        manifest.layers.push({
+            name: 'https://ipx-edge-function-layer.netlify.app/mod.ts',
+            flag: 'ipx-edge-function-layer-url',
         });
     }
     else {

package/lib/templates/getHandler.js

@@ -11,14 +11,13 @@ const path = require('path');
 const { URLSearchParams, URL } = require('url');
 const { Bridge } = require('@vercel/node-bridge/bridge');
 const { augmentFsModule, getMaxAge, getMultiValueHeaders, getPrefetchResponse, normalizePath, } = require('./handlerUtils');
+const { NetlifyNextServer } = require('./server');
 // We return a function and then call `toString()` on it to serialise it as the launcher function
 // eslint-disable-next-line max-params, max-lines-per-function
 const makeHandler = (conf, app, pageRoot, staticManifest = [], mode = 'ssr') => {
     var _a;
     // Change working directory into the site root, unless using Nx, which moves the
     // dist directory and handles this itself
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const { NetlifyNextServer } = require('./server');
     const dir = path.resolve(__dirname, app);
     if (pageRoot.startsWith(dir)) {
         process.chdir(dir);
@@ -146,6 +145,7 @@ const getHandler = ({ isODB = false, publishDir = '../../../.next', appDir = '..
   // We copy the file here rather than requiring from the node module
   const { Bridge } = require("./bridge");
   const { augmentFsModule, getMaxAge, getMultiValueHeaders, getPrefetchResponse, getNextServer, normalizePath } = require('./handlerUtils')
+  const { NetlifyNextServer } = require('./server')
 
   ${isODB ? `const { builder } = require("@netlify/functions")` : ''}
   const { config }  = require("${publishDir}/required-server-files.json")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.33.1-lazy-server-import.0",
+  "version": "4.34.0",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "index.js",
   "files": [
@@ -13,7 +13,7 @@
   "dependencies": {
     "@netlify/esbuild": "0.14.39",
     "@netlify/functions": "^1.4.0",
-    "@netlify/ipx": "^1.3.3",
+    "@netlify/ipx": "^1.4.0",
     "@vercel/node-bridge": "^2.1.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",

package/src/templates/edge/imageconfig.json

@@ -0,0 +1,3 @@
+{
+  "formats": ["webp"]
+}

package/src/templates/edge/ipx.ts

@@ -1,73 +1,5 @@
-import { Accepts } from 'https://deno.land/x/accepts@2.1.1/mod.ts'
-import type { Context } from 'https://edge.netlify.com'
-// Available at build time
-import imageconfig from './imageconfig.json' assert { type: 'json' }
-
-const defaultFormat = 'webp'
-
-interface ImageConfig extends Record<string, unknown> {
-  formats?: string[]
-}
-
-// Checks if a URL param is numeric
-const isNumeric = (value: string | null) => Number(value).toString() === value
-
-/**
- * Implement content negotiation for images
- */
-
-// deno-lint-ignore require-await
-const handler = async (req: Request, context: Context) => {
-  const { searchParams } = new URL(req.url)
-  const accept = new Accepts(req.headers)
-  const { formats = [defaultFormat] } = imageconfig as ImageConfig
-  if (formats.length === 0) {
-    formats.push(defaultFormat)
-  }
-  let type = accept.types(formats) || defaultFormat
-  if (Array.isArray(type)) {
-    type = type[0]
-  }
-
-  const source = searchParams.get('url')
-  const width = searchParams.get('w')
-  const quality = searchParams.get('q') ?? '75'
+import { getHandler } from 'https://ipx-edge-function-layer.netlify.app/mod.ts'
 
-  const errors: Array<string> = []
-
-  if (!source) {
-    errors.push('Missing "url" parameter')
-  } else if (!source.startsWith('http') && !source.startsWith('/')) {
-    errors.push('The "url" parameter must be a valid URL or path')
-  }
-
-  if (!width) {
-    errors.push('Missing "w" parameter')
-  } else if (!isNumeric(width)) {
-    errors.push('Invalid "w" parameter')
-  }
-
-  if (!isNumeric(quality)) {
-    errors.push('Invalid "q" parameter')
-  }
-
-  if (!source || errors.length > 0) {
-    return new Response(`Invalid request: \n${errors.join('\n')}`, {
-      status: 400,
-    })
-  }
-
-  const modifiers = [`w_${width}`, `q_${quality}`]
-
-  if (type) {
-    if (type.includes('/')) {
-      // If this is a mimetype, strip "image/"
-      type = type.split('/')[1]
-    }
-    modifiers.push(`f_${type}`)
-  }
-  const target = `/_ipx/${modifiers.join(',')}/${encodeURIComponent(source)}`
-  return context.rewrite(target)
-}
+import imageconfig from './imageconfig.json' assert { type: 'json' }
 
-export default handler
+export default getHandler({ formats: imageconfig?.formats })