move getRequestHeadersForUrl into gatsby/utils

gatsbyjs · May 17, 2022 · 4ba7177 · 4ba7177
1 parent 3408213
commit 4ba7177
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 31 deletions.
diff --git a/packages/gatsby-plugin-utils/src/polyfill-remote-file/http-routes.ts b/packages/gatsby-plugin-utils/src/polyfill-remote-file/http-routes.ts
@@ -5,7 +5,7 @@ import { hasFeature } from "../has-feature"
 import { ImageCDNUrlKeys } from "./utils/url-generator"
 import { getFileExtensionFromMimeType } from "./utils/mime-type-helpers"
 import { transformImage } from "./transform-images"
-import { getRequestHeadersForUrl } from "./utils/get-request-headers-for-url"
+import { getRequestHeadersForUrl } from "gatsby/dist/utils/get-request-headers-for-url"
 
 import type { Application } from "express"
 

diff --git a/packages/gatsby-plugin-utils/src/polyfill-remote-file/jobs/gatsby-worker.ts b/packages/gatsby-plugin-utils/src/polyfill-remote-file/jobs/gatsby-worker.ts
@@ -3,7 +3,7 @@ import { fetchRemoteFile } from "gatsby-core-utils/fetch-remote-file"
 import { cpuCoreCount } from "gatsby-core-utils/cpu-core-count"
 import Queue from "fastq"
 import { transformImage } from "../transform-images"
-import { getRequestHeadersForUrl } from "../utils/get-request-headers-for-url"
+import { getRequestHeadersForUrl } from "gatsby/dist/utils/get-request-headers-for-url"
 
 interface IImageServiceProps {
   outputDir: Parameters<typeof transformImage>[0]["outputDir"]

diff --git a/packages/gatsby-plugin-utils/src/polyfill-remote-file/placeholder-handler.ts b/packages/gatsby-plugin-utils/src/polyfill-remote-file/placeholder-handler.ts
@@ -7,7 +7,7 @@ import getSharpInstance from "gatsby-sharp"
 import { getCache } from "./utils/cache"
 import { getImageFormatFromMimeType } from "./utils/mime-type-helpers"
 import type { IRemoteImageNode } from "./types"
-import { getRequestHeadersForUrl } from "./utils/get-request-headers-for-url"
+import { getRequestHeadersForUrl } from "gatsby/dist/utils/get-request-headers-for-url"
 
 export enum PlaceholderType {
   BLURRED = `blurred`,

diff --git a/packages/gatsby-plugin-utils/src/polyfill-remote-file/transform-images.ts b/packages/gatsby-plugin-utils/src/polyfill-remote-file/transform-images.ts
@@ -4,7 +4,7 @@ import { fetchRemoteFile } from "gatsby-core-utils/fetch-remote-file"
 import { createContentDigest } from "gatsby-core-utils/create-content-digest"
 import getSharpInstance from "gatsby-sharp"
 import { getCache } from "./utils/cache"
-import { getRequestHeadersForUrl } from "./utils/get-request-headers-for-url"
+import { getRequestHeadersForUrl } from "gatsby/dist/utils/get-request-headers-for-url"
 
 export interface IResizeArgs {
   width: number

diff --git a/packages/gatsby-plugin-utils/src/polyfill-remote-file/utils/get-request-headers-for-url.ts b/packages/gatsby-plugin-utils/src/polyfill-remote-file/utils/get-request-headers-for-url.ts
diff --git a/packages/gatsby/src/utils/get-request-headers-for-url.ts b/packages/gatsby/src/utils/get-request-headers-for-url.ts
@@ -0,0 +1,13 @@
+import url from "url"
+import { store } from "../redux"
+
+import type { Headers } from "got"
+
+export function getRequestHeadersForUrl(
+  passedUrl: string
+): Headers | undefined {
+  const baseDomain = url.parse(passedUrl).hostname
+  const { requestHeaders } = store.getState()
+
+  return baseDomain ? requestHeaders?.get(baseDomain) : undefined
+}