Add support for Babel 7 + RN 0.57

.npmrc

@@ -0,0 +1,3 @@
+@office-iss:registry=https://office.pkgs.visualstudio.com/_packaging/Office/npm/registry/
+registry=https://office.pkgs.visualstudio.com/_packaging/Office/npm/registry/
+always-auth=true

docs/HMR_API.md

@@ -18,11 +18,13 @@ require('haul/hot/patch');
 * In production (`NODE_ENV === 'production'`):
   does nothing.
 
-* In development (`NODE_ENV !== 'production'`):
+* In development with HMR enabled
+  (`NODE_ENV !== 'production' && module.hot`):
 
   Patches React's `createElement` and `createFactory`, so that they use `react-proxy` and return a proxied component. Those components behave like the normal ones, but have their state persisted between updates.
 
-  This file __must be imported/required in the root file / entry file before anything else__, since the code must be executed at the very beginning.
+  This file is automatically imported before all configured entry
+  points, since the code must be executed at the very beginning.
 
 ## Module `haul/hot/index.js`
 

docs/HMR_Setup.md

@@ -43,14 +43,9 @@ This guide below is not a list of steps, but rather a set of rules and tips on h
 
 ------
 
-Haul uses `react-hot-loader` to support HMR, so the first step is to _patch_ React's `createElement` and `createFactory` functions to use `react-proxy`. Proxied component can be updated with a new implementation but it's state is persisted between updates.
-In order to do that, add the following line to `__the root file__` - the one that is used as an entrypoint, before any other code:
-
-```javascript
-import 'haul/hot/patch';
-```
-
-It's important that __the code from `haul/hot/patch` is evaluated before anything else!__
+Haul uses `react-hot-loader` to support HMR. `react-hot-loader/patch`
+is automatically imported in all entry points in development when
+HMR is enabled.
 
 Now, we need to wrap the __root component factories__ using `makeHot` function. Root component factory is a function that returns a __root component__:
 
@@ -148,7 +143,6 @@ Now, you need to replace empty strings with the paths according to the following
 ### Single root component in a entry file
 
 ```javascript
-import 'haul/hot/patch';
 import {
   makeHot,
   tryUpdateSelf,
@@ -176,7 +170,6 @@ if (module.hot) {
 
 ```javascript
 // index.js
-import 'haul/hot/patch';
 import './screens';
 ```
 

docs/HMR_react-native-navigation.md

@@ -7,30 +7,10 @@ Since we don't know how your project looks like, we will use one of the possible
 
 ---
 
-Let's assume you have `index.js` file which imports your screens and bootstraps the navigation. Add `import 'haul/hot/patch';` at the beginning:
+Let's assume you have `index.js` file which imports your screens and bootstraps the navigation. Make the following changes:
 
 ```diff
 // index.js
-+ import 'haul/hot/patch';
-import { Navigation } from 'react-native-navigation';
-
-// Screens
-import Calendar from './Calendar';
-import Localization from './Localization';
-import Information from './Information';
-
-Navigation.registerComponent('Calendar', () => Calendar);
-Navigation.registerComponent('Localization', () => Localization);
-Navigation.registerComponent('Information',() => Information);
-```
-
-`import 'haul/hot/patch';` should be placed in the root file / entry file, since __the code from this file must be executed before anything else!__
-
-Now, make the following changes:
-
-```diff
-// index.js
-import 'haul/hot/patch';
 import { Navigation } from 'react-native-navigation';
 + import {
 +   makeHot,

docs/HMR_react-navigation.md

@@ -31,7 +31,6 @@ First thing you need to do is to add the following code snipped at the top of `A
 
 ```diff
 // index.js
-+ import 'haul/hot/patch';
 + import { makeHot, clearCacheFor, redraw } from 'haul/hot';
 import {
   AppRegistry,
@@ -49,15 +48,12 @@ const MyApp = StackNavigator({
 AppRegistry.registerComponent('MyApp', () => MyApp);
 ```
 
-`import 'haul/hot/patch'` must be placed before anything else, since __the code in that file must be executed at the very beginning!__
-
 ---
 
 Now, if you're defining your screens using `screen` property, you must replace it with `getScreen` and convert the value to a function:
 
 ```diff
 // index.js
-import 'haul/hot/patch';
 import { makeHot, clearCacheFor, redraw } from 'haul/hot';
 import {
   AppRegistry,
@@ -81,7 +77,6 @@ Then, wrap those screen factories with `makeHot` call and pass the name of the s
 
 ```diff
 // index.js
-import 'haul/hot/patch';
 import { makeHot, clearCacheFor, redraw } from 'haul/hot';
 import {
   AppRegistry,
@@ -108,7 +103,6 @@ Place the following code snipped at the end of the file:
 
 ```diff
 // index.js
-import 'haul/hot/patch';
 import { makeHot, clearCacheFor, redraw } from 'haul/hot';
 import {
   AppRegistry,

fixtures/example-app/.babelrc

@@ -1,3 +1,3 @@
 {
-  "presets": ["react-native"]
+  "presets": ["module:metro-react-native-babel-preset"]
 }

fixtures/example-app/.flowconfig

@@ -29,7 +29,23 @@ node_modules/react-native/flow-github/
 [options]
 emoji=true
 
+esproposal.optional_chaining=enable
+esproposal.nullish_coalescing=enable
+
 module.system=haste
+module.system.haste.use_name_reducers=true
+# get basename
+module.system.haste.name_reducers='^.*/\([a-zA-Z0-9$_.-]+\.js\(\.flow\)?\)$' -> '\1'
+# strip .js or .js.flow suffix
+module.system.haste.name_reducers='^\(.*\)\.js\(\.flow\)?$' -> '\1'
+# strip .ios suffix
+module.system.haste.name_reducers='^\(.*\)\.ios$' -> '\1'
+module.system.haste.name_reducers='^\(.*\)\.android$' -> '\1'
+module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1'
+module.system.haste.paths.blacklist=.*/__tests__/.*
+module.system.haste.paths.blacklist=.*/__mocks__/.*
+module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/Animated/src/polyfills/.*
+module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/Libraries/.*
 
 munge_underscores=true
 
@@ -51,4 +67,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
 [version]
-^0.63.0
+^0.78.0

fixtures/example-app/.gitignore

@@ -55,3 +55,7 @@ buck-out/
 # Haul
 #
 haul-debug.log
+
+# Bundle artifact
+#
+*.jsbundle

fixtures/example-app/android/app/build.gradle

@@ -94,13 +94,13 @@ def enableSeparateBuildPerCPUArchitecture = false
 def enableProguardInReleaseBuilds = false
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         applicationId "com.example"
-        minSdkVersion 16
-        targetSdkVersion 22
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
         ndk {
@@ -137,9 +137,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: "libs", include: ["*.jar"])
-    compile "com.android.support:appcompat-v7:23.0.1"
-    compile "com.facebook.react:react-native:+"  // From node_modules
+    implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
+    implementation "com.facebook.react:react-native:+"  // From node_modules
 }
 
 // Run this once to be able to run the application with BUCK

fixtures/example-app/android/app/proguard-rules.pro

@@ -15,56 +15,3 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
-
-# Disabling obfuscation is useful if you collect stack traces from production crashes
-# (unless you are using a system that supports de-obfuscate the stack traces).
--dontobfuscate
-
-# React Native
-
-# Keep our interfaces so they can be used by other ProGuard rules.
-# See http://sourceforge.net/p/proguard/bugs/466/
--keep,allowobfuscation @interface com.facebook.proguard.annotations.DoNotStrip
--keep,allowobfuscation @interface com.facebook.proguard.annotations.KeepGettersAndSetters
--keep,allowobfuscation @interface com.facebook.common.internal.DoNotStrip
-
-# Do not strip any method/class that is annotated with @DoNotStrip
--keep @com.facebook.proguard.annotations.DoNotStrip class *
--keep @com.facebook.common.internal.DoNotStrip class *
--keepclassmembers class * {
-    @com.facebook.proguard.annotations.DoNotStrip *;
-    @com.facebook.common.internal.DoNotStrip *;
-}
-
--keepclassmembers @com.facebook.proguard.annotations.KeepGettersAndSetters class * {
-  void set*(***);
-  *** get*();
-}
-
--keep class * extends com.facebook.react.bridge.JavaScriptModule { *; }
--keep class * extends com.facebook.react.bridge.NativeModule { *; }
--keepclassmembers,includedescriptorclasses class * { native <methods>; }
--keepclassmembers class *  { @com.facebook.react.uimanager.UIProp <fields>; }
--keepclassmembers class *  { @com.facebook.react.uimanager.annotations.ReactProp <methods>; }
--keepclassmembers class *  { @com.facebook.react.uimanager.annotations.ReactPropGroup <methods>; }
-
--dontwarn com.facebook.react.**
-
-# TextLayoutBuilder uses a non-public Android constructor within StaticLayout.
-# See libs/proxy/src/main/java/com/facebook/fbui/textlayoutbuilder/proxy for details.
--dontwarn android.text.StaticLayout
-
-# okhttp
-
--keepattributes Signature
--keepattributes *Annotation*
--keep class okhttp3.** { *; }
--keep interface okhttp3.** { *; }
--dontwarn okhttp3.**
-
-# okio
-
--keep class sun.misc.Unsafe { *; }
--dontwarn java.nio.file.*
--dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
--dontwarn okio.**

fixtures/example-app/android/app/src/main/AndroidManifest.xml

@@ -1,20 +1,14 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example"
-    android:versionCode="1"
-    android:versionName="1.0">
+    package="com.example">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
-    <uses-sdk
-        android:minSdkVersion="16"
-        android:targetSdkVersion="22" />
-
     <application
       android:name=".MainApplication"
-      android:allowBackup="true"
       android:label="@string/app_name"
       android:icon="@mipmap/ic_launcher"
+      android:allowBackup="false"
       android:theme="@style/AppTheme">
       <activity
         android:name=".MainActivity"

fixtures/example-app/android/build.gradle

@@ -1,11 +1,19 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext {
+        buildToolsVersion = "27.0.3"
+        minSdkVersion = 16
+        compileSdkVersion = 27
+        targetSdkVersion = 26
+        supportLibVersion = "27.1.1"
+    }
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:3.1.4'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -20,5 +28,12 @@ allprojects {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
             url "$rootDir/../node_modules/react-native/android"
         }
+        google()
     }
 }
+
+
+task wrapper(type: Wrapper) {
+    gradleVersion = '4.4'
+    distributionUrl = distributionUrl.replace("bin", "all")
+}

fixtures/example-app/android/gradle.properties

@@ -16,5 +16,3 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-
-android.useDeprecatedNdk=true

fixtures/example-app/android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip