Load functions during initialize and stick em in redux

packages/gatsby/src/internal-plugins/functions/gatsby-node.ts

@@ -5,7 +5,9 @@ import webpack from "webpack"
 import multer from "multer"
 import * as express from "express"
 
-import { urlResolve } from "gatsby-core-utils"
+// import { urlResolve } from "gatsby-core-utils"
+
+// const { emitter, store } = require(`../../redux`)
 
 import {
   ParentSpanPluginArgs,
@@ -26,35 +28,36 @@ export async function onPreBootstrap(
 
   const {
     program: { directory: siteDirectoryPath },
+    functions,
   } = store.getState()
 
-  if (!functionsDirectoryPath) {
-    functionsDirectoryPath = path.join(siteDirectoryPath, `src/api`)
-  }
+  // if (!functionsDirectoryPath) {
+  functionsDirectoryPath = path.join(siteDirectoryPath, `src/api`)
+  // }
 
   const functionsDirectory = path.resolve(
     siteDirectoryPath,
     functionsDirectoryPath as string
   )
 
-  const functionsGlob = `**/*.{js,ts}`
+  // const functionsGlob = `**/*.{js,ts}`
 
   // Get initial list of files
-  const files = await glob(functionsGlob, { cwd: functionsDirectory })
-
-  if (files?.length === 0) {
-    reporter.warn(
-      `No functions found in directory: ${path.relative(
-        process.cwd(),
-        functionsDirectory
-      )}`
-    )
-    return
-  }
+  // const files = await glob(functionsGlob, { cwd: functionsDirectory })
+
+  // if (files?.length === 0) {
+  //   reporter.warn(
+  //     `No functions found in directory: ${path.relative(
+  //       process.cwd(),
+  //       functionsDirectory
+  //     )}`
+  //   )
+  //   return
+  // }
 
-  await fs.ensureDir(path.join(siteDirectoryPath, `.cache`, `functions`))
+  // await fs.ensureDir(path.join(siteDirectoryPath, `.cache`, `functions`))
 
-  await fs.emptyDir(path.join(siteDirectoryPath, `.cache`, `functions`))
+  // await fs.emptyDir(path.join(siteDirectoryPath, `.cache`, `functions`))
 
   const gatsbyVarObject = Object.keys(process.env).reduce((acc, key) => {
     if (key.match(/^GATSBY_/)) {
@@ -73,9 +76,17 @@ export async function onPreBootstrap(
     }
   )
 
+  console.log({
+    functions,
+  })
+
   try {
     await Promise.all(
-      files.map(file => {
+      Array.from(functions).map(([name, file]) => {
+        console.log({
+          file,
+        })
+
         const config = {
           entry: path.join(functionsDirectory, file),
           output: {
@@ -127,35 +138,38 @@ export async function onPreBootstrap(
   activity.end()
 }
 
-export async function onCreateDevServer(
-  { reporter, app, store }: CreateDevServerArgs,
-  { path: functionsDirectoryPath }: PluginOptions
-): Promise<void> {
-  const functionsGlob = `**/*.{js,ts}`
+export async function onCreateDevServer({
+  reporter,
+  app,
+  store,
+}: CreateDevServerArgs): // { path: functionsDirectoryPath }: PluginOptions
+Promise<void> {
+  // const functionsGlob = `**/*.{js,ts}`
 
   const {
-    program: { directory: siteDirectoryPath },
+    //   program: { directory: siteDirectoryPath },
+    functions,
   } = store.getState()
 
-  if (!functionsDirectoryPath) {
-    functionsDirectoryPath = path.join(siteDirectoryPath, `src/api`)
-  }
+  // if (!functionsDirectoryPath) {
+  //   functionsDirectoryPath = path.join(siteDirectoryPath, `src/api`)
+  // }
 
-  const functionsDirectory = path.resolve(
-    siteDirectoryPath,
-    functionsDirectoryPath as string
-  )
+  // const functionsDirectory = path.resolve(
+  //   siteDirectoryPath,
+  //   functionsDirectoryPath as string
+  // )
 
-  const files = await glob(functionsGlob, { cwd: functionsDirectory })
+  // const files = await glob(functionsGlob, { cwd: functionsDirectory })
 
   reporter.verbose(`Attaching functions to development server`)
 
-  const knownFunctions = new Map(
-    files.map(file => [
-      urlResolve(path.parse(file).dir, path.parse(file).name),
-      file,
-    ])
-  )
+  // const knownFunctions = new Map(
+  //   files.map(file => [
+  //     urlResolve(path.parse(file).dir, path.parse(file).name),
+  //     file,
+  //   ])
+  // )
 
   app.use(
     `/api/:functionName`,
@@ -167,18 +181,22 @@ export async function onCreateDevServer(
     (req, res, next) => {
       const { functionName } = req.params
 
-      if (knownFunctions.has(functionName)) {
+      if (functions.has(functionName)) {
         reporter.verbose(`Running ${functionName}`)
         const compiledFunctionsDir = path.join(
           process.cwd(),
           `.cache`,
           `functions`
         )
-        const funcNameToJs = knownFunctions.get(functionName) as string
+        const funcNameToJs = functions.get(functionName) as string
 
         try {
           const fn = require(path.join(compiledFunctionsDir, funcNameToJs))
 
+          console.log({
+            functions,
+          })
+
           const fnToExecute = (fn && fn.default) || fn
 
           // Promise.race()

packages/gatsby/src/redux/actions/internal.ts

@@ -16,6 +16,8 @@ import {
   IPageQueryRunAction,
   IRemoveStaleJobAction,
   ISetSiteConfig,
+  ISetSiteFunctions,
+  IGatsbyState,
   IDefinitionMeta,
   ISetGraphQLDefinitionsAction,
   IQueryStartAction,
@@ -328,3 +330,16 @@ export const setSiteConfig = (config?: unknown): ISetSiteConfig => {
     payload: normalizedPayload,
   }
 }
+
+/**
+ * Set gatsby functions
+ * @private
+ */
+export const setFunctions = (
+  functions: IGatsbyState["functions"]
+): ISetSiteFunctions => {
+  return {
+    type: `SET_SITE_FUNCTIONS`,
+    payload: functions,
+  }
+}

packages/gatsby/src/redux/reducers/functions.ts

@@ -0,0 +1,14 @@
+import { IGatsbyState, ISetSiteFunctions } from "../types"
+
+export const functionsReducer = (
+  state: IGatsbyState["functions"] = new Map(),
+  action: ISetSiteFunctions
+): IGatsbyState["functions"] => {
+  switch (action.type) {
+    case `SET_SITE_FUNCTIONS`:
+      return action.payload
+
+    default:
+      return state
+  }
+}

packages/gatsby/src/redux/reducers/index.ts

@@ -27,6 +27,7 @@ import { staticQueriesByTemplateReducer } from "./static-queries-by-template"
 import { queriesReducer } from "./queries"
 import { visitedPagesReducer } from "./visited-page"
 import { htmlReducer } from "./html"
+import { functionsReducer } from "./functions"
 
 /**
  * @property exports.nodesTouched Set<string>
@@ -61,4 +62,5 @@ export {
   staticQueriesByTemplateReducer as staticQueriesByTemplate,
   queriesReducer as queries,
   htmlReducer as html,
+  functionsReducer as functions,
 }

packages/gatsby/src/redux/types.ts

@@ -39,6 +39,10 @@ export interface IGatsbyPage {
   componentPath: SystemPath
 }
 
+export interface IGatsbyFunction {
+  path: string
+}
+
 export interface IGatsbyConfig {
   plugins?: Array<{
     // This is the name of the plugin like `gatsby-plugin-manifest
@@ -222,6 +226,7 @@ export interface IGatsbyState {
     pluginFilepath: SystemPath
   }>
   config: IGatsbyConfig
+  functions: Map<string, IGatsbyFunction>
   pages: Map<string, IGatsbyPage>
   schema: GraphQLSchema
   definitions: Map<string, IDefinitionMeta>
@@ -740,6 +745,11 @@ export interface ISetSiteConfig {
   payload: IGatsbyState["config"]
 }
 
+export interface ISetSiteFunctions {
+  type: `SET_SITE_FUNCTIONS`
+  payload: IGatsbyState["functions"]
+}
+
 export interface ICreateNodeAction {
   type: `CREATE_NODE`
   payload: IGatsbyNode

packages/gatsby/src/services/initialize.ts

@@ -1,5 +1,5 @@
 import _ from "lodash"
-import { slash, isCI } from "gatsby-core-utils"
+import { slash, isCI, urlResolve } from "gatsby-core-utils"
 import fs from "fs-extra"
 import md5File from "md5-file"
 import crypto from "crypto"
@@ -15,6 +15,7 @@ import { preferDefault } from "../bootstrap/prefer-default"
 import * as WorkerPool from "../utils/worker/pool"
 import JestWorker from "jest-worker"
 import { startPluginRunner } from "../redux/plugin-runner"
+import glob from "globby"
 import { loadPlugins } from "../bootstrap/load-plugins"
 import { store, emitter } from "../redux"
 import loadThemes from "../bootstrap/load-themes"
@@ -23,7 +24,7 @@ import { getConfigFile } from "../bootstrap/get-config-file"
 import { removeStaleJobs } from "../bootstrap/remove-stale-jobs"
 import { IPluginInfoOptions } from "../bootstrap/load-plugins/types"
 import { internalActions } from "../redux/actions"
-import { IGatsbyState } from "../redux/types"
+import { IGatsbyState, IGatsbyFunction } from "../redux/types"
 import { IBuildContext } from "./types"
 import availableFlags from "../utils/flags"
 
@@ -228,6 +229,49 @@ export async function initialize({
 
   activity.end()
 
+  if (true) {
+    const functionsGlob = `**/*.{js,ts}`
+
+    const {
+      program: { directory: siteDirectoryPath },
+    } = store.getState()
+
+    // if (!functionsDirectoryPath) {
+    const functionsDirectoryPath = path.join(siteDirectoryPath, `src/api`)
+    // }
+
+    const functionsDirectory = path.resolve(
+      siteDirectoryPath,
+      functionsDirectoryPath as string
+    )
+
+    const files = await glob(functionsGlob, { cwd: functionsDirectory })
+
+    if (files?.length === 0) {
+      reporter.warn(
+        `No functions found in directory: ${path.relative(
+          program.directory,
+          functionsDirectory
+        )}`
+      )
+    }
+
+    reporter.verbose(`Attaching functions to development server`)
+
+    const knownFunctions = new Map(
+      files.map(file => [
+        urlResolve(path.parse(file).dir, path.parse(file).name),
+        file,
+      ])
+    )
+
+    store.dispatch(internalActions.setFunctions(knownFunctions))
+
+    await fs.ensureDir(path.join(siteDirectoryPath, `.cache`, `functions`))
+
+    await fs.emptyDir(path.join(siteDirectoryPath, `.cache`, `functions`))
+  }
+
   if (process.env.GATSBY_EXPERIMENTAL_QUERY_ON_DEMAND) {
     if (process.env.gatsby_executing_command !== `develop`) {
       // we don't want to ever have this flag enabled for anything than develop