From ce7c8b06b85910e891fba6ee4564ea736508f5fc Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Sun, 8 Sep 2024 14:45:41 +0200
Subject: [PATCH] Turbopack build: Fix middleware dead code elimination test
 (#69828)

This test assumed a hardcoded file but with Turbopack it's a combination
of multiple files. Changed it to use the manifest to look up the
relevant files.

<!-- Thanks for opening a PR! Your contribution is much appreciated.
To make sure your PR is handled as smoothly as possible we request that
you follow the checklist sections below.
Choose the right checklist for the change(s) that you're making:

## For Contributors

### Improving Documentation

- Run `pnpm prettier-fix` to fix formatting issues before opening the
PR.
- Read the Docs Contribution Guide to ensure your contribution follows
the docs guidelines:
https://nextjs.org/docs/community/contribution-guide

### Adding or Updating Examples

- The "examples guidelines" are followed from our contributing doc
https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md
- Make sure the linting passes by running `pnpm build && pnpm lint`. See
https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md

### Fixing a bug

- Related issues linked using `fixes #number`
- Tests added. See:
https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md

### Adding a feature

- Implements an existing feature request or RFC. Make sure the feature
request has been accepted for implementation before opening a PR. (A
discussion must be opened, see
https://github.com/vercel/next.js/discussions/new?category=ideas)
- Related issues/discussions are linked using `fixes #number`
- e2e tests added
(https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs)
- Documentation added
- Telemetry added. In case of a feature if it's used or not.
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md


## For Maintainers

- Minimal description (aim for explaining to someone not on the team to
understand the PR)
- When linking to a Slack thread, you might want to share details of the
conclusion
- Link both the Linear (Fixes NEXT-xxx) and the GitHub issues
- Add review comments if necessary to explain to the reviewer the logic
behind a change

### What?

### Why?

### How?

Closes NEXT-
Fixes #

-->
---
 .../edge-runtime-is-addressable/index.test.ts  | 18 ++++++++++++------
 test/turbopack-build-tests-manifest.json       |  5 ++---
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/test/production/edge-runtime-is-addressable/index.test.ts b/test/production/edge-runtime-is-addressable/index.test.ts
index 0a9e25bb8460a..b4bc924023cd2 100644
--- a/test/production/edge-runtime-is-addressable/index.test.ts
+++ b/test/production/edge-runtime-is-addressable/index.test.ts
@@ -1,7 +1,6 @@
 import { createNext } from 'e2e-utils'
 import { NextInstance } from 'e2e-utils'
 import { fetchViaHTTP } from 'next-test-utils'
-import fs from 'fs-extra'
 import path from 'path'
 
 const files = {
@@ -55,13 +54,20 @@ describe('Edge Runtime is addressable', () => {
   })
 
   test('removes the undefined branch with dead code elimination', async () => {
-    const compiledMiddlewareFile = await fs.readFile(
-      path.join(next.testDir, '.next/server/middleware.js'),
-      'utf8'
+    const middlewareManifest = await next.readJSON(
+      '.next/server/middleware-manifest.json'
     )
 
-    expect(compiledMiddlewareFile).toContain('EdgeRuntime is defined')
-    expect(compiledMiddlewareFile).not.toContain('EdgeRuntime is undefined')
+    const files = middlewareManifest.middleware['/'].files
+
+    let allContentCombined = ''
+    for (const file of files) {
+      const content = await next.readFile(path.join('.next', file))
+      allContentCombined += content
+    }
+
+    expect(allContentCombined).toContain('EdgeRuntime is defined')
+    expect(allContentCombined).not.toContain('EdgeRuntime is undefined')
   })
 })
 
diff --git a/test/turbopack-build-tests-manifest.json b/test/turbopack-build-tests-manifest.json
index 1029bce22ce69..9c4f581224093 100644
--- a/test/turbopack-build-tests-manifest.json
+++ b/test/turbopack-build-tests-manifest.json
@@ -16044,11 +16044,10 @@
     "test/production/edge-runtime-is-addressable/index.test.ts": {
       "passed": [
         "Edge Runtime can be set to the production provider EdgeRuntime evaluates to a string",
-        "Edge Runtime is addressable EdgeRuntime evaluates to a string"
-      ],
-      "failed": [
+        "Edge Runtime is addressable EdgeRuntime evaluates to a string",
         "Edge Runtime is addressable removes the undefined branch with dead code elimination"
       ],
+      "failed": [],
       "pending": [],
       "flakey": [],
       "runtimeError": false