Restore prepare-nodes improvements

packages/gatsby/src/redux/prepare-nodes.js

@@ -22,14 +22,12 @@ const enhancedNodeCacheId = ({ node, args }) =>
 function awaitSiftField(fields, node, k) {
   const field = fields[k]
   if (field.resolve) {
-    return field.resolve(
-      node,
-      {},
-      {},
-      {
-        fieldName: k,
-      }
-    )
+    const { schema } = store.getState()
+    return field.resolve(node, {}, withResolverContext({}, schema), {
+      fieldName: k,
+      schema,
+      returnType: field.type,
+    })
   } else if (node[k] !== undefined) {
     return node[k]
   }
@@ -45,32 +43,18 @@ function resolveRecursive(node, siftFieldsObj, gqFields) {
         .then(v => {
           const innerSift = siftFieldsObj[k]
           const innerGqConfig = gqFields[k]
-          if (
-            _.isObject(innerSift) &&
-            v != null &&
-            innerGqConfig &&
-            innerGqConfig.type
-          ) {
-            if (_.isFunction(innerGqConfig.type.getFields)) {
+
+          const innerType = getNullableType(innerGqConfig.type)
+          const innerListType = getNamedType(innerType)
+          if (_.isObject(innerSift) && v != null && innerType) {
+            if (_.isFunction(innerType.getFields)) {
               // this is single object
-              return resolveRecursive(
-                v,
-                innerSift,
-                innerGqConfig.type.getFields()
-              )
-            } else if (
-              _.isArray(v) &&
-              innerGqConfig.type.ofType &&
-              _.isFunction(innerGqConfig.type.ofType.getFields)
-            ) {
+              return resolveRecursive(v, innerSift, innerType.getFields())
+            } else if (_.isArray(v) && _.isFunction(innerListType.getFields)) {
               // this is array
               return Promise.all(
                 v.map(item =>
-                  resolveRecursive(
-                    item,
-                    innerSift,
-                    innerGqConfig.type.ofType.getFields()
-                  )
+                  resolveRecursive(item, innerSift, innerListType.getFields())
                 )
               )
             }