Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
bodaso committed Dec 13, 2017
2 parents 388b89d + c6e60cb commit dfddbf2
Show file tree
Hide file tree
Showing 95 changed files with 579 additions and 161 deletions.
49 changes: 49 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<!--
If you're reading this... it means that you want to contribute to the project! Awesome and thanks!
To make it easier for us to help you — please follow the suggested format below (as it makes sense).
Useful Links:
- Documentation: https://www.gatsbyjs.org/docs/
- How to Contribute: https://www.gatsbyjs.org/docs/how-to-contribute/
- Become a Sponsor: https://opencollective.com/gatsby#sponsor
Before opening a new issue, please search existing issues (https://github.com/gatsbyjs/gatsby/issues)
to double-check your issue isn't already known.
-->

## Description

Describe the issue or the enhancement that you want to see.

### Environment

Gatsby version:
Node.js version:
Operating System:

### File contents (if changed):

`gatsby-config.js`: <!-- code block or not changed -->
`package.json`: <!-- code block or not changed -->
`gatsby-node.js`: <!-- code block or not changed -->
`gatsby-browser.js`: <!-- code block or not changed -->
`gatsby-ssr.js`: <!-- code block or not changed -->

### Actual result

What happened.

### Expected behavior

What should happen?

### Steps to reproduce

1\.

2\.

3\.

...
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ Websites built with Gatsby:
* [heml.io](https://heml.io)
([source](https://github.com/SparkPost/heml.io))
* [伊撒尔の窝](https://www.yisaer.com)
* [Artivest's Public Website](https://artivest.co)
* [William Owen UK](http://william-owen.co.uk)

## Docs

Expand Down
2 changes: 1 addition & 1 deletion docs/blog/gatsbygram-case-study/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ Every page will be rendered as children of the `Layout` component:
```jsx
<Layout>
<Page />
</Layout>;
</Layout>
```

Gatsbygram's layout component is somewhat more complicated than most sites as it
Expand Down
8 changes: 4 additions & 4 deletions docs/docs/awesome-gatsby.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ A curated list of interesting Gatsby community projects and learning resources.

## Gatsby tutorials

- [Official tutorial](/tutorial/)
- [Level Up Tutorials series on creating a blog](https://www.youtube.com/watch?v=b2H7fWhQcdE&list=PLLnpHn493BHHfoINKLELxDch3uJlSapxg)
- [Giraffe Academy series on getting started with Gatsby](https://www.youtube.com/playlist?list=PLLAZ4kZ9dFpMXuwazIt4mWtTuqOHdjRlk)
- [Egghead course — "Build a Blog with React and Markdown using Gatsby"](https://egghead.io/courses/build-a-blog-with-react-and-markdown-using-gatsby)
* [Official tutorial](/tutorial/)
* [Level Up Tutorials series on creating a blog](https://www.youtube.com/watch?v=b2H7fWhQcdE&list=PLLnpHn493BHHfoINKLELxDch3uJlSapxg)
* [Giraffe Academy series on getting started with Gatsby](https://www.youtube.com/playlist?list=PLLAZ4kZ9dFpMXuwazIt4mWtTuqOHdjRlk)
* [Egghead course — "Build a Blog with React and Markdown using Gatsby"](https://egghead.io/courses/build-a-blog-with-react-and-markdown-using-gatsby)
2 changes: 1 addition & 1 deletion docs/docs/custom-html.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ If you see this error: `Uncaught Error: _registerComponent(...): Target containe
key={`body`}
id="___gatsby"
dangerouslySetInnerHTML={{ __html: this.props.body }}
/>;
/>
```
11 changes: 11 additions & 0 deletions docs/docs/gatsby-starters.md
Original file line number Diff line number Diff line change
Expand Up @@ -277,3 +277,14 @@ Community:
* Create presentations/slides using Gatsby.
* Offline support.
* Page transitions.

* [gatsby-starter-forty](https://github.com/ChangoMan/gatsby-starter-forty)
[(demo)](http://gatsby-forty.surge.sh/)

Features:

* Based off of the Forty site template. Designed by
[HTML5 UP](https://html5up.net/forty)
* Colorful homepage, and also includes a Landing Page and Generic Page components.
* Many elements are available, including buttons, forms, tables, and pagination.
* Styling with SCSS
2 changes: 1 addition & 1 deletion docs/docs/migrating-from-v0-to-v1.md
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ your `html.js` should look like:
<body>
<div id="___gatsby" dangerouslySetInnerHTML={{ __html: this.props.body }} />
{this.props.postBodyComponents}
</body>;
</body>
```

## \_template.js is now src/layouts/index.js
Expand Down
4 changes: 3 additions & 1 deletion docs/docs/plugins.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ root.

## Community Plugins

* [gatsby-plugin-accessibilityjs](https://github.com/alampros/gatsby-plugin-accessibilityjs)
* [gatsby-plugin-antd](https://github.com/bskimball/gatsby-plugin-antd)
* [gatsby-plugin-copy](https://github.com/aquilio/gatsby-plugin-copy)
* [gatsby-plugin-elasticlunr-search](https://github.com/andrew-codes/gatsby-plugin-elasticlunr-search)
Expand All @@ -142,12 +143,13 @@ root.
* [gatsby-plugin-yandex-metrika](https://github.com/viatsko/gatsby-plugin-yandex-metrika)
* [gatsby-remark-emoji](https://github.com/Rulikkk/gatsby-remark-emoji)
* [gatsby-remark-external-links](https://github.com/JLongley/gatsby-remark-external-links)
* [gatsby-remark-flowchart](https://github.com/liudonghua123/gatsby-remark-flowchart)
* [gatsby-remark-graph](https://github.com/konsumer/gatsby-remark-graph)
* [gatsby-remark-sequence](https://github.com/liudonghua123/gatsby-remark-sequence)
* [gatsby-source-datocms](https://github.com/datocms/gatsby-source-datocms)
* [gatsby-source-github](https://github.com/mosch/gatsby-source-github)
* [gatsby-source-google-sheets](https://github.com/brandonmp/gatsby-source-google-sheets)
* [gatsby-source-soundcloud](https://github.com/jedidiah/gatsby-source-soundcloud)
* [gatsby-source-stripe](https://github.com/njosefbeck/gatsby-source-stripe)
* [gatsby-source-twitch](https://github.com/jedidiah/gatsby-source-twitch)
* [gatsby-source-workable](https://github.com/tumblbug/gatsby-source-workable)

4 changes: 2 additions & 2 deletions docs/features/gatsby-specs.csv
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Developer Experience,Maintenance & Extensibility,Serverless,3,3,2,2,"<p>Serverle
,Modern code syntax,Asset pipelines,3,1,1,0,"<p>Asset pipelines are the compilers of the web stack -- turning images and code in a variety of developer-friendly languages (SCSS, LESS, CSS modules, templates, JSX, JS modules, ES7, ES6, Typescript, Flow...) into minified, raw HTML, CSS and JS that browsers can parse.</p>

<p>Gatsby provides asset pipelining out of the box through its build system on top of Webpack and Babel. Wordpress and Jekyll don't provide this, although you could set up your own. Squarespace has a limited and tightly controlled development environment (no local development) that doesn't allow for creating an asset pipeline.</p>"
,,CSS Extensions (eg Sass),3,1,1,1,"Languages such as Sass and Less compile to CSS while offering support for variables, functions, hierarchal class definitions; libraries like glamor and aphrodite allow css to be colocated with JS and HTML in React. This solves problems in vanilla CSS like global namespacing, non-determinatism, dead code elimination and minification"
,,CSS Extensions (eg Sass),3,3,1,1,"Languages such as Sass and Less compile to CSS while offering support for variables, functions, hierarchal class definitions; libraries like glamor and aphrodite allow css to be colocated with JS and HTML in React. This solves problems in vanilla CSS like global namespacing, non-determinatism, dead code elimination and minification"
,,Advanced Javascript syntax,3,1,1,0,"Javascript has become more powerful as a language in the last several years, making it easier to write code. These include:
<ul>
<li><b>Syntactic sugar</b>: arrow functions, destructuring, template strings, dynamic object property names.</li>
Expand All @@ -67,4 +67,4 @@ Ecosystem,Ecosystem,Component ecosystem,3,0,3,0,"React has several sets of out-o
,,Theme ecosystem,2,2,3,3,"Gatsby offers various themes through Typography.js, and Jekyll has themes built on it as well. Wordpress and Squarespace offer support for multiple themes through theme selectors out of the box."
Design,Faster design iterations,Programmatic Design,2,0,0,0,"Gatsby offers support for programmatic design by being built on <a href=""https://kyleamathews.github.io/typography.js/"">Typography.js</a>."
,,Design systems,2,0,0,0,"Gatsby offers native support for design systems through react-sketch, a tool allowing you to export your production React components into Sketch. Other frameworks aren't plugged into the React ecosystem."
,,Component library,2,0,0,0,"Gatsby offers native support for component libraries through react-sketch, a tool allowing you to export your production React components into Sketch. Other frameworks aren't plugged into the React ecosystem."
,,Component library,2,0,0,0,"Gatsby offers native support for component libraries through react-sketch, a tool allowing you to export your production React components into Sketch. Other frameworks aren't plugged into the React ecosystem."
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"jest-cli": "^20.0.4",
"lerna": "^2.1.1",
"plop": "^1.8.1",
"prettier": "^1.9.1",
"prettier": "^1.9.2",
"prettier-eslint-cli": "4.2.x",
"remotedev-server": "^0.2.3",
"rimraf": "^2.6.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-1-config-css-modules/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gatsby-1-config-css-modules",
"version": "1.0.7",
"version": "1.0.8",
"description": "CSS Modules configuration for Gatsby v1 plugins",
"main": "index.js",
"scripts": {
Expand Down
3 changes: 2 additions & 1 deletion packages/gatsby-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "gatsby-cli",
"description": "Gatsby command-line interface for creating new sites and running Gatsby commands",
"version": "1.1.25",
"version": "1.1.27",
"author": "Kyle Mathews <mathews.kyle@gmail.com>",
"bin": {
"gatsby": "lib/index.js"
Expand All @@ -24,6 +24,7 @@
"resolve-cwd": "^2.0.0",
"source-map": "^0.5.7",
"stack-trace": "^0.0.10",
"update-notifier": "^2.3.0",
"yargs": "^8.0.2",
"yurnalist": "^0.2.1"
},
Expand Down
5 changes: 5 additions & 0 deletions packages/gatsby-cli/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ global.Promise = require(`bluebird`)
const version = process.version
const verDigit = Number(version.match(/\d+/)[0])

const pkg = require(`../package.json`)
const updateNotifier = require(`update-notifier`)
// Check if update is available
updateNotifier({ pkg }).notify()

if (verDigit < 4) {
report.panic(
`Gatsby 1.0+ requires node.js v4 or higher (you have ${version}). \n` +
Expand Down
11 changes: 9 additions & 2 deletions packages/gatsby-image/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ Note,
you can not currently use these fragments in the GraphiQL IDE.

Plugins supporting `gatsby-image` currently include
[gatsby-transformer-sharp](/packages/gatsby-transformer-sharp/) and
[gatsby-source-contentful](/packages/gatsby-source-contentful/).
[gatsby-transformer-sharp](/packages/gatsby-transformer-sharp/),
[gatsby-source-contentful](/packages/gatsby-source-contentful/) and [gatsby-source-datocms](https://github.com/datocms/gatsby-source-datocms).

Their fragments are:

Expand All @@ -145,6 +145,13 @@ Their fragments are:
* `GatsbyContentfulSizes`
* `GatsbyContentfulSizes_noBase64`

### gatsby-source-datocms

* `GatsbyDatoCmsResolutions`
* `GatsbyDatoCmsResolutions_noBase64`
* `GatsbyDatoCmsSizes`
* `GatsbyDatoCmsSizes_noBase64`

If you don't want to use the blur-up effect, choose the fragment with `noBase64`
at the end. If you want to use the traced placeholder SVGs, choose the fragment
with `tracedSVG` at the end.
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-image/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gatsby-image",
"version": "1.0.27",
"version": "1.0.29",
"description": "Lazy-loading React image component with optional support for the blur-up effect.",
"main": "index.js",
"scripts": {
Expand Down
23 changes: 23 additions & 0 deletions packages/gatsby-image/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,17 @@ class Image extends React.Component {
}}
/>
)}

{/* Show the original image during server-side rendering if JavaScript is disabled */}
<noscript>
<Img
alt={alt}
title={title}
srcSet={image.srcSet}
src={image.src}
sizes={image.sizes}
/>
</noscript>
</div>
</div>
)
Expand Down Expand Up @@ -374,6 +385,18 @@ class Image extends React.Component {
}}
/>
)}

{/* Show the original image during server-side rendering if JavaScript is disabled */}
<noscript>
<Img
alt={alt}
title={title}
width={image.width}
height={image.height}
srcSet={image.srcSet}
src={image.src}
/>
</noscript>
</div>
</div>
)
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-link/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gatsby-link",
"version": "1.6.30",
"version": "1.6.31",
"description": "An enhanced Link component for Gatsby sites with support for resource prefetching",
"main": "index.js",
"types": "index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-plugin-canonical-urls/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gatsby-plugin-canonical-urls",
"version": "1.0.9",
"version": "1.0.10",
"description": "Stub description for gatsby-plugin-canonical-urls",
"main": "index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-plugin-catch-links/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gatsby-plugin-catch-links",
"version": "1.0.13",
"version": "1.0.14",
"description": "Intercepts local links from markdown and other non-react pages and does a client-side pushState to avoid the browser having to refresh the page.",
"main": "index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-plugin-coffeescript/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "gatsby-plugin-coffeescript",
"description": "Adds CoffeeScript support for Gatsby layouts and pages.",
"version": "1.4.7",
"version": "1.4.8",
"author": "Kyle Mathews <mathews.kyle@gmail.com>",
"contributors": [
"Noah Lange <noahrlange@gmail.com>"
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-plugin-emotion/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gatsby-plugin-emotion",
"version": "1.1.9",
"version": "1.1.10",
"description": "Gatsby plugin to add support for Emotion",
"main": "index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-plugin-feed/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gatsby-plugin-feed",
"version": "1.3.14",
"version": "1.3.15",
"description": "Creates an RSS feed for your Gatsby site.",
"main": "index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-plugin-glamor/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "gatsby-plugin-glamor",
"description": "Gatsby plugin to add support for Glamor",
"version": "1.6.9",
"version": "1.6.10",
"author": "Kyle Mathews <mathews.kyle@gmail.com>",
"dependencies": {
"babel-runtime": "^6.26.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-plugin-google-analytics/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "gatsby-plugin-google-analytics",
"description": "Gatsby plugin to add google analytics onto a site",
"version": "1.0.13",
"version": "1.0.14",
"author": "Kyle Mathews <mathews.kyle@gmail.com>",
"devDependencies": {
"babel-cli": "^6.26.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-plugin-google-tagmanager/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "gatsby-plugin-google-tagmanager",
"description": "Gatsby plugin to add google tagmanager onto a site",
"version": "1.0.10",
"version": "1.0.12",
"author": "Thijs Koerselman <thijs@vauxlab.com>",
"devDependencies": {
"babel-cli": "^6.26.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-plugin-google-tagmanager/src/gatsby-ssr.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ exports.onRenderBody = (
height="0"
width="0"
style="display: none; visibility: hidden"
/>`,
></iframe>`,
}}
/>,
])
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-plugin-jss/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gatsby-plugin-jss",
"version": "1.5.7",
"version": "1.5.8",
"description": "Gatsby plugin that adds SSR support for JSS",
"main": "index.js",
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions packages/gatsby-plugin-less/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "gatsby-plugin-less",
"description": "Stub description for gatsby-plugin-less",
"version": "1.0.7",
"version": "1.0.8",
"author": "Ming Aldrich-Gan <mingaldrichgan@gmail.com>",
"dependencies": {
"babel-runtime": "^6.26.0",
"extract-text-webpack-plugin": "^1.0.1",
"gatsby-1-config-css-modules": "^1.0.7",
"gatsby-1-config-css-modules": "^1.0.8",
"less": "^2.7.2",
"less-loader": "^3.0.0",
"webpack": "^1.13.3"
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-plugin-lodash/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gatsby-plugin-lodash",
"version": "1.0.5",
"version": "1.0.6",
"description": "Easy modular Lodash builds. Adds the Lodash webpack & Babel plugins to your Gatsby build",
"main": "index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-plugin-manifest/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gatsby-plugin-manifest",
"version": "1.0.9",
"version": "1.0.10",
"description": "Gatsby plugin which adds a manifest.json to make sites progressive web apps",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit dfddbf2

Please sign in to comment.