update types & tests

.eslintrc.js

@@ -37,6 +37,7 @@ module.exports = {
     __BASE_PATH__: true,
     __ASSET_PREFIX__: true,
     _CFLAGS_: true,
+    __GATSBY: true,
   },
   rules: {
     "@babel/no-unused-expressions": [

packages/gatsby-core-utils/src/__tests__/fetch-remote-file.js

@@ -73,7 +73,7 @@ async function getFileContent(file, req, options = {}) {
     contentLength:
       req.url.searchParams.get(`contentLength`) === `false`
         ? undefined
-        : fileContentBuffer.length,
+        : String(fileContentBuffer.length),
   }
 }
 
@@ -120,6 +120,26 @@ const server = setupServer(
       ctx.status(200),
       ctx.body(content)
     )
+  }),
+  rest.get(`http://external.com/404.jpg`, async (req, res, ctx) => {
+    const content = `Page not found`
+
+    return res(
+      ctx.set(`Content-Type`, `text/html`),
+      ctx.set(`Content-Length`, String(content.length)),
+      ctx.status(404),
+      ctx.body(content)
+    )
+  }),
+  rest.get(`http://external.com/500.jpg`, async (req, res, ctx) => {
+    const content = `Server error`
+
+    return res(
+      ctx.set(`Content-Type`, `text/html`),
+      ctx.set(`Content-Length`, String(content.length)),
+      ctx.status(500),
+      ctx.body(content)
+    )
   })
 )
 
@@ -352,6 +372,24 @@ describe(`fetch-remote-file`, () => {
     expect(fsMove).toBeCalledTimes(2)
   })
 
+  it(`fails when 404 is triggered`, async () => {
+    await expect(
+      fetchRemoteFile({
+        url: `http://external.com/404.jpg`,
+        cache,
+      })
+    ).rejects.toThrow(`Response code 404 (Not Found)`)
+  })
+
+  it(`fails when 500 is triggered`, async () => {
+    await expect(
+      fetchRemoteFile({
+        url: `http://external.com/500.jpg`,
+        cache,
+      })
+    ).rejects.toThrow(`Response code 500 (Internal Server Error)`)
+  })
+
   describe(`retries the download`, () => {
     it(`Retries when gzip compression file is incomplete`, async () => {
       const filePath = await fetchRemoteFile({

packages/gatsby-core-utils/src/fetch-remote-file.ts

@@ -313,10 +313,18 @@ function requestRemoteNode(
     responseStream.pipe(fsWriteStream)
 
     // If there's a 400/500 response or other error.
+    // it will trigger a finish event on fsWriteStream
     responseStream.on(`error`, error => {
       if (timeout) {
         clearTimeout(timeout)
       }
+
+      fsWriteStream.close()
+      fs.removeSync(tmpFilename)
+
+      process.nextTick(() => {
+        reject(error)
+      })
     })
 
     responseStream.on(`response`, response => {

packages/gatsby/index.d.ts

@@ -1573,7 +1573,7 @@ export interface GatsbyFunctionRequest extends IncomingMessage {
   cookies: Record<string, string>
 }
 
-declare namespace NodeJS {
+declare module NodeJS {
   interface Global {
     __GATSBY: {
       buildId: string

packages/gatsby/src/commands/build.ts

@@ -58,7 +58,7 @@ module.exports = async function build(program: IBuildArgs): Promise<void> {
   // global gatsby object to use without store
   global.__GATSBY = {
     buildId: uuidv4(),
-    root: program.directory,
+    root: program!.directory,
   }
 
   if (isTruthy(process.env.VERBOSE)) {

types/gatsby-monorepo/global.d.ts

@@ -1,3 +1,12 @@
 declare const _CFLAGS_: {
   GATSBY_MAJOR: string
 }
+
+declare module NodeJS {
+  interface Global {
+    __GATSBY: {
+      buildId: string
+      root: string
+    }
+  }
+}