gatsby-source-filesystem 2.1.53 → 2.1.57

package/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.1.57](https://github.com/gatsbyjs/gatsby/compare/gatsby-source-filesystem@2.1.56...gatsby-source-filesystem@2.1.57) (2020-03-18)
+
+### Features
+
+- **gatsby-source-filesystem:** Unify publicURL ([#22328](https://github.com/gatsbyjs/gatsby/issues/22328)) ([756d386](https://github.com/gatsbyjs/gatsby/commit/756d386))
+
+## [2.1.56](https://github.com/gatsbyjs/gatsby/compare/gatsby-source-filesystem@2.1.55...gatsby-source-filesystem@2.1.56) (2020-03-16)
+
+**Note:** Version bump only for package gatsby-source-filesystem
+
+## [2.1.55](https://github.com/gatsbyjs/gatsby/compare/gatsby-source-filesystem@2.1.54...gatsby-source-filesystem@2.1.55) (2020-03-13)
+
+**Note:** Version bump only for package gatsby-source-filesystem
+
+## [2.1.54](https://github.com/gatsbyjs/gatsby/compare/gatsby-source-filesystem@2.1.53...gatsby-source-filesystem@2.1.54) (2020-03-12)
+
+**Note:** Version bump only for package gatsby-source-filesystem
+
 ## [2.1.53](https://github.com/gatsbyjs/gatsby/compare/gatsby-source-filesystem@2.1.52...gatsby-source-filesystem@2.1.53) (2020-03-11)
 
 **Note:** Version bump only for package gatsby-source-filesystem

package/README.md

@@ -169,11 +169,8 @@ createRemoteFileNode({
   // The id of the parent node (i.e. the node to which the new remote File node will be linked to.
   parentNodeId,
 
-  // The redux store which is passed to all Node APIs.
-  store,
-
   // Gatsby's cache which the helper uses to check if the file has been downloaded already. It's passed to all Node APIs.
-  cache,
+  getCache,
 
   // The action used to create nodes
   createNode,
@@ -204,8 +201,7 @@ const { createRemoteFileNode } = require(`gatsby-source-filesystem`)
 
 exports.downloadMediaFiles = ({
   nodes,
-  store,
-  cache,
+  getCache,
   createNode,
   createNodeId,
   _auth,
@@ -219,8 +215,7 @@ exports.downloadMediaFiles = ({
         fileNode = await createRemoteFileNode({
           url: node.source_url,
           parentNodeId: node.id,
-          store,
-          cache,
+          getCache,
           createNode,
           createNodeId,
           auth: _auth,
@@ -250,8 +245,7 @@ createRemoteFileNode({
   // The source url of the remote file
   url: `https://example.com/a-file-without-an-extension`,
   parentNodeId: node.id,
-  store,
-  cache,
+  getCache,
   createNode,
   createNodeId,
   // if necessary!
@@ -274,10 +268,7 @@ The following example is adapted from the source of [`gatsby-source-mysql`](http
 // gatsby-node.js
 const createMySqlNodes = require(`./create-nodes`)
 
-exports.sourceNodes = async (
-  { actions, createNodeId, store, cache },
-  config
-) => {
+exports.sourceNodes = async ({ actions, createNodeId, getCache }, config) => {
   const { createNode } = actions
   const { conn, queries } = config
   const { db, results } = await query(conn, queries)
@@ -289,8 +280,7 @@ exports.sourceNodes = async (
         createMySqlNodes(result, results, createNode, {
           createNode,
           createNodeId,
-          store,
-          cache,
+          getCache,
         })
       )
     db.end()
@@ -311,8 +301,7 @@ function attach(node, key, value, ctx) {
     ctx.linkChildren.push(parentNodeId =>
       createFileNodeFromBuffer({
         buffer: value,
-        store: ctx.store,
-        cache: ctx.cache,
+        getCache: ctx.getCache,
         createNode: ctx.createNode,
         createNodeId: ctx.createNodeId,
       })

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

@@ -23,11 +23,6 @@ const cacheId = hash => `create-file-node-from-buffer-${hash}`;
  * Type Definitions *
  ********************/
 
-/**
- * @typedef {Redux}
- * @see [Redux Docs]{@link https://redux.js.org/api-reference}
- */
-
 /**
  * @typedef {GatsbyCache}
  * @see gatsby/packages/gatsby/utils/cache.js
@@ -40,14 +35,11 @@ const cacheId = hash => `create-file-node-from-buffer-${hash}`;
  *
  * @param  {Buffer} options.buffer
  * @param  {String} options.hash
- * @param  {Redux} options.store
  * @param  {GatsbyCache} options.cache
+ * @param  {Function} options.getCache
  * @param  {Function} options.createNode
  */
 
-
-const CACHE_DIR = `.cache`;
-const FS_PLUGIN_DIR = `gatsby-source-filesystem`;
 /**
  * writeBuffer
  * --
@@ -59,6 +51,7 @@ const FS_PLUGIN_DIR = `gatsby-source-filesystem`;
  * @returns {Promise<void>}
  */
 
+
 const writeBuffer = (filename, buffer) => new Promise((resolve, reject) => {
   fs.writeFile(filename, buffer, err => err ? reject(err) : resolve());
 });
@@ -75,7 +68,6 @@ const writeBuffer = (filename, buffer) => new Promise((resolve, reject) => {
 async function processBufferNode({
   buffer,
   hash,
-  store,
   cache,
   createNode,
   parentNodeId,
@@ -83,9 +75,7 @@ async function processBufferNode({
   ext,
   name
 }) {
-  // Ensure our cache directory exists.
-  const pluginCacheDir = path.join(store.getState().program.directory, CACHE_DIR, FS_PLUGIN_DIR);
-  await fs.ensureDir(pluginCacheDir); // See if there's a cache file for this buffer's contents from
+  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));
@@ -144,9 +134,9 @@ const processingCache = {};
 module.exports = ({
   buffer,
   hash,
-  store,
   cache,
   createNode,
+  getCache,
   parentNodeId = null,
   createNodeId,
   ext,
@@ -163,12 +153,13 @@ module.exports = ({
     throw new Error(`createNode must be a function, was ${typeof createNode}`);
   }
 
-  if (typeof store !== `object`) {
-    throw new Error(`store must be the redux store, was ${typeof store}`);
+  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(`cache must be the Gatsby cache, was ${typeof cache}`);
+    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) {
@@ -188,7 +179,6 @@ module.exports = ({
   const bufferCachePromise = processBufferNode({
     buffer,
     hash,
-    store,
     cache,
     createNode,
     parentNodeId,

package/create-remote-file-node.js

@@ -43,11 +43,6 @@ let totalJobs = 0;
  * Type Definitions *
  ********************/
 
-/**
- * @typedef {Redux}
- * @see [Redux Docs]{@link https://redux.js.org/api-reference}
- */
-
 /**
  * @typedef {GatsbyCache}
  * @see gatsby/packages/gatsby/utils/cache.js
@@ -71,15 +66,13 @@ let totalJobs = 0;
  * @description Create Remote File Node Payload
  *
  * @param  {String} options.url
- * @param  {Redux} options.store
  * @param  {GatsbyCache} options.cache
  * @param  {Function} options.createNode
+ * @param  {Function} options.getCache
  * @param  {Auth} [options.auth]
  * @param  {Reporter} [options.reporter]
  */
 
-const CACHE_DIR = `.cache`;
-const FS_PLUGIN_DIR = `gatsby-source-filesystem`;
 const STALL_RETRY_LIMIT = 3;
 const STALL_TIMEOUT = 30000;
 const CONNECTION_RETRY_LIMIT = 5;
@@ -220,7 +213,6 @@ const requestRemoteNode = (url, headers, tmpFilename, httpOpts, attempt = 1) =>
 
 async function processRemoteNode({
   url,
-  store,
   cache,
   createNode,
   parentNodeId,
@@ -230,9 +222,7 @@ async function processRemoteNode({
   ext,
   name
 }) {
-  // Ensure our cache directory exists.
-  const pluginCacheDir = path.join(store.getState().program.directory, CACHE_DIR, FS_PLUGIN_DIR);
-  await fs.ensureDir(pluginCacheDir); // See if there's response headers for this url
+  const pluginCacheDir = cache.directory; // See if there's response headers for this url
   // from a previous request.
 
   const cachedHeaders = await cache.get(cacheId(url));
@@ -346,9 +336,9 @@ const pushTask = task => new Promise((resolve, reject) => {
 
 module.exports = ({
   url,
-  store,
   cache,
   createNode,
+  getCache,
   parentNodeId = null,
   auth = {},
   httpHeaders = {},
@@ -368,12 +358,13 @@ module.exports = ({
     throw new Error(`createNode must be a function, was ${typeof createNode}`);
   }
 
-  if (typeof store !== `object`) {
-    throw new Error(`store must be the redux store, was ${typeof store}`);
+  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(`cache must be the Gatsby cache, was ${typeof cache}`);
+    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.
 
@@ -395,7 +386,6 @@ module.exports = ({
   bar.total = totalJobs;
   const fileDownloadPromise = pushTask({
     url,
-    store,
     cache,
     createNode,
     parentNodeId,

package/extend-file-node.js

@@ -24,7 +24,7 @@ module.exports = ({
       description: `Copy file to static directory and return public url to it`,
       resolve: (file, fieldArgs, context) => {
         const details = getNodeAndSavePathDependency(file.id, context.path);
-        const fileName = `${file.name}-${file.internal.contentDigest}${details.ext}`;
+        const fileName = `${file.internal.contentDigest}/${details.base}`;
         const publicPath = path.join(process.cwd(), `public`, `static`, fileName);
 
         if (!fs.existsSync(publicPath)) {

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "gatsby-source-filesystem",
   "description": "Gatsby plugin which parses files within a directory for further parsing by other plugins",
-  "version": "2.1.53",
+  "version": "2.1.57",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
   },
   "dependencies": {
-    "@babel/runtime": "^7.7.6",
+    "@babel/runtime": "^7.8.7",
     "better-queue": "^3.8.10",
     "bluebird": "^3.7.2",
-    "chokidar": "3.3.0",
-    "file-type": "^12.4.0",
+    "chokidar": "3.3.1",
+    "file-type": "^12.4.2",
     "fs-extra": "^8.1.0",
-    "gatsby-core-utils": "^1.0.33",
+    "gatsby-core-utils": "^1.0.34",
     "got": "^8.3.2",
     "md5-file": "^3.2.3",
     "mime": "^2.4.4",
@@ -21,12 +21,12 @@
     "progress": "^2.0.3",
     "read-chunk": "^3.2.0",
     "valid-url": "^1.0.9",
-    "xstate": "^4.7.2"
+    "xstate": "^4.8.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.7.5",
-    "@babel/core": "^7.7.5",
-    "babel-preset-gatsby-package": "^0.2.17",
+    "@babel/cli": "^7.8.4",
+    "@babel/core": "^7.8.7",
+    "babel-preset-gatsby-package": "^0.2.18",
     "cross-env": "^5.2.1"
   },
   "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-source-filesystem#readme",
@@ -52,5 +52,5 @@
   "engines": {
     "node": ">=8.0.0"
   },
-  "gitHead": "edb1423009c6a5cfc0e811331abde8716f07f306"
+  "gitHead": "d2d32d4f61619da5200f2dd15a034cd51f5e9932"
 }

package/utils.js

@@ -86,7 +86,7 @@ function createProgress(message, reporter) {
  *
  * @param  {String} directory
  * @param  {String} filename
- * @param  {String} url
+ * @param  {String} ext
  * @return {String}
  */