From 4462e4fb7b858fd0a8ea2a8a509e193a3b97ec04 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Thu, 5 Sep 2024 23:13:09 +0200
Subject: [PATCH] Turbopack build: Update css modules tests (#69730)

Removes the in-between test that relies on the order of test execution
which is not needed as this can throw in beforeAll to make all relevant
tests fail.

<!-- 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 #

-->
---
 .../css-modules/test/index.test.js            | 32 ++++++++-----------
 test/turbopack-build-tests-manifest.json      |  2 --
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/test/integration/css-modules/test/index.test.js b/test/integration/css-modules/test/index.test.js
index f9bf874fb9470..4b13eaea93428 100644
--- a/test/integration/css-modules/test/index.test.js
+++ b/test/integration/css-modules/test/index.test.js
@@ -440,13 +440,16 @@ describe('Valid Nested CSS Module Usage from within node_modules', () => {
 
       let appPort
       let app
-      let stdout
-      let code
       beforeAll(async () => {
         await remove(join(appDir, '.next'))
-        ;({ code, stdout } = await nextBuild(appDir, [], {
+        const { code, stdout } = await nextBuild(appDir, [], {
           stdout: true,
-        }))
+        })
+
+        if (code !== 0) {
+          console.error(stdout)
+          throw new Error('Build failed')
+        }
 
         appPort = await findPort()
         app = await nextStart(appDir, appPort)
@@ -455,11 +458,6 @@ describe('Valid Nested CSS Module Usage from within node_modules', () => {
         await killApp(app)
       })
 
-      it('should have compiled successfully', () => {
-        expect(code).toBe(0)
-        expect(stdout).toMatch(/Compiled successfully/)
-      })
-
       it(`should've prerendered with relevant data`, async () => {
         const content = await renderViaHTTP(appPort, '/')
         const $ = cheerio.load(content)
@@ -573,13 +571,16 @@ describe('CSS Module Composes Usage (External)', () => {
 
       let appPort
       let app
-      let stdout
-      let code
       beforeAll(async () => {
         await remove(join(appDir, '.next'))
-        ;({ code, stdout } = await nextBuild(appDir, [], {
+        console.log({ appDir })
+        const { code, stdout } = await nextBuild(appDir, [], {
           stdout: true,
-        }))
+        })
+        if (code !== 0) {
+          console.error(stdout)
+          throw new Error('Build failed')
+        }
         appPort = await findPort()
         app = await nextStart(appDir, appPort)
       })
@@ -587,11 +588,6 @@ describe('CSS Module Composes Usage (External)', () => {
         await killApp(app)
       })
 
-      it('should have compiled successfully', () => {
-        expect(code).toBe(0)
-        expect(stdout).toMatch(/Compiled successfully/)
-      })
-
       it(`should've emitted a single CSS file`, async () => {
         const content = await renderViaHTTP(appPort, '/')
         const $ = cheerio.load(content)
diff --git a/test/turbopack-build-tests-manifest.json b/test/turbopack-build-tests-manifest.json
index c618271211f57..56629f1b9c6d0 100644
--- a/test/turbopack-build-tests-manifest.json
+++ b/test/turbopack-build-tests-manifest.json
@@ -7879,9 +7879,7 @@
         "Valid CSS Module Usage from within node_modules production mode should've prerendered with relevant data"
       ],
       "failed": [
-        "CSS Module Composes Usage (External) production mode should have compiled successfully",
         "CSS Module Composes Usage (External) production mode should've emitted a single CSS file",
-        "Valid Nested CSS Module Usage from within node_modules production mode should have compiled successfully",
         "Valid Nested CSS Module Usage from within node_modules production mode should've emitted a single CSS file",
         "Valid Nested CSS Module Usage from within node_modules production mode should've prerendered with relevant data"
       ],