Release 1.56.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

.circleci/config.yml

@@ -34,11 +34,73 @@ commands:
           paths:
             - ~/.npm
             - i18n-cache/data
+  checkout-shallow:
+    steps:
+      - run:
+          name: Checkout (Shallow)
+          command: |
+            #!/bin/sh
+            set -e
+
+            # Workaround old docker images with incorrect $HOME
+            # check https://github.com/docker/docker/issues/2968 for details
+            if [ "${HOME}" = "/" ]
+            then
+              export HOME=$(getent passwd $(id -un) | cut -d: -f6)
+            fi
+
+            SSH_CONFIG_DIR="$HOME/.ssh"
+            echo "Using SSH Config Dir '$SSH_CONFIG_DIR'"
+            git --version 
+
+            mkdir -p "$SSH_CONFIG_DIR"
+            chmod 0700 "$SSH_CONFIG_DIR"
+
+            printf "%s" 'github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
+            bitbucket.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAubiN81eDcafrgMeLzaFPsw2kNvEcqTKl/VqLat/MaB33pZy0y3rJZtnqwR2qOOvbwKZYKiEO1O6VqNEBxKvJJelCq0dTXWT5pbO2gDXC6h6QDXCaHo6pOHGPUy+YBaGQRGuSusMEASYiWunYN0vCAI8QaXnWMXNMdFP3jHAJH0eDsoiGnLPBlBp4TNm6rYI74nMzgz3B9IikW4WVK+dc8KZJZWYjAuORU3jc1c/NPskD2ASinf8v3xnfXeukU0sJ5N6m5E8VLjObPEO+mN2t/FZTMZLiFqPWc/ALSqnMnnhwrNi2rbfg/rd/IpL8Le3pSBne8+seeFVBoGqzHM9yXw==
+            ' >> "$SSH_CONFIG_DIR/known_hosts"
+            chmod 0600 "$SSH_CONFIG_DIR/known_hosts"
+
+            export GIT_SSH_COMMAND="ssh -o UserKnownHostsFile='$SSH_CONFIG_DIR/known_hosts'"
+
+            # use git+ssh instead of https
+            git config --global url."ssh://[email protected]".insteadOf "https://github.com" || true
+            git config --global gc.auto 0 || true
+
+            if [ -e "$HOME/project/.git" ] ; then
+              echo 'Fetching into existing repository'
+              existing_repo='true'
+              cd "$HOME/project"
+              git remote set-url origin "$CIRCLE_REPOSITORY_URL" || true
+            else
+              echo 'Cloning git repository'
+              existing_repo='false'
+              mkdir -p "$HOME/project"
+              cd "$HOME/project"
+              git clone --depth 1 --no-checkout "$CIRCLE_REPOSITORY_URL" .
+            fi
+
+            echo 'Fetching from remote repository'
+            if [ -n "$CIRCLE_TAG" ]; then
+              git fetch --depth 1 --force --tags origin "refs/tags/$CIRCLE_TAG"
+            else
+              git fetch --depth 1 --force origin "$CIRCLE_SHA1"
+            fi
+
+            if [ -n "$CIRCLE_TAG" ]; then
+              echo 'Checking out tag'
+              git checkout --force "$CIRCLE_TAG"
+              git reset --hard "$CIRCLE_SHA1"
+            else
+              echo 'Checking out branch'
+              git checkout --force -B "$CIRCLE_BRANCH" "$CIRCLE_SHA1"
+              git --no-pager log --no-color -n 1 --format='HEAD is now at %h %s'
+            fi
   checkout-submodules:
     steps:
       - run:
           name: Checkout Submodules
-          command: git submodule update --init --recursive
+          command: git submodule update --init --recursive --depth 1
   add-jest-reporter-dir:
       steps:
         - run:
@@ -70,7 +132,7 @@ jobs:
     machine:
       image: << pipeline.parameters.linux-machine-image >>
     steps:
-      - checkout
+      - checkout-shallow
       - checkout-submodules
       - run:
           name: Install newer nvm
@@ -114,7 +176,7 @@ jobs:
     machine:
       image: << pipeline.parameters.linux-machine-image >>
     steps:
-      - checkout
+      - checkout-shallow
       - checkout-submodules
       - run: node -v
       - npm-install
@@ -162,7 +224,7 @@ jobs:
     docker:
     - image: << pipeline.parameters.android-docker-image >>
     steps:
-      - checkout
+      - checkout-shallow
       - checkout-submodules
       - npm-install
       - run:
@@ -180,7 +242,7 @@ jobs:
     macos:
       xcode: "12.0.0"
     steps:
-    - checkout
+    - checkout-shallow
     - checkout-submodules
     - npm-install
     - add-jest-reporter-dir
@@ -292,7 +354,7 @@ jobs:
             else
               echo "Build initiated from a tag: proceeding..."
             fi
-      - checkout
+      - checkout-shallow
       - checkout-submodules
       - run:
           # Setting up Android before fetching the Node dependencies because

.eslintignore

@@ -1,5 +1,7 @@
 ; ignore the submodules
 gutenberg
+block-experiments
 bundle
 jetpack
 bin
+

.gitmodules

@@ -6,3 +6,7 @@
 	path = jetpack
 	url = ../../Automattic/jetpack.git
 	shallow = true
+[submodule "block-experiments"]
+	path = block-experiments
+	url = ../../Automattic/block-experiments.git
+	shallow = true

RELEASE-NOTES.txt

@@ -1,12 +1,20 @@
 Unreleased
 ------
 
+1.56.0
+------
+* [*] Tablet view fixes for inserter button. https://github.com/wordpress-mobile/gutenberg-mobile/pull/3602
+* [**] Fixed an issue where pressing enter inside a text-based block was not creating a new block when using Gboard [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3590]
+* [*] Tweaks to the badge component's styling, including change of background color and reduced padding. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3642]
+* [***] New block: Layout grid. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3513]
+
 1.55.2
 ------
 * [**] Fix incorrect block insertion point after blurring the post title field. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3640]
 
 1.55.1
 ------
+* [*] Fix: RNMobile borderRadius value setting. [https://github.com/WordPress/gutenberg/pull/32717]
 * [*] Improve unsupported block message for reusable block. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3621]
 
 1.55.0

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