Upgrade starter to 1.0

Tisha211 · Jul 4, 2017 · 6e19a82 · 6e19a82
1 parent e6c847d
commit 6e19a82
Show file tree

Hide file tree

Showing 15 changed files with 2,500 additions and 2,281 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,4 @@ node_modules
 .gatsby-context.js
 .sass-cache/
 public/
+.cache/
diff --git a/config.toml b/config.toml
diff --git a/gatsby-config.js b/gatsby-config.js
@@ -0,0 +1,6 @@
+module.exports = {
+  siteMetadata: {
+    title: `Gatsby Default Starter`,
+  },
+  plugins: [`gatsby-plugin-react-helmet`],
+}
diff --git a/package.json b/package.json
@@ -4,9 +4,9 @@
   "version": "1.0.0",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "dependencies": {
-    "gatsby": "^0.12.45",
-    "object-assign": "^4.1.1",
-    "react-helmet": "^5.0.3",
+    "gatsby": "next",
+    "gatsby-link": "next",
+    "gatsby-plugin-react-helmet": "next",
     "react-typography": "^0.15.0",
     "typography": "^0.15.8",
     "typography-breakpoint-constants": "^0.14.0",

diff --git a/pages/index.js b/pages/index.js
diff --git a/pages/page-2.js b/pages/page-2.js
diff --git a/css/markdown-styles.css → src/css/markdown-styles.css b/css/markdown-styles.css → src/css/markdown-styles.css
diff --git a/html.js → src/html.js b/html.js → src/html.js
@@ -1,27 +1,26 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import Helmet from 'react-helmet'
+import React from "react"
+import PropTypes from "prop-types"
+import Helmet from "react-helmet"
 
-import { prefixLink } from 'gatsby-helpers'
-import { TypographyStyle } from 'react-typography'
-import typography from './utils/typography'
+import { TypographyStyle } from "react-typography"
+import typography from "./utils/typography"
 
 const BUILD_TIME = new Date().getTime()
 
 export default class HTML extends React.Component {
   static propTypes = {
-    body: PropTypes.string
+    body: PropTypes.string,
   }
 
   render() {
     const head = Helmet.rewind()
 
     let css
-    if (process.env.NODE_ENV === 'production') {
+    if (process.env.NODE_ENV === "production") {
       css = (
         <style
           dangerouslySetInnerHTML={{
-            __html: require('!raw!./public/styles.css'),
+            __html: require("!raw!./public/styles.css"),
           }}
         />
       )
@@ -36,17 +35,16 @@ export default class HTML extends React.Component {
             name="viewport"
             content="width=device-width, initial-scale=1.0"
           />
-          {head.title.toComponent()}
-          {head.meta.toComponent()}
+          {this.props.headComponents}
           <TypographyStyle typography={typography} />
           {css}
         </head>
         <body>
           <div
-            id="react-mount"
+            id="___gatsby"
             dangerouslySetInnerHTML={{ __html: this.props.body }}
           />
-          <script src={prefixLink(`/bundle.js?t=${BUILD_TIME}`)} />
+          {this.props.postBodyComponents}
         </body>
       </html>
     )

diff --git a/pages/_template.jsx → src/layouts/index.js b/pages/_template.jsx → src/layouts/index.js
@@ -1,21 +1,19 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import { Link } from 'react-router'
-import { prefixLink } from 'gatsby-helpers'
-import Helmet from 'react-helmet'
-import { config } from 'config'
-import { rhythm } from '../utils/typography'
+import React from "react"
+import PropTypes from "prop-types"
+import Link from "gatsby-link"
+import Helmet from "react-helmet"
+import { rhythm } from "../utils/typography"
 
 export default class Template extends React.Component {
   static propTypes = {
-    children: PropTypes.any
+    children: PropTypes.func,
   }
 
   render() {
     return (
       <div>
         <Helmet
-          title={config.siteTitle}
+          title="Gatsby Default Starter"
           meta={[
             { name: "description", content: "Sample" },
             { name: "keywords", content: "sample, something" },
@@ -36,7 +34,7 @@ export default class Template extends React.Component {
           >
             <h1 style={{ margin: 0 }}>
               <Link
-                to={prefixLink("/")}
+                to="/"
                 style={{
                   color: "white",
                   textDecoration: "none",
@@ -55,7 +53,7 @@ export default class Template extends React.Component {
             paddingTop: 0,
           }}
         >
-          {this.props.children}
+          {this.props.children()}
         </div>
       </div>
     )

diff --git a/pages/404.md → src/pages/404.md b/pages/404.md → src/pages/404.md
diff --git a/src/pages/index.js b/src/pages/index.js
@@ -0,0 +1,16 @@
+import React from "react"
+import Link from "gatsby-link"
+import Helmet from "react-helmet"
+
+export default class Index extends React.Component {
+  render() {
+    return (
+      <div>
+        <h1>Hi people</h1>
+        <p>Welcome to your new Gatsby site.</p>
+        <p>Now go build something great.</p>
+        <Link to="/page-2/">Go to page 2</Link>
+      </div>
+    )
+  }
+}
diff --git a/src/pages/page-2.js b/src/pages/page-2.js
@@ -0,0 +1,15 @@
+import React from "react"
+import Link from "gatsby-link"
+import Helmet from "react-helmet"
+
+export default class Index extends React.Component {
+  render() {
+    return (
+      <div>
+        <h1>Hi people</h1>
+        <p>Welcome to page 2</p>
+        <Link to="/">Go back to the homepage</Link>
+      </div>
+    )
+  }
+}
diff --git a/utils/typography.js → src/utils/typography.js b/utils/typography.js → src/utils/typography.js
diff --git a/wrappers/md.js b/wrappers/md.js