diff --git a/apps/mobile/app.d.ts b/apps/mobile/app.d.ts new file mode 100644 index 0000000..a13e313 --- /dev/null +++ b/apps/mobile/app.d.ts @@ -0,0 +1 @@ +/// diff --git a/apps/mobile/app/(tabs)/_layout.tsx b/apps/mobile/app/(tabs)/_layout.tsx index 475f761..9e3aad6 100644 --- a/apps/mobile/app/(tabs)/_layout.tsx +++ b/apps/mobile/app/(tabs)/_layout.tsx @@ -1,10 +1,16 @@ import { Tabs } from 'expo-router'; +import { NativeWindStyleSheet } from 'nativewind'; import TabBarIcon from '../../components/TabBarIcon'; -import Colors from '../../constants/Colors.js'; import { globalStyles } from '../../styles/global'; +import useTailwind from '../hooks/useTailwind'; + +NativeWindStyleSheet.setOutput({ + default: 'native', +}); export default function TabLayout() { + const { colors } = useTailwind(); return ( - + No content is served from movie-web directly and movie web does not host anything. - + ); } diff --git a/apps/mobile/app/(tabs)/account.tsx b/apps/mobile/app/(tabs)/account.tsx index ee2ecaa..73f5b6a 100644 --- a/apps/mobile/app/(tabs)/account.tsx +++ b/apps/mobile/app/(tabs)/account.tsx @@ -1,5 +1,5 @@ import ScreenLayout from '../../components/layout/ScreenLayout'; -import { RegularText } from '../../components/ui/Text'; +import { StyledText } from '../../components/ui/Styled'; export default function AccountScreen() { return ( @@ -7,9 +7,7 @@ export default function AccountScreen() { title="Account" subtitle="Manage your movie web account from here" > - - Hey Bro! what are you up to? - + Hey Bro! what are you up to? ); } diff --git a/apps/mobile/app/(tabs)/index.tsx b/apps/mobile/app/(tabs)/index.tsx index b456b98..c1ecd65 100644 --- a/apps/mobile/app/(tabs)/index.tsx +++ b/apps/mobile/app/(tabs)/index.tsx @@ -1,12 +1,10 @@ import ScreenLayout from '../../components/layout/ScreenLayout'; -import { RegularText } from '../../components/ui/Text'; +import { StyledText } from '../../components/ui/Styled'; export default function HomeScreen() { return ( - - Movies will be listed here - + Movies will be listed here ); } diff --git a/apps/mobile/app/(tabs)/search/Searchbar.tsx b/apps/mobile/app/(tabs)/search/Searchbar.tsx index bd09bb1..f289bc7 100644 --- a/apps/mobile/app/(tabs)/search/Searchbar.tsx +++ b/apps/mobile/app/(tabs)/search/Searchbar.tsx @@ -1,13 +1,13 @@ import { FontAwesome5 } from '@expo/vector-icons'; import { useFocusEffect } from 'expo-router'; import { useCallback, useRef, useState } from 'react'; -import { View } from 'react-native'; import { TextInput } from 'react-native-gesture-handler'; -import Colors from '../../../constants/Colors.js'; -import { globalStyles } from '../../../styles/global'; +import { StyledView } from '../../../components/ui/Styled'; +import useTailwind from '../../hooks/useTailwind'; export default function Searchbar() { + const { colors } = useTailwind(); const [keyword, setKeyword] = useState(''); const inputRef = useRef(null); @@ -25,19 +25,19 @@ export default function Searchbar() { ); return ( - - - - + + + + setKeyword(text)} ref={inputRef} placeholder="What are you looking for?" - placeholderTextColor={Colors.shade[200]} - className="rounded-3xl py-3 pr-5 text-white" + placeholderTextColor={colors.shade[200]} + className="w-full rounded-3xl py-3 pr-5 text-white" /> - + ); } diff --git a/apps/mobile/app/(tabs)/search/_layout.tsx b/apps/mobile/app/(tabs)/search/_layout.tsx index 2c8a6b0..5daf1c2 100644 --- a/apps/mobile/app/(tabs)/search/_layout.tsx +++ b/apps/mobile/app/(tabs)/search/_layout.tsx @@ -1,40 +1,33 @@ -import { useFocusEffect } from 'expo-router'; -import { useCallback, useEffect, useRef, useState } from 'react'; -import { Dimensions, ScrollView, View } from 'react-native'; -import { TextInput } from 'react-native-gesture-handler'; +import { ScrollView } from 'react-native'; import Searchbar from './Searchbar'; -import styles from './styles'; import Item from '../../../components/item/item'; import ScreenLayout from '../../../components/layout/ScreenLayout'; -import { BoldText } from '../../../components/ui/Text'; -import { globalStyles } from '../../../styles/global'; +import { StyledText, StyledView } from '../../../components/ui/Styled'; export default function SearchScreen() { return ( - - Search - - + + Search + } subtitle="Looking for something?" > - - + + - - + + - - + + - - + + ); diff --git a/apps/mobile/app/(tabs)/search/styles.tsx b/apps/mobile/app/(tabs)/search/styles.tsx deleted file mode 100644 index d9ac5b0..0000000 --- a/apps/mobile/app/(tabs)/search/styles.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import { StyleSheet } from 'react-native'; - -const styles = StyleSheet.create({ - items: { - display: 'flex', - flexWrap: 'wrap', - justifyContent: 'flex-start', - width: '100%', - flexDirection: 'row', - flex: 1, - }, - itemOuter: { - flexBasis: '50%', - paddingHorizontal: 12, - paddingBottom: 12, - }, -}); - -export default styles; diff --git a/apps/mobile/app/(tabs)/settings.tsx b/apps/mobile/app/(tabs)/settings.tsx index 6c87e60..be769ae 100644 --- a/apps/mobile/app/(tabs)/settings.tsx +++ b/apps/mobile/app/(tabs)/settings.tsx @@ -1,12 +1,10 @@ import ScreenLayout from '../../components/layout/ScreenLayout'; -import { RegularText } from '../../components/ui/Text'; +import { StyledText } from '../../components/ui/Styled'; export default function SettingsScreen() { return ( - - Settings would be listed in here. Coming soon - + Settings would be listed in here. Coming soon ); } diff --git a/apps/mobile/app/[...missing].tsx b/apps/mobile/app/[...missing].tsx index d724747..2335f06 100644 --- a/apps/mobile/app/[...missing].tsx +++ b/apps/mobile/app/[...missing].tsx @@ -1,23 +1,22 @@ import { Link, Stack } from 'expo-router'; -import { View } from 'react-native'; -import { BoldText, RegularText } from '../components/ui/Text'; +import { StyledText, StyledView } from '../components/ui/Styled'; export default function NotFoundScreen() { return ( <> - - + + This screen doesn't exist. - + - + Go to home screen! - + - + ); } diff --git a/apps/mobile/app/_layout.tsx b/apps/mobile/app/_layout.tsx index a981ea5..ff6c288 100644 --- a/apps/mobile/app/_layout.tsx +++ b/apps/mobile/app/_layout.tsx @@ -10,7 +10,7 @@ import { SplashScreen, Stack } from 'expo-router'; import { useEffect } from 'react'; import { useColorScheme } from 'react-native'; -import Colors from '../constants/Colors.js'; +import useTailwind from './hooks/useTailwind'; export { // Catch any errors thrown by the Layout component. @@ -57,6 +57,7 @@ export default function RootLayout() { function RootLayoutNav() { const colorScheme = useColorScheme(); + const { colors } = useTailwind(); return ( @@ -65,7 +66,7 @@ function RootLayoutNav() { gestureEnabled: true, headerShown: false, contentStyle: { - backgroundColor: Colors.shade[900], + backgroundColor: colors.shade[900], }, }} > diff --git a/apps/mobile/app/hooks/useTailwind.ts b/apps/mobile/app/hooks/useTailwind.ts new file mode 100644 index 0000000..161f3fb --- /dev/null +++ b/apps/mobile/app/hooks/useTailwind.ts @@ -0,0 +1,13 @@ +import { useMemo } from 'react'; +import resolveConfig from 'tailwindcss/resolveConfig'; + +import tailwindConfig from '../../tailwind.config.js'; + +const useTailwind = () => { + const tailwind = useMemo(() => resolveConfig(tailwindConfig), []); + return { + colors: tailwind.theme.colors, + }; +}; + +export default useTailwind; diff --git a/apps/mobile/components/TabBarIcon.tsx b/apps/mobile/components/TabBarIcon.tsx index 6cb2f1f..3f8736c 100644 --- a/apps/mobile/components/TabBarIcon.tsx +++ b/apps/mobile/components/TabBarIcon.tsx @@ -1,20 +1,16 @@ import { FontAwesome } from '@expo/vector-icons'; -import Colors from '../constants/Colors.js'; +import useTailwind from '../app/hooks/useTailwind'; type Props = { focused?: boolean; - color?: string; } & React.ComponentProps; -export default function TabBarIcon({ - color = Colors.shade[300], - focused, - ...rest -}: Props) { +export default function TabBarIcon({ focused, ...rest }: Props) { + const { colors } = useTailwind(); return ( diff --git a/apps/mobile/components/item/item.tsx b/apps/mobile/components/item/item.tsx index 5d2369b..7acb1e9 100644 --- a/apps/mobile/components/item/item.tsx +++ b/apps/mobile/components/item/item.tsx @@ -1,12 +1,12 @@ -import { Image, View } from 'react-native'; +import { Image } from 'react-native'; import { TMDB_POSTER_PATH } from '../../constants/General'; -import { BoldText, RegularText } from '../ui/Text'; +import { StyledText, StyledView } from '../ui/Styled'; export default function Item() { return ( - - + + - - Hamilton - - Movie - - 2023 - - + + Hamilton + + Movie + + 2023 + + ); } diff --git a/apps/mobile/components/layout/screenLayout.tsx b/apps/mobile/components/layout/screenLayout.tsx index fc56b80..5162b4f 100644 --- a/apps/mobile/components/layout/screenLayout.tsx +++ b/apps/mobile/components/layout/screenLayout.tsx @@ -1,6 +1,4 @@ -import { View } from 'react-native'; - -import { BoldText, RegularText } from '../ui/Text'; +import { StyledText, StyledView } from '../ui/Styled'; type Props = { title?: React.ReactNode | string; @@ -10,15 +8,17 @@ type Props = { export default function ScreenLayout({ title, subtitle, children }: Props) { return ( - + {typeof title === 'string' && ( - {title} + + {title} + )} {typeof title !== 'string' && title} - + {subtitle} - - {children} - + + {children} + ); } diff --git a/apps/mobile/components/layout/styles.tsx b/apps/mobile/components/layout/styles.tsx deleted file mode 100644 index 3fa7d38..0000000 --- a/apps/mobile/components/layout/styles.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import { Dimensions, StyleSheet } from 'react-native'; - -export const styles = StyleSheet.create({ - container: { - minHeight: Dimensions.get('window').height, - }, - children: { - paddingVertical: 12, - }, -}); diff --git a/apps/mobile/components/ui/Styled.tsx b/apps/mobile/components/ui/Styled.tsx new file mode 100644 index 0000000..0e4d2fa --- /dev/null +++ b/apps/mobile/components/ui/Styled.tsx @@ -0,0 +1,6 @@ +import { styled } from 'nativewind'; +import { Text, View } from 'react-native'; + +export const StyledText = styled(Text, 'text-white'); + +export const StyledView = styled(View); diff --git a/apps/mobile/components/ui/Text.tsx b/apps/mobile/components/ui/Text.tsx deleted file mode 100644 index 137d2ee..0000000 --- a/apps/mobile/components/ui/Text.tsx +++ /dev/null @@ -1,44 +0,0 @@ -import { Text } from 'react-native'; - -export function RegularText({ style, children, ...rest }: Text['props']) { - return ( - - {children} - - ); -} -export function BoldText({ style, children, ...rest }: Text['props']) { - return ( - - {children} - - ); -} -export function SemiBoldText({ style, children, ...rest }: Text['props']) { - return ( - - {children} - - ); -} -export function MediumText({ style, children, ...rest }: Text['props']) { - return ( - - {children} - - ); -} -export function ExtraBoldText({ style, children, ...rest }: Text['props']) { - return ( - - {children} - - ); -} -export function LightText({ style, children, ...rest }: Text['props']) { - return ( - - {children} - - ); -} diff --git a/apps/mobile/constants/Colors.ts b/apps/mobile/constants/Colors.ts deleted file mode 100644 index a5afb78..0000000 --- a/apps/mobile/constants/Colors.ts +++ /dev/null @@ -1,42 +0,0 @@ -const tintColorLight = '#2f95dc'; -const tintColorDark = '#fff'; - -// export default { -// light: { -// text: '#000', -// background: '#fff', -// tint: tintColorLight, -// tabIconDefault: '#ccc', -// tabIconSelected: tintColorLight, -// }, -// dark: { -// text: '#fff', -// background: '#000', -// tint: tintColorDark, -// tabIconDefault: '#ccc', -// tabIconSelected: tintColorDark, -// purple100: '#C082FF', -// purple300: '#8D44D6', -// purple400: '#7831BF', -// shade50: '#676790', -// shade200: '#3F3F60', -// shade300: '#32324F', -// shade700: '#131322', -// shade900: '#0A0A12', -// }, -// }; - -export default { - purple: { - 100: '#C082FF', - 300: '#8D44D6', - 400: '#7831BF', - }, - shade: { - 50: '#676790', - 200: '#3F3F60', - 300: '#32324F', - 700: '#131322', - 900: '#0A0A12', - }, -}; diff --git a/apps/mobile/package.json b/apps/mobile/package.json index f4cffec..14e3e79 100644 --- a/apps/mobile/package.json +++ b/apps/mobile/package.json @@ -43,7 +43,7 @@ "react-native-web": "^0.19.10", "react-test-renderer": "*", "typescript": "*", - "tailwindcss": "*" + "tailwindcss": "3.3.2" }, "scripts": { "eas-build-pre-install": "cd ../../ && node tools/scripts/eas-build-pre-install.mjs . apps/mobile && cp pnpm-lock.yaml apps/mobile", @@ -65,7 +65,6 @@ "jest-expo": "~49.0.0", "pod-install": "^0.1.39", "react-test-renderer": "18.2.0", - "tailwindcss": "^3.4.1", "typescript": "~5.2.2" }, "overrides": { diff --git a/apps/mobile/tailwind.config.js b/apps/mobile/tailwind.config.js new file mode 100644 index 0000000..50457ef --- /dev/null +++ b/apps/mobile/tailwind.config.js @@ -0,0 +1,26 @@ +const colors = require('tailwindcss/colors'); + +// https://github.com/marklawlor/nativewind/issues/573 +module.exports = { + content: ['./**/*.{js,jsx,ts,tsx}'], + theme: { + extend: { + colors: { + ...colors, + purple: { + 100: '#C082FF', + 300: '#8D44D6', + 400: '#7831BF', + }, + shade: { + 50: '#676790', + 200: '#3F3F60', + 300: '#32324F', + 700: '#131322', + 900: '#0A0A12', + }, + }, + }, + }, + plugins: [], +}; diff --git a/apps/mobile/tailwind.config.ts b/apps/mobile/tailwind.config.ts deleted file mode 100644 index 8d1224e..0000000 --- a/apps/mobile/tailwind.config.ts +++ /dev/null @@ -1,13 +0,0 @@ -import type { Config } from 'tailwindcss'; - -import colors from './constants/Colors'; - -export default { - content: [], - theme: { - extend: { - colors, - }, - }, - plugins: [], -} satisfies Config; diff --git a/apps/mobile/tsconfig.app.json b/apps/mobile/tsconfig.app.json index 457425b..6d08c79 100644 --- a/apps/mobile/tsconfig.app.json +++ b/apps/mobile/tsconfig.app.json @@ -12,5 +12,5 @@ "**/*.spec.tsx", "test-setup.ts" ], - "include": ["**/*.ts", "**/*.tsx", "**/*.js", "**/*.jsx", "constants/Colors.ts", "tailwind.config.mjs"] + "include": ["**/*.ts", "**/*.tsx", "**/*.js", "**/*.jsx", "tailwind.config.js"] } diff --git a/apps/mobile/tsconfig.json b/apps/mobile/tsconfig.json index 0c82aa7..6ebe3ca 100644 --- a/apps/mobile/tsconfig.json +++ b/apps/mobile/tsconfig.json @@ -11,7 +11,8 @@ "skipLibCheck": true, "resolveJsonModule": true, "strict": true, - "declaration": true + "declaration": true, + "allowJs": true, }, "files": [], "include": [ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 817671e..cc871c3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -156,9 +156,6 @@ importers: prettier: specifier: ^3.0.3 version: 3.2.4 - prettier-plugin-tailwindcss: - specifier: ^0.5.11 - version: 0.5.11(prettier@3.2.4) react-test-renderer: specifier: 18.2.0 version: 18.2.0(react@18.2.0) @@ -245,7 +242,7 @@ importers: version: 0.80.4 nativewind: specifier: ^2.0.11 - version: 2.0.11(react@18.2.0)(tailwindcss@3.4.1) + version: 2.0.11(react@18.2.0)(tailwindcss@3.3.2) pod-install: specifier: '*' version: 0.2.0 @@ -279,13 +276,12 @@ importers: react-test-renderer: specifier: '*' version: 18.2.0(react@18.2.0) + tailwindcss: + specifier: 3.3.2 + version: 3.3.2(ts-node@10.9.1) typescript: specifier: '*' version: 5.2.2 - devDependencies: - tailwindcss: - specifier: ^3.4.1 - version: 3.4.1(ts-node@10.9.1) packages: @@ -309,6 +305,7 @@ packages: /@alloc/quick-lru@5.2.0: resolution: {integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==} engines: {node: '>=10'} + dev: false /@ampproject/remapping@2.2.1: resolution: {integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==} @@ -5723,6 +5720,7 @@ packages: /camelcase-css@2.0.1: resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==} engines: {node: '>= 6'} + dev: false /camelcase@5.3.1: resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==} @@ -6649,6 +6647,7 @@ packages: /didyoumean@1.2.2: resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==} + dev: false /diff-sequences@29.6.3: resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==} @@ -6666,6 +6665,7 @@ packages: /dlv@1.1.3: resolution: {integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==} + dev: false /dns-packet@5.6.1: resolution: {integrity: sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==} @@ -9549,6 +9549,7 @@ packages: /jiti@1.21.0: resolution: {integrity: sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==} hasBin: true + dev: false /jks-js@1.1.0: resolution: {integrity: sha512-irWi8S2V029Vic63w0/TYa8NIZwXu9oeMtHQsX51JDIVBo0lrEaOoyM8ALEEh5PVKD6TrA26FixQK6TzT7dHqA==} @@ -9928,6 +9929,7 @@ packages: /lilconfig@2.1.0: resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==} engines: {node: '>=10'} + dev: false /lilconfig@3.0.0: resolution: {integrity: sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==} @@ -10849,7 +10851,7 @@ packages: engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true - /nativewind@2.0.11(react@18.2.0)(tailwindcss@3.4.1): + /nativewind@2.0.11(react@18.2.0)(tailwindcss@3.3.2): resolution: {integrity: sha512-qCEXUwKW21RYJ33KRAJl3zXq2bCq82WoI564fI21D/TiqhfmstZOqPN53RF8qK1NDK6PGl56b2xaTxgObEePEg==} engines: {node: '>=14.18'} peerDependencies: @@ -10867,7 +10869,7 @@ packages: postcss-css-variables: 0.18.0(postcss@8.4.33) postcss-nested: 5.0.6(postcss@8.4.33) react-is: 18.2.0 - tailwindcss: 3.4.1(ts-node@10.9.1) + tailwindcss: 3.3.2(ts-node@10.9.1) use-sync-external-store: 1.2.0(react@18.2.0) transitivePeerDependencies: - react @@ -11119,6 +11121,7 @@ packages: /object-hash@3.0.0: resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==} engines: {node: '>= 6'} + dev: false /object-inspect@1.13.1: resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==} @@ -11661,6 +11664,7 @@ packages: postcss-value-parser: 4.2.0 read-cache: 1.0.0 resolve: 1.22.8 + dev: false /postcss-js@4.0.1(postcss@8.4.33): resolution: {integrity: sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==} @@ -11670,6 +11674,7 @@ packages: dependencies: camelcase-css: 2.0.1 postcss: 8.4.33 + dev: false /postcss-load-config@4.0.2(postcss@8.4.33)(ts-node@10.9.1): resolution: {integrity: sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==} @@ -11687,6 +11692,7 @@ packages: postcss: 8.4.33 ts-node: 10.9.1(@swc/core@1.3.105)(@types/node@18.16.9)(typescript@5.2.2) yaml: 2.3.4 + dev: false /postcss-loader@6.2.1(postcss@8.4.33)(webpack@5.89.0): resolution: {integrity: sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==} @@ -11818,6 +11824,7 @@ packages: dependencies: postcss: 8.4.33 postcss-selector-parser: 6.0.15 + dev: false /postcss-normalize-charset@6.0.1(postcss@8.4.33): resolution: {integrity: sha512-aW5LbMNRZ+oDV57PF9K+WI1Z8MPnF+A8qbajg/T8PP126YrGX1f9IQx21GI2OlGz7XFJi/fNi0GTbY948XJtXg==} @@ -11982,58 +11989,6 @@ packages: fast-diff: 1.3.0 dev: true - /prettier-plugin-tailwindcss@0.5.11(prettier@3.2.4): - resolution: {integrity: sha512-AvI/DNyMctyyxGOjyePgi/gqj5hJYClZ1avtQvLlqMT3uDZkRbi4HhGUpok3DRzv9z7Lti85Kdj3s3/1CeNI0w==} - engines: {node: '>=14.21.3'} - peerDependencies: - '@ianvs/prettier-plugin-sort-imports': '*' - '@prettier/plugin-pug': '*' - '@shopify/prettier-plugin-liquid': '*' - '@trivago/prettier-plugin-sort-imports': '*' - prettier: ^3.0 - prettier-plugin-astro: '*' - prettier-plugin-css-order: '*' - prettier-plugin-import-sort: '*' - prettier-plugin-jsdoc: '*' - prettier-plugin-marko: '*' - prettier-plugin-organize-attributes: '*' - prettier-plugin-organize-imports: '*' - prettier-plugin-style-order: '*' - prettier-plugin-svelte: '*' - prettier-plugin-twig-melody: '*' - peerDependenciesMeta: - '@ianvs/prettier-plugin-sort-imports': - optional: true - '@prettier/plugin-pug': - optional: true - '@shopify/prettier-plugin-liquid': - optional: true - '@trivago/prettier-plugin-sort-imports': - optional: true - prettier-plugin-astro: - optional: true - prettier-plugin-css-order: - optional: true - prettier-plugin-import-sort: - optional: true - prettier-plugin-jsdoc: - optional: true - prettier-plugin-marko: - optional: true - prettier-plugin-organize-attributes: - optional: true - prettier-plugin-organize-imports: - optional: true - prettier-plugin-style-order: - optional: true - prettier-plugin-svelte: - optional: true - prettier-plugin-twig-melody: - optional: true - dependencies: - prettier: 3.2.4 - dev: true - /prettier@3.2.4: resolution: {integrity: sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ==} engines: {node: '>=14'} @@ -13489,8 +13444,8 @@ packages: tslib: 2.6.2 dev: true - /tailwindcss@3.4.1(ts-node@10.9.1): - resolution: {integrity: sha512-qAYmXRfk3ENzuPBakNK0SRrUDipP8NQnEY6772uDhflcQz5EhRdD7JNZxyrFHVQNCwULPBn6FNPp9brpO7ctcA==} + /tailwindcss@3.3.2(ts-node@10.9.1): + resolution: {integrity: sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==} engines: {node: '>=14.0.0'} hasBin: true dependencies: @@ -13514,10 +13469,12 @@ packages: postcss-load-config: 4.0.2(postcss@8.4.33)(ts-node@10.9.1) postcss-nested: 6.0.1(postcss@8.4.33) postcss-selector-parser: 6.0.15 + postcss-value-parser: 4.2.0 resolve: 1.22.8 sucrase: 3.35.0 transitivePeerDependencies: - ts-node + dev: false /tapable@2.2.1: resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}