From 807d95850620e184b7ec2468c646097c6b303ae4 Mon Sep 17 00:00:00 2001
From: Tyler Barnes <tyler@gatsbyjs.com>
Date: Fri, 16 Jul 2021 16:28:50 -0700
Subject: [PATCH] Revert "fix(wordpress): ensure all file links are rewritten"
 (#32398)

This reverts commit f9706009f4b12006d655b1e14e17fbf0e0708b3a.

(cherry picked from commit 9e96088645160649dc6880b5debc882f353fd133)
---
 .../fetch-referenced-media-items.test.js      | 96 -------------------
 .../fetch-referenced-media-items.js           | 14 +--
 2 files changed, 4 insertions(+), 106 deletions(-)
 delete mode 100644 packages/gatsby-source-wordpress/__tests__/fetch-referenced-media-items.test.js

diff --git a/packages/gatsby-source-wordpress/__tests__/fetch-referenced-media-items.test.js b/packages/gatsby-source-wordpress/__tests__/fetch-referenced-media-items.test.js
deleted file mode 100644
index 39626b074436a..0000000000000
--- a/packages/gatsby-source-wordpress/__tests__/fetch-referenced-media-items.test.js
+++ /dev/null
@@ -1,96 +0,0 @@
-jest.mock(`../dist/utils/fetch-graphql`, () => jest.fn())
-
-import { getHelpers } from "../dist/utils/get-gatsby-api"
-import fetchGraphql from "../dist/utils/fetch-graphql"
-import { fetchMediaItemsBySourceUrl } from "../dist/steps/source-nodes/fetch-nodes/fetch-referenced-media-items"
-import { createContentDigest } from "gatsby-core-utils"
-import store from "../dist/store"
-
-const fakeReporter = {
-  panic: msg => {
-    console.error(msg)
-  },
-  info: msg => {
-    console.log(msg)
-  },
-}
-
-const createApi = () => {
-  return {
-    actions: {
-      createTypes: jest.fn(),
-      createNode: jest.fn(),
-      deleteNode: jest.fn(),
-    },
-    reporter: fakeReporter,
-    createNodeId: jest.fn(),
-    async getNode(id) {
-      return {
-        localFile: {
-          id: id,
-        },
-      }
-    },
-  }
-}
-
-describe(`fetchMediaItemsBySourceUrl`, () => {
-  beforeAll(() => {
-    store.dispatch.gatsbyApi.setState({
-      pluginOptions: {
-        schema: {
-          perPage: 2,
-        },
-      },
-    })
-  })
-
-  afterEach(() => {
-    jest.resetAllMocks()
-  })
-
-  it(`should properly download multiple pages`, async () => {
-    fetchGraphql
-      .mockResolvedValueOnce({
-        data: {
-          mediaItem__index_0: null,
-          mediaItem__index_1: null,
-        },
-      })
-      .mockResolvedValueOnce({
-        data: {
-          mediaItem__index_2: {
-            id: 2,
-            mediaItemUrl: `https://wordpress.host/wp-content/uploads/2018/05/file1.mp3`,
-          },
-          mediaItem__index_3: {
-            id: 3,
-            mediaItemUrl: `https://wordpress.host/wp-content/uploads/2018/05/file1.mp3`,
-          },
-        },
-      })
-      .mockResolvedValueOnce({
-        data: {
-          mediaItem__index_4: null,
-          mediaItem__index_5: null,
-        },
-      })
-      .mockResolvedValueOnce({
-        data: {
-          mediaItem__index_6: null,
-          mediaItem__index_7: null,
-        },
-      })
-    const result = await fetchMediaItemsBySourceUrl({
-      mediaItemUrls: [
-        `https://wordpress.host/wp-content/uploads/2018/05/file1.mp3?_=7`,
-        `https://wordpress.host/wp-content/uploads/2018/05/file2.mp3?_=7`,
-        `https://wordpress.host/wp-content/uploads/2018/05/file1.mp3`,
-        `https://wordpress.host/wp-content/uploads/2018/05/file2.mp3`,
-      ],
-      createContentDigest,
-      helpers: createApi(),
-    })
-    expect(result).toHaveLength(2)
-  })
-})
diff --git a/packages/gatsby-source-wordpress/src/steps/source-nodes/fetch-nodes/fetch-referenced-media-items.js b/packages/gatsby-source-wordpress/src/steps/source-nodes/fetch-nodes/fetch-referenced-media-items.js
index bebc36f076ee6..e84213199f3c8 100644
--- a/packages/gatsby-source-wordpress/src/steps/source-nodes/fetch-nodes/fetch-referenced-media-items.js
+++ b/packages/gatsby-source-wordpress/src/steps/source-nodes/fetch-nodes/fetch-referenced-media-items.js
@@ -271,7 +271,7 @@ const processAndDedupeImageUrls = urls =>
     }, urls)
   )
 
-export const fetchMediaItemsBySourceUrl = async ({
+const fetchMediaItemsBySourceUrl = async ({
   mediaItemUrls,
   selectionSet,
   builtFragments,
@@ -319,16 +319,10 @@ export const fetchMediaItemsBySourceUrl = async ({
   // we pass this resolve function into the queue function so it can let us
   // know when it's finished
   let resolveFutureNodes
-  const allResolvedNodes = [...previouslyCachedMediaItemNodes]
-  let resolveCountTogo = mediaItemUrlsPages.length
   const futureNodes = new Promise(resolve => {
-    // combine our resolved nodes we fetched with our cached nodes
-    resolveFutureNodes = (nodes = []) => {
-      allResolvedNodes.push(...nodes)
-      if (--resolveCountTogo === 0) {
-        resolve(allResolvedNodes)
-      }
-    }
+    resolveFutureNodes = (nodes = []) =>
+      // combine our resolved nodes we fetched with our cached nodes
+      resolve([...nodes, ...previouslyCachedMediaItemNodes])
   })
 
   // we have no media items to fetch,