Merge branch 'main' into v2-preferstatic

netlify · Nov 28, 2023 · 4021bc1 · 4021bc1
2 parents d3aba0c + c9dcf30
commit 4021bc1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/src/utils/proxy.ts b/src/utils/proxy.ts
@@ -689,6 +689,10 @@ const onRequest = async (
     ? null
     : await createStreamPromise(req, BYTES_LIMIT)
 
+  if (isImageRequest(req)) {
+    return imageProxy(req, res)
+  }
+
   const edgeFunctionsProxyURL = await edgeFunctionsProxy(req, res)
 
   if (edgeFunctionsProxyURL !== undefined) {
@@ -762,10 +766,6 @@ const onRequest = async (
     return proxy.web(req, res, { target: functionsServer })
   }
 
-  if (isImageRequest(req)) {
-    return imageProxy(req, res)
-  }
-
   proxy.web(req, res, options)
 }
 

diff --git a/tests/integration/__fixtures__/dev-server-with-v2-functions/functions/shadow-imagecdn.js b/tests/integration/__fixtures__/dev-server-with-v2-functions/functions/shadow-imagecdn.js
@@ -0,0 +1,5 @@
+export default () => new Response(`you were shadowed!`)
+
+export const config = {
+  path: '/.netlify/images',
+}
diff --git a/tests/integration/__fixtures__/dev-server-with-v2-functions/public/test.png b/tests/integration/__fixtures__/dev-server-with-v2-functions/public/test.png
diff --git a/tests/integration/commands/dev/v2-api.test.ts b/tests/integration/commands/dev/v2-api.test.ts
@@ -220,5 +220,11 @@ describe.runIf(gte(version, '18.13.0'))('v2 api', () => {
       expect(body.data).toBe('hello world')
       expect(body.metadata).toEqual({ name: 'Netlify', features: { blobs: true, functions: true } })
     })
+
+    test<FixtureTestContext>('does not shadow Image CDN', async ({ devServer }) => {
+      const response = await fetch(`http://localhost:${devServer.port}/.netlify/images?url=test.png&fm=avif`)
+      expect(response.status).toBe(200)
+      expect(response.headers.get('content-type')).toBe('image/avif')
+    })
   })
 })