Skip to content

Commit cce7cda

Browse files
committed
Merge branch 'master' into feat/add-contentful-node-manifest
2 parents 3973b2b + 3f2d581 commit cce7cda

File tree

441 files changed

+17940
-18678
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

441 files changed

+17940
-18678
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import React from "react"
2+
import Layout from "./src/components/layout"
3+
4+
export const wrapPageElement = ({ element, props }) => (
5+
<Layout {...props}>{element}</Layout>
6+
)

packages/gatsby-admin/gatsby-config.js deprecated-packages/gatsby-admin/gatsby-config.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module.exports = {
22
plugins: [
3-
"gatsby-plugin-react-helmet",
3+
`gatsby-plugin-react-helmet`,
44
{
5-
resolve: "gatsby-plugin-webfonts",
5+
resolve: `gatsby-plugin-webfonts`,
66
options: {
77
fonts: {
88
google: [
@@ -15,9 +15,9 @@ module.exports = {
1515
},
1616
},
1717
{
18-
resolve: "gatsby-plugin-create-client-paths",
18+
resolve: `gatsby-plugin-create-client-paths`,
1919
options: {
20-
prefixes: ["/plugins/*"],
20+
prefixes: [`/plugins/*`],
2121
},
2222
},
2323
],
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
exports.onCreateWebpackConfig = ({ actions }) => {
2+
actions.setWebpackConfig({
3+
resolve: {
4+
alias: {
5+
path: require.resolve(`path-browserify`),
6+
},
7+
},
8+
})
9+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// NOOP

docs/docs/building-an-ecommerce-site-with-shopify.md

+2-2

docs/docs/glossary/hydration.md

+3-3

docs/docs/how-to/performance/improving-site-performance.md

+1-1

docs/docs/how-to/sourcing-data/headless-cms.md

+18-18

docs/docs/images/error-overlays.jpg

376 KB

docs/docs/reference/built-in-components/gatsby-image.md

+1-1

docs/docs/reference/graphql-data-layer/node-model.md

+3-3

0 commit comments

Comments
 (0)