fix: fix downloadUrl when downloading Gatsby datastore file from CDN (#392)

* fix: fix downloadUrl for datastore file

* chore: cleanup - remove .only

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

Author: ericapisani

plugin/src/templates/utils.ts

@@ -108,7 +108,7 @@ export async function prepareFilesystem(
 
     const dataMetadataPath = join(process.cwd(), '.cache', 'dataMetadata.json')
     const { fileName } = await readJSON(dataMetadataPath)
-    const downloadUrl = `${siteUrl}/${fileName}`
+    const downloadUrl = new URL(`/${fileName}`, siteUrl).toString()
 
     console.log('Downloading data file from', downloadUrl)
 

plugin/test/unit/templates/utils.spec.ts

@@ -2,7 +2,14 @@ import { tmpdir } from 'os'
 import { resolve, join, dirname } from 'path'
 
 import Chance from 'chance'
-import { copy, ensureDir, existsSync, readFileSync, unlink } from 'fs-extra'
+import {
+  readJSON,
+  copy,
+  ensureDir,
+  existsSync,
+  readFileSync,
+  unlink,
+} from 'fs-extra'
 import { dir as getTmpDir } from 'tmp-promise'
 
 // eslint-disable-next-line import/no-namespace
@@ -67,6 +74,29 @@ describe('prepareFilesystem', () => {
     TEST_TIMEOUT,
   )
 
+  it(
+    'uses the correct URLs to download file from the CDN when GATSBY_EXCLUDE_DATASTORE_FROM_BUNDLE is enabled',
+    async () => {
+      const domain = chance.url({ path: '' })
+      const url = `${domain}${chance.word()}/${chance.word()}`
+
+      process.env.GATSBY_EXCLUDE_DATASTORE_FROM_BUNDLE = 'true'
+      await moveGatsbyDir()
+
+      const cacheDir = resolve('.cache')
+      const contents = await readJSON(`${cacheDir}/dataMetadata.json`)
+      const datastoreFileName = contents.fileName
+
+      await templateUtils.prepareFilesystem(cacheDir, url)
+
+      expect(downloadFileSpy).toHaveBeenCalledTimes(1)
+      expect(downloadFileSpy.mock.calls[0][0]).toEqual(
+        `${domain}${datastoreFileName}`,
+      )
+    },
+    TEST_TIMEOUT,
+  )
+
   it(
     'does not download file from the CDN when GATSBY_EXCLUDE_DATASTORE_FROM_BUNDLE is not enabled',
     async () => {