Move stuff around

freiksenet · freiksenet · commit e252bf47fedd · 2020-05-27T09:54:55.000+03:00
diff --git a/packages/gatsby/cache-dir/page-data-processors/asComponent.js b/packages/gatsby/cache-dir/page-data-processors/asComponent.js
@@ -1,7 +1,6 @@
 import React from "react"
-import { getModule } from "gatsby"
 
-export default function asComponent(data) {
+export default function asComponent(data, { getModule }) {
   if (data != null) {
     const component = getModule(data.moduleId)
     return (...additionalArgs) =>
diff --git a/packages/gatsby/cache-dir/page-renderer.js b/packages/gatsby/cache-dir/page-renderer.js
@@ -2,7 +2,6 @@ import React, { createElement } from "react"
 import PropTypes from "prop-types"
 import { publicLoader } from "./loader"
 import { apiRunner } from "./api-runner-browser"
-import processPageData from "./process-page-data"
 
 // Renders page
 class PageRenderer extends React.Component {
@@ -17,11 +16,6 @@ class PageRenderer extends React.Component {
       loader: publicLoader,
     })
 
-    processPageData(
-      this.props.pageResources.pageProcessors,
-      this.props.pageResources.json.data
-    )
-
     const pageElement =
       replacementElement ||
       createElement(this.props.pageResources.component, {
diff --git a/packages/gatsby/cache-dir/process-page-data.js b/packages/gatsby/cache-dir/process-page-data.js
@@ -23,6 +23,9 @@ function runModulesOnPath(json, path, modules) {
   }
 
   if (curr) {
-    curr[path[0]] = modules.reduce((acc, next) => next(acc), curr[path[0]])
+    curr[path[0]] = modules.reduce(
+      (acc, next) => next(acc, { getModule }),
+      curr[path[0]]
+    )
   }
 }
diff --git a/packages/gatsby/cache-dir/production-app.js b/packages/gatsby/cache-dir/production-app.js
@@ -73,6 +73,7 @@ apiRunnerAsync(`onClientEntry`).then(() => {
               location,
               staticQueryData: pageResources.staticQueryData,
             })
+
             processPageData(
               pageResources.pageProcessors,
               pageResources.json.data

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,9 @@ function runModulesOnPath(json, path, modules) {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`if (curr) {`
`26`		`- curr[path[0]] = modules.reduce((acc, next) => next(acc), curr[path[0]])`
	`26`	`+ curr[path[0]] = modules.reduce(`
	`27`	`+ (acc, next) => next(acc, { getModule }),`
	`28`	`+ curr[path[0]]`
	`29`	`+ )`
`27`	`30`	`}`
`28`	`31`	`}`