create-expo-stack 2.5.0-next.738ca1b → 2.5.0-next.77e2bc3

package/build/templates/packages/expo-router/tabs/app/(tabs)/_layout.tsx.ejs

@@ -1,26 +1,10 @@
-import FontAwesome from "@expo/vector-icons/FontAwesome";
 import { Link, Tabs } from "expo-router";
-<% if (props.stylingPackage?.name === "unistyles") { %>
-import { createStyleSheet, useStyles } from 'react-native-unistyles'
-import { Pressable } from 'react-native';
-<% } else { %>
-import { Pressable, StyleSheet } from "react-native";
-<% } %>
+import { HeaderButton } from '../../components/HeaderButton';
+import { TabBarIcon } from '../../components/TabBarIcon';
+
 
-function TabBarIcon(props: {
-  name: React.ComponentProps<typeof FontAwesome>["name"];
-  color: string;
-}) {
-  <% if (props.stylingPackage?.name === "unistyles") { %>
-  const {styles} = useStyles(stylesheet)
-  <% } %>
-  return <FontAwesome size={28} style={styles.tabBarIcon} {...props} />;
-}
 
 export default function TabLayout() {
-  <% if (props.stylingPackage?.name === "unistyles") { %>
-  const { styles } = useStyles(stylesheet)
-  <% } %>
   return (
     <Tabs
       screenOptions={{
@@ -30,19 +14,10 @@ export default function TabLayout() {
         name='index'
         options={{
           title: 'Tab One',
-          tabBarIcon: ({ color }) => <TabBarIcon name='code' color={color} />,
+          tabBarIcon: ({ color }) => <TabBarIcon name="code" color={color} />,
           headerRight: () => (
             <Link href='/modal' asChild>
-              <Pressable>
-                {({ pressed }) => (
-                  <FontAwesome
-                    name='info-circle'
-                    size={25}
-                    color='gray'
-                    style={[styles.headerRight, { opacity: pressed ? 0.5 : 1 }]}
-                  />
-                )}
-              </Pressable>
+                  <HeaderButton  />
             </Link>
           ),
         }}
@@ -50,7 +25,7 @@ export default function TabLayout() {
       <Tabs.Screen
         name="two"
         options={{
-          title: "Tab Two",
+          title: 'Tab Two',
           tabBarIcon: ({ color }) => <TabBarIcon name="code" color={color} />,
         }}
       />
@@ -58,22 +33,3 @@ export default function TabLayout() {
   );
 }
 
-<% if (props.stylingPackage?.name === "unistyles") { %>
-const stylesheet = createStyleSheet({
-  headerRight: {
-    marginRight: 15
-  },
-  tabBarIcon: {
-    marginBottom: -3
-  }
-});
-<% } else { %>
-const styles = StyleSheet.create({
-  headerRight: {
-    marginRight: 15
-  },
-  tabBarIcon: {
-    marginBottom: -3
-  }
-});
-<% } %>

package/build/templates/packages/expo-router/tabs/app/(tabs)/index.tsx.ejs

@@ -1,106 +1,22 @@
-<% if (props.stylingPackage?.name === "nativewind") { %>
-    import { Text, View } from "react-native";
-<% } else if (props.stylingPackage?.name === "tamagui") { %>
-    import { YStack, H2, Separator, Theme } from "tamagui";
-<% } else if (props.stylingPackage?.name === "restyle") { %>
-    import { Box, Text } from 'theme';
-<% } else if (props.stylingPackage?.name === "unistyles") { %>
-    import { useStyles } from 'react-native-unistyles'
-    import { Text, View } from 'react-native';
-<% } else { %>
-    import { StyleSheet, Text, View } from "react-native";
-<% } %>
-<% if (props.internalizationPackage?.name === "i18next") { %>
-  import { InternalizationExample } from '../../components/InternalizationExample';
-<% } %>
+import { Stack } from 'expo-router';
+import { StyleSheet, View } from 'react-native';
 
-import EditScreenInfo from "../../components/edit-screen-info";
+import { ScreenContent } from '~/components/ScreenContent';
 
-export default function TabOneScreen() {
-  <% if (props.stylingPackage?.name === "unistyles") { %>
-    const { theme } = useStyles()
-
-    return (
-			<View style={theme.components.container}>
-				<Text style={theme.components.title}>Tab One</Text>
-      <% if (props.internalizationPackage?.name === "i18next") { %>
-        <InternalizationExample />
-      <% } %>
-				<View style={theme.components.separator} />
-				<EditScreenInfo path="app/(tabs)/index.tsx" />
-			</View>
-    );
-  <% } else if (props.stylingPackage?.name === "nativewind") { %>
-        return (
-			<View className={styles.container}>
-				<Text className={styles.title}>Tab One</Text>
-      <% if (props.internalizationPackage?.name === "i18next") { %>
-        <InternalizationExample />
-      <% } %>
-				<View className={styles.separator} />
-				<EditScreenInfo path="app/(tabs)/index.tsx" />
-			</View>
-		);
-    <% } else if (props.stylingPackage?.name === "tamagui") { %>
-        return (
-			<Theme name="light">
-				<YStack flex={1} alignItems="center" justifyContent="center">
-					<H2>Tab One</H2>
-          <% if (props.internalizationPackage?.name === "i18next") { %>
-            <InternalizationExample />
-          <% } %>
-					<Separator />
-					<EditScreenInfo path="app/(tabs)/index.tsx" />
-				</YStack>
-			</Theme>
-		);    
-    <% } else if (props.stylingPackage?.name === "restyle") { %>
-      return (
-        <Box flex={1} alignItems="center" justifyContent="center">
-          <Text variant="title">Tab One</Text>
-        <% if (props.internalizationPackage?.name === "i18next") { %>
-          <InternalizationExample />
-        <% } %>
-          <Box height={1} marginVertical="l_32" width="80%" />
-          <EditScreenInfo path="app/(tabs)/index.tsx" />
-        </Box>
-      );
-    <% } else { %>
-        return (
-			<View style={styles.container}>
-				<Text style={styles.title}>Tab One</Text>
-      <% if (props.internalizationPackage?.name === "i18next") { %>
-        <InternalizationExample />
-      <% } %>
-				<View style={styles.separator} />
-				<EditScreenInfo path="app/(tabs)/index.tsx" />
-			</View>
-		);
-    <% } %>
+export default function Home() {
+  return (
+    <>
+      <Stack.Screen options={{ title: 'Tab One' }} />
+      <View style={styles.container}>
+        <ScreenContent path="app/(tabs)/index.tsx" title="Tab One" />
+      </View>
+    </>
+  );
 }
 
-<% if (props.stylingPackage?.name === "nativewind") { %>
-    const styles = {
-		container: `items-center flex-1 justify-center`,
-		separator: `h-[1px] my-7 w-4/5 bg-gray-200`,
-		title: `text-xl font-bold`
-	};
-<% } else if (props.stylingPackage?.name === "stylesheet") { %>
-    const styles = StyleSheet.create({
-		container: {
-			alignItems: "center",
-			flex: 1,
-			justifyContent: "center",
-		},
-		separator: {
-      backgroundColor: '#d1d5db',
-			height: 1,
-			marginVertical: 30,
-			width: "80%",
-		},
-		title: {
-			fontSize: 20,
-			fontWeight: "bold",
-		}
-	});
-<% } %>
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    padding: 24,
+  },
+});

package/build/templates/packages/expo-router/tabs/app/(tabs)/two.tsx.ejs

@@ -1,87 +1,22 @@
-<% if (props.stylingPackage?.name === "nativewind") { %>
-    import { Text, View } from "react-native";
-<% } else if (props.stylingPackage?.name === "tamagui") { %>
-    import { YStack, H2, Separator, Theme } from "tamagui";
-<% } else if (props.stylingPackage?.name === "restyle") { %>
-    import { Box, Text } from 'theme';
-<% } else if (props.stylingPackage?.name === "unistyles") { %>
-    import { useStyles } from 'react-native-unistyles'
-    import { Text, View } from 'react-native';
-<% } else { %>
-    import { StyleSheet, Text, View } from "react-native";
-<% } %>
+import { Stack } from 'expo-router';
+import { StyleSheet, View } from 'react-native';
 
-import EditScreenInfo from "../../components/edit-screen-info";
+import { ScreenContent } from '~/components/ScreenContent';
 
-export default function TabTwoScreen() {
-    <% if (props.stylingPackage?.name === "unistyles") { %>
-      const { theme } = useStyles()
-
-      return (
-        <View style={theme.components.container}>
-          <Text style={theme.components.title}>Tab Two</Text>
-          <View style={theme.components.separator} />
-          <EditScreenInfo path='app/(tabs)/two.tsx' />
-        </View>
-      );
-    <% } else if (props.stylingPackage?.name === "nativewind") { %>
-        return (
-			<View className={styles.container}>
-				<Text className={styles.title}>Tab Two</Text>
-				<View className={styles.separator} />
-				<EditScreenInfo path="app/(tabs)/index.tsx" />
-			</View>
-		);
-    <% } else if (props.stylingPackage?.name === "tamagui") { %>
-        return (
-			<Theme name="light">
-				<YStack flex={1} alignItems="center" justifyContent="center">
-					<H2>Tab Two</H2>
-					<Separator />
-					<EditScreenInfo path="app/(tabs)/index.tsx" />
-				</YStack>
-			</Theme>
-		);    
-    <% } else if (props.stylingPackage?.name === "restyle") { %>
-      return (
-        <Box flex={1} alignItems="center" justifyContent="center">
-          <Text variant="title">Tab Two</Text>
-          <Box height={1} marginVertical="l_32" width="80%" />
-          <EditScreenInfo path="app/(tabs)/two.tsx" />
-        </Box>
-      );
-    <% } else { %>
-        return (
-			<View style={styles.container}>
-				<Text style={styles.title}>Tab Two</Text>
-				<View style={styles.separator} />
-				<EditScreenInfo path="app/(tabs)/two.tsx" />
-			</View>
-		);
-    <% } %>
+export default function Home() {
+  return (
+    <>
+      <Stack.Screen options={{ title: 'Tab Two' }} />
+      <View style={styles.container}>
+        <ScreenContent path="app/(tabs)/two.tsx" title="Tab Two" />
+      </View>
+    </>
+  );
 }
 
-<% if (props.stylingPackage?.name === "nativewind") { %>
-    const styles = {
-		container: `items-center flex-1 justify-center`,
-		separator: `h-[1px] my-7 w-4/5 bg-gray-200`,
-		title: `text-xl font-bold`
-	};
-<% } else if (props.stylingPackage?.name === "stylesheet") { %>
-    const styles = StyleSheet.create({
-		container: {
-			alignItems: "center",
-			flex: 1,
-			justifyContent: "center",
-		},
-		separator: {
-			height: 1,
-			marginVertical: 30,
-			width: "80%",
-		},
-		title: {
-			fontSize: 20,
-			fontWeight: "bold",
-		}
-	});
-<% } %>
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    padding: 24,
+  },
+});

package/build/templates/packages/expo-router/tabs/app/modal.tsx.ejs

@@ -1,95 +1,20 @@
- <% if (props.stylingPackage?.name === "nativewind") { %>
-    import { Platform, Text, View } from "react-native";
-<% } else if (props.stylingPackage?.name === "tamagui") { %>
-    import { YStack, Paragraph, Separator, Theme } from "tamagui";
-	import { Platform } from 'react-native'
-<% } else if (props.stylingPackage?.name === "restyle") { %>
-  import { Platform } from 'react-native';
-  import { Box, Text } from 'theme';
-<% } else if (props.stylingPackage?.name === "unistyles") { %>
-  import { useStyles } from 'react-native-unistyles'
-  import { Platform, Text, View } from 'react-native';
-<% } else { %>
-    import { Platform, StyleSheet, Text, View } from "react-native";
-<% } %>
-import { StatusBar } from "expo-status-bar";
-
-import EditScreenInfo from "../components/edit-screen-info";
+import { ScreenContent } from 'components/ScreenContent';
+import { StatusBar } from 'expo-status-bar';
+import { Platform } from 'react-native';
 
-export default function ModalScreen() {
-    <% if (props.stylingPackage?.name === "unistyles") { %>
-      const { theme } = useStyles()
+<% if (props.internalizationPackage?.name === "i18next") { %>
+  import { InternalizationExample } from 'components/InternalizationExample';
+<% } %>
 
-      return (
-        <View style={theme.components.container}>
-          <StatusBar style={Platform.OS === 'ios' ? 'light' : 'auto'} />
-          <Text style={theme.components.title}>Modal</Text>
-          <View style={theme.components.separator} />
-          <EditScreenInfo path='app/modal.tsx' />
-        </View>
-      );
-    <% } else if (props.stylingPackage?.name === "nativewind") { %>
-        return (
-			<View className={styles.container}>
-				<StatusBar style={Platform.OS === "ios" ? "light" : "auto"} />
-				<Text className={styles.title}>Modal</Text>
-				<View className={styles.separator} />
-				<EditScreenInfo path="app/modal.tsx" />
-			</View>
-		);
-    <% } else if (props.stylingPackage?.name === "tamagui") { %>
-        return (
-			<Theme name="light">
-				<YStack flex={1} alignItems="center" justifyContent="center">
-					<StatusBar style={Platform.OS === "ios" ? "light" : "auto"} />
-					<Paragraph>Modal</Paragraph>
-					<Separator />
-					<EditScreenInfo path="app/modal.tsx" />
-				</YStack>
-			</Theme>
-		);
-    <% } else if (props.stylingPackage?.name === "restyle") { %>
-      return (
-        <Box flex={1} alignItems="center" justifyContent="center">
-          <StatusBar style={Platform.OS === 'ios' ? 'light' : 'auto'} />
-          <Text variant="title">Modal</Text>
-          <Box height={1} marginVertical="l_32" width="80%" />
-          <EditScreenInfo path="app/modal.tsx" />
-        </Box>
-      );
-    <% } else { %>
-        return (
-			<View style={styles.container}>
-				<StatusBar style={Platform.OS === "ios" ? "light" : "auto"} />
-				<Text style={styles.title}>Modal</Text>
-				<View style={styles.separator} />
-				<EditScreenInfo path="app/modal.tsx" />
-			</View>
-		);
-    <% } %>
+export default function Modal() {
+  return (
+    <>
+      <ScreenContent path="app/modal.tsx" title="Modal">
+      <% if (props.internalizationPackage?.name === "i18next") { %>
+        <InternalizationExample />
+      <% } %>
+      </ScreenContent>
+      <StatusBar style={Platform.OS === 'ios' ? 'light' : 'auto'} />
+    </>
+  );
 }
-
-<% if (props.stylingPackage?.name === "nativewind") { %>
-  const styles = {
-		container: `items-center flex-1 justify-center`,
-		separator: `h-[1px] my-7 w-4/5 bg-gray-200`,
-		title: `text-xl font-bold`
-	};
-<% } else if (props.stylingPackage?.name === "stylesheet") { %>
-    const styles = StyleSheet.create({
-		container: {
-			alignItems: "center",
-			flex: 1,
-			justifyContent: "center"
-		},
-		separator: {
-			height: 1,
-			marginVertical: 30,
-			width: "80%"
-		},
-		title: {
-			fontSize: 20,
-			fontWeight: "bold"
-		}
-	});
-<% } %>

package/build/templates/packages/i18next/components/InternalizationExample.tsx.ejs

@@ -20,4 +20,4 @@ export const InternalizationExample = () => {
 
 export const styles = StyleSheet.create({
   content: { gap: 20, padding: 20 },
-});
+});

package/build/templates/packages/i18next/translation/en.json.ejs

@@ -1,8 +1,8 @@
 {
-  "hello": "Hello, World!",
-  "title": "Open up App.tsx to start working on your app!",
   "button": {
     "french": "Switch language to French",
     "english": "Switch language to English"
-  }
+  },
+  "getStarted": "Open up the code for this screen:",
+  "changeCode": "Change any of the text, save the file, and your app will automatically update."
 }

package/build/templates/packages/i18next/translation/fr.json.ejs

@@ -1,8 +1,8 @@
 {
-  "hello": "Bonjour, le monde !",
-  "title": "Ouvrez App.tsx pour commencer à travailler sur votre application !",
   "button": {
     "french": "Changer la langue en français",
     "english": "Changer la langue en anglais"
-  }
+  },
+  "getStarted": "Ouvrez le code de cet écran :",
+  "changeCode": "Modifiez n'importe quel texte, enregistrez le fichier et votre application sera automatiquement mise à jour."
 }

package/build/templates/packages/nativewind/components/BackButton.tsx.ejs

@@ -0,0 +1,18 @@
+import { Feather } from '@expo/vector-icons';
+import { Text, View } from 'react-native';
+
+export const BackButton = ({ onPress }: { onPress: () => void }) => {
+  return (
+    <View className={styles.backButton}>
+      <Feather name="chevron-left" size={16} color="#007AFF" />
+      <Text className={styles.backButtonText} onPress={onPress}>
+        Back
+      </Text>
+    </View>
+  );
+};
+
+const styles = {
+  backButton: 'flex-row',
+  backButtonText: 'text-blue-500 ml-1',
+};

package/build/templates/packages/nativewind/components/Button.tsx.ejs

@@ -0,0 +1,14 @@
+import { Text, TouchableOpacity } from 'react-native';
+
+export const Button = ({ onPress, title }: { onPress: () => void; title: string }) => {
+  return (
+    <TouchableOpacity className={styles.button} onPress={onPress}>
+      <Text className={styles.buttonText}>{title}</Text>
+    </TouchableOpacity>
+  );
+};
+
+export const styles = {
+  button: 'items-center bg-indigo-500 rounded-[28px] shadow-md p-4',
+  buttonText: 'text-white text-lg font-semibold text-center',
+};

package/build/templates/packages/nativewind/components/EditScreenInfo.tsx.ejs

@@ -0,0 +1,40 @@
+import { Text, View } from 'react-native';
+
+<% if (props.internalizationPackage?.name === "i18next") { %>
+import { useTranslation } from 'react-i18next';
+<% } %>
+
+
+export const EditScreenInfo = ({ path }: { path: string }) => {
+<% if (props.internalizationPackage?.name === "i18next") { %>
+  const { t } = useTranslation();
+  const title = t('getStarted');
+  const description = t('changeCode')
+<% } else { %>
+  const title = "Open up the code for this screen:"
+  const description = "Change any of the text, save the file, and your app will automatically update."
+<% } %>
+  return (
+    <View>
+      <View className={styles.getStartedContainer}>
+        <Text className={styles.getStartedText}>{title}</Text>
+        <View className={styles.codeHighlightContainer + styles.homeScreenFilename}>
+          <Text>{path}</Text>
+        </View>
+        <Text className={styles.getStartedText}>
+          {description}
+        </Text>
+      </View>
+    </View>
+  );
+};
+
+const styles = {
+  codeHighlightContainer: `rounded-md px-1`,
+  getStartedContainer: `items-center mx-12`,
+  getStartedText: `text-lg leading-6 text-center`,
+  helpContainer: `items-center mx-5 mt-4`,
+  helpLink: `py-4`,
+  helpLinkText: `text-center`,
+  homeScreenFilename: `my-2`,
+};

package/build/templates/packages/nativewind/components/ScreenContent.tsx.ejs

@@ -0,0 +1,25 @@
+import { Text, View } from 'react-native';
+
+import { EditScreenInfo } from './EditScreenInfo';
+
+type ScreenContentProps = {
+  title: string;
+  path: string;
+  children?: React.ReactNode;
+};
+
+export const ScreenContent = ({ title, path, children} : ScreenContentProps) => {
+  return (
+    <View className={styles.container}>
+      <Text className={styles.title}>{title}</Text>
+      <View className={styles.separator} />
+      <EditScreenInfo path={path} />
+      {children}
+    </View>
+  );
+};
+const styles = {
+  container: `items-center flex-1 justify-center`,
+  separator: `h-[1px] my-7 w-4/5 bg-gray-200`,
+  title: `text-xl font-bold`,
+};

package/build/templates/packages/react-navigation/App.tsx.ejs

@@ -22,7 +22,7 @@ import "react-native-gesture-handler";
   import { theme } from 'theme';
 <% } %>
 
-import RootStack from "./src/navigation";
+import RootStack from "./navigation";
 
 export default function App() {
 	<% if (props.stylingPackage?.name === "tamagui") { %>

package/build/templates/packages/react-navigation/navigation/drawer-navigator.tsx.ejs

@@ -1,7 +1,7 @@
-import { FontAwesome, Ionicons, MaterialIcons } from '@expo/vector-icons';
+import { Ionicons, MaterialIcons } from '@expo/vector-icons';
 import { createDrawerNavigator } from '@react-navigation/drawer';
-import { Pressable } from 'react-native';
 import { StackScreenProps } from '@react-navigation/stack';
+import { HeaderButton } from 'components/HeaderButton';
 
 import { RootStackParamList } from '.';
 import TabNavigator from './tab-navigator';
@@ -12,39 +12,27 @@ type Props = StackScreenProps<RootStackParamList, 'DrawerNavigator'>;
 const Drawer = createDrawerNavigator();
 
 export default function DrawerNavigator({ navigation }: Props) {
-	return (
-		<Drawer.Navigator>
+  return (
+    <Drawer.Navigator>
       <Drawer.Screen
         name="Home"
         component={Home}
         options={{
-          drawerIcon: ({ size, color }) => <Ionicons name="home-outline" size={size} color={color} />,
+          drawerIcon: ({ size, color }) => (
+            <Ionicons name="home-outline" size={size} color={color} />
+          ),
         }}
       />
-			<Drawer.Screen name="Tabs" component={TabNavigator}
+      <Drawer.Screen
+        name="Tabs"
+        component={TabNavigator}
         options={{
-          headerRight: () => (
-            <Pressable onPress={() => navigation.navigate('Modal')}>
-              {({ pressed }) => (
-                <FontAwesome
-                  name="info-circle"
-                  size={25}
-                  color="gray"
-                  style={[
-                    {
-                      marginRight: 16,
-                      opacity: pressed ? 0.5 : 1,
-                    },
-                  ]}
-                />
-              )}
-            </Pressable>
-          ),
+          headerRight: () => <HeaderButton onPress={() => navigation.navigate('Modal')} />,
           drawerIcon: ({ size, color }) => (
             <MaterialIcons name="border-bottom" size={size} color={color} />
           ),
         }}
-       />
-		</Drawer.Navigator>
-	);
+      />
+    </Drawer.Navigator>
+  );
 }