[gatsby-plugin-netlify] create rewrite rules for pages that use match…

…Path
gatsbyjs · Dec 14, 2017 · 0402b78 · 0402b78
1 parent 99e3249
commit 0402b78
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/packages/gatsby-plugin-netlify/src/create-redirects.js b/packages/gatsby-plugin-netlify/src/create-redirects.js
@@ -1,10 +1,14 @@
 import { HEADER_COMMENT } from "./constants"
 import { appendFile, exists, readFile, writeFile } from "fs-extra"
 
-export default async function writeRedirectsFile(pluginData, redirects) {
+export default async function writeRedirectsFile(
+  pluginData,
+  redirects,
+  rewrites
+) {
   const { publicFolder } = pluginData
 
-  if (!redirects.length) return null
+  if (!redirects.length && !rewrites.length) return null
 
   const FILE_PATH = publicFolder(`_redirects`)
 
@@ -43,6 +47,10 @@ export default async function writeRedirectsFile(pluginData, redirects) {
     return pieces.join(`  `)
   })
 
+  rewrites = rewrites.map(
+    ({ fromPath, toPath }) => `${fromPath}  ${toPath}  200`
+  )
+
   let appendToFile = false
 
   // Websites may also have statically defined redirects
@@ -56,7 +64,7 @@ export default async function writeRedirectsFile(pluginData, redirects) {
     }
   }
 
-  const data = `${HEADER_COMMENT}\n\n${redirects.join(`\n`)}`
+  const data = `${HEADER_COMMENT}\n\n${[...redirects, ...rewrites].join(`\n`)}`
 
   return appendToFile
     ? appendFile(FILE_PATH, `\n\n${data}`)

diff --git a/packages/gatsby-plugin-netlify/src/gatsby-node.js b/packages/gatsby-plugin-netlify/src/gatsby-node.js
@@ -33,10 +33,17 @@ exports.onPostBuild = async ({ store, pathPrefix }, userPluginOptions) => {
   const pluginData = makePluginData(store, assetsManifest, pathPrefix)
   const pluginOptions = { ...DEFAULT_OPTIONS, ...userPluginOptions }
 
-  const { redirects } = store.getState()
+  const { redirects, pages } = store.getState()
+
+  const rewrites = pages
+    .filter(page => page.matchPath && page.matchPath !== page.path)
+    .map(page => ({
+      fromPath: page.matchPath,
+      toPath: page.path,
+    }))
 
   await Promise.all([
     buildHeadersProgram(pluginData, pluginOptions),
-    createRedirects(pluginData, redirects),
+    createRedirects(pluginData, redirects, rewrites),
   ])
 }