Merge pull request #59 from LubomirGeorgiev/master

Switch to Gatsby's official terminal reporter and Fix #7 #52

Author: lauriejim

src/fetch.js

@@ -2,12 +2,12 @@ import axios from 'axios'
 import { isObject, startsWith, forEach } from 'lodash'
 import pluralize from 'pluralize'
 
-module.exports = async ({ apiURL, contentType, jwtToken, queryLimit }) => {
-  console.time('Fetch Strapi data')
-  console.log(`Starting to fetch data from Strapi (${pluralize(contentType)})`)
-
+module.exports = async ({ apiURL, contentType, jwtToken, queryLimit, reporter }) => {
   // Define API endpoint.
-  const apiEndpoint = `${apiURL}/${pluralize(contentType)}?_limit=${queryLimit}`
+  const apiBase = `${apiURL}/${pluralize(contentType)}`
+  const apiEndpoint = `${apiBase}?_limit=${queryLimit}`
+
+  reporter.info(`Starting to fetch data from Strapi - ${apiBase}`)
 
   // Set authorization token
   let fetchRequestConfig = {}
@@ -20,9 +20,6 @@ module.exports = async ({ apiURL, contentType, jwtToken, queryLimit }) => {
   // Make API request.
   const documents = await axios(apiEndpoint, fetchRequestConfig)
 
-  // Query all documents from client.
-  console.timeEnd('Fetch Strapi data')
-
   // Map and clean data.
   return documents.data.map(item => clean(item))
 }

src/gatsby-node.js

@@ -5,7 +5,7 @@ import { capitalize } from 'lodash'
 import normalize from './normalize'
 
 exports.sourceNodes = async (
-  { store, boundActionCreators, cache },
+  { store, boundActionCreators, cache, reporter },
   {
     apiURL = 'http://localhost:1337',
     contentTypes = [],
@@ -23,8 +23,8 @@ exports.sourceNodes = async (
     loginData.hasOwnProperty('password') &&
     loginData.password.length !== 0
   ) {
-    console.time('Authenticate Strapi user')
-    console.log('Authenticate Strapi user')
+    const authenticationActivity = reporter.activityTimer(`Authenticate Strapi User`)
+    authenticationActivity.start()
 
     // Define API endpoint.
     const loginEndpoint = `${apiURL}/auth/local`
@@ -37,19 +37,23 @@ exports.sourceNodes = async (
         jwtToken = loginResponse.data.jwt
       }
     } catch (e) {
-      console.error('Strapi authentication error: ' + e)
+      reporter.panic('Strapi authentication error: ' + e)
     }
 
-    console.timeEnd('Authenticate Strapi user')
+    authenticationActivity.end()
   }
 
+  const fetchActivity = reporter.activityTimer(`Fetched Strapi Data`)
+  fetchActivity.start()
+
   // Generate a list of promises based on the `contentTypes` option.
   const promises = contentTypes.map(contentType =>
     fetchData({
       apiURL,
       contentType,
       jwtToken,
       queryLimit,
+      reporter
     })
   )
 
@@ -73,4 +77,6 @@ exports.sourceNodes = async (
       createNode(node)
     })
   })
+
+  fetchActivity.end()
 }