Pass 'force' parameter for redirects

e2e-tests/adapters/cypress/e2e/redirects.cy.ts

@@ -54,4 +54,12 @@ describe("Redirects", () => {
     cy.location(`hash`).should(`equal`, `#anchor`)
     cy.location(`search`).should(`equal`, `?query_param=hello`)
   })
+  it("should force redirect ", () => {
+    cy.visit(applyTrailingSlashOption(`/routes/redirect/existing`, `never`), {
+      failOnStatusCode: false,
+    }).waitForRouteChange()
+      .assertRoute(applyTrailingSlashOption(`/routes/redirect/existing-force`, `never`))
+
+    cy.get(`h1`).should(`have.text`, `Existing Force`)
+  })
 })

e2e-tests/adapters/gatsby-node.ts

@@ -8,10 +8,17 @@ export const createPages: GatsbyNode["createPages"] = ({ actions: { createRedire
   createRedirect({
     fromPath: applyTrailingSlashOption("/redirect", TRAILING_SLASH),
     toPath: applyTrailingSlashOption("/routes/redirect/hit", TRAILING_SLASH),
+    force: true,
   })
   createRedirect({
     fromPath: applyTrailingSlashOption("/routes/redirect/existing", TRAILING_SLASH),
     toPath: applyTrailingSlashOption("/routes/redirect/hit", TRAILING_SLASH),
+    force: false,
+  })
+  createRedirect({
+    fromPath: "/routes/redirect/existing",
+    toPath: "/routes/redirect/existing-force",
+    force: true,
   })
 
   createSlice({

e2e-tests/adapters/src/pages/routes/redirect/existing-force.jsx

@@ -0,0 +1,14 @@
+import * as React from "react"
+import Layout from "../../../components/layout"
+
+const ExistingForcePage = () => {
+  return (
+    <Layout>
+      <h1>Existing Force</h1>
+    </Layout>
+  )
+}
+
+export default ExistingForcePage
+
+export const Head = () => <title>Existing Force</title>

packages/gatsby-adapter-netlify/src/__tests__/route-handler.ts

@@ -1,13 +1,15 @@
 import fs from "fs-extra"
 import { tmpdir } from "os"
 import { join } from "path"
+import { Route } from "gatsby/src/utils/adapter/types"
 import {
   injectEntries,
   ADAPTER_MARKER_START,
   ADAPTER_MARKER_END,
   NETLIFY_PLUGIN_MARKER_START,
   NETLIFY_PLUGIN_MARKER_END,
   GATSBY_PLUGIN_MARKER_START,
+  handleRoutesManifest,
 } from "../route-handler"
 
 function generateLotOfContent(placeholderCharacter: string): string {
@@ -142,4 +144,20 @@ describe(`route-handler`, () => {
       })
     })
   })
+
+  // describe(`forceRedirects`, () => {
+  //   it(`honors the force parameter`, async () => {
+  //     const redirects: Route = {
+  //       path: `/old-url`,
+  //       type: `redirect`,
+  //       toPath: `/new-url`,
+  //       status: 200,
+  //       headers: [{}],
+  //       force: true,
+  //       conditions: { language: [`ca`, `us`] },
+  //     }
+
+  //     await handleRoutesManifest([redirects])
+  //   })
+  // })
 })

packages/gatsby-adapter-netlify/src/route-handler.ts

@@ -159,14 +159,13 @@ export async function handleRoutesManifest(
       const {
         status: routeStatus,
         toPath,
-        force,
         // TODO: add headers handling
         headers,
         ...rest
       } = route
       let status = String(routeStatus)
 
-      if (force) {
+      if (rest.force) {
         status = `${status}!`
       }
 

packages/gatsby/src/utils/adapter/__tests__/fixtures/state.ts

@@ -70,6 +70,20 @@ const redirects: IGatsbyState["redirects"] = [{
   ignoreCase: true,
   redirectInBrowser: false,
   toPath: '/new-url'
+}, {
+  fromPath: '/old-url2',
+  isPermanent: true,
+  ignoreCase: true,
+  redirectInBrowser: false,
+  toPath: '/new-url2',
+  force: true
+}, {
+  fromPath: '/old-url3',
+  isPermanent: true,
+  ignoreCase: true,
+  redirectInBrowser: false,
+  toPath: '/new-url3',
+  force: false
 }]
 
 const functions: IGatsbyState["functions"] = [{

packages/gatsby/src/utils/adapter/__tests__/manager.ts

@@ -92,6 +92,29 @@ describe(`getRoutesManifest`, () => {
       ])
     )
   })
+
+  it(`should respect "force" redirects parameter`, () => {
+    mockStoreState(stateDefault, {
+      config: { ...stateDefault.config },
+    })
+    process.chdir(fixturesDir)
+    setWebpackAssets(new Set([`app-123.js`]))
+
+    const routesManifest = getRoutesManifest()
+
+    expect(routesManifest).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          path: `/old-url2`,
+          platformSpecificFields: { force: true },
+        }),
+        expect.objectContaining({
+          path: `/old-url3`,
+          platformSpecificFields: { force: false },
+        }),
+      ])
+    )
+  })
 })
 
 describe(`getFunctionsManifest`, () => {

packages/gatsby/src/utils/adapter/manager.ts

@@ -458,17 +458,28 @@ function getRoutesManifest(): RoutesManifest {
 
   // redirect routes
   for (const redirect of state.redirects.values()) {
+    const {
+      fromPath,
+      toPath,
+      statusCode,
+      isPermanent,
+      ignoreCase,
+      redirectInBrowser,
+      ...platformSpecificFields
+    } = redirect
+
     addRoute({
-      path: redirect.fromPath,
+      path: fromPath,
       type: `redirect`,
-      toPath: redirect.toPath,
+      toPath: toPath,
       status:
-        redirect.statusCode ??
-        (redirect.isPermanent
+        statusCode ??
+        (isPermanent
           ? HTTP_STATUS_CODE.MOVED_PERMANENTLY_301
           : HTTP_STATUS_CODE.FOUND_302),
-      ignoreCase: redirect.ignoreCase,
+      ignoreCase: ignoreCase,
       headers: BASE_HEADERS,
+      platformSpecificFields,
     })
   }