Patch

expo-app/app/index.tsx

@@ -3,12 +3,10 @@ import { Button, ButtonText } from "@/components/ui/button";
 import { router } from "expo-router";
 import { SafeAreaView } from "react-native";
 import { VStack } from "@/components/ui/vstack";
-import { Heading } from "@/components/ui/heading";
 const index = () => {
   return (
     <SafeAreaView>
       <VStack className="m-2" space="xl">
-        <Heading>Auth Screen</Heading>
         <Button
           onPress={() => {
             router.push("auth/splash-screen");

expo-app/babel.config.js

@@ -19,12 +19,6 @@ module.exports = function (api) {
           },
         },
       ],
-      [
-        imageBabel,
-        {
-          assetPath: path.join(__dirname, "assets"),
-        },
-      ],
       "react-native-reanimated/plugin",
     ],
   };

expo-app/components/ui/avatar/index.tsx

@@ -2,7 +2,8 @@
 import React from "react";
 import { createAvatar } from "@gluestack-ui/avatar";
 
-import { View, Text, Image } from "react-native";
+import { View, Text } from "react-native";
+import Image from "@unitools/image";
 
 import { tva } from "@gluestack-ui/nativewind-utils/tva";
 import {
@@ -24,7 +25,11 @@ const UIAvatar = createAvatar({
 cssInterop(UIAvatar, { className: "style" });
 cssInterop(UIAvatar.Badge, { className: "style" });
 cssInterop(UIAvatar.Group, { className: "style" });
-cssInterop(UIAvatar.Image, { className: "style" });
+cssInterop(
+  UIAvatar.Image,
+  //@ts-ignore
+  Image.displayName === "NextImage" ? {} : { className: "style" }
+);
 cssInterop(UIAvatar.FallbackText, { className: "style" });
 
 const avatarStyle = tva({

expo-app/components/ui/image/index.tsx

@@ -1,50 +1,48 @@
-'use client';
-import React from 'react';
-import { createImage } from '@gluestack-ui/image';
-import { Platform, Image as RNImage } from 'react-native';
-import { tva } from '@gluestack-ui/nativewind-utils/tva';
-import type { VariantProps } from '@gluestack-ui/nativewind-utils';
-import { cssInterop } from '@gluestack-ui/nativewind-utils/cssInterop';
+"use client";
+import React from "react";
+import UnitoolsImage from "@unitools/image";
+import { tva } from "@gluestack-ui/nativewind-utils/tva";
+import type { VariantProps } from "@gluestack-ui/nativewind-utils";
+import { cssInterop } from "@gluestack-ui/nativewind-utils/cssInterop";
 
 const imageStyle = tva({
-  base: 'max-w-full',
+  base: "max-w-full",
   variants: {
     size: {
-      '2xs': 'h-6 w-6',
-      'xs': 'h-10 w-10',
-      'sm': 'h-16 w-16',
-      'md': 'h-20 w-20',
-      'lg': 'h-24 w-24',
-      'xl': 'h-32 w-32',
-      '2xl': 'h-64 w-64',
-      'full': 'h-full w-full',
+      "2xs": "h-6 w-6",
+      xs: "h-10 w-10",
+      sm: "h-16 w-16",
+      md: "h-20 w-20",
+      lg: "h-24 w-24",
+      xl: "h-32 w-32",
+      "2xl": "h-64 w-64",
+      full: "h-full w-full",
     },
   },
 });
 
-const UIImage = createImage({ Root: RNImage });
-cssInterop(UIImage, { className: 'style' });
+const UIImage = UnitoolsImage;
+cssInterop(
+  UIImage,
+  //@ts-ignore
+  UnitoolsImage.displayName === "NextImage" ? {} : { className: "style" }
+);
 
 type ImageProps = VariantProps<typeof imageStyle> &
   React.ComponentProps<typeof UIImage>;
 const Image = ({
-  size = 'md',
+  size = "md",
   className,
   ...props
 }: { className?: any } & ImageProps) => {
   return (
     <UIImage
+      // @ts-ignore
       className={imageStyle({ size, class: className })}
       {...props}
-      //@ts-ignore
-      style={
-        Platform.OS === 'web'
-          ? { height: 'revert-layer', width: 'revert-layer' }
-          : undefined
-      }
     />
   );
 };
 
-Image.displayName = 'Image';
+Image.displayName = "Image";
 export { Image };

expo-app/dist/debug.html

@@ -1,6 +1,6 @@
 
-      <script src="_expo/static/js/ios/entry-a70a6e7f4ca68d31aad55d029cd42a70.hbc"></script>
-      <script src="_expo/static/js/android/entry-ee9e4707b1186d528b5ddf3d2d04aedb.hbc"></script>
+      <script src="_expo/static/js/ios/entry-0ae608f62deb76a91f10947b1cfabada.hbc"></script>
+      <script src="_expo/static/js/android/entry-2680dcbf328044794b8a87eb1f489a62.hbc"></script>
       Open up this file in Chrome. In the JavaScript developer console, navigate to the Source tab.
       You can see a red colored folder containing the original source code from your bundle.
 

expo-app/dist/metadata.json

@@ -1 +1 @@
-{"version":0,"bundler":"metro","fileMetadata":{"ios":{"bundle":"_expo/static/js/ios/entry-a70a6e7f4ca68d31aad55d029cd42a70.hbc","assets":[{"path":"assets/7d40544b395c5949f4646f5e150fe020","ext":"png"},{"path":"assets/cdd04e13d4ec83ff0cd13ec8dabdc341","ext":"png"},{"path":"assets/a132ecc4ba5c1517ff83c0fb321bc7fc","ext":"png"},{"path":"assets/0ea69b5077e7c4696db85dbcba75b0e1","ext":"png"},{"path":"assets/f5b790e2ac193b3d41015edb3551f9b8","ext":"png"},{"path":"assets/5223c8d9b0d08b82a5670fb5f71faf78","ext":"png"},{"path":"assets/563d5e3294b67811d0a1aede6f601e30","ext":"png"},{"path":"assets/b6c297a501e289394b0bc5dc69c265e6","ext":"png"},{"path":"assets/5974eb3e1c5314e8d5a822702d7d0740","ext":"png"},{"path":"assets/9d9c5644f55c2f6e4b7f247c378b2fe9","ext":"png"},{"path":"assets/b06871f281fee6b241d60582ae9369b9","ext":"ttf"},{"path":"assets/49a79d66bdea2debf1832bf4d7aca127","ext":"ttf"},{"path":"assets/c2987746a520426d079b029f62c33e25","ext":"png"},{"path":"assets/2769486e3524cb5f1f6666c2880a1e3f","ext":"png"},{"path":"assets/10cecf4fa69ea16d6e60329908194f44","ext":"png"},{"path":"assets/25c301d2fae952722eb9d6617353fc3e","ext":"png"},{"path":"assets/c2987746a520426d079b029f62c33e25","ext":"png"},{"path":"assets/2769486e3524cb5f1f6666c2880a1e3f","ext":"png"},{"path":"assets/10cecf4fa69ea16d6e60329908194f44","ext":"png"},{"path":"assets/25c301d2fae952722eb9d6617353fc3e","ext":"png"},{"path":"assets/c2987746a520426d079b029f62c33e25","ext":"png"},{"path":"assets/2769486e3524cb5f1f6666c2880a1e3f","ext":"png"},{"path":"assets/10cecf4fa69ea16d6e60329908194f44","ext":"png"},{"path":"assets/25c301d2fae952722eb9d6617353fc3e","ext":"png"},{"path":"assets/c2987746a520426d079b029f62c33e25","ext":"png"},{"path":"assets/2769486e3524cb5f1f6666c2880a1e3f","ext":"png"},{"path":"assets/10cecf4fa69ea16d6e60329908194f44","ext":"png"},{"path":"assets/25c301d2fae952722eb9d6617353fc3e","ext":"png"},{"path":"assets/c2987746a520426d079b029f62c33e25","ext":"png"},{"path":"assets/2769486e3524cb5f1f6666c2880a1e3f","ext":"png"},{"path":"assets/10cecf4fa69ea16d6e60329908194f44","ext":"png"},{"path":"assets/25c301d2fae952722eb9d6617353fc3e","ext":"png"},{"path":"assets/eb60fe44c20a8e3aebc8f41b75eeef9d","ext":"png"},{"path":"assets/4444d2245a2144d1be137dcab682137d","ext":"png"},{"path":"assets/d037db807773a20d6b96c0de061d2a6c","ext":"png"},{"path":"assets/9be3dde82fb74ead8d545f127b1161f4","ext":"png"},{"path":"assets/b12eecf5f29690ceee4fcfc72e7fa3c5","ext":"png"},{"path":"assets/1a1e7d455cd67dc80f94105932665ed3","ext":"png"},{"path":"assets/4464ce72ae58b3e04183531cab71192d","ext":"png"},{"path":"assets/e481052f3bdb2197b02c996b63745fda","ext":"png"},{"path":"assets/5ead2a82139340960bd3907d74b09a3b","ext":"png"},{"path":"assets/9fa53963681efcb9553744f37aef96e1","ext":"png"},{"path":"assets/408f18f14baba6ec6aaa6fe5929178b8","ext":"png"},{"path":"assets/00120f9c2a281338ebd8428859eb0d91","ext":"png"},{"path":"assets/9be3dde82fb74ead8d545f127b1161f4","ext":"png"},{"path":"assets/c8703abcbcf836bfc34483785ea5ea82","ext":"png"},{"path":"assets/8bf3956c5bd6b2004ca2d7838321033e","ext":"png"},{"path":"assets/725485d71f857e30ab6966cde7e8db06","ext":"png"},{"path":"assets/aa74cabce063609b6e530a4bef24588c","ext":"png"},{"path":"assets/37cbcbed626ede85f34215ebad867e0e","ext":"png"}]},"android":{"bundle":"_expo/static/js/android/entry-ee9e4707b1186d528b5ddf3d2d04aedb.hbc","assets":[{"path":"assets/778ffc9fe8773a878e9c30a6304784de","ext":"png"},{"path":"assets/376d6a4c7f622917c39feb23671ef71d","ext":"png"},{"path":"assets/c79c3606a1cf168006ad3979763c7e0c","ext":"png"},{"path":"assets/02bc1fa7c0313217bde2d65ccbff40c9","ext":"png"},{"path":"assets/35ba0eaec5a4f5ed12ca16fabeae451d","ext":"png"},{"path":"assets/5223c8d9b0d08b82a5670fb5f71faf78","ext":"png"},{"path":"assets/563d5e3294b67811d0a1aede6f601e30","ext":"png"},{"path":"assets/b6c297a501e289394b0bc5dc69c265e6","ext":"png"},{"path":"assets/5974eb3e1c5314e8d5a822702d7d0740","ext":"png"},{"path":"assets/9d9c5644f55c2f6e4b7f247c378b2fe9","ext":"png"},{"path":"assets/b06871f281fee6b241d60582ae9369b9","ext":"ttf"},{"path":"assets/49a79d66bdea2debf1832bf4d7aca127","ext":"ttf"},{"path":"assets/c2987746a520426d079b029f62c33e25","ext":"png"},{"path":"assets/2769486e3524cb5f1f6666c2880a1e3f","ext":"png"},{"path":"assets/10cecf4fa69ea16d6e60329908194f44","ext":"png"},{"path":"assets/25c301d2fae952722eb9d6617353fc3e","ext":"png"},{"path":"assets/c2987746a520426d079b029f62c33e25","ext":"png"},{"path":"assets/2769486e3524cb5f1f6666c2880a1e3f","ext":"png"},{"path":"assets/10cecf4fa69ea16d6e60329908194f44","ext":"png"},{"path":"assets/25c301d2fae952722eb9d6617353fc3e","ext":"png"},{"path":"assets/c2987746a520426d079b029f62c33e25","ext":"png"},{"path":"assets/2769486e3524cb5f1f6666c2880a1e3f","ext":"png"},{"path":"assets/10cecf4fa69ea16d6e60329908194f44","ext":"png"},{"path":"assets/25c301d2fae952722eb9d6617353fc3e","ext":"png"},{"path":"assets/c2987746a520426d079b029f62c33e25","ext":"png"},{"path":"assets/2769486e3524cb5f1f6666c2880a1e3f","ext":"png"},{"path":"assets/10cecf4fa69ea16d6e60329908194f44","ext":"png"},{"path":"assets/25c301d2fae952722eb9d6617353fc3e","ext":"png"},{"path":"assets/c2987746a520426d079b029f62c33e25","ext":"png"},{"path":"assets/2769486e3524cb5f1f6666c2880a1e3f","ext":"png"},{"path":"assets/10cecf4fa69ea16d6e60329908194f44","ext":"png"},{"path":"assets/25c301d2fae952722eb9d6617353fc3e","ext":"png"},{"path":"assets/eb60fe44c20a8e3aebc8f41b75eeef9d","ext":"png"},{"path":"assets/4444d2245a2144d1be137dcab682137d","ext":"png"},{"path":"assets/d037db807773a20d6b96c0de061d2a6c","ext":"png"},{"path":"assets/9be3dde82fb74ead8d545f127b1161f4","ext":"png"},{"path":"assets/b12eecf5f29690ceee4fcfc72e7fa3c5","ext":"png"},{"path":"assets/1a1e7d455cd67dc80f94105932665ed3","ext":"png"},{"path":"assets/4464ce72ae58b3e04183531cab71192d","ext":"png"},{"path":"assets/e481052f3bdb2197b02c996b63745fda","ext":"png"},{"path":"assets/5ead2a82139340960bd3907d74b09a3b","ext":"png"},{"path":"assets/9fa53963681efcb9553744f37aef96e1","ext":"png"},{"path":"assets/408f18f14baba6ec6aaa6fe5929178b8","ext":"png"},{"path":"assets/00120f9c2a281338ebd8428859eb0d91","ext":"png"},{"path":"assets/9be3dde82fb74ead8d545f127b1161f4","ext":"png"},{"path":"assets/c8703abcbcf836bfc34483785ea5ea82","ext":"png"},{"path":"assets/8bf3956c5bd6b2004ca2d7838321033e","ext":"png"},{"path":"assets/725485d71f857e30ab6966cde7e8db06","ext":"png"},{"path":"assets/aa74cabce063609b6e530a4bef24588c","ext":"png"},{"path":"assets/37cbcbed626ede85f34215ebad867e0e","ext":"png"}]}}}
+{"version":0,"bundler":"metro","fileMetadata":{"ios":{"bundle":"_expo/static/js/ios/entry-0ae608f62deb76a91f10947b1cfabada.hbc","assets":[{"path":"assets/7d40544b395c5949f4646f5e150fe020","ext":"png"},{"path":"assets/cdd04e13d4ec83ff0cd13ec8dabdc341","ext":"png"},{"path":"assets/a132ecc4ba5c1517ff83c0fb321bc7fc","ext":"png"},{"path":"assets/0ea69b5077e7c4696db85dbcba75b0e1","ext":"png"},{"path":"assets/f5b790e2ac193b3d41015edb3551f9b8","ext":"png"},{"path":"assets/5223c8d9b0d08b82a5670fb5f71faf78","ext":"png"},{"path":"assets/563d5e3294b67811d0a1aede6f601e30","ext":"png"},{"path":"assets/b6c297a501e289394b0bc5dc69c265e6","ext":"png"},{"path":"assets/5974eb3e1c5314e8d5a822702d7d0740","ext":"png"},{"path":"assets/9d9c5644f55c2f6e4b7f247c378b2fe9","ext":"png"},{"path":"assets/b06871f281fee6b241d60582ae9369b9","ext":"ttf"},{"path":"assets/49a79d66bdea2debf1832bf4d7aca127","ext":"ttf"},{"path":"assets/130ce1a11cf2b242e26ad436d1f3557c","ext":"png"},{"path":"assets/6b65a1a053341dd87af4385e45a0b5df","ext":"png"},{"path":"assets/c2987746a520426d079b029f62c33e25","ext":"png"},{"path":"assets/2769486e3524cb5f1f6666c2880a1e3f","ext":"png"},{"path":"assets/10cecf4fa69ea16d6e60329908194f44","ext":"png"},{"path":"assets/25c301d2fae952722eb9d6617353fc3e","ext":"png"},{"path":"assets/eb60fe44c20a8e3aebc8f41b75eeef9d","ext":"png"},{"path":"assets/4444d2245a2144d1be137dcab682137d","ext":"png"},{"path":"assets/d037db807773a20d6b96c0de061d2a6c","ext":"png"},{"path":"assets/9be3dde82fb74ead8d545f127b1161f4","ext":"png"},{"path":"assets/b12eecf5f29690ceee4fcfc72e7fa3c5","ext":"png"},{"path":"assets/1a1e7d455cd67dc80f94105932665ed3","ext":"png"},{"path":"assets/4464ce72ae58b3e04183531cab71192d","ext":"png"},{"path":"assets/e481052f3bdb2197b02c996b63745fda","ext":"png"},{"path":"assets/5ead2a82139340960bd3907d74b09a3b","ext":"png"},{"path":"assets/9fa53963681efcb9553744f37aef96e1","ext":"png"},{"path":"assets/408f18f14baba6ec6aaa6fe5929178b8","ext":"png"},{"path":"assets/00120f9c2a281338ebd8428859eb0d91","ext":"png"},{"path":"assets/9be3dde82fb74ead8d545f127b1161f4","ext":"png"},{"path":"assets/c8703abcbcf836bfc34483785ea5ea82","ext":"png"},{"path":"assets/8bf3956c5bd6b2004ca2d7838321033e","ext":"png"},{"path":"assets/725485d71f857e30ab6966cde7e8db06","ext":"png"},{"path":"assets/aa74cabce063609b6e530a4bef24588c","ext":"png"},{"path":"assets/37cbcbed626ede85f34215ebad867e0e","ext":"png"}]},"android":{"bundle":"_expo/static/js/android/entry-2680dcbf328044794b8a87eb1f489a62.hbc","assets":[{"path":"assets/778ffc9fe8773a878e9c30a6304784de","ext":"png"},{"path":"assets/376d6a4c7f622917c39feb23671ef71d","ext":"png"},{"path":"assets/c79c3606a1cf168006ad3979763c7e0c","ext":"png"},{"path":"assets/02bc1fa7c0313217bde2d65ccbff40c9","ext":"png"},{"path":"assets/35ba0eaec5a4f5ed12ca16fabeae451d","ext":"png"},{"path":"assets/5223c8d9b0d08b82a5670fb5f71faf78","ext":"png"},{"path":"assets/563d5e3294b67811d0a1aede6f601e30","ext":"png"},{"path":"assets/b6c297a501e289394b0bc5dc69c265e6","ext":"png"},{"path":"assets/5974eb3e1c5314e8d5a822702d7d0740","ext":"png"},{"path":"assets/9d9c5644f55c2f6e4b7f247c378b2fe9","ext":"png"},{"path":"assets/b06871f281fee6b241d60582ae9369b9","ext":"ttf"},{"path":"assets/49a79d66bdea2debf1832bf4d7aca127","ext":"ttf"},{"path":"assets/130ce1a11cf2b242e26ad436d1f3557c","ext":"png"},{"path":"assets/6b65a1a053341dd87af4385e45a0b5df","ext":"png"},{"path":"assets/c2987746a520426d079b029f62c33e25","ext":"png"},{"path":"assets/2769486e3524cb5f1f6666c2880a1e3f","ext":"png"},{"path":"assets/10cecf4fa69ea16d6e60329908194f44","ext":"png"},{"path":"assets/25c301d2fae952722eb9d6617353fc3e","ext":"png"},{"path":"assets/eb60fe44c20a8e3aebc8f41b75eeef9d","ext":"png"},{"path":"assets/4444d2245a2144d1be137dcab682137d","ext":"png"},{"path":"assets/d037db807773a20d6b96c0de061d2a6c","ext":"png"},{"path":"assets/9be3dde82fb74ead8d545f127b1161f4","ext":"png"},{"path":"assets/b12eecf5f29690ceee4fcfc72e7fa3c5","ext":"png"},{"path":"assets/1a1e7d455cd67dc80f94105932665ed3","ext":"png"},{"path":"assets/4464ce72ae58b3e04183531cab71192d","ext":"png"},{"path":"assets/e481052f3bdb2197b02c996b63745fda","ext":"png"},{"path":"assets/5ead2a82139340960bd3907d74b09a3b","ext":"png"},{"path":"assets/9fa53963681efcb9553744f37aef96e1","ext":"png"},{"path":"assets/408f18f14baba6ec6aaa6fe5929178b8","ext":"png"},{"path":"assets/00120f9c2a281338ebd8428859eb0d91","ext":"png"},{"path":"assets/9be3dde82fb74ead8d545f127b1161f4","ext":"png"},{"path":"assets/c8703abcbcf836bfc34483785ea5ea82","ext":"png"},{"path":"assets/8bf3956c5bd6b2004ca2d7838321033e","ext":"png"},{"path":"assets/725485d71f857e30ab6966cde7e8db06","ext":"png"},{"path":"assets/aa74cabce063609b6e530a4bef24588c","ext":"png"},{"path":"assets/37cbcbed626ede85f34215ebad867e0e","ext":"png"}]}}}

expo-app/package.json

@@ -4,19 +4,20 @@
   "version": "1.0.0",
   "scripts": {
     "start": "EXPO_USE_METRO_WORKSPACE_ROOT=1 npx expo start",
-    "android": "expo run:android",
-    "ios": "expo run:ios",
+    "android": "EXPO_USE_METRO_WORKSPACE_ROOT=1 npx expo start --android",
+    "ios": "EXPO_USE_METRO_WORKSPACE_ROOT=1 npx expo start --ios",
     "web": "EXPO_USE_METRO_WORKSPACE_ROOT=1 npx expo start --web",
     "test": "jest --watchAll"
   },
   "jest": {
     "preset": "jest-expo"
   },
   "dependencies": {
+    "@hookform/resolvers": "^3.3.4",
+    "@unitools/image": "^0.0.4",
     "@unitools/link": "^0.0.3",
     "@unitools/navigation": "^0.0.1-alpha.0",
     "@unitools/router": "^0.0.4",
-    "@hookform/resolvers": "^3.3.4",
     "lucide-react-native": "^0.378.0",
     "react-hook-form": "^7.51.4",
     "zod": "^3.23.8",
@@ -51,15 +52,14 @@
     "@gluestack-ui/toast": "latest",
     "@gluestack-ui/tooltip": "latest",
     "@legendapp/motion": "latest",
-    "@unitools/image": "^0.0.2",
     "expo-image": "~1.12.9",
     "nativewind": "4.0.36",
     "react-native-reanimated": "latest",
     "react-native-svg": "^15.2.0",
     "tailwindcss": "3.4.3",
     "@expo/vector-icons": "^14.0.0",
     "@react-navigation/native": "^6.0.2",
-    "@unitools/image-expo": "^0.0.2",
+    "@unitools/image-expo": "^0.0.5",
     "@unitools/link-expo": "^0.0.1",
     "@unitools/router-expo": "^0.0.1",
     "expo": "~51.0.6",