create-expo-stack 2.4.0-next.f483b52 → 2.4.1-next.9242c21

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

@@ -1,61 +1,90 @@
-import FontAwesome from "@expo/vector-icons/FontAwesome";
+import FontAwesome from '@expo/vector-icons/FontAwesome';
 import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
 import { StackScreenProps } from '@react-navigation/stack';
-import { Pressable, StyleSheet } from "react-native";
+<% if (props.stylingPackage?.name === 'unistyles') { %>
+import { createStyleSheet, useStyles } from 'react-native-unistyles'
+import { Pressable } from 'react-native';
+<% } else if (props.navigationPackage?.options.type === 'drawer + tabs' ) { %>
+import { StyleSheet } from 'react-native';
+<% } else { %>
+import { Pressable, StyleSheet } from 'react-native';
+<% } %>
 
 import { RootStackParamList } from '.';
-import One from "../screens/one";
-import Two from "../screens/two";
+import One from '../screens/one';
+import Two from '../screens/two';
 
 const Tab = createBottomTabNavigator();
 
 function TabBarIcon(props: {
-  name: React.ComponentProps<typeof FontAwesome>["name"];
+  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} />;
 }
 
 type Props = StackScreenProps<RootStackParamList, 'TabNavigator'>;
 
 export default function TabLayout({ navigation }: Props) {
+  <% if (props.stylingPackage?.name === 'unistyles') {%>
+  const { styles } = useStyles(stylesheet) 
+  <% } %>
+  
   return (
     <Tab.Navigator
       screenOptions={{
-        tabBarActiveTintColor: "black",
+        tabBarActiveTintColor: 'black',
+      <% if (props.navigationPackage?.options.type === 'drawer + tabs') { %>
+        headerShown: false,
+      <% } %>
       }}>
       <Tab.Screen
-        name="One"
+        name='One'
         component={One}
         options={{
-          title: "Tab One",
-          tabBarIcon: ({ color }) => <TabBarIcon name="code" color={color} />,
+          title: 'Tab One',
+          tabBarIcon: ({ color }) => <TabBarIcon name='code' color={color} />,
+        <% if (props.navigationPackage?.options.type === 'tabs') { %>
           headerRight: () => (
-            <Pressable onPress={() => navigation.navigate("Modal")}>
+            <Pressable onPress={() => navigation.navigate('Modal')}>
               {({ pressed }) => (
                 <FontAwesome
-                  name="info-circle"
+                  name='info-circle'
                   size={25}
-                  color="gray"
+                  color='gray'
                   style={[styles.headerRight, { opacity: pressed ? 0.5 : 1 }]}
                 />
               )}
             </Pressable>
-          ),
+            )
+        <% } %>
         }}
       />
       <Tab.Screen
-        name="Two"
+        name='Two'
         component={Two}
         options={{
-          title: "Tab Two",
-          tabBarIcon: ({ color }) => <TabBarIcon name="code" color={color} />,
+          title: 'Tab Two',
+          tabBarIcon: ({ color }) => <TabBarIcon name='code' color={color} />,
         }}
       />
     </Tab.Navigator>
   );
 }
 
+<% if (props.stylingPackage?.name === 'unistyles') { %>
+const stylesheet = createStyleSheet({
+  headerRight: {
+    marginRight: 15
+  },
+  tabBarIcon: {
+    marginBottom: -3
+  }
+});
+<% } else { %>
 const styles = StyleSheet.create({
   headerRight: {
     marginRight: 15
@@ -63,4 +92,5 @@ const styles = StyleSheet.create({
   tabBarIcon: {
     marginBottom: -3
   }
-});
+});
+<% } %>

package/build/templates/packages/react-navigation/screens/details.tsx.ejs

@@ -6,6 +6,9 @@ import { RouteProp, useRoute } from "@react-navigation/native";
 	import { Container, Main, Subtitle, Title } from "../../tamagui.config";
 <% } else if (props.stylingPackage?.name === "restyle") { %>
 	import { Box, Text } from 'theme';
+<% } else if (props.stylingPackage?.name === "unistyles") { %>
+  import { createStyleSheet, useStyles } from 'react-native-unistyles'
+	import { View, Text } from 'react-native';
 <% } else { %>
 	import { View, StyleSheet, Text } from "react-native";
 <% } %>
@@ -45,6 +48,16 @@ export default function Details() {
           </Text>
         </Box>
       </Box>
+    );
+  <% } else if (props.stylingPackage?.name === "unistyles") { %>
+    const { styles, theme } = useStyles(stylesheet)
+    return (
+      <View style={styles.container}>
+        <View style={styles.main}>
+          <Text style={theme.components.title}>Details</Text>
+          <Text style={theme.components.subtitle}>Showing details for user {router.params.name}.</Text>
+        </View>
+      </View>
     );
 	<% } else { %>
 		return (
@@ -65,6 +78,18 @@ export default function Details() {
 		title: "text-[64px] font-bold",
 		subtitle: "text-4xl text-gray-700",
 	};
+<% } else if (props.stylingPackage?.name === "unistyles") { %>
+	const stylesheet = createStyleSheet({
+		container: {
+			flex: 1,
+			padding: 24,
+		},
+		main: {
+			flex: 1,
+			maxWidth: 960,
+			marginHorizontal: 'auto',
+		},
+	});
 <% } else if (props.stylingPackage?.name === "stylesheet") { %>
 	const styles = StyleSheet.create({
 		container: {

package/build/templates/packages/react-navigation/screens/home.tsx.ejs

@@ -0,0 +1,83 @@
+<% 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 if (props.stylingPackage?.name === 'stylesheet') { %>
+  import { StyleSheet, Text, View } from 'react-native';
+<% } %>
+
+const Page = () => {
+  <% if (props.stylingPackage?.name === 'unistyles') { %>
+    const { theme } = useStyles();
+
+    return (
+      <View style={theme.components.container}>
+        <Text style={theme.components.title}>News</Text>
+        <View style={theme.components.separator} />
+      </View>
+    );
+  <% } else if (props.stylingPackage?.name === 'nativewind') { %>
+      return (
+    <View className={styles.container}>
+      <Text className={styles.title}>Home</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>Home</H2>
+        <Separator />
+      </YStack>
+    </Theme>
+  );    
+  <% } else if (props.stylingPackage?.name === 'restyle') { %>
+    return (
+      <Box flex={1} alignItems='center' justifyContent='center'>
+        <Text variant='title'>Home</Text>
+        <Box height={1} marginVertical='l_32' width='80%' />
+      </Box>
+    );
+  <% } else { %>
+      return (
+    <View style={styles.container}>
+      <Text style={styles.title}>Home</Text>
+      <View style={styles.separator} />
+    </View>
+  );
+  <% } %>
+}
+
+export default Page;
+
+<% 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/react-navigation/screens/modal.tsx.ejs

@@ -6,6 +6,9 @@
 <% } else if (props.stylingPackage?.name === "restyle") { %>
     import { Platform } from 'react-native';
     import { Box, Text, makeStyles } 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";
 <% } %>
@@ -45,6 +48,16 @@ export default function Modal() {
         <EditScreenInfo path="src/screens/modal.tsx" />
       </Box>
     );
+  <% } else if (props.stylingPackage?.name === "unistyles") { %>
+    const { theme } = useStyles()
+    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='src/screens/modal.tsx' />
+			</View>
+		);
 	<% } else { %>
 		return (
 			<View style={styles.container}>

package/build/templates/packages/react-navigation/screens/one.tsx.ejs

@@ -4,6 +4,9 @@
   	import { YStack, H2, Separator, Theme } from "tamagui";
 <% } else if (props.stylingPackage?.name === "restyle") { %>
     import { Box, Text, makeStyles } 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";
 <% } %>
@@ -39,6 +42,15 @@ export default function TabOneScreen() {
         <EditScreenInfo path="src/screens/one.tsx" />
       </Box>
     );   
+  <% } else if (props.stylingPackage?.name === "unistyles") { %>
+    const { theme } = useStyles()
+		return (
+			<View style={theme.components.container}>
+				<Text style={theme.components.title}>Tab One</Text>
+				<View style={theme.components.separator} />
+				<EditScreenInfo path='src/screens/one.tsx' />
+			</View>
+		);
 	<% } else { %>
 		return (
 			<View style={styles.container}>

package/build/templates/packages/react-navigation/screens/overview.tsx.ejs

@@ -8,6 +8,9 @@ import { StackNavigationProp } from "@react-navigation/stack";
 <% } else if (props.stylingPackage?.name === "restyle") { %>
   import { TouchableOpacity } from 'react-native';
   import { Box, Text, makeStyles } from 'theme';
+<% } else if (props.stylingPackage?.name === "unistyles") { %>
+  import { createStyleSheet, useStyles } from 'react-native-unistyles'
+	import { Text, TouchableOpacity, View } from 'react-native';
 <% } else { %>
 	import { StyleSheet, Text, TouchableOpacity, View } from "react-native";
 <% } %>
@@ -16,7 +19,6 @@ import { RootStackParamList } from "../navigation";
 type OverviewScreenNavigationProps = StackNavigationProp<RootStackParamList, "Overview">;
 
 export default function Overview() {
-  const styles = useStyles();
 	const navigation = useNavigation<OverviewScreenNavigationProps>();
   	<% if (props.stylingPackage?.name === "nativewind") { %>
 		return (
@@ -47,6 +49,7 @@ export default function Overview() {
 			</Container>
 		);
 	<% } else if (props.stylingPackage?.name === "restyle") { %>
+    const styles = useStyles();
     return (
       <Box flex={1} padding="ml_24">
         <Box flex={1} maxWidth={960} justifyContent="space-between">
@@ -66,7 +69,22 @@ export default function Overview() {
         </Box>
       </Box>
     );
-	<% } else { %>
+	<% } else if (props.stylingPackage?.name === "unistyles") { %>
+    const { styles, theme } = useStyles(stylesheet)
+		return (
+			<View style={styles.container}>
+				<View style={styles.main}>
+					<View>
+						<Text style={theme.components.title}>Hello World</Text>
+						<Text style={theme.components.subtitle}>This is the first page of your app.</Text>
+					</View>
+					<TouchableOpacity style={theme.components.button} onPress={() => navigation.navigate('Details', { name: 'Dan' })}>
+						<Text style={theme.components.buttonText}>Show Details</Text>
+					</TouchableOpacity>
+				</View>
+			</View>
+		);
+  <% } else { %>
 		return (
 			<View style={styles.container}>
 				<View style={styles.main}>
@@ -111,6 +129,19 @@ export default function Overview() {
       shadowRadius: 3.84,
     },
   }));
+<% } else if (props.stylingPackage?.name === "unistyles") { %>
+  const stylesheet = createStyleSheet({
+		container: {
+			flex: 1,
+			padding: 24,
+		},
+		main: {
+			flex: 1,
+			maxWidth: 960,
+			marginHorizontal: 'auto',
+			justifyContent: 'space-between',
+		},
+	});
 <% } else if (props.stylingPackage?.name === "stylesheet") { %>
 	const styles = StyleSheet.create({
 		button: {

package/build/templates/packages/react-navigation/screens/two.tsx.ejs

@@ -4,6 +4,9 @@
   	import { YStack, H2, Separator, Theme } from "tamagui";
 <% } else if (props.stylingPackage?.name === "restyle") { %>
     import { Box, Text, makeStyles } 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";
 <% } %>
@@ -29,6 +32,15 @@ export default function TabTwoScreen() {
 				</YStack>
 			</Theme>
 		);    
+  <% } else 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='src/screens/two.tsx' />
+			</View>
+		);
 	<% } else if (props.stylingPackage?.name === "restyle") { %>
     const styles = useStyles();
 

package/build/templates/packages/unistyles/breakpoints.ts.ejs

@@ -0,0 +1,9 @@
+export const breakpoints = {
+  xs: 0,
+  sm: 576,
+  md: 768,
+  lg: 992,
+  xl: 1200,
+  superLarge: 2000,
+  tvLike: 4000
+} as const;

package/build/templates/packages/unistyles/theme.ts.ejs

@@ -0,0 +1,76 @@
+const colors = {
+  white: '#ffffff',
+  azureRadiance: '#007AFF',
+  limedSpruce: '#38434D',
+  cornflowerBlue: '#6366F1',
+  astral: '#2E78B7'
+} as const;
+
+export const lightTheme = {
+  colors,
+  components: {
+    <% if (props.navigationPackage?.options.type === 'tabs' || props.navigationPackage?.options.type === 'drawer') {%>
+    container: {
+			alignItems: 'center',
+			flex: 1,
+			justifyContent: 'center'
+		},
+    title: {
+      fontSize: 20,
+      fontWeight: 'bold',
+    },
+    <% if (props.navigationPackage?.name === 'expo-router') { %>
+    separator: {
+      height: 1,
+      marginVertical: 30,
+      width: '80%',
+    },
+    <% } else { %>
+    separator: {
+      backgroundColor: 'gray',
+      height: 1,
+      marginVertical: 30,
+      opacity: 0.25,
+      width: '80%',
+    },
+    <% } %>
+    <% } else { %>
+     button: {
+      alignItems: 'center',
+      backgroundColor: colors.cornflowerBlue,
+      borderRadius: 24,
+      elevation: 5,
+      flexDirection: 'row',
+      justifyContent: 'center',
+      padding: 16,
+      shadowColor: '#000',
+      shadowOffset: {
+        height: 2,
+        width: 0,
+      },
+      shadowOpacity: 0.25,
+      shadowRadius: 3.84,
+    },
+    buttonText: {
+      color: colors.white,
+      fontSize: 16,
+      fontWeight: '600',
+      textAlign: 'center',
+    },
+    title: {
+      fontSize: 64,
+      fontWeight: 'bold',
+    },
+    subtitle: {
+      color: colors.limedSpruce,
+      fontSize: 36,
+    },
+    <% } %>
+  },
+  margins: {
+    sm: 2,
+    md: 4,
+    lg: 8,
+    xl: 12,
+  },
+} as const;

package/build/templates/packages/unistyles/unistyles.ts.ejs

@@ -0,0 +1,27 @@
+import { UnistylesRegistry } from 'react-native-unistyles';
+
+import { breakpoints } from './breakpoints';
+import { lightTheme } from './theme';
+
+type AppBreakpoints = typeof breakpoints;
+
+// if you defined themes
+type AppThemes = {
+  light: typeof lightTheme;
+};
+
+// override library types
+declare module 'react-native-unistyles' {
+  export interface UnistylesBreakpoints extends AppBreakpoints {}
+  export interface UnistylesThemes extends AppThemes {}
+}
+
+UnistylesRegistry.addBreakpoints(breakpoints)
+  .addThemes({
+    light: lightTheme,
+    // register other themes with unique names
+  })
+  .addConfig({
+    // you can pass here optional config described below
+    adaptiveThemes: true,
+  });

package/build/types/types.d.ts

@@ -5,8 +5,8 @@ export interface CliFlags {
     importAlias: string | boolean;
     packageManager: PackageManager;
 }
-export declare const availablePackages: readonly ["@react-navigation/drawer", "expo-router", "expoRouter", "firebase", "nativewind", "react-navigation", "reactNavigation", "react-native-gesture-handler", "react-native-reanimated", "reactnavigation", "stylesheet", "supabase", "tamagui", "restyle"];
-export type NavigationTypes = 'stack' | 'tabs' | 'drawer' | undefined;
+export declare const availablePackages: readonly ["@react-navigation/drawer", "expo-router", "expoRouter", "firebase", "nativewind", "react-navigation", "reactNavigation", "react-native-gesture-handler", "react-native-reanimated", "reactnavigation", "stylesheet", "supabase", "tamagui", "restyle", "unistyles"];
+export type NavigationTypes = 'stack' | 'tabs' | 'drawer + tabs' | undefined;
 export type PackageManager = 'yarn' | 'npm' | 'pnpm' | 'bun';
 export type AvailablePackages = {
     name: (typeof availablePackages)[number];

package/build/types/utilities/printOutput.d.ts

@@ -1,3 +1,3 @@
 import { Toolbox } from 'gluegun/build/types/domain/toolbox';
-import { CliResults } from '../types';
-export declare function printOutput(cliResults: CliResults, formattedFiles: any[], toolbox: Toolbox): Promise<void>;
+import { AvailablePackages, CliResults } from '../types';
+export declare function printOutput(cliResults: CliResults, formattedFiles: any[], toolbox: Toolbox, stylingPackage: AvailablePackages): Promise<void>;

package/build/types.js

@@ -15,6 +15,7 @@ exports.availablePackages = [
     'stylesheet',
     'supabase',
     'tamagui',
-    'restyle'
+    'restyle',
+    'unistyles'
 ];
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBU2EsUUFBQSxpQkFBaUIsR0FBRztJQUMvQiwwQkFBMEI7SUFDMUIsYUFBYTtJQUNiLFlBQVk7SUFDWixVQUFVO0lBQ1YsWUFBWTtJQUNaLGtCQUFrQjtJQUNsQixpQkFBaUI7SUFDakIsOEJBQThCO0lBQzlCLHlCQUF5QjtJQUN6QixpQkFBaUI7SUFDakIsWUFBWTtJQUNaLFVBQVU7SUFDVixTQUFTO0lBQ1QsU0FBUztDQUNELENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBU2EsUUFBQSxpQkFBaUIsR0FBRztJQUMvQiwwQkFBMEI7SUFDMUIsYUFBYTtJQUNiLFlBQVk7SUFDWixVQUFVO0lBQ1YsWUFBWTtJQUNaLGtCQUFrQjtJQUNsQixpQkFBaUI7SUFDakIsOEJBQThCO0lBQzlCLHlCQUF5QjtJQUN6QixpQkFBaUI7SUFDakIsWUFBWTtJQUNaLFVBQVU7SUFDVixTQUFTO0lBQ1QsU0FBUztJQUNULFdBQVc7Q0FDSCxDQUFDIn0=

package/build/utilities/configureProjectFiles.js

@@ -32,7 +32,12 @@ function configureProjectFiles(authenticationPackage, files, navigationPackage,
     // add nativewind files if needed
     // modify base files with nativewind specifications
     if ((stylingPackage === null || stylingPackage === void 0 ? void 0 : stylingPackage.name) === 'nativewind') {
-        var nativewindFiles = ['packages/nativewind/tailwind.config.js.ejs', 'packages/nativewind/app-env.d.ts'];
+        var nativewindFiles = [
+            'packages/nativewind/tailwind.config.js.ejs',
+            'packages/nativewind/app-env.d.ts',
+            'packages/nativewind/metro.config.js',
+            'packages/nativewind/global.css'
+        ];
         files = __spreadArray(__spreadArray([], files, true), nativewindFiles, true);
     }
     // add tamagui files if needed
@@ -52,6 +57,16 @@ function configureProjectFiles(authenticationPackage, files, navigationPackage,
         ];
         files = __spreadArray(__spreadArray([], files, true), restyleFiles, true);
     }
+    // add unistyles files if needed
+    // modify base files with unis specifications
+    if ((stylingPackage === null || stylingPackage === void 0 ? void 0 : stylingPackage.name) === 'unistyles') {
+        var unistylesFiles = [
+            'packages/unistyles/breakpoints.ts.ejs',
+            'packages/unistyles/theme.ts.ejs',
+            'packages/unistyles/unistyles.ts.ejs'
+        ];
+        files = __spreadArray(__spreadArray([], files, true), unistylesFiles, true);
+    }
     // add react navigation files if needed
     // modify base files with react navigation specifications
     if ((navigationPackage === null || navigationPackage === void 0 ? void 0 : navigationPackage.name) === 'react-navigation') {
@@ -76,11 +91,13 @@ function configureProjectFiles(authenticationPackage, files, navigationPackage,
                 'packages/react-navigation/screens/two.tsx.ejs'
             ], false);
         }
-        else if (((_c = navigationPackage === null || navigationPackage === void 0 ? void 0 : navigationPackage.options) === null || _c === void 0 ? void 0 : _c.type) === 'drawer') {
+        else if (((_c = navigationPackage === null || navigationPackage === void 0 ? void 0 : navigationPackage.options) === null || _c === void 0 ? void 0 : _c.type) === 'drawer + tabs') {
             // it's a drawer navigator
             reactNavigationFiles = __spreadArray(__spreadArray([], reactNavigationFiles, true), [
                 'packages/react-navigation/components/edit-screen-info.tsx.ejs',
                 'packages/react-navigation/navigation/drawer-navigator.tsx.ejs',
+                'packages/react-navigation/navigation/tab-navigator.tsx.ejs',
+                'packages/react-navigation/screens/home.tsx.ejs',
                 'packages/react-navigation/screens/modal.tsx.ejs',
                 'packages/react-navigation/screens/one.tsx.ejs',
                 'packages/react-navigation/screens/two.tsx.ejs'
@@ -95,7 +112,7 @@ function configureProjectFiles(authenticationPackage, files, navigationPackage,
     if ((navigationPackage === null || navigationPackage === void 0 ? void 0 : navigationPackage.name) === 'expo-router') {
         var expoRouterFiles = [
             'packages/expo-router/expo-env.d.ts',
-            'packages/expo-router/metro.config.js',
+            'packages/expo-router/metro.config.js.ejs',
             'packages/expo-router/index.ts'
         ];
         // if it's a stack, add the stack files) {
@@ -124,12 +141,16 @@ function configureProjectFiles(authenticationPackage, files, navigationPackage,
         else {
             // it's a drawer navigator
             expoRouterFiles = __spreadArray(__spreadArray([], expoRouterFiles, true), [
-                'packages/expo-router/drawer/app/(drawer)/_layout.tsx.ejs',
-                'packages/expo-router/drawer/app/(drawer)/index.tsx.ejs',
-                'packages/expo-router/drawer/app/(drawer)/news.tsx.ejs',
                 'packages/expo-router/drawer/app/_layout.tsx.ejs',
                 'packages/expo-router/drawer/app/[...unmatched].tsx.ejs',
-                'packages/expo-router/drawer/app/+html.tsx.ejs'
+                'packages/expo-router/drawer/app/+html.tsx.ejs',
+                'packages/expo-router/drawer/app/(drawer)/_layout.tsx.ejs',
+                'packages/expo-router/drawer/app/(drawer)/index.tsx.ejs',
+                'packages/expo-router/drawer/app/(drawer)/(tabs)/_layout.tsx.ejs',
+                'packages/expo-router/drawer/app/(drawer)/(tabs)/index.tsx.ejs',
+                'packages/expo-router/drawer/app/(drawer)/(tabs)/two.tsx.ejs',
+                'packages/expo-router/drawer/app/modal.tsx.ejs',
+                'packages/expo-router/drawer/components/edit-screen-info.tsx.ejs'
             ], false);
         }
         // Remove the base App.tsx.ejs file since we'll be using index.tsx from expo-router
@@ -153,4 +174,4 @@ function configureProjectFiles(authenticationPackage, files, navigationPackage,
     return files;
 }
 exports.configureProjectFiles = configureProjectFiles;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlndXJlUHJvamVjdEZpbGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxpdGllcy9jb25maWd1cmVQcm9qZWN0RmlsZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBRUEseURBQXdEO0FBRXhELFNBQWdCLHFCQUFxQixDQUNuQyxxQkFBb0QsRUFDcEQsS0FBZSxFQUNmLGlCQUFnRCxFQUNoRCxjQUE2QyxFQUM3QyxPQUFnQixFQUNoQixVQUFzQjs7SUFFdEIsMkRBQTJEO0lBQzNELElBQU0sU0FBUyxHQUFHO1FBQ2hCLHdCQUF3QjtRQUN4QixtQkFBbUI7UUFDbkIsa0JBQWtCO1FBQ2xCLDBCQUEwQjtRQUMxQix1QkFBdUI7UUFDdkIscUJBQXFCO1FBQ3JCLGtCQUFrQjtLQUNuQixDQUFDO0lBRUYsSUFBTSxjQUFjLEdBQUcsSUFBQSxxQ0FBaUIsRUFBQyxPQUFPLEVBQUUsVUFBVSxDQUFDLENBQUM7SUFDOUQsdURBQXVEO0lBQ3ZELElBQUksY0FBYyxLQUFLLE1BQU0sSUFBSSxDQUFBLGlCQUFpQixhQUFqQixpQkFBaUIsdUJBQWpCLGlCQUFpQixDQUFFLElBQUksTUFBSyxhQUFhLEVBQUUsQ0FBQztRQUMzRSxTQUFTLENBQUMsSUFBSSxDQUFDLGlCQUFpQixDQUFDLENBQUM7SUFDcEMsQ0FBQztJQUVELEtBQUsscUJBQU8sU0FBUyxPQUFDLENBQUM7SUFFdkIsaUNBQWlDO0lBQ2pDLG1EQUFtRDtJQUNuRCxJQUFJLENBQUEsY0FBYyxhQUFkLGNBQWMsdUJBQWQsY0FBYyxDQUFFLElBQUksTUFBSyxZQUFZLEVBQUUsQ0FBQztRQUMxQyxJQUFNLGVBQWUsR0FBRyxDQUFDLDRDQUE0QyxFQUFFLGtDQUFrQyxDQUFDLENBQUM7UUFFM0csS0FBSyxtQ0FBTyxLQUFLLFNBQUssZUFBZSxPQUFDLENBQUM7SUFDekMsQ0FBQztJQUVELDhCQUE4QjtJQUM5QixnREFBZ0Q7SUFDaEQsSUFBSSxD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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlndXJlUHJvamVjdEZpbGVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxpdGllcy9jb25maWd1cmVQcm9qZWN0RmlsZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBRUEseURBQXdEO0FBRXhELFNBQWdCLHFCQUFxQixDQUNuQyxxQkFBb0QsRUFDcEQsS0FBZSxFQUNmLGlCQUFnRCxFQUNoRCxjQUE2QyxFQUM3QyxPQUFnQixFQUNoQixVQUFzQjs7SUFFdEIsMkRBQTJEO0lBQzNELElBQU0sU0FBUyxHQUFHO1FBQ2hCLHdCQUF3QjtRQUN4QixtQkFBbUI7UUFDbkIsa0JBQWtCO1FBQ2xCLDBCQUEwQjtRQUMxQix1QkFBdUI7UUFDdkIscUJBQXFCO1FBQ3JCLGtCQUFrQjtLQUNuQixDQUFDO0lBRUYsSUFBTSxjQUFjLEdBQUcsSUFBQSxxQ0FBaUIsRUFBQyxPQUFPLEVBQUUsVUFBVSxDQUFDLENBQUM7SUFDOUQsdURBQXVEO0lBQ3ZELElBQUksY0FBYyxLQUFLLE1BQU0sSUFBSSxDQUFBLGlCQUFpQixhQUFqQixpQkFBaUIsdUJBQWpCLGlCQUFpQixDQUFFLElBQUksTUFBSyxhQUFhLEVBQUUsQ0FBQztRQUMzRSxTQUFTLENBQUMsSUFBSSxDQUFDLGlCQUFpQixDQUFDLENBQUM7SUFDcEMsQ0FBQztJQUVELEtBQUsscUJBQU8sU0FBUyxPQUFDLENBQUM7SUFFdkIsaUNBQWlDO0lBQ2pDLG1EQUFtRDtJQUNuRCxJQUFJLENBQUEsY0FBYyxhQUFkLGNBQWMsdUJBQWQsY0FBYyxDQUFFLElBQUksTUFBSyxZQUFZLEVBQUUsQ0FBQztRQUMxQyxJQUFNLGVBQWUsR0FBRztZQUN0Qiw0Q0FBNEM7WUFDNUMsa0NBQWtDO1lBQ2xDLHFDQUFxQztZQUNyQyxnQ0FBZ0M7U0FDakMsQ0FBQztRQUVGLEtBQUssbUNBQU8sS0FBSyxTQUFLLGVBQWUsT0FBQyxDQUFDO0lBQ3pDLENBQUM7SUFFRCw4QkFB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