Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add generator meta tag for gatsby version #8221

Merged
merged 10 commits into from
Sep 17, 2018
Merged

feat: add generator meta tag for gatsby version #8221

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b4918b0
feat: add generator meta tag for gatsby version
DSchau Sep 17, 2018
fcf2e1f
refactor: use cache-dir instead of of webpack config
DSchau Sep 17, 2018
b8a15bc
chore: remove comments
DSchau Sep 17, 2018
e9f1fe0
fix: use join
DSchau Sep 17, 2018
cf7fd8a
refactor: simply require (thanks @pieh)
DSchau Sep 17, 2018
7910e73
refactor: use headComponents array to set generator version
DSchau Sep 17, 2018
110b6eb
chore: remove gatsby version from prop types
DSchau Sep 17, 2018
0b6ac91
Merge branch 'master' into gatsby/generator-version
DSchau Sep 17, 2018
14c377b
test: update snapshots
DSchau Sep 17, 2018
47270ad
test: make snapshots deterministic for gatsby version
DSchau Sep 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/gatsby/cache-dir/default-html.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export default class HTML extends React.Component {
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
/>
{this.props.gatsbyVersion && <meta name="generator" content={`Gatsby ${this.props.gatsbyVersion}`} />}
{this.props.headComponents}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of adding it to the default html component (which is often overrided), set it as a component in headComponents

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was so close to doing it this way instead 🙃 Will do it that way, one sec

</head>
<body {...this.props.bodyAttributes}>
Expand All @@ -32,6 +33,7 @@ HTML.propTypes = {
htmlAttributes: PropTypes.object,
headComponents: PropTypes.array,
bodyAttributes: PropTypes.object,
gatsbyVersion: PropTypes.string,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs removed

Copy link
Contributor Author

@DSchau DSchau Sep 17, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! (and done)

preBodyComponents: PropTypes.array,
body: PropTypes.string,
postBodyComponents: PropTypes.array,
Expand Down
2 changes: 2 additions & 0 deletions packages/gatsby/cache-dir/static-entry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const { get, merge, isObject, flatten, uniqBy } = require(`lodash`)
const apiRunner = require(`./api-runner-ssr`)
const syncRequires = require(`./sync-requires`)
const { dataPaths, pages } = require(`./data.json`)
const { version: gatsbyVersion } = require(`gatsby/package.json`)

// Speed up looking up pages.
const pagesObjectMap = new Map()
Expand Down Expand Up @@ -371,6 +372,7 @@ export default (pagePath, callback) => {
headComponents={headComponents}
htmlAttributes={htmlAttributes}
bodyAttributes={bodyAttributes}
gatsbyVersion={gatsbyVersion}
preBodyComponents={preBodyComponents}
postBodyComponents={postBodyComponents}
body={bodyHtml}
Expand Down