gisttor
diff --git a/‎package.json
Lines changed: 0 additions & 2 deletions b/‎package.json
Lines changed: 0 additions & 2 deletions
diff --git a/‎packages/next/compiled/@vercel/nft/index.js
Lines changed: 1 addition & 1 deletion b/‎packages/next/compiled/@vercel/nft/index.js
Lines changed: 1 addition & 1 deletion
diff --git a/‎test/e2e/basepath.test.ts
Lines changed: 3 additions & 3 deletions b/‎test/e2e/basepath.test.ts
Lines changed: 3 additions & 3 deletions
diff --git a/‎test/integration/prerender-native-module/test/index.test.js renamed to ‎test/e2e/prerender-native-module.test.ts
Lines changed: 36 additions & 54 deletions b/‎test/integration/prerender-native-module/test/index.test.js renamed to ‎test/e2e/prerender-native-module.test.ts
Lines changed: 36 additions & 54 deletions
diff --git a/‎test/integration/prerender-native-module/data.sqlite renamed to ‎test/e2e/prerender-native-module/data.sqlite b/‎test/integration/prerender-native-module/data.sqlite renamed to ‎test/e2e/prerender-native-module/data.sqlite
diff --git a/‎test/integration/prerender-native-module/pages/blog/[slug].js renamed to ‎test/e2e/prerender-native-module/pages/blog/[slug].js b/‎test/integration/prerender-native-module/pages/blog/[slug].js renamed to ‎test/e2e/prerender-native-module/pages/blog/[slug].js
diff --git a/‎test/integration/prerender-native-module/pages/index.js renamed to ‎test/e2e/prerender-native-module/pages/index.js b/‎test/integration/prerender-native-module/pages/index.js renamed to ‎test/e2e/prerender-native-module/pages/index.js
@@ -132,8 +132,6 @@
     "seedrandom": "3.0.5",
     "selenium-webdriver": "4.0.0-beta.4",
     "shell-quote": "1.7.2",
-    "sqlite": "4.0.22",
-    "sqlite3": "5.0.2",
     "styled-jsx-plugin-postcss": "3.0.2",
     "tailwindcss": "1.1.3",
     "taskr": "1.1.0",
 
@@ -136,7 +136,7 @@ describe('basePath', () => {
     })
 
     if (!dev) {
-      if (!(global as any).isDeploy) {
+      if (!(global as any).isNextDeploy) {
         it('should add basePath to routes-manifest', async () => {
           const routesManifest = JSON.parse(
             await next.readFile('.next/routes-manifest.json')
@@ -487,7 +487,7 @@ describe('basePath', () => {
       )
     })
 
-    if (!(global as any).isDeploy) {
+    if (!(global as any).isNextDeploy) {
       it('should navigate an absolute local url with basePath', async () => {
         const browser = await webdriver(
           next.url,
@@ -843,5 +843,5 @@ describe('basePath', () => {
       }
     })
   }
-  runTests((global as any).isDev)
+  runTests((global as any).isNextDev)
 })
@@ -1,31 +1,44 @@
-/* eslint-env jest */
-
-import fs from 'fs-extra'
-import { join, sep } from 'path'
+import path from 'path'
+import { createNext, FileRef } from 'e2e-utils'
+import { NextInstance } from 'test/lib/next-modes/base'
 import webdriver from 'next-webdriver'
-import {
-  findPort,
-  killApp,
-  launchApp,
-  nextBuild,
-  nextStart,
-} from 'next-test-utils'
 
-let app
-let appPort
-const appDir = join(__dirname, '..')
+describe('prerender native module', () => {
+  let next: NextInstance
+
+  beforeAll(async () => {
+    next = await createNext({
+      files: {
+        pages: new FileRef(
+          path.join(__dirname, 'prerender-native-module/pages')
+        ),
+        'data.sqlite': new FileRef(
+          path.join(__dirname, 'prerender-native-module/data.sqlite')
+        ),
+      },
+      dependencies: {
+        sqlite: '4.0.22',
+        sqlite3: '5.0.2',
+      },
+      nextConfig: {
+        experimental: {
+          nftTracing: true,
+        },
+      },
+    })
+  })
+  afterAll(() => next.destroy())
 
-const runTests = () => {
   it('should render index correctly', async () => {
-    const browser = await webdriver(appPort, '/')
+    const browser = await webdriver(next.url, '/')
     expect(await browser.elementByCss('#index').text()).toBe('index page')
     expect(JSON.parse(await browser.elementByCss('#props').text())).toEqual({
       index: true,
     })
   })
 
   it('should render /blog/first correctly', async () => {
-    const browser = await webdriver(appPort, '/blog/first')
+    const browser = await webdriver(next.url, '/blog/first')
 
     expect(await browser.elementByCss('#blog').text()).toBe('blog page')
     expect(JSON.parse(await browser.elementByCss('#props').text())).toEqual({
@@ -39,7 +52,7 @@ const runTests = () => {
   })
 
   it('should render /blog/second correctly', async () => {
-    const browser = await webdriver(appPort, '/blog/second')
+    const browser = await webdriver(next.url, '/blog/second')
     await browser.waitForElementByCss('#blog')
 
     expect(await browser.elementByCss('#blog').text()).toBe('blog page')
@@ -52,26 +65,8 @@ const runTests = () => {
       ],
     })
   })
-}
-
-describe('Prerender native module', () => {
-  describe('production', () => {
-    beforeAll(async () => {
-      const result = await nextBuild(appDir, undefined, {
-        cwd: appDir,
-        stderr: true,
-        stdout: true,
-      })
-
-      if (result.code !== 0) {
-        console.error(result)
-        throw new Error(`Failed to build, exited with code ${result.code}`)
-      }
-      appPort = await findPort()
-      app = await nextStart(appDir, appPort, { cwd: appDir })
-    })
-    afterAll(() => killApp(app))
 
+  if ((global as any).isNextStart) {
     it('should output traces', async () => {
       const checks = [
         {
@@ -101,9 +96,8 @@ describe('Prerender native module', () => {
       ]
 
       for (const check of checks) {
-        const contents = await fs.readFile(
-          join(appDir, '.next/server/pages/', check.page + '.js.nft.json'),
-          'utf8'
+        const contents = await next.readFile(
+          path.join('.next/server/pages/', check.page + '.js.nft.json')
         )
         const { version, files } = JSON.parse(contents)
         expect(version).toBe(1)
@@ -112,24 +106,12 @@ describe('Prerender native module', () => {
           check.tests.every((item) => files.some((file) => item.test(file)))
         ).toBe(true)
 
-        if (sep === '/') {
+        if (path.sep === '/') {
           expect(
             check.notTests.some((item) => files.some((file) => item.test(file)))
           ).toBe(false)
         }
       }
     })
-
-    runTests()
-  })
-
-  describe('dev', () => {
-    beforeAll(async () => {
-      appPort = await findPort()
-      app = await launchApp(appDir, appPort, { cwd: appDir })
-    })
-    afterAll(() => killApp(app))
-
-    runTests()
-  })
+  }
 })