Merge pull request #55 from react-native-community/orta-patch-1

Update App.tsx to correspond to def typed updates

.travis.yml

@@ -1,14 +1,17 @@
 language: node_js
 node_js:
   - "node"
-cache:
-  directories:
-    - "node_modules"
 deploy:
-  on:
-    branch: master
-    tags: true
-  provider: npm
-  email: "emin@emin.ch"
-  api_key: "${NPM_TOKEN}"
-  skip_cleanup: true
+  - provider: npm
+    on:
+      condition: $TRAVIS_BRANCH == "master" && -n $TRAVIS_TAG
+    email: "emin@emin.ch"
+    api_key: "${NPM_TOKEN}"
+    skip_cleanup: true
+  - provider: npm
+    on:
+      condition: $TRAVIS_BRANCH == "master-cli-v2" && -n $TRAVIS_TAG
+    email: "emin@emin.ch"
+    api_key: "${NPM_TOKEN}"
+    skip_cleanup: true
+    tag: next

App.tsx

@@ -1,9 +1,9 @@
 /**
  * Sample React Native App
  * https://github.com/facebook/react-native
- * 
+ *
  * Generated with the TypeScript template
- * https://github.com/emin93/react-native-template-typescript
+ * https://github.com/react-native-community/react-native-template-typescript
  *
  * @format
  */
@@ -27,6 +27,8 @@ import {
 } from 'react-native/Libraries/NewAppScreen';
 
 const App = () => {
+  const usingHermes = typeof HermesInternal === 'object' && HermesInternal !== null;
+
   return (
     <Fragment>
       <StatusBar barStyle="dark-content" />
@@ -35,6 +37,11 @@ const App = () => {
           contentInsetAdjustmentBehavior="automatic"
           style={styles.scrollView}>
           <Header />
+          {!usingHermes ? null : (
+            <View style={styles.engine}>
+              <Text style={styles.footer}>Engine: Hermes</Text>
+            </View>
+          )}
           <View style={styles.body}>
             <View style={styles.sectionContainer}>
               <Text style={styles.sectionTitle}>Step One</Text>
@@ -73,6 +80,10 @@ const styles = StyleSheet.create({
   scrollView: {
     backgroundColor: Colors.lighter,
   },
+  engine: {
+    position: 'absolute',
+    right: 0,
+  },
   body: {
     backgroundColor: Colors.white,
   },
@@ -94,6 +105,14 @@ const styles = StyleSheet.create({
   highlight: {
     fontWeight: '700',
   },
+  footer: {
+    color: Colors.dark,
+    fontSize: 12,
+    fontWeight: '600',
+    padding: 4,
+    paddingRight: 12,
+    textAlign: 'right',
+  },
 });
 
 export default App;

CONTRIBUTING.md

@@ -4,6 +4,8 @@ Contributing to this project should be as easy and transparent as possible.
 
 ## Workflow
 
+Right now there are two master branches in order to keep support for the old React Native CLI (for more info, check out the [related issue](https://github.com/react-native-community/react-native-template-typescript/issues/39)).
+
 We use [GitHub Flow](https://guides.github.com/introduction/flow/), so all code changes happen through pull requests.
 
 1.  Fork the repository and create your branch from `master`.

_gitignore

@@ -58,3 +58,6 @@ buck-out/
 
 # Bundle artifact
 *.jsbundle
+
+# CocoaPods
+/ios/Pods/

package.json

@@ -25,6 +25,6 @@
   },
   "homepage": "https://github.com/emin93/react-native-template-typescript#readme",
   "devDependencies": {
-    "standard": "12.0.1"
+    "standard": "13.0.2"
   }
 }