Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: fix patches for v4 to be compatible again #32959

Merged
merged 2 commits into from
Aug 30, 2021
Merged

chore: fix patches for v4 to be compatible again #32959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f5f7e2
fix patches
wardpeet Aug 30, 2021
1206ed8
commit yarn changes
wardpeet Aug 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion patches/v4/0-node-version.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion patches/v4/1-lmdb-default.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion patches/v4/2-gatsby-peerdeps.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
14 changes: 14 additions & 0 deletions scripts/release-next-major.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down