Skip to content

Commit b1cb6c3

Browse files
authored
Fixes for expo-router app generation and issues with master merge up (#2772)
* Initial change of imports to use a unified alias * More import updates to fix router app generation * Lint fix * Update test * Fix demo removal for i18n These lines weren't getting removed in demo and failed tests. Did we not have a test for removing demo and compiling? * Need to also transform test setup file * Lint fix * Print command output when it fails for easier debugging * Need to remove App.tsx when using expo-router * Fix patch removal I'm confused about this one, it appeared to work and printed `patches/patch.patch` originally, but now the path isn't including the directory. So added a new CWD to make sure the file gets deleted, otherwise bun fails. * This only applied for the splashscreen changes ...from the test it was copied from * Add error output to ignite-new test as well * Remove test output change for now Potential issue with buffer size. Update to use spawn later so we can stream output. * Make sure test doesn't time out * Pin eslint react plugin version They added a bug, there's a fix but it's unreleased: jsx-eslint/eslint-plugin-react#3821
1 parent ec72bc2 commit b1cb6c3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+158
-164
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
- run:
6464
name: Run jest tests
6565
command: yarn test
66-
no_output_timeout: 5m
66+
no_output_timeout: 10m
6767
- save_cache:
6868
name: Save ignite dependency cache
6969
paths:

boilerplate/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import "@expo/metro-runtime"
22
import * as SplashScreen from "expo-splash-screen"
3-
import App from "./app/app"
3+
import App from "@/app"
44

55
SplashScreen.preventAutoHideAsync()
66

boilerplate/app/components/Button.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import {
77
TextStyle,
88
ViewStyle,
99
} from "react-native"
10-
import type { ThemedStyle, ThemedStyleArray } from "app/theme"
10+
import type { ThemedStyle, ThemedStyleArray } from "@/theme"
1111
import { $styles } from "../theme"
1212
import { Text, TextProps } from "./Text"
13-
import { useAppTheme } from "app/utils/useAppTheme"
13+
import { useAppTheme } from "@/utils/useAppTheme"
1414

1515
type Presets = "default" | "filled" | "reversed"
1616

boilerplate/app/components/Card.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import {
88
ViewProps,
99
ViewStyle,
1010
} from "react-native"
11-
import type { ThemedStyle, ThemedStyleArray } from "app/theme"
11+
import type { ThemedStyle, ThemedStyleArray } from "@/theme"
1212
import { $styles } from "../theme"
1313
import { Text, TextProps } from "./Text"
14-
import { useAppTheme } from "app/utils/useAppTheme"
14+
import { useAppTheme } from "@/utils/useAppTheme"
1515

1616
type Presets = "default" | "reversed"
1717

boilerplate/app/components/EmptyState.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { Image, ImageProps, ImageStyle, StyleProp, TextStyle, View, ViewStyle }
22
import { translate } from "../i18n"
33
import { Button, ButtonProps } from "./Button"
44
import { Text, TextProps } from "./Text"
5-
import { useAppTheme } from "app/utils/useAppTheme"
6-
import type { ThemedStyle } from "app/theme"
5+
import { useAppTheme } from "@/utils/useAppTheme"
6+
import type { ThemedStyle } from "@/theme"
77

88
const sadFace = require("../../assets/images/sad-face.png")
99

boilerplate/app/components/Header.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import { $styles } from "../theme"
1212
import { ExtendedEdge, useSafeAreaInsetsStyle } from "../utils/useSafeAreaInsetsStyle"
1313
import { Icon, IconTypes } from "./Icon"
1414
import { Text, TextProps } from "./Text"
15-
import { useAppTheme } from "app/utils/useAppTheme"
16-
import type { ThemedStyle } from "app/theme"
15+
import { useAppTheme } from "@/utils/useAppTheme"
16+
import type { ThemedStyle } from "@/theme"
1717

1818
export interface HeaderProps {
1919
/**

boilerplate/app/components/ListItem.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import {
1010
import { $styles } from "../theme"
1111
import { Icon, IconTypes } from "./Icon"
1212
import { Text, TextProps } from "./Text"
13-
import type { ThemedStyle } from "app/theme"
14-
import { useAppTheme } from "app/utils/useAppTheme"
13+
import type { ThemedStyle } from "@/theme"
14+
import { useAppTheme } from "@/utils/useAppTheme"
1515

1616
export interface ListItemProps extends TouchableOpacityProps {
1717
/**

boilerplate/app/components/ListView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ForwardedRef, forwardRef, PropsWithoutRef, ReactElement, RefObject } from "react"
22
import { FlatList } from "react-native"
3-
import { isRTL } from "app/i18n"
3+
import { isRTL } from "@/i18n"
44
import { FlashList, FlashListProps } from "@shopify/flash-list"
55

66
export type ListViewRef<T> = FlashList<T> | FlatList<T>

boilerplate/app/components/Screen.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
import { $styles } from "../theme"
1616
import { ExtendedEdge, useSafeAreaInsetsStyle } from "../utils/useSafeAreaInsetsStyle"
1717
import { KeyboardAwareScrollView } from "react-native-keyboard-controller"
18-
import { useAppTheme } from "app/utils/useAppTheme"
18+
import { useAppTheme } from "@/utils/useAppTheme"
1919

2020
export const DEFAULT_BOTTOM_OFFSET = 50
2121

boilerplate/app/components/Text.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import i18n from "i18n-js"
22
import { StyleProp, Text as RNText, TextProps as RNTextProps, TextStyle } from "react-native"
33
import { isRTL, translate, TxKeyPath } from "../i18n"
4-
import type { ThemedStyle, ThemedStyleArray } from "app/theme"
5-
import { useAppTheme } from "app/utils/useAppTheme"
6-
import { typography } from "app/theme/typography"
4+
import type { ThemedStyle, ThemedStyleArray } from "@/theme"
5+
import { useAppTheme } from "@/utils/useAppTheme"
6+
import { typography } from "@/theme/typography"
77
import { ReactNode } from "react"
88

99
type Sizes = keyof typeof $sizeStyles

0 commit comments

Comments
 (0)