Skip to content
This repository has been archived by the owner on Mar 12, 2020. It is now read-only.

Commit

Permalink
Upgraded RN to v0.29.0 and fixed subsequent layout issues
Browse files Browse the repository at this point in the history
  • Loading branch information
sarahscott committed Jul 11, 2016
1 parent 5c1e9f5 commit 032b35e
Show file tree
Hide file tree
Showing 7 changed files with 1,583 additions and 1,776 deletions.
65 changes: 10 additions & 55 deletions .flowconfig
Original file line number Diff line number Diff line change
@@ -1,86 +1,41 @@
[ignore]

.*Example.*

# We fork some components by platform.
.*/*.web.js
.*/*.android.js

# Some modules have their own node_modules with overlap
.*/node_modules/node-haste/.*

# Ugh
.*/node_modules/babel.*
.*/node_modules/babylon.*
.*/node_modules/invariant.*

# Ignore react and fbjs where there are overlaps, but don't ignore
# anything that react-native relies on
.*/node_modules/fbjs/lib/Map.js
.*/node_modules/fbjs/lib/fetch.js
.*/node_modules/fbjs/lib/ExecutionEnvironment.js
.*/node_modules/fbjs/lib/ErrorUtils.js

# Flow has a built-in definition for the 'react' module which we prefer to use
# over the currently-untyped source
.*/node_modules/react/react.js
.*/node_modules/react/lib/React.js
.*/node_modules/react/lib/ReactDOM.js

.*/commoner/test/source/widget/share.js

# Ignore commoner tests
.*/node_modules/commoner/test/.*

# See https://github.com/facebook/flow/issues/442
.*/react-tools/node_modules/commoner/lib/reader.js

# Ignore generators
# Ignore templates with `@flow` in header
.*/local-cli/generator.*

.*/node_modules/is-my-json-valid/test/.*\.json
.*/node_modules/iconv-lite/encodings/tables/.*\.json
# Ignore malformed json
.*/node_modules/y18n/test/.*\.json
.*/node_modules/spdx-license-ids/spdx-license-ids.json
.*/node_modules/spdx-exceptions/index.json
.*/node_modules/resolve/test/subdirs/node_modules/a/b/c/x.json
.*/node_modules/resolve/lib/core.json
.*/node_modules/jsonparse/samplejson/.*\.json
.*/node_modules/json5/test/.*\.json
.*/node_modules/ua-parser-js/test/.*\.json
.*/node_modules/builtin-modules/builtin-modules.json
.*/node_modules/binary-extensions/binary-extensions.json
.*/node_modules/url-regex/tlds.json
.*/node_modules/joi/.*\.json
.*/node_modules/isemail/.*\.json
.*/node_modules/tr46/.*\.json

[include]

[libs]
lib/
node_modules/react-native/Libraries/react-native/react-native-interface.js
node_modules/react-native/flow/
node_modules/fbjs/flow/lib/
node_modules/react-native/flow
flow/

[options]
module.system=haste

esproposal.class_static_fields=enable
esproposal.class_instance_fields=enable

experimental.strict_type_args=true

munge_underscores=true

module.name_mapper='^image![a-zA-Z0-9$_-]+$' -> 'GlobalImageStub'
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\)$' -> 'RelativeImageStub'
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'

suppress_type=$FlowIssue
suppress_type=$FlowFixMe
suppress_type=$FixMe

suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(2[0-2]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(2[0-2]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(2[0-7]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(2[0-7]\\|1[0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy

[version]
^0.22.0
^0.27.0
24 changes: 12 additions & 12 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ PODS:
- Emission (1.0.3):
- Artsy+UIFonts (>= 1.1.0)
- Extraction
- React/Core (= 0.27.1)
- React/RCTNetwork (= 0.27.1)
- React/RCTText (= 0.27.1)
- React/Core (= 0.29.0)
- React/RCTNetwork (= 0.29.0)
- React/RCTText (= 0.29.0)
- SDWebImage (>= 3.7.2)
- Extraction (0.1.0):
- Extraction/ARSpinner (= 0.1.0)
Expand All @@ -22,14 +22,14 @@ PODS:
- UIView+BooleanAnimations
- Extraction/UIView+ARSpinner (0.1.0)
- FLKAutoLayout (1.0.0)
- React/Core (0.27.1)
- React/RCTNetwork (0.27.1):
- React/Core (0.29.0)
- React/RCTNetwork (0.29.0):
- React/Core
- React/RCTTest (0.27.1):
- React/RCTTest (0.29.0):
- React/Core
- React/RCTText (0.27.1):
- React/RCTText (0.29.0):
- React/Core
- React/RCTWebSocket (0.27.1):
- React/RCTWebSocket (0.29.0):
- React/Core
- SDWebImage (3.7.5):
- SDWebImage/Core (= 3.7.5)
Expand All @@ -49,11 +49,11 @@ EXTERNAL SOURCES:
Artsy+UIFonts:
:git: https://github.com/artsy/Artsy-UIFonts.git
Emission:
:path: ../
:path: "../"
Extraction:
:git: https://github.com/artsy/extraction.git
React:
:path: ../node_modules/react-native
:path: "../node_modules/react-native"

CHECKOUT OPTIONS:
Artsy+UIFonts:
Expand All @@ -66,10 +66,10 @@ CHECKOUT OPTIONS:
SPEC CHECKSUMS:
Artsy+UIColors: 10a2d71e9ffe1015be43d4e084d13ff4337aab97
Artsy+UIFonts: 108bfe625c45008ebb15c4c62003882dd345c4b8
Emission: 2cc5985953229faa9584dac67298711f384e7a2a
Emission: 8b29cf8ba7ddc9ea961c29e7b6c5c83faa7d7524
Extraction: 30a669899836cbe9c31bbc0e86918cd7a2dab463
FLKAutoLayout: 106b14dbae09d32c6730190f4e78a959759ba4a4
React: 36037bee3d492dd404501c83f7059630786c62c2
React: 2295aaed0bcaa7a0dd847504e0caa0d3b3f23305
SDWebImage: 69c6303e3348fba97e03f65d65d4fbc26740f461
Specta: ac94d110b865115fe60ff2c6d7281053c6f8e8a2
UIView+BooleanAnimations: a760be9a066036e55f298b7b7350a6cb14cfcd97
Expand Down
1 change: 1 addition & 0 deletions lib/components/artist/related_artists/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ const styles = StyleSheet.create({
artistContainer: {
flexWrap: 'wrap',
flexDirection: 'row',
alignItems: 'flex-start',
justifyContent: 'space-around',
marginTop: 12,
marginLeft: -10,
Expand Down
1 change: 1 addition & 0 deletions lib/components/artist/shows/large_list.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ const styles = StyleSheet.create({
justifyContent: 'flex-start',
flexDirection: 'row',
flexWrap: 'wrap',
alignItems: 'flex-start',
marginTop: 0,
marginBottom: 0,
marginLeft: -10,
Expand Down
1 change: 0 additions & 1 deletion lib/components/artist/shows/metadata.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ class Metadata extends React.Component {
const styles = StyleSheet.create({
container: {
justifyContent: 'flex-start',
flex: 1,
},
serifText: {
margin: 2,
Expand Down
Loading

0 comments on commit 032b35e

Please sign in to comment.