Skip to content

Commit c89d381

Browse files
authored
Merge pull request #22 from co2-git/feature/15
Fix #15
2 parents a9017a0 + 3923058 commit c89d381

File tree

8 files changed

+36
-22
lines changed

8 files changed

+36
-22
lines changed

.flowconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
; Ignore polyfills
77
.*/Libraries/polyfills/.*
88

9+
; Ignore relase
10+
.*/release/.*
11+
912

1013
[include]
1114

@@ -25,7 +28,6 @@
2528
./app/components/Layout/Router.js.flow
2629
./app/components/ReactNative/Info.js.flow
2730
./app/components/Terminal/Console.js.flow
28-
./app/lib/exec.js.flow
2931

3032
[options]
3133
emoji=true

app/components/App/AppBottomBar.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,37 +14,37 @@ const AppBottomBar = () => (
1414
<BottomNavigation>
1515
<BottomNavigationItem
1616
label="Info"
17-
onClick={() => this.select(0)}
17+
onClick={() => {}}
1818
icon={<InfoIcon />}
1919
/>
2020
<BottomNavigationItem
2121
label="Start"
22-
onClick={() => this.select(0)}
22+
onClick={() => {}}
2323
icon={<PlayIcon />}
2424
/>
2525
<BottomNavigationItem
2626
label="Android"
27-
onClick={() => this.select(0)}
27+
onClick={() => {}}
2828
icon={<AndroidIcon />}
2929
/>
3030
<BottomNavigationItem
3131
label="iOS"
32-
onClick={() => this.select(0)}
32+
onClick={() => {}}
3333
icon={<i className="icon-apple" style={{fontSize: 24, color: '#777', marginTop: -3}} />}
3434
/>
3535
<BottomNavigationItem
3636
label="Upgrade"
37-
onClick={() => this.select(0)}
37+
onClick={() => {}}
3838
icon={<UpgradeIcon />}
3939
/>
4040
<BottomNavigationItem
4141
label="Native"
42-
onClick={() => this.select(0)}
42+
onClick={() => {}}
4343
icon={<SmartPhoneIcon />}
4444
/>
4545
<BottomNavigationItem
4646
label="Eject"
47-
onClick={() => this.select(0)}
47+
onClick={() => {}}
4848
icon={<EjectIcon />}
4949
/>
5050
</BottomNavigation>
Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,22 @@
11
// @flow
22

3+
type $FlexDirection =
4+
& 'column'
5+
& 'row';
6+
37
declare type $FlexReactProps = {
48
children: any,
9+
style?: Object,
510
};
611

12+
declare type $FlexOwnProps = {|
13+
+between?: boolean,
14+
+column?: boolean,
15+
+direction?: $FlexDirection,
16+
+flexDirection?: $FlexDirection,
17+
+row?: boolean,
18+
|};
19+
720
declare type $FlexProps =
8-
& $FlexReactProps;
21+
& $FlexReactProps
22+
& $FlexOwnProps;

app/components/Layout/Page.js.flow

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// @flow
22

33
declare type $PageOwnProps = {|
4+
+children?: any,
45
+style?: Object,
56
|};

app/components/ReactNative/Info.js.flow

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ declare type $InfoConnectProps = {|
2020

2121
declare type $InfoProps =
2222
& $InfoOwnProps
23-
& InfoConnectProps;
23+
& $InfoConnectProps;

app/lib/exec.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
import {spawn} from 'child_process';
33
import Emitter from 'events';
44

5-
const $spawn = (cmd: string, options: $ExecOptions = {}) => {
5+
// eslint-disable-next-line camelcase
6+
const $spawn = (cmd: string, options: child_process$spawnOpts = {}) => {
67
const emitter = new Emitter();
78
let ps;
89
setTimeout(() => {

app/lib/exec.js.flow

Lines changed: 0 additions & 5 deletions
This file was deleted.

package.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
"scripts": {
55
"start": "electron main.js",
66
"babel": "babel --out-dir dist/ app/",
7-
"build": "bash scripts/build.sh $npm_package_name $npm_package_version",
8-
"build:osx": "yarn build darwin",
9-
"build:linux": "yarn build linux",
10-
"build:windows": "yarn build win32",
11-
"build:all": "npm-run-parallel build:osx build:linux build:windows",
7+
"make": "bash scripts/build.sh $npm_package_name $npm_package_version",
8+
"make:osx": "yarn make darwin",
9+
"make:linux": "yarn make linux",
10+
"make:windows": "yarn make win32",
11+
"make:all": "npm-run-parallel make:osx make:linux make:windows",
1212
"eslint": "eslint app --fix",
13-
"test": "yarn eslint"
13+
"test": "yarn eslint && yarn flow",
14+
"flow": "flow"
1415
},
1516
"dependencies": {
1617
"babel-polyfill": "^6.26.0",

0 commit comments

Comments
 (0)