Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main branch update from Dev branch #719

Merged
merged 29 commits into from
Feb 8, 2024
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
2d9c672
Refactor: Move web source to sub-package
SnowSuno Jan 1, 2024
00da015
Fix: Move `cypress` dependencies into `@taxi/web` package
SnowSuno Jan 9, 2024
5d50825
Fix: Move `prettier` configs into `@taxi/web` package
SnowSuno Jan 9, 2024
0a759af
Fix: Update `.gitignore` rules for monorepo build files
SnowSuno Jan 10, 2024
8245070
Build: Update `Dockerfile` to build monorepo packages
SnowSuno Jan 10, 2024
0043e47
Add: `.dockerignore`
SnowSuno Jan 10, 2024
b9d456c
Merge pull request #700 from sparcs-kaist/#699-migrate-to-monorepo
SnowSuno Jan 17, 2024
63f01b7
Fix: Update dotenv load path
SnowSuno Jan 17, 2024
5484b36
Fix: Change unmet module resolutions
SnowSuno Jan 17, 2024
1c16f01
Build: Add `build:web` script
SnowSuno Jan 17, 2024
7358a74
Docs: Update development docs
SnowSuno Jan 17, 2024
0043835
Build: Unify and update `tsconfig.json`
SnowSuno Jan 17, 2024
12fac24
Merge pull request #703 from sparcs-kaist/#699.1-migrate-to-monorepo
SnowSuno Jan 18, 2024
ab623cd
Add: Init `@taxi/app` package
SnowSuno Jan 18, 2024
a230234
Add: Implement `WebView` wrapper
SnowSuno Jan 18, 2024
0c45634
Add: Connect local web server with app
SnowSuno Jan 23, 2024
44b0157
Add: Config `@taxi/app` path aliases
SnowSuno Jan 24, 2024
d2eb95f
Add: Navigation packages
SnowSuno Jan 24, 2024
17b39bb
Add: Impl webview screen routing
SnowSuno Jan 24, 2024
d548130
Remove: unused webview listener
SnowSuno Jan 24, 2024
b315981
Fix: remove redundant types
SnowSuno Jan 24, 2024
adedbd9
Fix: Configure socket.io dev proxy
SnowSuno Jan 30, 2024
3d2129d
Add: `start:app:prod` script
SnowSuno Jan 30, 2024
2ff481a
Fix: Temp disable native tab navigation
SnowSuno Jan 30, 2024
036ac16
Add: Inject platform OS in userAgent
SnowSuno Jan 30, 2024
fcf0786
Merge pull request #704 from sparcs-kaist/#702-app-core-package-init
SnowSuno Jan 30, 2024
cc0e067
Fix: Vite .env At config
happycastle114 Jan 30, 2024
314aa17
Fix: Vite config for env
happycastle114 Feb 3, 2024
4a60374
Merge pull request #717 from sparcs-kaist/707-bug-vite-env-파일-작동-안함
14KGun Feb 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add: Init @taxi/app package
SnowSuno committed Jan 18, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit ab623cddf2724bd51e50dd2e6a9014875c6eab03
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node-linker=hoisted
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -4,7 +4,8 @@
"private": true,
"scripts": {
"preinstall": "npx only-allow pnpm",
"web": "pnpm -F @taxi/web",
"app": "pnpm --filter @taxi/app",
"web": "pnpm --filter @taxi/web",
"build:all": "pnpm -r build",
"build:web": "pnpm --filter @taxi/web... build",
"test": "pnpm -r test",
35 changes: 35 additions & 0 deletions packages/app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Learn more https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files

# dependencies
node_modules/

# Expo
.expo/
dist/
web-build/

# Native
*.orig.*
*.jks
*.p8
*.p12
*.key
*.mobileprovision

# Metro
.metro-health-check*

# debug
npm-debug.*
yarn-debug.*
yarn-error.*

# macOS
.DS_Store
*.pem

# local env files
.env*.local

# typescript
*.tsbuildinfo
30 changes: 30 additions & 0 deletions packages/app/app.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"expo": {
"name": "app",
"slug": "app",
"version": "1.0.0",
"orientation": "portrait",
"icon": "./assets/icon.png",
"userInterfaceStyle": "light",
"splash": {
"image": "./assets/splash.png",
"resizeMode": "contain",
"backgroundColor": "#ffffff"
},
"assetBundlePatterns": [
"**/*"
],
"ios": {
"supportsTablet": true
},
"android": {
"adaptiveIcon": {
"foregroundImage": "./assets/adaptive-icon.png",
"backgroundColor": "#ffffff"
}
},
"web": {
"favicon": "./assets/favicon.png"
}
}
}
Binary file added packages/app/assets/adaptive-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/app/assets/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/app/assets/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/app/assets/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions packages/app/babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = function(api) {
api.cache(true);
return {
presets: ['babel-preset-expo'],
};
};
26 changes: 26 additions & 0 deletions packages/app/metro.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// Learn more https://docs.expo.dev/guides/monorepos
const { getDefaultConfig } = require('expo/metro-config');
const { FileStore } = require('metro-cache');
const path = require('path');

const projectRoot = __dirname;
const workspaceRoot = path.resolve(projectRoot, '../..');

const config = getDefaultConfig(projectRoot);

// #1 - Watch all files in the monorepo
config.watchFolders = [workspaceRoot];
// #3 - Force resolving nested modules to the folders below
config.resolver.disableHierarchicalLookup = true;
// #2 - Try resolving with project modules first, then workspace modules
config.resolver.nodeModulesPaths = [
path.resolve(projectRoot, 'node_modules'),
path.resolve(workspaceRoot, 'node_modules'),
];

// Use turborepo to restore the cache when possible
config.cacheStores = [
new FileStore({ root: path.join(projectRoot, 'node_modules', '.cache', 'metro') }),
];

module.exports = config;
24 changes: 24 additions & 0 deletions packages/app/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"name": "@taxi/app",
"version": "1.0.0",
"main": "src/main.js",
"scripts": {
"start": "expo start",
"android": "expo start --android",
"ios": "expo start --ios",
"web": "expo start --web"
},
"dependencies": {
"expo": "~49.0.15",
"expo-status-bar": "~1.6.0",
"react": "18.2.0",
"react-native": "0.72.6",
"uuid": "3.4.0"
},
"devDependencies": {
"@babel/core": "^7.20.0",
"@types/react": "~18.2.14",
"typescript": "^5.1.3"
},
"private": true
}
20 changes: 20 additions & 0 deletions packages/app/src/App.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { StatusBar } from 'expo-status-bar';
import { StyleSheet, Text, View } from 'react-native';

export function App() {
return (
<View style={styles.container}>
<Text>Open up App.tsx to start working on your app!</Text>
<StatusBar style="auto" />
</View>
);
}

const styles = StyleSheet.create({
container: {
flex: 1,
backgroundColor: '#fff',
alignItems: 'center',
justifyContent: 'center',
},
});
4 changes: 4 additions & 0 deletions packages/app/src/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { registerRootComponent } from "expo";
import { App }from "./App";

registerRootComponent(App);
3 changes: 3 additions & 0 deletions packages/app/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": ["expo/tsconfig.base", "../../tsconfig.json"],
}
3,894 changes: 3,381 additions & 513 deletions pnpm-lock.yaml

Large diffs are not rendered by default.