create-expo-stack 2.10.0-next.3e39eed → 2.10.0-next.4433ac0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/build/templates/packages/nativewindui/drawer/app/_layout.tsx.ejs +84 -61
  2. package/build/templates/packages/nativewindui/tabs/app/+not-found.tsx.ejs +3 -3
  3. package/build/templates/packages/nativewindui/tabs/app/_layout.tsx.ejs +85 -57
  4. package/build/utilities/configureProjectFiles.js +2 -1
  5. package/build/utilities/generateProjectFiles.js +13 -15
  6. package/package.json +1 -1
package/build/templates/packages/nativewindui/drawer/app/_layout.tsx.ejs CHANGED
@@ -1,73 +1,96 @@
1
- <% if (props.stylingPackage?.name === "nativewind") { %>
2
- import '../global.css';
3
- <% } else if (props.stylingPackage?.name === "nativewinui") { %>
4
- import '../global.css';
5
- import 'expo-dev-client';
1
+ import '../global.css';
2
+ import 'expo-dev-client';
3
+ import { ThemeProvider as NavThemeProvider } from '@react-navigation/native';
4
+ import { Icon } from '@roninoss/icons';
5
+ <% if (props.stylingPackage?.options.selectedComponents.includes('action-sheet')) { %>
6
+ import { ActionSheetProvider } from '@expo/react-native-action-sheet';
6
7
  <% } %>
7
- <% if (props.stylingPackage?.name === "unistyles") { %>
8
- import '../unistyles';
8
+ <% if (props.stylingPackage?.options.selectedComponents.includes('bottom-sheet')) { %>
9
+ import { BottomSheetModalProvider } from '@gorhom/bottom-sheet';
9
10
  <% } %>
10
-
11
- <% if (props.internalizationPackage?.name === "i18next") { %>
12
- import '../translation';
13
- <% } %>
14
-
15
- import 'react-native-gesture-handler';
11
+ import { Link, Stack } from 'expo-router';
12
+ import { StatusBar } from 'expo-status-bar';
13
+ import { Pressable, View } from 'react-native';
14
+ <% if (props.stylingPackage?.options.selectedComponents.includes('bottom-sheet')) { %>
16
15
  import { GestureHandlerRootView } from 'react-native-gesture-handler';
17
- import { Stack } from 'expo-router';
16
+ <% } %>
18
17
 
19
- <% if (props.stylingPackage?.name==="tamagui" ) { %>
20
- import React, { useEffect } from "react";
21
- import { TamaguiProvider } from 'tamagui'
22
- import { SplashScreen } from "expo-router";
23
- import { useFonts } from "expo-font";
18
+ import { ThemeToggle } from '~/components/nativewindui/ThemeToggle';
19
+ import { cn } from '~/lib/cn';
20
+ import { useColorScheme, useInitialAndroidBarSync } from '~/lib/useColorScheme';
21
+ import { NAV_THEME } from '~/theme';
24
22
 
25
- import config from '../tamagui.config';
23
+ export {
24
+ // Catch any errors thrown by the Layout component.
25
+ ErrorBoundary,
26
+ } from 'expo-router';
26
27
 
27
- SplashScreen.preventAutoHideAsync();
28
- <% } else if (props.stylingPackage?.name === "restyle") { %>
29
- import { ThemeProvider } from '@shopify/restyle';
30
-
31
- import { theme } from '../theme';
32
- <% } %>
28
+ export default function RootLayout() {
29
+ useInitialAndroidBarSync();
30
+ const { colorScheme, isDarkColorScheme } = useColorScheme();
33
31
 
34
- export const unstable_settings = {
35
- // Ensure that reloading on `/modal` keeps a back button present.
36
- initialRouteName: "(drawer)",
37
- };
32
+ return (
33
+ <>
34
+ <StatusBar
35
+ key={`root-status-bar-${isDarkColorScheme ? 'light' : 'dark'}`}
36
+ style={isDarkColorScheme ? 'light' : 'dark'}
37
+ />
38
+ <% if (props.stylingPackage?.options.selectedComponents.includes('bottom-sheet')) { %>
39
+ <GestureHandlerRootView style={{ flex: 1 }}>
40
+ <BottomSheetModalProvider>
41
+ <% } %>
42
+ <% if (props.stylingPackage?.options.selectedComponents.includes('action-sheet')) { %>
43
+ <ActionSheetProvider>
44
+ <% } %>
45
+ <NavThemeProvider value={NAV_THEME[colorScheme]}>
46
+ <Stack screenOptions={SCREEN_OPTIONS}>
47
+ <Stack.Screen name="(tabs)" options={DRAWER_OPTIONS} />
48
+ <Stack.Screen name="modal" options={MODAL_OPTIONS} />
49
+ </Stack>
50
+ </NavThemeProvider>
51
+ <% if (props.stylingPackage?.options.selectedComponents.includes('action-sheet')) { %>
52
+ </ActionSheetProvider>
53
+ <% } %>
54
+ <% if (props.stylingPackage?.options.selectedComponents.includes('bottom-sheet')) { %>
55
+ </BottomSheetModalProvider>
56
+ </GestureHandlerRootView>
57
+ <% } %>
58
+ </>
59
+ );
60
+ }
38
61
 
39
- export default function RootLayout() {
40
- <% if (props.stylingPackage?.name==="tamagui" ) { %>
41
- const [loaded] = useFonts({
42
- Inter: require("@tamagui/font-inter/otf/Inter-Medium.otf"),
43
- InterBold: require("@tamagui/font-inter/otf/Inter-Bold.otf")
44
- });
62
+ const SCREEN_OPTIONS = {
63
+ animation: 'ios', // for android
64
+ } as const;
45
65
 
46
- useEffect(() => {
47
- if (loaded) {
48
- SplashScreen.hideAsync();
49
- }
50
- }, [loaded]);
66
+ const DRAWER_OPTIONS = {
67
+ headerShown: false,
68
+ } as const;
51
69
 
52
- if (!loaded) return null;
53
- <% } %>
70
+ const INDEX_OPTIONS = {
71
+ headerLargeTitle: true,
72
+ title: 'NativeWindUI',
73
+ headerRight: () => <SettingsIcon />,
74
+ } as const;
54
75
 
55
- return (
56
- <% if (props.stylingPackage?.name === "tamagui") { %>
57
- <TamaguiProvider config={config}>
58
- <% } else if (props.stylingPackage?.name === "restyle") { %>
59
- <ThemeProvider theme={theme}>
60
- <% } %>
61
- <GestureHandlerRootView style={{ flex: 1 }}>
62
- <Stack>
63
- <Stack.Screen name="(drawer)" options={{ headerShown: false }} />
64
- <Stack.Screen name="modal" options={{ title: 'Modal', presentation: 'modal' }} />
65
- </Stack>
66
- </GestureHandlerRootView>
67
- <% if (props.stylingPackage?.name === "tamagui") { %>
68
- </TamaguiProvider>
69
- <% } else if (props.stylingPackage?.name === "restyle") { %>
70
- </ThemeProvider>
71
- <% } %>
76
+ function SettingsIcon() {
77
+ const { colors } = useColorScheme();
78
+ return (
79
+ <Link href="/modal" asChild>
80
+ <Pressable className="opacity-80">
81
+ {({ pressed }) => (
82
+ <View className={cn(pressed ? 'opacity-50' : 'opacity-90')}>
83
+ <Icon name="cog-outline" color={colors.foreground} />
84
+ </View>
85
+ )}
86
+ </Pressable>
87
+ </Link>
72
88
  );
73
- }
89
+ }
90
+
91
+ const MODAL_OPTIONS = {
92
+ presentation: 'modal',
93
+ animation: 'fade_from_bottom', // for android
94
+ title: 'Settings',
95
+ headerRight: () => <ThemeToggle />,
96
+ } as const;
package/build/templates/packages/nativewindui/tabs/app/+not-found.tsx.ejs CHANGED
@@ -1,5 +1,5 @@
1
1
  import { Link, Stack } from 'expo-router';
2
- <% if (props.stylingPackage?.name === "nativewind") {%>
2
+ <% if (props.stylingPackage?.name === "nativewind" || "natiwindui") {%>
3
3
  import { Text, View } from 'react-native';
4
4
  <% } else if (props.stylingPackage?.name === "unistyles") { %>
5
5
  import { createStyleSheet, useStyles } from 'react-native-unistyles'
@@ -23,7 +23,7 @@ export default function NotFoundScreen() {
23
23
  <% } %>
24
24
 
25
25
  return (
26
- <% if (props.stylingPackage?.name === "nativewind") {%>
26
+ <% if (props.stylingPackage?.name === "nativewind" || "nativewindui") {%>
27
27
  <>
28
28
  <Stack.Screen options={{ title: "Oops!" }} />
29
29
  <View className={styles.container}>
@@ -71,7 +71,7 @@ export default function NotFoundScreen() {
71
71
  );
72
72
  }
73
73
 
74
- <% if (props.stylingPackage?.name === "nativewind") { %>
74
+ <% if (props.stylingPackage?.name === "nativewind" || "nativewindui") { %>
75
75
  const styles = {
76
76
  container: `items-center flex-1 justify-center p-5`,
77
77
  title: `text-xl font-bold`,
package/build/templates/packages/nativewindui/tabs/app/_layout.tsx.ejs CHANGED
@@ -1,68 +1,96 @@
1
- <% if (props.stylingPackage?.name === "nativewind") { %>
2
- import '../global.css';
3
- <% } else if (props.stylingPackage?.name === "nativewinui") { %>
4
- import '../global.css';
5
- import 'expo-dev-client';
1
+ import '../global.css';
2
+ import 'expo-dev-client';
3
+ import { ThemeProvider as NavThemeProvider } from '@react-navigation/native';
4
+ import { Icon } from '@roninoss/icons';
5
+ <% if (props.stylingPackage?.options.selectedComponents.includes('action-sheet')) { %>
6
+ import { ActionSheetProvider } from '@expo/react-native-action-sheet';
6
7
  <% } %>
7
- <% if (props.stylingPackage?.name === "unistyles") { %>
8
- import '../unistyles';
8
+ <% if (props.stylingPackage?.options.selectedComponents.includes('bottom-sheet')) { %>
9
+ import { BottomSheetModalProvider } from '@gorhom/bottom-sheet';
9
10
  <% } %>
10
- <% if (props.internalizationPackage?.name === "i18next") { %>
11
- import '../translation';
11
+ import { Link, Stack } from 'expo-router';
12
+ import { StatusBar } from 'expo-status-bar';
13
+ import { Pressable, View } from 'react-native';
14
+ <% if (props.stylingPackage?.options.selectedComponents.includes('bottom-sheet')) { %>
15
+ import { GestureHandlerRootView } from 'react-native-gesture-handler';
12
16
  <% } %>
13
17
 
14
- <% if (props.stylingPackage?.name === "tamagui") { %>
15
- import React, { useEffect } from "react";
16
- import { TamaguiProvider } from 'tamagui'
17
- import { SplashScreen, Stack } from "expo-router";
18
- import { useFonts } from "expo-font";
18
+ import { ThemeToggle } from '~/components/nativewindui/ThemeToggle';
19
+ import { cn } from '~/lib/cn';
20
+ import { useColorScheme, useInitialAndroidBarSync } from '~/lib/useColorScheme';
21
+ import { NAV_THEME } from '~/theme';
19
22
 
20
- import config from '../tamagui.config'
23
+ export {
24
+ // Catch any errors thrown by the Layout component.
25
+ ErrorBoundary,
26
+ } from 'expo-router';
21
27
 
22
- SplashScreen.preventAutoHideAsync();
23
- <% } else if (props.stylingPackage?.name === "restyle") { %>
24
- import { ThemeProvider } from '@shopify/restyle';
25
- import { Stack } from 'expo-router';
26
- import { theme } from 'theme';
27
- <% } else { %>
28
- import { Stack } from "expo-router";
29
- <% } %>
28
+ export default function RootLayout() {
29
+ useInitialAndroidBarSync();
30
+ const { colorScheme, isDarkColorScheme } = useColorScheme();
30
31
 
31
- export const unstable_settings = {
32
- // Ensure that reloading on `/modal` keeps a back button present.
33
- initialRouteName: "(tabs)",
34
- };
32
+ return (
33
+ <>
34
+ <StatusBar
35
+ key={`root-status-bar-${isDarkColorScheme ? 'light' : 'dark'}`}
36
+ style={isDarkColorScheme ? 'light' : 'dark'}
37
+ />
38
+ <% if (props.stylingPackage?.options.selectedComponents.includes('bottom-sheet')) { %>
39
+ <GestureHandlerRootView style={{ flex: 1 }}>
40
+ <BottomSheetModalProvider>
41
+ <% } %>
42
+ <% if (props.stylingPackage?.options.selectedComponents.includes('action-sheet')) { %>
43
+ <ActionSheetProvider>
44
+ <% } %>
45
+ <NavThemeProvider value={NAV_THEME[colorScheme]}>
46
+ <Stack screenOptions={SCREEN_OPTIONS}>
47
+ <Stack.Screen name="(tabs)" options={TABS_OPTIONS} />
48
+ <Stack.Screen name="modal" options={MODAL_OPTIONS} />
49
+ </Stack>
50
+ </NavThemeProvider>
51
+ <% if (props.stylingPackage?.options.selectedComponents.includes('action-sheet')) { %>
52
+ </ActionSheetProvider>
53
+ <% } %>
54
+ <% if (props.stylingPackage?.options.selectedComponents.includes('bottom-sheet')) { %>
55
+ </BottomSheetModalProvider>
56
+ </GestureHandlerRootView>
57
+ <% } %>
58
+ </>
59
+ );
60
+ }
35
61
 
36
- export default function RootLayout() {
37
- <% if (props.stylingPackage?.name === "tamagui") { %>
38
- const [loaded] = useFonts({
39
- Inter: require("@tamagui/font-inter/otf/Inter-Medium.otf"),
40
- InterBold: require("@tamagui/font-inter/otf/Inter-Bold.otf")
41
- });
62
+ const SCREEN_OPTIONS = {
63
+ animation: 'ios', // for android
64
+ } as const;
65
+
66
+ const TABS_OPTIONS = {
67
+ headerShown: false,
68
+ } as const;
42
69
 
43
- useEffect(() => {
44
- if (loaded) {
45
- SplashScreen.hideAsync();
46
- }
47
- }, [loaded]);
70
+ const INDEX_OPTIONS = {
71
+ headerLargeTitle: true,
72
+ title: 'NativeWindUI',
73
+ headerRight: () => <SettingsIcon />,
74
+ } as const;
48
75
 
49
- if (!loaded) return null;
50
- <% } %>
76
+ function SettingsIcon() {
77
+ const { colors } = useColorScheme();
78
+ return (
79
+ <Link href="/modal" asChild>
80
+ <Pressable className="opacity-80">
81
+ {({ pressed }) => (
82
+ <View className={cn(pressed ? 'opacity-50' : 'opacity-90')}>
83
+ <Icon name="cog-outline" color={colors.foreground} />
84
+ </View>
85
+ )}
86
+ </Pressable>
87
+ </Link>
88
+ );
89
+ }
51
90
 
52
- return (
53
- <% if (props.stylingPackage?.name === "tamagui") { %>
54
- <TamaguiProvider config={config}>
55
- <% } else if (props.stylingPackage?.name === "restyle") { %>
56
- <ThemeProvider theme={theme}>
57
- <% } %>
58
- <Stack>
59
- <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
60
- <Stack.Screen name="modal" options={{ presentation: "modal" }} />
61
- </Stack>
62
- <% if (props.stylingPackage?.name === "tamagui") { %>
63
- </TamaguiProvider>
64
- <% } else if (props.stylingPackage?.name === "restyle") { %>
65
- </ThemeProvider>
66
- <% } %>
67
- );
68
- }
91
+ const MODAL_OPTIONS = {
92
+ presentation: 'modal',
93
+ animation: 'fade_from_bottom', // for android
94
+ title: 'Settings',
95
+ headerRight: () => <ThemeToggle />,
96
+ } as const;
package/build/utilities/configureProjectFiles.js CHANGED
@@ -43,6 +43,7 @@ function configureProjectFiles(authenticationPackage, files, navigationPackage,
43
43
  'base/package.json.ejs',
44
44
  'base/.gitignore.ejs',
45
45
  'base/prettier.config.js.ejs',
46
+ 'packages/expo-router/metro.config.js.ejs',
46
47
  'packages/nativewindui/components/BackButton.tsx.ejs',
47
48
  'packages/nativewindui/components/Button.tsx.ejs',
48
49
  'packages/nativewindui/components/Container.tsx.ejs',
@@ -353,4 +354,4 @@ function configureProjectFiles(authenticationPackage, files, navigationPackage,
353
354
  return files;
354
355
  }
355
356
  exports.configureProjectFiles = configureProjectFiles;
356
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"configureProjectFiles.js","sourceRoot":"","sources":["../../src/utilities/configureProjectFiles.ts"],"names":[],"mappings":"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"}
357
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"configureProjectFiles.js","sourceRoot":"","sources":["../../src/utilities/configureProjectFiles.ts"],"names":[],"mappings":"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"}
package/build/utilities/generateProjectFiles.js CHANGED
@@ -33,22 +33,20 @@ function generateProjectFiles(authenticationPackage, cliResults, files, formatte
33
33
  target = target.replace('packages/react-navigation/App.tsx', 'App.tsx');
34
34
  target = target.replace('packages/react-navigation/', '');
35
35
  }
36
- if ((stylingPackage === null || stylingPackage === void 0 ? void 0 : stylingPackage.name) !== 'nativewindui') {
37
- if ((navigationPackage === null || navigationPackage === void 0 ? void 0 : navigationPackage.name) === 'expo-router') {
38
- target = target.replace('packages/expo-router/', '');
39
- if (((_a = navigationPackage === null || navigationPackage === void 0 ? void 0 : navigationPackage.options) === null || _a === void 0 ? void 0 : _a.type) === 'stack') {
40
- target = target.replace('stack/', '');
41
- }
42
- if (((_b = navigationPackage === null || navigationPackage === void 0 ? void 0 : navigationPackage.options) === null || _b === void 0 ? void 0 : _b.type) === 'tabs') {
43
- target = target.replace('tabs/', '');
44
- }
45
- if (((_c = navigationPackage === null || navigationPackage === void 0 ? void 0 : navigationPackage.options) === null || _c === void 0 ? void 0 : _c.type) === 'drawer + tabs') {
46
- target = target.replace('drawer/', '');
47
- }
36
+ if ((navigationPackage === null || navigationPackage === void 0 ? void 0 : navigationPackage.name) === 'expo-router') {
37
+ target = target.replace('packages/expo-router/', '');
38
+ if (((_a = navigationPackage === null || navigationPackage === void 0 ? void 0 : navigationPackage.options) === null || _a === void 0 ? void 0 : _a.type) === 'stack') {
39
+ target = target.replace('stack/', '');
48
40
  }
49
- if ((internalizationPackage === null || internalizationPackage === void 0 ? void 0 : internalizationPackage.name) === 'i18next') {
50
- target = target.replace('packages/i18next/', '');
41
+ if (((_b = navigationPackage === null || navigationPackage === void 0 ? void 0 : navigationPackage.options) === null || _b === void 0 ? void 0 : _b.type) === 'tabs') {
42
+ target = target.replace('tabs/', '');
51
43
  }
44
+ if (((_c = navigationPackage === null || navigationPackage === void 0 ? void 0 : navigationPackage.options) === null || _c === void 0 ? void 0 : _c.type) === 'drawer + tabs') {
45
+ target = target.replace('drawer/', '');
46
+ }
47
+ }
48
+ if ((internalizationPackage === null || internalizationPackage === void 0 ? void 0 : internalizationPackage.name) === 'i18next') {
49
+ target = target.replace('packages/i18next/', '');
52
50
  }
53
51
  var gen = toolbox.template.generate({
54
52
  template: template,
@@ -68,4 +66,4 @@ function generateProjectFiles(authenticationPackage, cliResults, files, formatte
68
66
  }, formattedFiles);
69
67
  }
70
68
  exports.generateProjectFiles = generateProjectFiles;
71
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJhdGVQcm9qZWN0RmlsZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbGl0aWVzL2dlbmVyYXRlUHJvamVjdEZpbGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUdBLFNBQWdCLG9CQUFvQixDQUNsQyxxQkFBb0QsRUFDcEQsVUFBc0IsRUFDdEIsS0FBZSxFQUNmLGNBQXFCLEVBQ3JCLGlCQUFnRCxFQUNoRCxjQUE4QixFQUM5QixjQUE2QyxFQUM3QyxPQUFnQixFQUNoQixzQkFBcUQ7SUFFN0MsSUFBQSxXQUFXLEdBQXNCLFVBQVUsWUFBaEMsRUFBRSxRQUFRLEdBQVksVUFBVSxTQUF0QixFQUFFLEtBQUssR0FBSyxVQUFVLE1BQWYsQ0FBZ0I7SUFFcEQsT0FBTyxLQUFLLENBQUMsTUFBTSxDQUFDLFVBQUMsSUFBSSxFQUFFLElBQUk7O1FBQzdCLElBQU0sUUFBUSxHQUFHLElBQUksQ0FBQztRQUN0QixJQUFJLE1BQU0sR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsQ0FBQztRQUV0QyxJQUFJLENBQUEscUJBQXFCLGFBQXJCLHFCQUFxQix1QkFBckIscUJBQXFCLENBQUUsSUFBSSxNQUFLLFVBQVUsRUFBRSxDQUFDO1lBQy9DLE1BQU0sR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLG9CQUFvQixFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ3BELENBQUM7UUFFRCxJQUFJLENBQUEscUJBQXFCLGFBQXJCLHFCQUFxQix1QkFBckIscUJBQXFCLENBQUUsSUFBSSxNQUFLLFVBQVUsRUFBRSxDQUFDO1lBQy9DLE1BQU0sR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLG9CQUFvQixFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ3BELENBQUM7UUFFRCxNQUFNLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFFckMsSUFBSSxDQUFBLGNBQWMs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
69
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJhdGVQcm9qZWN0RmlsZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbGl0aWVzL2dlbmVyYXRlUHJvamVjdEZpbGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUdBLFNBQWdCLG9CQUFvQixDQUNsQyxxQkFBb0QsRUFDcEQsVUFBc0IsRUFDdEIsS0FBZSxFQUNmLGNBQXFCLEVBQ3JCLGlCQUFnRCxFQUNoRCxjQUE4QixFQUM5QixjQUE2QyxFQUM3QyxPQUFnQixFQUNoQixzQkFBcUQ7SUFFN0MsSUFBQSxXQUFXLEdBQXNCLFVBQVUsWUFBaEMsRUFBRSxRQUFRLEdBQVksVUFBVSxTQUF0QixFQUFFLEtBQUssR0FBSyxVQUFVLE1BQWYsQ0FBZ0I7SUFFcEQsT0FBTyxLQUFLLENBQUMsTUFBTSxDQUFDLFVBQUMsSUFBSSxFQUFFLElBQUk7O1FBQzdCLElBQU0sUUFBUSxHQUFHLElBQUksQ0FBQztRQUN0QixJQUFJLE1BQU0sR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsQ0FBQztRQUV0QyxJQUFJLENBQUEscUJBQXFCLGFBQXJCLHFCQUFxQix1QkFBckIscUJBQXFCLENBQUUsSUFBSSxNQUFLLFVBQVUsRUFBRSxDQUFDO1lBQy9DLE1BQU0sR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLG9CQUFvQixFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ3BELENBQUM7UUFFRCxJQUFJLENBQUEscUJBQXFCLGFBQXJCLHFCQUFxQix1QkFBckIscUJBQXFCLENBQUUsSUFBSSxNQUFLLFVBQVUsRUFBRSxDQUFDO1lBQy9DLE1BQU0sR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLG9CQUFvQixFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ3BELENBQUM7UUFFRCxNQUFNLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFFckMsSUFBSSxDQUFBLGNBQWMs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
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "create-expo-stack",
3
- "version": "2.10.0-next.3e39eed",
3
+ "version": "2.10.0-next.4433ac0",
4
4
  "description": "CLI tool to initialize a React Native application with Expo",
5
5
  "repository": {
6
6
  "type": "git",