gatsby-source-filesystem 5.4.0-next.1 → 5.4.0-next.2

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [5.3.1](https://github.com/gatsbyjs/gatsby/commits/gatsby-source-filesystem@5.3.1/packages/gatsby-source-filesystem) (2022-12-14)
+
+**Note:** Version bump only for package gatsby-source-filesystem
+
+## [5.3.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-source-filesystem@5.3.0/packages/gatsby-source-filesystem) (2022-12-13)
+
+[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v5.3)
+
+#### Bug Fixes
+
+- update minor and patch dependencies for gatsby-source-filesystem [#37163](https://github.com/gatsbyjs/gatsby/issues/37163) ([21f815f](https://github.com/gatsbyjs/gatsby/commit/21f815f53a76c511e548dd4f1ae0d71078b5e783))
+
 ## [5.2.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-source-filesystem@5.2.0/packages/gatsby-source-filesystem) (2022-11-25)
 
 [🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v5.2)

package/create-file-node-from-buffer.js

@@ -1,21 +1,17 @@
 "use strict";
 
 const fs = require(`fs-extra`);
-
 const path = require(`path`);
-
 const fileType = require(`file-type`);
-
 const {
   createFileNode
 } = require(`./create-file-node`);
-
 const {
   createContentDigest,
   createFilePath
 } = require(`gatsby-core-utils`);
-
 const cacheId = hash => `create-file-node-from-buffer-${hash}`;
+
 /********************
  * Type Definitions *
  ********************/
@@ -47,11 +43,10 @@ const cacheId = hash => `create-file-node-from-buffer-${hash}`;
  * @param {Buffer} buffer
  * @returns {Promise<void>}
  */
-
-
 const writeBuffer = (filename, buffer) => new Promise((resolve, reject) => {
   fs.writeFile(filename, buffer, err => err ? reject(err) : resolve());
 });
+
 /**
  * processBufferNode
  * --
@@ -60,8 +55,6 @@ const writeBuffer = (filename, buffer) => new Promise((resolve, reject) => {
  * @param {CreateFileNodeFromBufferPayload} options
  * @return {Promise<Object>} Resolves with the fileNode
  */
-
-
 async function processBufferNode({
   buffer,
   hash,
@@ -72,11 +65,11 @@ async function processBufferNode({
   ext,
   name
 }) {
-  const pluginCacheDir = cache.directory; // See if there's a cache file for this buffer's contents from
-  // a previous run
+  const pluginCacheDir = cache.directory;
 
+  // See if there's a cache file for this buffer's contents from
+  // a previous run
   let filename = await cache.get(cacheId(hash));
-
   if (!filename) {
     // If the user did not provide an extension and we couldn't get
     // one from remote file, try and guess one
@@ -84,35 +77,36 @@ async function processBufferNode({
       const filetype = await fileType.fromBuffer(buffer);
       ext = filetype ? `.${filetype.ext}` : `.bin`;
     }
-
     filename = createFilePath(path.join(pluginCacheDir, hash), name, ext);
-    await fs.ensureDir(path.dirname(filename)); // Cache the buffer contents
+    await fs.ensureDir(path.dirname(filename));
 
-    await writeBuffer(filename, buffer); // Save the cache file path for future use
+    // Cache the buffer contents
+    await writeBuffer(filename, buffer);
 
+    // Save the cache file path for future use
     await cache.set(cacheId(hash), filename);
-  } // Create the file node.
-
+  }
 
+  // Create the file node.
   const fileNode = await createFileNode(filename, createNodeId, {});
   fileNode.internal.description = `File "Buffer<${hash}>"`;
   fileNode.hash = hash;
-  fileNode.parent = parentNodeId; // Override the default plugin as gatsby-source-filesystem needs to
+  fileNode.parent = parentNodeId;
+  // Override the default plugin as gatsby-source-filesystem needs to
   // be the owner of File nodes or there'll be conflicts if any other
   // File nodes are created through normal usages of
   // gatsby-source-filesystem.
-
   await createNode(fileNode, {
     name: `gatsby-source-filesystem`
   });
   return fileNode;
 }
+
 /**
  * Index of promises resolving to File node from buffer cache
  */
-
-
 const processingCache = {};
+
 /***************
  * Entry Point *
  ***************/
@@ -127,7 +121,6 @@ const processingCache = {};
  * @param {CreateFileNodeFromBufferPayload} options
  * @return {Promise<Object>}                  Returns the created node
  */
-
 module.exports = ({
   buffer,
   hash,
@@ -145,38 +138,31 @@ module.exports = ({
   if (typeof createNodeId !== `function`) {
     throw new Error(`createNodeId must be a function, was ${typeof createNodeId}`);
   }
-
   if (typeof createNode !== `function`) {
     throw new Error(`createNode must be a function, was ${typeof createNode}`);
   }
-
   if (typeof getCache === `function`) {
     // use cache of this plugin and not cache of function caller
     cache = getCache(`gatsby-source-filesystem`);
   }
-
   if (typeof cache !== `object`) {
     throw new Error(`Neither "cache" or "getCache" was passed. getCache must be function that return Gatsby cache, "cache" must be the Gatsby cache, was ${typeof cache}`);
   }
-
   if (!buffer) {
     return Promise.reject(`bad buffer: ${buffer}`);
   }
-
   if (!hash) {
     hash = createContentDigest(buffer);
   }
-
   if (!name) {
     name = hash;
-  } // Check if we already requested node for this remote file
-  // and return stored promise if we did.
-
+  }
 
+  // Check if we already requested node for this remote file
+  // and return stored promise if we did.
   if (processingCache[hash]) {
     return processingCache[hash];
   }
-
   const bufferCachePromise = processBufferNode({
     buffer,
     hash,

package/create-file-node.js

@@ -1,31 +1,25 @@
 "use strict";
 
 const path = require(`path`);
-
 const fs = require(`fs-extra`);
-
 const mime = require(`mime`);
-
 const prettyBytes = require(`pretty-bytes`);
-
 const md5File = require(`md5-file`);
-
 const {
   createContentDigest,
   slash
 } = require(`gatsby-core-utils`);
-
 exports.createFileNode = async (pathToFile, createNodeId, pluginOptions = {}) => {
   const slashed = slash(pathToFile);
   const parsedSlashed = path.parse(slashed);
-  const slashedFile = { ...parsedSlashed,
+  const slashedFile = {
+    ...parsedSlashed,
     absolutePath: slashed,
     // Useful for limiting graphql query with certain parent directory
     relativeDirectory: slash(path.relative(pluginOptions.path || process.cwd(), parsedSlashed.dir))
   };
   const stats = await fs.stat(slashedFile.absolutePath);
   let internal;
-
   if (stats.isDirectory()) {
     const contentDigest = createContentDigest({
       stats: stats,
@@ -46,7 +40,6 @@ exports.createFileNode = async (pathToFile, createNodeId, pluginOptions = {}) =>
       description: `File "${path.relative(process.cwd(), slashed)}"`
     };
   }
-
   return {
     // Don't actually make the File id the absolute path as otherwise
     // people will use the id for that and ids shouldn't be treated as

package/create-file-path.js

@@ -1,11 +1,9 @@
 "use strict";
 
 const path = require(`path`);
-
 const {
   slash
 } = require(`gatsby-core-utils`);
-
 function findFileNode({
   node,
   getNode
@@ -13,19 +11,15 @@ function findFileNode({
   // Find the file node.
   let fileNode = node;
   let whileCount = 0;
-
   while (fileNode.internal.type !== `File` && fileNode.parent && getNode(fileNode.parent) !== undefined && whileCount < 101) {
     fileNode = getNode(fileNode.parent);
     whileCount += 1;
-
     if (whileCount > 100) {
       console.log(`It looks like you have a node that's set its parent as itself`, fileNode);
     }
   }
-
   return fileNode;
 }
-
 module.exports = ({
   node,
   getNode,

package/create-remote-file-node.js

@@ -3,14 +3,13 @@
 const {
   fetchRemoteFile
 } = require(`gatsby-core-utils/fetch-remote-file`);
-
 const {
   isWebUri
 } = require(`valid-url`);
-
 const {
   createFileNode
 } = require(`./create-file-node`);
+
 /********************
  * Type Definitions *
  ********************/
@@ -51,8 +50,6 @@ const {
  * @param {CreateRemoteFileNodePayload} options
  * @return {Promise<Object>} Resolves with the fileNode
  */
-
-
 async function processRemoteNode({
   url,
   cache,
@@ -71,27 +68,28 @@ async function processRemoteNode({
     httpHeaders,
     ext,
     name
-  }); // Create the file node.
+  });
 
+  // Create the file node.
   const fileNode = await createFileNode(filename, createNodeId, {});
   fileNode.internal.description = `File "${url}"`;
   fileNode.url = url;
-  fileNode.parent = parentNodeId; // Override the default plugin as gatsby-source-filesystem needs to
+  fileNode.parent = parentNodeId;
+  // Override the default plugin as gatsby-source-filesystem needs to
   // be the owner of File nodes or there'll be conflicts if any other
   // File nodes are created through normal usages of
   // gatsby-source-filesystem.
-
   await createNode(fileNode, {
     name: `gatsby-source-filesystem`
   });
   return fileNode;
 }
+
 /**
  * Index of promises resolving to File node from remote url
  */
-
-
 const processingCache = {};
+
 /***************
  * Entry Point *
  ***************/
@@ -107,7 +105,6 @@ const processingCache = {};
  * @param {CreateRemoteFileNodePayload} options
  * @return {Promise<Object>}                  Returns the created node
  */
-
 module.exports = function createRemoteFileNode({
   url,
   cache,
@@ -126,30 +123,25 @@ module.exports = function createRemoteFileNode({
   if (typeof createNodeId !== `function`) {
     throw new Error(`createNodeId must be a function, was ${typeof createNodeId}`);
   }
-
   if (typeof createNode !== `function`) {
     throw new Error(`createNode must be a function, was ${typeof createNode}`);
   }
-
   if (typeof getCache === `function`) {
     // use cache of this plugin and not cache of function caller
     cache = getCache(`gatsby-source-filesystem`);
   }
-
   if (typeof cache !== `object`) {
     throw new Error(`Neither "cache" or "getCache" was passed. getCache must be function that return Gatsby cache, "cache" must be the Gatsby cache, was ${typeof cache}`);
-  } // Check if we already requested node for this remote file
-  // and return stored promise if we did.
-
+  }
 
+  // Check if we already requested node for this remote file
+  // and return stored promise if we did.
   if (processingCache[url]) {
     return processingCache[url];
   }
-
   if (!url || isWebUri(url) === undefined) {
     throw new Error(`url passed to createRemoteFileNode is either missing or not a proper web uri: ${url}`);
   }
-
   const fileDownloadPromise = processRemoteNode({
     url,
     cache,

package/error-utils.js

@@ -10,13 +10,12 @@ const CODES = {
 exports.CODES = CODES;
 const pluginPrefix = `gatsby-source-filesystem`;
 exports.pluginPrefix = pluginPrefix;
-
 function prefixId(id) {
   return `${pluginPrefix}_${id}`;
-} // TODO: Refactor to use contextual data instead of only context.sourceMessage
-// once reporter.setErrorMap is guaranteed to be available
-
+}
 
+// TODO: Refactor to use contextual data instead of only context.sourceMessage
+// once reporter.setErrorMap is guaranteed to be available
 const ERROR_MAP = {
   [CODES.Generic]: {
     text: context => context.sourceMessage,

package/extend-file-node.js

@@ -3,16 +3,12 @@
 const {
   GraphQLString
 } = require(`gatsby/graphql`);
-
 const fs = require(`fs-extra`);
-
 const path = require(`path`);
-
 const {
   prefixId,
   CODES
 } = require(`./error-utils`);
-
 module.exports = ({
   type,
   getNodeAndSavePathDependency,
@@ -22,7 +18,6 @@ module.exports = ({
   if (type.name !== `File`) {
     return {};
   }
-
   return {
     publicURL: {
       type: GraphQLString,
@@ -32,7 +27,6 @@ module.exports = ({
         const details = getNodeAndSavePathDependency(file.id, context.path);
         const fileName = `${file.internal.contentDigest}/${details.base}`;
         const publicPath = path.join(process.cwd(), `public`, `static`, fileName);
-
         if (!fs.existsSync(publicPath)) {
           fs.copySync(details.absolutePath, publicPath, {
             dereference: true
@@ -47,7 +41,6 @@ module.exports = ({
             }
           });
         }
-
         return `${pathPrefix}/static/${fileName}`;
       }
     }

package/gatsby-node.js

@@ -1,25 +1,19 @@
 "use strict";
 
 const chokidar = require(`chokidar`);
-
 const fs = require(`fs`);
-
 const path = require(`path`);
-
 const {
   createMachine,
   interpret,
   assign
 } = require(`xstate`);
-
 const {
   createFileNode
 } = require(`./create-file-node`);
-
 const {
   ERROR_MAP
 } = require(`./error-utils`);
-
 exports.onPreInit = ({
   reporter
 }) => {
@@ -27,11 +21,10 @@ exports.onPreInit = ({
     reporter.setErrorMap(ERROR_MAP);
   }
 };
+
 /**
  * Create a state machine to manage Chokidar's not-ready/ready states.
  */
-
-
 const createFSMachine = ({
   actions: {
     createNode,
@@ -48,25 +41,24 @@ const createFSMachine = ({
     });
     return fileNodePromise;
   };
-
   const deletePathNode = path => {
-    const node = getNode(createNodeId(path)); // It's possible the node was never created as sometimes tools will
+    const node = getNode(createNodeId(path));
+    // It's possible the node was never created as sometimes tools will
     // write and then immediately delete temporary files to the file system.
-
     if (node) {
       deleteNode(node);
     }
-  }; // For every path that is reported before the 'ready' event, we throw them
+  };
+
+  // For every path that is reported before the 'ready' event, we throw them
   // into a queue and then flush the queue when 'ready' event arrives.
   // After 'ready', we handle the 'add' event without putting it into a queue.
-
-
   let pathQueue = [];
-
   const flushPathQueue = () => {
     const queue = pathQueue.slice();
     pathQueue = null;
-    return Promise.all( // eslint-disable-next-line consistent-return
+    return Promise.all(
+    // eslint-disable-next-line consistent-return
     queue.map(({
       op,
       path
@@ -74,19 +66,16 @@ const createFSMachine = ({
       switch (op) {
         case `delete`:
           return deletePathNode(path);
-
         case `upsert`:
           return createAndProcessNode(path);
       }
     }));
   };
-
   const log = expr => (ctx, action, meta) => {
     if (ctx.bootstrapped) {
       reporter.info(expr(ctx, action, meta));
     }
   };
-
   const fsMachine = createMachine({
     predictableActionArguments: true,
     context: {
@@ -162,7 +151,6 @@ const createFSMachine = ({
       }) {
         createAndProcessNode(path).catch(err => reporter.error(err));
       },
-
       deletePathNode(_, {
         pathType,
         path
@@ -171,14 +159,12 @@ const createFSMachine = ({
       }) {
         deletePathNode(path);
       },
-
       flushPathQueue(_, {
         resolve,
         reject
       }) {
         flushPathQueue().then(resolve, reject);
       },
-
       queueNodeDeleting(_, {
         path
       }) {
@@ -187,7 +173,6 @@ const createFSMachine = ({
           path
         });
       },
-
       queueNodeProcessing(_, {
         path
       }) {
@@ -196,12 +181,10 @@ const createFSMachine = ({
           path
         });
       }
-
     }
   });
   return interpret(fsMachine).start();
 };
-
 exports.pluginOptionsSchema = ({
   Joi
 }) => Joi.object({
@@ -209,7 +192,6 @@ exports.pluginOptionsSchema = ({
   path: Joi.string(),
   ignore: Joi.array().items(Joi.string(), Joi.object().regex(), Joi.function())
 });
-
 exports.sourceNodes = (api, pluginOptions) => {
   // Validate that the path exists.
   if (!fs.existsSync(pluginOptions.path)) {
@@ -219,17 +201,17 @@ ${pluginOptions.path}
 Please pick a path to an existing directory.
 See docs here - https://www.gatsbyjs.com/plugins/gatsby-source-filesystem/
       `);
-  } // Validate that the path is absolute.
-  // Absolute paths are required to resolve images correctly.
-
+  }
 
+  // Validate that the path is absolute.
+  // Absolute paths are required to resolve images correctly.
   if (!path.isAbsolute(pluginOptions.path)) {
     pluginOptions.path = path.resolve(process.cwd(), pluginOptions.path);
   }
+  const fsMachine = createFSMachine(api, pluginOptions);
 
-  const fsMachine = createFSMachine(api, pluginOptions); // Once bootstrap is finished, we only let one File node update go through
+  // Once bootstrap is finished, we only let one File node update go through
   // the system at a time.
-
   api.emitter.on(`BOOTSTRAP_FINISHED`, () => {
     fsMachine.send(`BOOTSTRAP_FINISHED`);
   });
@@ -281,5 +263,4 @@ See docs here - https://www.gatsbyjs.com/plugins/gatsby-source-filesystem/
     });
   });
 };
-
 exports.setFieldsOnGraphQLNodeType = require(`./extend-file-node`);

package/index.js

@@ -1,11 +1,9 @@
 "use strict";
 
 const fs = require(`fs-extra`);
-
 function loadNodeContent(fileNode) {
   return fs.readFile(fileNode.absolutePath, `utf-8`);
 }
-
 exports.createFilePath = require(`./create-file-path`);
 exports.createRemoteFileNode = require(`./create-remote-file-node`);
 exports.createFileNodeFromBuffer = require(`./create-file-node-from-buffer`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gatsby-source-filesystem",
   "description": "Gatsby source plugin for building websites from local data. Markdown, JSON, images, YAML, CSV, and dozens of other data types supported.",
-  "version": "5.4.0-next.1",
+  "version": "5.4.0-next.2",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
@@ -11,7 +11,7 @@
     "chokidar": "^3.5.3",
     "file-type": "^16.5.4",
     "fs-extra": "^10.1.0",
-    "gatsby-core-utils": "^4.4.0-next.1",
+    "gatsby-core-utils": "^4.4.0-next.2",
     "md5-file": "^5.0.0",
     "mime": "^2.6.0",
     "pretty-bytes": "^5.6.0",
@@ -21,7 +21,7 @@
   "devDependencies": {
     "@babel/cli": "^7.15.4",
     "@babel/core": "^7.15.5",
-    "babel-preset-gatsby-package": "^3.4.0-next.0",
+    "babel-preset-gatsby-package": "^3.4.0-next.1",
     "cross-env": "^7.0.3"
   },
   "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-source-filesystem#readme",
@@ -47,5 +47,5 @@
   "engines": {
     "node": ">=18.0.0"
   },
-  "gitHead": "7103697710ba19ac41ef3b384c1af5143f71c176"
+  "gitHead": "5df8a99b7fd6de53a8f3088138cc574f55f4cfd5"
 }

package/utils.js

@@ -4,14 +4,12 @@ exports.__esModule = true;
 exports.createFilePath = void 0;
 exports.getRemoteFileExtension = getRemoteFileExtension;
 exports.getRemoteFileName = getRemoteFileName;
-
 const path = require(`path`);
-
 const Url = require(`url`);
-
 const {
   createFilePath
 } = require(`gatsby-core-utils`);
+
 /**
  * getParsedPath
  * --
@@ -21,13 +19,11 @@ const {
  * @param  {String}          url
  * @return {Object}          path
  */
-
-
 exports.createFilePath = createFilePath;
-
 function getParsedPath(url) {
   return path.parse(Url.parse(url).pathname);
 }
+
 /**
  * getRemoteFileExtension
  * --
@@ -37,11 +33,10 @@ function getParsedPath(url) {
  * @param  {String}          url
  * @return {String}          extension
  */
-
-
 function getRemoteFileExtension(url) {
   return getParsedPath(url).ext;
 }
+
 /**
  * getRemoteFileName
  * --
@@ -51,10 +46,10 @@ function getRemoteFileExtension(url) {
  * @param  {String}          url
  * @return {String}          filename
  */
-
-
 function getRemoteFileName(url) {
   return decodeURIComponent(getParsedPath(url).name);
-} // createFilePath should be imported from `gatsby-core-utils`
+}
+
+// createFilePath should be imported from `gatsby-core-utils`
 // but some plugins already do import it from `gatsby-source-filesystem/utils`
 // so just keeping re-export here for backward compatibility