Merge branch 'main' into trek/zero-2801-verify-and-correct-tracking-of-confirm-and-yes

kodiakhq[bot] · web-flow · commit 8903e6775be6 · 2024-10-29T19:07:43.000Z
diff --git a/packages/next/package.json b/packages/next/package.json
@@ -11,7 +11,8 @@
     "test-next-local": "pnpm test test/integration/*.test.js test/integration/*.test.ts",
     "test-next-local-legacy": "pnpm test test/integration/legacy/*.test.js",
     "test-next-local:middleware": "pnpm test test/integration/middleware.test.ts",
-    "test-e2e": "rm -f test/builder-info.json; pnpm test test/fixtures/**/*.test.js",
+    "test-e2e--skipped": "rm -f test/builder-info.json; pnpm test test/fixtures/**/*.test.js",
+    "test-e2e": "echo skipped",
     "type-check": "tsc --noEmit"
   },
   "repository": {
diff --git a/packages/next/test/fixtures/00-server-build/index.test.js b/packages/next/test/fixtures/00-server-build/index.test.js
@@ -37,18 +37,18 @@ describe(`${__dirname.split(path.sep).pop()}`, () => {
         { urlPath: '/fallback-blocking/first', query: '?another=value' },
       ],
     },
-    {
-      title: 'should update content for non-prerendered path correctly',
-      pathsToCheck: [
-        { urlPath: '/fallback-blocking/on-demand-2' },
-        {
-          urlPath: '/fallback-blocking/on-demand-2',
-          query: '?slug=on-demand-2',
-        },
-        { urlPath: '/fallback-blocking/on-demand-2', query: '?slug=random' },
-        { urlPath: '/fallback-blocking/on-demand-2', query: '?another=value' },
-      ],
-    },
+    // {
+    //   title: 'should update content for non-prerendered path correctly',
+    //   pathsToCheck: [
+    //     { urlPath: '/fallback-blocking/on-demand-2' },
+    //     {
+    //       urlPath: '/fallback-blocking/on-demand-2',
+    //       query: '?slug=on-demand-2',
+    //     },
+    //     { urlPath: '/fallback-blocking/on-demand-2', query: '?slug=random' },
+    //     { urlPath: '/fallback-blocking/on-demand-2', query: '?another=value' },
+    //   ],
+    // },
   ])('$title', async ({ pathsToCheck }) => {
     let initialRandom;
     let initialRandomData;
