gatsby-source-filesystem 4.6.0 → 4.8.0-next.0

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.6.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-source-filesystem@4.6.0/packages/gatsby-source-filesystem) (2022-01-25)
+
+[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v4.6)
+
+**Note:** Version bump only for package gatsby-source-filesystem
+
 ### [4.5.2](https://github.com/gatsbyjs/gatsby/commits/gatsby-source-filesystem@4.5.2/packages/gatsby-source-filesystem) (2022-01-17)
 
 **Note:** Version bump only for package gatsby-source-filesystem

package/create-remote-file-node.js

@@ -1,30 +1,16 @@
 "use strict";
 
-const fs = require(`fs-extra`);
-
 const {
-  createContentDigest,
-  fetchRemoteFile,
-  createFilePath
+  fetchRemoteFile
 } = require(`gatsby-core-utils`);
 
-const path = require(`path`);
-
 const {
   isWebUri
 } = require(`valid-url`);
 
-const Queue = require(`fastq`);
-
 const {
   createFileNode
 } = require(`./create-file-node`);
-
-const {
-  getRemoteFileExtension
-} = require(`./utils`);
-
-let showFlagWarning = !!process.env.GATSBY_EXPERIMENTAL_REMOTE_FILE_PLACEHOLDER;
 /********************
  * Type Definitions *
  ********************/
@@ -59,37 +45,6 @@ let showFlagWarning = !!process.env.GATSBY_EXPERIMENTAL_REMOTE_FILE_PLACEHOLDER;
  * @param  {Reporter} [options.reporter]
  */
 
-/********************
- * Queue Management *
- ********************/
-
-const GATSBY_CONCURRENT_DOWNLOAD = process.env.GATSBY_CONCURRENT_DOWNLOAD ? parseInt(process.env.GATSBY_CONCURRENT_DOWNLOAD, 10) || 0 : 200;
-const queue = Queue(pushToQueue, GATSBY_CONCURRENT_DOWNLOAD);
-/**
- * @callback {Queue~queueCallback}
- * @param {*} error
- * @param {*} result
- */
-
-/**
- * pushToQueue
- * --
- * Handle tasks that are pushed in to the Queue
- *
- *
- * @param  {CreateRemoteFileNodePayload}          task
- * @param  {Queue~queueCallback}  cb
- * @return {Promise<null>}
- */
-
-async function pushToQueue(task, cb) {
-  try {
-    const node = await processRemoteNode(task);
-    return cb(null, node);
-  } catch (e) {
-    return cb(e);
-  }
-}
 /******************
  * Core Functions *
  ******************/
@@ -115,27 +70,14 @@ async function processRemoteNode({
   ext,
   name
 }) {
-  let filename;
-
-  if (process.env.GATSBY_EXPERIMENTAL_REMOTE_FILE_PLACEHOLDER) {
-    filename = await fetchPlaceholder({
-      fromPath: process.env.GATSBY_EXPERIMENTAL_REMOTE_FILE_PLACEHOLDER,
-      url,
-      cache,
-      ext,
-      name
-    });
-  } else {
-    filename = await fetchRemoteFile({
-      url,
-      cache,
-      auth,
-      httpHeaders,
-      ext,
-      name
-    });
-  } // Create the file node.
-
+  const filename = await fetchRemoteFile({
+    url,
+    cache,
+    auth,
+    httpHeaders,
+    ext,
+    name
+  }); // Create the file node.
 
   const fileNode = await createFileNode(filename, createNodeId, {});
   fileNode.internal.description = `File "${url}"`;
@@ -150,50 +92,12 @@ async function processRemoteNode({
   });
   return fileNode;
 }
-
-async function fetchPlaceholder({
-  fromPath,
-  url,
-  cache,
-  ext,
-  name
-}) {
-  const pluginCacheDir = cache.directory;
-  const digest = createContentDigest(url);
-
-  if (!ext) {
-    ext = getRemoteFileExtension(url);
-  }
-
-  const filename = createFilePath(path.join(pluginCacheDir, digest), name, ext);
-  fs.copySync(fromPath, filename);
-  return filename;
-}
 /**
  * Index of promises resolving to File node from remote url
  */
 
 
 const processingCache = {};
-/**
- * pushTask
- * --
- * pushes a task in to the Queue and the processing cache
- *
- * Promisfy a task in queue
- * @param {CreateRemoteFileNodePayload} task
- * @return {Promise<Object>}
- */
-
-const pushTask = task => new Promise((resolve, reject) => {
-  queue.push(task, (err, node) => {
-    if (!err) {
-      resolve(node);
-    } else {
-      reject(`failed to process ${task.url}\n${err}`);
-    }
-  });
-});
 /***************
  * Entry Point *
  ***************/
@@ -210,7 +114,6 @@ const pushTask = task => new Promise((resolve, reject) => {
  * @return {Promise<Object>}                  Returns the created node
  */
 
-
 module.exports = function createRemoteFileNode({
   url,
   cache,
@@ -223,19 +126,9 @@ module.exports = function createRemoteFileNode({
   ext = null,
   name = null
 }) {
-  if (showFlagWarning) {
-    showFlagWarning = false; // Note: This will use a placeholder image as the default for every file that is downloaded through this API.
-    //       That may break certain cases, in particular when the file is not meant to be an image or when the image
-    //       is expected to be of a particular type that is other than the placeholder. This API is meant to bypass
-    //       the remote download for local testing only.
-
-    console.info(`GATSBY_EXPERIMENTAL_REMOTE_FILE_PLACEHOLDER: Any file downloaded by \`createRemoteFileNode\` will use the same placeholder image and skip the remote fetch. Note: This is an experimental flag that can change/disappear at any point.`);
-    console.info(`GATSBY_EXPERIMENTAL_REMOTE_FILE_PLACEHOLDER: File to use: \`${process.env.GATSBY_EXPERIMENTAL_REMOTE_FILE_PLACEHOLDER}\``);
-  } // validation of the input
+  // validation of the input
   // without this it's notoriously easy to pass in the wrong `createNodeId`
   // see gatsbyjs/gatsby#6643
-
-
   if (typeof createNodeId !== `function`) {
     throw new Error(`createNodeId must be a function, was ${typeof createNodeId}`);
   }
@@ -260,10 +153,10 @@ module.exports = function createRemoteFileNode({
   }
 
   if (!url || isWebUri(url) === undefined) {
-    return Promise.reject(`url passed to createRemoteFileNode is either missing or not a proper web uri: ${url}`);
+    return Promise.reject(new Error(`url passed to createRemoteFileNode is either missing or not a proper web uri: ${url}`));
   }
 
-  const fileDownloadPromise = pushTask({
+  const fileDownloadPromise = processRemoteNode({
     url,
     cache,
     createNode,

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": "4.6.0",
+  "version": "4.8.0-next.0",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
@@ -9,10 +9,9 @@
   "dependencies": {
     "@babel/runtime": "^7.15.4",
     "chokidar": "^3.5.2",
-    "fastq": "^1.13.0",
     "file-type": "^16.5.3",
     "fs-extra": "^10.0.0",
-    "gatsby-core-utils": "^3.6.0",
+    "gatsby-core-utils": "^3.8.0-next.0",
     "got": "^9.6.0",
     "md5-file": "^5.0.0",
     "mime": "^2.5.2",
@@ -24,7 +23,7 @@
   "devDependencies": {
     "@babel/cli": "^7.15.4",
     "@babel/core": "^7.15.5",
-    "babel-preset-gatsby-package": "^2.6.0",
+    "babel-preset-gatsby-package": "^2.8.0-next.0",
     "cross-env": "^7.0.3"
   },
   "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-source-filesystem#readme",
@@ -50,5 +49,5 @@
   "engines": {
     "node": ">=14.15.0"
   },
-  "gitHead": "441e6da3e1659e73621492a37a47745d308a565f"
+  "gitHead": "459d61e672d081ce6968ef07fe1b39c2e6e2a001"
 }