fix(deps): update dependency tailwind-merge to v3 (main) (#16518)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Paul Rogers <paul.rogers@grafana.com>
Co-authored-by: Paul Rogers <129207811+paul1r@users.noreply.github.com>

clients/pkg/promtail/targets/docker/target_test.go

@@ -9,7 +9,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/client"
 	"github.com/go-kit/log"
@@ -46,11 +45,11 @@ func handlerForPath(t *testing.T, paths []urlContainToPath, tty bool) http.Handl
 			require.NoError(t, err)
 		default:
 			w.Header().Set("Content-Type", "application/json")
-			info := types.ContainerJSON{
-				ContainerJSONBase: &types.ContainerJSONBase{},
-				Mounts:            []types.MountPoint{},
+			info := container.InspectResponse{
+				ContainerJSONBase: &container.ContainerJSONBase{},
+				Mounts:            []container.MountPoint{},
 				Config:            &container.Config{Tty: tty},
-				NetworkSettings:   &types.NetworkSettings{},
+				NetworkSettings:   &container.NetworkSettings{},
 			}
 			err := json.NewEncoder(w).Encode(info)
 			require.NoError(t, err)

clients/pkg/promtail/targets/docker/targetmanager_test.go

@@ -10,7 +10,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/network"
 	"github.com/go-kit/log"
@@ -33,10 +32,10 @@ func Test_TargetManager(t *testing.T) {
 		case strings.HasSuffix(path, "/containers/json"):
 			// Serve container list
 			w.Header().Set("Content-Type", "application/json")
-			containerResponse := []types.Container{{
+			containerResponse := []container.Summary{{
 				ID:    "1234",
 				Names: []string{"flog"},
-				NetworkSettings: &types.SummaryNetworkSettings{
+				NetworkSettings: &container.NetworkSettingsSummary{
 					Networks: map[string]*network.EndpointSettings{
 						"foo": {
 							NetworkID: "my_network",
@@ -54,11 +53,11 @@ func Test_TargetManager(t *testing.T) {
 			require.NoError(t, err)
 		case strings.HasSuffix(path, "json"):
 			w.Header().Set("Content-Type", "application/json")
-			info := types.ContainerJSON{
-				ContainerJSONBase: &types.ContainerJSONBase{},
-				Mounts:            []types.MountPoint{},
+			info := container.InspectResponse{
+				ContainerJSONBase: &container.ContainerJSONBase{},
+				Mounts:            []container.MountPoint{},
 				Config:            &container.Config{Tty: false},
-				NetworkSettings:   &types.NetworkSettings{},
+				NetworkSettings:   &container.NetworkSettings{},
 			}
 			err := json.NewEncoder(w).Encode(info)
 			require.NoError(t, err)

pkg/ui/frontend/package-lock.json

@@ -47,7 +47,7 @@
         "react-icons": "^5.4.0",
         "react-router-dom": "^7.0.0",
         "recharts": "^2.15.1",
-        "tailwind-merge": "^2.6.0",
+        "tailwind-merge": "^3.0.0",
         "tailwindcss-animate": "^1.0.7",
         "use-react-router-breadcrumbs": "^4.0.1",
         "zod": "^3.24.1"
@@ -6284,9 +6284,9 @@
       "license": "MIT"
     },
     "node_modules/tailwind-merge": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.0.tgz",
-      "integrity": "sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.0.2.tgz",
+      "integrity": "sha512-l7z+OYZ7mu3DTqrL88RiKrKIqO3NcpEO8V/Od04bNpvk0kiIFndGEoqfuzvj4yuhRkHKjRkII2z+KS2HfPcSxw==",
       "license": "MIT",
       "funding": {
         "type": "github",

pkg/ui/frontend/package.json

@@ -49,7 +49,7 @@
     "react-icons": "^5.4.0",
     "react-router-dom": "^7.0.0",
     "recharts": "^2.15.1",
-    "tailwind-merge": "^2.6.0",
+    "tailwind-merge": "^3.0.0",
     "tailwindcss-animate": "^1.0.7",
     "use-react-router-breadcrumbs": "^4.0.1",
     "zod": "^3.24.1"