e2e-tests/production-runtime/cypress/integration/1-production.js

@@ -207,4 +207,54 @@ describe(`Production build tests`, () => {
       cy.getTestElement(`404`).should(`exist`)
     })
   })
+
+  describe(`Keeps search query`, () => {
+    describe(`No trailing slash canonical path (/slashes/no-trailing)`, () => {
+      it(`/slashes/no-trailing?param=value`, () => {
+        cy.visit(`/slashes/no-trailing?param=value`).waitForRouteChange()
+
+        cy.getTestElement(`search-marker`)
+          .invoke(`text`)
+          .should(`equal`, `?param=value`)
+
+        cy.location(`pathname`).should(`equal`, `/slashes/no-trailing`)
+        cy.location(`search`).should(`equal`, `?param=value`)
+      })
+
+      it(`/slashes/no-trailing/?param=value`, () => {
+        cy.visit(`/slashes/no-trailing/?param=value`).waitForRouteChange()
+
+        cy.getTestElement(`search-marker`)
+          .invoke(`text`)
+          .should(`equal`, `?param=value`)
+
+        cy.location(`pathname`).should(`equal`, `/slashes/no-trailing`)
+        cy.location(`search`).should(`equal`, `?param=value`)
+      })
+    })
+
+    describe(`With trailing slash canonical path (/slashes/with-trailing/)`, () => {
+      it(`/slashes/with-trailing?param=value`, () => {
+        cy.visit(`/slashes/with-trailing?param=value`).waitForRouteChange()
+
+        cy.getTestElement(`search-marker`)
+          .invoke(`text`)
+          .should(`equal`, `?param=value`)
+
+        cy.location(`pathname`).should(`equal`, `/slashes/with-trailing/`)
+        cy.location(`search`).should(`equal`, `?param=value`)
+      })
+
+      it(`/slashes/with-trailing/?param=value`, () => {
+        cy.visit(`/slashes/with-trailing/?param=value`).waitForRouteChange()
+
+        cy.getTestElement(`search-marker`)
+          .invoke(`text`)
+          .should(`equal`, `?param=value`)
+
+        cy.location(`pathname`).should(`equal`, `/slashes/with-trailing/`)
+        cy.location(`search`).should(`equal`, `?param=value`)
+      })
+    })
+  })
 })

e2e-tests/production-runtime/gatsby-node.js

@@ -130,6 +130,22 @@ exports.createPages = ({ actions: { createPage, createRedirect } }) => {
     component: path.resolve(`./.cache/static-page-from-cache.js`),
   })
 
+  {
+    const searchParamComponent = path.resolve(
+      `src/templates/search-param-render.js`
+    )
+
+    createPage({
+      path: `/slashes/no-trailing`,
+      component: searchParamComponent,
+    })
+
+    createPage({
+      path: `/slashes/with-trailing/`,
+      component: searchParamComponent,
+    })
+  }
+
   createRedirect({
     fromPath: "/pagina-larga",
     toPath: "/long-page",

e2e-tests/production-runtime/src/templates/search-param-render.js

@@ -0,0 +1,7 @@
+import * as React from "react"
+
+const SearchParam = ({ location }) => (
+  <pre data-testid="search-marker">{location.search}</pre>
+)
+
+export default SearchParam

packages/gatsby-source-drupal/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gatsby-source-drupal",
   "description": "Gatsby source plugin for building websites using the Drupal CMS as a data source",
-  "version": "5.1.0",
+  "version": "5.1.1",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"

packages/gatsby-source-drupal/src/gatsby-node.js

@@ -61,6 +61,21 @@ async function worker([url, options]) {
     }
   }
 
+  if (typeof options.searchParams === `object`) {
+    url = new URL(url)
+    const searchParams = new URLSearchParams(options.searchParams)
+    const searchKeys = Array.from(searchParams.keys())
+    searchKeys.forEach(searchKey => {
+      // Only add search params to url if it has not already been
+      // added.
+      if (!url.searchParams.has(searchKey)) {
+        url.searchParams.set(searchKey, searchParams.get(searchKey))
+      }
+    })
+    url = url.toString()
+  }
+  delete options.searchParams
+
   const response = await got(url, {
     agent,
     cache: false,
@@ -467,6 +482,7 @@ ${JSON.stringify(webhookBody, null, 4)}`
                 username: basicAuth.username,
                 password: basicAuth.password,
                 headers,
+                searchParams: params,
                 responseType: `json`,
                 parentSpan: fullFetchSpan,
               },

packages/gatsby/cache-dir/production-app.js

@@ -149,9 +149,15 @@ apiRunnerAsync(`onClientEntry`).then(() => {
       pagePath.match(/^\/offline-plugin-app-shell-fallback\/?$/)
     )
   ) {
-    navigate(__BASE_PATH__ + pagePath + browserLoc.hash, {
-      replace: true,
-    })
+    navigate(
+      __BASE_PATH__ +
+        pagePath +
+        (!pagePath.includes(`?`) ? browserLoc.search : ``) +
+        browserLoc.hash,
+      {
+        replace: true,
+      }
+    )
   }
 
   publicLoader.loadPage(browserLoc.pathname + browserLoc.search).then(page => {

packages/gatsby/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gatsby",
   "description": "Blazing fast modern site generator for React",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bin": {
     "gatsby": "./cli.js"