gatsby 5.3.0-next.3 → 5.3.0

package/cache-dir/commonjs/develop-static-entry.js

@@ -17,10 +17,6 @@ var _apiRunnerSsr = require("./api-runner-ssr");
 var _asyncRequires = _interopRequireDefault(require("$virtual/async-requires"));
 
 /* global BROWSER_ESM_ONLY */
-// import testRequireError from "./test-require-error"
-// For some extremely mysterious reason, webpack adds the above module *after*
-// this module so that when this code runs, testRequireError is undefined.
-// So in the meantime, we'll just inline it.
 const testRequireError = (moduleName, err) => {
   const regex = new RegExp(`Error: Cannot find module\\s.${moduleName}`);
   const firstLine = err.toString().split(`\n`)[0];

package/cache-dir/commonjs/loader.js

@@ -354,7 +354,7 @@ class BaseLoader {
       });
     }
 
-    const url = `/slice-data/${sliceName}.json`;
+    const url = `${__PATH_PREFIX__}/slice-data/${sliceName}.json`;
     return doFetch(url, `GET`).then(res => {
       const jsonPayload = JSON.parse(res.responseText);
       this.slicesDataDb.set(sliceName, jsonPayload);

package/cache-dir/commonjs/ssr-develop-static-entry.js

@@ -42,11 +42,7 @@ var _loader = require("./loader");
 
 /* global BROWSER_ESM_ONLY */
 // prefer default export if available
-const preferDefault = m => m && m.default || m; // import testRequireError from "./test-require-error"
-// For some extremely mysterious reason, webpack adds the above module *after*
-// this module so that when this code runs, testRequireError is undefined.
-// So in the meantime, we'll just inline it.
-
+const preferDefault = m => m && m.default || m;
 
 const testRequireError = (moduleName, err) => {
   const regex = new RegExp(`Error: Cannot find module\\s.${moduleName}`);

package/cache-dir/commonjs/static-entry.js

@@ -86,10 +86,7 @@ const {
 
 const {
   join
-} = path.posix; // const testRequireError = require("./test-require-error")
-// For some extremely mysterious reason, webpack adds the above module *after*
-// this module so that when this code runs, testRequireError is undefined.
-// So in the meantime, we'll just inline it.
+} = path.posix;
 
 const testRequireError = (moduleName, err) => {
   const regex = new RegExp(`Error: Cannot find module\\s.${moduleName}`);

package/cache-dir/develop-static-entry.js

@@ -5,10 +5,6 @@ import { merge } from "lodash"
 import { apiRunner } from "./api-runner-ssr"
 import asyncRequires from "$virtual/async-requires"
 
-// import testRequireError from "./test-require-error"
-// For some extremely mysterious reason, webpack adds the above module *after*
-// this module so that when this code runs, testRequireError is undefined.
-// So in the meantime, we'll just inline it.
 const testRequireError = (moduleName, err) => {
   const regex = new RegExp(`Error: Cannot find module\\s.${moduleName}`)
   const firstLine = err.toString().split(`\n`)[0]

package/cache-dir/loader.js

@@ -327,7 +327,7 @@ export class BaseLoader {
       return Promise.resolve({ sliceName, jsonPayload })
     }
 
-    const url = `/slice-data/${sliceName}.json`
+    const url = `${__PATH_PREFIX__}/slice-data/${sliceName}.json`
     return doFetch(url, `GET`).then(res => {
       const jsonPayload = JSON.parse(res.responseText)
 

package/cache-dir/ssr-develop-static-entry.js

@@ -16,10 +16,6 @@ import { getStaticQueryResults } from "./loader"
 // prefer default export if available
 const preferDefault = m => (m && m.default) || m
 
-// import testRequireError from "./test-require-error"
-// For some extremely mysterious reason, webpack adds the above module *after*
-// this module so that when this code runs, testRequireError is undefined.
-// So in the meantime, we'll just inline it.
 const testRequireError = (moduleName, err) => {
   const regex = new RegExp(`Error: Cannot find module\\s.${moduleName}`)
   const firstLine = err.toString().split(`\n`)[0]

package/cache-dir/static-entry.js

@@ -28,10 +28,6 @@ const { ServerSliceRenderer } = require(`./slice/server-slice-renderer`)
 // we want to force posix-style joins, so Windows doesn't produce backslashes for urls
 const { join } = path.posix
 
-// const testRequireError = require("./test-require-error")
-// For some extremely mysterious reason, webpack adds the above module *after*
-// this module so that when this code runs, testRequireError is undefined.
-// So in the meantime, we'll just inline it.
 const testRequireError = (moduleName, err) => {
   const regex = new RegExp(`Error: Cannot find module\\s.${moduleName}`)
   const firstLine = err.toString().split(`\n`)[0]

package/dist/bootstrap/get-config-file.js

@@ -7,133 +7,177 @@ exports.getConfigFile = getConfigFile;
 
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 
-var _testRequireError = require("../utils/test-require-error");
+var _testImportError = require("../utils/test-import-error");
 
 var _reporter = _interopRequireDefault(require("gatsby-cli/lib/reporter"));
 
 var _path = _interopRequireDefault(require("path"));
 
-var _fsExistsCached = require("fs-exists-cached");
-
 var _compileGatsbyFiles = require("../utils/parcel/compile-gatsby-files");
 
 var _isNearMatch = require("../utils/is-near-match");
 
+var _resolveJsFilePath = require("./resolve-js-file-path");
+
+var _preferDefault = require("./prefer-default");
+
 async function getConfigFile(siteDirectory, configName, distance = 3) {
-  let configPath = ``;
-  let configFilePath = ``;
-  let configModule; // Attempt to find compiled gatsby-config.js in .cache/compiled/gatsby-config.js
+  const compiledResult = await attemptImportCompiled(siteDirectory, configName);
+
+  if (compiledResult !== null && compiledResult !== void 0 && compiledResult.configModule && compiledResult !== null && compiledResult !== void 0 && compiledResult.configFilePath) {
+    return compiledResult;
+  }
+
+  const uncompiledResult = await attemptImportUncompiled(siteDirectory, configName, distance);
+  return uncompiledResult || {};
+}
+
+async function attemptImport(siteDirectory, configPath) {
+  const configFilePath = await (0, _resolveJsFilePath.resolveJSFilepath)({
+    rootDir: siteDirectory,
+    filePath: configPath
+  }); // The file does not exist, no sense trying to import it
+
+  if (!configFilePath) {
+    return {
+      configFilePath: ``,
+      configModule: undefined
+    };
+  }
+
+  const importedModule = await import(configFilePath);
+  const configModule = (0, _preferDefault.preferDefault)(importedModule);
+  return {
+    configFilePath,
+    configModule
+  };
+}
+
+async function attemptImportCompiled(siteDirectory, configName) {
+  let compiledResult;
 
   try {
-    configPath = _path.default.join(`${siteDirectory}/${_compileGatsbyFiles.COMPILED_CACHE_DIR}`, configName);
-    configFilePath = require.resolve(configPath);
-    configModule = require(configFilePath);
-  } catch (outerError) {
-    var _outerError$requireSt, _outerError$requireSt2, _outerError$requireSt3;
-
-    // Not all plugins will have a compiled file, so the err.message can look like this:
-    // "Cannot find module '<root>/node_modules/gatsby-source-filesystem/.cache/compiled/gatsby-config'"
-    // But the compiled file can also have an error like this:
-    // "Cannot find module 'foobar'"
-    // So this is trying to differentiate between an error we're fine ignoring and an error that we should throw
-    const isModuleNotFoundError = outerError.code === `MODULE_NOT_FOUND`;
-    const isThisFileRequireError = (_outerError$requireSt = outerError === null || outerError === void 0 ? void 0 : (_outerError$requireSt2 = outerError.requireStack) === null || _outerError$requireSt2 === void 0 ? void 0 : (_outerError$requireSt3 = _outerError$requireSt2[0]) === null || _outerError$requireSt3 === void 0 ? void 0 : _outerError$requireSt3.includes(`get-config-file`)) !== null && _outerError$requireSt !== void 0 ? _outerError$requireSt : true; // User's module require error inside gatsby-config.js
-
-    if (!(isModuleNotFoundError && isThisFileRequireError)) {
+    const compiledConfigPath = _path.default.join(`${siteDirectory}/${_compileGatsbyFiles.COMPILED_CACHE_DIR}`, configName);
+
+    compiledResult = await attemptImport(siteDirectory, compiledConfigPath);
+  } catch (error) {
+    _reporter.default.panic({
+      id: `11902`,
+      error: error,
+      context: {
+        configName,
+        message: error.message
+      }
+    });
+  }
+
+  return compiledResult;
+}
+
+async function attemptImportUncompiled(siteDirectory, configName, distance) {
+  var _uncompiledResult;
+
+  let uncompiledResult;
+
+  const uncompiledConfigPath = _path.default.join(siteDirectory, configName);
+
+  try {
+    uncompiledResult = await attemptImport(siteDirectory, uncompiledConfigPath);
+  } catch (error) {
+    if (!(0, _testImportError.testImportError)(uncompiledConfigPath, error)) {
       _reporter.default.panic({
-        id: `11902`,
-        error: outerError,
+        id: `10123`,
+        error,
         context: {
           configName,
-          message: outerError.message
+          message: error.message
         }
       });
-    } // Attempt to find uncompiled gatsby-config.js in root dir
-
-
-    configPath = _path.default.join(siteDirectory, configName);
-
-    try {
-      configFilePath = require.resolve(configPath);
-      configModule = require(configFilePath);
-    } catch (innerError) {
-      // Some other error that is not a require error
-      if (!(0, _testRequireError.testRequireError)(configPath, innerError)) {
-        _reporter.default.panic({
-          id: `10123`,
-          error: innerError,
-          context: {
-            configName,
-            message: innerError.message
-          }
-        });
+    }
+  }
+
+  if ((_uncompiledResult = uncompiledResult) !== null && _uncompiledResult !== void 0 && _uncompiledResult.configFilePath) {
+    return uncompiledResult;
+  }
+
+  const error = new Error(`Cannot find package '${uncompiledConfigPath}'`);
+  const {
+    tsConfig,
+    nearMatch
+  } = await checkTsAndNearMatch(siteDirectory, configName, distance); // gatsby-config.ts exists but compiled gatsby-config.js does not
+
+  if (tsConfig) {
+    _reporter.default.panic({
+      id: `10127`,
+      error,
+      context: {
+        configName
       }
+    });
+  } // gatsby-config is misnamed
 
-      const files = await _fsExtra.default.readdir(siteDirectory);
-      let tsConfig = false;
-      let nearMatch = ``;
 
-      for (const file of files) {
-        if (tsConfig || nearMatch) {
-          break;
-        }
+  if (nearMatch) {
+    const isTSX = nearMatch.endsWith(`.tsx`);
 
-        const {
-          name,
-          ext
-        } = _path.default.parse(file);
+    _reporter.default.panic({
+      id: `10124`,
+      error,
+      context: {
+        configName,
+        nearMatch,
+        isTSX
+      }
+    });
+  } // gatsby-config is incorrectly located in src directory
 
-        if (name === configName && ext === `.ts`) {
-          tsConfig = true;
-          break;
-        }
 
-        if ((0, _isNearMatch.isNearMatch)(name, configName, distance)) {
-          nearMatch = file;
-        }
-      } // gatsby-config.ts exists but compiled gatsby-config.js does not
-
-
-      if (tsConfig) {
-        _reporter.default.panic({
-          id: `10127`,
-          error: innerError,
-          context: {
-            configName
-          }
-        });
-      } // gatsby-config is misnamed
-
-
-      if (nearMatch) {
-        const isTSX = nearMatch.endsWith(`.tsx`);
-
-        _reporter.default.panic({
-          id: `10124`,
-          error: innerError,
-          context: {
-            configName,
-            nearMatch,
-            isTSX
-          }
-        });
-      } // gatsby-config.js is incorrectly located in src/gatsby-config.js
-
-
-      if ((0, _fsExistsCached.sync)(_path.default.join(siteDirectory, `src`, configName + `.js`))) {
-        _reporter.default.panic({
-          id: `10125`,
-          context: {
-            configName
-          }
-        });
+  const isInSrcDir = await (0, _resolveJsFilePath.resolveJSFilepath)({
+    rootDir: siteDirectory,
+    filePath: _path.default.join(siteDirectory, `src`, configName),
+    warn: false
+  });
+
+  if (isInSrcDir) {
+    _reporter.default.panic({
+      id: `10125`,
+      context: {
+        configName
       }
+    });
+  }
+
+  return uncompiledResult;
+}
+
+async function checkTsAndNearMatch(siteDirectory, configName, distance) {
+  const files = await _fsExtra.default.readdir(siteDirectory);
+  let tsConfig = false;
+  let nearMatch = ``;
+
+  for (const file of files) {
+    if (tsConfig || nearMatch) {
+      break;
+    }
+
+    const {
+      name,
+      ext
+    } = _path.default.parse(file);
+
+    if (name === configName && ext === `.ts`) {
+      tsConfig = true;
+      break;
+    }
+
+    if ((0, _isNearMatch.isNearMatch)(name, configName, distance)) {
+      nearMatch = file;
     }
   }
 
   return {
-    configModule,
-    configFilePath
+    tsConfig,
+    nearMatch
   };
 }
 //# sourceMappingURL=get-config-file.js.map

package/dist/bootstrap/get-config-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-config-file.js","names":["getConfigFile","siteDirectory","configName","distance","configPath","configFilePath","configModule","path","join","COMPILED_CACHE_DIR","require","resolve","outerError","isModuleNotFoundError","code","isThisFileRequireError","requireStack","includes","report","panic","id","error","context","message","innerError","testRequireError","files","fs","readdir","tsConfig","nearMatch","file","name","ext","parse","isNearMatch","isTSX","endsWith","existsSync"],"sources":["../../src/bootstrap/get-config-file.ts"],"sourcesContent":["import fs from \"fs-extra\"\nimport { testRequireError } from \"../utils/test-require-error\"\nimport report from \"gatsby-cli/lib/reporter\"\nimport path from \"path\"\nimport { sync as existsSync } from \"fs-exists-cached\"\nimport { COMPILED_CACHE_DIR } from \"../utils/parcel/compile-gatsby-files\"\nimport { isNearMatch } from \"../utils/is-near-match\"\n\nexport async function getConfigFile(\n  siteDirectory: string,\n  configName: string,\n  distance: number = 3\n): Promise<{\n  configModule: any\n  configFilePath: string\n}> {\n  let configPath = ``\n  let configFilePath = ``\n  let configModule: any\n\n  // Attempt to find compiled gatsby-config.js in .cache/compiled/gatsby-config.js\n  try {\n    configPath = path.join(`${siteDirectory}/${COMPILED_CACHE_DIR}`, configName)\n    configFilePath = require.resolve(configPath)\n    configModule = require(configFilePath)\n  } catch (outerError) {\n    // Not all plugins will have a compiled file, so the err.message can look like this:\n    // \"Cannot find module '<root>/node_modules/gatsby-source-filesystem/.cache/compiled/gatsby-config'\"\n    // But the compiled file can also have an error like this:\n    // \"Cannot find module 'foobar'\"\n    // So this is trying to differentiate between an error we're fine ignoring and an error that we should throw\n    const isModuleNotFoundError = outerError.code === `MODULE_NOT_FOUND`\n    const isThisFileRequireError =\n      outerError?.requireStack?.[0]?.includes(`get-config-file`) ?? true\n\n    // User's module require error inside gatsby-config.js\n    if (!(isModuleNotFoundError && isThisFileRequireError)) {\n      report.panic({\n        id: `11902`,\n        error: outerError,\n        context: {\n          configName,\n          message: outerError.message,\n        },\n      })\n    }\n\n    // Attempt to find uncompiled gatsby-config.js in root dir\n    configPath = path.join(siteDirectory, configName)\n\n    try {\n      configFilePath = require.resolve(configPath)\n      configModule = require(configFilePath)\n    } catch (innerError) {\n      // Some other error that is not a require error\n      if (!testRequireError(configPath, innerError)) {\n        report.panic({\n          id: `10123`,\n          error: innerError,\n          context: {\n            configName,\n            message: innerError.message,\n          },\n        })\n      }\n\n      const files = await fs.readdir(siteDirectory)\n\n      let tsConfig = false\n      let nearMatch = ``\n\n      for (const file of files) {\n        if (tsConfig || nearMatch) {\n          break\n        }\n\n        const { name, ext } = path.parse(file)\n\n        if (name === configName && ext === `.ts`) {\n          tsConfig = true\n          break\n        }\n\n        if (isNearMatch(name, configName, distance)) {\n          nearMatch = file\n        }\n      }\n\n      // gatsby-config.ts exists but compiled gatsby-config.js does not\n      if (tsConfig) {\n        report.panic({\n          id: `10127`,\n          error: innerError,\n          context: {\n            configName,\n          },\n        })\n      }\n\n      // gatsby-config is misnamed\n      if (nearMatch) {\n        const isTSX = nearMatch.endsWith(`.tsx`)\n        report.panic({\n          id: `10124`,\n          error: innerError,\n          context: {\n            configName,\n            nearMatch,\n            isTSX,\n          },\n        })\n      }\n\n      // gatsby-config.js is incorrectly located in src/gatsby-config.js\n      if (existsSync(path.join(siteDirectory, `src`, configName + `.js`))) {\n        report.panic({\n          id: `10125`,\n          context: {\n            configName,\n          },\n        })\n      }\n    }\n  }\n\n  return { configModule, configFilePath }\n}\n"],"mappings":"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"}
+{"version":3,"file":"get-config-file.js","names":["getConfigFile","siteDirectory","configName","distance","compiledResult","attemptImportCompiled","configModule","configFilePath","uncompiledResult","attemptImportUncompiled","attemptImport","configPath","resolveJSFilepath","rootDir","filePath","undefined","importedModule","preferDefault","compiledConfigPath","path","join","COMPILED_CACHE_DIR","error","report","panic","id","context","message","uncompiledConfigPath","testImportError","Error","tsConfig","nearMatch","checkTsAndNearMatch","isTSX","endsWith","isInSrcDir","warn","files","fs","readdir","file","name","ext","parse","isNearMatch"],"sources":["../../src/bootstrap/get-config-file.ts"],"sourcesContent":["import fs from \"fs-extra\"\nimport { testImportError } from \"../utils/test-import-error\"\nimport report from \"gatsby-cli/lib/reporter\"\nimport path from \"path\"\nimport { COMPILED_CACHE_DIR } from \"../utils/parcel/compile-gatsby-files\"\nimport { isNearMatch } from \"../utils/is-near-match\"\nimport { resolveJSFilepath } from \"./resolve-js-file-path\"\nimport { preferDefault } from \"./prefer-default\"\n\nexport async function getConfigFile(\n  siteDirectory: string,\n  configName: string,\n  distance: number = 3\n): Promise<{\n  configModule: any\n  configFilePath: string\n}> {\n  const compiledResult = await attemptImportCompiled(siteDirectory, configName)\n\n  if (compiledResult?.configModule && compiledResult?.configFilePath) {\n    return compiledResult\n  }\n\n  const uncompiledResult = await attemptImportUncompiled(\n    siteDirectory,\n    configName,\n    distance\n  )\n\n  return uncompiledResult || {}\n}\n\nasync function attemptImport(\n  siteDirectory: string,\n  configPath: string\n): Promise<{\n  configModule: unknown\n  configFilePath: string\n}> {\n  const configFilePath = await resolveJSFilepath({\n    rootDir: siteDirectory,\n    filePath: configPath,\n  })\n\n  // The file does not exist, no sense trying to import it\n  if (!configFilePath) {\n    return { configFilePath: ``, configModule: undefined }\n  }\n\n  const importedModule = await import(configFilePath)\n  const configModule = preferDefault(importedModule)\n\n  return { configFilePath, configModule }\n}\n\nasync function attemptImportCompiled(\n  siteDirectory: string,\n  configName: string\n): Promise<{\n  configModule: unknown\n  configFilePath: string\n}> {\n  let compiledResult\n\n  try {\n    const compiledConfigPath = path.join(\n      `${siteDirectory}/${COMPILED_CACHE_DIR}`,\n      configName\n    )\n    compiledResult = await attemptImport(siteDirectory, compiledConfigPath)\n  } catch (error) {\n    report.panic({\n      id: `11902`,\n      error: error,\n      context: {\n        configName,\n        message: error.message,\n      },\n    })\n  }\n\n  return compiledResult\n}\n\nasync function attemptImportUncompiled(\n  siteDirectory: string,\n  configName: string,\n  distance: number\n): Promise<{\n  configModule: unknown\n  configFilePath: string\n}> {\n  let uncompiledResult\n\n  const uncompiledConfigPath = path.join(siteDirectory, configName)\n\n  try {\n    uncompiledResult = await attemptImport(siteDirectory, uncompiledConfigPath)\n  } catch (error) {\n    if (!testImportError(uncompiledConfigPath, error)) {\n      report.panic({\n        id: `10123`,\n        error,\n        context: {\n          configName,\n          message: error.message,\n        },\n      })\n    }\n  }\n\n  if (uncompiledResult?.configFilePath) {\n    return uncompiledResult\n  }\n\n  const error = new Error(`Cannot find package '${uncompiledConfigPath}'`)\n\n  const { tsConfig, nearMatch } = await checkTsAndNearMatch(\n    siteDirectory,\n    configName,\n    distance\n  )\n\n  // gatsby-config.ts exists but compiled gatsby-config.js does not\n  if (tsConfig) {\n    report.panic({\n      id: `10127`,\n      error,\n      context: {\n        configName,\n      },\n    })\n  }\n\n  // gatsby-config is misnamed\n  if (nearMatch) {\n    const isTSX = nearMatch.endsWith(`.tsx`)\n    report.panic({\n      id: `10124`,\n      error,\n      context: {\n        configName,\n        nearMatch,\n        isTSX,\n      },\n    })\n  }\n\n  // gatsby-config is incorrectly located in src directory\n  const isInSrcDir = await resolveJSFilepath({\n    rootDir: siteDirectory,\n    filePath: path.join(siteDirectory, `src`, configName),\n    warn: false,\n  })\n\n  if (isInSrcDir) {\n    report.panic({\n      id: `10125`,\n      context: {\n        configName,\n      },\n    })\n  }\n\n  return uncompiledResult\n}\n\nasync function checkTsAndNearMatch(\n  siteDirectory: string,\n  configName: string,\n  distance: number\n): Promise<{\n  tsConfig: boolean\n  nearMatch: string\n}> {\n  const files = await fs.readdir(siteDirectory)\n\n  let tsConfig = false\n  let nearMatch = ``\n\n  for (const file of files) {\n    if (tsConfig || nearMatch) {\n      break\n    }\n\n    const { name, ext } = path.parse(file)\n\n    if (name === configName && ext === `.ts`) {\n      tsConfig = true\n      break\n    }\n\n    if (isNearMatch(name, configName, distance)) {\n      nearMatch = file\n    }\n  }\n\n  return {\n    tsConfig,\n    nearMatch,\n  }\n}\n"],"mappings":"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"}

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

@@ -43,13 +43,14 @@ async function loadPlugins(rawConfig, rootDir) {
   const pluginArray = (0, _flattenPlugins.flattenPlugins)(pluginInfos); // Work out which plugins use which APIs, including those which are not
   // valid Gatsby APIs, aka 'badExports'
 
-  const x = (0, _validate.collatePluginAPIs)({
+  let {
+    flattenedPlugins,
+    badExports
+  } = await (0, _validate.collatePluginAPIs)({
     currentAPIs,
-    flattenedPlugins: pluginArray
-  }); // From this point on, these are fully-resolved plugins.
-
-  let flattenedPlugins = x.flattenedPlugins;
-  const badExports = x.badExports; // Show errors for any non-Gatsby APIs exported from plugins
+    flattenedPlugins: pluginArray,
+    rootDir
+  }); // Show errors for any non-Gatsby APIs exported from plugins
 
   await (0, _validate.handleBadExports)({
     currentAPIs,

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["loadPlugins","rawConfig","rootDir","config","normalizeConfig","validateConfigPluginsOptions","currentAPIs","getAPI","browser","browserAPIs","node","nodeAPIs","ssr","ssrAPIs","pluginInfos","loadInternalPlugins","pluginArray","flattenPlugins","x","collatePluginAPIs","flattenedPlugins","badExports","handleBadExports","handleMultipleReplaceRenderers","store","dispatch","type","payload"],"sources":["../../../src/bootstrap/load-plugins/index.ts"],"sourcesContent":["import { store } from \"../../redux\"\nimport { IGatsbyState } from \"../../redux/types\"\nimport * as nodeAPIs from \"../../utils/api-node-docs\"\nimport * as browserAPIs from \"../../utils/api-browser-docs\"\nimport ssrAPIs from \"../../../cache-dir/api-ssr-docs\"\nimport { loadInternalPlugins } from \"./load-internal-plugins\"\nimport {\n  collatePluginAPIs,\n  handleBadExports,\n  handleMultipleReplaceRenderers,\n  validateConfigPluginsOptions,\n} from \"./validate\"\nimport { IFlattenedPlugin } from \"./types\"\nimport { normalizeConfig } from \"./utils/normalize\"\nimport { getAPI } from \"./utils/get-api\"\nimport { flattenPlugins } from \"./utils/flatten-plugins\"\nimport { IGatsbyConfig } from \"../../internal\"\n\nexport async function loadPlugins(\n  rawConfig: IGatsbyConfig,\n  rootDir: string\n): Promise<Array<IFlattenedPlugin>> {\n  // Turn all strings in plugins: [`...`] into the { resolve: ``, options: {} } form\n  const config = normalizeConfig(rawConfig)\n\n  // Show errors for invalid plugin configuration\n  await validateConfigPluginsOptions(config, rootDir)\n\n  const currentAPIs = getAPI({\n    browser: browserAPIs,\n    node: nodeAPIs,\n    ssr: ssrAPIs,\n  })\n\n  // Collate internal plugins, site config plugins, site default plugins\n  const pluginInfos = loadInternalPlugins(config, rootDir)\n\n  // Create a flattened array of the plugins\n  const pluginArray = flattenPlugins(pluginInfos)\n\n  // Work out which plugins use which APIs, including those which are not\n  // valid Gatsby APIs, aka 'badExports'\n  const x = collatePluginAPIs({ currentAPIs, flattenedPlugins: pluginArray })\n\n  // From this point on, these are fully-resolved plugins.\n  let flattenedPlugins = x.flattenedPlugins\n  const badExports = x.badExports\n\n  // Show errors for any non-Gatsby APIs exported from plugins\n  await handleBadExports({ currentAPIs, badExports })\n\n  // Show errors when ReplaceRenderer has been implemented multiple times\n  flattenedPlugins = handleMultipleReplaceRenderers({\n    flattenedPlugins,\n  })\n\n  // If we get this far, everything looks good. Update the store\n  store.dispatch({\n    type: `SET_SITE_FLATTENED_PLUGINS`,\n    payload: flattenedPlugins as IGatsbyState[\"flattenedPlugins\"],\n  })\n\n  return flattenedPlugins\n}\n"],"mappings":";;;;;;;AAAA;;AAEA;;AACA;;AACA;;AACA;;AACA;;AAOA;;AACA;;AACA;;;;;;AAGO,eAAeA,WAAf,CACLC,SADK,EAELC,OAFK,EAG6B;EAClC;EACA,MAAMC,MAAM,GAAG,IAAAC,0BAAA,EAAgBH,SAAhB,CAAf,CAFkC,CAIlC;;EACA,MAAM,IAAAI,sCAAA,EAA6BF,MAA7B,EAAqCD,OAArC,CAAN;EAEA,MAAMI,WAAW,GAAG,IAAAC,cAAA,EAAO;IACzBC,OAAO,EAAEC,WADgB;IAEzBC,IAAI,EAAEC,QAFmB;IAGzBC,GAAG,EAAEC;EAHoB,CAAP,CAApB,CAPkC,CAalC;;EACA,MAAMC,WAAW,GAAG,IAAAC,wCAAA,EAAoBZ,MAApB,EAA4BD,OAA5B,CAApB,CAdkC,CAgBlC;;EACA,MAAMc,WAAW,GAAG,IAAAC,8BAAA,EAAeH,WAAf,CAApB,CAjBkC,CAmBlC;EACA;;EACA,MAAMI,CAAC,GAAG,IAAAC,2BAAA,EAAkB;IAAEb,WAAF;IAAec,gBAAgB,EAAEJ;EAAjC,CAAlB,CAAV,CArBkC,CAuBlC;;EACA,IAAII,gBAAgB,GAAGF,CAAC,CAACE,gBAAzB;EACA,MAAMC,UAAU,GAAGH,CAAC,CAACG,UAArB,CAzBkC,CA2BlC;;EACA,MAAM,IAAAC,0BAAA,EAAiB;IAAEhB,WAAF;IAAee;EAAf,CAAjB,CAAN,CA5BkC,CA8BlC;;EACAD,gBAAgB,GAAG,IAAAG,wCAAA,EAA+B;IAChDH;EADgD,CAA/B,CAAnB,CA/BkC,CAmClC;;EACAI,YAAA,CAAMC,QAAN,CAAe;IACbC,IAAI,EAAG,4BADM;IAEbC,OAAO,EAAEP;EAFI,CAAf;;EAKA,OAAOA,gBAAP;AACD"}
+{"version":3,"file":"index.js","names":["loadPlugins","rawConfig","rootDir","config","normalizeConfig","validateConfigPluginsOptions","currentAPIs","getAPI","browser","browserAPIs","node","nodeAPIs","ssr","ssrAPIs","pluginInfos","loadInternalPlugins","pluginArray","flattenPlugins","flattenedPlugins","badExports","collatePluginAPIs","handleBadExports","handleMultipleReplaceRenderers","store","dispatch","type","payload"],"sources":["../../../src/bootstrap/load-plugins/index.ts"],"sourcesContent":["import { store } from \"../../redux\"\nimport { IGatsbyState } from \"../../redux/types\"\nimport * as nodeAPIs from \"../../utils/api-node-docs\"\nimport * as browserAPIs from \"../../utils/api-browser-docs\"\nimport ssrAPIs from \"../../../cache-dir/api-ssr-docs\"\nimport { loadInternalPlugins } from \"./load-internal-plugins\"\nimport {\n  collatePluginAPIs,\n  handleBadExports,\n  handleMultipleReplaceRenderers,\n  validateConfigPluginsOptions,\n} from \"./validate\"\nimport { IFlattenedPlugin } from \"./types\"\nimport { normalizeConfig } from \"./utils/normalize\"\nimport { getAPI } from \"./utils/get-api\"\nimport { flattenPlugins } from \"./utils/flatten-plugins\"\nimport { IGatsbyConfig } from \"../../internal\"\n\nexport async function loadPlugins(\n  rawConfig: IGatsbyConfig,\n  rootDir: string\n): Promise<Array<IFlattenedPlugin>> {\n  // Turn all strings in plugins: [`...`] into the { resolve: ``, options: {} } form\n  const config = normalizeConfig(rawConfig)\n\n  // Show errors for invalid plugin configuration\n  await validateConfigPluginsOptions(config, rootDir)\n\n  const currentAPIs = getAPI({\n    browser: browserAPIs,\n    node: nodeAPIs,\n    ssr: ssrAPIs,\n  })\n\n  // Collate internal plugins, site config plugins, site default plugins\n  const pluginInfos = loadInternalPlugins(config, rootDir)\n\n  // Create a flattened array of the plugins\n  const pluginArray = flattenPlugins(pluginInfos)\n\n  // Work out which plugins use which APIs, including those which are not\n  // valid Gatsby APIs, aka 'badExports'\n  let { flattenedPlugins, badExports } = await collatePluginAPIs({\n    currentAPIs,\n    flattenedPlugins: pluginArray,\n    rootDir,\n  })\n\n  // Show errors for any non-Gatsby APIs exported from plugins\n  await handleBadExports({ currentAPIs, badExports })\n\n  // Show errors when ReplaceRenderer has been implemented multiple times\n  flattenedPlugins = handleMultipleReplaceRenderers({\n    flattenedPlugins,\n  })\n\n  // If we get this far, everything looks good. Update the store\n  store.dispatch({\n    type: `SET_SITE_FLATTENED_PLUGINS`,\n    payload: flattenedPlugins as IGatsbyState[\"flattenedPlugins\"],\n  })\n\n  return flattenedPlugins\n}\n"],"mappings":";;;;;;;AAAA;;AAEA;;AACA;;AACA;;AACA;;AACA;;AAOA;;AACA;;AACA;;;;;;AAGO,eAAeA,WAAf,CACLC,SADK,EAELC,OAFK,EAG6B;EAClC;EACA,MAAMC,MAAM,GAAG,IAAAC,0BAAA,EAAgBH,SAAhB,CAAf,CAFkC,CAIlC;;EACA,MAAM,IAAAI,sCAAA,EAA6BF,MAA7B,EAAqCD,OAArC,CAAN;EAEA,MAAMI,WAAW,GAAG,IAAAC,cAAA,EAAO;IACzBC,OAAO,EAAEC,WADgB;IAEzBC,IAAI,EAAEC,QAFmB;IAGzBC,GAAG,EAAEC;EAHoB,CAAP,CAApB,CAPkC,CAalC;;EACA,MAAMC,WAAW,GAAG,IAAAC,wCAAA,EAAoBZ,MAApB,EAA4BD,OAA5B,CAApB,CAdkC,CAgBlC;;EACA,MAAMc,WAAW,GAAG,IAAAC,8BAAA,EAAeH,WAAf,CAApB,CAjBkC,CAmBlC;EACA;;EACA,IAAI;IAAEI,gBAAF;IAAoBC;EAApB,IAAmC,MAAM,IAAAC,2BAAA,EAAkB;IAC7Dd,WAD6D;IAE7DY,gBAAgB,EAAEF,WAF2C;IAG7Dd;EAH6D,CAAlB,CAA7C,CArBkC,CA2BlC;;EACA,MAAM,IAAAmB,0BAAA,EAAiB;IAAEf,WAAF;IAAea;EAAf,CAAjB,CAAN,CA5BkC,CA8BlC;;EACAD,gBAAgB,GAAG,IAAAI,wCAAA,EAA+B;IAChDJ;EADgD,CAA/B,CAAnB,CA/BkC,CAmClC;;EACAK,YAAA,CAAMC,QAAN,CAAe;IACbC,IAAI,EAAG,4BADM;IAEbC,OAAO,EAAER;EAFI,CAAf;;EAKA,OAAOA,gBAAP;AACD"}

package/dist/bootstrap/load-plugins/validate.d.ts

@@ -26,13 +26,14 @@ export declare function validateConfigPluginsOptions(config: ISiteConfig | undef
 /**
  * Identify which APIs each plugin exports
  */
-export declare function collatePluginAPIs({ currentAPIs, flattenedPlugins, }: {
+export declare function collatePluginAPIs({ currentAPIs, flattenedPlugins, rootDir, }: {
     currentAPIs: ICurrentAPIs;
     flattenedPlugins: Array<IPluginInfo & Partial<IFlattenedPlugin>>;
-}): {
+    rootDir: string;
+}): Promise<{
     flattenedPlugins: Array<IFlattenedPlugin>;
     badExports: IEntryMap;
-};
+}>;
 export declare const handleMultipleReplaceRenderers: ({ flattenedPlugins, }: {
     flattenedPlugins: Array<IFlattenedPlugin>;
 }) => Array<IFlattenedPlugin>;

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

@@ -304,9 +304,10 @@ async function validateConfigPluginsOptions(config = {}, rootDir) {
  */
 
 
-function collatePluginAPIs({
+async function collatePluginAPIs({
   currentAPIs,
-  flattenedPlugins
+  flattenedPlugins,
+  rootDir
 }) {
   // Get a list of bad exports
   const badExports = {
@@ -314,7 +315,8 @@ function collatePluginAPIs({
     browser: [],
     ssr: []
   };
-  flattenedPlugins.forEach(plugin => {
+
+  for (const plugin of flattenedPlugins) {
     var _plugin$resolvedCompi;
 
     plugin.nodeAPIs = [];
@@ -323,11 +325,16 @@ function collatePluginAPIs({
     // the plugin node itself *and* in an API to plugins map for faster lookups
     // later.
 
-    const pluginNodeExports = (0, _resolveModuleExports.resolveModuleExports)((_plugin$resolvedCompi = plugin.resolvedCompiledGatsbyNode) !== null && _plugin$resolvedCompi !== void 0 ? _plugin$resolvedCompi : `${plugin.resolve}/gatsby-node`, {
-      mode: `require`
+    const pluginNodeExports = await (0, _resolveModuleExports.resolveModuleExports)((_plugin$resolvedCompi = plugin.resolvedCompiledGatsbyNode) !== null && _plugin$resolvedCompi !== void 0 ? _plugin$resolvedCompi : `${plugin.resolve}/gatsby-node`, {
+      mode: `import`,
+      rootDir
+    });
+    const pluginBrowserExports = await (0, _resolveModuleExports.resolveModuleExports)(`${plugin.resolve}/gatsby-browser`, {
+      rootDir
+    });
+    const pluginSSRExports = await (0, _resolveModuleExports.resolveModuleExports)(`${plugin.resolve}/gatsby-ssr`, {
+      rootDir
     });
-    const pluginBrowserExports = (0, _resolveModuleExports.resolveModuleExports)(`${plugin.resolve}/gatsby-browser`);
-    const pluginSSRExports = (0, _resolveModuleExports.resolveModuleExports)(`${plugin.resolve}/gatsby-ssr`);
 
     if (pluginNodeExports.length > 0) {
       plugin.nodeAPIs = (0, _intersection2.default)(pluginNodeExports, currentAPIs.node);
@@ -343,7 +350,8 @@ function collatePluginAPIs({
       plugin.ssrAPIs = (0, _intersection2.default)(pluginSSRExports, currentAPIs.ssr);
       badExports.ssr = badExports.ssr.concat(getBadExports(plugin, pluginSSRExports, currentAPIs.ssr)); // Collate any bad exports
     }
-  });
+  }
+
   return {
     flattenedPlugins: flattenedPlugins,
     badExports