From 5b81ecd5e125a8904cb8a2a1ee70a52e94d22b05 Mon Sep 17 00:00:00 2001 From: Michal Piechowiak Date: Mon, 13 Nov 2023 10:57:37 +0100 Subject: [PATCH] don't use path prefix for alternate image cdn url --- .../polyfill-remote-file/utils/url-generator.ts | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/packages/gatsby-plugin-utils/src/polyfill-remote-file/utils/url-generator.ts b/packages/gatsby-plugin-utils/src/polyfill-remote-file/utils/url-generator.ts index 7715999f95d5d..79e3ec108db00 100644 --- a/packages/gatsby-plugin-utils/src/polyfill-remote-file/utils/url-generator.ts +++ b/packages/gatsby-plugin-utils/src/polyfill-remote-file/utils/url-generator.ts @@ -94,7 +94,7 @@ export function generateImageUrl( store?: Store ): string { if (process.env.NETLIFY_IMAGE_CDN) { - return generateImageUrlAlt(source, imageArgs, store) + return generateImageUrlAlt(source, imageArgs) } const filenameWithoutExt = basename(source.filename, extname(source.filename)) const queryStr = generateImageArgs(imageArgs) @@ -183,13 +183,12 @@ export function generateImageUrlAlt( mimeType: string internal: { contentDigest: string } }, - imageArgs: Parameters[0], - store?: Store + imageArgs: Parameters[0] ): string { const placeholderOrigin = `http://netlify.com` const imageParams = generateImageArgsAlt(imageArgs) - const baseURL = new URL(`${placeholderOrigin}/${generateRoutePrefix(store)}`) + const baseURL = new URL(`${placeholderOrigin}/.netlify/images`) baseURL.search = imageParams.toString() baseURL.searchParams.append(`url`, source.url) @@ -198,16 +197,6 @@ export function generateImageUrlAlt( return `${baseURL.pathname}${baseURL.search}` } -function generateRoutePrefix(store?: Store): string { - const state = store?.getState() - - const pathPrefix = state?.program?.prefixPaths - ? state?.config?.pathPrefix - : `` - - return pathPrefix + `.netlify/images` -} - export function generateImageArgsAlt({ width, height,