From d603ea7349f4ed6c6b6214cd34f858f02720a3df Mon Sep 17 00:00:00 2001
From: Jiachi Liu <inbox@huozhi.im>
Date: Sun, 2 Apr 2023 00:48:38 +0200
Subject: [PATCH 1/4] Update flaky test

---
 test/e2e/app-dir/app-css/index.test.ts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/test/e2e/app-dir/app-css/index.test.ts b/test/e2e/app-dir/app-css/index.test.ts
index abb441bfdcf8..fd0a8d03e0b7 100644
--- a/test/e2e/app-dir/app-css/index.test.ts
+++ b/test/e2e/app-dir/app-css/index.test.ts
@@ -7,7 +7,6 @@ createNextDescribe(
     files: __dirname,
     skipDeployment: true,
     dependencies: {
-      swr: '2.0.0-rc.0',
       '@picocss/pico': '1.5.7',
       react: 'latest',
       'react-dom': 'latest',
@@ -506,18 +505,18 @@ createNextDescribe(
           const browser = await next.browser('/suspensey-css')
           await browser.elementByCss('#slow').click()
           await check(() => browser.eval(`document.body.innerText`), 'Get back')
-          expect(await browser.eval(`window.__log`)).toEqual(
-            'background = rgb(255, 255, 0)'
-          )
+          await check(async () => {
+            return await browser.eval(`window.__log`)
+          }, /background = rgb\(255, 255, 0\)/)
         })
 
         it('should timeout if the resource takes too long', async () => {
           const browser = await next.browser('/suspensey-css')
           await browser.elementByCss('#timeout').click()
           await check(() => browser.eval(`document.body.innerText`), 'Get back')
-          expect(await browser.eval(`window.__log`)).toEqual(
-            'background = rgba(0, 0, 0, 0)'
-          )
+          await check(async () => {
+            return await browser.eval(`window.__log`)
+          }, /background = rgb\(0, 0, 0\)/)
         })
       })
     }

From c589f1482b4f9fee95ff466411b9d01572055644 Mon Sep 17 00:00:00 2001
From: Jiachi Liu <inbox@huozhi.im>
Date: Sun, 2 Apr 2023 00:48:51 +0200
Subject: [PATCH 2/4] Remove unused test deps and update to latest

---
 test/e2e/app-dir/app-basepath/index.test.ts        | 1 -
 test/e2e/app-dir/app-external/app-external.test.ts | 2 +-
 test/e2e/app-dir/app/index.test.ts                 | 2 +-
 test/e2e/app-dir/app/standalone.test.ts            | 1 -
 test/e2e/app-dir/app/useReportWebVitals.test.ts    | 2 +-
 test/e2e/app-dir/app/vercel-analytics.test.ts      | 2 +-
 test/e2e/app-dir/hooks/hooks.test.ts               | 6 ------
 test/e2e/app-dir/navigation/navigation.test.ts     | 6 ------
 8 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/test/e2e/app-dir/app-basepath/index.test.ts b/test/e2e/app-dir/app-basepath/index.test.ts
index 1cd3880f748d..ae6893aa9384 100644
--- a/test/e2e/app-dir/app-basepath/index.test.ts
+++ b/test/e2e/app-dir/app-basepath/index.test.ts
@@ -6,7 +6,6 @@ createNextDescribe(
     files: __dirname,
     skipDeployment: true,
     dependencies: {
-      swr: '2.0.0-rc.0',
       react: 'latest',
       'react-dom': 'latest',
       sass: 'latest',
diff --git a/test/e2e/app-dir/app-external/app-external.test.ts b/test/e2e/app-dir/app-external/app-external.test.ts
index 63f8816672f1..06205b2e6aed 100644
--- a/test/e2e/app-dir/app-external/app-external.test.ts
+++ b/test/e2e/app-dir/app-external/app-external.test.ts
@@ -21,7 +21,7 @@ createNextDescribe(
     dependencies: {
       react: 'latest',
       'react-dom': 'latest',
-      swr: '2.0.0-rc.0',
+      swr: 'latest',
     },
     packageJson: {
       scripts: {
diff --git a/test/e2e/app-dir/app/index.test.ts b/test/e2e/app-dir/app/index.test.ts
index 58d853e26269..c7295c682d5e 100644
--- a/test/e2e/app-dir/app/index.test.ts
+++ b/test/e2e/app-dir/app/index.test.ts
@@ -9,7 +9,7 @@ createNextDescribe(
   {
     files: __dirname,
     dependencies: {
-      swr: '2.0.0-rc.0',
+      swr: 'latest',
       react: 'latest',
       'react-dom': 'latest',
       sass: 'latest',
diff --git a/test/e2e/app-dir/app/standalone.test.ts b/test/e2e/app-dir/app/standalone.test.ts
index 5f2052a43552..df7d1222f5c4 100644
--- a/test/e2e/app-dir/app/standalone.test.ts
+++ b/test/e2e/app-dir/app/standalone.test.ts
@@ -17,7 +17,6 @@ if (!(globalThis as any).isNextStart) {
     {
       files: __dirname,
       dependencies: {
-        swr: '2.0.0-rc.0',
         react: 'latest',
         'react-dom': 'latest',
         sass: 'latest',
diff --git a/test/e2e/app-dir/app/useReportWebVitals.test.ts b/test/e2e/app-dir/app/useReportWebVitals.test.ts
index 833daf35e81c..4922584c39bd 100644
--- a/test/e2e/app-dir/app/useReportWebVitals.test.ts
+++ b/test/e2e/app-dir/app/useReportWebVitals.test.ts
@@ -9,7 +9,7 @@ describe('useReportWebVitals hook', () => {
     next = await createNext({
       files: __dirname,
       dependencies: {
-        swr: '2.0.0-rc.0',
+        swr: 'latest',
         react: 'latest',
         'react-dom': 'latest',
         sass: 'latest',
diff --git a/test/e2e/app-dir/app/vercel-analytics.test.ts b/test/e2e/app-dir/app/vercel-analytics.test.ts
index a92d077e1696..b3dff9d0ca69 100644
--- a/test/e2e/app-dir/app/vercel-analytics.test.ts
+++ b/test/e2e/app-dir/app/vercel-analytics.test.ts
@@ -17,7 +17,7 @@ describe('vercel analytics', () => {
       next = await createNext({
         files: __dirname,
         dependencies: {
-          swr: '2.0.0-rc.0',
+          swr: 'latest',
           react: 'latest',
           'react-dom': 'latest',
           sass: 'latest',
diff --git a/test/e2e/app-dir/hooks/hooks.test.ts b/test/e2e/app-dir/hooks/hooks.test.ts
index 9dc801788fda..6ba8a70dc324 100644
--- a/test/e2e/app-dir/hooks/hooks.test.ts
+++ b/test/e2e/app-dir/hooks/hooks.test.ts
@@ -4,12 +4,6 @@ createNextDescribe(
   'app dir - hooks',
   {
     files: __dirname,
-    dependencies: {
-      swr: 'latest',
-      react: 'latest',
-      'react-dom': 'latest',
-      sass: 'latest',
-    },
   },
   ({ next, isNextDeploy }) => {
     describe('from pages', () => {
diff --git a/test/e2e/app-dir/navigation/navigation.test.ts b/test/e2e/app-dir/navigation/navigation.test.ts
index 4d2ad57f4e75..ecab325bdf04 100644
--- a/test/e2e/app-dir/navigation/navigation.test.ts
+++ b/test/e2e/app-dir/navigation/navigation.test.ts
@@ -6,12 +6,6 @@ createNextDescribe(
   'app dir - navigation',
   {
     files: __dirname,
-    dependencies: {
-      swr: 'latest',
-      react: 'latest',
-      'react-dom': 'latest',
-      sass: 'latest',
-    },
   },
   ({ next, isNextDeploy }) => {
     describe('query string', () => {

From 017340fa1794f7f7e30871b11a7b5056c90a997f Mon Sep 17 00:00:00 2001
From: Jiachi Liu <inbox@huozhi.im>
Date: Sun, 2 Apr 2023 01:15:40 +0200
Subject: [PATCH 3/4] remove duplicated test

---
 test/e2e/app-dir/app/index.test.ts              | 9 ---------
 test/e2e/app-dir/app/pages/index.js             | 3 ---
 test/e2e/app-dir/app/standalone.test.ts         | 5 -----
 test/e2e/app-dir/app/useReportWebVitals.test.ts | 6 ------
 test/e2e/app-dir/app/vercel-analytics.test.ts   | 6 ------
 5 files changed, 29 deletions(-)

diff --git a/test/e2e/app-dir/app/index.test.ts b/test/e2e/app-dir/app/index.test.ts
index c7295c682d5e..a6e6e7debb39 100644
--- a/test/e2e/app-dir/app/index.test.ts
+++ b/test/e2e/app-dir/app/index.test.ts
@@ -8,12 +8,6 @@ createNextDescribe(
   'app dir',
   {
     files: __dirname,
-    dependencies: {
-      swr: 'latest',
-      react: 'latest',
-      'react-dom': 'latest',
-      sass: 'latest',
-    },
   },
   ({ next, isNextDev: isDev, isNextStart, isNextDeploy }) => {
     if (!isDev) {
@@ -215,9 +209,6 @@ createNextDescribe(
     it('should serve from pages', async () => {
       const html = await next.render('/')
       expect(html).toContain('hello from pages/index')
-
-      // esm imports should work fine in pages/
-      expect(html).toContain('swr-index')
     })
 
     it('should serve dynamic route from pages', async () => {
diff --git a/test/e2e/app-dir/app/pages/index.js b/test/e2e/app-dir/app/pages/index.js
index ac03305fde3c..5ee253ffe17b 100644
--- a/test/e2e/app-dir/app/pages/index.js
+++ b/test/e2e/app-dir/app/pages/index.js
@@ -1,15 +1,12 @@
 import React from 'react'
 import Link from 'next/link'
-import useSWR from 'swr'
 import styles from '../styles/shared.module.css'
 
 export default function Page() {
-  const { data } = useSWR('swr-index', (v) => v, { fallbackData: 'swr-index' })
   return (
     <>
       <p className={styles.content}>hello from pages/index</p>
       <Link href="/dashboard">Dashboard</Link>
-      <div>{data}</div>
     </>
   )
 }
diff --git a/test/e2e/app-dir/app/standalone.test.ts b/test/e2e/app-dir/app/standalone.test.ts
index df7d1222f5c4..8cbeee62b6e5 100644
--- a/test/e2e/app-dir/app/standalone.test.ts
+++ b/test/e2e/app-dir/app/standalone.test.ts
@@ -16,11 +16,6 @@ if (!(globalThis as any).isNextStart) {
     'output: standalone with app dir',
     {
       files: __dirname,
-      dependencies: {
-        react: 'latest',
-        'react-dom': 'latest',
-        sass: 'latest',
-      },
       skipStart: true,
     },
     ({ next }) => {
diff --git a/test/e2e/app-dir/app/useReportWebVitals.test.ts b/test/e2e/app-dir/app/useReportWebVitals.test.ts
index 4922584c39bd..2b947bef32ce 100644
--- a/test/e2e/app-dir/app/useReportWebVitals.test.ts
+++ b/test/e2e/app-dir/app/useReportWebVitals.test.ts
@@ -8,12 +8,6 @@ describe('useReportWebVitals hook', () => {
   beforeAll(async () => {
     next = await createNext({
       files: __dirname,
-      dependencies: {
-        swr: 'latest',
-        react: 'latest',
-        'react-dom': 'latest',
-        sass: 'latest',
-      },
       skipStart: true,
       env: {},
     })
diff --git a/test/e2e/app-dir/app/vercel-analytics.test.ts b/test/e2e/app-dir/app/vercel-analytics.test.ts
index b3dff9d0ca69..9a2d6004ca20 100644
--- a/test/e2e/app-dir/app/vercel-analytics.test.ts
+++ b/test/e2e/app-dir/app/vercel-analytics.test.ts
@@ -16,12 +16,6 @@ describe('vercel analytics', () => {
     beforeAll(async () => {
       next = await createNext({
         files: __dirname,
-        dependencies: {
-          swr: 'latest',
-          react: 'latest',
-          'react-dom': 'latest',
-          sass: 'latest',
-        },
         skipStart: true,
         env: {
           VERCEL_ANALYTICS_ID: 'fake-analytics-id',

From cb035be10da3ab4f85b3998c73c2cf1d80900fb3 Mon Sep 17 00:00:00 2001
From: Jiachi Liu <inbox@huozhi.im>
Date: Sun, 2 Apr 2023 01:26:53 +0200
Subject: [PATCH 4/4] revert timeout case

---
 test/e2e/app-dir/app-css/index.test.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/e2e/app-dir/app-css/index.test.ts b/test/e2e/app-dir/app-css/index.test.ts
index fd0a8d03e0b7..5ef9ea95af18 100644
--- a/test/e2e/app-dir/app-css/index.test.ts
+++ b/test/e2e/app-dir/app-css/index.test.ts
@@ -514,9 +514,9 @@ createNextDescribe(
           const browser = await next.browser('/suspensey-css')
           await browser.elementByCss('#timeout').click()
           await check(() => browser.eval(`document.body.innerText`), 'Get back')
-          await check(async () => {
-            return await browser.eval(`window.__log`)
-          }, /background = rgb\(0, 0, 0\)/)
+          expect(await browser.eval(`window.__log`)).toEqual(
+            'background = rgba(0, 0, 0, 0)'
+          )
         })
       })
     }