gatsby 4.12.0-next.2 → 4.12.0

package/CHANGELOG.md

@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [4.11.2](https://github.com/gatsbyjs/gatsby/commits/gatsby@4.11.2/packages/gatsby) (2022-04-05)
+
+#### Bug Fixes
+
+- fix intermittent wrong sort results when sorting on materialized field fix [#35271](https://github.com/gatsbyjs/gatsby/issues/35271) fix [#35340](https://github.com/gatsbyjs/gatsby/issues/35340) ([3f703d1](https://github.com/gatsbyjs/gatsby/commit/3f703d14ae79bc81a0b3701da7e10d5d01f19d9c))
+- React 18 Hydration with offline plugin [#35319](https://github.com/gatsbyjs/gatsby/issues/35319) [#35343](https://github.com/gatsbyjs/gatsby/issues/35343) ([af78344](https://github.com/gatsbyjs/gatsby/commit/af783440ae60b8f562bb836d9dde7e23644529d5))
+
 ### [4.11.1](https://github.com/gatsbyjs/gatsby/commits/gatsby@4.11.1/packages/gatsby) (2022-03-31)
 
 #### Bug Fixes

package/cache-dir/app.js

@@ -44,12 +44,18 @@ let reactRender
 let reactHydrate
 if (HAS_REACT_18) {
   const reactDomClient = require(`react-dom/client`)
-  reactRender = (Component, el) =>
-    reactDomClient.createRoot(el).render(Component)
+  reactRender = (Component, el) => {
+    const root = reactDomClient.createRoot(el)
+    root.render(Component)
+    return () => root.unmount()
+  }
   reactHydrate = (Component, el) => reactDomClient.hydrateRoot(el, Component)
 } else {
   const reactDomClient = require(`react-dom`)
-  reactRender = reactDomClient.render
+  reactRender = (Component, el) => {
+    reactDomClient.render(Component, el)
+    return () => ReactDOM.unmountComponentAtNode(el)
+  }
   reactHydrate = reactDomClient.hydrate
 }
 
@@ -163,19 +169,26 @@ apiRunnerAsync(`onClientEntry`).then(() => {
     process.env.GATSBY_QUERY_ON_DEMAND_LOADING_INDICATOR === `true`
   ) {
     let indicatorMountElement
+    let cleanupFn
 
     const showIndicatorTimeout = setTimeout(() => {
       indicatorMountElement = document.createElement(
         `first-render-loading-indicator`
       )
       document.body.append(indicatorMountElement)
-      renderer(<Indicator />, indicatorMountElement)
+      cleanupFn = renderer(<Indicator />, indicatorMountElement)
     }, 1000)
 
     dismissLoadingIndicator = () => {
       clearTimeout(showIndicatorTimeout)
       if (indicatorMountElement) {
-        ReactDOM.unmountComponentAtNode(indicatorMountElement)
+        // If user defined replaceHydrateFunction themselves the cleanupFn return might not be there
+        // So fallback to unmountComponentAtNode for now
+        if (cleanupFn) {
+          cleanupFn()
+        } else {
+          ReactDOM.unmountComponentAtNode(indicatorMountElement)
+        }
         indicatorMountElement.remove()
       }
     }

package/cache-dir/fast-refresh-overlay/components/runtime-errors.js

@@ -53,10 +53,20 @@ function WrappedAccordionItem({ error, open }) {
 }
 
 export function RuntimeErrors({ errors, dismiss }) {
-  const deduplicatedErrors = React.useMemo(
-    () => Array.from(new Set(errors)),
-    [errors]
-  )
+  const deduplicatedErrors = React.useMemo(() => {
+    const errorCache = new Set()
+    const errorList = []
+    errors.forEach(error => {
+      // Second line contains the exact location
+      const secondLine = error.stack.split(`\n`)[1]
+      if (!errorCache.has(secondLine)) {
+        errorList.push(error)
+        errorCache.add(secondLine)
+      }
+    })
+
+    return errorList
+  }, [errors])
   const hasMultipleErrors = deduplicatedErrors.length > 1
 
   return (
@@ -65,7 +75,7 @@ export function RuntimeErrors({ errors, dismiss }) {
         <div data-gatsby-overlay="header__cause-file">
           <h1 id="gatsby-overlay-labelledby">
             {hasMultipleErrors
-              ? `${errors.length} Unhandled Runtime Errors`
+              ? `${deduplicatedErrors.length} Unhandled Runtime Errors`
               : `Unhandled Runtime Error`}
           </h1>
         </div>

package/cache-dir/loader.js

@@ -60,6 +60,9 @@ const doesConnectionSupportPrefetch = () => {
   return true
 }
 
+// Regex that matches common search crawlers
+const BOT_REGEX = /bot|crawler|spider|crawling/i
+
 const toPageResources = (pageData, component = null) => {
   const page = {
     componentChunkName: pageData.componentChunkName,
@@ -388,6 +391,11 @@ export class BaseLoader {
       return false
     }
 
+    // Don't prefetch if this is a crawler bot
+    if (navigator.userAgent && BOT_REGEX.test(navigator.userAgent)) {
+      return false
+    }
+
     // Check if the page exists.
     if (this.pageDb.has(pagePath)) {
       return false

package/cache-dir/production-app.js

@@ -30,11 +30,15 @@ setLoader(loader)
 loader.setApiRunner(apiRunner)
 
 let reactHydrate
+let reactRender
 if (HAS_REACT_18) {
   const reactDomClient = require(`react-dom/client`)
+  reactRender = (Component, el) =>
+    reactDomClient.createRoot(el).render(Component)
   reactHydrate = (Component, el) => reactDomClient.hydrateRoot(el, Component)
 } else {
   const reactDomClient = require(`react-dom`)
+  reactRender = reactDomClient.render
   reactHydrate = reactDomClient.hydrate
 }
 
@@ -258,10 +262,19 @@ apiRunnerAsync(`onClientEntry`).then(() => {
       return <GatsbyRoot>{SiteRoot}</GatsbyRoot>
     }
 
+    const focusEl = document.getElementById(`gatsby-focus-wrapper`)
+
+    // Client only pages have any empty body so we just do a normal
+    // render to avoid React complaining about hydration mis-matches.
+    let defaultRenderer = reactRender
+    if (focusEl && focusEl.children.length) {
+      defaultRenderer = reactHydrate
+    }
+
     const renderer = apiRunner(
       `replaceHydrateFunction`,
       undefined,
-      reactHydrate
+      defaultRenderer
     )[0]
 
     function runRender() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gatsby",
   "description": "Blazing fast modern site generator for React",
-  "version": "4.12.0-next.2",
+  "version": "4.12.0",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bin": {
     "gatsby": "./cli.js"
@@ -35,8 +35,8 @@
     "babel-plugin-add-module-exports": "^1.0.4",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "babel-plugin-lodash": "^3.3.4",
-    "babel-plugin-remove-graphql-queries": "^4.12.0-next.2",
-    "babel-preset-gatsby": "^2.12.0-next.2",
+    "babel-plugin-remove-graphql-queries": "^4.12.0",
+    "babel-preset-gatsby": "^2.12.0",
     "better-opn": "^2.1.1",
     "bluebird": "^3.7.2",
     "body-parser": "^1.19.0",
@@ -78,19 +78,19 @@
     "find-cache-dir": "^3.3.2",
     "fs-exists-cached": "1.0.0",
     "fs-extra": "^10.0.0",
-    "gatsby-cli": "^4.12.0-next.2",
-    "gatsby-core-utils": "^3.12.0-next.2",
-    "gatsby-graphiql-explorer": "^2.12.0-next.0",
-    "gatsby-legacy-polyfills": "^2.12.0-next.0",
-    "gatsby-link": "^4.12.0-next.2",
-    "gatsby-page-utils": "^2.12.0-next.2",
-    "gatsby-parcel-config": "^0.3.0-next.0",
-    "gatsby-plugin-page-creator": "^4.12.0-next.2",
-    "gatsby-plugin-typescript": "^4.12.0-next.2",
-    "gatsby-plugin-utils": "^3.6.0-next.2",
-    "gatsby-react-router-scroll": "^5.12.0-next.1",
-    "gatsby-telemetry": "^3.12.0-next.2",
-    "gatsby-worker": "^1.12.0-next.0",
+    "gatsby-cli": "^4.12.0",
+    "gatsby-core-utils": "^3.12.0",
+    "gatsby-graphiql-explorer": "^2.12.0",
+    "gatsby-legacy-polyfills": "^2.12.0",
+    "gatsby-link": "^4.12.0",
+    "gatsby-page-utils": "^2.12.0",
+    "gatsby-parcel-config": "^0.3.0",
+    "gatsby-plugin-page-creator": "^4.12.0",
+    "gatsby-plugin-typescript": "^4.12.0",
+    "gatsby-plugin-utils": "^3.6.0",
+    "gatsby-react-router-scroll": "^5.12.0",
+    "gatsby-telemetry": "^3.12.0",
+    "gatsby-worker": "^1.12.0",
     "glob": "^7.2.0",
     "globby": "^11.1.0",
     "got": "^11.8.2",
@@ -105,7 +105,7 @@
     "joi": "^17.4.2",
     "json-loader": "^0.5.7",
     "latest-version": "5.1.0",
-    "lmdb": "^2.2.3",
+    "lmdb": "~2.2.3",
     "lodash": "^4.17.21",
     "md5-file": "^5.0.0",
     "meant": "^1.0.3",
@@ -179,7 +179,7 @@
     "@types/string-similarity": "^4.0.0",
     "@types/tmp": "^0.2.0",
     "@types/webpack-virtual-modules": "^0.1.1",
-    "babel-preset-gatsby-package": "^2.12.0-next.0",
+    "babel-preset-gatsby-package": "^2.12.0",
     "copyfiles": "^2.3.0",
     "cross-env": "^7.0.3",
     "documentation": "^13.1.0",
@@ -193,7 +193,7 @@
     "zipkin-transport-http": "^0.22.0"
   },
   "optionalDependencies": {
-    "gatsby-sharp": "^0.6.0-next.1"
+    "gatsby-sharp": "^0.6.0"
   },
   "engines": {
     "node": ">=14.15.0"
@@ -265,5 +265,5 @@
   "yargs": {
     "boolean-negation": false
   },
-  "gitHead": "da4d313c7d3ce70961b32304d17b1d419f63144d"
+  "gitHead": "12e90fce284eb0a64b7d1f15e293027483826372"
 }

package/apis.json

@@ -1,66 +0,0 @@
-{
-  "ssr": {
-    "replaceRenderer": {},
-    "onRenderBody": {},
-    "onPreRenderHTML": {},
-    "wrapPageElement": {},
-    "wrapRootElement": {}
-  },
-  "browser": {
-    "onClientEntry": {},
-    "onInitialClientRender": {},
-    "onPreRouteUpdate": {},
-    "onRouteUpdateDelayed": {},
-    "onRouteUpdate": {},
-    "shouldUpdateScroll": {},
-    "registerServiceWorker": {},
-    "wrapPageElement": {},
-    "wrapRootElement": {},
-    "onPrefetchPathname": {},
-    "onPostPrefetchPathname": {},
-    "disableCorePrefetching": {},
-    "replaceHydrateFunction": {},
-    "onServiceWorkerInstalled": {},
-    "onServiceWorkerUpdateFound": {},
-    "onServiceWorkerUpdateReady": {},
-    "onServiceWorkerActive": {},
-    "onServiceWorkerRedundant": {}
-  },
-  "node": {
-    "resolvableExtensions": {},
-    "createPages": {},
-    "createPagesStatefully": {},
-    "sourceNodes": {},
-    "onCreateNode": {},
-    "unstable_shouldOnCreateNode": {
-      "version": "2.24.80"
-    },
-    "onCreatePage": {},
-    "setFieldsOnGraphQLNodeType": {},
-    "createSchemaCustomization": {
-      "version": "2.12.0"
-    },
-    "createResolvers": {
-      "version": "2.2.0"
-    },
-    "preprocessSource": {},
-    "onCreateBabelConfig": {},
-    "onCreateWebpackConfig": {},
-    "onPreInit": {},
-    "onPluginInit": {
-      "version": "3.9.0"
-    },
-    "onPreBootstrap": {},
-    "onPostBootstrap": {},
-    "onPreBuild": {},
-    "onPostBuild": {},
-    "onPreExtractQueries": {},
-    "onCreateDevServer": {},
-    "pluginOptionsSchema": {
-      "version": "2.25.0"
-    }
-  },
-  "features": [
-    "image-cdn"
-  ]
-}

package/cache-dir/commonjs/api-runner-browser-plugins.js

@@ -1,15 +0,0 @@
-"use strict";
-
-// During bootstrap, we write requires at top of this file which looks
-// basically like:
-// module.exports = [
-//   {
-//     plugin: require("/path/to/plugin1/gatsby-browser.js"),
-//     options: { ... },
-//   },
-//   {
-//     plugin: require("/path/to/plugin2/gatsby-browser.js"),
-//     options: { ... },
-//   },
-// ]
-module.exports = [];

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

@@ -1,55 +0,0 @@
-"use strict";
-
-const plugins = require(`./api-runner-browser-plugins`);
-
-const {
-  getResourceURLsForPathname,
-  loadPage,
-  loadPageSync
-} = require(`./loader`).publicLoader;
-
-exports.apiRunner = (api, args = {}, defaultReturn, argTransform) => {
-  // Hooks for gatsby-cypress's API handler
-  if (process.env.CYPRESS_SUPPORT) {
-    if (window.___apiHandler) {
-      window.___apiHandler(api);
-    } else if (window.___resolvedAPIs) {
-      window.___resolvedAPIs.push(api);
-    } else {
-      window.___resolvedAPIs = [api];
-    }
-  }
-
-  let results = plugins.map(plugin => {
-    if (!plugin.plugin[api]) {
-      return undefined;
-    }
-
-    args.getResourceURLsForPathname = getResourceURLsForPathname;
-    args.loadPage = loadPage;
-    args.loadPageSync = loadPageSync;
-    const result = plugin.plugin[api](args, plugin.options);
-
-    if (result && argTransform) {
-      args = argTransform({
-        args,
-        result,
-        plugin
-      });
-    }
-
-    return result;
-  }); // Filter out undefined results.
-
-  results = results.filter(result => typeof result !== `undefined`);
-
-  if (results.length > 0) {
-    return results;
-  } else if (defaultReturn) {
-    return [defaultReturn];
-  } else {
-    return [];
-  }
-};
-
-exports.apiRunnerAsync = (api, args, defaultReturn) => plugins.reduce((previous, next) => next.plugin[api] ? previous.then(() => next.plugin[api](args, next.options)) : previous, Promise.resolve());

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

@@ -1,101 +0,0 @@
-"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 = [
-//   {
-//     plugin: require("/path/to/plugin1/gatsby-ssr.js"),
-//     options: { ... },
-//   },
-//   {
-//     plugin: require("/path/to/plugin2/gatsby-ssr.js"),
-//     options: { ... },
-//   },
-// ]
-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;
-}
-
-function apiRunner(api, args, defaultReturn, argTransform) {
-  if (!apis[api]) {
-    console.log(`This API doesn't exist`, api);
-  }
-
-  const results = [];
-  plugins.forEach(plugin => {
-    const apiFn = plugin.plugin[api];
-
-    if (!apiFn) {
-      return;
-    }
-
-    try {
-      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
-
-
-      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 = [];
-
-  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];
-}