Merge pull request #3246 from gluestack/fix/upgrade-v3

Fix/upgrade v3

Author: Sanchitv3

packages/gluestack-core/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @gluestack-ui/core
 
+## 3.0.11
+
+### Patch Changes
+
+- fix: added initialwindowmetrics to safeareaprovider
+
 ## 3.0.10
 
 ### Patch Changes

packages/gluestack-core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gluestack-ui/core",
   "description": "Universal UI components for React Native, Expo, and Next.js",
-  "version": "3.0.10",
+  "version": "3.0.11",
   "main": "./lib/esm/index.js",
   "module": "./lib/esm/index.js",
   "types": "./lib/esm/index.d.ts",

packages/gluestack-core/src/toast/creator/ToastList.tsx

@@ -3,7 +3,7 @@ import { useKeyboardBottomInset } from '@gluestack-ui/utils/hooks';
 import { Overlay } from '../../overlay/creator';
 import React from 'react';
 import { Platform, View } from 'react-native';
-import { SafeAreaProvider, SafeAreaView } from 'react-native-safe-area-context';
+import { initialWindowMetrics, SafeAreaProvider, SafeAreaView } from 'react-native-safe-area-context';
 import { OverlayAnimatePresence } from './OverlayAnimatePresence';
 import { ToastContext } from './ToastContext';
 import type { IToast, ToastPlacement } from './types';
@@ -92,7 +92,7 @@ export const ToastList = () => {
             >
               {toastInfo[position].map((toast: IToast) => {
                 return (
-                  <SafeAreaProvider key={toast.id}>
+                  <SafeAreaProvider key={toast.id} initialMetrics={initialWindowMetrics}>
                     <SafeAreaView style={{ pointerEvents: 'box-none' }}>
                       <OverlayAnimatePresence
                         visible={visibleToasts[toast.id]}

packages/gluestack-ui/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## 0.4.9-alpha.0 (2023-07-21)
 
+## 3.0.9
+
+### Patch Changes
+
+- fix: update the upgrade flow to avoid uninstalling @gluestack-ui/core and @gluestack-ui/utils
+
 ## 3.0.8
 
 ### Patch Changes

packages/gluestack-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gluestack-ui",
-  "version": "3.0.8",
+  "version": "3.0.9",
   "main": "dist/index.js",
   "bin": {
     "gluestack-ui": "./dist/index.js"

packages/gluestack-ui/src/commands/upgrade.ts

@@ -446,8 +446,14 @@ export const upgrade = new Command()
       else if (fs.existsSync('pnpm-lock.yaml')) packageManager = 'pnpm';
       else if (fs.existsSync('bun.lockb')) packageManager = 'bun';
       await updateTailwindConfig();
+      // Do not remove packages that we want to keep/install
+      const retainSet = new Set(['@gluestack-ui/core', '@gluestack-ui/utils']);
+      const packagesToRemove = oldPackages.filter(
+        (pkg: string) => !retainSet.has(pkg)
+      );
+      // Remove old packages first, then install required ones
+      removePackages(packagesToRemove, packageManager);
       installPackages(packageManager);
-      removePackages(oldPackages, packageManager);
       cleanAndReinstall(packageManager);
       await updateRegistryFile();
       await updateNextConfig();