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.

Sign up for GitHub

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

update rnv version + deps #198

Merged
merged 2 commits into from
Sep 20, 2024
Merged

update rnv version + deps #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77794a4
update rnv version + deps
ElenaDiachenko Sep 18, 2024
6c9e11b
clear code
ElenaDiachenko Sep 18, 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
4 changes: 2 additions & 2 deletions examples/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@react-navigation/native-stack": "^6.9.13",
"@react-navigation/stack": "^6.3.17",
"@types/react-native": "^0.72.2",
"react": "18.2.0",
"react": "18.3.1",
"react-native": "npm:[email protected]",
"react-native-gesture-handler": "^2.12.0",
"react-native-linear-gradient": "^2.8.3",
Expand All @@ -34,7 +34,7 @@
"@react-native-community/eslint-config": "^3.2.0",
"@tsconfig/react-native": "^2.0.2",
"@types/jest": "^29.2.1",
"@types/react": "18.2.52",
"@types/react": "18.3.3",
"@types/react-test-renderer": "^18.0.0",
"babel-jest": "^29.2.1",
"eslint": "^8.19.0",
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"@flexn/prettier-config": "1.0.0",
"@flexn/typescript-config": "1.0.0",
"@flexn/build-hooks": "1.0.0-feat-rnv-update.0",
"@rnv/core": "1.0.0-rc.17",
"@rnv/core": "1.1.0",
"@types/jest": "^29.5.12",
"@types/lodash-es": "~4.17.5",
"@types/lodash.debounce": "~4.0.6",
Expand Down Expand Up @@ -120,7 +120,7 @@
},
"resolutions": {
"@babel/core": "7.24.4",
"@types/react": "18.2.52",
"@types/react": "18.3.3",
"tslib": "2.5.2"
}
}
28 changes: 14 additions & 14 deletions packages/app-harness/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,22 +63,22 @@
"@react-navigation/routers": "6.1.9",
"@react-navigation/stack": "6.3.28",
"@react-navigation/web": "1.0.0-alpha.9",
"@rnv/renative": "1.0.0-rc.17",
"@rnv/renative": "1.1.0",
"@sentry/react": "6.13.3",
"@sentry/react-native": "3.1.1",
"@sentry/tracing": "6.13.3",
"next": "14.1.4",
"raf": "3.4.1",
"react": "18.2.0",
"react-art": "18.2.0",
"react-dom": "18.2.0",
"react": "18.3.1",
"react-art": "18.3.1",
"react-dom": "18.3.1",
"react-native": "0.73.4",
"react-native-carplay": "2.0.0",
"react-native-gesture-handler": "2.14.1",
"react-native-gesture-handler": "2.16.2",
"react-native-google-cast": "4.6.0",
"react-native-media-query": "2.0.0",
"react-native-reanimated": "3.6.1",
"react-native-safe-area-context": "4.9.0",
"react-native-reanimated": "3.11.0",
"react-native-safe-area-context": "4.10.3",
"react-native-screens": "3.29.0",
"react-native-snap-carousel": "3.9.1",
"react-native-tvos": "0.73.6-0",
Expand All @@ -88,13 +88,13 @@
},
"devDependencies": {
"@flexn/create-template-starter": "1.3.0-feat-rnv-update.19",
"@rnv/cli": "1.0.0-rc.17",
"@rnv/config-templates": "1.0.0-rc.17",
"@rnv/engine-rn": "1.0.0-rc.17",
"@rnv/engine-rn-electron": "1.0.0-rc.17",
"@rnv/engine-rn-next": "1.0.0-rc.17",
"@rnv/engine-rn-tvos": "1.0.0-rc.17",
"@rnv/engine-rn-web": "1.0.0-rc.17",
"@rnv/cli": "1.1.0",
"@rnv/config-templates": "1.1.0",
"@rnv/engine-rn": "1.1.0",
"@rnv/engine-rn-electron": "1.1.0",
"@rnv/engine-rn-next": "1.1.0",
"@rnv/engine-rn-tvos": "1.1.0",
"@rnv/engine-rn-web": "1.1.0",
"jetifier": "1.6.5"
},
"private": true,
Expand Down
1 change: 1 addition & 0 deletions packages/create/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"files": [
"lib",
"ios",
"src",
"android",
"tools",
"!android/build",
Expand Down
36 changes: 18 additions & 18 deletions packages/template-starter/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,34 +82,34 @@
"@react-navigation/routers": "6.1.9",
"@react-navigation/stack": "6.3.28",
"@react-navigation/web": "1.0.0-alpha.9",
"@rnv/adapter": "1.0.0-rc.17",
"@rnv/config-templates": "1.0.0-rc.17",
"@rnv/core": "1.0.0-rc.17",
"@rnv/engine-rn": "1.0.0-rc.17",
"@rnv/engine-rn-electron": "1.0.0-rc.17",
"@rnv/engine-rn-next": "1.0.0-rc.17",
"@rnv/engine-rn-tvos": "1.0.0-rc.17",
"@rnv/engine-rn-web": "1.0.0-rc.17",
"@rnv/renative": "1.0.0-rc.17",
"@types/react": "18.2.52",
"@types/react-dom": "18.2.18",
"@rnv/adapter": "1.1.0",
"@rnv/config-templates": "1.1.0",
"@rnv/core": "1.1.0",
"@rnv/engine-rn": "1.1.0",
"@rnv/engine-rn-electron": "1.1.0",
"@rnv/engine-rn-next": "1.1.0",
"@rnv/engine-rn-tvos": "1.1.0",
"@rnv/engine-rn-web": "1.1.0",
"@rnv/renative": "1.1.0",
"@types/react": "18.3.3",
"@types/react-dom": "18.3.0",
"@types/react-native": "0.72.3",
"babel-loader": "9.1.3",
"jetifier": "1.6.5",
"next": "14.1.4",
"raf": "3.4.1",
"react": "18.2.0",
"react-art": "18.2.0",
"react-dom": "18.2.0",
"react": "18.3.1",
"react-art": "18.3.1",
"react-dom": "18.3.1",
"react-native": "0.73.4",
"react-native-gesture-handler": "2.14.1",
"react-native-gesture-handler": "2.16.2",
"react-native-media-query": "2.0.0",
"react-native-reanimated": "3.6.1",
"react-native-safe-area-context": "4.9.0",
"react-native-reanimated": "3.11.0",
"react-native-safe-area-context": "4.10.3",
"react-native-screens": "3.29.0",
"react-native-tvos": "0.73.6-0",
"react-native-vector-icons": "10.0.3",
"react-native-web": "0.18.9"
"react-native-web": "0.19.12"
},
"publishConfig": {
"access": "public"
Expand Down
17 changes: 6 additions & 11 deletions packages/template-starter/renative.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"version": "1.3.0-feat-rnv-update.19"
},
"@rnv/renative": {
"version": "1.0.0-rc.17"
"version": "1.1.0"
},
"react-native-vector-icons": "source:rnv",
"@react-navigation/core": "source:rnv",
Expand Down Expand Up @@ -71,7 +71,7 @@
"react-native": "source:rnv",
"next": "source:rnv",
"react-native-web": {
"version": "0.18.9"
"version": "0.19.12"
},
"react-native-tvos": "source:rnv"
},
Expand All @@ -81,6 +81,7 @@
"targetSdkVersion": 34,
"compileSdkVersion": 34,
"buildToolsVersion": "34.0.0",
"ndkVersion": "26.0.10792818",
"gradleBuildToolsVersion": "4.2.2",
"gradleWrapperVersion": "8.3",
"kotlinVersion": "1.8.0",
Expand Down Expand Up @@ -140,15 +141,11 @@
},
"web": {
"engine": "engine-rn-next",
"nextTranspileModules": [
"lodash-es"
]
"nextTranspileModules": ["lodash-es"]
},
"chromecast": {
"engine": "engine-rn-next",
"nextTranspileModules": [
"lodash-es"
]
"nextTranspileModules": ["lodash-es"]
},
"tizen": {
"engine": "engine-rn-web",
Expand All @@ -166,9 +163,7 @@
},
"macos": {
"engine": "engine-rn-electron",
"excludedPlugins": [
"react-native-linear-gradient"
]
"excludedPlugins": ["react-native-linear-gradient"]
}
},
"permissions": {
Expand Down
17 changes: 9 additions & 8 deletions packages/template-starter/renative.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,24 @@
"package_json": {
"devDependencies": {
"typescript": "5.2.2",
"@types/react": "18.2.52",
"@types/react-dom": "18.2.18",
"@types/react": "18.3.3",
"@types/react-dom": "18.3.0",
"@types/react-native": "0.72.3",
"@flexn/typescript-config": "1.0.0",
"@flexn/assets-create-outline": "1.0.0",
"@types/react-native-vector-icons": "6.4.13",
"@rnv/core": "1.0.0-rc.17",
"@rnv/cli": "1.0.0-rc.17",
"@rnv/adapter": "1.0.0-rc.17",
"@rnv/config-templates": "1.0.0-rc.17"
"@rnv/core": "1.1.0",
"@rnv/cli": "1.1.0",
"@rnv/adapter": "1.1.0",
"@rnv/config-templates": "1.1.0"
},
"dependencies": {
"axios": "1.6.8",
"next": "14.1.4"
"next": "14.1.4",
"babel-loader": "9.1.3"
},
"resolutions": {
"react-native-web": "0.18.9"
"react-native-web": "0.19.12"
},
"browserslist": ["> 2%"]
}
Expand Down
23 changes: 15 additions & 8 deletions packages/template-starter/src/pages/_app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,30 @@
import React from 'react';
import React, { useEffect, useState } from 'react';
import { Debugger, App } from '@flexn/create';
import Menu from '../components/menu';
import { themeStyles, ThemeProvider } from '../config';
import { AppProps } from 'next/app';
import Head from 'next/head';

export default function MyApp({ Component, pageProps }: AppProps<any>) {
const [isClient, setIsClient] = useState(false);

useEffect(() => {
setIsClient(true);
}, []);
return (
<>
<Head>
<meta name="viewport" content="width=device-width, initial-scale=1" />
</Head>
<ThemeProvider>
<Menu />
<App style={themeStyles.appContainer}>
<Component {...pageProps} />
<Debugger />
</App>
</ThemeProvider>
{isClient ? (
<ThemeProvider>
<Menu />
<App style={themeStyles.appContainer}>
<Component {...pageProps} />
<Debugger />
</App>
</ThemeProvider>
) : null}
</>
);
}
37 changes: 20 additions & 17 deletions packages/template-starter/src/screens/carousels.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,26 +95,29 @@ const ScreenCarousels = ({ navigation }: { navigation?: any }) => {
<ScrollView {...testProps('template-carousels-screen-container')} style={styles.wrapper}>
{data.map((list, index) => (
<View style={styles.listSeparator} key={index}>
<FlashList
data={list}
extraData={{ dark }}
renderItem={(props) => renderItem({ ...props, listIndex: index })}
type="row"
estimatedItemSize={getCarouselSize().height}
horizontal
drawDistance={
isPlatformWebos || isPlatformTizen
? Dimensions.get('window').width / 3
: Ratio(Dimensions.get('window').width)
}
showsHorizontalScrollIndicator={false}
<View
style={{
flex: 1,
...(isFactorTv && {
width: Dimensions.get('screen').width - Ratio(100),
}),
}}
/>
>
<FlashList
data={list}
extraData={{ dark }}
renderItem={(props) => renderItem({ ...props, listIndex: index })}
type="row"
estimatedItemSize={getCarouselSize().height}
horizontal
drawDistance={
isPlatformWebos || isPlatformTizen
? Dimensions.get('window').width / 3
: Ratio(Dimensions.get('window').width)
}
showsHorizontalScrollIndicator={false}
/>
</View>
</View>
))}
</ScrollView>
Expand All @@ -133,9 +136,9 @@ const styles = StyleSheet.create({
top: Ratio(30),
marginBottom: isFactorTv ? Ratio(30) : 20,
height: Dimensions.get('screen').height,
...isFactorMobile && {
marginBottom: 100
}
...(isFactorMobile && {
marginBottom: 100,
}),
},
listSeparator: {
paddingBottom: isPlatformMacos || isPlatformWeb ? Ratio(20) : Ratio(30),
Expand Down
Loading
Loading