Update tests

Author: devjiwonchoi

test/integration/dist-dir/test/index.test.js

@@ -68,15 +68,9 @@ describe('distDir', () => {
 
       it('should build the app within the given `dist` directory', async () => {
         // In isolated dev build, the distDir for development is `distDir/dev`
-        if (process.env.__NEXT_EXPERIMENTAL_ISOLATED_DEV_BUILD === 'true') {
-          expect(
-            await fs.exists(join(__dirname, `/../dist/dev/${BUILD_MANIFEST}`))
-          ).toBeTruthy()
-        } else {
-          expect(
-            await fs.exists(join(__dirname, `/../dist/${BUILD_MANIFEST}`))
-          ).toBeTruthy()
-        }
+        expect(
+          await fs.exists(join(__dirname, `/../dist/dev/${BUILD_MANIFEST}`))
+        ).toBeTruthy()
       })
       it('should not build the app within the default `.next` directory', async () => {
         expect(

test/integration/module-ids/test/index.test.js

@@ -8,10 +8,11 @@ import {
   launchApp,
   nextBuild,
   renderViaHTTP,
+  getDistDir,
 } from 'next-test-utils'
 
 const appDir = join(__dirname, '../')
-
+const originalIsNextDev = global.isNextDev
 let appPort
 let app
 
@@ -23,9 +24,11 @@ describe('minified module ids', () => {
     let staticBundles = ''
 
     beforeAll(async () => {
+      // getDistDir depends on global.isNextDev
+      global.isNextDev = false
       await nextBuild(appDir, [])
 
-      const ssrPath = join(appDir, '.next/server/chunks/ssr/')
+      const ssrPath = join(appDir, `${getDistDir()}/server/chunks/ssr/`)
       const ssrBundleBasenames = (await fs.readdir(ssrPath)).filter((p) =>
         p.match(/\.js$/)
       )
@@ -34,7 +37,7 @@ describe('minified module ids', () => {
         ssrBundles += output
       }
 
-      const staticPath = join(appDir, '.next/static/chunks/')
+      const staticPath = join(appDir, `${getDistDir()}/static/chunks/`)
       const staticBundleBasenames = (await fs.readdir(staticPath)).filter((p) =>
         p.match(/\.js$/)
       )
@@ -43,6 +46,9 @@ describe('minified module ids', () => {
         staticBundles += output
       }
     })
+    afterAll(() => {
+      global.isNextDev = originalIsNextDev
+    })
 
     it('should have no long module ids for basic modules', async () => {
       expect(ssrBundles).not.toContain('module-with-long-name')
@@ -72,12 +78,14 @@ describe('minified module ids', () => {
     let staticBundles = ''
 
     beforeAll(async () => {
+      // getDistDir depends on global.isNextDev
+      global.isNextDev = true
       appPort = await findPort()
       app = await launchApp(appDir, appPort)
 
       await renderViaHTTP(appPort, '/')
 
-      const ssrPath = join(appDir, '.next/server/chunks/ssr/')
+      const ssrPath = join(appDir, `${getDistDir()}/server/chunks/ssr/`)
       const ssrBundleBasenames = (await fs.readdir(ssrPath)).filter((p) =>
         p.match(/\.js$/)
       )
@@ -86,7 +94,7 @@ describe('minified module ids', () => {
         ssrBundles += output
       }
 
-      const staticPath = join(appDir, '.next/static/chunks/')
+      const staticPath = join(appDir, `${getDistDir()}/static/chunks/`)
       const staticBundleBasenames = (await fs.readdir(staticPath)).filter((p) =>
         p.match(/\.js$/)
       )
@@ -95,7 +103,10 @@ describe('minified module ids', () => {
         staticBundles += output
       }
     })
-    afterAll(() => killApp(app))
+    afterAll(() => {
+      global.isNextDev = originalIsNextDev
+      killApp(app)
+    })
 
     it('should have long module ids for basic modules', async () => {
       expect(ssrBundles).toContain('module-with-long-name')

test/integration/typescript-app-type-declarations/next-env.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./.next/types/routes.d.ts";
+import "./.next/dev/types/routes.d.ts";
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.

test/integration/typescript-app-type-declarations/test/index.test.js

@@ -8,18 +8,6 @@ const appDir = join(__dirname, '..')
 const appTypeDeclarations = join(appDir, 'next-env.d.ts')
 
 describe('TypeScript App Type Declarations', () => {
-  if (process.env.__NEXT_EXPERIMENTAL_ISOLATED_DEV_BUILD === 'true') {
-    it.skip('should skip on isolated dev build', () => {
-      // We use static fixture "next-env.d.ts" but the content should differ
-      // based on the isolated dev build flag. We can't do something like
-      // "next-env-dev.d.ts" because Next.js Types Plugin emits a file
-      // "next-env.d.ts", and we have to change its behavior for this test case.
-      // Rather than that, just skip the test as we're going to remove this flag soon.
-      // Then modify the content to be ".next/dev/types/routes.d.ts"
-    })
-    return
-  }
-
   it('should write a new next-env.d.ts if none exist', async () => {
     const prevContent = await fs.readFile(appTypeDeclarations, 'utf8')
     try {

test/lib/next-test-utils.ts

@@ -1893,9 +1893,7 @@ export function normalizeManifest<T>(
 export function getDistDir(): '.next' | '.next/dev' {
   // global.isNextDev is set in e2e/development/production tests.
   // NEXT_TEST_MODE is set in CI or local test-* commands.
-  return ((global as any).isNextDev || process.env.NEXT_TEST_MODE === 'dev') &&
-    // Flag for incremental rollout of isolated dev build, set in CI.
-    process.env.__NEXT_EXPERIMENTAL_ISOLATED_DEV_BUILD === 'true'
+  return (global as any).isNextDev || process.env.NEXT_TEST_MODE === 'dev'
     ? '.next/dev'
     : '.next'
 }

test/unit/isolated/config.test.ts

@@ -38,12 +38,7 @@ describe('config', () => {
 
   it('Should assign object defaults deeply to user config', async () => {
     const config = await loadConfig(PHASE_DEVELOPMENT_SERVER, pathToConfigFn)
-    // In isolatedDevBuild, the default distDir is ".next/dev" during PHASE_DEVELOPMENT_SERVER.
-    if (process.env.__NEXT_EXPERIMENTAL_ISOLATED_DEV_BUILD === 'true') {
-      expect(config.distDir).toEqual('.next/dev')
-    } else {
-      expect(config.distDir).toEqual('.next')
-    }
+    expect(config.distDir.replace(/\\/g, '/')).toEqual('.next/dev')
     expect(config.onDemandEntries.maxInactiveAge).toBeDefined()
   })