Merge branch 'main' into sync-e9a7cb1b

Author: orama254

public/images/blog/react-labs-april-2025/flip.gif

@@ -27,6 +27,7 @@ function PageHeading({
   tags = [],
   breadcrumbs,
 }: PageHeadingProps) {
+  console.log('version', version);
   return (
     <div className="px-5 sm:px-12 pt-3.5">
       <div className="max-w-4xl ms-0 2xl:mx-auto">

src/components/PageHeading.tsx

@@ -1415,4 +1415,4 @@ When an `<Activity>` is "hidden", all its children's Effects are cleaned up. Con
 
 If you're relying on an Effect mounting to clean up a component's side effects, refactor the Effect to do the work in the returned cleanup function instead.
 
-To eagerly find problematic Effects, we recommend adding [`<StrictMode>`](/reference/react/StrictMode) which will eagerly perform Activity unmounts and mounts to catch any unexpected side-effects. 
+To eagerly find problematic Effects, we recommend adding [`<StrictMode>`](/reference/react/StrictMode) which will eagerly perform Activity unmounts and mounts to catch any unexpected side-effects. 

src/content/reference/react/Activity.md

@@ -170,27 +170,6 @@
       ]
     },
     {
-<<<<<<< HEAD
-      "title": "Directives",
-      "path": "/reference/react/directives",
-      "canary": true,
-      "routes": [
-        {
-          "title": "'use client'",
-          "path": "/reference/react/use-client",
-          "canary": true
-        },
-        {
-          "title": "'use server'",
-          "path": "/reference/react/use-server",
-          "canary": true
-
-        }
-      ]
-    },
-    {
-=======
->>>>>>> 9e1f5cd590fd066e72dda9022237bee30b499951
       "hasSectionHeader": true,
       "sectionHeader": "react-dom@{{version}}"
     },