Skip to content

Commit 015c693

Browse files
MoOxMoOx
committed
Upgrade to "reason-react": "^0.9.0", "reason-react-native": "^0.62.0" & "bs-platform": "^8.0.0"
1 parent 49d5c87 commit 015c693

12 files changed

+310
-573
lines changed

‎package.json

+9-10
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"@react-navigation/material-top-tabs": "^5.0.0",
99
"@react-navigation/material-bottom-tabs": "^5.0.0",
1010
"@react-navigation/drawer": "^5.0.0",
11-
"reason-react": "^0.7.0",
12-
"reason-react-native": "^0.61.0"
11+
"reason-react": "^0.9.0",
12+
"reason-react-native": "^0.62.0"
1313
},
1414
"publishConfig": {
1515
"access": "public"
@@ -44,17 +44,16 @@
4444
"release": "npmpub"
4545
},
4646
"devDependencies": {
47-
"bs-platform": "^7.2.0",
48-
"husky": "^1.3.0",
49-
"lint-staged": "^10.1.1",
47+
"bs-platform": "^8.0.0",
48+
"husky": "^4.0.0",
49+
"lint-staged": "^10.0.0",
5050
"npmpub": "^5.0.0",
51-
"prettier": "^1.18.0",
52-
"reason-react": "^0.7.0",
53-
"reason-react-native": "^0.61.0"
51+
"prettier": "^2.0.0",
52+
"reason-react": "^0.9.0",
53+
"reason-react-native": "^0.62.0"
5454
},
5555
"prettier": {
56-
"trailingComma": "all",
57-
"proseWrap": "always"
56+
"trailingComma": "all"
5857
},
5958
"lint-staged": {
6059
"*.{md,json,js,css}": [

‎src/BottomTabs.bs.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var BottomTabs = require("@react-navigation/bottom-tabs");
66
var BottomTabNavigationProp = Core$ReactNavigation.NavigationScreenProp;
77

88
function Make(M) {
9-
var M$1 = { };
9+
var M$1 = {};
1010
var include = Core$ReactNavigation.NavigationScreenProp(M$1);
1111
var Navigation = include;
1212
var bottomTabs = BottomTabs.createBottomTabNavigator();

‎src/Core.bs.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ function NavigationHelpersCommon(M) {
1111
tmp.params = Caml_option.valFromOption(params);
1212
}
1313
tmp.navigate();
14-
return /* () */0;
14+
1515
};
1616
var navigateByName = function (name, key, params, param) {
1717
var tmp = {
@@ -24,7 +24,7 @@ function NavigationHelpersCommon(M) {
2424
tmp.params = Caml_option.valFromOption(params);
2525
}
2626
tmp.navigate();
27-
return /* () */0;
27+
2828
};
2929
return {
3030
navigateByKey: navigateByKey,
@@ -33,7 +33,7 @@ function NavigationHelpersCommon(M) {
3333
}
3434

3535
function EventConsumer(M) {
36-
return { };
36+
return {};
3737
}
3838

3939
function NavigationScreenProp(M) {
@@ -45,7 +45,7 @@ function NavigationScreenProp(M) {
4545
tmp.params = Caml_option.valFromOption(params);
4646
}
4747
tmp.navigate();
48-
return /* () */0;
48+
4949
};
5050
var navigateByName = function (name, key, params, param) {
5151
var tmp = {
@@ -58,7 +58,7 @@ function NavigationScreenProp(M) {
5858
tmp.params = Caml_option.valFromOption(params);
5959
}
6060
tmp.navigate();
61-
return /* () */0;
61+
6262
};
6363
return {
6464
navigateByKey: navigateByKey,

‎src/Drawer.bs.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var Drawer = require("@react-navigation/drawer");
66
var DrawerNavigationProp = Core$ReactNavigation.NavigationScreenProp;
77

88
function Make(M) {
9-
var M$1 = { };
9+
var M$1 = {};
1010
var include = Core$ReactNavigation.NavigationScreenProp(M$1);
1111
var Navigation = include;
1212
var stack = Drawer.createDrawerNavigator();

‎src/Drawer.re

+3-6
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ module Make = (M: {type params;}) => {
7676
=?,
7777
unit
7878
) =>
79-
options =
80-
"";
79+
options;
8180

8281
type optionsProps = {
8382
navigation,
@@ -116,8 +115,7 @@ module Make = (M: {type params;}) => {
116115
}),
117116
unit
118117
) =>
119-
screenProps =
120-
"";
118+
screenProps;
121119
let make = stack##"Screen";
122120
};
123121

@@ -166,8 +164,7 @@ module Make = (M: {type params;}) => {
166164
~style: ReactNative.Style.t=?,
167165
unit
168166
) =>
169-
navigatorProps =
170-
"";
167+
navigatorProps;
171168

172169
let make = stack##"Navigator";
173170
};

‎src/Example.bs.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ var ModalScreen = {
2929
make: Example$ModalScreen
3030
};
3131

32-
var StakeParams = { };
32+
var StakeParams = {};
3333

3434
var include = Stack$ReactNavigation.Make(StakeParams);
3535

@@ -44,15 +44,15 @@ function Example$MainStackScreen(Props) {
4444
children: React.createElement($$Screen.make, {
4545
name: "Home",
4646
options: (function (props) {
47-
var match = props.route.params;
47+
var params = props.route.params;
4848
return {
49-
title: match !== undefined ? match.name : "Reason",
49+
title: params !== undefined ? params.name : "Reason",
5050
headerRight: (function (param) {
5151
return React.createElement(ReactNative.Button, {
5252
color: "#f00",
5353
onPress: (function (param) {
5454
props.navigation.navigate("MyModal");
55-
return /* () */0;
55+
5656
}),
5757
title: "Info"
5858
});
@@ -86,7 +86,7 @@ var MainStackScreen = {
8686
make: Example$MainStackScreen
8787
};
8888

89-
var include$1 = Stack$ReactNavigation.Make({ });
89+
var include$1 = Stack$ReactNavigation.Make({});
9090

9191
var ScreenWithCallback = include$1.ScreenWithCallback;
9292

‎src/MaterialBottomTabs.bs.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ var MaterialBottomTabs = require("@react-navigation/material-bottom-tabs");
77
var MaterialBottomTabNavigationProp = Core$ReactNavigation.NavigationScreenProp;
88

99
function Make(M) {
10-
var M$1 = { };
10+
var M$1 = {};
1111
var include = Core$ReactNavigation.NavigationScreenProp(M$1);
1212
var Navigation = include;
1313
var t = function (prim) {
14-
return Interop.identity(prim[1]);
14+
return Interop.identity(prim.VAL);
1515
};
1616
var $$boolean = function (x) {
1717
return Interop.identity(x);

‎src/MaterialTopTabs.bs.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var MaterialTopTabs = require("@react-navigation/material-top-tabs");
66
var MaterialTopTabNavigationProp = Core$ReactNavigation.NavigationScreenProp;
77

88
function Make(M) {
9-
var M$1 = { };
9+
var M$1 = {};
1010
var include = Core$ReactNavigation.NavigationScreenProp(M$1);
1111
var Navigation = include;
1212
var materialTopTabs = MaterialTopTabs.createMaterialTopTabNavigator();
@@ -22,7 +22,7 @@ function Make(M) {
2222
var $$Navigator = {
2323
make: make$2
2424
};
25-
var MaterialTopTabBar = { };
25+
var MaterialTopTabBar = {};
2626
return {
2727
Navigation: Navigation,
2828
materialTopTabs: materialTopTabs,

‎src/Native.bs.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33

4-
var NavigationContainer = { };
4+
var NavigationContainer = {};
55

66
exports.NavigationContainer = NavigationContainer;
77
/* No side effect */

‎src/NavigationActions.re

+2-4
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,13 @@ type navigateParams;
44

55
[@bs.obj]
66
external navigateParams:
7-
(~routeName: string, ~params: Js.t({..})=?, unit) => navigateParams =
8-
"";
7+
(~routeName: string, ~params: Js.t({..})=?, unit) => navigateParams;
98

109
type backParams;
1110

1211
[@bs.obj]
1312
external backParams:
14-
(~key: string=?, ~immediate: bool=?, unit) => navigateParams =
15-
"";
13+
(~key: string=?, ~immediate: bool=?, unit) => navigateParams;
1614

1715
[@bs.module "react-navigation"] [@bs.scope "NavigationActions"]
1816
external navigate: navigateParams => action = "navigate";

‎src/Stack.bs.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ var Interop = require("./Interop");
44
var Core$ReactNavigation = require("./Core.bs.js");
55
var Stack = require("@react-navigation/stack");
66

7-
var TransitionSpec = { };
7+
var TransitionSpec = {};
88

99
var StackNavigationScreenProp = Core$ReactNavigation.NavigationScreenProp;
1010

1111
function Make(M) {
12-
var M$1 = { };
12+
var M$1 = {};
1313
var include = Core$ReactNavigation.NavigationScreenProp(M$1);
1414
var Navigation = include;
1515
var t = function (prim) {
16-
return Interop.identity(prim[1]);
16+
return Interop.identity(prim.VAL);
1717
};
1818
var string = function (s) {
1919
return Interop.identity(s);
@@ -27,7 +27,7 @@ function Make(M) {
2727
render: render
2828
};
2929
var t$1 = function (prim) {
30-
return Interop.identity(prim[1]);
30+
return Interop.identity(prim.VAL);
3131
};
3232
var render$1 = function (x) {
3333
return Interop.identity(x);
@@ -62,13 +62,13 @@ function Make(M) {
6262
};
6363
}
6464

65-
var TransitionSpecs = { };
65+
var TransitionSpecs = {};
6666

67-
var CardStyleInterpolators = { };
67+
var CardStyleInterpolators = {};
6868

69-
var HeaderStyleInterpolators = { };
69+
var HeaderStyleInterpolators = {};
7070

71-
var TransitionPresets = { };
71+
var TransitionPresets = {};
7272

7373
exports.TransitionSpec = TransitionSpec;
7474
exports.StackNavigationScreenProp = StackNavigationScreenProp;

0 commit comments

Comments
 (0)