fix(gatsby): Normalize paths for run queries before caching (gatsbyjs…

…#14910) Fixes gatsbyjs#14903
mxxk · Jun 21, 2019 · dc6c1e0 · dc6c1e0
1 parent 4f932ed
commit dc6c1e0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/packages/gatsby/src/utils/normalize-page-path.js b/packages/gatsby/src/utils/normalize-page-path.js
@@ -0,0 +1,14 @@
+// This is a duplicate of the runtime util
+// file cache-dir/normalize-page-path.js
+module.exports = path => {
+ if (path === undefined) {
+ return path
+ }
+ if (path === `/`) {
+ return `/`
+ }
+ if (path.charAt(path.length - 1) === `/`) {
+ return path.slice(0, -1)
+ }
+ return path
+}
diff --git a/packages/gatsby/src/utils/websocket-manager.js b/packages/gatsby/src/utils/websocket-manager.js
@@ -4,6 +4,7 @@ const path = require(`path`)
 const { store } = require(`../redux`)
 const fs = require(`fs`)
 const pageDataUtil = require(`../utils/page-data`)
+const normalizePagePath = require(`../utils/normalize-page-path`)
 const telemetry = require(`gatsby-telemetry`)
 const url = require(`url`)
 const { createHash } = require(`crypto`)
@@ -248,6 +249,7 @@ class WebsocketManager {
  }
 
  emitPageData(data: QueryResult) {
+ data.id = normalizePagePath(data.id)
  this.pageResults.set(data.id, data)
  if (this.isInitialised) {
  this.websocket.send({ type: `pageQueryResult`, payload: data })