From acdc7bd8929844aa0e5d816a140f09bc30b8cf78 Mon Sep 17 00:00:00 2001
From: Jonathan Swoboda <154711427+swoboda1337@users.noreply.github.com>
Date: Tue, 20 Jan 2026 22:51:54 -0500
Subject: [PATCH] [json] Use ESP-IDF component registry for ArduinoJson on
 ESP32 (#13280)

Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
---
 .clang-tidy.hash                    | 2 +-
 esphome/components/json/__init__.py | 9 +++++++--
 esphome/idf_component.yml           | 2 ++
 platformio.ini                      | 5 ++++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.clang-tidy.hash b/.clang-tidy.hash
index 9661c2ca02..b448915e27 100644
--- a/.clang-tidy.hash
+++ b/.clang-tidy.hash
@@ -1 +1 @@
-d272a88e8ca28ae9340a9a03295a566432a52cb696501908f57764475bf7ca65
+d15ae81646ac0ee76b2586716fe697f187281523ee6db566aed26542a9f98d1a
diff --git a/esphome/components/json/__init__.py b/esphome/components/json/__init__.py
index 4cd737c60d..28fdcd41ef 100644
--- a/esphome/components/json/__init__.py
+++ b/esphome/components/json/__init__.py
@@ -1,6 +1,6 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome.core import CoroPriority, coroutine_with_priority
+from esphome.core import CORE, CoroPriority, coroutine_with_priority
 
 CODEOWNERS = ["@esphome/core"]
 json_ns = cg.esphome_ns.namespace("json")
@@ -12,6 +12,11 @@ CONFIG_SCHEMA = cv.All(
 
 @coroutine_with_priority(CoroPriority.BUS)
 async def to_code(config):
-    cg.add_library("bblanchon/ArduinoJson", "7.4.2")
+    if CORE.is_esp32:
+        from esphome.components.esp32 import add_idf_component
+
+        add_idf_component(name="bblanchon/arduinojson", ref="7.4.2")
+    else:
+        cg.add_library("bblanchon/ArduinoJson", "7.4.2")
     cg.add_define("USE_JSON")
     cg.add_global(json_ns.using)
diff --git a/esphome/idf_component.yml b/esphome/idf_component.yml
index 5903e68e8e..e19c1a1c87 100644
--- a/esphome/idf_component.yml
+++ b/esphome/idf_component.yml
@@ -1,4 +1,6 @@
 dependencies:
+  bblanchon/arduinojson:
+    version: "7.4.2"
   espressif/esp-tflite-micro:
     version: 1.3.3~1
   espressif/esp32-camera:
diff --git a/platformio.ini b/platformio.ini
index 4180971b54..a54aa0964c 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -34,7 +34,6 @@ build_flags =
 [common]
 ; Base dependencies for all environments
 lib_deps_base =
-    bblanchon/ArduinoJson@7.4.2            ; json
     wjtje/qr-code-generator-library@1.7.0  ; qr_code
     functionpointer/arduino-MLX90393@1.0.2 ; mlx90393
     pavlodn/HaierProtocol@0.9.31           ; haier
@@ -111,6 +110,7 @@ platform_packages =
 framework = arduino
 lib_deps =
     ${common:arduino.lib_deps}
+    bblanchon/ArduinoJson@7.4.2           ; json
     ESP8266WiFi                           ; wifi (Arduino built-in)
     Update                                ; ota (Arduino built-in)
     ESP32Async/ESPAsyncTCP@2.0.0          ; async_tcp
@@ -201,6 +201,7 @@ platform_packages =
 framework = arduino
 lib_deps =
     ${common:arduino.lib_deps}
+    bblanchon/ArduinoJson@7.4.2           ; json
     ESP32Async/ESPAsyncWebServer@3.7.8    ; web_server_base
 build_flags =
     ${common:arduino.build_flags}
@@ -216,6 +217,7 @@ platform = libretiny@1.9.2
 framework = arduino
 lib_compat_mode = soft
 lib_deps =
+    bblanchon/ArduinoJson@7.4.2           ; json
     ESP32Async/ESPAsyncWebServer@3.7.8    ; web_server_base
     droscy/esp_wireguard@0.4.2            ; wireguard
 build_flags =
@@ -239,6 +241,7 @@ build_flags =
     -DUSE_NRF52
 lib_deps =
     ${common.lib_deps_base}
+    bblanchon/ArduinoJson@7.4.2           ; json
 
 ; All the actual environments are defined below.