From 12570245b538a8eadd657d6f9f90002bce416fc8 Mon Sep 17 00:00:00 2001
From: Ward Peeters <ward@coding-tech.com>
Date: Mon, 30 Aug 2021 14:31:01 +0200
Subject: [PATCH] chore: fix patches for v4 to be compatible again (#32959)

---
 patches/v4/0-node-version.patch    |  2 +-
 patches/v4/1-lmdb-default.patch    |  2 +-
 patches/v4/2-gatsby-peerdeps.patch |  2 +-
 scripts/release-next-major.js      | 14 ++++++++++++++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/patches/v4/0-node-version.patch b/patches/v4/0-node-version.patch
index dfe0b7a1f580e..721ed6b300257 100644
--- a/patches/v4/0-node-version.patch
+++ b/patches/v4/0-node-version.patch
@@ -174,7 +174,7 @@ index 811773db17..fec9f4ba7e 100644
 --- a/packages/gatsby-graphiql-explorer/package.json
 +++ b/packages/gatsby-graphiql-explorer/package.json
 @@ -56,6 +56,6 @@
-     "whatwg-fetch": "^3.5.0"
+     "whatwg-fetch": "^3.6.2"
    },
    "engines": {
 -    "node": ">=12.13.0"
diff --git a/patches/v4/1-lmdb-default.patch b/patches/v4/1-lmdb-default.patch
index db4cc0a3dbbce..68795249f00d3 100644
--- a/patches/v4/1-lmdb-default.patch
+++ b/patches/v4/1-lmdb-default.patch
@@ -3,7 +3,7 @@ index f9b0648b15..bfbd311aca 100644
 --- a/packages/gatsby/package.json
 +++ b/packages/gatsby/package.json
 @@ -101,6 +101,7 @@
-     "json-stringify-safe": "^5.0.1",
+     "json-loader": "^0.5.7",
      "latest-version": "5.1.0",
      "lodash": "^4.17.21",
 +    "lmdb-store": "^1.6.6",
diff --git a/patches/v4/2-gatsby-peerdeps.patch b/patches/v4/2-gatsby-peerdeps.patch
index 52f78917fc0fe..5be2f2117f52d 100644
--- a/patches/v4/2-gatsby-peerdeps.patch
+++ b/patches/v4/2-gatsby-peerdeps.patch
@@ -133,7 +133,7 @@ index 0b7931da5d..dbaf39f0aa 100644
 --- a/packages/gatsby-plugin-flow/package.json
 +++ b/packages/gatsby-plugin-flow/package.json
 @@ -35,7 +35,7 @@
-     "gatsby-plugin-utils": "^1.13.0-next.0"
+     "gatsby-plugin-utils": "^1.14.0-next.0"
    },
    "peerDependencies": {
 -    "gatsby": "^3.0.0-next.0"
diff --git a/scripts/release-next-major.js b/scripts/release-next-major.js
index a0865c44cee05..d9d3c0c1313bc 100644
--- a/scripts/release-next-major.js
+++ b/scripts/release-next-major.js
@@ -154,6 +154,20 @@ let currentGitHash = null
       stdio: [`inherit`, `inherit`, `inherit`],
     })
 
+    try {
+      await promiseSpawn(
+        `git`,
+        [`commit`, `-am`, `Comitting yarn changes`, `--no-verify`],
+        {
+          cwd: path.resolve(__dirname, `../`),
+          stdio: [`inherit`, `inherit`, `inherit`],
+        }
+      )
+      commitCreated = true
+    } catch (err) {
+      // no catch
+    }
+
     console.log(` `)
     console.log(`=== PUBLISHING V${nextMajor} ALPHA ===`)
     await promiseSpawn(