Merge pull request #988 from wordpress-mobile/release/1.5.0

Release/1.5.0

.flowconfig

@@ -94,6 +94,8 @@ module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|we
 ; mock/ignore style files
 module.name_mapper='.*\(.scss\)' -> 'empty/object'
 
+server.max_workers=4
+
 suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
 suppress_type=$FlowFixMeProps

.gitattributes

@@ -0,0 +1 @@
+RELEASE-NOTES.txt merge=union

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,7 @@
+Fixes #
+
+To test:
+
+Update release notes:
+
+- [ ] If there are user facing changes, I have added an item to `RELEASE-NOTES.txt`.

README.md

@@ -63,14 +63,30 @@ yarn android
 
 The app should now open in a connected device or a running emulator and fetch the JavaScript code from the running packager.
 
-To compile and run the iOS variant of the app, use:
+To compile and run the iOS variant of the app using the _default_ simulator device, use:
 
 ```
 yarn ios
 ```
 
 which will attempt to open your app in the iOS Simulator if you're on a Mac and have it installed.
 
+### Running on Other iOS Device Simulators
+
+To compile and run the app using a different device simulator, use:
+
+```
+yarn ios --simulator="DEVICE_NAME"
+```
+
+For example, if you'd like to run in an iPhone Xs Max, try:
+
+```
+yarn ios --simulator="iPhone Xs Max"
+```
+
+To see a list of all of your available iOS devices, use `xcrun simctl list devices`.
+
 ### When things seem crazy
 
 Some times, and especially when tweaking anything in the `package.json`, Babel configuration (`.babelrc`) or the Jest configuration (`jest.config.js`), your changes might seem to not take effect as expected. On those times, you might need to clean various caches before starting the packager. To do that, run the script: `yarn start:reset`. Other times, you might want to reinstall the NPM packages from scratch and the `yarn clean:install` script can be handy.

RELEASE-NOTES.txt

@@ -0,0 +1,2 @@
+1.6.0
+------

android/app/build.gradle

@@ -150,6 +150,7 @@ configurations.all {
 }
 
 dependencies {
+    implementation project(':react-native-video')
     implementation project(':react-native-svg')
     implementation project(':react-native-aztec')
     implementation project(':react-native-recyclerview-list')

android/app/src/main/java/com/gutenberg/MainApplication.java

@@ -4,6 +4,7 @@
 import android.util.Log;
 
 import com.facebook.react.ReactApplication;
+import com.brentvatne.react.ReactVideoPackage;
 import com.horcrux.svg.SvgPackage;
 
 import org.wordpress.mobile.ReactNativeAztec.ReactAztecPackage;
@@ -32,6 +33,7 @@ public boolean getUseDeveloperSupport() {
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(
           new MainReactPackage(),
+            new ReactVideoPackage(),
             new SvgPackage(),
             new ReactAztecPackage(),
             new RNRecyclerviewListPackage(),
@@ -40,13 +42,13 @@ protected List<ReactPackage> getPackages() {
                 public void responseHtml(String title, String html, boolean changed) {}
 
                 @Override
-                public void requestMediaPickFromMediaLibrary(MediaSelectedCallback mediaSelectedCallback) {}
+                public void requestMediaPickFromMediaLibrary(MediaSelectedCallback mediaSelectedCallback, MediaType mediaType) {}
 
                 @Override
-                public void requestMediaPickFromDeviceLibrary(MediaUploadCallback mediaUploadCallback) {}
+                public void requestMediaPickFromDeviceLibrary(MediaUploadCallback mediaUploadCallback, MediaType mediaType) {}
 
                 @Override
-                public void requestMediaPickerFromDeviceCamera(MediaUploadCallback mediaUploadCallback) {}
+                public void requestMediaPickerFromDeviceCamera(MediaUploadCallback mediaUploadCallback, MediaType mediaType) {}
 
                 @Override
                 public void requestMediaImport(String url, MediaSelectedCallback mediaSelectedCallback) {}

android/settings.gradle

@@ -1,4 +1,6 @@
 rootProject.name = 'gutenberg'
+include ':react-native-video'
+project(':react-native-video').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-video/android-exoplayer')
 include ':react-native-svg'
 project(':react-native-svg').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-svg/android')
 include ':react-native-aztec'

babel.config.js

@@ -25,6 +25,7 @@ module.exports = function( api ) {
 						'@babel/plugin-transform-react-jsx',
 						{
 							pragma: 'createElement',
+							pragmaFrag: 'Fragment',
 						},
 					],
 				],
@@ -33,9 +34,10 @@ module.exports = function( api ) {
 			{ // Auto-add `import { createElement } from '@wordpress/element';` when JSX is found
 				plugins: [
 					[
-						'@wordpress/babel-plugin-import-jsx-pragma',
+						'./gutenberg/packages/babel-plugin-import-jsx-pragma',
 						{
 							scopeVariable: 'createElement',
+							scopeVariableFrag: 'Fragment',
 							source: '@wordpress/element',
 							isDefault: false,
 						},

bin/ci-checks-js.sh

@@ -14,8 +14,8 @@ if [[ -z "${CHECK_CORRECTNESS}" ]] && [[ -z "${CHECK_TESTS}" ]] ; then
 fi
 
 if [ "$CHECK_CORRECTNESS" = true ] ; then
-  npm run flow || pFail
-  npm run lint || pFail
+  yarn flow || pFail
+  yarn lint || pFail
 fi
 
 if [ "$GUTENBERG_AS_PARENT" = true ] ; then
@@ -27,9 +27,9 @@ fi
 if [ "$CHECK_TESTS" = true ] ; then
   # we'll run the tests twich (once for each platform) if the platform env var is not set
   if [[ -z "${TEST_RN_PLATFORM}" ]] ; then
-    TEST_RN_PLATFORM=android npm run ${TEST_SCRIPT_NAME} || pFail
-    TEST_RN_PLATFORM=ios npm run ${TEST_SCRIPT_NAME} || pFail
+    TEST_RN_PLATFORM=android yarn ${TEST_SCRIPT_NAME} --maxWorkers=4 || pFail
+    TEST_RN_PLATFORM=ios yarn ${TEST_SCRIPT_NAME} --maxWorkers=4 || pFail
   else
-    npm run ${TEST_SCRIPT_NAME} || pFail
+    yarn ${TEST_SCRIPT_NAME} --maxWorkers=4 || pFail
   fi
 fi