From 5655da355d4063f13534e4c44b8eb88f0ec1ccb3 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Thu, 20 Jun 2024 13:38:58 +0200 Subject: [PATCH 1/2] dedupe emotion --- packages/toolpad-studio/src/server/toolpadAppBuilder.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/toolpad-studio/src/server/toolpadAppBuilder.ts b/packages/toolpad-studio/src/server/toolpadAppBuilder.ts index 427e7310793..1e103145d39 100644 --- a/packages/toolpad-studio/src/server/toolpadAppBuilder.ts +++ b/packages/toolpad-studio/src/server/toolpadAppBuilder.ts @@ -241,7 +241,7 @@ if (import.meta.hot) { }, envFile: false, resolve: { - dedupe: ['@mui/material'], + dedupe: ['@mui/material', '@emotion/react', '@emotion/styled'], alias: [ { // FIXME(https://github.com/mui/material-ui/issues/35233) From bff29fb794b1d51d1f0ea76fec4f8cf2f012f247 Mon Sep 17 00:00:00 2001 From: MUI bot <2109932+Janpot@users.noreply.github.com> Date: Thu, 20 Jun 2024 14:04:14 +0200 Subject: [PATCH 2/2] Update toolpadAppBuilder.ts --- packages/toolpad-studio/src/server/toolpadAppBuilder.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/toolpad-studio/src/server/toolpadAppBuilder.ts b/packages/toolpad-studio/src/server/toolpadAppBuilder.ts index 1e103145d39..f15b32e4dd9 100644 --- a/packages/toolpad-studio/src/server/toolpadAppBuilder.ts +++ b/packages/toolpad-studio/src/server/toolpadAppBuilder.ts @@ -241,7 +241,7 @@ if (import.meta.hot) { }, envFile: false, resolve: { - dedupe: ['@mui/material', '@emotion/react', '@emotion/styled'], + dedupe: ['@mui/material', '@emotion/react', '@emotion/styled', '@tanstack/react-query'], alias: [ { // FIXME(https://github.com/mui/material-ui/issues/35233)