Merge branch '14-2-1' into ijjk/backport-revalidate-tag

vercel · Sep 30, 2024 · b07cc34 · b07cc34
2 parents fec85a2 + f81e681
commit b07cc34
Show file tree

Hide file tree

Showing 4 changed files with 116 additions and 102 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -215,29 +215,30 @@ jobs:
 
     secrets: inherit
 
-  test-new-tests-dev:
-    name: Test new tests for flakes (dev)
-    needs: ['changes', 'build-native', 'build-next']
-    if: ${{ needs.changes.outputs.docs-only == 'false' }}
+  # disabled for backport branch
+  # test-new-tests-dev:
+  #   name: Test new tests for flakes (dev)
+  #   needs: ['changes', 'build-native', 'build-next']
+  #   if: ${{ needs.changes.outputs.docs-only == 'false' }}
 
-    uses: ./.github/workflows/build_reusable.yml
-    with:
-      afterBuild: node scripts/test-new-tests.mjs --dev-mode
-      stepName: 'test-new-tests-dev'
+  #   uses: ./.github/workflows/build_reusable.yml
+  #   with:
+  #     afterBuild: node scripts/test-new-tests.mjs --dev-mode
+  #     stepName: 'test-new-tests-dev'
 
-    secrets: inherit
+  #   secrets: inherit
 
-  test-new-tests-start:
-    name: Test new tests for flakes (prod)
-    needs: ['changes', 'build-native', 'build-next']
-    if: ${{ needs.changes.outputs.docs-only == 'false' }}
+  # test-new-tests-start:
+  #   name: Test new tests for flakes (prod)
+  #   needs: ['changes', 'build-native', 'build-next']
+  #   if: ${{ needs.changes.outputs.docs-only == 'false' }}
 
-    uses: ./.github/workflows/build_reusable.yml
-    with:
-      afterBuild: node scripts/test-new-tests.mjs --prod-mode
-      stepName: 'test-new-tests-start'
+  #   uses: ./.github/workflows/build_reusable.yml
+  #   with:
+  #     afterBuild: node scripts/test-new-tests.mjs --prod-mode
+  #     stepName: 'test-new-tests-start'
 
-    secrets: inherit
+  #   secrets: inherit
 
   test-dev:
     name: test dev
@@ -309,8 +310,7 @@ jobs:
     secrets: inherit
 
   tests-pass:
-    needs:
-      [
+    needs: [
         'build-native',
         'build-next',
         'lint',
@@ -325,8 +325,8 @@ jobs:
         'test-next-swc-wasm',
         'test-turbopack-dev',
         'test-turbopack-integration',
-        'test-new-tests-dev',
-        'test-new-tests-start',
+        # 'test-new-tests-dev',
+        # 'test-new-tests-start',
       ]
 
     if: always()

diff --git a/test/development/basic/hmr.test.ts b/test/development/basic/hmr.test.ts
@@ -877,83 +877,92 @@ describe.each([
       }
     })
 
-    it('should recover after loader parse error in an imported file', async () => {
-      let browser
-      const aboutPage = join('pages', 'hmr', 'about9.js')
+    // assertion is highly flakey in turbopack mode
+    if (!process.env.TURBOPACK) {
+      it('should recover after loader parse error in an imported file', async () => {
+        let browser
+        const aboutPage = join('pages', 'hmr', 'about9.js')
 
-      const aboutContent = await next.readFile(aboutPage)
-      try {
-        browser = await webdriver(next.appPort, basePath + '/hmr/about9')
-        await check(() => getBrowserBodyText(browser), /This is the about page/)
+        const aboutContent = await next.readFile(aboutPage)
+        try {
+          browser = await webdriver(next.appPort, basePath + '/hmr/about9')
+          await check(
+            () => getBrowserBodyText(browser),
+            /This is the about page/
+          )
 
-        await next.patchFile(
-          aboutPage,
-          aboutContent.replace(
-            'export default',
-            'import "../../components/parse-error.js"\nexport default'
+          await next.patchFile(
+            aboutPage,
+            aboutContent.replace(
+              'export default',
+              'import "../../components/parse-error.js"\nexport default'
+            )
           )
-        )
 
-        expect(await hasRedbox(browser)).toBe(true)
-        expect(await getRedboxHeader(browser)).toMatch('Failed to compile')
-        let redboxSource = await getRedboxSource(browser)
+          expect(await hasRedbox(browser)).toBe(true)
+          expect(await getRedboxHeader(browser)).toMatch('Failed to compile')
+          let redboxSource = await getRedboxSource(browser)
+
+          redboxSource = redboxSource.replace(`${next.testDir}`, '.')
+          if (process.env.TURBOPACK) {
+            expect(next.normalizeTestDirContent(redboxSource))
+              .toMatchInlineSnapshot(`
+                "./components/parse-error.js:3:1
+                Parsing ecmascript source code failed
+                  1 | This
+                  2 | is
+                > 3 | }}}
+                    | ^
+                  4 | invalid
+                  5 | js
+
+                Expression expected"
+              `)
+          } else {
+            redboxSource = redboxSource.substring(
+              0,
+              redboxSource.indexOf('`----')
+            )
 
-        redboxSource = redboxSource.replace(`${next.testDir}`, '.')
-        if (process.env.TURBOPACK) {
-          expect(next.normalizeTestDirContent(redboxSource))
-            .toMatchInlineSnapshot(`
-              "./components/parse-error.js:3:1
-              Parsing ecmascript source code failed
+            expect(next.normalizeTestDirContent(redboxSource))
+              .toMatchInlineSnapshot(`
+                "./components/parse-error.js
+                Error: 
+                  x Expression expected
+                  ,-[./components/parse-error.js:1:1]
                 1 | This
                 2 | is
-              > 3 | }}}
-                  | ^
+                3 | }}}
+                  : ^
                 4 | invalid
                 5 | js
+                  "
+              `)
+          }
 
-              Expression expected"
-            `)
-        } else {
-          redboxSource = redboxSource.substring(
-            0,
-            redboxSource.indexOf('`----')
-          )
-
-          expect(next.normalizeTestDirContent(redboxSource))
-            .toMatchInlineSnapshot(`
-              "./components/parse-error.js
-              Error: 
-                x Expression expected
-                 ,-[./components/parse-error.js:1:1]
-               1 | This
-               2 | is
-               3 | }}}
-                 : ^
-               4 | invalid
-               5 | js
-                 "
-            `)
-        }
-
-        await next.patchFile(aboutPage, aboutContent)
-
-        await check(() => getBrowserBodyText(browser), /This is the about page/)
-        expect(await hasRedbox(browser)).toBe(false)
-      } catch (err) {
-        await next.patchFile(aboutPage, aboutContent)
+          await next.patchFile(aboutPage, aboutContent)
 
-        if (browser) {
           await check(
             () => getBrowserBodyText(browser),
             /This is the about page/
           )
+          expect(await hasRedbox(browser)).toBe(false)
+        } catch (err) {
+          await next.patchFile(aboutPage, aboutContent)
+
+          if (browser) {
+            await check(
+              () => getBrowserBodyText(browser),
+              /This is the about page/
+            )
+          }
+        } finally {
+          if (browser) {
+            await browser.close()
+          }
         }
-      } finally {
-        if (browser) {
-          await browser.close()
-        }
-      }
-    })
+      })
+    }
 
     it('should recover from errors in getInitialProps in client', async () => {
       let browser

diff --git a/test/development/basic/node-builtins/app/server-component/page.js b/test/development/basic/node-builtins/app/server-component/page.js
@@ -19,7 +19,6 @@ import tty from 'tty'
 import util from 'util'
 import zlib from 'zlib'
 
-import '_http_common'
 import 'setimmediate'
 
 async function getData() {

diff --git a/test/integration/eslint/test/next-lint.test.js b/test/integration/eslint/test/next-lint.test.js
@@ -29,33 +29,39 @@ const mjsCjsLinting = join(__dirname, '../mjs-cjs-linting')
 const dirTypescript = join(__dirname, '../with-typescript')
 
 describe('Next Lint', () => {
-  describe('First Time Setup ', () => {
+  const folders = []
+  afterAll(async () => {
+    for (const folder of folders) {
+      await fs.remove(folder)
+    }
+  })
+
+  // these are flaking on 14-2-1
+  describe.skip('First Time Setup ', () => {
     async function nextLintTemp(setupCallback, isApp = false) {
       const folder = join(os.tmpdir(), Math.random().toString(36).substring(2))
+      folders.push(folder)
+
       await fs.mkdirp(folder)
       await fs.copy(join(dirNoConfig, isApp ? 'app' : ''), folder)
       await setupCallback?.(folder)
 
-      try {
-        const { stdout, stderr } = await nextLint(folder, ['--strict'], {
-          stderr: true,
-          stdout: true,
-          cwd: folder,
-        })
+      const { stdout, stderr } = await nextLint(folder, ['--strict'], {
+        stderr: true,
+        stdout: true,
+        cwd: folder,
+      })
 
-        console.log({ stdout, stderr })
+      console.log({ stdout, stderr })
 
-        const pkgJson = JSON.parse(
-          await fs.readFile(join(folder, 'package.json'), 'utf8')
-        )
-        const eslintrcJson = JSON.parse(
-          await fs.readFile(join(folder, '.eslintrc.json'), 'utf8')
-        )
+      const pkgJson = JSON.parse(
+        await fs.readFile(join(folder, 'package.json'), 'utf8')
+      )
+      const eslintrcJson = JSON.parse(
+        await fs.readFile(join(folder, '.eslintrc.json'), 'utf8')
+      )
 
-        return { stdout, pkgJson, eslintrcJson }
-      } finally {
-        await fs.remove(folder)
-      }
+      return { stdout, pkgJson, eslintrcJson }
     }
 
     test('show a prompt to set up ESLint if no configuration detected', async () => {