gatsby 3.9.0-next.1 → 3.9.0

package/CHANGELOG.md

@@ -3,6 +3,21 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.9.0](https://github.com/gatsbyjs/gatsby/compare/gatsby@3.9.0-next.1...gatsby@3.9.0) (2021-07-06)
+
+### Bug Fixes
+
+- **gatsby:** add fallback for resolveType ([#32195](https://github.com/gatsbyjs/gatsby/issues/32195)) ([#32265](https://github.com/gatsbyjs/gatsby/issues/32265)) ([6bd5f9c](https://github.com/gatsbyjs/gatsby/commit/6bd5f9cb92311c7623f1b5a6a4328d1850e5a292))
+- **gatsby:** update async requires in dev loader ([#32189](https://github.com/gatsbyjs/gatsby/issues/32189)) ([f4c5c48](https://github.com/gatsbyjs/gatsby/commit/f4c5c482ba5da626d4f7e2d592fdc4d43eb817ba))
+
+### Features
+
+- **gatsby:** enable async rendering with react 18 ([#32188](https://github.com/gatsbyjs/gatsby/issues/32188)) ([#32267](https://github.com/gatsbyjs/gatsby/issues/32267)) ([33ee108](https://github.com/gatsbyjs/gatsby/commit/33ee10864eb11c088dbf3fc815c8b5af98595925))
+- **gatsby:** enable replaceRenderer to be async ([#32182](https://github.com/gatsbyjs/gatsby/issues/32182)) ([#32266](https://github.com/gatsbyjs/gatsby/issues/32266)) ([d93f258](https://github.com/gatsbyjs/gatsby/commit/d93f25860f9fd15db484e6041636b1c63d9323cd))
+- worker pool that can execute tasks on all workers ([#32120](https://github.com/gatsbyjs/gatsby/issues/32120)) ([a82f6db](https://github.com/gatsbyjs/gatsby/commit/a82f6dbe354f2e82a5d944727622ddb0bb44e05d))
+- **gatsby:** Add activity for writing out page-data.json files to the public directory ([#31987](https://github.com/gatsbyjs/gatsby/issues/31987)) ([0be1025](https://github.com/gatsbyjs/gatsby/commit/0be10250a7c461efdc4e7a6b6bf261e245954d53))
+- **gatsby:** Prevent generation of polyfill bundle if not needed ([#31993](https://github.com/gatsbyjs/gatsby/issues/31993)) ([7d41a98](https://github.com/gatsbyjs/gatsby/commit/7d41a985669438e3504987968ed326eb2fd42bca))
+
 # [3.9.0-next.1](https://github.com/gatsbyjs/gatsby/compare/gatsby@3.9.0-next.0...gatsby@3.9.0-next.1) (2021-06-28)
 
 ### Bug Fixes

package/cache-dir/api-runner-ssr.js

@@ -1,3 +1,4 @@
+/* global plugins */
 // During bootstrap, we write requires at top of this file which looks like:
 // var plugins = [
 //   {
@@ -12,41 +13,76 @@
 
 const apis = require(`./api-ssr-docs`)
 
-// Run the specified API in any plugins that have implemented it
-module.exports = (api, args, defaultReturn, argTransform) => {
+function augmentErrorWithPlugin(plugin, err) {
+  if (plugin.name !== `default-site-plugin`) {
+    // default-site-plugin is user code and will print proper stack trace,
+    // so no point in annotating error message pointing out which plugin is root of the problem
+    err.message += ` (from plugin: ${plugin.name})`
+  }
+
+  throw err
+}
+
+export function apiRunner(api, args, defaultReturn, argTransform) {
   if (!apis[api]) {
     console.log(`This API doesn't exist`, api)
   }
 
-  // Run each plugin in series.
-  // eslint-disable-next-line no-undef
-  let results = plugins.map(plugin => {
-    if (!plugin.plugin[api]) {
-      return undefined
+  const results = []
+  plugins.forEach(plugin => {
+    const apiFn = plugin.plugin[api]
+    if (!apiFn) {
+      return
     }
+
     try {
-      const result = plugin.plugin[api](args, plugin.options)
+      const result = apiFn(args, plugin.options)
+
       if (result && argTransform) {
         args = argTransform({ args, result })
       }
-      return result
-    } catch (e) {
-      if (plugin.name !== `default-site-plugin`) {
-        // default-site-plugin is user code and will print proper stack trace,
-        // so no point in annotating error message pointing out which plugin is root of the problem
-        e.message += ` (from plugin: ${plugin.name})`
-      }
 
-      throw e
+      // This if case keeps behaviour as before, we should allow undefined here as the api is defined
+      // TODO V4
+      if (typeof result !== `undefined`) {
+        results.push(result)
+      }
+    } catch (e) {
+      augmentErrorWithPlugin(plugin, e)
     }
   })
 
-  // Filter out undefined results.
-  results = results.filter(result => typeof result !== `undefined`)
+  return results.length ? results : [defaultReturn]
+}
 
-  if (results.length > 0) {
-    return results
-  } else {
-    return [defaultReturn]
+export async function apiRunnerAsync(api, args, defaultReturn, argTransform) {
+  if (!apis[api]) {
+    console.log(`This API doesn't exist`, api)
   }
+
+  const results = []
+  for (const plugin of plugins) {
+    const apiFn = plugin.plugin[api]
+    if (!apiFn) {
+      continue
+    }
+
+    try {
+      const result = await apiFn(args, plugin.options)
+
+      if (result && argTransform) {
+        args = argTransform({ args, result })
+      }
+
+      // This if case keeps behaviour as before, we should allow undefined here as the api is defined
+      // TODO V4
+      if (typeof result !== `undefined`) {
+        results.push(result)
+      }
+    } catch (e) {
+      augmentErrorWithPlugin(plugin, e)
+    }
+  }
+
+  return results.length ? results : [defaultReturn]
 }

package/cache-dir/app.js

@@ -22,11 +22,14 @@ import "./blank.css"
 // Enable fast-refresh for virtual sync-requires, gatsby-browser & navigation
 // To ensure that our <Root /> component can hot reload in case anything below doesn't
 // satisfy fast-refresh constraints
-module.hot.accept([
-  `$virtual/async-requires`,
-  `./api-runner-browser`,
-  `./navigation`,
-])
+module.hot.accept(
+  [`$virtual/async-requires`, `./api-runner-browser`, `./navigation`],
+  () => {
+    // asyncRequires should be automatically updated here (due to ESM import and webpack HMR spec),
+    // but loader doesn't know that and needs to be manually nudged
+    loader.updateAsyncRequires(asyncRequires)
+  }
+)
 
 window.___emitter = emitter
 

package/cache-dir/commonjs/api-runner-ssr.js

@@ -1,5 +1,10 @@
 "use strict";
 
+exports.__esModule = true;
+exports.apiRunner = apiRunner;
+exports.apiRunnerAsync = apiRunnerAsync;
+
+/* global plugins */
 // During bootstrap, we write requires at top of this file which looks like:
 // var plugins = [
 //   {
@@ -11,48 +16,86 @@
 //     options: { ... },
 //   },
 // ]
-const apis = require(`./api-ssr-docs`); // Run the specified API in any plugins that have implemented it
+const apis = require(`./api-ssr-docs`);
+
+function augmentErrorWithPlugin(plugin, err) {
+  if (plugin.name !== `default-site-plugin`) {
+    // default-site-plugin is user code and will print proper stack trace,
+    // so no point in annotating error message pointing out which plugin is root of the problem
+    err.message += ` (from plugin: ${plugin.name})`;
+  }
 
+  throw err;
+}
 
-module.exports = (api, args, defaultReturn, argTransform) => {
+function apiRunner(api, args, defaultReturn, argTransform) {
   if (!apis[api]) {
     console.log(`This API doesn't exist`, api);
-  } // Run each plugin in series.
-  // eslint-disable-next-line no-undef
+  }
 
+  const results = [];
+  plugins.forEach(plugin => {
+    const apiFn = plugin.plugin[api];
 
-  let results = plugins.map(plugin => {
-    if (!plugin.plugin[api]) {
-      return undefined;
+    if (!apiFn) {
+      return;
     }
 
     try {
-      const result = plugin.plugin[api](args, plugin.options);
+      const result = apiFn(args, plugin.options);
 
       if (result && argTransform) {
         args = argTransform({
           args,
           result
         });
-      }
+      } // This if case keeps behaviour as before, we should allow undefined here as the api is defined
+      // TODO V4
 
-      return result;
-    } catch (e) {
-      if (plugin.name !== `default-site-plugin`) {
-        // default-site-plugin is user code and will print proper stack trace,
-        // so no point in annotating error message pointing out which plugin is root of the problem
-        e.message += ` (from plugin: ${plugin.name})`;
+
+      if (typeof result !== `undefined`) {
+        results.push(result);
       }
+    } catch (e) {
+      augmentErrorWithPlugin(plugin, e);
+    }
+  });
+  return results.length ? results : [defaultReturn];
+}
+
+async function apiRunnerAsync(api, args, defaultReturn, argTransform) {
+  if (!apis[api]) {
+    console.log(`This API doesn't exist`, api);
+  }
+
+  const results = [];
 
-      throw e;
+  for (const plugin of plugins) {
+    const apiFn = plugin.plugin[api];
+
+    if (!apiFn) {
+      continue;
     }
-  }); // Filter out undefined results.
 
-  results = results.filter(result => typeof result !== `undefined`);
+    try {
+      const result = await apiFn(args, plugin.options);
 
-  if (results.length > 0) {
-    return results;
-  } else {
-    return [defaultReturn];
+      if (result && argTransform) {
+        args = argTransform({
+          args,
+          result
+        });
+      } // This if case keeps behaviour as before, we should allow undefined here as the api is defined
+      // TODO V4
+
+
+      if (typeof result !== `undefined`) {
+        results.push(result);
+      }
+    } catch (e) {
+      augmentErrorWithPlugin(plugin, e);
+    }
   }
-};
+
+  return results.length ? results : [defaultReturn];
+}

package/cache-dir/commonjs/app.js

@@ -42,7 +42,11 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // Enable fast-refresh for virtual sync-requires, gatsby-browser & navigation
 // To ensure that our <Root /> component can hot reload in case anything below doesn't
 // satisfy fast-refresh constraints
-module.hot.accept([`$virtual/async-requires`, `./api-runner-browser`, `./navigation`]);
+module.hot.accept([`$virtual/async-requires`, `./api-runner-browser`, `./navigation`], () => {
+  // asyncRequires should be automatically updated here (due to ESM import and webpack HMR spec),
+  // but loader doesn't know that and needs to be manually nudged
+  loader.updateAsyncRequires(_asyncRequires.default);
+});
 window.___emitter = _emitter.default;
 const loader = new _devLoader.default(_asyncRequires.default, _matchPaths.default);
 (0, _loader.setLoader)(loader);

package/cache-dir/commonjs/dev-loader.js

@@ -32,15 +32,16 @@ function mergePageEntry(cachedPage, newPageData) {
 class DevLoader extends _loader.BaseLoader {
   constructor(asyncRequires, matchPaths) {
     const loadComponent = chunkName => {
-      if (!asyncRequires.components[chunkName]) {
+      if (!this.asyncRequires.components[chunkName]) {
         throw new Error(`We couldn't find the correct component chunk with the name "${chunkName}"`);
       }
 
-      return asyncRequires.components[chunkName]().then(preferDefault) // loader will handle the case when component is error
+      return this.asyncRequires.components[chunkName]().then(preferDefault) // loader will handle the case when component is error
       .catch(err => err);
     };
 
     super(loadComponent, matchPaths);
+    this.asyncRequires = asyncRequires;
     const socket = (0, _socketIo.default)();
     this.notFoundPagePathsInCaches = new Set();
 
@@ -59,6 +60,10 @@ class DevLoader extends _loader.BaseLoader {
     }
   }
 
+  updateAsyncRequires(asyncRequires) {
+    this.asyncRequires = asyncRequires;
+  }
+
   loadPage(pagePath) {
     const realPath = (0, _findPath.findPath)(pagePath);
     return super.loadPage(realPath).then(result => {

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

@@ -11,8 +11,9 @@ var _server = require("react-dom/server");
 
 var _lodash = require("lodash");
 
-var _apiRunnerSsr = _interopRequireDefault(require("./api-runner-ssr"));
+var _apiRunnerSsr = require("./api-runner-ssr");
 
+/* 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.
@@ -95,7 +96,7 @@ var _default = ({
     postBodyComponents = components;
   };
 
-  (0, _apiRunnerSsr.default)(`onRenderBody`, {
+  (0, _apiRunnerSsr.apiRunner)(`onRenderBody`, {
     setHeadComponents,
     setHtmlAttributes,
     setBodyAttributes,
@@ -104,7 +105,7 @@ var _default = ({
     setBodyProps,
     pathname: pagePath
   });
-  (0, _apiRunnerSsr.default)(`onPreRenderHTML`, {
+  (0, _apiRunnerSsr.apiRunner)(`onPreRenderHTML`, {
     getHeadComponents,
     replaceHeadComponents,
     getPreBodyComponents,
@@ -127,7 +128,7 @@ var _default = ({
     htmlAttributes,
     bodyAttributes,
     preBodyComponents,
-    postBodyComponents: postBodyComponents.concat([/*#__PURE__*/_react.default.createElement("script", {
+    postBodyComponents: postBodyComponents.concat([!BROWSER_ESM_ONLY && /*#__PURE__*/_react.default.createElement("script", {
       key: `polyfill`,
       src: "/polyfill.js",
       noModule: true
@@ -137,7 +138,7 @@ var _default = ({
     }), /*#__PURE__*/_react.default.createElement("script", {
       key: `commons`,
       src: "/commons.js"
-    })])
+    })].filter(Boolean))
   });
 
   htmlStr = (0, _server.renderToStaticMarkup)(htmlElement);

package/cache-dir/commonjs/server-utils/writable-as-promise.js

@@ -0,0 +1,41 @@
+"use strict";
+
+exports.__esModule = true;
+exports.WritableAsPromise = void 0;
+
+var _stream = require("stream");
+
+class WritableAsPromise extends _stream.Writable {
+  constructor() {
+    super();
+    this._output = ``;
+    this._deferred = {
+      promise: null,
+      resolve: null,
+      reject: null
+    };
+    this._deferred.promise = new Promise((resolve, reject) => {
+      this._deferred.resolve = resolve;
+      this._deferred.reject = reject;
+    });
+  }
+
+  _write(chunk, enc, cb) {
+    this._output += chunk.toString();
+    cb();
+  }
+
+  end() {
+    this._deferred.resolve(this._output);
+
+    this.destroy();
+  } // disguise us as a promise
+
+
+  then(resolve, reject) {
+    return this._deferred.promise.then(resolve, reject);
+  }
+
+}
+
+exports.WritableAsPromise = WritableAsPromise;

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

@@ -3,7 +3,7 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports.default = void 0;
+exports.default = staticPage;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -15,7 +15,7 @@ var _lodash = require("lodash");
 
 var _path = _interopRequireDefault(require("path"));
 
-var _apiRunnerSsr = _interopRequireDefault(require("./api-runner-ssr"));
+var _apiRunnerSsr = require("./api-runner-ssr");
 
 var _findPath = require("./find-path");
 
@@ -25,6 +25,7 @@ var _routeAnnouncerProps = require("./route-announcer-props");
 
 var _router = require("@reach/router");
 
+/* 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.
@@ -61,7 +62,7 @@ try {
 
 Html = Html && Html.__esModule ? Html.default : Html;
 
-var _default = (pagePath, isClientOnlyPage, publicDir, error, callback) => {
+async function staticPage(pagePath, isClientOnlyPage, publicDir, error, callback) {
   let bodyHtml = ``;
   let headComponents = [/*#__PURE__*/_react.default.createElement("meta", {
     key: "environment",
@@ -85,7 +86,7 @@ var _default = (pagePath, isClientOnlyPage, publicDir, error, callback) => {
     }, /*#__PURE__*/_react.default.createElement("h1", null, "Failed to Server Render (SSR)"), /*#__PURE__*/_react.default.createElement("h2", null, "Error message:"), /*#__PURE__*/_react.default.createElement("p", null, error.sourceMessage), /*#__PURE__*/_react.default.createElement("h2", null, "File:"), /*#__PURE__*/_react.default.createElement("p", null, error.source, ":", error.line, ":", error.column), /*#__PURE__*/_react.default.createElement("h2", null, "Stack:"), /*#__PURE__*/_react.default.createElement("pre", null, /*#__PURE__*/_react.default.createElement("code", null, error.stack)))]);
   }
 
-  const generateBodyHTML = () => {
+  const generateBodyHTML = async () => {
     const setHeadComponents = components => {
       headComponents = headComponents.concat(components);
     };
@@ -153,8 +154,7 @@ var _default = (pagePath, isClientOnlyPage, publicDir, error, callback) => {
 
     const pageData = getPageData(pagePath);
     const {
-      componentChunkName,
-      staticQueryHashes = []
+      componentChunkName
     } = pageData;
     let scriptsAndStyles = (0, _lodash.flatten)([`commons`].map(chunkKey => {
       const fetchKey = `assetsByChunkName[${chunkKey}]`;
@@ -194,7 +194,7 @@ var _default = (pagePath, isClientOnlyPage, publicDir, error, callback) => {
       }
 
       return chunks;
-    })).filter(s => (0, _lodash.isObject)(s)).sort((s1, s2) => s1.rel == `preload` ? -1 : 1); // given priority to preload
+    })).filter(s => (0, _lodash.isObject)(s)).sort((s1, _s2) => s1.rel == `preload` ? -1 : 1); // given priority to preload
 
     scriptsAndStyles = (0, _lodash.uniqBy)(scriptsAndStyles, item => item.name);
     const styles = scriptsAndStyles.filter(style => style.name && style.name.endsWith(`.css`));
@@ -229,7 +229,7 @@ var _default = (pagePath, isClientOnlyPage, publicDir, error, callback) => {
           pageElement = () => null;
         }
 
-        const wrappedPage = (0, _apiRunnerSsr.default)(`wrapPageElement`, {
+        const wrappedPage = (0, _apiRunnerSsr.apiRunner)(`wrapPageElement`, {
           element: pageElement,
           props
         }, pageElement, ({
@@ -254,7 +254,7 @@ var _default = (pagePath, isClientOnlyPage, publicDir, error, callback) => {
       path: "/*"
     })), /*#__PURE__*/_react.default.createElement("div", _routeAnnouncerProps.RouteAnnouncerProps));
 
-    const bodyComponent = (0, _apiRunnerSsr.default)(`wrapRootElement`, {
+    const bodyComponent = (0, _apiRunnerSsr.apiRunner)(`wrapRootElement`, {
       element: routerElement,
       pathname: pagePath
     }, routerElement, ({
@@ -266,7 +266,7 @@ var _default = (pagePath, isClientOnlyPage, publicDir, error, callback) => {
       };
     }).pop(); // Let the site or plugin render the page component.
 
-    (0, _apiRunnerSsr.default)(`replaceRenderer`, {
+    await (0, _apiRunnerSsr.apiRunnerAsync)(`replaceRenderer`, {
       bodyComponent,
       replaceBodyHTMLString,
       setHeadComponents,
@@ -288,7 +288,7 @@ var _default = (pagePath, isClientOnlyPage, publicDir, error, callback) => {
       }
     }
 
-    (0, _apiRunnerSsr.default)(`onRenderBody`, {
+    (0, _apiRunnerSsr.apiRunner)(`onRenderBody`, {
       setHeadComponents,
       setHtmlAttributes,
       setBodyAttributes,
@@ -297,7 +297,7 @@ var _default = (pagePath, isClientOnlyPage, publicDir, error, callback) => {
       setBodyProps,
       pathname: pagePath
     });
-    (0, _apiRunnerSsr.default)(`onPreRenderHTML`, {
+    (0, _apiRunnerSsr.apiRunner)(`onPreRenderHTML`, {
       getHeadComponents,
       replaceHeadComponents,
       getPreBodyComponents,
@@ -309,7 +309,7 @@ var _default = (pagePath, isClientOnlyPage, publicDir, error, callback) => {
     return bodyHtml;
   };
 
-  const bodyStr = generateBodyHTML();
+  const bodyStr = await generateBodyHTML();
 
   const htmlElement = /*#__PURE__*/_react.default.createElement(Html, { ...bodyProps,
     body: bodyStr,
@@ -320,7 +320,7 @@ var _default = (pagePath, isClientOnlyPage, publicDir, error, callback) => {
     htmlAttributes,
     bodyAttributes,
     preBodyComponents,
-    postBodyComponents: postBodyComponents.concat([/*#__PURE__*/_react.default.createElement("script", {
+    postBodyComponents: postBodyComponents.concat([!BROWSER_ESM_ONLY && /*#__PURE__*/_react.default.createElement("script", {
       key: `polyfill`,
       src: "/polyfill.js",
       noModule: true
@@ -330,12 +330,10 @@ var _default = (pagePath, isClientOnlyPage, publicDir, error, callback) => {
     }), /*#__PURE__*/_react.default.createElement("script", {
       key: `commons`,
       src: "/commons.js"
-    })])
+    })].filter(Boolean))
   });
 
   let htmlStr = (0, _server.renderToStaticMarkup)(htmlElement);
   htmlStr = `<!DOCTYPE html>${htmlStr}`;
   callback(null, htmlStr);
-};
-
-exports.default = _default;
+}

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

@@ -3,7 +3,8 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports.default = exports.sanitizeComponents = void 0;
+exports.default = staticPage;
+exports.sanitizeComponents = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
@@ -13,7 +14,8 @@ const path = require(`path`);
 
 const {
   renderToString,
-  renderToStaticMarkup
+  renderToStaticMarkup,
+  pipeToNodeWritable
 } = require(`react-dom/server`);
 
 const {
@@ -38,7 +40,10 @@ const {
   RouteAnnouncerProps
 } = require(`./route-announcer-props`);
 
-const apiRunner = require(`./api-runner-ssr`);
+const {
+  apiRunner,
+  apiRunnerAsync
+} = require(`./api-runner-ssr`);
 
 const syncRequires = require(`$virtual/sync-requires`);
 
@@ -125,7 +130,7 @@ const ensureArray = components => {
   }
 };
 
-var _default = ({
+async function staticPage({
   pagePath,
   pageData,
   staticQueryContext,
@@ -133,7 +138,7 @@ var _default = ({
   scripts,
   reversedStyles,
   reversedScripts
-}) => {
+}) {
   // for this to work we need this function to be sync or at least ensure there is single execution of it at a time
   global.unsafeBuiltinUsage = [];
 
@@ -276,7 +281,7 @@ var _default = ({
       };
     }).pop()); // Let the site or plugin render the page component.
 
-    apiRunner(`replaceRenderer`, {
+    await apiRunnerAsync(`replaceRenderer`, {
       bodyComponent,
       replaceBodyHTMLString,
       setHeadComponents,
@@ -291,7 +296,27 @@ var _default = ({
 
     if (!bodyHtml) {
       try {
-        bodyHtml = renderToString(bodyComponent);
+        // react 18 enabled
+        if (pipeToNodeWritable) {
+          const {
+            WritableAsPromise
+          } = require(`./server-utils/writable-as-promise`);
+
+          const writableStream = new WritableAsPromise();
+          const {
+            startWriting
+          } = pipeToNodeWritable(bodyComponent, writableStream, {
+            onCompleteAll() {
+              startWriting();
+            },
+
+            onError() {}
+
+          });
+          bodyHtml = await writableStream;
+        } else {
+          bodyHtml = renderToString(bodyComponent);
+        }
       } catch (e) {
         // ignore @reach/router redirect errors
         if (!isRedirect(e)) throw e;
@@ -440,6 +465,4 @@ var _default = ({
     e.unsafeBuiltinsUsage = global.unsafeBuiltinUsage;
     throw e;
   }
-};
-
-exports.default = _default;
+}

package/cache-dir/dev-loader.js

@@ -26,20 +26,21 @@ function mergePageEntry(cachedPage, newPageData) {
 class DevLoader extends BaseLoader {
   constructor(asyncRequires, matchPaths) {
     const loadComponent = chunkName => {
-      if (!asyncRequires.components[chunkName]) {
+      if (!this.asyncRequires.components[chunkName]) {
         throw new Error(
           `We couldn't find the correct component chunk with the name "${chunkName}"`
         )
       }
 
       return (
-        asyncRequires.components[chunkName]()
+        this.asyncRequires.components[chunkName]()
           .then(preferDefault)
           // loader will handle the case when component is error
           .catch(err => err)
       )
     }
     super(loadComponent, matchPaths)
+    this.asyncRequires = asyncRequires
 
     const socket = getSocket()
 
@@ -60,6 +61,10 @@ class DevLoader extends BaseLoader {
     }
   }
 
+  updateAsyncRequires(asyncRequires) {
+    this.asyncRequires = asyncRequires
+  }
+
   loadPage(pagePath) {
     const realPath = findPath(pagePath)
     return super.loadPage(realPath).then(result => {