Skip to content

fixed breaking change for Gatsby v4 #66

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fixed breaking change for Gatsby v4 #66

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
70ec220
fixed breaking change for gatsby v4
cravi24 Feb 24, 2022
3b8b048
update peer dep requirement since fix doesn't break anything for Gats…
cravi24 Feb 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@wardpeet/gatsby-plugin-static-site",
"version": "0.3.0",
"version": "0.4.0",
"description": "A plugin that disables client side routing for gatsby",
"main": "index.js",
"author": "Ward Peeters <[email protected]>",
Expand All @@ -17,7 +17,7 @@
},
"license": "MIT",
"peerDependencies": {
"gatsby": "^3.0.0"
"gatsby": "^3.0.0 || ^4.0.0"
},
"files": [
"gatsby-browser.js",
Expand Down
18 changes: 12 additions & 6 deletions src/gatsby-browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@ exports.onClientEntry = () => {

loader.loadPageSync = path => {
let pageResources;
// if the path is the same as our current page we know it's not a prefetch
if (path === location.pathname) {
// With Gatsby V4, path has been appended with window.location.search when invoking loadPageSync
const pathWithoutQueryParams = path.replace(location.search, '');

// if the pathWithoutQueryParams is the same as our current page we know it's not a prefetch
if (pathWithoutQueryParams === location.pathname) {
pageResources = originalLoadPageSync(pagePath);
} else {
pageResources = originalLoadPageSync(path);
pageResources = originalLoadPageSync(pathWithoutQueryParams);
}

if (pageResources.page) {
Expand All @@ -37,11 +40,14 @@ exports.onClientEntry = () => {

loader.loadPage = path => {
let pageResources;
// if the path is the same as our current page we know it's not a prefetch
if (path === location.pathname) {
// With Gatsby V4, path has been appended with window.location.search when invoking loadPage
const pathWithoutQueryParams = path.replace(location.search, '');

// if the pathWithoutQueryParams is the same as our current page we know it's not a prefetch
if (pathWithoutQueryParams === location.pathname) {
pageResources = originalLoadPage(pagePath);
} else {
pageResources = originalLoadPage(path);
pageResources = originalLoadPage(pathWithoutQueryParams);
}

if (pageResources.page) {
Expand Down