[v2] deleteNode signature (#5222)

* Change deleteNode signature to remove nodeId * These tests were failing? * Deprecate old deleteNode method signature * Change touchNode to accept an object
gatsbyjs · May 10, 2018 · 63168df · 63168df
1 parent 82c103b
commit 63168df
Show file tree

Hide file tree

Showing 13 changed files with 418 additions and 360 deletions.
diff --git a/packages/gatsby-source-contentful/src/gatsby-node.js b/packages/gatsby-source-contentful/src/gatsby-node.js
@@ -68,13 +68,13 @@ exports.sourceNodes = async (
  // Remove deleted entries & assets.
  // TODO figure out if entries referencing now deleted entries/assets
  // are "updated" so will get the now deleted reference removed.
- currentSyncData.deletedEntries.forEach(e => deleteNode(e.sys.id, e.sys))
- currentSyncData.deletedAssets.forEach(e => deleteNode(e.sys.id, e.sys))
+ currentSyncData.deletedEntries.forEach(e => deleteNode({ node: e.sys }))
+ currentSyncData.deletedAssets.forEach(e => deleteNode({ node: e.sys }))
 
  const existingNodes = getNodes().filter(
  n => n.internal.owner === `gatsby-source-contentful`
  )
- existingNodes.forEach(n => touchNode(n.id))
+ existingNodes.forEach(n => touchNode({ nodeId: n.id }))
 
  const assets = currentSyncData.assets
 

diff --git a/packages/gatsby-source-drupal/src/gatsby-node.js b/packages/gatsby-source-drupal/src/gatsby-node.js
@@ -24,7 +24,7 @@ exports.sourceNodes = async (
  // Touch existing Drupal nodes so Gatsby doesn't garbage collect them.
  // _.values(store.getState().nodes)
  // .filter(n => n.internal.type.slice(0, 8) === `drupal__`)
- // .forEach(n => touchNode(n.id))
+ // .forEach(n => touchNode({ nodeId: n.id }))
 
  // Fetch articles.
  // console.time(`fetch Drupal data`)

diff --git a/packages/gatsby-source-filesystem/src/gatsby-node.js b/packages/gatsby-source-filesystem/src/gatsby-node.js
@@ -188,7 +188,7 @@ See docs here - https://www.gatsbyjs.org/packages/gatsby-source-filesystem/
  // write and then immediately delete temporary files to the file system.
  if (node) {
  currentState = fsMachine.transition(currentState.value, `EMIT_FS_EVENT`)
- deleteNode(node.id, node)
+ deleteNode({ node })
  }
  })
 
@@ -212,7 +212,7 @@ See docs here - https://www.gatsbyjs.org/packages/gatsby-source-filesystem/
  reporter.info(`directory deleted at ${path}`)
  }
  const node = getNode(createNodeId(path))
- deleteNode(node.id, node)
+ deleteNode({ node })
  })
 
  return new Promise((resolve, reject) => {

diff --git a/packages/gatsby-source-wordpress/src/normalize.js b/packages/gatsby-source-wordpress/src/normalize.js
@@ -408,7 +408,7 @@ exports.downloadMediaFiles = async ({
  // previously created file node to not try to redownload
  if (cacheMediaData && e.modified === cacheMediaData.modified) {
  fileNodeID = cacheMediaData.fileNodeID
- touchNode(cacheMediaData.fileNodeID)
+ touchNode({ nodeId: cacheMediaData.fileNodeID })
  }
 
  // If we don't have cached data, download the file

diff --git a/packages/gatsby-transformer-screenshot/src/gatsby-node.js b/packages/gatsby-transformer-screenshot/src/gatsby-node.js
@@ -35,7 +35,7 @@ exports.onPreBootstrap = (
  } else {
  // Screenshot hasn't yet expired, touch the image node
  // to prevent garbage collection
- touchNode(n.screenshotFile___NODE)
+ touchNode({ nodeId: n.screenshotFile___NODE })
  }
  })
  )

diff --git a/packages/gatsby/cache-dir/loader.js b/packages/gatsby/cache-dir/loader.js
@@ -174,8 +174,8 @@ const queue = {
  },
 
  addPagesArray: newPages => {
- if (__PREFIX_PATHS__) {
- pathPrefix = `${__PATH_PREFIX__}/`
+ if (typeof __PREFIX_PATHS__ !== `undefined`) {
+ pathPrefix = typeof __PATH_PREFIX__ !== `undefined` ? `${__PATH_PREFIX__}/` : `/`
  }
  findPage = pageFinderFactory(newPages, pathPrefix.slice(0, -1))
  },

diff --git a/packages/gatsby/src/internal-plugins/internal-data-bridge/gatsby-node.js b/packages/gatsby/src/internal-plugins/internal-data-bridge/gatsby-node.js
@@ -168,5 +168,5 @@ exports.onCreatePage = ({ page, actions }) => {
 emitter.on(`DELETE_PAGE`, action => {
  const nodeId = createPageId(action.payload.path)
  const node = getNode(nodeId)
- boundActionCreators.deleteNode(nodeId, node)
+ boundActionCreators.deleteNode({ node })
 })
diff --git a/packages/gatsby/src/internal-plugins/query-runner/page-query-runner.js b/packages/gatsby/src/internal-plugins/query-runner/page-query-runner.js
@@ -44,7 +44,7 @@ emitter.on(`CREATE_NODE`, action => {
 })
 
 emitter.on(`DELETE_NODE`, action => {
- queuedDirtyActions.push({ payload: action.node })
+ queuedDirtyActions.push({ payload: action.payload })
 })
 
 const runQueuedActions = async () => {

diff --git a/packages/gatsby/src/redux/__tests__/__snapshots__/nodes.js.snap b/packages/gatsby/src/redux/__tests__/__snapshots__/nodes.js.snap
@@ -127,3 +127,16 @@ exports[`Create and update nodes throws error if a node sets a value on "fields"
  \\"name\\": \\"pluginA\\"
 }"
 `;
+
+exports[`Create and update nodes warns when using old deleteNode signature 1`] = `
+Object {
+ "children": Array [],
+ "id": "hi",
+ "internal": Object {
+ "contentDigest": "hasdfljds",
+ "owner": "tests",
+ "type": "Test",
+ },
+ "parent": "test",
+}
+`;