Skip to content

[1.0] Fix duplicate node #822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 19, 2017
Merged

[1.0] Fix duplicate node #822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
12e575d
Pretty json output (easier to debug)
fabien0102 Apr 19, 2017
c113b14
Don't include contentDigest into node.id
fabien0102 Apr 19, 2017
19094e2
Deal with contestDisgest changes
fabien0102 Apr 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions packages/gatsby-source-filesystem/src/gatsby-node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function readFile(file, pluginOptions, cb) {
// Stringify date objects.
const newFile = JSON.parse(
JSON.stringify({
id: `${slashedFile.absolutePath} >>> ${contentDigest}`,
id: `${slashedFile.absolutePath}`,
contentDigest: contentDigest,
children: [],
parent: `___SOURCE___`,
Expand All @@ -44,7 +44,10 @@ function readFile(file, pluginOptions, cb) {
})
}

exports.sourceNodes = ({ boundActionCreators, getNode }, pluginOptions) => {
exports.sourceNodes = (
{ boundActionCreators, getNode, hasNodeChanged },
pluginOptions
) => {
const { createNode, updateSourcePluginStatus } = boundActionCreators
updateSourcePluginStatus({
plugin: `source-filesystem --- ${pluginOptions.name}`,
Expand All @@ -66,7 +69,7 @@ exports.sourceNodes = ({ boundActionCreators, getNode }, pluginOptions) => {
// console.log("Added file at", path)
readFile(path, pluginOptions, (err, file) => {
// Only create node if the content digest has changed.
if (!getNode(file.id)) {
if (!getNode(file.id) || hasNodeChanged(file.id, file.contentDigest)) {
createNode(file)
} else {
// console.log("not creating node cause it already exists", file.id)
Expand All @@ -77,7 +80,7 @@ exports.sourceNodes = ({ boundActionCreators, getNode }, pluginOptions) => {
console.log("changed file at", path)
readFile(path, pluginOptions, (err, file) => {
// Only create node if the content digest has changed.
if (!getNode(file.id)) {
if (!getNode(file.id) || hasNodeChanged(file.id, file.contentDigest)) {
createNode(file)
}
})
Expand Down
4 changes: 2 additions & 2 deletions packages/gatsby/lib/redux/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import chalk from "chalk"
const _ = require("lodash")
const { bindActionCreators } = require("redux")

const { getNode } = require("./index")
const { getNode, hasNodeChanged } = require("./index")

const { store } = require("./index")
import * as joiSchemas from "../joi-schemas/joi"
Expand Down Expand Up @@ -66,7 +66,7 @@ actions.createNode = node => {
}

// Check if the node has already been processed.
if (getNode(node.id)) {
if (getNode(node.id) && !hasNodeChanged(node.id, node.contentDigest)) {
console.log("NODE_ALREADY_CREATED", node.pluginName, node.id)
console.log(node)
console.trace()
Expand Down
5 changes: 4 additions & 1 deletion packages/gatsby/lib/redux/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ const Redux = require("redux")
const Promise = require("bluebird")
const _ = require("lodash")
const { composeWithDevTools } = require("remote-redux-devtools")
const apiRunnerNode = require("../utils/api-runner-node")
const fs = require("fs")

// Reducers
Expand Down Expand Up @@ -49,6 +48,10 @@ const getNode = id => {
return store.getState().nodes[id]
}
exports.getNode = getNode
exports.hasNodeChanged = (id, digest) => {
const node = store.getState().nodes[id]
return node.contentDigest !== digest
}

exports.loadNodeContent = node => {
if (node.content) {
Expand Down
5 changes: 4 additions & 1 deletion packages/gatsby/lib/redux/reducers/nodes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ const _ = require("lodash")

const saveState = _.debounce(state => {
console.log("===============saving node state")
fs.writeFile(`${process.cwd()}/.cache/node-data.json`, JSON.stringify(state))
fs.writeFile(
`${process.cwd()}/.cache/node-data.json`,
JSON.stringify(state, null, 2)
)
}, 1000)

module.exports = (state = {}, action) => {
Expand Down
2 changes: 2 additions & 0 deletions packages/gatsby/lib/utils/api-runner-node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ const runAPI = (plugin, api, args) => {
loadNodeContent,
getNodes,
getNode,
hasNodeChanged,
getNodeAndSavePathDependency,
} = require("../redux")
const { boundActionCreators } = require("../redux/actions")
Expand All @@ -66,6 +67,7 @@ const runAPI = (plugin, api, args) => {
store,
getNodes,
getNode,
hasNodeChanged,
getNodeAndSavePathDependency,
cache,
},
Expand Down