From a61fdf60b6bc8c7d4440d033f919e4704680915c Mon Sep 17 00:00:00 2001
From: fantonangeli <fabrizio.antonangeli@gmail.com>
Date: Tue, 25 Aug 2026 17:49:20 +0200
Subject: [PATCH 1/4] Enable feature branches PR previews

Signed-off-by: fantonangeli <fabrizio.antonangeli@gmail.com>
---
 netlify.toml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/netlify.toml b/netlify.toml
index 41d14aa5..52ed100c 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -28,7 +28,18 @@
   publish = "packages/open-workflow-diagram-editor/dist-storybook"
   ignore = """
     set -e -o pipefail
-    git fetch --no-tags --depth=1 origin main:refs/remotes/origin/main
+
+    if [ -n "${REVIEW_ID:-}" ]; then
+      FETCH_REF="refs/pull/${REVIEW_ID}/merge"
+      BASE_REV="FETCH_HEAD^1"
+    else
+      FETCH_REF="main"
+      BASE_REV="FETCH_HEAD"
+    fi
+
+    git fetch --no-tags --depth=2 origin "$FETCH_REF"
+    BASE_REF="$(git rev-parse "$BASE_REV")"
+
     npm i -g "pnpm@$PNPM_VERSION"
-    ! pnpm -F '...[origin/main]' -rc exec 'echo "$PNPM_PACKAGE_NAME"' | grep -Fqx "$PREVIEW_PACKAGE_NAME"
+    ! pnpm -F "...[$BASE_REF]" -rc exec 'echo "$PNPM_PACKAGE_NAME"' | grep -Fqx "$PREVIEW_PACKAGE_NAME"
   """

From 209dc7bf2b24f158bba4d1c3ccc1ebc3f5857c30 Mon Sep 17 00:00:00 2001
From: fantonangeli <fabrizio.antonangeli@gmail.com>
Date: Tue, 25 Aug 2026 18:20:42 +0200
Subject: [PATCH 2/4] print calculated vars

Signed-off-by: fantonangeli <fabrizio.antonangeli@gmail.com>
---
 netlify.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/netlify.toml b/netlify.toml
index 52ed100c..59d0b33d 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -39,6 +39,7 @@
 
     git fetch --no-tags --depth=2 origin "$FETCH_REF"
     BASE_REF="$(git rev-parse "$BASE_REV")"
+    echo "FETCH_REF=$FETCH_REF BASE_REV=$BASE_REV BASE_REF=$BASE_REF"
 
     npm i -g "pnpm@$PNPM_VERSION"
     ! pnpm -F "...[$BASE_REF]" -rc exec 'echo "$PNPM_PACKAGE_NAME"' | grep -Fqx "$PREVIEW_PACKAGE_NAME"

From b3f934acbade8472a63b569fe6aa4b407ab84a81 Mon Sep 17 00:00:00 2001
From: fantonangeli <fabrizio.antonangeli@gmail.com>
Date: Wed, 26 Aug 2026 12:16:54 +0200
Subject: [PATCH 3/4] compare Netlify previews against the correct base ref

Signed-off-by: fantonangeli <fabrizio.antonangeli@gmail.com>
---
 netlify.toml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/netlify.toml b/netlify.toml
index 59d0b33d..cb954cbd 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -30,16 +30,16 @@
     set -e -o pipefail
 
     if [ -n "${REVIEW_ID:-}" ]; then
+      # For PR previews, fetch GitHub's synthetic merge commit.
       FETCH_REF="refs/pull/${REVIEW_ID}/merge"
-      BASE_REV="FETCH_HEAD^1"
     else
-      FETCH_REF="main"
-      BASE_REV="FETCH_HEAD"
+      # For branch builds, fetch the branch being deployed.
+      FETCH_REF="$BRANCH"
     fi
 
     git fetch --no-tags --depth=2 origin "$FETCH_REF"
-    BASE_REF="$(git rev-parse "$BASE_REV")"
-    echo "FETCH_REF=$FETCH_REF BASE_REV=$BASE_REV BASE_REF=$BASE_REF"
+    BASE_REF="$(git rev-parse FETCH_HEAD^1)"
+    echo "FETCH_REF=$FETCH_REF BASE_REF=$BASE_REF"
 
     npm i -g "pnpm@$PNPM_VERSION"
     ! pnpm -F "...[$BASE_REF]" -rc exec 'echo "$PNPM_PACKAGE_NAME"' | grep -Fqx "$PREVIEW_PACKAGE_NAME"

From 8dbf49b7b21258719f72eb7d005cdcd5afd1ddb8 Mon Sep 17 00:00:00 2001
From: fantonangeli <fabrizio.antonangeli@gmail.com>
Date: Wed, 26 Aug 2026 13:17:58 +0200
Subject: [PATCH 4/4] Always deploy if fetch fails.

Signed-off-by: fantonangeli <fabrizio.antonangeli@gmail.com>
---
 netlify.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/netlify.toml b/netlify.toml
index cb954cbd..5d12d014 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -37,7 +37,8 @@
       FETCH_REF="$BRANCH"
     fi
 
-    git fetch --no-tags --depth=2 origin "$FETCH_REF"
+    # Always deploy if fetch fails.
+    git fetch --no-tags --depth=2 origin "$FETCH_REF" || exit 1
     BASE_REF="$(git rev-parse FETCH_HEAD^1)"
     echo "FETCH_REF=$FETCH_REF BASE_REF=$BASE_REF"