Skip to content

Commit

Permalink
refactor: use standard monorepo project structure (#72)
Browse files Browse the repository at this point in the history
* refactor: change structure to standard monorepo

* refactor: add shared commands to both packages

Signed-off-by: Cedric van Putten <[email protected]>

* fix(ui): add missing `postcss.config.js` for monorepos

* fix: move the build output of `expo-atlas-ui` into `expo-atlas`

* refactor: move `prettier` to root package file

* fix: escape wildcard filter for bun

* chore(ui): update metro config

* chore: speed up CI by moving webui builds to separate job

* refactor(ui): flatten structure without `src`

* refactor(ui): drop production script

* fix(ui): resolve missing renames

* fix(ui): resolve missing `.env`

* fix(ui): resolve module pages stretching out

* fix(example): enable workspace in example app

* refactor: move typescript to root

---------

Signed-off-by: Cedric van Putten <[email protected]>
  • Loading branch information
byCedric authored Aug 29, 2024
1 parent 55ab49e commit 21063d9
Show file tree
Hide file tree
Showing 149 changed files with 1,170 additions and 325 deletions.
20 changes: 5 additions & 15 deletions .github/actions/setup-project/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,11 @@ inputs:
description: Version of Node to install
default: 20.x

with-webui:
description: If the setup should prepare the web UI
type: boolean

runs:
using: composite
steps:
- name: 🏗 Setup Node
uses: oven-sh/setup-bun@v1
uses: oven-sh/setup-bun@v2
with:
bun-version: ${{ inputs.bun-version }}

Expand All @@ -31,18 +27,12 @@ runs:
run: bun install
shell: bash

- name: 📦 Install webui dependencies
if: ${{ inputs.with-webui == 'true' }}
run: bun install
working-directory: webui
shell: bash

- name: ♻️ Restore webui cache
- name: ♻️ Restore Metro cache
if: ${{ inputs.with-webui == 'true' }}
uses: actions/cache@v4
with:
key: webui-metro-${{ runner.os }}-${{ github.sha }}
key: metro-${{ runner.os }}-${{ github.sha }}
restore-keys: |
webui-metro-${{ runner.os }}
metro-${{ runner.os }}
path: |
webui/node_modules/.cache/metro
packages/expo-atlas-ui/node_modules/.cache/metro
33 changes: 9 additions & 24 deletions .github/workflows/review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ concurrency:
cancel-in-progress: true

jobs:
core:
test:
runs-on: ubuntu-latest
steps:
- name: 🏗 Setup repo
Expand All @@ -21,39 +21,24 @@ jobs:
- name: 🏗 Setup project
uses: ./.github/actions/setup-project

- name: 🚨 Lint core
run: bun run lint -- --max-warnings 0
- name: 🚨 Lint project
run: bun run lint

- name: 📋 Typecheck core
- name: 📋 Typecheck project
run: bun run typecheck

- name: 🧪 Test core
run: bun test
- name: 🧪 Test project
run: bun run test

- name: 👷 Build core
run: bun run build

webui:
ui:
runs-on: ubuntu-latest
steps:
- name: 🏗 Setup repo
uses: actions/checkout@v4

- name: 🏗 Setup project
uses: ./.github/actions/setup-project
with:
with-webui: true

# Required for typechecking webui
- name: 👷 Build core
run: bun run build

- name: 📋 Typecheck webui
run: bun run typecheck
working-directory: webui

- name: 👷 Build webui
- name: 👷 Build expo-atlas-ui
run: bun run build
working-directory: webui
env:
EXPO_USE_FAST_RESOLVER: true # Use the faster Metro resolver in SDK 51
working-directory: packages/expo-atlas-ui
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# Learn more https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files

# project
/build
/webui/dist
/apps/*/build
/apps/*/dist
/packages/*/build
/packages/*/dist

# test fixtures
*.temp.jsonl
Expand Down
3 changes: 3 additions & 0 deletions apps/example/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
EXPO_USE_FAST_RESOLVER=true
EXPO_USE_METRO_WORKSPACE_ROOT=true
EXPO_UNSTABLE_ATLAS=true
File renamed without changes.
50 changes: 50 additions & 0 deletions apps/example/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# Welcome to your Expo app 👋

This is an [Expo](https://expo.dev) project created with [`create-expo-app`](https://www.npmjs.com/package/create-expo-app).

## Get started

1. Install dependencies

```bash
npm install
```

2. Start the app

```bash
npx expo start
```

In the output, you'll find options to open the app in a

- [development build](https://docs.expo.dev/develop/development-builds/introduction/)
- [Android emulator](https://docs.expo.dev/workflow/android-studio-emulator/)
- [iOS simulator](https://docs.expo.dev/workflow/ios-simulator/)
- [Expo Go](https://expo.dev/go), a limited sandbox for trying out app development with Expo

You can start developing by editing the files inside the **app** directory. This project uses [file-based routing](https://docs.expo.dev/router/introduction).

## Get a fresh project

When you're ready, run:

```bash
npm run reset-project
```

This command will move the starter code to the **app-example** directory and create a blank **app** directory where you can start developing.

## Learn more

To learn more about developing your project with Expo, look at the following resources:

- [Expo documentation](https://docs.expo.dev/): Learn fundamentals, or go into advanced topics with our [guides](https://docs.expo.dev/guides).
- [Learn Expo tutorial](https://docs.expo.dev/tutorial/introduction/): Follow a step-by-step tutorial where you'll create a project that runs on Android, iOS, and the web.

## Join the community

Join our community of developers creating universal apps.

- [Expo on GitHub](https://github.com/expo/expo): View our open source platform and contribute.
- [Discord community](https://chat.expo.dev): Chat with Expo users and ask questions.
36 changes: 36 additions & 0 deletions apps/example/app.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"expo": {
"name": "example",
"slug": "example",
"version": "1.0.0",
"orientation": "portrait",
"icon": "./assets/images/icon.png",
"scheme": "myapp",
"userInterfaceStyle": "automatic",
"splash": {
"image": "./assets/images/splash.png",
"resizeMode": "contain",
"backgroundColor": "#ffffff"
},
"ios": {
"supportsTablet": true
},
"android": {
"adaptiveIcon": {
"foregroundImage": "./assets/images/adaptive-icon.png",
"backgroundColor": "#ffffff"
}
},
"web": {
"bundler": "metro",
"output": "static",
"favicon": "./assets/images/favicon.png"
},
"plugins": [
"expo-router"
],
"experiments": {
"typedRoutes": true
}
}
}
37 changes: 37 additions & 0 deletions apps/example/app/(tabs)/_layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import { Tabs } from 'expo-router';
import React from 'react';

import { TabBarIcon } from '@/components/navigation/TabBarIcon';
import { Colors } from '@/constants/Colors';
import { useColorScheme } from '@/hooks/useColorScheme';

export default function TabLayout() {
const colorScheme = useColorScheme();

return (
<Tabs
screenOptions={{
tabBarActiveTintColor: Colors[colorScheme ?? 'light'].tint,
headerShown: false,
}}>
<Tabs.Screen
name="index"
options={{
title: 'Home',
tabBarIcon: ({ color, focused }) => (
<TabBarIcon name={focused ? 'home' : 'home-outline'} color={color} />
),
}}
/>
<Tabs.Screen
name="explore"
options={{
title: 'Explore',
tabBarIcon: ({ color, focused }) => (
<TabBarIcon name={focused ? 'code-slash' : 'code-slash-outline'} color={color} />
),
}}
/>
</Tabs>
);
}
102 changes: 102 additions & 0 deletions apps/example/app/(tabs)/explore.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
import Ionicons from '@expo/vector-icons/Ionicons';
import { StyleSheet, Image, Platform } from 'react-native';

import { Collapsible } from '@/components/Collapsible';
import { ExternalLink } from '@/components/ExternalLink';
import ParallaxScrollView from '@/components/ParallaxScrollView';
import { ThemedText } from '@/components/ThemedText';
import { ThemedView } from '@/components/ThemedView';

export default function TabTwoScreen() {
return (
<ParallaxScrollView
headerBackgroundColor={{ light: '#D0D0D0', dark: '#353636' }}
headerImage={<Ionicons size={310} name="code-slash" style={styles.headerImage} />}>
<ThemedView style={styles.titleContainer}>
<ThemedText type="title">Explore</ThemedText>
</ThemedView>
<ThemedText>This app includes example code to help you get started.</ThemedText>
<Collapsible title="File-based routing">
<ThemedText>
This app has two screens:{' '}
<ThemedText type="defaultSemiBold">app/(tabs)/index.tsx</ThemedText> and{' '}
<ThemedText type="defaultSemiBold">app/(tabs)/explore.tsx</ThemedText>
</ThemedText>
<ThemedText>
The layout file in <ThemedText type="defaultSemiBold">app/(tabs)/_layout.tsx</ThemedText>{' '}
sets up the tab navigator.
</ThemedText>
<ExternalLink href="https://docs.expo.dev/router/introduction">
<ThemedText type="link">Learn more</ThemedText>
</ExternalLink>
</Collapsible>
<Collapsible title="Android, iOS, and web support">
<ThemedText>
You can open this project on Android, iOS, and the web. To open the web version, press{' '}
<ThemedText type="defaultSemiBold">w</ThemedText> in the terminal running this project.
</ThemedText>
</Collapsible>
<Collapsible title="Images">
<ThemedText>
For static images, you can use the <ThemedText type="defaultSemiBold">@2x</ThemedText> and{' '}
<ThemedText type="defaultSemiBold">@3x</ThemedText> suffixes to provide files for
different screen densities
</ThemedText>
<Image source={require('@/assets/images/react-logo.png')} style={{ alignSelf: 'center' }} />
<ExternalLink href="https://reactnative.dev/docs/images">
<ThemedText type="link">Learn more</ThemedText>
</ExternalLink>
</Collapsible>
<Collapsible title="Custom fonts">
<ThemedText>
Open <ThemedText type="defaultSemiBold">app/_layout.tsx</ThemedText> to see how to load{' '}
<ThemedText style={{ fontFamily: 'SpaceMono' }}>
custom fonts such as this one.
</ThemedText>
</ThemedText>
<ExternalLink href="https://docs.expo.dev/versions/latest/sdk/font">
<ThemedText type="link">Learn more</ThemedText>
</ExternalLink>
</Collapsible>
<Collapsible title="Light and dark mode components">
<ThemedText>
This template has light and dark mode support. The{' '}
<ThemedText type="defaultSemiBold">useColorScheme()</ThemedText> hook lets you inspect
what the user's current color scheme is, and so you can adjust UI colors accordingly.
</ThemedText>
<ExternalLink href="https://docs.expo.dev/develop/user-interface/color-themes/">
<ThemedText type="link">Learn more</ThemedText>
</ExternalLink>
</Collapsible>
<Collapsible title="Animations">
<ThemedText>
This template includes an example of an animated component. The{' '}
<ThemedText type="defaultSemiBold">components/HelloWave.tsx</ThemedText> component uses
the powerful <ThemedText type="defaultSemiBold">react-native-reanimated</ThemedText> library
to create a waving hand animation.
</ThemedText>
{Platform.select({
ios: (
<ThemedText>
The <ThemedText type="defaultSemiBold">components/ParallaxScrollView.tsx</ThemedText>{' '}
component provides a parallax effect for the header image.
</ThemedText>
),
})}
</Collapsible>
</ParallaxScrollView>
);
}

const styles = StyleSheet.create({
headerImage: {
color: '#808080',
bottom: -90,
left: -35,
position: 'absolute',
},
titleContainer: {
flexDirection: 'row',
gap: 8,
},
});
Loading

0 comments on commit 21063d9

Please sign in to comment.