Skip to content

Commit 25cc3fb

Browse files
authored
Merge branch 'master' into ipads
2 parents 337dcbd + c872e4d commit 25cc3fb

File tree

863 files changed

+22829
-8264
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

863 files changed

+22829
-8264
lines changed

.editorconfig

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

.env.sample.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
// Make a copy of this file as '.env.js'
22
// Fill in the variables as appropriate
3-
export const GOOGLE_CALENDAR_API_KEY = 'key goes here'
3+
export const GOOGLE_CALENDAR_API_KEY = 'calendar key goes here'
4+
export const GOOGLE_MAPS_API_KEY = 'maps key goes here'

.eslintrc.yaml

Lines changed: 54 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,88 @@
11
parser: babel-eslint
2-
extends: eslint:recommended
3-
installedESLint: true
2+
3+
plugins:
4+
- babel
5+
- react
6+
- react-native
7+
- flowtype
8+
9+
extends:
10+
- eslint:recommended
11+
- plugin:flowtype/recommended
12+
- plugin:react/recommended
13+
- prettier
14+
- prettier/flowtype
15+
- prettier/react
416

517
env:
618
es6: true
719
node: true
8-
9-
parserOptions:
10-
sourceType: module
11-
ecmaFeatures:
12-
experimentalObjectRestSpread: true
13-
jsx: true
14-
15-
plugins: [babel, react, flowtype]
20+
browser: true
1621

1722
globals:
1823
fetch: true
1924
FormData: true
25+
fetchJson: true
26+
rawFetch: true
2027

2128
rules:
22-
array-callback-return: warn
23-
arrow-spacing: ['warn', {before: true, after: true}]
24-
brace-style: [warn, 1tbs]
25-
camelcase: error
26-
comma-dangle: [warn, always-multiline]
27-
comma-spacing: ['warn', {before: false, after: true}]
28-
comma-style: [warn, last]
29-
consistent-this: [warn, self]
30-
curly: [error, multi-line]
29+
array-callback-return: error
30+
camelcase: warn
31+
consistent-this: [error, self]
32+
curly: [warn, multi-line]
3133
default-case: error
3234
guard-for-in: error
33-
indent: [error, 2, {SwitchCase: 1, MemberExpression: 1}]
34-
key-spacing: ['error', {beforeColon: false, afterColon: true}]
35-
keyword-spacing: warn
3635
linebreak-style: [error, unix]
37-
new-cap: 'off'
36+
new-cap: off
37+
no-await-in-loop: warn
3838
no-case-declarations: error
39-
no-class-assign: error
40-
no-confusing-arrow: error
41-
no-console: 'off'
42-
no-const-assign: error
39+
no-confusing-arrow: off
40+
no-console: off
4341
no-div-regex: error
44-
no-eq-null: error
42+
no-eq-null: warn
4543
no-extra-label: error
46-
no-fallthrough: error
47-
no-implicit-coercion: ['error', {boolean: true, number: true, string: true}]
44+
no-implicit-coercion: [error, {boolean: true, number: true, string: true}]
4845
no-implicit-globals: error
46+
no-multi-assign: error
4947
no-new-symbol: error
50-
no-redeclare: ['error', {builtinGlobals: true}]
5148
no-restricted-syntax: [error, WithStatement]
52-
no-self-assign: warn
53-
no-undef-init: 'off'
54-
no-underscore-dangle: 'off'
49+
no-return-await: error
50+
no-throw-literal: error
51+
no-undef-init: off
52+
no-underscore-dangle: off
5553
no-unmodified-loop-condition: error
56-
no-unused-labels: error
57-
no-unused-vars: ['warn', {args: 'after-used', argsIgnorePattern: '^_$'}]
54+
no-unused-vars: [warn, {args: 'after-used', argsIgnorePattern: '^_$'}]
5855
no-useless-constructor: error
5956
no-var: error
60-
no-whitespace-before-property: error
61-
one-var-declaration-per-line: error
62-
prefer-spread: warn
63-
quotes: [error, single, avoid-escape]
64-
semi: [error, never]
65-
wrap-iife: error
66-
babel/arrow-parens: [warn, as-needed]
67-
babel/no-await-in-loop: warn
57+
prefer-promise-reject-errors: error
58+
prefer-spread: error
59+
quotes: [warn, single, avoid-escape]
60+
require-await: warn
61+
semi: off
6862

6963
# react rules – https://github.com/yannickcr/eslint-plugin-react
70-
jsx-quotes: [warn, prefer-single]
71-
react/display-name: 'off'
72-
react/jsx-curly-spacing: [warn, never]
73-
react/jsx-indent-props: [warn, 2]
74-
react/jsx-no-duplicate-props: warn
75-
react/jsx-no-undef: error
76-
react/jsx-space-before-closing: error
77-
react/jsx-uses-react: error
78-
react/jsx-uses-vars: error
79-
react/no-deprecated: error
64+
react/display-name: off
65+
react/jsx-key: warn
66+
react/jsx-no-bind: [warn, {ignoreRefs: true, allowArrowFunctions: true}]
8067
react/no-did-mount-set-state: warn
8168
react/no-did-update-set-state: warn
82-
react/no-direct-mutation-state: error
83-
react/no-multi-comp: 'off' # prevent multiple component definition per file
69+
react/no-multi-comp: off # prevent multiple component definition per file
70+
react/no-string-refs: error
71+
react/no-unescaped-entities: off
8472
react/no-unknown-property: warn
85-
react/prefer-stateless-function: warn
86-
react/prop-types: error # prevent missing proptypes in a react component definition
87-
react/react-in-jsx-scope: error
73+
react/prop-types: off
8874
react/self-closing-comp: warn # prevent extra closing tags for components without children
8975
react/sort-comp: warn
9076
react/sort-prop-types: warn
91-
react/wrap-multilines: 'off'
77+
react/wrap-multilines: off
9278

9379
# flow rules
94-
flowtype/define-flow-type: error
95-
# flowtype/require-valid-file-annotation: [error, always]
96-
flowtype/space-after-type-colon: [warn, always]
97-
flowtype/space-before-type-colon: [warn, never]
98-
flowtype/type-id-match: error
80+
flowtype/define-flow-type: warn
9981
flowtype/use-flow-type: error
100-
flowtype/valid-syntax: warn
82+
flowtype/valid-syntax: error
83+
flowtype/no-types-missing-file-annotation: off
84+
85+
# react-native rules
86+
react-native/no-unused-styles: warn
87+
react-native/no-inline-styles: warn
88+
react-native/no-color-literals: warn

.flowconfig

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,61 @@
11
[ignore]
2-
3-
# We fork some components by platform.
2+
; We fork some components by platform
43
.*/*[.]android.js
54

6-
# Ignore templates with `@flow` in header
7-
.*/local-cli/generator.*
8-
9-
# Ignore malformed json
10-
.*/node_modules/y18n/test/.*\.json
11-
12-
# Ignore the website subdir
13-
<PROJECT_ROOT>/website/.*
5+
; Ignore json files from flow
6+
*.json
147

15-
# Ignore BUCK generated dirs
8+
; Ignore "BUCK" generated dirs
169
<PROJECT_ROOT>/\.buckd/
1710

18-
# Ignore unexpected extra @providesModule
19-
.*/node_modules/commoner/test/source/widget/share.js
11+
; Ignore unexpected extra "@providesModule"
12+
.*/node_modules/.*/node_modules/fbjs/.*
2013

21-
# Ignore duplicate module providers
22-
# For RN Apps installed via npm, "Libraries" folder is inside node_modules/react-native but in the source repo it is in the root
14+
; Ignore the vendor/ folder, since CIs appear to stick ruby deps in there
15+
<PROJECT_ROOT>/vendor/
16+
17+
; Ignore duplicate module providers
18+
; For RN Apps installed via npm, "Libraries" folder is inside
19+
; "node_modules/react-native" but in the source repo it is in the root
2320
.*/Libraries/react-native/React.js
2421
.*/Libraries/react-native/ReactNative.js
22+
23+
; Ignore other things
2524
.*/node_modules/jest-runtime/build/__tests__/.*
25+
.*/node_modules/babel-plugin-flow-react-proptypes/src/__test__/.*
26+
.*/node_modules/.*/examples/.*
27+
.*/node_modules/react-native-mock/.*
2628

2729
[include]
2830

2931
[libs]
3032
node_modules/react-native/Libraries/react-native/react-native-interface.js
3133
node_modules/react-native/flow
32-
flow/
34+
flow-typed/
3335

3436
[options]
35-
module.system=haste
37+
emoji=true
3638

37-
esproposal.class_static_fields=enable
38-
esproposal.class_instance_fields=enable
39+
module.system=haste
3940

4041
experimental.strict_type_args=true
4142

4243
munge_underscores=true
4344

44-
module.name_mapper='^image![a-zA-Z0-9$_-]+$' -> 'GlobalImageStub'
45+
; from https://github.com/facebook/flow/issues/945
46+
module.file_ext=.ios.js
47+
module.file_ext=.js
48+
module.file_ext=.jsx
49+
module.file_ext=.json
50+
4551
module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
4652

4753
suppress_type=$FlowIssue
4854
suppress_type=$FlowFixMe
4955
suppress_type=$FixMe
5056

51-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(30\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
52-
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(30\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
57+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-8]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
58+
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-8]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
5359
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
5460

5561
unsafe.enable_getters_and_setters=true
56-
57-
[version]
58-
^0.30.0

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.pbxproj -text

.gitignore

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,52 @@ DerivedData
2222
*.xcuserstate
2323
project.xcworkspace
2424

25-
# Android/IJ
25+
# Android/IntelliJ
2626
#
27-
*.iml
27+
build/
2828
.idea
2929
.gradle
3030
local.properties
31+
*.iml
3132

3233
# node.js
3334
#
3435
node_modules/
3536
npm-debug.log
37+
yarn-error.log
38+
.eslintcache
3639

3740
# BUCK
3841
buck-out/
3942
\.buckd/
4043
android/app/libs
41-
android/keystores/debug.keystore
44+
*.keystore
4245

4346
# KEYS
44-
keys.js
4547
.env.js
48+
49+
# Tests and code coverage
50+
coverage
51+
52+
# fastlane specific
53+
fastlane/report.xml
54+
55+
# deliver's temporary files
56+
Preview.html
57+
58+
# snapshot's generated screenshots
59+
fastlane/screenshots
60+
61+
# scan's temporary files
62+
fastlane/test_output
63+
64+
# deploy key
65+
scripts/travisci_deploy_key
66+
fastlane/play-private-key.json
67+
68+
# generated files
69+
docs/
70+
71+
# android keystores
72+
android/app/signing.properties
73+
*.keystore

.npmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1+
package-lock=false
12
save-exact=true
2-
save=true

0 commit comments

Comments
 (0)