test: adjust tests to look for .netlify/images and not _next/image

Author: pieh

adapters-notes.md

@@ -1,13 +1,19 @@
 ## Feedback
 
-- Files from `public` directory not listed in `outputs.staticFiles`
-- In `onBuildComplete` - `config.images.remotePatterns` type is `(RemotePattern | URL)[]` but in
-  reality `URL` inputs are converted to `RemotePattern` so type should be just `RemotePattern[]`
+- Files from `public` directory not listed in `outputs.staticFiles`. Should they be?
 - `routes.headers` does not contain immutable cache-control headers for `_next/static`
-- `outputs.middleware` does not contain env that exist in `middleware-manifest.json` (i.e.
-  `NEXT_SERVER_ACTIONS_ENCRYPTION_KEY`, `NEXT_PREVIEW_MODE_ID`, `NEXT_PREVIEW_MODE_SIGNING_KEY` etc)
+- In `onBuildComplete` - `config.images.remotePatterns` type is `(RemotePattern | URL)[]` but in
+  reality `URL` inputs are converted to `RemotePattern` so type should be just `RemotePattern[]` in
+  `onBuildComplete` (this would require different config type for `modifyConfig` (allow inputs
+  here?) and `onBuildComplete` (final, normalized config shape)?)
 - `outputs.middleware.config.matchers` can be undefined per types - can that ever happen? Can we
-  just have empty array instead to simplify handling.
+  just have empty array instead to simplify handling (possibly similar as above point where type is
+  for the input, while "output" will have a default matcher if not defined by user).
+- `outputs.middleware` does not contain `env` that exist in `middleware-manifest.json` (i.e.
+  `NEXT_SERVER_ACTIONS_ENCRYPTION_KEY`, `NEXT_PREVIEW_MODE_ID`, `NEXT_PREVIEW_MODE_SIGNING_KEY` etc)
+  or `wasm` (tho wasm files are included in assets, so I think I have a way to support those as-is,
+  but need to to make some assumption about using extension-less file name of wasm file as
+  identifier)
 - `outputs.staticFiles` (i18n enabled) custom fully static (no `getStaticProps`) `/pages/404.js`
   `filePath` point to not existing file (it doesn't have i18n locale prefix in `staticFiles` array,
   actual 404.html are written to i18n locale prefixed directories)
@@ -45,7 +51,8 @@
     handler and convert those files into blobs to upload later
 - [partially done - for edge runtime] use middleware output to generate middleware edge function
 - [done] don't glob for static files and use `outputs.staticFiles` instead
-- don't read various manifest files manually and use provided context in `onBuildComplete` instead
+- note any remaining manual manifest files reading in build plugin once everything that could be
+  adjusted was handled
 
 ## To figure out
 

tests/e2e/export.test.ts

@@ -54,12 +54,12 @@ test('Renders the Home page correctly with output export and custom dist dir', a
 
 test.describe('next/image is using Netlify Image CDN', () => {
   test('Local images', async ({ page, outputExport }) => {
-    const nextImageResponsePromise = page.waitForResponse('**/_next/image**')
+    const nextImageResponsePromise = page.waitForResponse('**/.netlify/images**')
 
     await page.goto(`${outputExport.url}/image/local`)
 
     const nextImageResponse = await nextImageResponsePromise
-    expect(nextImageResponse.request().url()).toContain('_next/image?url=%2Fsquirrel.jpg')
+    expect(nextImageResponse.request().url()).toContain('.netlify/images?url=%2Fsquirrel.jpg')
 
     expect(nextImageResponse.status()).toBe(200)
     // ensure next/image is using Image CDN

tests/e2e/simple-app.test.ts

@@ -110,12 +110,12 @@ test.skip('streams stale responses', async ({ simple }) => {
 
 test.describe('next/image is using Netlify Image CDN', () => {
   test('Local images', async ({ page, simple }) => {
-    const nextImageResponsePromise = page.waitForResponse('**/_next/image**')
+    const nextImageResponsePromise = page.waitForResponse('**/.netlify/images**')
 
     await page.goto(`${simple.url}/image/local`)
 
     const nextImageResponse = await nextImageResponsePromise
-    expect(nextImageResponse.request().url()).toContain('_next/image?url=%2Fsquirrel.jpg')
+    expect(nextImageResponse.request().url()).toContain('.netlify/images?url=%2Fsquirrel.jpg')
 
     expect(nextImageResponse.status()).toBe(200)
     // ensure next/image is using Image CDN
@@ -131,14 +131,14 @@ test.describe('next/image is using Netlify Image CDN', () => {
     page,
     simple,
   }) => {
-    const nextImageResponsePromise = page.waitForResponse('**/_next/image**')
+    const nextImageResponsePromise = page.waitForResponse('**/.netlify/images**')
 
     await page.goto(`${simple.url}/image/remote-pattern-1`)
 
     const nextImageResponse = await nextImageResponsePromise
 
     expect(nextImageResponse.url()).toContain(
-      `_next/image?url=${encodeURIComponent(
+      `.netlify/images?url=${encodeURIComponent(
         'https://images.unsplash.com/photo-1574870111867-089730e5a72b',
       )}`,
     )
@@ -155,14 +155,14 @@ test.describe('next/image is using Netlify Image CDN', () => {
     page,
     simple,
   }) => {
-    const nextImageResponsePromise = page.waitForResponse('**/_next/image**')
+    const nextImageResponsePromise = page.waitForResponse('**/.netlify/images**')
 
     await page.goto(`${simple.url}/image/remote-pattern-2`)
 
     const nextImageResponse = await nextImageResponsePromise
 
     expect(nextImageResponse.url()).toContain(
-      `_next/image?url=${encodeURIComponent(
+      `.netlify/images?url=${encodeURIComponent(
         'https://cdn.pixabay.com/photo/2017/02/20/18/03/cat-2083492_1280.jpg',
       )}`,
     )
@@ -176,14 +176,14 @@ test.describe('next/image is using Netlify Image CDN', () => {
   })
 
   test('Remote images: domains', async ({ page, simple }) => {
-    const nextImageResponsePromise = page.waitForResponse('**/_next/image**')
+    const nextImageResponsePromise = page.waitForResponse('**/.netlify/images**')
 
     await page.goto(`${simple.url}/image/remote-domain`)
 
     const nextImageResponse = await nextImageResponsePromise
 
     expect(nextImageResponse.url()).toContain(
-      `_next/image?url=${encodeURIComponent(
+      `.netlify/images?url=${encodeURIComponent(
         'https://images.pexels.com/photos/406014/pexels-photo-406014.jpeg',
       )}`,
     )