@netlify/plugin-nextjs 4.24.0 → 4.24.2

package/lib/templates/getHandler.js

@@ -102,8 +102,15 @@ const makeHandler = (conf, app, pageRoot, staticManifest = [], mode = 'ssr') =>
                 const ttl = getMaxAge(cacheHeader);
                 // Long-expiry TTL is basically no TTL, so we'll skip it
                 if (ttl > 0 && ttl < ONE_YEAR_IN_SECONDS) {
-                    result.ttl = ttl;
-                    requestMode = `odb ttl=${ttl}`;
+                    // ODBs currently have a minimum TTL of 60 seconds
+                    result.ttl = Math.max(ttl, 60);
+                }
+                // Only cache 404s ephemerally
+                if (ttl === ONE_YEAR_IN_SECONDS && result.statusCode === 404) {
+                    result.ttl = 60;
+                }
+                if (result.ttl > 0) {
+                    requestMode = `odb ttl=${result.ttl}`;
                 }
             }
             multiValueHeaders['cache-control'] = ['public, max-age=0, must-revalidate'];

package/lib/templates/ipx.js

@@ -9,5 +9,6 @@ exports.handler = (0, ipx_1.createIPXHandler)({
     domains: imageconfig_json_1.domains,
     remotePatterns: imageconfig_json_1.remotePatterns,
     responseHeaders: imageconfig_json_1.responseHeaders,
+    localPrefix: '/_next/static/media/',
 });
 /* eslint-enable n/no-missing-import, import/no-unresolved, @typescript-eslint/ban-ts-comment  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "4.24.0",
+  "version": "4.24.2",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "lib/index.js",
   "files": [
@@ -11,8 +11,8 @@
   ],
   "dependencies": {
     "@netlify/esbuild": "0.14.39",
-    "@netlify/functions": "^1.2.0",
-    "@netlify/ipx": "^1.2.5",
+    "@netlify/functions": "^1.3.0",
+    "@netlify/ipx": "^1.3.0",
     "@vercel/node-bridge": "^2.1.0",
     "chalk": "^4.1.2",
     "destr": "^1.1.1",

package/src/templates/edge/ipx.ts

@@ -9,6 +9,9 @@ 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
  */
@@ -28,10 +31,28 @@ const handler = async (req: Request, context: Context) => {
 
   const source = searchParams.get('url')
   const width = searchParams.get('w')
-  const quality = searchParams.get('q') ?? 75
+  const quality = searchParams.get('q') ?? '75'
+
+  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 || !width) {
-    return new Response('Invalid request', {
+  if (!source || errors.length > 0) {
+    return new Response(`Invalid request: \n${errors.join('\n')}`, {
       status: 400,
     })
   }