Skip to content

Commit

Permalink
react-native upgrade templates
Browse files Browse the repository at this point in the history
  • Loading branch information
Richard-Cao committed Jan 3, 2017
1 parent e631cee commit 5990b56
Show file tree
Hide file tree
Showing 13 changed files with 71 additions and 32 deletions.
9 changes: 2 additions & 7 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
{
"presets": [
"react-native" // this is required for debugging with react-native/packager/transformer
],
"plugins": [],
"sourceMaps": true // must be true react-native/packager/transformer using with node-module-debug
// because of some bugs from vscode-node-debug & vscode-react-native, "sourceMaps" cannot be "inline" or "both"
}
"presets": ["react-native"]
}
32 changes: 9 additions & 23 deletions .flowconfig
Original file line number Diff line number Diff line change
@@ -1,29 +1,18 @@
[ignore]

# We fork some components by platform.
; We fork some components by platform
.*/*[.]android.js

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

# Ignore malformed json
.*/node_modules/y18n/test/.*\.json

# Ignore the website subdir
<PROJECT_ROOT>/website/.*

# Ignore BUCK generated dirs
; Ignore "BUCK" generated dirs
<PROJECT_ROOT>/\.buckd/

# Ignore unexpected extra @providesModule
.*/node_modules/commoner/test/source/widget/share.js
; Ignore unexpected extra "@providesModule"
.*/node_modules/.*/node_modules/fbjs/.*

# Ignore duplicate module providers
# For RN Apps installed via npm, "Libraries" folder is inside node_modules/react-native but in the source repo it is in the root
; Ignore duplicate module providers
; For RN Apps installed via npm, "Libraries" folder is inside
; "node_modules/react-native" but in the source repo it is in the root
.*/Libraries/react-native/React.js
.*/Libraries/react-native/ReactNative.js
.*/node_modules/jest-runtime/build/__tests__/.*

[include]

Expand All @@ -35,9 +24,6 @@ flow/
[options]
module.system=haste

esproposal.class_static_fields=enable
esproposal.class_instance_fields=enable

experimental.strict_type_args=true

munge_underscores=true
Expand All @@ -49,11 +35,11 @@ suppress_type=$FlowIssue
suppress_type=$FlowFixMe
suppress_type=$FixMe

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

unsafe.enable_getters_and_setters=true

[version]
^0.33.0
^0.35.0
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.pbxproj -text
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<application
android:name=".MainApplication"
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme">
<activity
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<item name="actionMenuTextColor">#fcfcfc</item>
<item name="android:actionMenuTextAppearance">@style/ReadingMenuTextStyle</item>
<item name="actionMenuTextAppearance">@style/ReadingMenuTextStyle</item>
<item name="android:windowBackground">@drawable/splash</item>
<item name="android:windowBackground">@mipmap/splash</item>
<item name="colorPrimaryDark">#3e9ce9</item>
</style>

Expand Down
8 changes: 8 additions & 0 deletions android/keystores/BUCK
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
keystore(
name = 'debug',
store = 'debug.keystore',
properties = 'debug.keystore.properties',
visibility = [
'PUBLIC',
],
)
4 changes: 4 additions & 0 deletions android/keystores/debug.keystore.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
key.store=debug.keystore
key.alias=androiddebugkey
key.store.password=android
key.alias.password=android
45 changes: 45 additions & 0 deletions ios/reading.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
176D7ACC1C61D30B004C465D /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 176D7ACB1C61D30B004C465D /* libsqlite3.0.tbd */; };
176D7ACE1C61D315004C465D /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 176D7ACD1C61D315004C465D /* libc++.tbd */; };
176D7AD01C61D31C004C465D /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 176D7ACF1C61D31C004C465D /* libz.tbd */; };
179261C51E1BAC370033E8C9 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 179261C21E1BAC230033E8C9 /* libRCTAnimation.a */; };
179B10A91D210D7000405A2C /* libCodePush.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 179B10A81D210D1F00405A2C /* libCodePush.a */; };
17B5769B1C84466D002717C9 /* libRCTWeChat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 176D7AC51C61D2DB004C465D /* libRCTWeChat.a */; };
17EC86EF1D6EE93F006878BB /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 17EC86EE1D6EE93F006878BB /* Ionicons.ttf */; };
Expand Down Expand Up @@ -98,6 +99,20 @@
remoteGlobalIDString = 86D238421BD0BB9E00C75D01;
remoteInfo = RCTWeChat;
};
179261C11E1BAC230033E8C9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 179261BC1E1BAC230033E8C9 /* RCTAnimation.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 134814201AA4EA6300B7C361;
remoteInfo = RCTAnimation;
};
179261C31E1BAC230033E8C9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 179261BC1E1BAC230033E8C9 /* RCTAnimation.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 2D2A28201D9B03D100D4039D;
remoteInfo = "RCTAnimation-tvOS";
};
179B10A71D210D1F00405A2C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 179B10A31D210D1F00405A2C /* CodePush.xcodeproj */;
Expand Down Expand Up @@ -206,6 +221,7 @@
176D7ACB1C61D30B004C465D /* libsqlite3.0.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.0.tbd; path = usr/lib/libsqlite3.0.tbd; sourceTree = SDKROOT; };
176D7ACD1C61D315004C465D /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
176D7ACF1C61D31C004C465D /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
179261BC1E1BAC230033E8C9 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
179B10A31D210D1F00405A2C /* CodePush.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CodePush.xcodeproj; path = "../node_modules/react-native-code-push/ios/CodePush.xcodeproj"; sourceTree = "<group>"; };
17EC86EE1D6EE93F006878BB /* Ionicons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Ionicons.ttf; sourceTree = "<group>"; };
17EC86F01D6EE979006878BB /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNVectorIcons.xcodeproj; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = "<group>"; };
Expand All @@ -222,6 +238,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
179261C51E1BAC370033E8C9 /* libRCTAnimation.a in Frameworks */,
17EC86F61D6EE9AB006878BB /* libRNVectorIcons.a in Frameworks */,
A85175D71D54FD2000AEF15A /* Security.framework in Frameworks */,
176D7AD01C61D31C004C465D /* libz.tbd in Frameworks */,
Expand Down Expand Up @@ -339,6 +356,15 @@
name = Products;
sourceTree = "<group>";
};
179261BD1E1BAC230033E8C9 /* Products */ = {
isa = PBXGroup;
children = (
179261C21E1BAC230033E8C9 /* libRCTAnimation.a */,
179261C41E1BAC230033E8C9 /* libRCTAnimation-tvOS.a */,
);
name = Products;
sourceTree = "<group>";
};
179B10A41D210D1F00405A2C /* Products */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -384,6 +410,7 @@
832341AE1AAA6A7D00B99B32 /* Libraries */ = {
isa = PBXGroup;
children = (
179261BC1E1BAC230033E8C9 /* RCTAnimation.xcodeproj */,
17EC86F01D6EE979006878BB /* RNVectorIcons.xcodeproj */,
179B10A31D210D1F00405A2C /* CodePush.xcodeproj */,
146833FF1AC3E56700842450 /* React.xcodeproj */,
Expand Down Expand Up @@ -493,6 +520,10 @@
ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */;
ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */;
},
{
ProductGroup = 179261BD1E1BAC230033E8C9 /* Products */;
ProjectRef = 179261BC1E1BAC230033E8C9 /* RCTAnimation.xcodeproj */;
},
{
ProductGroup = 00C302B61ABCB90400DB3ED1 /* Products */;
ProjectRef = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */;
Expand Down Expand Up @@ -613,6 +644,20 @@
remoteRef = 176D7AC41C61D2DB004C465D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
179261C21E1BAC230033E8C9 /* libRCTAnimation.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libRCTAnimation.a;
remoteRef = 179261C11E1BAC230033E8C9 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
179261C41E1BAC230033E8C9 /* libRCTAnimation-tvOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libRCTAnimation-tvOS.a";
remoteRef = 179261C31E1BAC230033E8C9 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
179B10A81D210D1F00405A2C /* libCodePush.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
Expand Down

0 comments on commit 5990b56

Please sign in to comment.