Skip to content

The Open Standard for Generative UI

Resolve conflicts

i-subham2535eda47caa
diff --cc frontend-sdk/packages/react-ui/package.json
index 3866aadda,28a607bf6..f02b7b64b
--- a/frontend-sdk/packages/react-ui/package.json
+++ b/frontend-sdk/packages/react-ui/package.json
@@@ -50,6 -50,6 +51,7 @@@
"@radix-ui/react-select": "^2.1.5",
"@radix-ui/react-slider": "^1.2.2",
"@radix-ui/react-switch": "^1.1.2",
++ "@radix-ui/react-switch": "^1.1.2",
"@radix-ui/react-tabs": "^1.1.2",
"@storybook/addon-styling-webpack": "^1.0.1",
"clsx": "^2.1.1",
diff --cc frontend-sdk/pnpm-lock.yaml
index 17e05f49e,f25e59f74..c63faf1de
--- a/frontend-sdk/pnpm-lock.yaml
+++ b/frontend-sdk/pnpm-lock.yaml
@@@ -193,9 -184,9 +193,12 @@@ importers
'@storybook/test':
specifier: ^8.5.2
+ '@storybook/theming':
+ specifier: ^8.5.2
+ '@types/lodash-es':
+ specifier: ^4.17.12
+ version: 4.17.12
'@types/react':
specifier: ^19.0.8
version: 19.0.8
@@@ -4585,8 -4400,8 +4550,10 @@@ snapshots
find-up: 5.0.0
magic-string: 0.30.17
react: 18.3.1
++ react: 18.3.1
react-docgen: 7.1.0
react-dom: 18.3.1([email protected])
++ react-dom: 18.3.1([email protected])
resolve: 1.22.10
storybook: 8.5.2([email protected])
tsconfig-paths: 4.2.0