Skip to content

Commit f102513

Browse files
authored
Upgrading to rn-0.61.2 (#118)
1 parent 8b27829 commit f102513

63 files changed

Lines changed: 3490 additions & 5654 deletions

Some content is hidden

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

.babelrc

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

.eslintrc

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

.eslintrc.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module.exports = {
2+
root: true,
3+
extends: '@react-native-community',
4+
};

.flowconfig

Lines changed: 43 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,50 +5,71 @@
55
; Ignore "BUCK" generated dirs
66
<PROJECT_ROOT>/\.buckd/
77

8-
; Ignore unexpected extra "@providesModule"
9-
.*/node_modules/.*/node_modules/fbjs/.*
8+
; Ignore polyfills
9+
node_modules/react-native/Libraries/polyfills/.*
1010

11-
; Ignore duplicate module providers
12-
; For RN Apps installed via npm, "Libraries" folder is inside
13-
; "node_modules/react-native" but in the source repo it is in the root
14-
.*/Libraries/react-native/React.js
11+
; These should not be required directly
12+
; require from fbjs/lib instead: require('fbjs/lib/warning')
13+
node_modules/warning/.*
1514

16-
; Ignore polyfills
17-
.*/Libraries/polyfills/.*
15+
; Flow doesn't support platforms
16+
.*/Libraries/Utilities/LoadingView.js
1817

19-
; Ignore metro
20-
.*/node_modules/metro/.*
18+
[untyped]
19+
.*/node_modules/@react-native-community/cli/.*/.*
2120

2221
[include]
2322

2423
[libs]
2524
node_modules/react-native/Libraries/react-native/react-native-interface.js
2625
node_modules/react-native/flow/
27-
node_modules/react-native/flow-github/
2826

2927
[options]
3028
emoji=true
3129

32-
module.system=haste
33-
34-
munge_underscores=true
35-
36-
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'
30+
esproposal.optional_chaining=enable
31+
esproposal.nullish_coalescing=enable
3732

3833
module.file_ext=.js
39-
module.file_ext=.jsx
4034
module.file_ext=.json
41-
module.file_ext=.native.js
35+
module.file_ext=.ios.js
36+
37+
munge_underscores=true
38+
39+
module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/react-native/react-native-implementation'
40+
module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/node_modules/react-native/\1'
41+
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\)$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/Image/RelativeImageStub'
4242

4343
suppress_type=$FlowIssue
4444
suppress_type=$FlowFixMe
4545
suppress_type=$FlowFixMeProps
4646
suppress_type=$FlowFixMeState
4747

48-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
49-
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
50-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
48+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)
49+
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)?:? #[0-9]+
5150
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
5251

52+
[lints]
53+
sketchy-null-number=warn
54+
sketchy-null-mixed=warn
55+
sketchy-number=warn
56+
untyped-type-import=warn
57+
nonstrict-import=warn
58+
deprecated-type=warn
59+
unsafe-getters-setters=warn
60+
inexact-spread=warn
61+
unnecessary-invariant=warn
62+
signature-verification-failure=warn
63+
deprecated-utility=error
64+
65+
[strict]
66+
deprecated-type
67+
nonstrict-import
68+
sketchy-null
69+
unclear-type
70+
unsafe-getters-setters
71+
untyped-import
72+
untyped-type-import
73+
5374
[version]
54-
^0.67.0
75+
^0.105.0

.gitignore

Lines changed: 38 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,9 @@
1-
# Most part of this file is created by https://www.gitignore.io
2-
3-
### Node ###
4-
# Logs
5-
logs
6-
*.log
7-
8-
# Runtime data
9-
pids
10-
*.pid
11-
*.seed
12-
13-
# Directory for instrumented libs generated by jscoverage/JSCover
14-
lib-cov
15-
16-
# Coverage directory used by tools like istanbul
17-
coverage
18-
19-
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
20-
.grunt
21-
22-
# node-waf configuration
23-
.lock-wscript
24-
25-
# Compiled binary addons (http://nodejs.org/api/addons.html)
26-
build/Release
27-
28-
# Dependency directory
29-
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
30-
node_modules
31-
32-
33-
### OSX ###
1+
# OSX
2+
#
343
.DS_Store
35-
.AppleDouble
36-
.LSOverride
37-
38-
# Icon must end with two \r
39-
Icon
40-
41-
42-
# Thumbnails
43-
._*
44-
45-
# Files that might appear in the root of a volume
46-
.DocumentRevisions-V100
47-
.fseventsd
48-
.Spotlight-V100
49-
.TemporaryItems
50-
.Trashes
51-
.VolumeIcon.icns
52-
53-
# Directories potentially created on remote AFP share
54-
.AppleDB
55-
.AppleDesktop
56-
Network Trash Folder
57-
Temporary Items
58-
.apdisk
594

60-
61-
### Xcode ###
5+
# Xcode
6+
#
627
build/
638
*.pbxuser
649
!default.pbxuser
@@ -72,25 +17,49 @@ xcuserdata
7217
*.xccheckout
7318
*.moved-aside
7419
DerivedData
20+
*.hmap
21+
*.ipa
7522
*.xcuserstate
7623

77-
### Android ###
78-
*.iml
24+
# Android/IntelliJ
25+
#
26+
build/
7927
.idea
8028
.gradle
8129
local.properties
30+
*.iml
31+
32+
# node.js
33+
#
34+
node_modules/
35+
npm-debug.log
36+
yarn-error.log
8237

8338
# BUCK
8439
buck-out/
8540
\.buckd/
86-
android/app/libs
87-
android/keystores/debug.keystore
41+
*.keystore
42+
!debug.keystore
8843

89-
# android signing key
90-
key/my-release-key.keystore
91-
android/app/my-release-key.keystore
44+
# fastlane
45+
#
46+
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
47+
# screenshots whenever they are needed.
48+
# For more information about the recommended setup visit:
49+
# https://docs.fastlane.tools/best-practices/source-control/
50+
51+
*/fastlane/report.xml
52+
*/fastlane/Preview.html
53+
*/fastlane/screenshots
54+
55+
# Bundle artifact
56+
*.jsbundle
57+
58+
# CocoaPods
59+
/ios/Pods/
9260

93-
android/.gradle
9461

95-
# vscode generated react files
96-
.vscode/.react
62+
# Custom
63+
android/keystores/debug.keystore
64+
key/my-release-key.keystore
65+
android/app/my-release-key.keystore

.prettierrc.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module.exports = {
2+
bracketSpacing: false,
3+
jsxBracketSameLine: true,
4+
singleQuote: true,
5+
trailingComma: 'all',
6+
};

.travis.yml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,14 @@ cache:
1616
- $HOME/.gradle/caches/
1717
- $HOME/.gradle/wrapper/
1818
- node_modules
19+
- $HOME/.yarn-cache
1920
android:
2021
components:
22+
- tools
2123
- platform-tools
24+
- build-tools-28.0.3
2225
- tools
23-
- build-tools-23.0.1
24-
- build-tools-23.0.2
25-
- build-tools-25.0.2
26-
- build-tools-26.0.2
27-
- android-23
28-
- android-26
26+
- android-28
2927
- extra-android-m2repository
3028
- extra-google-google_play_services
3129
- extra-google-m2repository
@@ -36,12 +34,10 @@ licenses:
3634
before_install:
3735
- nvm ls-remote
3836
- nvm list
39-
- nvm install 8
37+
- nvm install v10.16.3
4038
- node --version
41-
- travis_retry curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
42-
- echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
43-
- travis_retry sudo apt-get update -qq
44-
- travis_retry sudo apt-get install -y -qq yarn
39+
- curl -o- -L https://yarnpkg.com/install.sh | bash
40+
- export PATH="$HOME/.yarn/bin:$PATH"
4541
- chmod +x ./android/gradlew
4642
install:
4743
- yarn install

.vscode/launch.json

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,30 @@
66
"configurations": [
77
{
88
"name": "Debug Android",
9-
"program": "${workspaceRoot}/.vscode/launchReactNative.js",
9+
"cwd": "${workspaceFolder}",
1010
"type": "reactnative",
1111
"request": "launch",
12-
"platform": "android",
13-
"sourceMaps": true,
14-
"outDir": "${workspaceRoot}/.vscode/.react"
12+
"platform": "android"
1513
},
1614
{
1715
"name": "Debug iOS",
18-
"program": "${workspaceRoot}/.vscode/launchReactNative.js",
16+
"cwd": "${workspaceFolder}",
1917
"type": "reactnative",
2018
"request": "launch",
21-
"platform": "ios",
22-
"sourceMaps": true,
23-
"outDir": "${workspaceRoot}/.vscode/.react"
19+
"platform": "ios"
2420
},
2521
{
2622
"name": "Attach to packager",
27-
"program": "${workspaceRoot}/.vscode/launchReactNative.js",
23+
"cwd": "${workspaceFolder}",
2824
"type": "reactnative",
29-
"request": "attach",
30-
"sourceMaps": true,
31-
"outDir": "${workspaceRoot}/.vscode/.react"
25+
"request": "attach"
3226
},
3327
{
3428
"name": "Debug in Exponent",
35-
"program": "${workspaceRoot}/.vscode/launchReactNative.js",
29+
"cwd": "${workspaceFolder}",
3630
"type": "reactnative",
3731
"request": "launch",
38-
"platform": "exponent",
39-
"sourceMaps": true,
40-
"outDir": "${workspaceRoot}/.vscode/.react"
32+
"platform": "exponent"
4133
}
4234
]
4335
}

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"java.configuration.updateBuildConfiguration": "disabled"
3+
}

android/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
.gradle
1+
.gradle

0 commit comments

Comments
 (0)