From 65cef38a51ce1ee944527961d76455f83c90832d Mon Sep 17 00:00:00 2001
From: Kyle Mathews
Date: Mon, 2 Apr 2018 15:30:44 -0700
Subject: [PATCH] Manage canonical url with react-helmet so easy for a blog
post to override it
---
.../2018-03-29-migration-from-wordpress-to-gatsby/index.md | 2 +-
www/gatsby-config.js | 6 ------
www/package.json | 1 -
www/src/layouts/index.js | 4 ++++
4 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/docs/blog/2018-03-29-migration-from-wordpress-to-gatsby/index.md b/docs/blog/2018-03-29-migration-from-wordpress-to-gatsby/index.md
index 4e91e3d4a931d..7aedea1c084a4 100644
--- a/docs/blog/2018-03-29-migration-from-wordpress-to-gatsby/index.md
+++ b/docs/blog/2018-03-29-migration-from-wordpress-to-gatsby/index.md
@@ -91,6 +91,6 @@ My blog is now deployed on Netlify CDN, which means the user will be served fast
-Quite a difference, right? Long story short - Gatsby is great. You should give it a try, especially if you are a front-end developer. And keep watching its development as I am sure we can look forward to even more awesomeness in the future. If Gatsby is not your cup of the, you should still consider switching to a static site generator as the advantages are too good to ignore. To learn more about Gatsby Check [this curated list](/docs/awesome-gatsby/) of Gatsby-related resources.
+Quite a difference, right? Long story short - Gatsby is great. You should give it a try, especially if you are a front-end developer. And keep watching its development as I am sure we can look forward to even more awesomeness in the future. If Gatsby is not your cup of the, you should still consider switching to a static site generator as the advantages are too good to ignore. To learn more about Gatsby, check out [this curated list](/docs/awesome-gatsby/) of Gatsby-related resources.
_This article was originally published on [Vojtech Ruzicka's Blog](https://www.vojtechruzicka.com/)._
diff --git a/www/gatsby-config.js b/www/gatsby-config.js
index d3ab2fd99adee..1ceb866a9fb1f 100644
--- a/www/gatsby-config.js
+++ b/www/gatsby-config.js
@@ -34,12 +34,6 @@ module.exports = {
pathToConfigModule: `src/utils/typography`,
},
},
- {
- resolve: `gatsby-plugin-canonical-urls`,
- options: {
- siteUrl: `https://www.gatsbyjs.org`,
- },
- },
`gatsby-transformer-sharp`,
`gatsby-transformer-documentationjs`,
`gatsby-transformer-yaml`,
diff --git a/www/package.json b/www/package.json
index 78ea4b65790af..208dd8083827e 100644
--- a/www/package.json
+++ b/www/package.json
@@ -9,7 +9,6 @@
"gatsby": "^1.9.225",
"gatsby-image": "^1.0.41",
"gatsby-link": "^1.6.38",
- "gatsby-plugin-canonical-urls": "^1.0.15",
"gatsby-plugin-catch-links": "^1.0.19",
"gatsby-plugin-feed": "^1.3.19",
"gatsby-plugin-fullstory": "^1.0.0",
diff --git a/www/src/layouts/index.js b/www/src/layouts/index.js
index 0902fdca7c97e..11df3af9f377b 100644
--- a/www/src/layouts/index.js
+++ b/www/src/layouts/index.js
@@ -125,6 +125,10 @@ class DefaultLayout extends React.Component {
+