fixup! Turbopack: support config.turbopack and deprecate config.experimental.turbopack.

Author: wbinnssmith

test/e2e/turbopack-turbo-config-compatibility/index.test.ts

@@ -19,27 +19,23 @@ describe('turbopack-turbo-config-compatibility', () => {
   describe('only including deprecated experimental turbo config', () => {
     const { next, isTurbopack } = nextTestSetup({
       files: __dirname,
+      overrideFiles: {
+        'next.config.js': `module.exports = {
+          experimental: {
+            turbo: {
+              resolveAlias: {
+                foo: './turbo.js',
+              },
+            },
+          },
+        }`,
+      },
     })
 
     if (!isTurbopack) {
       return
     }
 
-    beforeAll(async () => {
-      await next.patchFile(
-        'next.config.js',
-        `module.exports = {
-        experimental: {
-          turbo: {
-            resolveAlias: {
-              foo: './turbo.js',
-            },
-          },
-        },
-      }`
-      )
-    })
-
     it('still uses the deprecated experimental turbo config', async () => {
       const $ = await next.render$('/')
       expect($('#result').text()).toEqual('Hello turbo')

test/integration/production-build-dir/test/index.test.js

@@ -15,11 +15,12 @@ describe('Production Custom Build Directory', () => {
     () => {
       describe('With basic usage', () => {
         it('should render the page', async () => {
-          await runNextCommand(['build', 'build'], {
+          const result = await runNextCommand(['build', 'build'], {
             cwd: join(__dirname, '..'),
             stdout: true,
             stderr: true,
           })
+          expect(result.stderr).toBe('')
 
           const appPort = await findPort()
           const app = await nextStart(join(__dirname, '../build'), appPort)