Merge pull request #3233 from gluestack/feat/web-changes

Feat/web changes

Author: Sanchitv3

apps/kitchen-sink/package.json

@@ -17,7 +17,7 @@
     "@expo/html-elements": "^0.10.1",
     "@expo/vector-icons": "^15.0.2",
     "@gluestack-ui/core": "^3.0.10",
-    "@gluestack-ui/utils": "^3.0.7",
+    "@gluestack-ui/utils": "^3.0.11",
     "@legendapp/motion": "^2.4.0",
     "@react-navigation/bottom-tabs": "^7.3.10",
     "@react-navigation/elements": "^2.3.8",

apps/kitchen-sink/yarn.lock

@@ -1268,15 +1268,15 @@
   resolved "https://registry.npmjs.org/@gluestack-ui/core/-/core-3.0.10.tgz#96ba8e5a80a27a921123b25baeb7063a8bc4d665"
   integrity sha512-Ctw4CYCsfT2YUNz0n5hDoTfv7G72SRxirqwFv+VmhCwDrtVab/fV7qbqLMnBEEr19o1iP1bE0ztJ3IQHEqXw4g==
 
-"@gluestack-ui/utils@^3.0.7":
-  version "3.0.7"
-  resolved "https://registry.npmjs.org/@gluestack-ui/utils/-/utils-3.0.7.tgz#c5e01215e984f77b9d0abb1bf79fa17eba2b8a1f"
-  integrity sha512-QyTu9qC1d/0xsSEc9kMb0HAVEvRYp1dsIL3mr26qUATfd1AZ53UtINGTDnhwqgif4n6192bzI8nARY9t7t9VVg==
+"@gluestack-ui/utils@^3.0.11":
+  version "3.0.11"
+  resolved "https://registry.npmjs.org/@gluestack-ui/utils/-/utils-3.0.11.tgz#10bf2cb7658795d09b267ce5ba47daaab08a1fba"
+  integrity sha512-4stxK98v07NFAGvSI4Dxje/xbnftaY45VcZglZUxlAr8FFVLNFcjXUTSnVWqog0DBp2oJ7Nk/AYUpT2KkpI+7A==
   dependencies:
     dom-helpers "^6.0.1"
     react-aria "^3.41.1"
     react-stately "^3.39.0"
-    tailwind-variants "0.1.14"
+    tailwind-variants "0.1.20"
 
 "@humanfs/core@^0.19.1":
   version "0.19.1"
@@ -8371,19 +8371,12 @@ supports-preserve-symlinks-flag@^1.0.0:
   resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
-tailwind-merge@^1.13.2, tailwind-merge@^1.14.0:
+tailwind-merge@^1.14.0:
   version "1.14.0"
   resolved "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-1.14.0.tgz#e677f55d864edc6794562c63f5001f45093cdb8b"
   integrity sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ==
 
-[email protected]:
-  version "0.1.14"
-  resolved "https://registry.npmjs.org/tailwind-variants/-/tailwind-variants-0.1.14.tgz#1c9d59b92f5c902e8157ee14256eb4b90d287963"
-  integrity sha512-qfOkSGP+cSolTTkJboldGmiM+w5uE77pazCRkwixEBsuaml9CmhN0E8qgH7QnZNmOTVSsgRK1tn/MsKOvOKVWA==
-  dependencies:
-    tailwind-merge "^1.13.2"
-
-tailwind-variants@^0.1.20:
+[email protected], tailwind-variants@^0.1.20:
   version "0.1.20"
   resolved "https://registry.npmjs.org/tailwind-variants/-/tailwind-variants-0.1.20.tgz#8aaed9094be0379a438641a42d588943e44c5fcd"
   integrity sha512-AMh7x313t/V+eTySKB0Dal08RHY7ggYK0MSn/ad8wKWOrDUIzyiWNayRUm2PIJ4VRkvRnfNuyRuKbLV3EN+ewQ==

apps/starter-kit-expo/components/ui/button/index.tsx

@@ -8,7 +8,7 @@ import {
 } from '@gluestack-ui/utils/nativewind-utils';
 import { cssInterop } from 'nativewind';
 import { ActivityIndicator, Pressable, Text, View } from 'react-native';
-import type { VariantProps } from 'tailwind-variants';
+import type { VariantProps } from '@gluestack-ui/utils/nativewind-utils';
 import { PrimitiveIcon, UIIcon } from '@gluestack-ui/core/icon/creator';
 
 const SCOPE = 'BUTTON';

apps/starter-kit-expo/package.json

@@ -18,7 +18,7 @@
     "@expo/html-elements": "^0.12.5",
     "@expo/vector-icons": "^15.0.2",
     "@gluestack-ui/core": "^3.0.8",
-    "@gluestack-ui/utils": "^3.0.7",
+    "@gluestack-ui/utils": "^3.0.11",
     "@gorhom/bottom-sheet": "^5.0.0-alpha.11",
     "@legendapp/motion": "^2.4.0",
     "@react-aria/utils": "^3.29.0",
@@ -40,9 +40,9 @@
     "react-dom": "19.1.0",
     "react-native": "0.81.4",
     "react-native-reanimated": "~4.1.0",
-    "react-native-safe-area-context": "~5.6.0",
+    "react-native-safe-area-context": "^5.6.1",
     "react-native-screens": "~4.16.0",
-    "react-native-svg": "15.12.1",
+    "react-native-svg": "^15.12.0",
     "react-native-web": "^0.21.0",
     "react-native-worklets": "^0.5.1",
     "react-stately": "^3.39.0",

apps/starter-kit-expo/yarn.lock

@@ -12,7 +12,7 @@
   "dependencies": {
     "@expo/html-elements": "^0.12.5",
     "@gluestack-ui/core": "^3.0.10",
-    "@gluestack-ui/utils": "^3.0.7",
+    "@gluestack-ui/utils": "^3.0.11",
     "@gluestack/ui-next-adapter": "^3.0.3",
     "@gorhom/bottom-sheet": "^5.0.0-alpha.11",
     "@legendapp/motion": "^2.4.0",