Merge branch 'canary' into fix-revalidatetag-rsc

abhi12299 · Sep 30, 2024 · 9ca9553 · 9ca9553
2 parents 2f55634 + ee3211e
commit 9ca9553
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/packages/next/src/client/components/router-reducer/aliased-prefetch-navigations.ts b/packages/next/src/client/components/router-reducer/aliased-prefetch-navigations.ts
@@ -223,7 +223,6 @@ export function addSearchParamsToPageSegments(
   // If it's a page segment, modify the segment by adding search params
   if (segment.includes(PAGE_SEGMENT_KEY)) {
     const newSegment = addSearchParamsIfPageSegment(segment, searchParams)
-    console.log({ existingSegment: segment, newSegment })
     return [newSegment, parallelRoutes, ...rest]
   }
 

diff --git a/test/turbopack-build-tests-manifest.json b/test/turbopack-build-tests-manifest.json
@@ -15856,6 +15856,26 @@
       "flakey": [],
       "runtimeError": false
     },
+    "test/production/app-dir/server-action-period-hash/server-action-period-hash.test.ts": {
+      "passed": [],
+      "failed": [
+        "app-dir - server-action-period-hash should have same manifest between continuous two builds",
+        "app-dir - server-action-period-hash should have different manifest between two builds with period hash"
+      ],
+      "pending": [],
+      "flakey": [],
+      "runtimeError": false
+    },
+    "test/production/app-dir/server-action-period-hash/server-action-period-hash-custom-key.test.ts": {
+      "passed": [],
+      "failed": [
+        "app-dir - server-action-period-hash-custom-key should have different manifest if the encryption key from process env is changed",
+        "app-dir - server-action-period-hash-custom-key should have different manifest if the encryption key from process env is same"
+      ],
+      "pending": [],
+      "flakey": [],
+      "runtimeError": false
+    },
     "test/production/app-dir/ssg-single-pass/ssg-single-pass.test.ts": {
       "passed": [
         "ssg-single-pass should only render the page once during an ISR revalidation",