feat(gatsby-plugin-page-creator): Fix gatsby plugin page creator v4

packages/gatsby-plugin-page-creator/package.json

@@ -30,6 +30,7 @@
     "chokidar": "^3.5.2",
     "fs-exists-cached": "^1.0.0",
     "gatsby-core-utils": "^2.14.0-next.2",
+    "gatsby-plugin-utils": "^1.14.0-next.2",
     "gatsby-page-utils": "^1.14.0-next.2",
     "gatsby-telemetry": "^2.14.0-next.2",
     "globby": "^11.0.4",

packages/gatsby-plugin-page-creator/src/gatsby-node.ts

@@ -23,6 +23,19 @@ import { derivePath } from "./derive-path"
 import { validatePathQuery } from "./validate-path-query"
 import { CODES, ERROR_MAP, prefixId } from "./error-utils"
 
+let coreSupportsOnPluginInit: `unstable` | `stable` | undefined
+
+try {
+  const { isGatsbyNodeLifecycleSupported } = require(`gatsby-plugin-utils`)
+  if (isGatsbyNodeLifecycleSupported(`onPluginInit`)) {
+    coreSupportsOnPluginInit = `stable`
+  } else if (isGatsbyNodeLifecycleSupported(`unstable_onPluginInit`)) {
+    coreSupportsOnPluginInit = `unstable`
+  }
+} catch (e) {
+  console.error(`Could not check if Gatsby supports onPluginInit lifecycle`)
+}
+
 interface IOptions extends PluginOptions {
   path: string
   pathCheck?: boolean
@@ -221,7 +234,7 @@ export function setFieldsOnGraphQLNodeType(
   }
 }
 
-export async function onPreInit(
+async function initializePlugin(
   { reporter }: ParentSpanPluginArgs,
   { path: pagesPath }: IOptions
 ): Promise<void> {
@@ -265,3 +278,12 @@ export async function onPreInit(
     })
   }
 }
+
+if (coreSupportsOnPluginInit === `stable`) {
+  // need to conditionally export otherwise it throws an error for older versions
+  exports.onPluginInit = initializePlugin
+} else if (coreSupportsOnPluginInit === `unstable`) {
+  exports.unstable_onPluginInit = initializePlugin
+} else {
+  exports.onPreInit = initializePlugin
+}

packages/gatsby/src/bootstrap/index.ts

@@ -51,8 +51,9 @@ export async function bootstrap(
 
   if (process.env.GATSBY_EXPERIMENTAL_PARALLEL_QUERY_RUNNING) {
     const directory = slash(context.store.getState().program.directory)
+    const program = context.store.getState().program
 
-    workerPool.all.loadConfigAndPlugins({ siteDirectory: directory })
+    workerPool.all.loadConfigAndPlugins({ siteDirectory: directory, program })
   }
 
   await customizeSchema(context)

packages/gatsby/src/bootstrap/load-config-and-plugins.ts

@@ -11,13 +11,15 @@ import loadThemes from "../bootstrap/load-themes"
 import { store } from "../redux"
 import handleFlags from "../utils/handle-flags"
 import availableFlags from "../utils/flags"
+import { IProgram } from "../commands/types"
 
 export async function loadConfigAndPlugins({
   siteDirectory,
   processFlags = false,
 }: {
   siteDirectory: string
   processFlags?: boolean
+  program?: IProgram
 }): Promise<{
   config: any
   flattenedPlugins: Array<IFlattenedPlugin>

packages/gatsby/src/utils/worker/child/load-config-and-plugins.ts

@@ -5,12 +5,12 @@ import apiRunnerNode from "../../api-runner-node"
 export async function loadConfigAndPlugins(
   ...args: Parameters<typeof internalLoadConfigAndPlugins>
 ): Promise<void> {
-  const [{ siteDirectory }] = args
+  const [{ siteDirectory, program }] = args
 
   store.dispatch({
     type: `SET_PROGRAM`,
     payload: {
-      ...store.getState().program,
+      ...program,
       directory: siteDirectory,
     },
   })