Upgrade to RN 0.64.0

.circleci/cache-version

@@ -0,0 +1,2 @@
+# To invalidate the cache, generate a new UUID using `uuidgen` on the command line then paste it here
+BD31B30E-7154-402F-AF62-80C50D4BE2CB

bin/generate-podspecs.sh

@@ -1,34 +1,93 @@
-#!/bin/sh
+#!/bin/bash
 
 # Exit if any command fails
 set -e
 
+function warn_missing_tag_commit() {
+    RED="\033[0;31m"
+    NO_COLOR="\033[0m"
+    PODSPEC_HAS_TAG_OR_COMMIT=$(jq '.source | has("tag") or has("commit")' "$DEST/$pod.podspec.json")
+    if [[ $PODSPEC_HAS_TAG_OR_COMMIT == "false" ]]; then
+        printf "${RED}WARNING! $pod.podspec doesn't have a 'tag' or 'commit' field. Either modify this script to add a patch during the podspec generation or modify the original $pod.podspec in the source repo.${NO_COLOR}\n"
+        exit 1
+    fi
+}
+
 # Change to the expected directory.
-cd "$( dirname $0 )"
+cd "$( dirname "$0" )"
 cd ..
+WD=$(pwd)
+echo "Working directory: $WD"
 
 # Check for cocoapods & jq
 command -v pod > /dev/null || ( echo Cocoapods is required to generate podspecs; exit 1 )
 command -v jq > /dev/null || ( echo jq is required to generate podspecs; exit 1 )
 
-WD=$(pwd)
+read -r -p "If your node_modules folder isn't up-to-date please run 'npm install' first and re-run the script. Is your node_modules folder up-to-date? [y/N] " PROMPT_RESPONSE
+if [[ $PROMPT_RESPONSE != "y" ]]; then
+    echo "Please run npm install first and re-run the script."
+    exit 1
+fi
+
+read -r -p "Enter the commit hash of previous commit. If this is the first-time running this script, enter 0, then commit generated files and re-rerun the script and this time use the previous commit hash: " COMMIT_HASH
+if [[ -z "$COMMIT_HASH" ]]; then
+    echo "Commit hash cannot be empty."
+    exit 1
+fi
+
 DEST="${WD}/third-party-podspecs"
 NODE_MODULES_DIR="gutenberg/node_modules"
 
 # Generate the external (non-RN podspecs)
 EXTERNAL_PODSPECS=$(find "$NODE_MODULES_DIR/react-native/third-party-podspecs" \
-                         "$NODE_MODULES_DIR/react-native-svg" \
+                         "$NODE_MODULES_DIR/@react-native-community/blur" \
+                         "$NODE_MODULES_DIR/@react-native-community/masked-view" \
+                         "$NODE_MODULES_DIR/@react-native-community/slider" \
+                         "$NODE_MODULES_DIR/react-native-dark-mode" \
+                         "$NODE_MODULES_DIR/react-native-gesture-handler" \
+                         "$NODE_MODULES_DIR/react-native-get-random-values" \
                          "$NODE_MODULES_DIR/react-native-keyboard-aware-scroll-view" \
+                         "$NODE_MODULES_DIR/react-native-linear-gradient" \
+                         "$NODE_MODULES_DIR/react-native-reanimated" \
                          "$NODE_MODULES_DIR/react-native-safe-area" \
-                         "$NODE_MODULES_DIR/react-native-dark-mode" \
-                         "$NODE_MODULES_DIR/react-native-get-random-values" -type f -name "*.podspec" -print)
+                         "$NODE_MODULES_DIR/react-native-safe-area-context" \
+                         "$NODE_MODULES_DIR/react-native-screens" \
+                         "$NODE_MODULES_DIR/react-native-svg" \
+                         "$NODE_MODULES_DIR/react-native-video"\
+                          -type f -name "*.podspec" -print)
 
 for podspec in $EXTERNAL_PODSPECS
 do
     pod=$(basename "$podspec" .podspec)
 
     echo "Generating podspec for $pod"
-    pod ipc spec $podspec > "$DEST/$pod.podspec.json"
+    pod ipc spec "$podspec" > "$DEST/$pod.podspec.json"
+
+    # react-native-slider is the only gutenberg-mobile fork where we don't use the native files from the original repo
+    if [[ "$pod" == "react-native-slider" ]]; then
+        echo "   ==> Patching $pod podspec"
+        TMP_RNSliderSpec=$(mktemp)
+        jq '.source.git = "https://github.com/wordpress-mobile/react-native-slider.git" | .source.commit = "d263ff16cdd9fb7352b354342522ff030f220f42" | del(.source.tag)' "$DEST/$pod.podspec.json" > "$TMP_RNSliderSpec"
+        mv "$TMP_RNSliderSpec" "$DEST/$pod.podspec.json"
+    fi
+
+    # react-native-blur doesn't have a tag field in it's podspec
+    if [[ "$pod" == "react-native-blur" ]]; then
+        echo "   ==> Patching $pod podspec"
+        TMP_RNBlurPodspec=$(mktemp)
+        # The npm version we're using is 3.6.0 because 3.6.1 still isn't on npm https://www.npmjs.com/package/@react-native-community/blur/v/3.6.1
+        # And there's no v3.6.0 tag in https://github.com/Kureev/react-native-blur so we depend on v3.6.1 in the podspec
+        jq '.source.tag = "v3.6.1" | .version = "3.6.1"' "$DEST/$pod.podspec.json" > "$TMP_RNBlurPodspec"
+        mv "$TMP_RNBlurPodspec" "$DEST/$pod.podspec.json"
+    fi
+
+    # Add warning to bottom
+    TMP_SPEC=$(mktemp)
+    jq '. + {"__WARNING!__": "This file is autogenerated by generate-podspecs.sh script. Do not modify manually. Re-run the script if necessary."}' "$DEST/$pod.podspec.json" > "$TMP_SPEC"
+    mv "$TMP_SPEC" "$DEST/$pod.podspec.json"
+
+    # As a last step check if podspec has a "tag" or "commit" field in "source"
+    warn_missing_tag_commit
 done
 
 # Generate the React Native podspecs
@@ -44,11 +103,40 @@ do
     path=$(dirname "$podspec")
 
     echo "Generating podspec for $pod with path $path"
-    pod ipc spec $podspec > "$TMP_DEST/$pod.podspec.json"
+    pod ipc spec "$podspec" > "$TMP_DEST/$pod.podspec.json"
     cat "$TMP_DEST/$pod.podspec.json" | jq > "$DEST/$pod.podspec.json"
 
     # Add a "prepare_command" entry to each podspec so that 'pod install' will fetch sources from the correct directory
     # and retains the existing prepare_command if it exists
     prepare_command="TMP_DIR=\$(mktemp -d); mv * \$TMP_DIR; cp -R \"\$TMP_DIR/${path}\"/* ."
     cat "$TMP_DEST/$pod.podspec.json" | jq --arg CMD "$prepare_command" '.prepare_command = "\($CMD) && \(.prepare_command // true)"' > "$DEST/$pod.podspec.json"
+
+    # Add warning to bottom
+    TMP_SPEC=$(mktemp)
+    jq '. + {"__WARNING!__": "This file is autogenerated by generate-podspecs.sh script. Do not modify manually. Re-run the script if necessary."}' "$DEST/$pod.podspec.json" > "$TMP_SPEC"
+    mv "$TMP_SPEC" "$DEST/$pod.podspec.json"
+
+    # As a last step check if podspec has a "tag" or "commit" field in "source"
+    warn_missing_tag_commit
+
+    # FBReactNativeSpec needs special treatment because of react-native-codegen code generation
+    if [[ "$pod" == "FBReactNativeSpec" ]]; then
+        echo "   ==> Patching $pod podspec"
+        # First move it to its own folder
+        mkdir -p "$DEST/FBReactNativeSpec"
+        mv "$DEST/FBReactNativeSpec.podspec.json" "$DEST/FBReactNativeSpec"
+
+        # Then we generate FBReactNativeSpec-generated.mm and FBReactNativeSpec.h files.
+        # They are normally generated during compile time using a Script Phase in FBReactNativeSpec added via the `use_react_native_codegen` function.
+        # This script is inside node_modules/react-native/scripts folder. Since we don't have the node_modules when compiling WPiOS,
+        # we're calling the script here manually to generate these files ahead of time.
+        CODEGEN_MODULES_OUTPUT_DIR=$DEST/FBReactNativeSpec ./scripts/generate-specs.sh 
+
+        # Removing 'script_phases' that shouldn't be needed anymore.
+        # Removing 'prepare_command' that includes additional steps to create intermediate folders to keep generated files which won't be needed.
+        # Removing 'source.tag' as we'll use a commit hash from gutenberg-mobile instead.
+        TMP_FBReactNativeSpec=$(mktemp)
+        jq --arg COMMIT_HASH "$COMMIT_HASH" 'del(.script_phases) | del(.prepare_command) | del(.source.tag) | .source.git = "https://github.com/wordpress-mobile/gutenberg-mobile.git" | .source.commit = $COMMIT_HASH | .source.submodules = "true" | .source_files = "third-party-podspecs/FBReactNativeSpec/**/*.{c,h,m,mm,cpp}"' "$DEST/FBReactNativeSpec/FBReactNativeSpec.podspec.json" > "$TMP_FBReactNativeSpec"
+        mv "$TMP_FBReactNativeSpec" "$DEST/FBReactNativeSpec/FBReactNativeSpec.podspec.json"
+    fi
 done

jest.config.js

@@ -66,7 +66,7 @@ module.exports = {
 		// See: https://github.com/wordpress-mobile/gutenberg-mobile/pull/257#discussion_r234978268
 		// There is no overloading in jest so we need to rewrite the config from react-native-jest-preset:
 		// https://github.com/facebook/react-native/blob/master/jest-preset.json#L20
-		'node_modules/(?!(simple-html-tokenizer|@react-native-community|(jest-)?react-native|react-clone-referenced-element))',
+		'node_modules/(?!(simple-html-tokenizer|@react-native-community|(jest-)?react-native|@react-native|react-clone-referenced-element))',
 	],
 	reporters: [ 'default', 'jest-junit' ],
 };