Skip to content

Commit 5042c86

Browse files
committed
chore: upgrade depenendecies
1 parent 34c907e commit 5042c86

File tree

16 files changed

+1997
-1226
lines changed

16 files changed

+1997
-1226
lines changed

example/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
"@expo/vector-icons": "^10.2.0",
1717
"@react-native-community/masked-view": "^0.1.10",
1818
"color": "^3.1.2",
19-
"expo": "^37.0.8",
20-
"expo-asset": "~8.1.3",
19+
"expo": "^37.0.12",
20+
"expo-asset": "~8.1.5",
2121
"expo-blur": "~8.1.0",
2222
"koa": "^2.12.0",
2323
"react": "~16.9.0",
@@ -29,32 +29,32 @@
2929
"react-native-restart": "^0.0.15",
3030
"react-native-safe-area-context": "^1.0.0",
3131
"react-native-screens": "^2.7.0",
32-
"react-native-tab-view": "2.14.0",
32+
"react-native-tab-view": "2.14.4",
3333
"react-native-unimodules": "~0.9.1",
3434
"react-native-vector-icons": "^6.6.0",
3535
"react-native-web": "^0.11.7"
3636
},
3737
"devDependencies": {
38-
"@babel/node": "^7.8.7",
39-
"@expo/webpack-config": "^0.11.19",
38+
"@babel/node": "^7.10.1",
39+
"@expo/webpack-config": "^0.12.12",
4040
"@types/cheerio": "^0.22.18",
4141
"@types/jest-dev-server": "^4.2.0",
4242
"@types/koa": "^2.11.3",
4343
"@types/node-fetch": "^2.5.7",
44-
"@types/react": "^16.9.34",
44+
"@types/react": "^16.9.36",
4545
"@types/react-dom": "^16.9.8",
4646
"@types/react-native": "^0.62.7",
4747
"babel-plugin-module-resolver": "^4.0.0",
48-
"babel-preset-expo": "^8.1.0",
48+
"babel-preset-expo": "^8.2.1",
4949
"cheerio": "^1.0.0-rc.3",
50-
"expo-cli": "^3.20.1",
50+
"expo-cli": "^3.21.5",
5151
"jest": "^26.0.1",
5252
"jest-dev-server": "^4.4.0",
5353
"mock-require-assets": "^0.0.1",
5454
"node-fetch": "^2.6.0",
5555
"nodemon": "^2.0.4",
5656
"playwright": "^0.14.0",
57-
"serve": "^11.3.0",
58-
"typescript": "^3.8.3"
57+
"serve": "^11.3.2",
58+
"typescript": "^3.9.5"
5959
}
6060
}

example/src/Shared/Albums.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@ export default function Albums(props: Partial<ScrollViewProps>) {
8181
}
8282

8383
const styles = StyleSheet.create({
84-
content: {
85-
flexDirection: 'row',
86-
flexWrap: 'wrap',
87-
},
8884
...Platform.select({
8985
web: {
9086
content: {

package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,26 +25,26 @@
2525
"example": "yarn --cwd example"
2626
},
2727
"devDependencies": {
28-
"@babel/plugin-proposal-class-properties": "^7.8.3",
29-
"@babel/plugin-proposal-optional-chaining": "^7.9.0",
30-
"@babel/preset-env": "^7.9.6",
31-
"@babel/preset-flow": "^7.9.0",
32-
"@babel/preset-react": "^7.9.4",
33-
"@babel/preset-typescript": "^7.9.0",
34-
"@babel/runtime": "^7.9.6",
28+
"@babel/plugin-proposal-class-properties": "^7.10.1",
29+
"@babel/plugin-proposal-optional-chaining": "^7.10.1",
30+
"@babel/preset-env": "^7.10.2",
31+
"@babel/preset-flow": "^7.10.1",
32+
"@babel/preset-react": "^7.10.1",
33+
"@babel/preset-typescript": "^7.10.1",
34+
"@babel/runtime": "^7.10.2",
3535
"@commitlint/config-conventional": "^8.3.4",
36-
"@types/jest": "^25.2.1",
36+
"@types/jest": "^26.0.0",
3737
"babel-jest": "^26.0.1",
38-
"codecov": "^3.6.5",
38+
"codecov": "^3.7.0",
3939
"commitlint": "^8.3.5",
4040
"core-js": "^3.6.5",
41-
"eslint": "^6.8.0",
41+
"eslint": "^7.2.0",
4242
"eslint-config-satya164": "^3.1.7",
4343
"husky": "^4.2.5",
4444
"jest": "^26.0.1",
45-
"lerna": "^3.20.2",
45+
"lerna": "^3.22.1",
4646
"prettier": "^2.0.5",
47-
"typescript": "^3.8.3"
47+
"typescript": "^3.9.5"
4848
},
4949
"resolutions": {
5050
"react": "~16.9.0",

packages/bottom-tabs/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@
3636
"react-native-iphone-x-helper": "^1.2.1"
3737
},
3838
"devDependencies": {
39-
"@react-native-community/bob": "^0.14.3",
39+
"@react-native-community/bob": "^0.15.1",
4040
"@react-navigation/native": "^5.5.1",
4141
"@types/color": "^3.0.1",
42-
"@types/react": "^16.9.34",
42+
"@types/react": "^16.9.36",
4343
"@types/react-native": "^0.62.7",
44-
"del-cli": "^3.0.0",
44+
"del-cli": "^3.0.1",
4545
"react": "~16.9.0",
4646
"react-native": "~0.61.5",
4747
"react-native-safe-area-context": "^1.0.0",
4848
"react-native-screens": "^2.7.0",
49-
"typescript": "^3.8.3"
49+
"typescript": "^3.9.5"
5050
},
5151
"peerDependencies": {
5252
"@react-navigation/native": "^5.0.5",

packages/compat/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
"clean": "del lib"
2828
},
2929
"devDependencies": {
30-
"@react-native-community/bob": "^0.14.3",
30+
"@react-native-community/bob": "^0.15.1",
3131
"@react-navigation/native": "^5.5.1",
32-
"@types/react": "^16.9.34",
32+
"@types/react": "^16.9.36",
3333
"react": "~16.9.0",
34-
"typescript": "^3.8.3"
34+
"typescript": "^3.9.5"
3535
},
3636
"peerDependencies": {
3737
"@react-navigation/native": "^5.0.5",

packages/core/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,21 @@
3333
"dependencies": {
3434
"@react-navigation/routers": "^5.4.7",
3535
"escape-string-regexp": "^4.0.0",
36-
"nanoid": "^3.1.5",
37-
"query-string": "^6.12.1",
36+
"nanoid": "^3.1.9",
37+
"query-string": "^6.13.1",
3838
"react-is": "^16.13.0",
3939
"use-subscription": "^1.4.0"
4040
},
4141
"devDependencies": {
42-
"@react-native-community/bob": "^0.14.3",
43-
"@types/react": "^16.9.34",
42+
"@react-native-community/bob": "^0.15.1",
43+
"@types/react": "^16.9.36",
4444
"@types/react-is": "^16.7.1",
4545
"@types/use-subscription": "^1.0.0",
46-
"del-cli": "^3.0.0",
46+
"del-cli": "^3.0.1",
4747
"react": "~16.9.0",
48-
"react-native-testing-library": "^1.13.2",
48+
"react-native-testing-library": "^2.1.0",
4949
"react-test-renderer": "~16.13.1",
50-
"typescript": "^3.8.3"
50+
"typescript": "^3.9.5"
5151
},
5252
"peerDependencies": {
5353
"react": "*"

packages/core/src/types.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,10 @@ export type TypedNavigator<
461461
route: RouteProp<ParamList, keyof ParamList>;
462462
navigation: any;
463463
}) => ScreenOptions);
464+
/**
465+
* Configuration for screens
466+
*/
467+
children: React.ReactNode;
464468
}
465469
>;
466470
/**

packages/core/src/useDescriptors.tsx

Lines changed: 46 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -112,56 +112,53 @@ export default function useDescriptors<
112112
emitter,
113113
});
114114

115-
return state.routes.reduce(
116-
(acc, route) => {
117-
const screen = screens[route.name];
118-
const navigation = navigations[route.key];
115+
return state.routes.reduce<
116+
Record<string, Descriptor<ParamListBase, string, State, ScreenOptions>>
117+
>((acc, route) => {
118+
const screen = screens[route.name];
119+
const navigation = navigations[route.key];
119120

120-
const routeOptions = {
121-
// The default `screenOptions` passed to the navigator
122-
...(typeof screenOptions === 'object' || screenOptions == null
123-
? screenOptions
124-
: screenOptions({
125-
// @ts-ignore
126-
route,
127-
navigation,
128-
})),
129-
// The `options` prop passed to `Screen` elements
130-
...(typeof screen.options === 'object' || screen.options == null
131-
? screen.options
132-
: screen.options({
133-
// @ts-ignore
134-
route,
135-
// @ts-ignore
136-
navigation,
137-
})),
138-
// The options set via `navigation.setOptions`
139-
...options[route.key],
140-
};
121+
const routeOptions = {
122+
// The default `screenOptions` passed to the navigator
123+
...(typeof screenOptions === 'object' || screenOptions == null
124+
? screenOptions
125+
: screenOptions({
126+
// @ts-ignore
127+
route,
128+
navigation,
129+
})),
130+
// The `options` prop passed to `Screen` elements
131+
...(typeof screen.options === 'object' || screen.options == null
132+
? screen.options
133+
: screen.options({
134+
// @ts-ignore
135+
route,
136+
// @ts-ignore
137+
navigation,
138+
})),
139+
// The options set via `navigation.setOptions`
140+
...options[route.key],
141+
};
141142

142-
acc[route.key] = {
143-
navigation,
144-
render() {
145-
return (
146-
<NavigationBuilderContext.Provider key={route.key} value={context}>
147-
<SceneView
148-
navigation={navigation}
149-
route={route}
150-
screen={screen}
151-
getState={getState}
152-
setState={setState}
153-
options={routeOptions}
154-
/>
155-
</NavigationBuilderContext.Provider>
156-
);
157-
},
158-
options: routeOptions,
159-
};
143+
acc[route.key] = {
144+
navigation,
145+
render() {
146+
return (
147+
<NavigationBuilderContext.Provider key={route.key} value={context}>
148+
<SceneView
149+
navigation={navigation}
150+
route={route}
151+
screen={screen}
152+
getState={getState}
153+
setState={setState}
154+
options={routeOptions}
155+
/>
156+
</NavigationBuilderContext.Provider>
157+
);
158+
},
159+
options: routeOptions as ScreenOptions,
160+
};
160161

161-
return acc;
162-
},
163-
{} as {
164-
[key: string]: Descriptor<ParamListBase, string, State, ScreenOptions>;
165-
}
166-
);
162+
return acc;
163+
}, {});
167164
}

packages/drawer/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,18 @@
4141
"react-native-iphone-x-helper": "^1.2.1"
4242
},
4343
"devDependencies": {
44-
"@react-native-community/bob": "^0.14.3",
44+
"@react-native-community/bob": "^0.15.1",
4545
"@react-navigation/native": "^5.5.1",
46-
"@types/react": "^16.9.34",
46+
"@types/react": "^16.9.36",
4747
"@types/react-native": "^0.62.7",
48-
"del-cli": "^3.0.0",
48+
"del-cli": "^3.0.1",
4949
"react": "~16.9.0",
5050
"react-native": "~0.61.5",
5151
"react-native-gesture-handler": "^1.6.0",
5252
"react-native-reanimated": "^1.8.0",
5353
"react-native-safe-area-context": "^1.0.0",
5454
"react-native-screens": "^2.7.0",
55-
"typescript": "^3.8.3"
55+
"typescript": "^3.9.5"
5656
},
5757
"peerDependencies": {
5858
"@react-navigation/native": "^5.0.5",

packages/material-bottom-tabs/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@
3737
"clean": "del lib"
3838
},
3939
"devDependencies": {
40-
"@react-native-community/bob": "^0.14.3",
40+
"@react-native-community/bob": "^0.15.1",
4141
"@react-navigation/native": "^5.5.1",
42-
"@types/react": "^16.9.34",
42+
"@types/react": "^16.9.36",
4343
"@types/react-native": "^0.62.7",
4444
"@types/react-native-vector-icons": "^6.4.5",
45-
"del-cli": "^3.0.0",
45+
"del-cli": "^3.0.1",
4646
"react": "~16.9.0",
4747
"react-native": "~0.61.5",
4848
"react-native-paper": "^3.10.1",
4949
"react-native-vector-icons": "^6.6.0",
50-
"typescript": "^3.8.3"
50+
"typescript": "^3.9.5"
5151
},
5252
"peerDependencies": {
5353
"@react-navigation/native": "^5.0.5",

0 commit comments

Comments
 (0)