Skip to content
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

feat(gatsby) : add createContentDigest helper #8687

Merged
merged 7 commits into from
Oct 2, 2018
Merged

feat(gatsby) : add createContentDigest helper #8687

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
87d7e20
feat(gatsby) : add createContentDigest helper
rbadr Oct 1, 2018
75f4cf7
Update createContentDigest helper to support non strings args
rbadr Oct 2, 2018
d87ecd1
feat(gatsby-transformer-csv): Use gatsby's createContentDigest helper
rbadr Oct 2, 2018
b856b56
feat(gatsby-transformer-json): Use gatsby's createContentDigest helper
rbadr Oct 2, 2018
2440dbb
feat(gatsby-transformer-xml): Use gatsby's createContentDigest helper
rbadr Oct 2, 2018
2ba16f5
Remove unused import
rbadr Oct 2, 2018
acfa00e
Use strict inequality
rbadr Oct 2, 2018
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
8 changes: 4 additions & 4 deletions packages/gatsby-transformer-xml/src/__tests__/__snapshots__/gatsby-node.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Array [
"content": "",
"id": "bk101",
"internal": Object {
"contentDigest": "4fa0c7a57664d1566dba2f85176f62cf",
"contentDigest": "contentDigest",
"type": "NodeNameXml",
},
"name": "book",
Expand Down Expand Up @@ -66,7 +66,7 @@ Array [
"content": "",
"id": "bk102",
"internal": Object {
"contentDigest": "d01ca541dbe1148c59883a673342df9b",
"contentDigest": "contentDigest",
"type": "NodeNameXml",
},
"name": "book",
Expand Down Expand Up @@ -128,7 +128,7 @@ Array [
"content": "",
"id": "bk101",
"internal": Object {
"contentDigest": "4fa0c7a57664d1566dba2f85176f62cf",
"contentDigest": "contentDigest",
"type": "NodeNameXml",
},
"name": "book",
Expand Down Expand Up @@ -220,7 +220,7 @@ Array [
"content": "",
"id": "bk102",
"internal": Object {
"contentDigest": "d01ca541dbe1148c59883a673342df9b",
"contentDigest": "contentDigest",
"type": "NodeNameXml",
},
"name": "book",
Expand Down
2 changes: 2 additions & 0 deletions packages/gatsby-transformer-xml/src/__tests__/gatsby-node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,14 @@ describe(`Process XML nodes correctly`, () => {
const actions = { createNode, createParentChildLink }
const createNodeId = jest.fn()
createNodeId.mockReturnValue(`uuid-from-gatsby`)
const createContentDigest = jest.fn().mockReturnValue(`contentDigest`)

await onCreateNode({
node,
loadNodeContent,
actions,
createNodeId,
createContentDigest,
}).then(() => {
expect(createNode.mock.calls).toMatchSnapshot()
expect(createParentChildLink.mock.calls).toMatchSnapshot()
Expand Down
9 changes: 2 additions & 7 deletions packages/gatsby-transformer-xml/src/gatsby-node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const parseXml = require(`xml-parser`)
const crypto = require(`crypto`)
rbadr marked this conversation as resolved.
Show resolved Hide resolved
const _ = require(`lodash`)

async function onCreateNode({ node, actions, loadNodeContent, createNodeId }) {
async function onCreateNode({ node, actions, loadNodeContent, createNodeId, createContentDigest }) {
const { createNode, createParentChildLink } = actions

// We only care about XML content.
Expand All @@ -12,11 +12,6 @@ async function onCreateNode({ node, actions, loadNodeContent, createNodeId }) {
const rawXml = await loadNodeContent(node)
const parsedXml = parseXml(rawXml)
const nodeArray = parsedXml.root.children.map((obj, i) => {
const objStr = JSON.stringify(obj)
const contentDigest = crypto
.createHash(`md5`)
.update(objStr)
.digest(`hex`)
if (obj.children) {
obj.xmlChildren = obj.children
delete obj.children
Expand All @@ -29,7 +24,7 @@ async function onCreateNode({ node, actions, loadNodeContent, createNodeId }) {
parent: node.id,
children: [],
internal: {
contentDigest,
contentDigest: createContentDigest(obj),
type: _.upperFirst(_.camelCase(`${node.name} xml`)),
},
}
Expand Down