diff --git a/.circleci/config.yml b/.circleci/config.yml
index cee6efa7ebed..33b0570bf527 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,7 +7,7 @@ version: 2.1
 # Base configurations
 default_image: &default_image
   docker:
-    - image: cimg/node:22.22.0
+    - image: cimg/node:24.13.0
 
 default_resource_class: &default_resource_class
   resource_class: medium
@@ -269,13 +269,13 @@ commands:
   windows_set_node_version:
     parameters:
       version:
-        default: 22.22.0
+        default: 24.13.0
         type: string
     steps:
       - run: choco upgrade nvm -y
       - run: nvm -v
-      - run: nvm install 22.22.0
-      - run: nvm use 22.22.0
+      - run: nvm install 24.13.0
+      - run: nvm use 24.13.0
       - run: node -v
 
   windows_add_bvm_to_path:
@@ -315,7 +315,7 @@ commands:
         default: 'BASE_IMAGE'
         type: string
       docker_build_base_image_arg_value:
-        default: 'node:22.22.0'
+        default: 'node:24.13.0'
         type: string
       image_name:
         default: 'bitcli/bit'
@@ -348,7 +348,7 @@ commands:
         default: 'BASE_IMAGE'
         type: string
       docker_build_base_image_arg_value:
-        default: 'node:22.22.0'
+        default: 'node:24.13.0'
         type: string
       image_name:
         default: 'bitcli/bit'
@@ -1024,27 +1024,27 @@ jobs:
           path: index.json
 
   # ========== Docker Jobs ==========
-  docker_build_node_22:
+  docker_build_node_24:
     machine:
       image: ubuntu-2004:202111-02
     steps:
       - attach_workspace:
           at: ./
       - docker_build_and_push:
-          docker_build_base_image_arg_value: "node:22.22.0"
-          docker_tag_suffix: "-node-22.22.0"
+          docker_build_base_image_arg_value: "node:24.13.0"
+          docker_tag_suffix: "-node-24.13.0"
 
-  docker_non_root_build_node_22:
+  docker_non_root_build_node_24:
     machine:
       image: ubuntu-2004:202111-02
     steps:
       - attach_workspace:
           at: ./
       - docker_build_and_push:
-          docker_build_base_image_arg_value: "node:22.22.0"
+          docker_build_base_image_arg_value: "node:24.13.0"
           image_name: "bitcli/bit-non-root"
           docker_file_name: "Dockerfile-bit-non-root"
-          docker_tag_suffix: "-node-22.22.0"
+          docker_tag_suffix: "-node-24.13.0"
 
   docker_build_alpine:
     machine:
@@ -1053,22 +1053,22 @@ jobs:
       - attach_workspace:
           at: ./
       - docker_build_and_push:
-          docker_build_base_image_arg_value: "node:22.22.0-alpine"
+          docker_build_base_image_arg_value: "node:24.13.0-alpine"
           # image_name: "bitcli/bit-alpine"
           docker_file_name: "Dockerfile-bit-alpine"
-          docker_tag_suffix: "-alpine-node-22.22.0"
+          docker_tag_suffix: "-alpine-node-24.13.0"
 
-  server_docker_build_node_22:
+  server_docker_build_node_24:
     machine:
       image: ubuntu-2004:202111-02
     steps:
       - attach_workspace:
           at: ./
       - docker_build_and_push:
-          docker_build_base_image_arg_value: "`npm show @teambit/bit version`-node-22.22.0"
+          docker_build_base_image_arg_value: "`npm show @teambit/bit version`-node-24.13.0"
           image_name: "bitcli/bit-server"
           docker_file_name: "Dockerfile-bit-server"
-          docker_tag_suffix: "-node-22.22.0"
+          docker_tag_suffix: "-node-24.13.0"
 
   # ========== Windows Jobs ==========
   windows_checkout_code:
@@ -1215,9 +1215,9 @@ jobs:
       # - run: node -v
       # - run: npm -v
       # - run: yarn -v
-      # # - run: choco install nodejs --version 22.22.0
+      # # - run: choco install nodejs --version 24.13.0
       # # - run: node -v
-      # - run: cinst nodejs --version 22.22.0
+      # - run: cinst nodejs --version 24.13.0
       # - run: node -v
 
 # ========================================
@@ -1339,18 +1339,18 @@ workflows:
             - bundle_version_macos
             - bundle_version_windows
             - checkout_code # This is needed to generate index.json
-      - docker_build_node_22:
+      - docker_build_node_24:
           requires:
             - harmony_publish_to_gcloud
       - docker_build_alpine:
           requires:
             - harmony_publish_to_gcloud
-      - docker_non_root_build_node_22:
+      - docker_non_root_build_node_24:
           requires:
             - harmony_publish_to_gcloud
-      - server_docker_build_node_22:
+      - server_docker_build_node_24:
           requires:
-            - docker_build_node_22
+            - docker_build_node_24
       - e2e_test_bbit:
           requires:
             - setup_harmony
@@ -1421,7 +1421,7 @@ workflows:
             - bundle_version_macos
             - bundle_version_windows
             - checkout_code # This is needed to generate index.json
-      - docker_build_node_22:
+      - docker_build_node_24:
           requires:
             - harmony_deploy_approval_job
             - harmony_publish_to_gcloud
@@ -1429,14 +1429,14 @@ workflows:
           requires:
             - harmony_deploy_approval_job
             - harmony_publish_to_gcloud
-      - docker_non_root_build_node_22:
+      - docker_non_root_build_node_24:
           requires:
             - harmony_deploy_approval_job
             - harmony_publish_to_gcloud
-      - server_docker_build_node_22:
+      - server_docker_build_node_24:
           requires:
             - harmony_deploy_approval_job
-            - docker_build_node_22
+            - docker_build_node_24
 
   # Manual deploy workflow: same jobs as harmony_deploy, without the approval gate.
   # Trigger from the CircleCI web app (or API) on master with run_deploy=true.
diff --git a/.prettierignore b/.prettierignore
index 3f6e83a0a1e1..da4bb4bb1e23 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,3 +1,6 @@
 fixtures
 e2e/fixtures
-components/legacy/e2e-helper/excluded-fixtures
\ No newline at end of file
+components/legacy/e2e-helper/excluded-fixtures
+# MDX files with JSX comments that prettier incorrectly escapes
+scopes/react/aspect-docs/react/react.mdx
+scopes/react/ui/loader-fallback/loader-fallback.docs.mdx
\ No newline at end of file
diff --git a/scopes/react/aspect-docs/react/react.mdx b/scopes/react/aspect-docs/react/react.mdx
index e2f3b0f76853..53f77db088d5 100644
--- a/scopes/react/aspect-docs/react/react.mdx
+++ b/scopes/react/aspect-docs/react/react.mdx
@@ -186,44 +186,40 @@ As such, they run in the environment's Preview runtime and not the Main runtime.
 For example, a provider that centers compositions in their rendering page, will look like this:
 
 ```tsx title="A composition provider example"
-import React, { ReactReact, ReactElement } from 'react'
+import React, { ReactReact, ReactElement } from 'react';
 
 const style = {
   display: 'flex',
   justifyContent: 'center',
   alignItems: 'center',
-  height: '100vh'
-}
+  height: '100vh',
+};
 
-export const Center = ({
-  children
-}: {
-  children: ReactReact
-}): ReactElement => {
-  return <div style={style}>{children}</div>
-}
+export const Center = ({ children }: { children: ReactReact }): ReactElement => {
+  return <div style={style}>{children}</div>;
+};
 ```
 
 This `Center` provider component will be registered using the registerProvider method in the React extension's `*.preview.runtime.tsx` file:
 
 ```tsx title="react-with-providers.preview.runtime.tsx"
-import { PreviewRuntime } from '@teambit/preview'
-import { ReactAspect, ReactPreview } from '@teambit/react'
-import { ReactWithProvidersAspect } from './react-with-providers.aspect'
-import { Center } from './composition-providers/center'
+import { PreviewRuntime } from '@teambit/preview';
+import { ReactAspect, ReactPreview } from '@teambit/react';
+import { ReactWithProvidersAspect } from './react-with-providers.aspect';
+import { Center } from './composition-providers/center';
 
 export class ReactWithProvidersPreview {
-  static runtime = PreviewRuntime
-  static dependencies = [ReactAspect]
+  static runtime = PreviewRuntime;
+  static dependencies = [ReactAspect];
 
   static async provider([react]: [ReactPreview]) {
-    react.registerProvider([Center])
+    react.registerProvider([Center]);
 
-    return ReactWithProvidersPreview
+    return ReactWithProvidersPreview;
   }
 }
 
-ReactWithProvidersAspect.addRuntime(ReactWithProvidersPreview)
+ReactWithProvidersAspect.addRuntime(ReactWithProvidersPreview);
 ```
 
 > See the full demo project [here](https://github.com/teambit/react-env-with-providers). */}
diff --git a/scopes/react/ui/loader-fallback/loader-fallback.docs.mdx b/scopes/react/ui/loader-fallback/loader-fallback.docs.mdx
index abc84697c65a..38d3b4030036 100644
--- a/scopes/react/ui/loader-fallback/loader-fallback.docs.mdx
+++ b/scopes/react/ui/loader-fallback/loader-fallback.docs.mdx
@@ -24,7 +24,7 @@ const safeTarget = useFallback(Target && <Target />, <DefaultComponent />, { tim
 {/* live playground doesn't keep state when editing :( */}
 {/* Try it out:
 
-```tsx live
+````tsx live
 function Example() {
   return (
     <LoaderFallback
@@ -43,3 +43,4 @@ function Example() {
   }
 }
 ``` */}
+````
diff --git a/workspace.jsonc b/workspace.jsonc
index f46a16192b90..8994ce1d6957 100644
--- a/workspace.jsonc
+++ b/workspace.jsonc
@@ -715,7 +715,7 @@
       "uri-js": "npm:uri-js-replace",
       "encoding": "-"
     },
-    "nodeVersion": "22.22.0",
+    "nodeVersion": "24.13.0",
     "engineStrict": true,
     // This is a temporary workaround to fix "bit compile" on macOS and Windows.
     // "bit compile" breaks node_modules when hard links are used.
@@ -794,7 +794,7 @@
         "packageJson": {
           "name": "@teambit/{name}", // @teambit/discovery.ui.sidebar
           "bvm": {
-            "node": "22.22.0"
+            "node": "24.13.0"
           },
           "engines": {
             "node": ">=18.12.0"