chore(gatsyb-source-contentful): move locale filter

packages/gatsby-source-contentful/src/__tests__/fetch.js

@@ -181,26 +181,6 @@ it(`calls contentful.getContentTypes with custom plugin option page limit`, asyn
   })
 })
 
-it(`panics when localeFilter reduces locale list to 0`, async () => {
-  await fetchData({
-    pluginConfig: createPluginConfig({
-      accessToken: `6f35edf0db39085e9b9c19bd92943e4519c77e72c852d961968665f1324bfc94`,
-      spaceId: `rocybtov1ozk`,
-      pageLimit: 50,
-      localeFilter: () => false,
-    }),
-    reporter,
-  })
-
-  expect(reporter.panic).toBeCalledWith(
-    expect.objectContaining({
-      context: {
-        sourceMessage: `Please check if your localeFilter is configured properly. Locales 'en-us' were found but were filtered down to none.`,
-      },
-    })
-  )
-})
-
 describe(`Displays troubleshooting tips and detailed plugin options on contentful client error`, () => {
   it(`Generic fallback error`, async () => {
     mockClient.getLocales.mockImplementation(() => {

packages/gatsby-source-contentful/src/__tests__/gatsby-node.js

@@ -702,4 +702,44 @@ describe(`gatsby-node`, () => {
       expect(homeNode.content.references___NODE).toMatchSnapshot()
     })
   })
+
+  it(`panics when localeFilter reduces locale list to 0`, async () => {
+    cache.get.mockClear()
+    cache.set.mockClear()
+    fetch.mockImplementationOnce(startersBlogFixture.initialSync)
+    const locales = [`en-US`, `nl`]
+
+    const mockPanicReporter = {
+      ...reporter,
+      panic: jest.fn(),
+    }
+
+    await gatsbyNode.sourceNodes(
+      {
+        actions,
+        store,
+        getNodes,
+        getNode,
+        reporter: mockPanicReporter,
+        createNodeId,
+        cache,
+        getCache,
+        schema,
+      },
+      {
+        ...pluginOptions,
+        localeFilter: () => false,
+      }
+    )
+
+    expect(mockPanicReporter.panic).toBeCalledWith(
+      expect.objectContaining({
+        context: {
+          sourceMessage: `Please check if your localeFilter is configured properly. Locales '${locales.join(
+            `,`
+          )}' were found but were filtered down to none.`,
+        },
+      })
+    )
+  })
 })

packages/gatsby-source-contentful/src/fetch.js

@@ -86,23 +86,10 @@ module.exports = async function contentfulFetch({
   try {
     reporter.verbose(`Fetching default locale`)
     space = await client.getSpace()
-    let contentfulLocales = await client
-      .getLocales()
-      .then(response => response.items)
-    defaultLocale = _.find(contentfulLocales, { default: true }).code
-    locales = contentfulLocales.filter(pluginConfig.get(`localeFilter`))
-    if (locales.length === 0) {
-      reporter.panic({
-        id: CODES.LocalesMissing,
-        context: {
-          sourceMessage: `Please check if your localeFilter is configured properly. Locales '${contentfulLocales
-            .map(item => item.code)
-            .join(`,`)}' were found but were filtered down to none.`,
-        },
-      })
-    }
+    locales = await client.getLocales().then(response => response.items)
+    defaultLocale = _.find(locales, { default: true }).code
     reporter.verbose(
-      `Default locale is: ${defaultLocale}. There are ${contentfulLocales.length} locales in total.`
+      `Default locale is: ${defaultLocale}. There are ${locales.length} locales in total.`
     )
   } catch (e) {
     let details

packages/gatsby-source-contentful/src/gatsby-node.js

@@ -5,6 +5,7 @@ const fs = require(`fs-extra`)
 const { createClient } = require(`contentful`)
 const v8 = require(`v8`)
 const fetch = require(`node-fetch`)
+const { CODES } = require(`./report`)
 
 const normalize = require(`./normalize`)
 const fetchData = require(`./fetch`)
@@ -293,6 +294,22 @@ exports.sourceNodes = async (
     }
   }
 
+  const allLocales = locales
+  locales = locales.filter(pluginConfig.get(`localeFilter`))
+  reporter.verbose(
+    `All locales: ${allLocales}, default: ${defaultLocale}, after plugin.options.localeFilter: ${locales}`
+  )
+  if (locales.length === 0) {
+    reporter.panic({
+      id: CODES.LocalesMissing,
+      context: {
+        sourceMessage: `Please check if your localeFilter is configured properly. Locales '${allLocales
+          .map(item => item.code)
+          .join(`,`)}' were found but were filtered down to none.`,
+      },
+    })
+  }
+
   createTypes(`
   interface ContentfulEntry @nodeInterface {
     contentful_id: String!