From a97fc4582333454a5869f21b6e5985e4deac06c3 Mon Sep 17 00:00:00 2001 From: Michal Piechowiak Date: Tue, 17 Jul 2018 16:48:24 +0200 Subject: [PATCH 1/3] fix early bail when for file inferring --- packages/gatsby/src/schema/types/type-file.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gatsby/src/schema/types/type-file.js b/packages/gatsby/src/schema/types/type-file.js index 9f672a65ebe1c..301db11b6fce5 100644 --- a/packages/gatsby/src/schema/types/type-file.js +++ b/packages/gatsby/src/schema/types/type-file.js @@ -28,7 +28,7 @@ export function setFileNodeRootType(fileNodeRootType) { function pointsToFile(nodes, key, value) { const looksLikeFile = _.isString(value) && - mime.getType(value) !== `application/octet-stream` && + mime.getType(value) !== null && // domains ending with .com mime.getType(value) !== `application/x-msdownload` && isRelative(value) && From 16e79e7bf7200398fa6e9e92c058ab55339ee85f Mon Sep 17 00:00:00 2001 From: Michal Piechowiak Date: Wed, 18 Jul 2018 12:15:58 +0200 Subject: [PATCH 2/3] remove any `application/octet-stream` handling to be in line with mime@2 behaviour --- packages/gatsby-source-filesystem/src/create-file-node.js | 2 +- packages/gatsby-transformer-toml/src/gatsby-node.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/gatsby-source-filesystem/src/create-file-node.js b/packages/gatsby-source-filesystem/src/create-file-node.js index e64e86d53fa90..009b69749a02d 100644 --- a/packages/gatsby-source-filesystem/src/create-file-node.js +++ b/packages/gatsby-source-filesystem/src/create-file-node.js @@ -44,7 +44,7 @@ exports.createFileNode = async ( internal = { contentDigest, type: `File`, - mediaType: mediaType ? mediaType : `application/octet-stream`, + mediaType: mediaType, description: `File "${path.relative(process.cwd(), slashed)}"`, } } diff --git a/packages/gatsby-transformer-toml/src/gatsby-node.js b/packages/gatsby-transformer-toml/src/gatsby-node.js index 8cb73188590d9..f4caa0f627769 100644 --- a/packages/gatsby-transformer-toml/src/gatsby-node.js +++ b/packages/gatsby-transformer-toml/src/gatsby-node.js @@ -5,7 +5,7 @@ const crypto = require(`crypto`) async function onCreateNode({ node, actions, loadNodeContent, createNodeId }) { const { createNode, createParentChildLink } = actions // Filter out non-toml content - // Currently TOML files are considered 'application/octet-stream' in 'mime-db' + // Currently TOML files are considered null in 'mime-db' // Hence the extension test instead of mediaType test if (node.extension !== `toml`) { return From d9b0affadf6f89ad9c24deb2057902e0afcf384d Mon Sep 17 00:00:00 2001 From: Michal Piechowiak Date: Wed, 18 Jul 2018 12:16:56 +0200 Subject: [PATCH 3/3] this can be shorter, doh! --- packages/gatsby-source-filesystem/src/create-file-node.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gatsby-source-filesystem/src/create-file-node.js b/packages/gatsby-source-filesystem/src/create-file-node.js index 009b69749a02d..3084876a6f602 100644 --- a/packages/gatsby-source-filesystem/src/create-file-node.js +++ b/packages/gatsby-source-filesystem/src/create-file-node.js @@ -44,7 +44,7 @@ exports.createFileNode = async ( internal = { contentDigest, type: `File`, - mediaType: mediaType, + mediaType, description: `File "${path.relative(process.cwd(), slashed)}"`, } }