This commit is contained in:
Jorrin
2024-01-29 10:34:51 +01:00
parent 5baf4d6b86
commit a7608b878d
18 changed files with 35 additions and 64 deletions

View File

@@ -17,7 +17,7 @@ module.exports = {
settings: { settings: {
'import/resolver': { 'import/resolver': {
typescript: { typescript: {
project: './tsconfig.json', project: ['./tsconfig.base.json', './apps/*/tsconfig.json'],
}, },
}, },
}, },

View File

@@ -1,7 +1,7 @@
import { Tabs } from 'expo-router'; import { Tabs } from 'expo-router';
import TabBarIcon from '../components/TabBarIcon'; import TabBarIcon from '@/components/TabBarIcon';
import Colors from '../constants/Colors'; import Colors from '@/constants/Colors';
export default function TabLayout() { export default function TabLayout() {
return ( return (

View File

@@ -1,6 +1,5 @@
import { Text } from '../components/ui/Text'; import ScreenLayout from '@/components/layout/ScreenLayout';
import { Text } from '@/components/ui/Text';
import ScreenLayout from '../components/layout/ScreenLayout';
export default function AboutScreen() { export default function AboutScreen() {
return ( return (

View File

@@ -1,5 +1,5 @@
import { Text } from '../components/ui/Text'; import ScreenLayout from '@/components/layout/ScreenLayout';
import ScreenLayout from '../components/layout/ScreenLayout'; import { Text } from '@/components/ui/Text';
export default function AccountScreen() { export default function AccountScreen() {
return ( return (

View File

@@ -1,5 +1,5 @@
import ScreenLayout from '../components/layout/ScreenLayout'; import ScreenLayout from '@/components/layout/ScreenLayout';
import { Text } from '../components/ui/Text'; import { Text } from '@/components/ui/Text';
export default function HomeScreen() { export default function HomeScreen() {
return ( return (

View File

@@ -1,9 +1,10 @@
import { ScrollView, View } from 'react-native'; import { ScrollView, View } from 'react-native';
import { Text } from '../../components/ui/Text';
import Item from '@/components/item/item';
import ScreenLayout from '@/components/layout/ScreenLayout';
import { Text } from '@/components/ui/Text';
import Searchbar from './Searchbar'; import Searchbar from './Searchbar';
import ScreenLayout from '../../components/layout/ScreenLayout';
import Item from '../../components/item/item';
export default function SearchScreen() { export default function SearchScreen() {
return ( return (

View File

@@ -1,6 +1,5 @@
import { Text } from '../components/ui/Text'; import ScreenLayout from '@/components/layout/ScreenLayout';
import { Text } from '@/components/ui/Text';
import ScreenLayout from '../components/layout/ScreenLayout';
export default function SettingsScreen() { export default function SettingsScreen() {
return ( return (

View File

@@ -1,6 +1,7 @@
import { Link, Stack } from 'expo-router'; import { Link, Stack } from 'expo-router';
import { View } from 'react-native'; import { View } from 'react-native';
import { Text } from './components/ui/Text';
import { Text } from '@/components/ui/Text';
export default function NotFoundScreen() { export default function NotFoundScreen() {
return ( return (

View File

@@ -10,7 +10,7 @@ import { SplashScreen, Stack } from 'expo-router';
import { useEffect } from 'react'; import { useEffect } from 'react';
import { useColorScheme } from 'react-native'; import { useColorScheme } from 'react-native';
import Colors from './constants/Colors'; import Colors from '@/constants/Colors';
import './styles/global.css'; import './styles/global.css';

View File

@@ -1,5 +1,6 @@
import { FontAwesome } from '@expo/vector-icons'; import { FontAwesome } from '@expo/vector-icons';
import Colors from '../constants/Colors';
import Colors from '@/constants/Colors';
type Props = { type Props = {
focused?: boolean; focused?: boolean;

View File

@@ -1,7 +1,7 @@
import { Image, View } from 'react-native'; import { Image, View } from 'react-native';
import { Text } from '../../components/ui/Text';
import { TMDB_POSTER_PATH } from '../../constants/General'; import { Text } from '@/components/ui/Text';
import { TMDB_POSTER_PATH } from '@/constants/General';
export default function Item() { export default function Item() {
return ( return (

View File

@@ -1,5 +1,6 @@
import { View } from 'react-native'; import { View } from 'react-native';
import { Text } from '../../components/ui/Text';
import { Text } from '@/components/ui/Text';
type Props = { type Props = {
title?: React.ReactNode | string; title?: React.ReactNode | string;

View File

@@ -1,7 +1,7 @@
import { cva } from 'class-variance-authority'; import { cva } from 'class-variance-authority';
import { Text as RNText, TextProps } from 'react-native'; import { Text as RNText, TextProps } from 'react-native';
import { cn } from '../../lib/utils'; import { cn } from '@/lib/utils';
const textVariants = cva('text-white'); const textVariants = cva('text-white');

View File

@@ -1,5 +1,5 @@
import { ClassValue, clsx } from 'clsx';
import { twMerge } from 'tailwind-merge'; import { twMerge } from 'tailwind-merge';
import { clsx, ClassValue } from 'clsx';
export function cn(...inputs: ClassValue[]) { export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs)); return twMerge(clsx(inputs));

View File

@@ -1,41 +1,3 @@
// const { withNxMetro } = require('@nx/expo');
// const { getDefaultConfig } = require('@expo/metro-config');
// const { mergeConfig } = require('metro-config');
// const { withNativeWind } = require('nativewind/metro');
// const exclusionList = require('metro-config/src/defaults/exclusionList');
// const defaultConfig = getDefaultConfig(__dirname);
// const { assetExts, sourceExts } = defaultConfig.resolver;
// /**
// * Metro configuration
// * https://facebook.github.io/metro/docs/configuration
// *
// * @type {import('metro-config').MetroConfig}
// */
// const customConfig = {
// transformer: {
// babelTransformerPath: require.resolve('react-native-svg-transformer'),
// },
// resolver: {
// assetExts: assetExts.filter((ext) => ext !== 'svg'),
// sourceExts: [...sourceExts, 'svg'],
// blockList: exclusionList([/^(?!.*node_modules).*\/dist\/.*/]),
// // unstable_enableSymlinks: true,
// // unstable_enablePackageExports: true,
// },
// };
// module.exports = withNxMetro(mergeConfig(defaultConfig, customConfig), {
// // Change this to true to see debugging info.
// // Useful if you have issues resolving modules
// debug: false,
// // all the file extensions used for imports other than 'ts', 'tsx', 'js', 'jsx', 'json'
// extensions: [],
// // Specify folders to watch, in addition to Nx defaults (workspace libraries and node_modules)
// watchFolders: [],
// });
const { withNxMetro } = require('@nx/expo'); const { withNxMetro } = require('@nx/expo');
const { getDefaultConfig } = require('@expo/metro-config'); const { getDefaultConfig } = require('@expo/metro-config');
const { mergeConfig } = require('metro-config'); const { mergeConfig } = require('metro-config');

View File

@@ -48,7 +48,8 @@
"react-test-renderer": "*", "react-test-renderer": "*",
"tailwind-merge": "^2.2.1", "tailwind-merge": "^2.2.1",
"tailwindcss": "3.3.2", "tailwindcss": "3.3.2",
"typescript": "*" "typescript": "*",
"prettier-plugin-tailwindcss": "*"
}, },
"scripts": { "scripts": {
"eas-build-pre-install": "cd ../../ && node tools/scripts/eas-build-pre-install.mjs . apps/mobile && cp pnpm-lock.yaml apps/mobile", "eas-build-pre-install": "cd ../../ && node tools/scripts/eas-build-pre-install.mjs . apps/mobile && cp pnpm-lock.yaml apps/mobile",

View File

@@ -3,7 +3,7 @@
"compilerOptions": { "compilerOptions": {
"composite": true, "composite": true,
"outDir": "../../dist/out-tsc", "outDir": "../../dist/out-tsc",
"types": ["node"] "types": ["node"],
}, },
"files": ["../../node_modules/@nx/expo/typings/svg.d.ts"], "files": ["../../node_modules/@nx/expo/typings/svg.d.ts"],
"exclude": [ "exclude": [

View File

@@ -10,6 +10,12 @@
"strict": true, "strict": true,
"declaration": true, "declaration": true,
"allowJs": true, "allowJs": true,
"baseUrl": "./",
"paths": {
"@/*": [
"./app/*"
],
}
}, },
"files": [], "files": [],
"include": [".expo/types/**/*.ts", "expo-env.d.ts"], "include": [".expo/types/**/*.ts", "expo-env.d.ts"],