gatsby 4.25.1 → 4.25.2

package/dist/bootstrap/load-config/index.js

@@ -15,7 +15,7 @@ var _getConfigFile = require("../get-config-file");
 
 var _actions = require("../../redux/actions");
 
-var _loadThemes = _interopRequireDefault(require("../load-themes"));
+var _loadThemes = require("../load-themes");
 
 var _redux = require("../../redux");
 
@@ -87,7 +87,7 @@ async function loadConfig({
 
 
   if (config) {
-    const plugins = await (0, _loadThemes.default)(config, {
+    const plugins = await (0, _loadThemes.loadThemes)(config, {
       configFilePath,
       rootDir: siteDirectory
     });

package/dist/bootstrap/load-config/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["loadConfig","siteDirectory","processFlags","configModule","configFilePath","getConfigFile","config","preferDefault","reporter","panic","id","context","configName","enabledConfigFlags","unknownFlagMessage","unfitFlagMessage","message","handleFlags","availableFlags","flags","warn","forEach","flag","process","env","info","telemetryId","telemetry","trackFeatureIsUsed","plugins","loadThemes","rootDir","store","dispatch","internalActions","setSiteConfig"],"sources":["../../../src/bootstrap/load-config/index.ts"],"sourcesContent":["import reporter from \"gatsby-cli/lib/reporter\"\nimport telemetry from \"gatsby-telemetry\"\nimport { preferDefault } from \"../prefer-default\"\nimport { getConfigFile } from \"../get-config-file\"\nimport { internalActions } from \"../../redux/actions\"\nimport loadThemes from \"../load-themes\"\nimport { store } from \"../../redux\"\nimport handleFlags from \"../../utils/handle-flags\"\nimport availableFlags from \"../../utils/flags\"\nimport { IProgram } from \"../../commands/types\"\nimport { IGatsbyConfig } from \"../../internal\"\n\nexport async function loadConfig({\n  siteDirectory,\n  processFlags = false,\n}: {\n  siteDirectory: string\n  processFlags?: boolean\n  program?: IProgram\n}): Promise<IGatsbyConfig> {\n  // Try opening the site's gatsby-config.js file.\n  const { configModule, configFilePath } = await getConfigFile(\n    siteDirectory,\n    `gatsby-config`\n  )\n  let config = preferDefault(configModule)\n\n  // The root config cannot be exported as a function, only theme configs\n  if (typeof config === `function`) {\n    reporter.panic({\n      id: `10126`,\n      context: {\n        configName: `gatsby-config`,\n        siteDirectory,\n      },\n    })\n  }\n\n  if (config && processFlags) {\n    // Setup flags\n    if (config) {\n      // Get flags\n      const {\n        enabledConfigFlags,\n        unknownFlagMessage,\n        unfitFlagMessage,\n        message,\n      } = handleFlags(availableFlags, config.flags)\n\n      if (unknownFlagMessage !== ``) {\n        reporter.warn(unknownFlagMessage)\n      }\n      if (unfitFlagMessage !== ``) {\n        reporter.warn(unfitFlagMessage)\n      }\n      //  set process.env for each flag\n      enabledConfigFlags.forEach(flag => {\n        process.env[flag.env] = `true`\n      })\n\n      // Print out message.\n      if (message !== ``) {\n        reporter.info(message)\n      }\n\n      //  track usage of feature\n      enabledConfigFlags.forEach(flag => {\n        if (flag.telemetryId) {\n          telemetry.trackFeatureIsUsed(flag.telemetryId)\n        }\n      })\n\n      // Track the usage of config.flags\n      if (config.flags) {\n        telemetry.trackFeatureIsUsed(`ConfigFlags`)\n      }\n    }\n  }\n\n  // theme gatsby configs can be functions or objects\n  if (config) {\n    const plugins = await loadThemes(config, {\n      configFilePath,\n      rootDir: siteDirectory,\n    })\n    config = plugins.config\n  }\n\n  store.dispatch(internalActions.setSiteConfig(config))\n\n  return config\n}\n"],"mappings":";;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AAIO,eAAeA,UAAf,CAA0B;EAC/BC,aAD+B;EAE/BC,YAAY,GAAG;AAFgB,CAA1B,EAOoB;EACzB;EACA,MAAM;IAAEC,YAAF;IAAgBC;EAAhB,IAAmC,MAAM,IAAAC,4BAAA,EAC7CJ,aAD6C,EAE5C,eAF4C,CAA/C;EAIA,IAAIK,MAAM,GAAG,IAAAC,4BAAA,EAAcJ,YAAd,CAAb,CANyB,CAQzB;;EACA,IAAI,OAAOG,MAAP,KAAmB,UAAvB,EAAkC;IAChCE,iBAAA,CAASC,KAAT,CAAe;MACbC,EAAE,EAAG,OADQ;MAEbC,OAAO,EAAE;QACPC,UAAU,EAAG,eADN;QAEPX;MAFO;IAFI,CAAf;EAOD;;EAED,IAAIK,MAAM,IAAIJ,YAAd,EAA4B;IAC1B;IACA,IAAII,MAAJ,EAAY;MACV;MACA,MAAM;QACJO,kBADI;QAEJC,kBAFI;QAGJC,gBAHI;QAIJC;MAJI,IAKF,IAAAC,oBAAA,EAAYC,cAAZ,EAA4BZ,MAAM,CAACa,KAAnC,CALJ;;MAOA,IAAIL,kBAAkB,KAAM,EAA5B,EAA+B;QAC7BN,iBAAA,CAASY,IAAT,CAAcN,kBAAd;MACD;;MACD,IAAIC,gBAAgB,KAAM,EAA1B,EAA6B;QAC3BP,iBAAA,CAASY,IAAT,CAAcL,gBAAd;MACD,CAdS,CAeV;;;MACAF,kBAAkB,CAACQ,OAAnB,CAA2BC,IAAI,IAAI;QACjCC,OAAO,CAACC,GAAR,CAAYF,IAAI,CAACE,GAAjB,IAAyB,MAAzB;MACD,CAFD,EAhBU,CAoBV;;MACA,IAAIR,OAAO,KAAM,EAAjB,EAAoB;QAClBR,iBAAA,CAASiB,IAAT,CAAcT,OAAd;MACD,CAvBS,CAyBV;;;MACAH,kBAAkB,CAACQ,OAAnB,CAA2BC,IAAI,IAAI;QACjC,IAAIA,IAAI,CAACI,WAAT,EAAsB;UACpBC,wBAAA,CAAUC,kBAAV,CAA6BN,IAAI,CAACI,WAAlC;QACD;MACF,CAJD,EA1BU,CAgCV;;MACA,IAAIpB,MAAM,CAACa,KAAX,EAAkB;QAChBQ,wBAAA,CAAUC,kBAAV,CAA8B,aAA9B;MACD;IACF;EACF,CA1DwB,CA4DzB;;;EACA,IAAItB,MAAJ,EAAY;IACV,MAAMuB,OAAO,GAAG,MAAM,IAAAC,mBAAA,EAAWxB,MAAX,EAAmB;MACvCF,cADuC;MAEvC2B,OAAO,EAAE9B;IAF8B,CAAnB,CAAtB;IAIAK,MAAM,GAAGuB,OAAO,CAACvB,MAAjB;EACD;;EAED0B,YAAA,CAAMC,QAAN,CAAeC,wBAAA,CAAgBC,aAAhB,CAA8B7B,MAA9B,CAAf;;EAEA,OAAOA,MAAP;AACD"}
+{"version":3,"file":"index.js","names":["loadConfig","siteDirectory","processFlags","configModule","configFilePath","getConfigFile","config","preferDefault","reporter","panic","id","context","configName","enabledConfigFlags","unknownFlagMessage","unfitFlagMessage","message","handleFlags","availableFlags","flags","warn","forEach","flag","process","env","info","telemetryId","telemetry","trackFeatureIsUsed","plugins","loadThemes","rootDir","store","dispatch","internalActions","setSiteConfig"],"sources":["../../../src/bootstrap/load-config/index.ts"],"sourcesContent":["import reporter from \"gatsby-cli/lib/reporter\"\nimport telemetry from \"gatsby-telemetry\"\nimport { preferDefault } from \"../prefer-default\"\nimport { getConfigFile } from \"../get-config-file\"\nimport { internalActions } from \"../../redux/actions\"\nimport { loadThemes } from \"../load-themes\"\nimport { store } from \"../../redux\"\nimport handleFlags from \"../../utils/handle-flags\"\nimport availableFlags from \"../../utils/flags\"\nimport { IProgram } from \"../../commands/types\"\nimport { IGatsbyConfig } from \"../../internal\"\n\nexport async function loadConfig({\n  siteDirectory,\n  processFlags = false,\n}: {\n  siteDirectory: string\n  processFlags?: boolean\n  program?: IProgram\n}): Promise<IGatsbyConfig> {\n  // Try opening the site's gatsby-config.js file.\n  const { configModule, configFilePath } = await getConfigFile(\n    siteDirectory,\n    `gatsby-config`\n  )\n  let config = preferDefault(configModule)\n\n  // The root config cannot be exported as a function, only theme configs\n  if (typeof config === `function`) {\n    reporter.panic({\n      id: `10126`,\n      context: {\n        configName: `gatsby-config`,\n        siteDirectory,\n      },\n    })\n  }\n\n  if (config && processFlags) {\n    // Setup flags\n    if (config) {\n      // Get flags\n      const {\n        enabledConfigFlags,\n        unknownFlagMessage,\n        unfitFlagMessage,\n        message,\n      } = handleFlags(availableFlags, config.flags)\n\n      if (unknownFlagMessage !== ``) {\n        reporter.warn(unknownFlagMessage)\n      }\n      if (unfitFlagMessage !== ``) {\n        reporter.warn(unfitFlagMessage)\n      }\n      //  set process.env for each flag\n      enabledConfigFlags.forEach(flag => {\n        process.env[flag.env] = `true`\n      })\n\n      // Print out message.\n      if (message !== ``) {\n        reporter.info(message)\n      }\n\n      //  track usage of feature\n      enabledConfigFlags.forEach(flag => {\n        if (flag.telemetryId) {\n          telemetry.trackFeatureIsUsed(flag.telemetryId)\n        }\n      })\n\n      // Track the usage of config.flags\n      if (config.flags) {\n        telemetry.trackFeatureIsUsed(`ConfigFlags`)\n      }\n    }\n  }\n\n  // theme gatsby configs can be functions or objects\n  if (config) {\n    const plugins = await loadThemes(config, {\n      configFilePath,\n      rootDir: siteDirectory,\n    })\n    config = plugins.config\n  }\n\n  store.dispatch(internalActions.setSiteConfig(config))\n\n  return config\n}\n"],"mappings":";;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AAIO,eAAeA,UAAf,CAA0B;EAC/BC,aAD+B;EAE/BC,YAAY,GAAG;AAFgB,CAA1B,EAOoB;EACzB;EACA,MAAM;IAAEC,YAAF;IAAgBC;EAAhB,IAAmC,MAAM,IAAAC,4BAAA,EAC7CJ,aAD6C,EAE5C,eAF4C,CAA/C;EAIA,IAAIK,MAAM,GAAG,IAAAC,4BAAA,EAAcJ,YAAd,CAAb,CANyB,CAQzB;;EACA,IAAI,OAAOG,MAAP,KAAmB,UAAvB,EAAkC;IAChCE,iBAAA,CAASC,KAAT,CAAe;MACbC,EAAE,EAAG,OADQ;MAEbC,OAAO,EAAE;QACPC,UAAU,EAAG,eADN;QAEPX;MAFO;IAFI,CAAf;EAOD;;EAED,IAAIK,MAAM,IAAIJ,YAAd,EAA4B;IAC1B;IACA,IAAII,MAAJ,EAAY;MACV;MACA,MAAM;QACJO,kBADI;QAEJC,kBAFI;QAGJC,gBAHI;QAIJC;MAJI,IAKF,IAAAC,oBAAA,EAAYC,cAAZ,EAA4BZ,MAAM,CAACa,KAAnC,CALJ;;MAOA,IAAIL,kBAAkB,KAAM,EAA5B,EAA+B;QAC7BN,iBAAA,CAASY,IAAT,CAAcN,kBAAd;MACD;;MACD,IAAIC,gBAAgB,KAAM,EAA1B,EAA6B;QAC3BP,iBAAA,CAASY,IAAT,CAAcL,gBAAd;MACD,CAdS,CAeV;;;MACAF,kBAAkB,CAACQ,OAAnB,CAA2BC,IAAI,IAAI;QACjCC,OAAO,CAACC,GAAR,CAAYF,IAAI,CAACE,GAAjB,IAAyB,MAAzB;MACD,CAFD,EAhBU,CAoBV;;MACA,IAAIR,OAAO,KAAM,EAAjB,EAAoB;QAClBR,iBAAA,CAASiB,IAAT,CAAcT,OAAd;MACD,CAvBS,CAyBV;;;MACAH,kBAAkB,CAACQ,OAAnB,CAA2BC,IAAI,IAAI;QACjC,IAAIA,IAAI,CAACI,WAAT,EAAsB;UACpBC,wBAAA,CAAUC,kBAAV,CAA6BN,IAAI,CAACI,WAAlC;QACD;MACF,CAJD,EA1BU,CAgCV;;MACA,IAAIpB,MAAM,CAACa,KAAX,EAAkB;QAChBQ,wBAAA,CAAUC,kBAAV,CAA8B,aAA9B;MACD;IACF;EACF,CA1DwB,CA4DzB;;;EACA,IAAItB,MAAJ,EAAY;IACV,MAAMuB,OAAO,GAAG,MAAM,IAAAC,sBAAA,EAAWxB,MAAX,EAAmB;MACvCF,cADuC;MAEvC2B,OAAO,EAAE9B;IAF8B,CAAnB,CAAtB;IAIAK,MAAM,GAAGuB,OAAO,CAACvB,MAAjB;EACD;;EAED0B,YAAA,CAAMC,QAAN,CAAeC,wBAAA,CAAgBC,aAAhB,CAA8B7B,MAA9B,CAAf;;EAEA,OAAOA,MAAP;AACD"}

package/dist/bootstrap/load-plugins/load-internal-plugins.js

@@ -5,6 +5,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.loadInternalPlugins = loadInternalPlugins;
 
+var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
+
+var _uniqWith2 = _interopRequireDefault(require("lodash/uniqWith"));
+
 var _gatsbyCoreUtils = require("gatsby-core-utils");
 
 var _path = _interopRequireDefault(require("path"));
@@ -125,6 +129,7 @@ function loadInternalPlugins(config = {}, rootDir) {
   // collect scripts that users might inject in their `wrapRootElement`
 
   plugins.push((0, _processPlugin.processPlugin)(_path.default.join(__dirname, `../../internal-plugins/partytown`), rootDir));
-  return plugins;
+  const uniquePlugins = (0, _uniqWith2.default)(plugins, _isEqual2.default);
+  return uniquePlugins;
 }
 //# sourceMappingURL=load-internal-plugins.js.map

package/dist/bootstrap/load-plugins/load-internal-plugins.js.map

@@ -1 +1 @@
-{"version":3,"file":"load-internal-plugins.js","names":["TYPESCRIPT_PLUGIN_NAME","loadInternalPlugins","config","rootDir","plugins","configuredPluginNames","Set","internalPlugins","filter","Boolean","forEach","relPath","absPath","path","join","__dirname","push","processPlugin","plugin","processedPlugin","add","name","resolve","require","options","slash","pathCheck","has","GATSBY_CLOUD_PLUGIN_NAME","incompatibleGatsbyCloudPlugin","reporter","panic","process","env","GATSBY_CLOUD","addGatsbyPluginCloudPluginWhenInstalled","GATSBY_PLUGIN_PREVIEW_NAME","addGatsbyPluginPreviewWhenInstalled","processedTypeScriptPlugin","allExtensions","isTSX","jsxPragma","cwd","id","createPluginId","version","createFileContentHash","pluginOptions","getResolvedFieldsForPlugin","program","store","getState","pageCreatorOptions","directory","pageCreatorPlugin","find","processedPageCreatorPlugin"],"sources":["../../../src/bootstrap/load-plugins/load-internal-plugins.ts"],"sourcesContent":["import { slash } from \"gatsby-core-utils\"\nimport path from \"path\"\nimport reporter from \"gatsby-cli/lib/reporter\"\nimport { store } from \"../../redux\"\nimport {\n  IPluginInfo,\n  IPluginRefObject,\n  IPluginRefOptions,\n  ISiteConfig,\n} from \"./types\"\nimport { processPlugin } from \"./process-plugin\"\nimport { createPluginId } from \"./utils/create-id\"\nimport { createFileContentHash } from \"./utils/create-hash\"\nimport {\n  addGatsbyPluginCloudPluginWhenInstalled,\n  addGatsbyPluginPreviewWhenInstalled,\n  incompatibleGatsbyCloudPlugin,\n  GATSBY_CLOUD_PLUGIN_NAME,\n  GATSBY_PLUGIN_PREVIEW_NAME,\n} from \"./utils/handle-gatsby-cloud\"\nimport { getResolvedFieldsForPlugin } from \"../../utils/parcel/compile-gatsby-files\"\n\nconst TYPESCRIPT_PLUGIN_NAME = `gatsby-plugin-typescript`\n\nexport function loadInternalPlugins(\n  config: ISiteConfig = {},\n  rootDir: string\n): Array<IPluginInfo> {\n  // Instantiate plugins.\n  const plugins: Array<IPluginInfo> = []\n  const configuredPluginNames = new Set()\n\n  // Add internal plugins\n  const internalPlugins = [\n    `../../internal-plugins/dev-404-page`,\n    `../../internal-plugins/load-babel-config`,\n    `../../internal-plugins/internal-data-bridge`,\n    `../../internal-plugins/prod-404-500`,\n    `../../internal-plugins/webpack-theme-component-shadowing`,\n    `../../internal-plugins/bundle-optimisations`,\n    `../../internal-plugins/functions`,\n  ].filter(Boolean) as Array<string>\n\n  internalPlugins.forEach(relPath => {\n    const absPath = path.join(__dirname, relPath)\n    plugins.push(processPlugin(absPath, rootDir))\n  })\n\n  // Add plugins from the site config.\n  if (config.plugins) {\n    config.plugins.forEach(plugin => {\n      const processedPlugin = processPlugin(plugin, rootDir)\n      plugins.push(processedPlugin)\n      configuredPluginNames.add(processedPlugin.name)\n    })\n  }\n\n  // the order of all of these page-creators matters. The \"last plugin wins\",\n  // so the user's site comes last, and each page-creator instance has to\n  // match the plugin definition order before that. This works fine for themes\n  // because themes have already been added in the proper order to the plugins\n  // array\n  plugins.forEach(plugin => {\n    plugins.push(\n      processPlugin(\n        {\n          resolve: require.resolve(`gatsby-plugin-page-creator`),\n          options: {\n            path: slash(path.join(plugin.resolve, `src/pages`)),\n            pathCheck: false,\n          },\n        },\n        rootDir\n      )\n    )\n  })\n\n  if (\n    configuredPluginNames.has(GATSBY_CLOUD_PLUGIN_NAME) &&\n    incompatibleGatsbyCloudPlugin(plugins)\n  ) {\n    reporter.panic(\n      `Plugin gatsby-plugin-gatsby-cloud is not compatible with your gatsby version. Please upgrade to gatsby-plugin-gatsby-cloud@next`\n    )\n  }\n\n  if (\n    !configuredPluginNames.has(GATSBY_CLOUD_PLUGIN_NAME) &&\n    (process.env.GATSBY_CLOUD === `true` || process.env.GATSBY_CLOUD === `1`)\n  ) {\n    addGatsbyPluginCloudPluginWhenInstalled(plugins, rootDir)\n  }\n\n  if (\n    !configuredPluginNames.has(GATSBY_PLUGIN_PREVIEW_NAME) &&\n    (process.env.GATSBY_CLOUD === `true` || process.env.GATSBY_CLOUD === `1`)\n  ) {\n    addGatsbyPluginPreviewWhenInstalled(plugins, rootDir)\n  }\n\n  // Support Typescript by default but allow users to override it\n  if (!configuredPluginNames.has(TYPESCRIPT_PLUGIN_NAME)) {\n    const processedTypeScriptPlugin = processPlugin(\n      {\n        resolve: require.resolve(TYPESCRIPT_PLUGIN_NAME),\n        options: {\n          // TODO(@mxstbr): Do not hard-code these defaults but infer them from the\n          // pluginOptionsSchema of gatsby-plugin-typescript\n          allExtensions: false,\n          isTSX: false,\n          jsxPragma: `React`,\n        },\n      },\n      rootDir\n    )\n    plugins.push(processedTypeScriptPlugin)\n  }\n\n  // Add the site's default \"plugin\" i.e. gatsby-x files in root of site.\n  plugins.push({\n    resolve: slash(process.cwd()),\n    id: createPluginId(`default-site-plugin`),\n    name: `default-site-plugin`,\n    version: createFileContentHash(process.cwd(), `gatsby-*`),\n    pluginOptions: {\n      plugins: [],\n    },\n    ...getResolvedFieldsForPlugin(rootDir, `default-site-plugin`),\n  })\n\n  const program = store.getState().program\n\n  // default options for gatsby-plugin-page-creator\n  let pageCreatorOptions: IPluginRefOptions | undefined = {\n    path: slash(path.join(program.directory, `src/pages`)),\n    pathCheck: false,\n  }\n\n  if (config.plugins) {\n    const pageCreatorPlugin = config.plugins.find(\n      (plugin): plugin is IPluginRefObject =>\n        typeof plugin !== `string` &&\n        plugin.resolve === `gatsby-plugin-page-creator` &&\n        slash((plugin.options && plugin.options.path) || ``) ===\n          slash(path.join(program.directory, `src/pages`))\n    )\n    if (pageCreatorPlugin) {\n      // override the options if there are any user specified options\n      pageCreatorOptions = pageCreatorPlugin.options\n    }\n  }\n\n  const processedPageCreatorPlugin = processPlugin(\n    {\n      resolve: require.resolve(`gatsby-plugin-page-creator`),\n      options: pageCreatorOptions,\n    },\n    rootDir\n  )\n\n  plugins.push(processedPageCreatorPlugin)\n\n  // Partytown plugin collects usage of <Script strategy={\"off-main-thread\"} />\n  // in `wrapRootElement`, so we have to make sure it's the last one running to be able to\n  // collect scripts that users might inject in their `wrapRootElement`\n  plugins.push(\n    processPlugin(\n      path.join(__dirname, `../../internal-plugins/partytown`),\n      rootDir\n    )\n  )\n\n  return plugins\n}\n"],"mappings":"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"}
+{"version":3,"file":"load-internal-plugins.js","names":["TYPESCRIPT_PLUGIN_NAME","loadInternalPlugins","config","rootDir","plugins","configuredPluginNames","Set","internalPlugins","filter","Boolean","forEach","relPath","absPath","path","join","__dirname","push","processPlugin","plugin","processedPlugin","add","name","resolve","require","options","slash","pathCheck","has","GATSBY_CLOUD_PLUGIN_NAME","incompatibleGatsbyCloudPlugin","reporter","panic","process","env","GATSBY_CLOUD","addGatsbyPluginCloudPluginWhenInstalled","GATSBY_PLUGIN_PREVIEW_NAME","addGatsbyPluginPreviewWhenInstalled","processedTypeScriptPlugin","allExtensions","isTSX","jsxPragma","cwd","id","createPluginId","version","createFileContentHash","pluginOptions","getResolvedFieldsForPlugin","program","store","getState","pageCreatorOptions","directory","pageCreatorPlugin","find","processedPageCreatorPlugin","uniquePlugins"],"sources":["../../../src/bootstrap/load-plugins/load-internal-plugins.ts"],"sourcesContent":["import { slash } from \"gatsby-core-utils\"\nimport { uniqWith, isEqual } from \"lodash\"\nimport path from \"path\"\nimport reporter from \"gatsby-cli/lib/reporter\"\nimport { store } from \"../../redux\"\nimport {\n  IPluginInfo,\n  IPluginRefObject,\n  IPluginRefOptions,\n  ISiteConfig,\n} from \"./types\"\nimport { processPlugin } from \"./process-plugin\"\nimport { createPluginId } from \"./utils/create-id\"\nimport { createFileContentHash } from \"./utils/create-hash\"\nimport {\n  addGatsbyPluginCloudPluginWhenInstalled,\n  addGatsbyPluginPreviewWhenInstalled,\n  incompatibleGatsbyCloudPlugin,\n  GATSBY_CLOUD_PLUGIN_NAME,\n  GATSBY_PLUGIN_PREVIEW_NAME,\n} from \"./utils/handle-gatsby-cloud\"\nimport { getResolvedFieldsForPlugin } from \"../../utils/parcel/compile-gatsby-files\"\n\nconst TYPESCRIPT_PLUGIN_NAME = `gatsby-plugin-typescript`\n\nexport function loadInternalPlugins(\n  config: ISiteConfig = {},\n  rootDir: string\n): Array<IPluginInfo> {\n  // Instantiate plugins.\n  const plugins: Array<IPluginInfo> = []\n  const configuredPluginNames = new Set()\n\n  // Add internal plugins\n  const internalPlugins = [\n    `../../internal-plugins/dev-404-page`,\n    `../../internal-plugins/load-babel-config`,\n    `../../internal-plugins/internal-data-bridge`,\n    `../../internal-plugins/prod-404-500`,\n    `../../internal-plugins/webpack-theme-component-shadowing`,\n    `../../internal-plugins/bundle-optimisations`,\n    `../../internal-plugins/functions`,\n  ].filter(Boolean) as Array<string>\n\n  internalPlugins.forEach(relPath => {\n    const absPath = path.join(__dirname, relPath)\n    plugins.push(processPlugin(absPath, rootDir))\n  })\n\n  // Add plugins from the site config.\n  if (config.plugins) {\n    config.plugins.forEach(plugin => {\n      const processedPlugin = processPlugin(plugin, rootDir)\n      plugins.push(processedPlugin)\n      configuredPluginNames.add(processedPlugin.name)\n    })\n  }\n\n  // the order of all of these page-creators matters. The \"last plugin wins\",\n  // so the user's site comes last, and each page-creator instance has to\n  // match the plugin definition order before that. This works fine for themes\n  // because themes have already been added in the proper order to the plugins\n  // array\n  plugins.forEach(plugin => {\n    plugins.push(\n      processPlugin(\n        {\n          resolve: require.resolve(`gatsby-plugin-page-creator`),\n          options: {\n            path: slash(path.join(plugin.resolve, `src/pages`)),\n            pathCheck: false,\n          },\n        },\n        rootDir\n      )\n    )\n  })\n\n  if (\n    configuredPluginNames.has(GATSBY_CLOUD_PLUGIN_NAME) &&\n    incompatibleGatsbyCloudPlugin(plugins)\n  ) {\n    reporter.panic(\n      `Plugin gatsby-plugin-gatsby-cloud is not compatible with your gatsby version. Please upgrade to gatsby-plugin-gatsby-cloud@next`\n    )\n  }\n\n  if (\n    !configuredPluginNames.has(GATSBY_CLOUD_PLUGIN_NAME) &&\n    (process.env.GATSBY_CLOUD === `true` || process.env.GATSBY_CLOUD === `1`)\n  ) {\n    addGatsbyPluginCloudPluginWhenInstalled(plugins, rootDir)\n  }\n\n  if (\n    !configuredPluginNames.has(GATSBY_PLUGIN_PREVIEW_NAME) &&\n    (process.env.GATSBY_CLOUD === `true` || process.env.GATSBY_CLOUD === `1`)\n  ) {\n    addGatsbyPluginPreviewWhenInstalled(plugins, rootDir)\n  }\n\n  // Support Typescript by default but allow users to override it\n  if (!configuredPluginNames.has(TYPESCRIPT_PLUGIN_NAME)) {\n    const processedTypeScriptPlugin = processPlugin(\n      {\n        resolve: require.resolve(TYPESCRIPT_PLUGIN_NAME),\n        options: {\n          // TODO(@mxstbr): Do not hard-code these defaults but infer them from the\n          // pluginOptionsSchema of gatsby-plugin-typescript\n          allExtensions: false,\n          isTSX: false,\n          jsxPragma: `React`,\n        },\n      },\n      rootDir\n    )\n    plugins.push(processedTypeScriptPlugin)\n  }\n\n  // Add the site's default \"plugin\" i.e. gatsby-x files in root of site.\n  plugins.push({\n    resolve: slash(process.cwd()),\n    id: createPluginId(`default-site-plugin`),\n    name: `default-site-plugin`,\n    version: createFileContentHash(process.cwd(), `gatsby-*`),\n    pluginOptions: {\n      plugins: [],\n    },\n    ...getResolvedFieldsForPlugin(rootDir, `default-site-plugin`),\n  })\n\n  const program = store.getState().program\n\n  // default options for gatsby-plugin-page-creator\n  let pageCreatorOptions: IPluginRefOptions | undefined = {\n    path: slash(path.join(program.directory, `src/pages`)),\n    pathCheck: false,\n  }\n\n  if (config.plugins) {\n    const pageCreatorPlugin = config.plugins.find(\n      (plugin): plugin is IPluginRefObject =>\n        typeof plugin !== `string` &&\n        plugin.resolve === `gatsby-plugin-page-creator` &&\n        slash((plugin.options && plugin.options.path) || ``) ===\n          slash(path.join(program.directory, `src/pages`))\n    )\n    if (pageCreatorPlugin) {\n      // override the options if there are any user specified options\n      pageCreatorOptions = pageCreatorPlugin.options\n    }\n  }\n\n  const processedPageCreatorPlugin = processPlugin(\n    {\n      resolve: require.resolve(`gatsby-plugin-page-creator`),\n      options: pageCreatorOptions,\n    },\n    rootDir\n  )\n\n  plugins.push(processedPageCreatorPlugin)\n\n  // Partytown plugin collects usage of <Script strategy={\"off-main-thread\"} />\n  // in `wrapRootElement`, so we have to make sure it's the last one running to be able to\n  // collect scripts that users might inject in their `wrapRootElement`\n  plugins.push(\n    processPlugin(\n      path.join(__dirname, `../../internal-plugins/partytown`),\n      rootDir\n    )\n  )\n\n  const uniquePlugins = uniqWith(plugins, isEqual)\n\n  return uniquePlugins\n}\n"],"mappings":"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"}

package/dist/bootstrap/load-themes/index.d.ts

@@ -0,0 +1,17 @@
+import { IGatsbyConfigInput, PluginEntry } from "../../utils/merge-gatsby-config";
+interface IThemeObj {
+    themeName: string;
+    themeConfig: IGatsbyConfigInput;
+    themeDir: string;
+    themeSpec: PluginEntry;
+    parentDir: string;
+    configFilePath?: string;
+}
+export declare function loadThemes(config: IGatsbyConfigInput, { configFilePath, rootDir }: {
+    configFilePath: string;
+    rootDir: string;
+}): Promise<{
+    config: IGatsbyConfigInput;
+    themes: Array<IThemeObj>;
+}>;
+export {};

package/dist/bootstrap/load-themes/index.js

@@ -1,34 +1,49 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.loadThemes = loadThemes;
+
+var _uniqWith2 = _interopRequireDefault(require("lodash/uniqWith"));
+
+var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
+
+var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
+
+var _flattenDeep2 = _interopRequireDefault(require("lodash/flattenDeep"));
+
+var _gatsbyCoreUtils = require("gatsby-core-utils");
+
+var path = _interopRequireWildcard(require("path"));
+
 var _mergeGatsbyConfig = require("../../utils/merge-gatsby-config");
 
+var _bluebird = require("bluebird");
+
+var _debug = _interopRequireDefault(require("debug"));
+
 var _preferDefault = require("../prefer-default");
 
 var _getConfigFile = require("../get-config-file");
 
 var _resolvePlugin = require("../load-plugins/resolve-plugin");
 
-const {
-  createRequireFromPath
-} = require(`gatsby-core-utils`);
-
-const path = require(`path`);
-
-const Promise = require(`bluebird`);
+var _reporter = _interopRequireDefault(require("gatsby-cli/lib/reporter"));
 
-const _ = require(`lodash`);
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-const debug = require(`debug`)(`gatsby:load-themes`);
-
-const reporter = require(`gatsby-cli/lib/reporter`); // get the gatsby-config file for a theme
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+const debug = (0, _debug.default)(`gatsby:load-themes`);
 
+// get the gatsby-config file for a theme
 const resolveTheme = async (themeSpec, configFileThatDeclaredTheme, isMainConfig = false, rootDir) => {
-  const themeName = themeSpec.resolve || themeSpec;
+  const themeName = typeof themeSpec === `string` ? themeSpec : themeSpec.resolve;
   let themeDir;
 
   try {
-    const scopedRequire = createRequireFromPath(`${rootDir}/:internal:`); // theme is an node-resolvable module
+    const scopedRequire = (0, _gatsbyCoreUtils.createRequireFromPath)(`${rootDir}/:internal:`); // theme is an node-resolvable module
 
     themeDir = path.dirname(scopedRequire.resolve(themeName));
   } catch (e) {
@@ -47,13 +62,14 @@ const resolveTheme = async (themeSpec, configFileThatDeclaredTheme, isMainConfig
         } = (0, _resolvePlugin.resolvePlugin)(themeName, rootDir);
         themeDir = resolve;
       } catch (localErr) {
-        reporter.panic(`Failed to resolve ${themeName}`, localErr);
+        _reporter.default.panic(`Failed to resolve ${themeName}`, localErr);
       }
     }
 
     if (!themeDir) {
       const nodeResolutionPaths = module.paths.map(p => path.join(p, themeName));
-      reporter.panic({
+
+      _reporter.default.panic({
         id: `10226`,
         context: {
           themeName,
@@ -71,12 +87,7 @@ const resolveTheme = async (themeSpec, configFileThatDeclaredTheme, isMainConfig
   } = await (0, _getConfigFile.getConfigFile)(themeDir, `gatsby-config`);
   const theme = (0, _preferDefault.preferDefault)(configModule); // if theme is a function, call it with the themeConfig
 
-  let themeConfig = theme;
-
-  if (_.isFunction(theme)) {
-    themeConfig = theme(themeSpec.options || {});
-  }
-
+  const themeConfig = (0, _isFunction2.default)(theme) ? theme(typeof themeSpec === `string` ? {} : themeSpec.options) : theme;
   return {
     themeName,
     themeConfig,
@@ -110,46 +121,54 @@ const processTheme = ({
   if (themeConfig && themesList) {
     // for every parent theme a theme defines, resolve the parent's
     // gatsby config and return it in order [parentA, parentB, child]
-    return Promise.mapSeries(themesList, async spec => {
+    return (0, _bluebird.mapSeries)(themesList, async spec => {
       const themeObj = await resolveTheme(spec, configFilePath, false, themeDir);
       return processTheme(themeObj, {
         rootDir: themeDir
       });
-    }).then(arr => arr.concat([{
+    }).then(arr => (0, _flattenDeep2.default)(arr.concat([{
       themeName,
       themeConfig,
       themeSpec,
       themeDir,
       parentDir: rootDir
-    }]));
+    }])));
   } else {
     // if a theme doesn't define additional themes, return the original theme
-    return [{
+    return Promise.resolve([{
       themeName,
       themeConfig,
       themeSpec,
       themeDir,
       parentDir: rootDir
-    }];
+    }]);
   }
 };
 
-module.exports = async (config, {
+function normalizePluginEntry(plugin, parentDir) {
+  return {
+    resolve: typeof plugin === `string` ? plugin : plugin.resolve,
+    options: typeof plugin === `string` ? {} : plugin.options || {},
+    parentDir
+  };
+}
+
+async function loadThemes(config, {
   configFilePath,
   rootDir
-}) => {
-  const themesA = await Promise.mapSeries(config.plugins || [], async themeSpec => {
+}) {
+  const themesA = await (0, _bluebird.mapSeries)(config.plugins || [], async themeSpec => {
     const themeObj = await resolveTheme(themeSpec, configFilePath, true, rootDir);
     return processTheme(themeObj, {
       rootDir
     });
-  }).then(arr => _.flattenDeep(arr)); // log out flattened themes list to aid in debugging
+  }).then(arr => (0, _flattenDeep2.default)(arr)); // log out flattened themes list to aid in debugging
 
   debug(themesA); // map over each theme, adding the theme itself to the plugins
   // list in the config for the theme. This enables the usage of
   // gatsby-node, etc in themes.
 
-  return Promise.mapSeries(themesA, ({
+  return (0, _bluebird.mapSeries)(themesA, ({
     themeName,
     themeConfig = {},
     themeSpec,
@@ -157,16 +176,10 @@ module.exports = async (config, {
     parentDir
   }) => {
     return { ...themeConfig,
-      plugins: [...(themeConfig.plugins || []).map(plugin => {
-        return {
-          resolve: typeof plugin === `string` ? plugin : plugin.resolve,
-          options: plugin.options || {},
-          parentDir: themeDir
-        };
-      }), // theme plugin is last so it's gatsby-node, etc can override it's declared plugins, like a normal site.
+      plugins: [...(themeConfig.plugins || []).map(plugin => normalizePluginEntry(plugin, themeDir)), // theme plugin is last so it's gatsby-node, etc can override it's declared plugins, like a normal site.
       {
         resolve: themeName,
-        options: themeSpec.options || {},
+        options: typeof themeSpec === `string` ? {} : themeSpec.options,
         parentDir
       }]
     };
@@ -178,10 +191,14 @@ module.exports = async (config, {
    * children, can override functionality in earlier themes.
    */
   .reduce(_mergeGatsbyConfig.mergeGatsbyConfig, {}).then(newConfig => {
+    const mergedConfig = (0, _mergeGatsbyConfig.mergeGatsbyConfig)(newConfig, { ...config,
+      plugins: [...(config.plugins || []).map(plugin => normalizePluginEntry(plugin, rootDir))]
+    });
+    mergedConfig.plugins = (0, _uniqWith2.default)(mergedConfig.plugins, _isEqual2.default);
     return {
-      config: (0, _mergeGatsbyConfig.mergeGatsbyConfig)(newConfig, config),
+      config: mergedConfig,
       themes: themesA
     };
   });
-};
+}
 //# sourceMappingURL=index.js.map

package/dist/bootstrap/load-themes/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["createRequireFromPath","require","path","Promise","_","debug","reporter","resolveTheme","themeSpec","configFileThatDeclaredTheme","isMainConfig","rootDir","themeName","resolve","themeDir","scopedRequire","dirname","e","pathToLocalTheme","join","resolvePlugin","localErr","panic","nodeResolutionPaths","module","paths","map","p","id","context","configFilePath","configModule","getConfigFile","theme","preferDefault","themeConfig","isFunction","options","parentDir","processTheme","themesList","plugins","mapSeries","spec","themeObj","then","arr","concat","exports","config","themesA","flattenDeep","plugin","reduce","mergeGatsbyConfig","newConfig","themes"],"sources":["../../../src/bootstrap/load-themes/index.js"],"sourcesContent":["const { createRequireFromPath } = require(`gatsby-core-utils`)\nconst path = require(`path`)\nimport { mergeGatsbyConfig } from \"../../utils/merge-gatsby-config\"\nconst Promise = require(`bluebird`)\nconst _ = require(`lodash`)\nconst debug = require(`debug`)(`gatsby:load-themes`)\nimport { preferDefault } from \"../prefer-default\"\nimport { getConfigFile } from \"../get-config-file\"\nimport { resolvePlugin } from \"../load-plugins/resolve-plugin\"\nconst reporter = require(`gatsby-cli/lib/reporter`)\n\n// get the gatsby-config file for a theme\nconst resolveTheme = async (\n  themeSpec,\n  configFileThatDeclaredTheme,\n  isMainConfig = false,\n  rootDir\n) => {\n  const themeName = themeSpec.resolve || themeSpec\n  let themeDir\n  try {\n    const scopedRequire = createRequireFromPath(`${rootDir}/:internal:`)\n    // theme is an node-resolvable module\n    themeDir = path.dirname(scopedRequire.resolve(themeName))\n  } catch (e) {\n    let pathToLocalTheme\n\n    // only try to look for local theme in main site\n    // local themes nested in other themes is potential source of problems:\n    // because those are not hosted by npm, there is potential for multiple\n    // local themes with same name that do different things and name being\n    // main identifier that Gatsby uses right now, it's safer not to support it for now.\n    if (isMainConfig) {\n      pathToLocalTheme = path.join(rootDir, `plugins`, themeName)\n      // is a local plugin OR it doesn't exist\n      try {\n        const { resolve } = resolvePlugin(themeName, rootDir)\n        themeDir = resolve\n      } catch (localErr) {\n        reporter.panic(`Failed to resolve ${themeName}`, localErr)\n      }\n    }\n\n    if (!themeDir) {\n      const nodeResolutionPaths = module.paths.map(p => path.join(p, themeName))\n      reporter.panic({\n        id: `10226`,\n        context: {\n          themeName,\n          configFilePath: configFileThatDeclaredTheme,\n          pathToLocalTheme,\n          nodeResolutionPaths,\n        },\n      })\n    }\n  }\n\n  const { configModule, configFilePath } = await getConfigFile(\n    themeDir,\n    `gatsby-config`\n  )\n  const theme = preferDefault(configModule)\n\n  // if theme is a function, call it with the themeConfig\n  let themeConfig = theme\n  if (_.isFunction(theme)) {\n    themeConfig = theme(themeSpec.options || {})\n  }\n  return {\n    themeName,\n    themeConfig,\n    themeSpec,\n    themeDir,\n    parentDir: rootDir,\n    configFilePath,\n  }\n}\n\n// single iteration of a recursive function that resolve parent themes\n// It's recursive because we support child themes declaring parents and\n// have to resolve all the way `up the tree` of parent/children relationships\n//\n// Theoretically, there could be an infinite loop here but in practice there is\n// no use case for a loop so I expect that to only happen if someone is very\n// off track and creating their own set of themes\nconst processTheme = (\n  { themeName, themeConfig, themeSpec, themeDir, configFilePath },\n  { rootDir }\n) => {\n  const themesList = themeConfig && themeConfig.plugins\n  // Gatsby themes don't have to specify a gatsby-config.js (they might only use gatsby-node, etc)\n  // in this case they're technically plugins, but we should support it anyway\n  // because we can't guarantee which files theme creators create first\n  if (themeConfig && themesList) {\n    // for every parent theme a theme defines, resolve the parent's\n    // gatsby config and return it in order [parentA, parentB, child]\n    return Promise.mapSeries(themesList, async spec => {\n      const themeObj = await resolveTheme(spec, configFilePath, false, themeDir)\n      return processTheme(themeObj, { rootDir: themeDir })\n    }).then(arr =>\n      arr.concat([\n        { themeName, themeConfig, themeSpec, themeDir, parentDir: rootDir },\n      ])\n    )\n  } else {\n    // if a theme doesn't define additional themes, return the original theme\n    return [{ themeName, themeConfig, themeSpec, themeDir, parentDir: rootDir }]\n  }\n}\n\nmodule.exports = async (config, { configFilePath, rootDir }) => {\n  const themesA = await Promise.mapSeries(\n    config.plugins || [],\n    async themeSpec => {\n      const themeObj = await resolveTheme(\n        themeSpec,\n        configFilePath,\n        true,\n        rootDir\n      )\n      return processTheme(themeObj, { rootDir })\n    }\n  ).then(arr => _.flattenDeep(arr))\n\n  // log out flattened themes list to aid in debugging\n  debug(themesA)\n\n  // map over each theme, adding the theme itself to the plugins\n  // list in the config for the theme. This enables the usage of\n  // gatsby-node, etc in themes.\n  return (\n    Promise.mapSeries(\n      themesA,\n      ({ themeName, themeConfig = {}, themeSpec, themeDir, parentDir }) => {\n        return {\n          ...themeConfig,\n          plugins: [\n            ...(themeConfig.plugins || []).map(plugin => {\n              return {\n                resolve: typeof plugin === `string` ? plugin : plugin.resolve,\n                options: plugin.options || {},\n                parentDir: themeDir,\n              }\n            }),\n            // theme plugin is last so it's gatsby-node, etc can override it's declared plugins, like a normal site.\n            { resolve: themeName, options: themeSpec.options || {}, parentDir },\n          ],\n        }\n      }\n    )\n      /**\n       * themes resolve to a gatsby-config, so here we merge all of the configs\n       * into a single config, making sure to maintain the order in which\n       * they were defined so that later configs, like the user's site and\n       * children, can override functionality in earlier themes.\n       */\n      .reduce(mergeGatsbyConfig, {})\n      .then(newConfig => {\n        return {\n          config: mergeGatsbyConfig(newConfig, config),\n          themes: themesA,\n        }\n      })\n  )\n}\n"],"mappings":";;AAEA;;AAIA;;AACA;;AACA;;AARA,MAAM;EAAEA;AAAF,IAA4BC,OAAO,CAAE,mBAAF,CAAzC;;AACA,MAAMC,IAAI,GAAGD,OAAO,CAAE,MAAF,CAApB;;AAEA,MAAME,OAAO,GAAGF,OAAO,CAAE,UAAF,CAAvB;;AACA,MAAMG,CAAC,GAAGH,OAAO,CAAE,QAAF,CAAjB;;AACA,MAAMI,KAAK,GAAGJ,OAAO,CAAE,OAAF,CAAP,CAAkB,oBAAlB,CAAd;;AAIA,MAAMK,QAAQ,GAAGL,OAAO,CAAE,yBAAF,CAAxB,C,CAEA;;;AACA,MAAMM,YAAY,GAAG,OACnBC,SADmB,EAEnBC,2BAFmB,EAGnBC,YAAY,GAAG,KAHI,EAInBC,OAJmB,KAKhB;EACH,MAAMC,SAAS,GAAGJ,SAAS,CAACK,OAAV,IAAqBL,SAAvC;EACA,IAAIM,QAAJ;;EACA,IAAI;IACF,MAAMC,aAAa,GAAGf,qBAAqB,CAAE,GAAEW,OAAQ,aAAZ,CAA3C,CADE,CAEF;;IACAG,QAAQ,GAAGZ,IAAI,CAACc,OAAL,CAAaD,aAAa,CAACF,OAAd,CAAsBD,SAAtB,CAAb,CAAX;EACD,CAJD,CAIE,OAAOK,CAAP,EAAU;IACV,IAAIC,gBAAJ,CADU,CAGV;IACA;IACA;IACA;IACA;;IACA,IAAIR,YAAJ,EAAkB;MAChBQ,gBAAgB,GAAGhB,IAAI,CAACiB,IAAL,CAAUR,OAAV,EAAoB,SAApB,EAA8BC,SAA9B,CAAnB,CADgB,CAEhB;;MACA,IAAI;QACF,MAAM;UAAEC;QAAF,IAAc,IAAAO,4BAAA,EAAcR,SAAd,EAAyBD,OAAzB,CAApB;QACAG,QAAQ,GAAGD,OAAX;MACD,CAHD,CAGE,OAAOQ,QAAP,EAAiB;QACjBf,QAAQ,CAACgB,KAAT,CAAgB,qBAAoBV,SAAU,EAA9C,EAAiDS,QAAjD;MACD;IACF;;IAED,IAAI,CAACP,QAAL,EAAe;MACb,MAAMS,mBAAmB,GAAGC,MAAM,CAACC,KAAP,CAAaC,GAAb,CAAiBC,CAAC,IAAIzB,IAAI,CAACiB,IAAL,CAAUQ,CAAV,EAAaf,SAAb,CAAtB,CAA5B;MACAN,QAAQ,CAACgB,KAAT,CAAe;QACbM,EAAE,EAAG,OADQ;QAEbC,OAAO,EAAE;UACPjB,SADO;UAEPkB,cAAc,EAAErB,2BAFT;UAGPS,gBAHO;UAIPK;QAJO;MAFI,CAAf;IASD;EACF;;EAED,MAAM;IAAEQ,YAAF;IAAgBD;EAAhB,IAAmC,MAAM,IAAAE,4BAAA,EAC7ClB,QAD6C,EAE5C,eAF4C,CAA/C;EAIA,MAAMmB,KAAK,GAAG,IAAAC,4BAAA,EAAcH,YAAd,CAAd,CA5CG,CA8CH;;EACA,IAAII,WAAW,GAAGF,KAAlB;;EACA,IAAI7B,CAAC,CAACgC,UAAF,CAAaH,KAAb,CAAJ,EAAyB;IACvBE,WAAW,GAAGF,KAAK,CAACzB,SAAS,CAAC6B,OAAV,IAAqB,EAAtB,CAAnB;EACD;;EACD,OAAO;IACLzB,SADK;IAELuB,WAFK;IAGL3B,SAHK;IAILM,QAJK;IAKLwB,SAAS,EAAE3B,OALN;IAMLmB;EANK,CAAP;AAQD,CAhED,C,CAkEA;AACA;AACA;AACA;AACA;AACA;AACA;;;AACA,MAAMS,YAAY,GAAG,CACnB;EAAE3B,SAAF;EAAauB,WAAb;EAA0B3B,SAA1B;EAAqCM,QAArC;EAA+CgB;AAA/C,CADmB,EAEnB;EAAEnB;AAAF,CAFmB,KAGhB;EACH,MAAM6B,UAAU,GAAGL,WAAW,IAAIA,WAAW,CAACM,OAA9C,CADG,CAEH;EACA;EACA;;EACA,IAAIN,WAAW,IAAIK,UAAnB,EAA+B;IAC7B;IACA;IACA,OAAOrC,OAAO,CAACuC,SAAR,CAAkBF,UAAlB,EAA8B,MAAMG,IAAN,IAAc;MACjD,MAAMC,QAAQ,GAAG,MAAMrC,YAAY,CAACoC,IAAD,EAAOb,cAAP,EAAuB,KAAvB,EAA8BhB,QAA9B,CAAnC;MACA,OAAOyB,YAAY,CAACK,QAAD,EAAW;QAAEjC,OAAO,EAAEG;MAAX,CAAX,CAAnB;IACD,CAHM,EAGJ+B,IAHI,CAGCC,GAAG,IACTA,GAAG,CAACC,MAAJ,CAAW,CACT;MAAEnC,SAAF;MAAauB,WAAb;MAA0B3B,SAA1B;MAAqCM,QAArC;MAA+CwB,SAAS,EAAE3B;IAA1D,CADS,CAAX,CAJK,CAAP;EAQD,CAXD,MAWO;IACL;IACA,OAAO,CAAC;MAAEC,SAAF;MAAauB,WAAb;MAA0B3B,SAA1B;MAAqCM,QAArC;MAA+CwB,SAAS,EAAE3B;IAA1D,CAAD,CAAP;EACD;AACF,CAvBD;;AAyBAa,MAAM,CAACwB,OAAP,GAAiB,OAAOC,MAAP,EAAe;EAAEnB,cAAF;EAAkBnB;AAAlB,CAAf,KAA+C;EAC9D,MAAMuC,OAAO,GAAG,MAAM/C,OAAO,CAACuC,SAAR,CACpBO,MAAM,CAACR,OAAP,IAAkB,EADE,EAEpB,MAAMjC,SAAN,IAAmB;IACjB,MAAMoC,QAAQ,GAAG,MAAMrC,YAAY,CACjCC,SADiC,EAEjCsB,cAFiC,EAGjC,IAHiC,EAIjCnB,OAJiC,CAAnC;IAMA,OAAO4B,YAAY,CAACK,QAAD,EAAW;MAAEjC;IAAF,CAAX,CAAnB;EACD,CAVmB,EAWpBkC,IAXoB,CAWfC,GAAG,IAAI1C,CAAC,CAAC+C,WAAF,CAAcL,GAAd,CAXQ,CAAtB,CAD8D,CAc9D;;EACAzC,KAAK,CAAC6C,OAAD,CAAL,CAf8D,CAiB9D;EACA;EACA;;EACA,OACE/C,OAAO,CAACuC,SAAR,CACEQ,OADF,EAEE,CAAC;IAAEtC,SAAF;IAAauB,WAAW,GAAG,EAA3B;IAA+B3B,SAA/B;IAA0CM,QAA1C;IAAoDwB;EAApD,CAAD,KAAqE;IACnE,OAAO,EACL,GAAGH,WADE;MAELM,OAAO,EAAE,CACP,GAAG,CAACN,WAAW,CAACM,OAAZ,IAAuB,EAAxB,EAA4Bf,GAA5B,CAAgC0B,MAAM,IAAI;QAC3C,OAAO;UACLvC,OAAO,EAAE,OAAOuC,MAAP,KAAmB,QAAnB,GAA6BA,MAA7B,GAAsCA,MAAM,CAACvC,OADjD;UAELwB,OAAO,EAAEe,MAAM,CAACf,OAAP,IAAkB,EAFtB;UAGLC,SAAS,EAAExB;QAHN,CAAP;MAKD,CANE,CADI,EAQP;MACA;QAAED,OAAO,EAAED,SAAX;QAAsByB,OAAO,EAAE7B,SAAS,CAAC6B,OAAV,IAAqB,EAApD;QAAwDC;MAAxD,CATO;IAFJ,CAAP;EAcD,CAjBH;EAmBE;AACN;AACA;AACA;AACA;AACA;EAxBI,CAyBGe,MAzBH,CAyBUC,oCAzBV,EAyB6B,EAzB7B,EA0BGT,IA1BH,CA0BQU,SAAS,IAAI;IACjB,OAAO;MACLN,MAAM,EAAE,IAAAK,oCAAA,EAAkBC,SAAlB,EAA6BN,MAA7B,CADH;MAELO,MAAM,EAAEN;IAFH,CAAP;EAID,CA/BH,CADF;AAkCD,CAtDD"}
+{"version":3,"file":"index.js","names":["debug","DebugCtor","resolveTheme","themeSpec","configFileThatDeclaredTheme","isMainConfig","rootDir","themeName","resolve","themeDir","scopedRequire","createRequireFromPath","path","dirname","e","pathToLocalTheme","join","resolvePlugin","localErr","reporter","panic","nodeResolutionPaths","module","paths","map","p","id","context","configFilePath","configModule","getConfigFile","theme","preferDefault","themeConfig","options","parentDir","processTheme","themesList","plugins","mapSeries","spec","themeObj","then","arr","concat","Promise","normalizePluginEntry","plugin","loadThemes","config","themesA","reduce","mergeGatsbyConfig","newConfig","mergedConfig","themes"],"sources":["../../../src/bootstrap/load-themes/index.ts"],"sourcesContent":["import { createRequireFromPath } from \"gatsby-core-utils\"\nimport * as path from \"path\"\nimport {\n  IGatsbyConfigInput,\n  mergeGatsbyConfig,\n  PluginEntry,\n  IPluginEntryWithParentDir,\n} from \"../../utils/merge-gatsby-config\"\nimport { mapSeries } from \"bluebird\"\nimport { flattenDeep, isEqual, isFunction, uniqWith } from \"lodash\"\nimport DebugCtor from \"debug\"\nimport { preferDefault } from \"../prefer-default\"\nimport { getConfigFile } from \"../get-config-file\"\nimport { resolvePlugin } from \"../load-plugins/resolve-plugin\"\nimport reporter from \"gatsby-cli/lib/reporter\"\n\nconst debug = DebugCtor(`gatsby:load-themes`)\n\ninterface IThemeObj {\n  themeName: string\n  themeConfig: IGatsbyConfigInput\n  themeDir: string\n  themeSpec: PluginEntry\n  parentDir: string\n  configFilePath?: string\n}\n\n// get the gatsby-config file for a theme\nconst resolveTheme = async (\n  themeSpec: PluginEntry,\n  configFileThatDeclaredTheme: string | undefined,\n  isMainConfig: boolean = false,\n  rootDir: string\n): Promise<IThemeObj> => {\n  const themeName =\n    typeof themeSpec === `string` ? themeSpec : themeSpec.resolve\n  let themeDir\n  try {\n    const scopedRequire = createRequireFromPath(`${rootDir}/:internal:`)\n    // theme is an node-resolvable module\n    themeDir = path.dirname(scopedRequire.resolve(themeName))\n  } catch (e) {\n    let pathToLocalTheme\n\n    // only try to look for local theme in main site\n    // local themes nested in other themes is potential source of problems:\n    // because those are not hosted by npm, there is potential for multiple\n    // local themes with same name that do different things and name being\n    // main identifier that Gatsby uses right now, it's safer not to support it for now.\n    if (isMainConfig) {\n      pathToLocalTheme = path.join(rootDir, `plugins`, themeName)\n      // is a local plugin OR it doesn't exist\n      try {\n        const { resolve } = resolvePlugin(themeName, rootDir)\n        themeDir = resolve\n      } catch (localErr) {\n        reporter.panic(`Failed to resolve ${themeName}`, localErr)\n      }\n    }\n\n    if (!themeDir) {\n      const nodeResolutionPaths = module.paths.map(p => path.join(p, themeName))\n      reporter.panic({\n        id: `10226`,\n        context: {\n          themeName,\n          configFilePath: configFileThatDeclaredTheme,\n          pathToLocalTheme,\n          nodeResolutionPaths,\n        },\n      })\n    }\n  }\n\n  const { configModule, configFilePath } = await getConfigFile(\n    themeDir,\n    `gatsby-config`\n  )\n  const theme:\n    | IGatsbyConfigInput\n    | ((options?: Record<string, unknown>) => IGatsbyConfigInput) =\n    preferDefault(configModule)\n\n  // if theme is a function, call it with the themeConfig\n  const themeConfig = isFunction(theme)\n    ? theme(typeof themeSpec === `string` ? {} : themeSpec.options)\n    : theme\n\n  return {\n    themeName,\n    themeConfig,\n    themeSpec,\n    themeDir,\n    parentDir: rootDir,\n    configFilePath,\n  }\n}\n\n// single iteration of a recursive function that resolve parent themes\n// It's recursive because we support child themes declaring parents and\n// have to resolve all the way `up the tree` of parent/children relationships\n//\n// Theoretically, there could be an infinite loop here but in practice there is\n// no use case for a loop so I expect that to only happen if someone is very\n// off track and creating their own set of themes\nconst processTheme = (\n  { themeName, themeConfig, themeSpec, themeDir, configFilePath }: IThemeObj,\n  { rootDir }: { rootDir: string }\n): Promise<Array<IThemeObj>> => {\n  const themesList = themeConfig && themeConfig.plugins\n  // Gatsby themes don't have to specify a gatsby-config.js (they might only use gatsby-node, etc)\n  // in this case they're technically plugins, but we should support it anyway\n  // because we can't guarantee which files theme creators create first\n  if (themeConfig && themesList) {\n    // for every parent theme a theme defines, resolve the parent's\n    // gatsby config and return it in order [parentA, parentB, child]\n    return mapSeries(\n      themesList,\n      async (spec: PluginEntry): Promise<Array<IThemeObj>> => {\n        const themeObj = await resolveTheme(\n          spec,\n          configFilePath,\n          false,\n          themeDir\n        )\n        return processTheme(themeObj, { rootDir: themeDir })\n      }\n    ).then(arr =>\n      flattenDeep(\n        arr.concat([\n          { themeName, themeConfig, themeSpec, themeDir, parentDir: rootDir },\n        ])\n      )\n    )\n  } else {\n    // if a theme doesn't define additional themes, return the original theme\n    return Promise.resolve([\n      { themeName, themeConfig, themeSpec, themeDir, parentDir: rootDir },\n    ])\n  }\n}\n\nfunction normalizePluginEntry(\n  plugin: PluginEntry,\n  parentDir: string\n): IPluginEntryWithParentDir {\n  return {\n    resolve: typeof plugin === `string` ? plugin : plugin.resolve,\n    options: typeof plugin === `string` ? {} : plugin.options || {},\n    parentDir,\n  }\n}\n\nexport async function loadThemes(\n  config: IGatsbyConfigInput,\n  { configFilePath, rootDir }: { configFilePath: string; rootDir: string }\n): Promise<{\n  config: IGatsbyConfigInput\n  themes: Array<IThemeObj>\n}> {\n  const themesA = await mapSeries(\n    config.plugins || [],\n    async (themeSpec: PluginEntry) => {\n      const themeObj = await resolveTheme(\n        themeSpec,\n        configFilePath,\n        true,\n        rootDir\n      )\n      return processTheme(themeObj, { rootDir })\n    }\n  ).then(arr => flattenDeep(arr))\n\n  // log out flattened themes list to aid in debugging\n  debug(themesA)\n\n  // map over each theme, adding the theme itself to the plugins\n  // list in the config for the theme. This enables the usage of\n  // gatsby-node, etc in themes.\n  return (\n    mapSeries(\n      themesA,\n      ({ themeName, themeConfig = {}, themeSpec, themeDir, parentDir }) => {\n        return {\n          ...themeConfig,\n          plugins: [\n            ...(themeConfig.plugins || []).map(plugin =>\n              normalizePluginEntry(plugin, themeDir)\n            ),\n            // theme plugin is last so it's gatsby-node, etc can override it's declared plugins, like a normal site.\n            {\n              resolve: themeName,\n              options: typeof themeSpec === `string` ? {} : themeSpec.options,\n              parentDir,\n            },\n          ],\n        }\n      }\n    )\n      /**\n       * themes resolve to a gatsby-config, so here we merge all of the configs\n       * into a single config, making sure to maintain the order in which\n       * they were defined so that later configs, like the user's site and\n       * children, can override functionality in earlier themes.\n       */\n      .reduce(mergeGatsbyConfig, {})\n      .then(newConfig => {\n        const mergedConfig = mergeGatsbyConfig(newConfig, {\n          ...config,\n          plugins: [\n            ...(config.plugins || []).map(plugin =>\n              normalizePluginEntry(plugin, rootDir)\n            ),\n          ],\n        })\n\n        mergedConfig.plugins = uniqWith(mergedConfig.plugins, isEqual)\n\n        return {\n          config: mergedConfig,\n          themes: themesA,\n        }\n      })\n  )\n}\n"],"mappings":"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"}

package/dist/schema/graphql-engine/entry.js

@@ -71,18 +71,30 @@ class GraphQLEngine {
         payload: _queryEnginePlugins.flattenedPlugins
       });
 
-      for (const pluginName of Object.keys(_queryEnginePlugins.gatsbyNodes)) {
+      for (const plugin of _queryEnginePlugins.gatsbyNodes) {
+        const {
+          name,
+          module,
+          importKey
+        } = plugin;
         (0, _requireGatsbyPlugin.setGatsbyPluginCache)({
-          name: pluginName,
-          resolve: ``
-        }, `gatsby-node`, _queryEnginePlugins.gatsbyNodes[pluginName]);
+          name,
+          resolve: ``,
+          importKey
+        }, `gatsby-node`, module);
       }
 
-      for (const pluginName of Object.keys(_queryEnginePlugins.gatsbyWorkers)) {
+      for (const plugin of _queryEnginePlugins.gatsbyWorkers) {
+        const {
+          name,
+          module,
+          importKey
+        } = plugin;
         (0, _requireGatsbyPlugin.setGatsbyPluginCache)({
-          name: pluginName,
-          resolve: ``
-        }, `gatsby-worker`, _queryEnginePlugins.gatsbyWorkers[pluginName]);
+          name,
+          resolve: ``,
+          importKey
+        }, `gatsby-worker`, module);
       }
 
       await (0, _apiRunnerNode.default)(`onPluginInit`, {

package/dist/schema/graphql-engine/entry.js.map

@@ -1 +1 @@
-{"version":3,"file":"entry.js","names":["tracerReadyPromise","initTracer","process","env","GATSBY_OPEN_TRACING_CONFIG_FILE","GraphQLEngine","constructor","dbPath","setupLmdbStore","getRunner","_doGetRunner","wrapActivity","reporter","phantomActivity","start","store","dispatch","actions","createTypes","SCHEMA_SNAPSHOT","type","payload","flattenedPlugins","pluginName","Object","keys","gatsbyNodes","setGatsbyPluginCache","name","resolve","gatsbyWorkers","apiRunnerNode","parentSpan","span","build","fullMetadataBuild","GraphQLRunner","end","runnerPromise","ready","runQuery","query","context","opts","engineContext","requestId","uuid","v4","doRunQuery","queryName","undefined","gettingRunnerActivity","graphqlRunner","result","waitingForJobsCreatedByCurrentRequestActivity","waitJobsByRequest","runWithEngineContext","findPageByPath","pathName","state","pages","get","getDataStore","getNode","values","iterateNodesByType"],"sources":["../../../src/schema/graphql-engine/entry.ts"],"sourcesContent":["// \"bootstrap\" must be first import, as it sets up multiple globals that need to be set early\n// see details in that module\nimport \"./bootstrap\"\n\nimport { ExecutionResult, Source } from \"graphql\"\nimport { uuid } from \"gatsby-core-utils\"\nimport { build } from \"../index\"\nimport { setupLmdbStore } from \"../../datastore/lmdb/lmdb-datastore\"\nimport { store } from \"../../redux\"\nimport { actions } from \"../../redux/actions\"\nimport reporter from \"gatsby-cli/lib/reporter\"\nimport { GraphQLRunner, IQueryOptions } from \"../../query/graphql-runner\"\nimport { waitJobsByRequest } from \"../../utils/wait-until-jobs-complete\"\nimport { setGatsbyPluginCache } from \"../../utils/require-gatsby-plugin\"\nimport apiRunnerNode from \"../../utils/api-runner-node\"\nimport type { IGatsbyPage, IGatsbyState } from \"../../redux/types\"\nimport { findPageByPath } from \"../../utils/find-page-by-path\"\nimport { runWithEngineContext } from \"../../utils/engine-context\"\nimport { getDataStore } from \"../../datastore\"\nimport {\n  gatsbyNodes,\n  gatsbyWorkers,\n  flattenedPlugins,\n  // @ts-ignore\n} from \".cache/query-engine-plugins\"\nimport { initTracer } from \"../../utils/tracer\"\n\ntype MaybePhantomActivity =\n  | ReturnType<typeof reporter.phantomActivity>\n  | undefined\n\nconst tracerReadyPromise = initTracer(\n  process.env.GATSBY_OPEN_TRACING_CONFIG_FILE ?? ``\n)\n\nexport class GraphQLEngine {\n  // private schema: GraphQLSchema\n  private runnerPromise?: Promise<GraphQLRunner>\n\n  constructor({ dbPath }: { dbPath: string }) {\n    setupLmdbStore({ dbPath })\n    // start initializing runner ASAP\n    this.getRunner()\n  }\n\n  private async _doGetRunner(): Promise<GraphQLRunner> {\n    await tracerReadyPromise\n\n    const wrapActivity = reporter.phantomActivity(`Initializing GraphQL Engine`)\n    wrapActivity.start()\n    try {\n      // @ts-ignore SCHEMA_SNAPSHOT is being \"inlined\" by bundler\n      store.dispatch(actions.createTypes(SCHEMA_SNAPSHOT))\n\n      // TODO: FLATTENED_PLUGINS needs to be merged with plugin options from gatsby-config\n      //  (as there might be non-serializable options, i.e. functions)\n      store.dispatch({\n        type: `SET_SITE_FLATTENED_PLUGINS`,\n        payload: flattenedPlugins,\n      })\n\n      for (const pluginName of Object.keys(gatsbyNodes)) {\n        setGatsbyPluginCache(\n          { name: pluginName, resolve: `` },\n          `gatsby-node`,\n          gatsbyNodes[pluginName]\n        )\n      }\n      for (const pluginName of Object.keys(gatsbyWorkers)) {\n        setGatsbyPluginCache(\n          { name: pluginName, resolve: `` },\n          `gatsby-worker`,\n          gatsbyWorkers[pluginName]\n        )\n      }\n\n      await apiRunnerNode(`onPluginInit`, { parentSpan: wrapActivity.span })\n      await apiRunnerNode(`createSchemaCustomization`, {\n        parentSpan: wrapActivity.span,\n      })\n\n      // Build runs\n      // Note: skipping inference metadata because we rely on schema snapshot\n      await build({ fullMetadataBuild: false, parentSpan: wrapActivity.span })\n\n      return new GraphQLRunner(store)\n    } finally {\n      wrapActivity.end()\n    }\n  }\n\n  private async getRunner(): Promise<GraphQLRunner> {\n    if (!this.runnerPromise) {\n      this.runnerPromise = this._doGetRunner()\n    }\n    return this.runnerPromise\n  }\n\n  public async ready(): Promise<void> {\n    // We don't want to expose internal runner freely. We do expose `runQuery` function already.\n    // The way internal runner works can change, so we should not make it a public API.\n    // Here we just want to expose way to await it being ready\n    await this.getRunner()\n  }\n\n  public async runQuery(\n    query: string | Source,\n    context: Record<string, any> = {},\n    opts?: IQueryOptions\n  ): Promise<ExecutionResult> {\n    const engineContext = {\n      requestId: uuid.v4(),\n    }\n\n    const doRunQuery = async (): Promise<ExecutionResult> => {\n      if (!opts) {\n        opts = {\n          queryName: `GraphQL Engine query`,\n          parentSpan: undefined,\n        }\n      }\n\n      let gettingRunnerActivity: MaybePhantomActivity\n      let graphqlRunner: GraphQLRunner\n      try {\n        if (opts.parentSpan) {\n          gettingRunnerActivity = reporter.phantomActivity(\n            `Waiting for graphql runner to init`,\n            {\n              parentSpan: opts.parentSpan,\n            }\n          )\n          gettingRunnerActivity.start()\n        }\n        graphqlRunner = await this.getRunner()\n      } finally {\n        if (gettingRunnerActivity) {\n          gettingRunnerActivity.end()\n        }\n      }\n\n      // graphqlRunner creates it's own Span as long as we pass `parentSpan`\n      const result = await graphqlRunner.query(query, context, opts)\n\n      let waitingForJobsCreatedByCurrentRequestActivity: MaybePhantomActivity\n      try {\n        if (opts.parentSpan) {\n          waitingForJobsCreatedByCurrentRequestActivity =\n            reporter.phantomActivity(`Waiting for jobs to finish`, {\n              parentSpan: opts.parentSpan,\n            })\n          waitingForJobsCreatedByCurrentRequestActivity.start()\n        }\n        await waitJobsByRequest(engineContext.requestId)\n      } finally {\n        if (waitingForJobsCreatedByCurrentRequestActivity) {\n          waitingForJobsCreatedByCurrentRequestActivity.end()\n        }\n      }\n      return result\n    }\n\n    try {\n      return await runWithEngineContext(engineContext, doRunQuery)\n    } finally {\n      // Reset job-to-request mapping\n      store.dispatch({\n        type: `CLEAR_JOB_V2_CONTEXT`,\n        payload: engineContext,\n      })\n    }\n  }\n\n  public findPageByPath(pathName: string): IGatsbyPage | undefined {\n    // adapter so `findPageByPath` use SitePage nodes in datastore\n    // instead of `pages` redux slice\n    const state = {\n      pages: {\n        get(pathName: string): IGatsbyPage | undefined {\n          return getDataStore().getNode(`SitePage ${pathName}`) as\n            | IGatsbyPage\n            | undefined\n        },\n        values(): Iterable<IGatsbyPage> {\n          return getDataStore().iterateNodesByType(\n            `SitePage`\n          ) as Iterable<IGatsbyPage>\n        },\n      },\n    } as unknown as IGatsbyState\n\n    return findPageByPath(state, pathName, false)\n  }\n}\n\nexport default { GraphQLEngine }\n"],"mappings":"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"}
+{"version":3,"file":"entry.js","names":["tracerReadyPromise","initTracer","process","env","GATSBY_OPEN_TRACING_CONFIG_FILE","GraphQLEngine","constructor","dbPath","setupLmdbStore","getRunner","_doGetRunner","wrapActivity","reporter","phantomActivity","start","store","dispatch","actions","createTypes","SCHEMA_SNAPSHOT","type","payload","flattenedPlugins","plugin","gatsbyNodes","name","module","importKey","setGatsbyPluginCache","resolve","gatsbyWorkers","apiRunnerNode","parentSpan","span","build","fullMetadataBuild","GraphQLRunner","end","runnerPromise","ready","runQuery","query","context","opts","engineContext","requestId","uuid","v4","doRunQuery","queryName","undefined","gettingRunnerActivity","graphqlRunner","result","waitingForJobsCreatedByCurrentRequestActivity","waitJobsByRequest","runWithEngineContext","findPageByPath","pathName","state","pages","get","getDataStore","getNode","values","iterateNodesByType"],"sources":["../../../src/schema/graphql-engine/entry.ts"],"sourcesContent":["// \"bootstrap\" must be first import, as it sets up multiple globals that need to be set early\n// see details in that module\nimport \"./bootstrap\"\n\nimport { ExecutionResult, Source } from \"graphql\"\nimport { uuid } from \"gatsby-core-utils\"\nimport { build } from \"../index\"\nimport { setupLmdbStore } from \"../../datastore/lmdb/lmdb-datastore\"\nimport { store } from \"../../redux\"\nimport { actions } from \"../../redux/actions\"\nimport reporter from \"gatsby-cli/lib/reporter\"\nimport { GraphQLRunner, IQueryOptions } from \"../../query/graphql-runner\"\nimport { waitJobsByRequest } from \"../../utils/wait-until-jobs-complete\"\nimport { setGatsbyPluginCache } from \"../../utils/require-gatsby-plugin\"\nimport apiRunnerNode from \"../../utils/api-runner-node\"\nimport type { IGatsbyPage, IGatsbyState } from \"../../redux/types\"\nimport { findPageByPath } from \"../../utils/find-page-by-path\"\nimport { runWithEngineContext } from \"../../utils/engine-context\"\nimport { getDataStore } from \"../../datastore\"\nimport {\n  gatsbyNodes,\n  gatsbyWorkers,\n  flattenedPlugins,\n  // @ts-ignore\n} from \".cache/query-engine-plugins\"\nimport { initTracer } from \"../../utils/tracer\"\n\ntype MaybePhantomActivity =\n  | ReturnType<typeof reporter.phantomActivity>\n  | undefined\n\nconst tracerReadyPromise = initTracer(\n  process.env.GATSBY_OPEN_TRACING_CONFIG_FILE ?? ``\n)\n\nexport class GraphQLEngine {\n  // private schema: GraphQLSchema\n  private runnerPromise?: Promise<GraphQLRunner>\n\n  constructor({ dbPath }: { dbPath: string }) {\n    setupLmdbStore({ dbPath })\n    // start initializing runner ASAP\n    this.getRunner()\n  }\n\n  private async _doGetRunner(): Promise<GraphQLRunner> {\n    await tracerReadyPromise\n\n    const wrapActivity = reporter.phantomActivity(`Initializing GraphQL Engine`)\n    wrapActivity.start()\n    try {\n      // @ts-ignore SCHEMA_SNAPSHOT is being \"inlined\" by bundler\n      store.dispatch(actions.createTypes(SCHEMA_SNAPSHOT))\n\n      // TODO: FLATTENED_PLUGINS needs to be merged with plugin options from gatsby-config\n      //  (as there might be non-serializable options, i.e. functions)\n      store.dispatch({\n        type: `SET_SITE_FLATTENED_PLUGINS`,\n        payload: flattenedPlugins,\n      })\n\n      for (const plugin of gatsbyNodes) {\n        const { name, module, importKey } = plugin\n        setGatsbyPluginCache(\n          { name, resolve: ``, importKey },\n          `gatsby-node`,\n          module\n        )\n      }\n      for (const plugin of gatsbyWorkers) {\n        const { name, module, importKey } = plugin\n        setGatsbyPluginCache(\n          { name, resolve: ``, importKey },\n          `gatsby-worker`,\n          module\n        )\n      }\n\n      await apiRunnerNode(`onPluginInit`, { parentSpan: wrapActivity.span })\n      await apiRunnerNode(`createSchemaCustomization`, {\n        parentSpan: wrapActivity.span,\n      })\n\n      // Build runs\n      // Note: skipping inference metadata because we rely on schema snapshot\n      await build({ fullMetadataBuild: false, parentSpan: wrapActivity.span })\n\n      return new GraphQLRunner(store)\n    } finally {\n      wrapActivity.end()\n    }\n  }\n\n  private async getRunner(): Promise<GraphQLRunner> {\n    if (!this.runnerPromise) {\n      this.runnerPromise = this._doGetRunner()\n    }\n    return this.runnerPromise\n  }\n\n  public async ready(): Promise<void> {\n    // We don't want to expose internal runner freely. We do expose `runQuery` function already.\n    // The way internal runner works can change, so we should not make it a public API.\n    // Here we just want to expose way to await it being ready\n    await this.getRunner()\n  }\n\n  public async runQuery(\n    query: string | Source,\n    context: Record<string, any> = {},\n    opts?: IQueryOptions\n  ): Promise<ExecutionResult> {\n    const engineContext = {\n      requestId: uuid.v4(),\n    }\n\n    const doRunQuery = async (): Promise<ExecutionResult> => {\n      if (!opts) {\n        opts = {\n          queryName: `GraphQL Engine query`,\n          parentSpan: undefined,\n        }\n      }\n\n      let gettingRunnerActivity: MaybePhantomActivity\n      let graphqlRunner: GraphQLRunner\n      try {\n        if (opts.parentSpan) {\n          gettingRunnerActivity = reporter.phantomActivity(\n            `Waiting for graphql runner to init`,\n            {\n              parentSpan: opts.parentSpan,\n            }\n          )\n          gettingRunnerActivity.start()\n        }\n        graphqlRunner = await this.getRunner()\n      } finally {\n        if (gettingRunnerActivity) {\n          gettingRunnerActivity.end()\n        }\n      }\n\n      // graphqlRunner creates it's own Span as long as we pass `parentSpan`\n      const result = await graphqlRunner.query(query, context, opts)\n\n      let waitingForJobsCreatedByCurrentRequestActivity: MaybePhantomActivity\n      try {\n        if (opts.parentSpan) {\n          waitingForJobsCreatedByCurrentRequestActivity =\n            reporter.phantomActivity(`Waiting for jobs to finish`, {\n              parentSpan: opts.parentSpan,\n            })\n          waitingForJobsCreatedByCurrentRequestActivity.start()\n        }\n        await waitJobsByRequest(engineContext.requestId)\n      } finally {\n        if (waitingForJobsCreatedByCurrentRequestActivity) {\n          waitingForJobsCreatedByCurrentRequestActivity.end()\n        }\n      }\n      return result\n    }\n\n    try {\n      return await runWithEngineContext(engineContext, doRunQuery)\n    } finally {\n      // Reset job-to-request mapping\n      store.dispatch({\n        type: `CLEAR_JOB_V2_CONTEXT`,\n        payload: engineContext,\n      })\n    }\n  }\n\n  public findPageByPath(pathName: string): IGatsbyPage | undefined {\n    // adapter so `findPageByPath` use SitePage nodes in datastore\n    // instead of `pages` redux slice\n    const state = {\n      pages: {\n        get(pathName: string): IGatsbyPage | undefined {\n          return getDataStore().getNode(`SitePage ${pathName}`) as\n            | IGatsbyPage\n            | undefined\n        },\n        values(): Iterable<IGatsbyPage> {\n          return getDataStore().iterateNodesByType(\n            `SitePage`\n          ) as Iterable<IGatsbyPage>\n        },\n      },\n    } as unknown as IGatsbyState\n\n    return findPageByPath(state, pathName, false)\n  }\n}\n\nexport default { GraphQLEngine }\n"],"mappings":"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"}

package/dist/schema/graphql-engine/print-plugins.js

@@ -54,35 +54,35 @@ function relativePluginPath(resolve) {
 }
 
 function render(usedPlugins, usedSubPlugins) {
-  const uniqGatsbyNode = uniq(usedPlugins);
   const uniqSubPlugins = uniq(usedSubPlugins);
-  const sanitizedUsedPlugins = usedPlugins.map(plugin => {
+  const sanitizedUsedPlugins = usedPlugins.map((plugin, i) => {
     // TODO: We don't support functions in pluginOptions here
     return { ...plugin,
       resolve: ``,
       pluginFilepath: ``,
-      subPluginPaths: undefined
+      subPluginPaths: undefined,
+      importKey: i + 1
     };
   });
-  const pluginsWithWorkers = filterPluginsWithWorkers(uniqGatsbyNode);
+  const pluginsWithWorkers = filterPluginsWithWorkers(usedPlugins);
   const subPluginModuleToImportNameMapping = new Map();
-  const imports = [...uniqGatsbyNode.map((plugin, i) => `import * as pluginGatsbyNode${i} from "${relativePluginPath(plugin.resolve)}/gatsby-node"`), ...pluginsWithWorkers.map((plugin, i) => `import * as pluginGatsbyWorker${i} from "${relativePluginPath(plugin.resolve)}/gatsby-worker"`), ...uniqSubPlugins.map((plugin, i) => {
+  const imports = [...usedPlugins.map((plugin, i) => `import * as pluginGatsbyNode${i} from "${relativePluginPath(plugin.resolve)}/gatsby-node"`), ...pluginsWithWorkers.map((plugin, i) => `import * as pluginGatsbyWorker${i} from "${relativePluginPath(plugin.resolve)}/gatsby-worker"`), ...uniqSubPlugins.map((plugin, i) => {
     const importName = `subPlugin${i}`;
     subPluginModuleToImportNameMapping.set(plugin.modulePath, importName);
     return `import * as ${importName} from "${relativePluginPath(plugin.modulePath)}"`;
   })];
-  const gatsbyNodeExports = uniqGatsbyNode.map((plugin, i) => `"${plugin.name}": pluginGatsbyNode${i},`);
-  const gatsbyWorkerExports = pluginsWithWorkers.map((plugin, i) => `"${plugin.name}": pluginGatsbyWorker${i},`);
+  const gatsbyNodeExports = usedPlugins.map((plugin, i) => `{ name: "${plugin.name}", module: pluginGatsbyNode${i}, importKey: ${i + 1} },`);
+  const gatsbyWorkerExports = pluginsWithWorkers.map((plugin, i) => `{ name: "${plugin.name}", module: pluginGatsbyWorker${i}, importKey: ${i + 1} },`);
   const output = `
 ${imports.join(`\n`)}
 
-export const gatsbyNodes = {
+export const gatsbyNodes = [
 ${gatsbyNodeExports.join(`\n`)}
-}
+]
 
-export const gatsbyWorkers = {
+export const gatsbyWorkers = [
 ${gatsbyWorkerExports.join(`\n`)}
-}
+]
 
 export const flattenedPlugins =
   ${JSON.stringify(sanitizedUsedPlugins.map(plugin => {

package/dist/schema/graphql-engine/print-plugins.js.map

@@ -1 +1 @@
-{"version":3,"file":"print-plugins.js","names":["schemaCustomizationAPIs","Set","excludePlugins","includePlugins","schemaCustomizationPluginsPath","process","cwd","printQueryEnginePlugins","fs","remove","e","writeFile","renderQueryEnginePlugins","flattenedPlugins","store","getState","usedPlugins","filter","p","has","name","nodeAPIs","some","api","usedSubPlugins","findSubPlugins","render","relativePluginPath","resolve","slash","path","relative","dirname","uniqGatsbyNode","uniq","uniqSubPlugins","sanitizedUsedPlugins","map","plugin","pluginFilepath","subPluginPaths","undefined","pluginsWithWorkers","filterPluginsWithWorkers","subPluginModuleToImportNameMapping","Map","imports","i","importName","set","modulePath","gatsbyNodeExports","gatsbyWorkerExports","output","join","JSON","stringify","pluginOptions","value","module","subPlugin","get","replace","plugins","Boolean","requireGatsbyPlugin","err","getSubpluginsByPluginPath","parentPlugin","segments","split","roots","segment","flat","root","allFlattenedPlugins","usedSubPluginResolves","flatMap","subPlugins","subPluginPath","push","Array","from","values"],"sources":["../../../src/schema/graphql-engine/print-plugins.ts"],"sourcesContent":["/* eslint @typescript-eslint/no-unused-vars: [\"error\", { \"ignoreRestSiblings\": true }] */\nimport * as fs from \"fs-extra\"\nimport * as path from \"path\"\nimport * as _ from \"lodash\"\nimport { slash } from \"gatsby-core-utils\"\nimport { store } from \"../../redux\"\nimport { IGatsbyState } from \"../../redux/types\"\nimport { requireGatsbyPlugin } from \"../../utils/require-gatsby-plugin\"\n\nexport const schemaCustomizationAPIs = new Set([\n  `setFieldsOnGraphQLNodeType`,\n  `createSchemaCustomization`,\n  `createResolvers`,\n])\n\nconst excludePlugins = new Set([`internal-data-bridge`])\nconst includePlugins = new Set([`gatsby-plugin-sharp`])\n\n// Emit file that imports required node APIs\nconst schemaCustomizationPluginsPath =\n  process.cwd() + `/.cache/query-engine-plugins.js`\n\nexport async function printQueryEnginePlugins(): Promise<void> {\n  try {\n    await fs.remove(schemaCustomizationPluginsPath)\n  } catch (e) {\n    // no-op\n  }\n  return await fs.writeFile(\n    schemaCustomizationPluginsPath,\n    renderQueryEnginePlugins()\n  )\n}\n\nfunction renderQueryEnginePlugins(): string {\n  const { flattenedPlugins } = store.getState()\n  const usedPlugins = flattenedPlugins.filter(\n    p =>\n      includePlugins.has(p.name) ||\n      (!excludePlugins.has(p.name) &&\n        p.nodeAPIs.some(api => schemaCustomizationAPIs.has(api)))\n  )\n  const usedSubPlugins = findSubPlugins(usedPlugins, flattenedPlugins)\n  return render(usedPlugins, usedSubPlugins)\n}\n\nfunction relativePluginPath(resolve: string): string {\n  return slash(\n    path.relative(path.dirname(schemaCustomizationPluginsPath), resolve)\n  )\n}\n\nfunction render(\n  usedPlugins: IGatsbyState[\"flattenedPlugins\"],\n  usedSubPlugins: IGatsbyState[\"flattenedPlugins\"]\n): string {\n  const uniqGatsbyNode = uniq(usedPlugins)\n  const uniqSubPlugins = uniq(usedSubPlugins)\n\n  const sanitizedUsedPlugins = usedPlugins.map(plugin => {\n    // TODO: We don't support functions in pluginOptions here\n    return {\n      ...plugin,\n      resolve: ``,\n      pluginFilepath: ``,\n      subPluginPaths: undefined,\n    }\n  })\n\n  const pluginsWithWorkers = filterPluginsWithWorkers(uniqGatsbyNode)\n\n  const subPluginModuleToImportNameMapping = new Map<string, string>()\n  const imports: Array<string> = [\n    ...uniqGatsbyNode.map(\n      (plugin, i) =>\n        `import * as pluginGatsbyNode${i} from \"${relativePluginPath(\n          plugin.resolve\n        )}/gatsby-node\"`\n    ),\n    ...pluginsWithWorkers.map(\n      (plugin, i) =>\n        `import * as pluginGatsbyWorker${i} from \"${relativePluginPath(\n          plugin.resolve\n        )}/gatsby-worker\"`\n    ),\n    ...uniqSubPlugins.map((plugin, i) => {\n      const importName = `subPlugin${i}`\n      subPluginModuleToImportNameMapping.set(plugin.modulePath!, importName)\n      return `import * as ${importName} from \"${relativePluginPath(\n        plugin.modulePath!\n      )}\"`\n    }),\n  ]\n  const gatsbyNodeExports = uniqGatsbyNode.map(\n    (plugin, i) => `\"${plugin.name}\": pluginGatsbyNode${i},`\n  )\n  const gatsbyWorkerExports = pluginsWithWorkers.map(\n    (plugin, i) => `\"${plugin.name}\": pluginGatsbyWorker${i},`\n  )\n  const output = `\n${imports.join(`\\n`)}\n\nexport const gatsbyNodes = {\n${gatsbyNodeExports.join(`\\n`)}\n}\n\nexport const gatsbyWorkers = {\n${gatsbyWorkerExports.join(`\\n`)}\n}\n\nexport const flattenedPlugins =\n  ${JSON.stringify(\n    sanitizedUsedPlugins.map(plugin => {\n      return {\n        ...plugin,\n        pluginOptions: _.cloneDeepWith(\n          plugin.pluginOptions,\n          (value: any): any => {\n            if (\n              typeof value === `object` &&\n              value !== null &&\n              value.module &&\n              value.modulePath\n            ) {\n              const { module, modulePath, ...subPlugin } = value\n              return {\n                ...subPlugin,\n                module: `_SKIP_START_${subPluginModuleToImportNameMapping.get(\n                  modulePath\n                )}_SKIP_END_`,\n                resolve: ``,\n                pluginFilepath: ``,\n              }\n            }\n            return undefined\n          }\n        ),\n      }\n    }),\n    null,\n    2\n  ).replace(/\"_SKIP_START_|_SKIP_END_\"/g, ``)}\n`\n  return output\n}\n\nfunction filterPluginsWithWorkers(\n  plugins: IGatsbyState[\"flattenedPlugins\"]\n): IGatsbyState[\"flattenedPlugins\"] {\n  return plugins.filter(plugin => {\n    try {\n      return Boolean(requireGatsbyPlugin(plugin, `gatsby-worker`))\n    } catch (err) {\n      return false\n    }\n  })\n}\n\ntype ArrayElement<ArrayType extends Array<unknown>> = ArrayType extends Array<\n  infer ElementType\n>\n  ? ElementType\n  : never\n\nfunction getSubpluginsByPluginPath(\n  parentPlugin: ArrayElement<IGatsbyState[\"flattenedPlugins\"]>,\n  path: string\n): IGatsbyState[\"flattenedPlugins\"] {\n  const segments = path.split(`.`)\n  let roots: Array<any> = [parentPlugin.pluginOptions]\n\n  for (const segment of segments) {\n    if (segment === `[]`) {\n      roots = roots.flat()\n    } else {\n      roots = roots.map(root => root[segment])\n    }\n  }\n  roots = roots.flat()\n\n  return roots\n}\n\nfunction findSubPlugins(\n  plugins: IGatsbyState[\"flattenedPlugins\"],\n  allFlattenedPlugins: IGatsbyState[\"flattenedPlugins\"]\n): IGatsbyState[\"flattenedPlugins\"] {\n  const usedSubPluginResolves = new Set<string>(\n    plugins\n      .flatMap(plugin => {\n        if (plugin.subPluginPaths) {\n          const subPlugins: IGatsbyState[\"flattenedPlugins\"] = []\n          for (const subPluginPath of plugin.subPluginPaths) {\n            subPlugins.push(...getSubpluginsByPluginPath(plugin, subPluginPath))\n          }\n          return subPlugins\n        }\n\n        return []\n      })\n      .map(plugin => plugin[`resolve`])\n      .filter((p: unknown): p is string => typeof p === `string`)\n  )\n  return allFlattenedPlugins.filter(\n    p => usedSubPluginResolves.has(p.resolve) && !!p.modulePath\n  )\n}\n\nfunction uniq(\n  plugins: IGatsbyState[\"flattenedPlugins\"]\n): IGatsbyState[\"flattenedPlugins\"] {\n  return Array.from(new Map(plugins.map(p => [p.resolve, p])).values())\n}\n"],"mappings":"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"}
+{"version":3,"file":"print-plugins.js","names":["schemaCustomizationAPIs","Set","excludePlugins","includePlugins","schemaCustomizationPluginsPath","process","cwd","printQueryEnginePlugins","fs","remove","e","writeFile","renderQueryEnginePlugins","flattenedPlugins","store","getState","usedPlugins","filter","p","has","name","nodeAPIs","some","api","usedSubPlugins","findSubPlugins","render","relativePluginPath","resolve","slash","path","relative","dirname","uniqSubPlugins","uniq","sanitizedUsedPlugins","map","plugin","i","pluginFilepath","subPluginPaths","undefined","importKey","pluginsWithWorkers","filterPluginsWithWorkers","subPluginModuleToImportNameMapping","Map","imports","importName","set","modulePath","gatsbyNodeExports","gatsbyWorkerExports","output","join","JSON","stringify","pluginOptions","value","module","subPlugin","get","replace","plugins","Boolean","requireGatsbyPlugin","err","getSubpluginsByPluginPath","parentPlugin","segments","split","roots","segment","flat","root","allFlattenedPlugins","usedSubPluginResolves","flatMap","subPlugins","subPluginPath","push","Array","from","values"],"sources":["../../../src/schema/graphql-engine/print-plugins.ts"],"sourcesContent":["/* eslint @typescript-eslint/no-unused-vars: [\"error\", { \"ignoreRestSiblings\": true }] */\nimport * as fs from \"fs-extra\"\nimport * as path from \"path\"\nimport * as _ from \"lodash\"\nimport { slash } from \"gatsby-core-utils\"\nimport { store } from \"../../redux\"\nimport { IGatsbyState } from \"../../redux/types\"\nimport { requireGatsbyPlugin } from \"../../utils/require-gatsby-plugin\"\n\nexport const schemaCustomizationAPIs = new Set([\n  `setFieldsOnGraphQLNodeType`,\n  `createSchemaCustomization`,\n  `createResolvers`,\n])\n\nconst excludePlugins = new Set([`internal-data-bridge`])\nconst includePlugins = new Set([`gatsby-plugin-sharp`])\n\n// Emit file that imports required node APIs\nconst schemaCustomizationPluginsPath =\n  process.cwd() + `/.cache/query-engine-plugins.js`\n\nexport async function printQueryEnginePlugins(): Promise<void> {\n  try {\n    await fs.remove(schemaCustomizationPluginsPath)\n  } catch (e) {\n    // no-op\n  }\n  return await fs.writeFile(\n    schemaCustomizationPluginsPath,\n    renderQueryEnginePlugins()\n  )\n}\n\nfunction renderQueryEnginePlugins(): string {\n  const { flattenedPlugins } = store.getState()\n  const usedPlugins = flattenedPlugins.filter(\n    p =>\n      includePlugins.has(p.name) ||\n      (!excludePlugins.has(p.name) &&\n        p.nodeAPIs.some(api => schemaCustomizationAPIs.has(api)))\n  )\n  const usedSubPlugins = findSubPlugins(usedPlugins, flattenedPlugins)\n  return render(usedPlugins, usedSubPlugins)\n}\n\nfunction relativePluginPath(resolve: string): string {\n  return slash(\n    path.relative(path.dirname(schemaCustomizationPluginsPath), resolve)\n  )\n}\n\nfunction render(\n  usedPlugins: IGatsbyState[\"flattenedPlugins\"],\n  usedSubPlugins: IGatsbyState[\"flattenedPlugins\"]\n): string {\n  const uniqSubPlugins = uniq(usedSubPlugins)\n\n  const sanitizedUsedPlugins = usedPlugins.map((plugin, i) => {\n    // TODO: We don't support functions in pluginOptions here\n    return {\n      ...plugin,\n      resolve: ``,\n      pluginFilepath: ``,\n      subPluginPaths: undefined,\n      importKey: i + 1,\n    }\n  })\n\n  const pluginsWithWorkers = filterPluginsWithWorkers(usedPlugins)\n\n  const subPluginModuleToImportNameMapping = new Map<string, string>()\n  const imports: Array<string> = [\n    ...usedPlugins.map(\n      (plugin, i) =>\n        `import * as pluginGatsbyNode${i} from \"${relativePluginPath(\n          plugin.resolve\n        )}/gatsby-node\"`\n    ),\n    ...pluginsWithWorkers.map(\n      (plugin, i) =>\n        `import * as pluginGatsbyWorker${i} from \"${relativePluginPath(\n          plugin.resolve\n        )}/gatsby-worker\"`\n    ),\n    ...uniqSubPlugins.map((plugin, i) => {\n      const importName = `subPlugin${i}`\n      subPluginModuleToImportNameMapping.set(plugin.modulePath!, importName)\n      return `import * as ${importName} from \"${relativePluginPath(\n        plugin.modulePath!\n      )}\"`\n    }),\n  ]\n  const gatsbyNodeExports = usedPlugins.map(\n    (plugin, i) =>\n      `{ name: \"${plugin.name}\", module: pluginGatsbyNode${i}, importKey: ${\n        i + 1\n      } },`\n  )\n  const gatsbyWorkerExports = pluginsWithWorkers.map(\n    (plugin, i) =>\n      `{ name: \"${plugin.name}\", module: pluginGatsbyWorker${i}, importKey: ${\n        i + 1\n      } },`\n  )\n  const output = `\n${imports.join(`\\n`)}\n\nexport const gatsbyNodes = [\n${gatsbyNodeExports.join(`\\n`)}\n]\n\nexport const gatsbyWorkers = [\n${gatsbyWorkerExports.join(`\\n`)}\n]\n\nexport const flattenedPlugins =\n  ${JSON.stringify(\n    sanitizedUsedPlugins.map(plugin => {\n      return {\n        ...plugin,\n        pluginOptions: _.cloneDeepWith(\n          plugin.pluginOptions,\n          (value: any): any => {\n            if (\n              typeof value === `object` &&\n              value !== null &&\n              value.module &&\n              value.modulePath\n            ) {\n              const { module, modulePath, ...subPlugin } = value\n              return {\n                ...subPlugin,\n                module: `_SKIP_START_${subPluginModuleToImportNameMapping.get(\n                  modulePath\n                )}_SKIP_END_`,\n                resolve: ``,\n                pluginFilepath: ``,\n              }\n            }\n            return undefined\n          }\n        ),\n      }\n    }),\n    null,\n    2\n  ).replace(/\"_SKIP_START_|_SKIP_END_\"/g, ``)}\n`\n  return output\n}\n\nfunction filterPluginsWithWorkers(\n  plugins: IGatsbyState[\"flattenedPlugins\"]\n): IGatsbyState[\"flattenedPlugins\"] {\n  return plugins.filter(plugin => {\n    try {\n      return Boolean(requireGatsbyPlugin(plugin, `gatsby-worker`))\n    } catch (err) {\n      return false\n    }\n  })\n}\n\ntype ArrayElement<ArrayType extends Array<unknown>> = ArrayType extends Array<\n  infer ElementType\n>\n  ? ElementType\n  : never\n\nfunction getSubpluginsByPluginPath(\n  parentPlugin: ArrayElement<IGatsbyState[\"flattenedPlugins\"]>,\n  path: string\n): IGatsbyState[\"flattenedPlugins\"] {\n  const segments = path.split(`.`)\n  let roots: Array<any> = [parentPlugin.pluginOptions]\n\n  for (const segment of segments) {\n    if (segment === `[]`) {\n      roots = roots.flat()\n    } else {\n      roots = roots.map(root => root[segment])\n    }\n  }\n  roots = roots.flat()\n\n  return roots\n}\n\nfunction findSubPlugins(\n  plugins: IGatsbyState[\"flattenedPlugins\"],\n  allFlattenedPlugins: IGatsbyState[\"flattenedPlugins\"]\n): IGatsbyState[\"flattenedPlugins\"] {\n  const usedSubPluginResolves = new Set<string>(\n    plugins\n      .flatMap(plugin => {\n        if (plugin.subPluginPaths) {\n          const subPlugins: IGatsbyState[\"flattenedPlugins\"] = []\n          for (const subPluginPath of plugin.subPluginPaths) {\n            subPlugins.push(...getSubpluginsByPluginPath(plugin, subPluginPath))\n          }\n          return subPlugins\n        }\n\n        return []\n      })\n      .map(plugin => plugin[`resolve`])\n      .filter((p: unknown): p is string => typeof p === `string`)\n  )\n  return allFlattenedPlugins.filter(\n    p => usedSubPluginResolves.has(p.resolve) && !!p.modulePath\n  )\n}\n\nfunction uniq(\n  plugins: IGatsbyState[\"flattenedPlugins\"]\n): IGatsbyState[\"flattenedPlugins\"] {\n  return Array.from(new Map(plugins.map(p => [p.resolve, p])).values())\n}\n"],"mappings":"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"}

package/dist/schema/graphql-engine/standalone-regenerate.js

@@ -39,7 +39,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 async function run() {
-  // load config
+  process.env.GATSBY_SLICES = `1`; // load config
+
   console.log(`loading config and plugins`);
   await (0, _loadConfigAndPlugins.loadConfigAndPlugins)({
     siteDirectory: process.cwd()

package/dist/schema/graphql-engine/standalone-regenerate.js.map

@@ -1 +1 @@
-{"version":3,"file":"standalone-regenerate.js","names":["run","console","log","loadConfigAndPlugins","siteDirectory","process","cwd","fs","remove","e","state","store","getState","buildActivityTimer","reporter","activityTimer","start","Promise","all","createGraphqlEngineBundle","createPageSSRBundle","rootDir","components","staticQueriesByTemplate","webpackCompilationHash","isVerbose","program","verbose","err","panic","end","validateEnginesActivity","validateEngines","error","id","context"],"sources":["../../../src/schema/graphql-engine/standalone-regenerate.ts"],"sourcesContent":["#!/usr/bin/env node\n\n/*\nthis is used for development purposes only\nto be able to run `gatsby build` once to source data\nand print schema and then just rebundle graphql-engine\nwith source file changes and test re-built engine quickly\n\nUsage:\nThere need to be at least one successful `gatsby build`\nbefore starting to use this script (warm up datastore,\ngenerate \"page-ssr\" bundle). Once that's done you can\nrun following command in test site directory:\n\n```shell\nnode node_modules/gatsby/dist/schema/graphql-engine/standalone-regenerate.js\n```\n*/\n\nimport { createGraphqlEngineBundle } from \"./bundle-webpack\"\nimport { createPageSSRBundle } from \"./../../utils/page-ssr-module/bundle-webpack\"\nimport reporter from \"gatsby-cli/lib/reporter\"\nimport { loadConfigAndPlugins } from \"../../utils/worker/child/load-config-and-plugins\"\nimport * as fs from \"fs-extra\"\nimport { store } from \"../../redux\"\nimport { validateEngines } from \"../../utils/validate-engines\"\n\nasync function run(): Promise<void> {\n  // load config\n  console.log(`loading config and plugins`)\n  await loadConfigAndPlugins({\n    siteDirectory: process.cwd(),\n  })\n\n  try {\n    console.log(`clearing webpack cache\\n\\n`)\n    // get rid of cache if it exist\n    await fs.remove(process.cwd() + `/.cache/webpack/query-engine`)\n    await fs.remove(process.cwd() + `/.cache/webpack/page-ssr`)\n  } catch (e) {\n    // eslint-disable no-empty\n  }\n\n  const state = store.getState()\n\n  // recompile\n  const buildActivityTimer = reporter.activityTimer(\n    `Building Rendering Engines`\n  )\n  try {\n    buildActivityTimer.start()\n    await Promise.all([\n      createGraphqlEngineBundle(process.cwd(), reporter, true),\n      createPageSSRBundle({\n        rootDir: process.cwd(),\n        components: store.getState().components,\n        staticQueriesByTemplate: state.staticQueriesByTemplate,\n        webpackCompilationHash: state.webpackCompilationHash, // we set webpackCompilationHash above\n        reporter,\n        isVerbose: state.program.verbose,\n      }),\n    ])\n  } catch (err) {\n    buildActivityTimer.panic(err)\n  } finally {\n    buildActivityTimer.end()\n  }\n\n  // validate\n  const validateEnginesActivity = reporter.activityTimer(\n    `Validating Rendering Engines`\n  )\n  validateEnginesActivity.start()\n  try {\n    await validateEngines(process.cwd())\n  } catch (error) {\n    validateEnginesActivity.panic({ id: `98001`, context: {}, error })\n  } finally {\n    validateEnginesActivity.end()\n  }\n\n  console.log(`DONE`)\n}\n\nrun()\n"],"mappings":"AAAA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;AAEA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;AAEA,eAAeA,GAAf,GAAoC;EAClC;EACAC,OAAO,CAACC,GAAR,CAAa,4BAAb;EACA,MAAM,IAAAC,0CAAA,EAAqB;IACzBC,aAAa,EAAEC,OAAO,CAACC,GAAR;EADU,CAArB,CAAN;;EAIA,IAAI;IACFL,OAAO,CAACC,GAAR,CAAa,4BAAb,EADE,CAEF;;IACA,MAAMK,EAAE,CAACC,MAAH,CAAUH,OAAO,CAACC,GAAR,KAAiB,8BAA3B,CAAN;IACA,MAAMC,EAAE,CAACC,MAAH,CAAUH,OAAO,CAACC,GAAR,KAAiB,0BAA3B,CAAN;EACD,CALD,CAKE,OAAOG,CAAP,EAAU,CACV;EACD;;EAED,MAAMC,KAAK,GAAGC,YAAA,CAAMC,QAAN,EAAd,CAhBkC,CAkBlC;;;EACA,MAAMC,kBAAkB,GAAGC,iBAAA,CAASC,aAAT,CACxB,4BADwB,CAA3B;;EAGA,IAAI;IACFF,kBAAkB,CAACG,KAAnB;IACA,MAAMC,OAAO,CAACC,GAAR,CAAY,CAChB,IAAAC,wCAAA,EAA0Bd,OAAO,CAACC,GAAR,EAA1B,EAAyCQ,iBAAzC,EAAmD,IAAnD,CADgB,EAEhB,IAAAM,mCAAA,EAAoB;MAClBC,OAAO,EAAEhB,OAAO,CAACC,GAAR,EADS;MAElBgB,UAAU,EAAEX,YAAA,CAAMC,QAAN,GAAiBU,UAFX;MAGlBC,uBAAuB,EAAEb,KAAK,CAACa,uBAHb;MAIlBC,sBAAsB,EAAEd,KAAK,CAACc,sBAJZ;MAIoC;MACtDV,QAAQ,EAARA,iBALkB;MAMlBW,SAAS,EAAEf,KAAK,CAACgB,OAAN,CAAcC;IANP,CAApB,CAFgB,CAAZ,CAAN;EAWD,CAbD,CAaE,OAAOC,GAAP,EAAY;IACZf,kBAAkB,CAACgB,KAAnB,CAAyBD,GAAzB;EACD,CAfD,SAeU;IACRf,kBAAkB,CAACiB,GAAnB;EACD,CAvCiC,CAyClC;;;EACA,MAAMC,uBAAuB,GAAGjB,iBAAA,CAASC,aAAT,CAC7B,8BAD6B,CAAhC;;EAGAgB,uBAAuB,CAACf,KAAxB;;EACA,IAAI;IACF,MAAM,IAAAgB,gCAAA,EAAgB3B,OAAO,CAACC,GAAR,EAAhB,CAAN;EACD,CAFD,CAEE,OAAO2B,KAAP,EAAc;IACdF,uBAAuB,CAACF,KAAxB,CAA8B;MAAEK,EAAE,EAAG,OAAP;MAAeC,OAAO,EAAE,EAAxB;MAA4BF;IAA5B,CAA9B;EACD,CAJD,SAIU;IACRF,uBAAuB,CAACD,GAAxB;EACD;;EAED7B,OAAO,CAACC,GAAR,CAAa,MAAb;AACD;;AAEDF,GAAG"}
+{"version":3,"file":"standalone-regenerate.js","names":["run","process","env","GATSBY_SLICES","console","log","loadConfigAndPlugins","siteDirectory","cwd","fs","remove","e","state","store","getState","buildActivityTimer","reporter","activityTimer","start","Promise","all","createGraphqlEngineBundle","createPageSSRBundle","rootDir","components","staticQueriesByTemplate","webpackCompilationHash","isVerbose","program","verbose","err","panic","end","validateEnginesActivity","validateEngines","error","id","context"],"sources":["../../../src/schema/graphql-engine/standalone-regenerate.ts"],"sourcesContent":["#!/usr/bin/env node\n\n/*\nthis is used for development purposes only\nto be able to run `gatsby build` once to source data\nand print schema and then just rebundle graphql-engine\nwith source file changes and test re-built engine quickly\n\nUsage:\nThere need to be at least one successful `gatsby build`\nbefore starting to use this script (warm up datastore,\ngenerate \"page-ssr\" bundle). Once that's done you can\nrun following command in test site directory:\n\n```shell\nnode node_modules/gatsby/dist/schema/graphql-engine/standalone-regenerate.js\n```\n*/\n\nimport { createGraphqlEngineBundle } from \"./bundle-webpack\"\nimport { createPageSSRBundle } from \"./../../utils/page-ssr-module/bundle-webpack\"\nimport reporter from \"gatsby-cli/lib/reporter\"\nimport { loadConfigAndPlugins } from \"../../utils/worker/child/load-config-and-plugins\"\nimport * as fs from \"fs-extra\"\nimport { store } from \"../../redux\"\nimport { validateEngines } from \"../../utils/validate-engines\"\n\nasync function run(): Promise<void> {\n  process.env.GATSBY_SLICES = `1`\n  // load config\n  console.log(`loading config and plugins`)\n  await loadConfigAndPlugins({\n    siteDirectory: process.cwd(),\n  })\n\n  try {\n    console.log(`clearing webpack cache\\n\\n`)\n    // get rid of cache if it exist\n    await fs.remove(process.cwd() + `/.cache/webpack/query-engine`)\n    await fs.remove(process.cwd() + `/.cache/webpack/page-ssr`)\n  } catch (e) {\n    // eslint-disable no-empty\n  }\n\n  const state = store.getState()\n\n  // recompile\n  const buildActivityTimer = reporter.activityTimer(\n    `Building Rendering Engines`\n  )\n  try {\n    buildActivityTimer.start()\n    await Promise.all([\n      createGraphqlEngineBundle(process.cwd(), reporter, true),\n      createPageSSRBundle({\n        rootDir: process.cwd(),\n        components: store.getState().components,\n        staticQueriesByTemplate: state.staticQueriesByTemplate,\n        webpackCompilationHash: state.webpackCompilationHash, // we set webpackCompilationHash above\n        reporter,\n        isVerbose: state.program.verbose,\n      }),\n    ])\n  } catch (err) {\n    buildActivityTimer.panic(err)\n  } finally {\n    buildActivityTimer.end()\n  }\n\n  // validate\n  const validateEnginesActivity = reporter.activityTimer(\n    `Validating Rendering Engines`\n  )\n  validateEnginesActivity.start()\n  try {\n    await validateEngines(process.cwd())\n  } catch (error) {\n    validateEnginesActivity.panic({ id: `98001`, context: {}, error })\n  } finally {\n    validateEnginesActivity.end()\n  }\n\n  console.log(`DONE`)\n}\n\nrun()\n"],"mappings":"AAAA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;;;;AAEA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;AAEA,eAAeA,GAAf,GAAoC;EAClCC,OAAO,CAACC,GAAR,CAAYC,aAAZ,GAA6B,GAA7B,CADkC,CAElC;;EACAC,OAAO,CAACC,GAAR,CAAa,4BAAb;EACA,MAAM,IAAAC,0CAAA,EAAqB;IACzBC,aAAa,EAAEN,OAAO,CAACO,GAAR;EADU,CAArB,CAAN;;EAIA,IAAI;IACFJ,OAAO,CAACC,GAAR,CAAa,4BAAb,EADE,CAEF;;IACA,MAAMI,EAAE,CAACC,MAAH,CAAUT,OAAO,CAACO,GAAR,KAAiB,8BAA3B,CAAN;IACA,MAAMC,EAAE,CAACC,MAAH,CAAUT,OAAO,CAACO,GAAR,KAAiB,0BAA3B,CAAN;EACD,CALD,CAKE,OAAOG,CAAP,EAAU,CACV;EACD;;EAED,MAAMC,KAAK,GAAGC,YAAA,CAAMC,QAAN,EAAd,CAjBkC,CAmBlC;;;EACA,MAAMC,kBAAkB,GAAGC,iBAAA,CAASC,aAAT,CACxB,4BADwB,CAA3B;;EAGA,IAAI;IACFF,kBAAkB,CAACG,KAAnB;IACA,MAAMC,OAAO,CAACC,GAAR,CAAY,CAChB,IAAAC,wCAAA,EAA0BpB,OAAO,CAACO,GAAR,EAA1B,EAAyCQ,iBAAzC,EAAmD,IAAnD,CADgB,EAEhB,IAAAM,mCAAA,EAAoB;MAClBC,OAAO,EAAEtB,OAAO,CAACO,GAAR,EADS;MAElBgB,UAAU,EAAEX,YAAA,CAAMC,QAAN,GAAiBU,UAFX;MAGlBC,uBAAuB,EAAEb,KAAK,CAACa,uBAHb;MAIlBC,sBAAsB,EAAEd,KAAK,CAACc,sBAJZ;MAIoC;MACtDV,QAAQ,EAARA,iBALkB;MAMlBW,SAAS,EAAEf,KAAK,CAACgB,OAAN,CAAcC;IANP,CAApB,CAFgB,CAAZ,CAAN;EAWD,CAbD,CAaE,OAAOC,GAAP,EAAY;IACZf,kBAAkB,CAACgB,KAAnB,CAAyBD,GAAzB;EACD,CAfD,SAeU;IACRf,kBAAkB,CAACiB,GAAnB;EACD,CAxCiC,CA0ClC;;;EACA,MAAMC,uBAAuB,GAAGjB,iBAAA,CAASC,aAAT,CAC7B,8BAD6B,CAAhC;;EAGAgB,uBAAuB,CAACf,KAAxB;;EACA,IAAI;IACF,MAAM,IAAAgB,gCAAA,EAAgBjC,OAAO,CAACO,GAAR,EAAhB,CAAN;EACD,CAFD,CAEE,OAAO2B,KAAP,EAAc;IACdF,uBAAuB,CAACF,KAAxB,CAA8B;MAAEK,EAAE,EAAG,OAAP;MAAeC,OAAO,EAAE,EAAxB;MAA4BF;IAA5B,CAA9B;EACD,CAJD,SAIU;IACRF,uBAAuB,CAACD,GAAxB;EACD;;EAED5B,OAAO,CAACC,GAAR,CAAa,MAAb;AACD;;AAEDL,GAAG"}

package/dist/utils/merge-gatsby-config.d.ts

@@ -1,10 +1,12 @@
 import { Express } from "express";
 import type { TrailingSlash } from "gatsby-page-utils";
-declare type PluginEntry = string | {
+export interface IPluginEntryWithParentDir {
     resolve: string;
     options?: Record<string, unknown>;
-};
-interface IGatsbyConfigInput {
+    parentDir: string;
+}
+export declare type PluginEntry = string | IPluginEntryWithParentDir;
+export interface IGatsbyConfigInput {
     siteMetadata?: Record<string, unknown>;
     plugins?: Array<PluginEntry>;
     pathPrefix?: string;
@@ -24,4 +26,3 @@ interface IGatsbyConfigInput {
  * Defines how a theme object is merged with the user's config
  */
 export declare const mergeGatsbyConfig: (a: IGatsbyConfigInput, b: IGatsbyConfigInput) => IGatsbyConfigInput;
-export {};

package/dist/utils/merge-gatsby-config.js

@@ -7,33 +7,8 @@ exports.mergeGatsbyConfig = void 0;
 
 var _uniq2 = _interopRequireDefault(require("lodash/uniq"));
 
-var _pick2 = _interopRequireDefault(require("lodash/pick"));
-
-var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
-
-var _uniqWith2 = _interopRequireDefault(require("lodash/uniqWith"));
-
 var _merge2 = _interopRequireDefault(require("lodash/merge"));
 
-var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
-
-var _isString2 = _interopRequireDefault(require("lodash/isString"));
-
-/**
- * Normalize plugin spec before comparing so
- *  - `gatsby-plugin-name`
- *  - { resolve: `gatsby-plugin-name` }
- *  - { resolve: `gatsby-plugin-name`, options: {} }
- * are all considered equal
- */
-const normalizePluginEntry = entry => (0, _isString2.default)(entry) ? {
-  resolve: entry,
-  options: {}
-} : (0, _isObject2.default)(entry) ? {
-  options: {},
-  ...entry
-} : entry;
-
 const howToMerge = {
   /**
    * pick a truthy value by default.
@@ -43,7 +18,7 @@ const howToMerge = {
   byDefault: (a, b) => b || a,
   siteMetadata: (objA, objB) => (0, _merge2.default)({}, objA, objB),
   // plugins are concatenated and uniq'd, so we don't get two of the same plugin value
-  plugins: (a = [], b = []) => (0, _uniqWith2.default)(a.concat(b), (a, b) => (0, _isEqual2.default)((0, _pick2.default)(normalizePluginEntry(a), [`resolve`, `options`]), (0, _pick2.default)(normalizePluginEntry(b), [`resolve`, `options`]))),
+  plugins: (a = [], b = []) => a.concat(b),
   mapping: (objA, objB) => (0, _merge2.default)({}, objA, objB)
 };
 /**

package/dist/utils/merge-gatsby-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge-gatsby-config.js","names":["normalizePluginEntry","entry","resolve","options","howToMerge","byDefault","a","b","siteMetadata","objA","objB","plugins","concat","mapping","mergeGatsbyConfig","allGatsbyConfigKeysWithAValue","Object","keys","mergedConfig","reduce","config","gatsbyConfigKey","mergeFn"],"sources":["../../src/utils/merge-gatsby-config.ts"],"sourcesContent":["import _ from \"lodash\"\nimport { Express } from \"express\"\nimport type { TrailingSlash } from \"gatsby-page-utils\"\n// TODO export it in index.d.ts\ntype PluginEntry =\n  | string\n  | {\n      resolve: string\n      options?: Record<string, unknown>\n    }\n\ninterface INormalizedPluginEntry {\n  resolve: string\n  options: Record<string, unknown>\n}\n\ninterface IGatsbyConfigInput {\n  siteMetadata?: Record<string, unknown>\n  plugins?: Array<PluginEntry>\n  pathPrefix?: string\n  assetPrefix?: string\n  polyfill?: boolean\n  mapping?: Record<string, string>\n  proxy?: {\n    prefix: string\n    url: string\n  }\n  developMiddleware?(app: Express): void\n  jsxRuntime?: \"classic\" | \"automatic\"\n  jsxImportSource?: string\n  trailingSlash?: TrailingSlash\n}\n\ntype ConfigKey = keyof IGatsbyConfigInput\ntype Metadata = IGatsbyConfigInput[\"siteMetadata\"]\ntype Mapping = IGatsbyConfigInput[\"mapping\"]\n\n/**\n * Normalize plugin spec before comparing so\n *  - `gatsby-plugin-name`\n *  - { resolve: `gatsby-plugin-name` }\n *  - { resolve: `gatsby-plugin-name`, options: {} }\n * are all considered equal\n */\nconst normalizePluginEntry = (entry: PluginEntry): INormalizedPluginEntry =>\n  _.isString(entry)\n    ? {\n        resolve: entry,\n        options: {},\n      }\n    : _.isObject(entry)\n    ? { options: {}, ...entry }\n    : entry\n\nconst howToMerge = {\n  /**\n   * pick a truthy value by default.\n   * This makes sure that if a single value is defined, that one it used.\n   * We prefer the \"right\" value, because the user's config will be \"on the right\"\n   */\n  byDefault: (a: ConfigKey, b: ConfigKey): ConfigKey => b || a,\n  siteMetadata: (objA: Metadata, objB: Metadata): Metadata =>\n    _.merge({}, objA, objB),\n  // plugins are concatenated and uniq'd, so we don't get two of the same plugin value\n  plugins: (\n    a: Array<PluginEntry> = [],\n    b: Array<PluginEntry> = []\n  ): Array<PluginEntry> =>\n    _.uniqWith(a.concat(b), (a, b) =>\n      _.isEqual(\n        _.pick(normalizePluginEntry(a), [`resolve`, `options`]),\n        _.pick(normalizePluginEntry(b), [`resolve`, `options`])\n      )\n    ),\n  mapping: (objA: Mapping, objB: Mapping): Mapping => _.merge({}, objA, objB),\n} as const\n\n/**\n * Defines how a theme object is merged with the user's config\n */\nexport const mergeGatsbyConfig = (\n  a: IGatsbyConfigInput,\n  b: IGatsbyConfigInput\n): IGatsbyConfigInput => {\n  // a and b are gatsby configs, If they have keys, that means there are values to merge\n  const allGatsbyConfigKeysWithAValue = _.uniq(\n    Object.keys(a).concat(Object.keys(b))\n  ) as Array<ConfigKey>\n\n  // reduce the array of mergable keys into a single gatsby config object\n  const mergedConfig = allGatsbyConfigKeysWithAValue.reduce(\n    (config, gatsbyConfigKey) => {\n      // choose a merge function for the config key if there's one defined,\n      // otherwise use the default value merge function\n      const mergeFn = howToMerge[gatsbyConfigKey] || howToMerge.byDefault\n      return {\n        ...config,\n        [gatsbyConfigKey]: mergeFn(a[gatsbyConfigKey], b[gatsbyConfigKey]),\n      }\n    },\n    {} as IGatsbyConfigInput\n  )\n\n  // return the fully merged config\n  return mergedConfig\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAqCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMA,oBAAoB,GAAIC,KAAD,IAC3B,wBAAWA,KAAX,IACI;EACEC,OAAO,EAAED,KADX;EAEEE,OAAO,EAAE;AAFX,CADJ,GAKI,wBAAWF,KAAX,IACA;EAAEE,OAAO,EAAE,EAAX;EAAe,GAAGF;AAAlB,CADA,GAEAA,KARN;;AAUA,MAAMG,UAAU,GAAG;EACjB;AACF;AACA;AACA;AACA;EACEC,SAAS,EAAE,CAACC,CAAD,EAAeC,CAAf,KAA2CA,CAAC,IAAID,CAN1C;EAOjBE,YAAY,EAAE,CAACC,IAAD,EAAiBC,IAAjB,KACZ,qBAAQ,EAAR,EAAYD,IAAZ,EAAkBC,IAAlB,CARe;EASjB;EACAC,OAAO,EAAE,CACPL,CAAqB,GAAG,EADjB,EAEPC,CAAqB,GAAG,EAFjB,KAIP,wBAAWD,CAAC,CAACM,MAAF,CAASL,CAAT,CAAX,EAAwB,CAACD,CAAD,EAAIC,CAAJ,KACtB,uBACE,oBAAOP,oBAAoB,CAACM,CAAD,CAA3B,EAAgC,CAAE,SAAF,EAAa,SAAb,CAAhC,CADF,EAEE,oBAAON,oBAAoB,CAACO,CAAD,CAA3B,EAAgC,CAAE,SAAF,EAAa,SAAb,CAAhC,CAFF,CADF,CAde;EAoBjBM,OAAO,EAAE,CAACJ,IAAD,EAAgBC,IAAhB,KAA2C,qBAAQ,EAAR,EAAYD,IAAZ,EAAkBC,IAAlB;AApBnC,CAAnB;AAuBA;AACA;AACA;;AACO,MAAMI,iBAAiB,GAAG,CAC/BR,CAD+B,EAE/BC,CAF+B,KAGR;EACvB;EACA,MAAMQ,6BAA6B,GAAG,oBACpCC,MAAM,CAACC,IAAP,CAAYX,CAAZ,EAAeM,MAAf,CAAsBI,MAAM,CAACC,IAAP,CAAYV,CAAZ,CAAtB,CADoC,CAAtC,CAFuB,CAMvB;;EACA,MAAMW,YAAY,GAAGH,6BAA6B,CAACI,MAA9B,CACnB,CAACC,MAAD,EAASC,eAAT,KAA6B;IAC3B;IACA;IACA,MAAMC,OAAO,GAAGlB,UAAU,CAACiB,eAAD,CAAV,IAA+BjB,UAAU,CAACC,SAA1D;IACA,OAAO,EACL,GAAGe,MADE;MAEL,CAACC,eAAD,GAAmBC,OAAO,CAAChB,CAAC,CAACe,eAAD,CAAF,EAAqBd,CAAC,CAACc,eAAD,CAAtB;IAFrB,CAAP;EAID,CATkB,EAUnB,EAVmB,CAArB,CAPuB,CAoBvB;;EACA,OAAOH,YAAP;AACD,CAzBM"}
+{"version":3,"file":"merge-gatsby-config.js","names":["howToMerge","byDefault","a","b","siteMetadata","objA","objB","plugins","concat","mapping","mergeGatsbyConfig","allGatsbyConfigKeysWithAValue","Object","keys","mergedConfig","reduce","config","gatsbyConfigKey","mergeFn"],"sources":["../../src/utils/merge-gatsby-config.ts"],"sourcesContent":["import _ from \"lodash\"\nimport { Express } from \"express\"\nimport type { TrailingSlash } from \"gatsby-page-utils\"\n\nexport interface IPluginEntryWithParentDir {\n  resolve: string\n  options?: Record<string, unknown>\n  parentDir: string\n}\n// TODO export it in index.d.ts\nexport type PluginEntry = string | IPluginEntryWithParentDir\n\nexport interface IGatsbyConfigInput {\n  siteMetadata?: Record<string, unknown>\n  plugins?: Array<PluginEntry>\n  pathPrefix?: string\n  assetPrefix?: string\n  polyfill?: boolean\n  mapping?: Record<string, string>\n  proxy?: {\n    prefix: string\n    url: string\n  }\n  developMiddleware?(app: Express): void\n  jsxRuntime?: \"classic\" | \"automatic\"\n  jsxImportSource?: string\n  trailingSlash?: TrailingSlash\n}\n\ntype ConfigKey = keyof IGatsbyConfigInput\ntype Metadata = IGatsbyConfigInput[\"siteMetadata\"]\ntype Mapping = IGatsbyConfigInput[\"mapping\"]\n\nconst howToMerge = {\n  /**\n   * pick a truthy value by default.\n   * This makes sure that if a single value is defined, that one it used.\n   * We prefer the \"right\" value, because the user's config will be \"on the right\"\n   */\n  byDefault: (a: ConfigKey, b: ConfigKey): ConfigKey => b || a,\n  siteMetadata: (objA: Metadata, objB: Metadata): Metadata =>\n    _.merge({}, objA, objB),\n  // plugins are concatenated and uniq'd, so we don't get two of the same plugin value\n  plugins: (\n    a: Array<PluginEntry> = [],\n    b: Array<PluginEntry> = []\n  ): Array<PluginEntry> => a.concat(b),\n  mapping: (objA: Mapping, objB: Mapping): Mapping => _.merge({}, objA, objB),\n} as const\n\n/**\n * Defines how a theme object is merged with the user's config\n */\nexport const mergeGatsbyConfig = (\n  a: IGatsbyConfigInput,\n  b: IGatsbyConfigInput\n): IGatsbyConfigInput => {\n  // a and b are gatsby configs, If they have keys, that means there are values to merge\n  const allGatsbyConfigKeysWithAValue = _.uniq(\n    Object.keys(a).concat(Object.keys(b))\n  ) as Array<ConfigKey>\n\n  // reduce the array of mergable keys into a single gatsby config object\n  const mergedConfig = allGatsbyConfigKeysWithAValue.reduce(\n    (config, gatsbyConfigKey) => {\n      // choose a merge function for the config key if there's one defined,\n      // otherwise use the default value merge function\n      const mergeFn = howToMerge[gatsbyConfigKey] || howToMerge.byDefault\n      return {\n        ...config,\n        [gatsbyConfigKey]: mergeFn(a[gatsbyConfigKey], b[gatsbyConfigKey]),\n      }\n    },\n    {} as IGatsbyConfigInput\n  )\n\n  // return the fully merged config\n  return mergedConfig\n}\n"],"mappings":";;;;;;;;;;;AAiCA,MAAMA,UAAU,GAAG;EACjB;AACF;AACA;AACA;AACA;EACEC,SAAS,EAAE,CAACC,CAAD,EAAeC,CAAf,KAA2CA,CAAC,IAAID,CAN1C;EAOjBE,YAAY,EAAE,CAACC,IAAD,EAAiBC,IAAjB,KACZ,qBAAQ,EAAR,EAAYD,IAAZ,EAAkBC,IAAlB,CARe;EASjB;EACAC,OAAO,EAAE,CACPL,CAAqB,GAAG,EADjB,EAEPC,CAAqB,GAAG,EAFjB,KAGgBD,CAAC,CAACM,MAAF,CAASL,CAAT,CAbR;EAcjBM,OAAO,EAAE,CAACJ,IAAD,EAAgBC,IAAhB,KAA2C,qBAAQ,EAAR,EAAYD,IAAZ,EAAkBC,IAAlB;AAdnC,CAAnB;AAiBA;AACA;AACA;;AACO,MAAMI,iBAAiB,GAAG,CAC/BR,CAD+B,EAE/BC,CAF+B,KAGR;EACvB;EACA,MAAMQ,6BAA6B,GAAG,oBACpCC,MAAM,CAACC,IAAP,CAAYX,CAAZ,EAAeM,MAAf,CAAsBI,MAAM,CAACC,IAAP,CAAYV,CAAZ,CAAtB,CADoC,CAAtC,CAFuB,CAMvB;;EACA,MAAMW,YAAY,GAAGH,6BAA6B,CAACI,MAA9B,CACnB,CAACC,MAAD,EAASC,eAAT,KAA6B;IAC3B;IACA;IACA,MAAMC,OAAO,GAAGlB,UAAU,CAACiB,eAAD,CAAV,IAA+BjB,UAAU,CAACC,SAA1D;IACA,OAAO,EACL,GAAGe,MADE;MAEL,CAACC,eAAD,GAAmBC,OAAO,CAAChB,CAAC,CAACe,eAAD,CAAF,EAAqBd,CAAC,CAACc,eAAD,CAAtB;IAFrB,CAAP;EAID,CATkB,EAUnB,EAVmB,CAArB,CAPuB,CAoBvB;;EACA,OAAOH,YAAP;AACD,CAzBM"}

package/dist/utils/require-gatsby-plugin.d.ts

@@ -1,9 +1,11 @@
 export declare function setGatsbyPluginCache(plugin: {
     name: string;
     resolve: string;
+    importKey?: string;
 }, module: string, moduleObject: any): void;
 export declare function requireGatsbyPlugin(plugin: {
     name: string;
     resolve: string;
     resolvedCompiledGatsbyNode?: string;
+    importKey?: string;
 }, module: string): any;

package/dist/utils/require-gatsby-plugin.js

@@ -8,10 +8,16 @@ const pluginModuleCache = new Map();
 function setGatsbyPluginCache(plugin, module, moduleObject) {
   const key = `${plugin.name}/${module}`;
   pluginModuleCache.set(key, moduleObject);
+  const additionalPrefix = plugin.importKey || plugin.resolve;
+
+  if (additionalPrefix) {
+    const key = `${additionalPrefix}/${module}`;
+    pluginModuleCache.set(key, moduleObject);
+  }
 }
 
 function requireGatsbyPlugin(plugin, module) {
-  const key = `${plugin.name}/${module}`;
+  const key = `${plugin.importKey || plugin.resolve || plugin.name}/${module}`;
   let pluginModule = pluginModuleCache.get(key);
 
   if (!pluginModule) {

package/dist/utils/require-gatsby-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"require-gatsby-plugin.js","names":["pluginModuleCache","Map","setGatsbyPluginCache","plugin","module","moduleObject","key","name","set","requireGatsbyPlugin","pluginModule","get","require","resolvedCompiledGatsbyNode","resolve"],"sources":["../../src/utils/require-gatsby-plugin.ts"],"sourcesContent":["const pluginModuleCache = new Map<string, any>()\n\nexport function setGatsbyPluginCache(\n  plugin: { name: string; resolve: string },\n  module: string,\n  moduleObject: any\n): void {\n  const key = `${plugin.name}/${module}`\n  pluginModuleCache.set(key, moduleObject)\n}\n\nexport function requireGatsbyPlugin(\n  plugin: {\n    name: string\n    resolve: string\n    resolvedCompiledGatsbyNode?: string\n  },\n  module: string\n): any {\n  const key = `${plugin.name}/${module}`\n\n  let pluginModule = pluginModuleCache.get(key)\n  if (!pluginModule) {\n    pluginModule = require(module === `gatsby-node` &&\n      plugin.resolvedCompiledGatsbyNode\n      ? plugin.resolvedCompiledGatsbyNode\n      : `${plugin.resolve}/${module}`)\n    pluginModuleCache.set(key, pluginModule)\n  }\n  return pluginModule\n}\n"],"mappings":";;;;;AAAA,MAAMA,iBAAiB,GAAG,IAAIC,GAAJ,EAA1B;;AAEO,SAASC,oBAAT,CACLC,MADK,EAELC,MAFK,EAGLC,YAHK,EAIC;EACN,MAAMC,GAAG,GAAI,GAAEH,MAAM,CAACI,IAAK,IAAGH,MAAO,EAArC;EACAJ,iBAAiB,CAACQ,GAAlB,CAAsBF,GAAtB,EAA2BD,YAA3B;AACD;;AAEM,SAASI,mBAAT,CACLN,MADK,EAMLC,MANK,EAOA;EACL,MAAME,GAAG,GAAI,GAAEH,MAAM,CAACI,IAAK,IAAGH,MAAO,EAArC;EAEA,IAAIM,YAAY,GAAGV,iBAAiB,CAACW,GAAlB,CAAsBL,GAAtB,CAAnB;;EACA,IAAI,CAACI,YAAL,EAAmB;IACjBA,YAAY,GAAGE,OAAO,CAACR,MAAM,KAAM,aAAZ,IACrBD,MAAM,CAACU,0BADc,GAEnBV,MAAM,CAACU,0BAFY,GAGlB,GAAEV,MAAM,CAACW,OAAQ,IAAGV,MAAO,EAHV,CAAtB;IAIAJ,iBAAiB,CAACQ,GAAlB,CAAsBF,GAAtB,EAA2BI,YAA3B;EACD;;EACD,OAAOA,YAAP;AACD"}
+{"version":3,"file":"require-gatsby-plugin.js","names":["pluginModuleCache","Map","setGatsbyPluginCache","plugin","module","moduleObject","key","name","set","additionalPrefix","importKey","resolve","requireGatsbyPlugin","pluginModule","get","require","resolvedCompiledGatsbyNode"],"sources":["../../src/utils/require-gatsby-plugin.ts"],"sourcesContent":["const pluginModuleCache = new Map<string, any>()\n\nexport function setGatsbyPluginCache(\n  plugin: { name: string; resolve: string; importKey?: string },\n  module: string,\n  moduleObject: any\n): void {\n  const key = `${plugin.name}/${module}`\n  pluginModuleCache.set(key, moduleObject)\n\n  const additionalPrefix = plugin.importKey || plugin.resolve\n  if (additionalPrefix) {\n    const key = `${additionalPrefix}/${module}`\n    pluginModuleCache.set(key, moduleObject)\n  }\n}\n\nexport function requireGatsbyPlugin(\n  plugin: {\n    name: string\n    resolve: string\n    resolvedCompiledGatsbyNode?: string\n    importKey?: string\n  },\n  module: string\n): any {\n  const key = `${plugin.importKey || plugin.resolve || plugin.name}/${module}`\n\n  let pluginModule = pluginModuleCache.get(key)\n  if (!pluginModule) {\n    pluginModule = require(module === `gatsby-node` &&\n      plugin.resolvedCompiledGatsbyNode\n      ? plugin.resolvedCompiledGatsbyNode\n      : `${plugin.resolve}/${module}`)\n    pluginModuleCache.set(key, pluginModule)\n  }\n  return pluginModule\n}\n"],"mappings":";;;;;AAAA,MAAMA,iBAAiB,GAAG,IAAIC,GAAJ,EAA1B;;AAEO,SAASC,oBAAT,CACLC,MADK,EAELC,MAFK,EAGLC,YAHK,EAIC;EACN,MAAMC,GAAG,GAAI,GAAEH,MAAM,CAACI,IAAK,IAAGH,MAAO,EAArC;EACAJ,iBAAiB,CAACQ,GAAlB,CAAsBF,GAAtB,EAA2BD,YAA3B;EAEA,MAAMI,gBAAgB,GAAGN,MAAM,CAACO,SAAP,IAAoBP,MAAM,CAACQ,OAApD;;EACA,IAAIF,gBAAJ,EAAsB;IACpB,MAAMH,GAAG,GAAI,GAAEG,gBAAiB,IAAGL,MAAO,EAA1C;IACAJ,iBAAiB,CAACQ,GAAlB,CAAsBF,GAAtB,EAA2BD,YAA3B;EACD;AACF;;AAEM,SAASO,mBAAT,CACLT,MADK,EAOLC,MAPK,EAQA;EACL,MAAME,GAAG,GAAI,GAAEH,MAAM,CAACO,SAAP,IAAoBP,MAAM,CAACQ,OAA3B,IAAsCR,MAAM,CAACI,IAAK,IAAGH,MAAO,EAA3E;EAEA,IAAIS,YAAY,GAAGb,iBAAiB,CAACc,GAAlB,CAAsBR,GAAtB,CAAnB;;EACA,IAAI,CAACO,YAAL,EAAmB;IACjBA,YAAY,GAAGE,OAAO,CAACX,MAAM,KAAM,aAAZ,IACrBD,MAAM,CAACa,0BADc,GAEnBb,MAAM,CAACa,0BAFY,GAGlB,GAAEb,MAAM,CAACQ,OAAQ,IAAGP,MAAO,EAHV,CAAtB;IAIAJ,iBAAiB,CAACQ,GAAlB,CAAsBF,GAAtB,EAA2BO,YAA3B;EACD;;EACD,OAAOA,YAAP;AACD"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gatsby",
   "description": "Blazing fast modern site generator for React",
-  "version": "4.25.1",
+  "version": "4.25.2",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bin": {
     "gatsby": "./cli.js"
@@ -174,7 +174,7 @@
     "webpack-stats-plugin": "^1.0.3",
     "webpack-virtual-modules": "^0.3.2",
     "xstate": "4.32.1",
-    "yaml-loader": "^0.6.0"
+    "yaml-loader": "^0.8.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.15.4",
@@ -277,5 +277,5 @@
   "yargs": {
     "boolean-negation": false
   },
-  "gitHead": "4dcca80d273558368785612ad07f2a8dc9e3bb99"
+  "gitHead": "13bf518f95eed9373da0ae93a13ce774a4a3fc17"
 }