Update tests for Turbopack

vercel · Nov 7, 2024 · e856540 · e856540
1 parent 9e4c143
commit e856540
Show file tree

Hide file tree

Showing 9 changed files with 155 additions and 100 deletions.
diff --git a/test/e2e/edge-pages-support/index.test.ts b/test/e2e/edge-pages-support/index.test.ts
@@ -13,22 +13,44 @@ describe('edge-render-getserversideprops', () => {
   if ((global as any).isNextStart) {
     it('should not output trace files for edge routes', async () => {
       expect(await fs.pathExists(join(next.testDir, '.next/pages'))).toBe(false)
-      expect(
-        await fs.pathExists(join(next.testDir, '.next/server/pages/[id].js'))
-      ).toBe(true)
-      expect(
-        await fs.pathExists(
-          join(next.testDir, '.next/server/pages/[id].js.nft.json')
-        )
-      ).toBe(false)
-      expect(
-        await fs.pathExists(join(next.testDir, '.next/server/pages/index.js'))
-      ).toBe(true)
-      expect(
-        await fs.pathExists(
-          join(next.testDir, '.next/server/pages/index.js.nft.json')
-        )
-      ).toBe(false)
+      if (process.env.TURBOPACK) {
+        expect(
+          await fs.pathExists(
+            join(
+              next.testDir,
+              '.next/server/pages/[id]/middleware-manifest.json'
+            )
+          )
+        ).toBe(true)
+      } else {
+        expect(
+          await fs.pathExists(join(next.testDir, '.next/server/pages/[id].js'))
+        ).toBe(true)
+        expect(
+          await fs.pathExists(
+            join(next.testDir, '.next/server/pages/[id].js.nft.json')
+          )
+        ).toBe(false)
+      }
+      if (process.env.TURBOPACK) {
+        expect(
+          await fs.pathExists(
+            join(
+              next.testDir,
+              '.next/server/pages/index/middleware-manifest.json'
+            )
+          )
+        ).toBe(true)
+      } else {
+        expect(
+          await fs.pathExists(join(next.testDir, '.next/server/pages/index.js'))
+        ).toBe(true)
+        expect(
+          await fs.pathExists(
+            join(next.testDir, '.next/server/pages/index.js.nft.json')
+          )
+        ).toBe(false)
+      }
     })
   }
 

diff --git a/test/e2e/og-api/index.test.ts b/test/e2e/og-api/index.test.ts
@@ -55,16 +55,32 @@ describe('og-api', () => {
     it('should copy files correctly', async () => {
       expect(next.cliOutput).not.toContain('Failed to copy traced files')
 
-      expect(
-        await fs.pathExists(
-          join(next.testDir, '.next/standalone/.next/server/pages/api/og.js')
-        )
-      ).toBe(true)
-      expect(
-        await fs.pathExists(
-          join(next.testDir, '.next/standalone/.next/server/edge-chunks')
-        )
-      ).toBe(true)
+      if (process.env.TURBOPACK) {
+        expect(
+          await fs.pathExists(
+            join(
+              next.testDir,
+              '.next/standalone/.next/server/pages/api/og/middleware-manifest.json'
+            )
+          )
+        ).toBe(true)
+        expect(
+          await fs.pathExists(
+            join(next.testDir, '.next/standalone/.next/server/edge/chunks')
+          )
+        ).toBe(true)
+      } else {
+        expect(
+          await fs.pathExists(
+            join(next.testDir, '.next/standalone/.next/server/pages/api/og.js')
+          )
+        ).toBe(true)
+        expect(
+          await fs.pathExists(
+            join(next.testDir, '.next/standalone/.next/server/edge-chunks')
+          )
+        ).toBe(true)
+      }
     })
   }
 

diff --git a/test/e2e/prerender-native-module.test.ts b/test/e2e/prerender-native-module.test.ts
@@ -69,7 +69,7 @@ describe('prerender native module', () => {
         {
           page: '/_app',
           tests: [
-            /webpack-runtime\.js/,
+            /(webpack-runtime\.js|\[turbopack\]_runtime\.js)/,
             /node_modules\/react\/index\.js/,
             /node_modules\/react\/package\.json/,
             isReact18
@@ -81,7 +81,7 @@ describe('prerender native module', () => {
         {
           page: '/blog/[slug]',
           tests: [
-            /webpack-runtime\.js/,
+            /(webpack-runtime\.js|\[turbopack\]_runtime\.js)/,
             /node_modules\/react\/index\.js/,
             /node_modules\/react\/package\.json/,
             isReact18

diff --git a/test/e2e/prerender.test.ts b/test/e2e/prerender.test.ts
@@ -2117,7 +2117,7 @@ describe('Prerender', () => {
           {
             page: '/_app',
             tests: [
-              /webpack-runtime\.js/,
+              /(webpack-runtime\.js|\[turbopack\]_runtime\.js)/,
               /node_modules\/react\/index\.js/,
               /node_modules\/react\/package\.json/,
               isReact18
@@ -2129,7 +2129,7 @@ describe('Prerender', () => {
           {
             page: '/another',
             tests: [
-              /webpack-runtime\.js/,
+              /(webpack-runtime\.js|\[turbopack\]_runtime\.js)/,
               /chunks\/.*?\.js/,
               /node_modules\/react\/index\.js/,
               /node_modules\/react\/package\.json/,
@@ -2146,7 +2146,7 @@ describe('Prerender', () => {
           {
             page: '/blog/[post]',
             tests: [
-              /webpack-runtime\.js/,
+              /(webpack-runtime\.js|\[turbopack\]_runtime\.js)/,
               /chunks\/.*?\.js/,
               /node_modules\/react\/index\.js/,
               /node_modules\/react\/package\.json/,

diff --git a/test/e2e/streaming-ssr/index.test.ts b/test/e2e/streaming-ssr/index.test.ts
@@ -166,10 +166,15 @@ if (isNextProd) {
       next.destroy()
     })
 
-    it('should pass correct nextRuntime values', async () => {
-      const content = await next.readFile('runtimes.txt')
-      expect(content.split('\n').sort()).toEqual(['client', 'edge', 'nodejs'])
-    })
+    // Relies on the custom webpack config above
+    ;(process.env.TURBOPACK ? it.skip : it)(
+      'should pass correct nextRuntime values',
+      async () => {
+        const content = await next.readFile('runtimes.txt')
+        // eslint-disable-next-line jest/no-standalone-expect
+        expect(content.split('\n').sort()).toEqual(['client', 'edge', 'nodejs'])
+      }
+    )
 
     it('should generate html response by streaming correctly', async () => {
       const html = await renderViaHTTP(next.url, '/')

diff --git a/test/integration/dist-dir/test/index.test.js b/test/integration/dist-dir/test/index.test.js
@@ -102,7 +102,7 @@ describe('distDir', () => {
         })
         await fs.writeFile(nextConfig, origNextConfig)
 
-        expect(stderr.length).toBe(0)
+        expect(stderr).toBeEmpty()
       })
     }
   )

diff --git a/test/production/pages-dir/production/test/index.test.ts b/test/production/pages-dir/production/test/index.test.ts
@@ -180,7 +180,7 @@ describe('Production Usage', () => {
       {
         page: '/_app',
         tests: [
-          /webpack-runtime\.js/,
+          /(webpack-runtime\.js|\[turbopack\]_runtime\.js)/,
           /node_modules\/react\/index\.js/,
           /node_modules\/react\/package\.json/,
           isReact18
@@ -192,7 +192,7 @@ describe('Production Usage', () => {
       {
         page: '/client-error',
         tests: [
-          /webpack-runtime\.js/,
+          /(webpack-runtime\.js|\[turbopack\]_runtime\.js)/,
           /chunks\/.*?\.js/,
           /node_modules\/react\/index\.js/,
           /node_modules\/react\/package\.json/,
@@ -206,7 +206,7 @@ describe('Production Usage', () => {
       {
         page: '/index',
         tests: [
-          /webpack-runtime\.js/,
+          /(webpack-runtime\.js|\[turbopack\]_runtime\.js)/,
           /chunks\/.*?\.js/,
           /node_modules\/react\/index\.js/,
           /node_modules\/react\/package\.json/,
@@ -223,7 +223,7 @@ describe('Production Usage', () => {
       {
         page: '/next-import',
         tests: [
-          /webpack-runtime\.js/,
+          /(webpack-runtime\.js|\[turbopack\]_runtime\.js)/,
           /chunks\/.*?\.js/,
           /node_modules\/react\/index\.js/,
           /node_modules\/react\/package\.json/,
@@ -242,7 +242,10 @@ describe('Production Usage', () => {
       },
       {
         page: '/api',
-        tests: [/webpack-runtime\.js/, /\/logo\.module\.css/],
+        tests: [
+          /(webpack-runtime\.js|\[turbopack\]_runtime\.js)/,
+          /\/logo\.module\.css/,
+        ],
         notTests: [
           /next\/dist\/server\/next\.js/,
           /next\/dist\/bin/,

diff --git a/test/production/standalone-mode/required-server-files/required-server-files.test.ts b/test/production/standalone-mode/required-server-files/required-server-files.test.ts
@@ -300,13 +300,17 @@ describe('required server files', () => {
     })
   })
 
-  it('should warn when "next" is imported directly', async () => {
-    await renderViaHTTP(appPort, '/gssp')
-    await check(
-      () => stderr,
-      /"next" should not be imported directly, imported in/
-    )
-  })
+  // TODO(mischnic) do we still want to do this?
+  ;(process.env.TURBOPACK ? it.skip : it)(
+    'should warn when "next" is imported directly',
+    async () => {
+      await renderViaHTTP(appPort, '/gssp')
+      await check(
+        () => stderr,
+        /"next" should not be imported directly, imported in/
+      )
+    }
+  )
 
   it('`compress` should be `false` in nextEnv', async () => {
     expect(
@@ -330,18 +334,24 @@ describe('required server files', () => {
     ).toContain('"cacheMaxMemorySize":0')
   })
 
-  it('should output middleware correctly', async () => {
-    expect(
-      await fs.pathExists(
-        join(next.testDir, 'standalone/.next/server/edge-runtime-webpack.js')
-      )
-    ).toBe(true)
-    expect(
-      await fs.pathExists(
-        join(next.testDir, 'standalone/.next/server/middleware.js')
-      )
-    ).toBe(true)
-  })
+  // TODO(mischnic) do these files even exist in turbopack?
+  ;(process.env.TURBOPACK ? it.skip : it)(
+    'should output middleware correctly',
+    async () => {
+      // eslint-disable-next-line jest/no-standalone-expect
+      expect(
+        await fs.pathExists(
+          join(next.testDir, 'standalone/.next/server/edge-runtime-webpack.js')
+        )
+      ).toBe(true)
+      // eslint-disable-next-line jest/no-standalone-expect
+      expect(
+        await fs.pathExists(
+          join(next.testDir, 'standalone/.next/server/middleware.js')
+        )
+      ).toBe(true)
+    }
+  )
 
   it('should output required-server-files manifest correctly', async () => {
     expect(requiredFilesManifest.version).toBe(1)
@@ -1293,9 +1303,15 @@ describe('required server files', () => {
       expect(res.status).toBe(200)
       expect(await res.text()).toContain('index page')
 
-      expect(
-        fs.existsSync(join(standaloneDir, '.next/server/edge-chunks'))
-      ).toBe(true)
+      if (process.env.TURBOPACK) {
+        expect(
+          fs.existsSync(join(standaloneDir, '.next/server/edge/chunks'))
+        ).toBe(true)
+      } else {
+        expect(
+          fs.existsSync(join(standaloneDir, '.next/server/edge-chunks'))
+        ).toBe(true)
+      }
 
       const resImageResponse = await fetchViaHTTP(
         appPort,
-Original file line number
+Diff line change
@@ Expand Up / @@ -102,7 +102,7 @@ describe('distDir', () => { @@
             })
             await fs.writeFile(nextConfig, origNextConfig)
-            expect(stderr.length).toBe(0)
+            expect(stderr).toBeEmpty()
           })
         }
       )
@@ Expand Down @@