Misc

README.md

@@ -1,7 +1,7 @@
 # gatsby-theme-material-ui
 
 > [Gatsby](https://github.com/gatsbyjs/gatsby) themes for
-> [Material-UI](https://github.com/mui-org/material-ui)
+> [Material-UI](https://github.com/mui-org/material-ui): The fastest way to build server-side rendered Material-UI websites
 
 :warning: This is experimental and subject to breaking changes.
 
@@ -15,7 +15,13 @@ This repository is a monorepo managed with [Lerna](https://github.com/lerna/lern
 
 ## Running the examples locally
 
-Clone this repo and run yarn in the root directory. To launch the development server with the hot reloading functionality that allows any change in files in the `src` & `content` folder to be immediately visible in the browser. Run the following command:
+Clone this repo and run yarn in the root directory.
+
+```
+yarn
+```
+
+To launch the development server with the hot reloading functionality that allows any change in files in the `src` & `content` folder to be immediately visible in the browser. Run the following command:
 
 ```
 yarn start:*

examples/blog/package.json

@@ -3,10 +3,10 @@
   "version": "1.0.12",
   "private": true,
   "dependencies": {
-    "@material-ui/core": "next",
-    "@material-ui/icons": "next",
-    "@material-ui/styles": "next",
-    "gatsby": "2.4.2",
+    "@material-ui/core": "4.0.0",
+    "@material-ui/icons": "4.0.0",
+    "@material-ui/styles": "4.0.0",
+    "gatsby": "2.7.1",
     "gatsby-theme-material-ui": "^0.0.22",
     "gatsby-theme-material-ui-blog": "^0.0.15",
     "gatsby-theme-material-ui-layout": "^0.0.5",

examples/composition/package.json

@@ -3,10 +3,10 @@
   "version": "1.0.10",
   "private": true,
   "dependencies": {
-    "@material-ui/core": "next",
-    "@material-ui/icons": "next",
-    "@material-ui/styles": "next",
-    "gatsby": "2.4.2",
+    "@material-ui/core": "4.0.0",
+    "@material-ui/icons": "4.0.0",
+    "@material-ui/styles": "4.0.0",
+    "gatsby": "2.7.1",
     "gatsby-theme-material-ui": "^0.0.22",
     "gatsby-theme-material-ui-album": "^0.0.9",
     "gatsby-theme-material-ui-blog": "^0.0.15",

examples/simple/package.json

@@ -3,9 +3,9 @@
   "version": "1.0.12",
   "private": true,
   "dependencies": {
-    "@material-ui/core": "next",
-    "@material-ui/styles": "next",
-    "gatsby": "2.4.2",
+    "@material-ui/core": "4.0.0",
+    "@material-ui/styles": "4.0.0",
+    "gatsby": "2.7.1",
     "gatsby-theme-material-ui": "^0.0.22",
     "react": "latest",
     "react-dom": "latest",

examples/using-redux/package.json

@@ -3,9 +3,9 @@
   "version": "1.0.12",
   "private": true,
   "dependencies": {
-    "@material-ui/core": "next",
-    "@material-ui/styles": "next",
-    "gatsby": "2.4.2",
+    "@material-ui/core": "4.0.0",
+    "@material-ui/styles": "4.0.0",
+    "gatsby": "2.7.1",
     "gatsby-theme-material-ui": "^0.0.22",
     "react": "latest",
     "react-dom": "latest",

package.json

@@ -1,6 +1,5 @@
 {
-  "name": "gatsby-theme-material-ui-root",
-  "version": "1.0.0",
+  "name": "root",
   "private": true,
   "author": "[email protected]",
   "license": "MIT",
@@ -25,6 +24,6 @@
     "www"
   ],
   "devDependencies": {
-    "lerna": "^3.13.4"
+    "lerna": "^3.14.1"
   }
 }

packages/gatsby-theme-material-ui-blog/package.json

@@ -17,13 +17,13 @@
   "main": "index.js",
   "scripts": {},
   "dependencies": {
-    "@mdx-js/mdx": "^1.0.16",
+    "@mdx-js/mdx": "^1.0.19",
     "@mdx-js/react": "^1.0.16",
-    "gatsby-image": "^2.0.41",
+    "gatsby-image": "^2.1.1",
     "gatsby-mdx": "0.6.3",
-    "gatsby-plugin-sharp": "^2.0.36",
-    "gatsby-remark-images": "^3.0.11",
-    "gatsby-source-filesystem": "^2.0.33",
+    "gatsby-plugin-sharp": "^2.1.1",
+    "gatsby-remark-images": "^3.0.12",
+    "gatsby-source-filesystem": "^2.0.37",
     "gatsby-theme-material-ui": "^0.0.22",
     "gatsby-transformer-sharp": "^2.1.19",
     "material-ui-mdx": "^0.0.7",

packages/gatsby-theme-material-ui-docs/package.json

@@ -17,11 +17,11 @@
   "main": "index.js",
   "scripts": {},
   "dependencies": {
-    "@mdx-js/mdx": "^1.0.16",
+    "@mdx-js/mdx": "^1.0.19",
     "@mdx-js/react": "^1.0.16",
     "gatsby-mdx": "0.6.3",
-    "gatsby-plugin-page-creator": "^2.0.12",
-    "gatsby-source-filesystem": "^2.0.33",
+    "gatsby-plugin-page-creator": "^2.0.13",
+    "gatsby-source-filesystem": "^2.0.37",
     "gatsby-theme-material-ui": "^0.0.22",
     "mkdirp": "^0.5.1"
   },

packages/gatsby-theme-material-ui-landing-page/package.json

@@ -17,8 +17,8 @@
   "main": "index.js",
   "scripts": {},
   "dependencies": {
-    "gatsby-background-image": "^0.5.3",
-    "gatsby-source-filesystem": "^2.0.33",
+    "gatsby-background-image": "^0.6.2",
+    "gatsby-source-filesystem": "^2.0.37",
     "gatsby-theme-material-ui": "^0.0.22",
     "gatsby-transformer-yaml": "^2.1.12",
     "mkdirp": "^0.5.1"

packages/gatsby-theme-material-ui-layout/src/wrap-with-layout.js

@@ -2,5 +2,6 @@ import React from 'react';
 import Layout from './layout';
 
 export default function wrapWithLayout({ element, props }) {
+  console.log('Element', element);
   return <Layout {...props}>{element}</Layout>;
 }

packages/gatsby-theme-material-ui/README.md

@@ -1,7 +1,7 @@
 # gatsby-theme-material-ui
 
 > A [Gatsby](https://github.com/gatsbyjs/gatsby) theme for
-> [Material-UI](https://github.com/mui-org/material-ui)
+> [Material-UI](https://github.com/mui-org/material-ui): The fastest way to build server-side rendered Material-UI websites
 
 :warning: This is experimental and subject to breaking changes.
 

packages/gatsby-theme-material-ui/package.json

@@ -18,13 +18,13 @@
   "scripts": {},
   "dependencies": {
     "gatsby-plugin-compile-es6-packages": "^1.1.0",
-    "gatsby-plugin-material-ui": "next",
+    "gatsby-plugin-material-ui": "^2.0.1",
     "gatsby-plugin-react-helmet": "^3.0.12",
-    "gatsby-plugin-webfonts": "^1.0.1"
+    "gatsby-plugin-webfonts": "^1.0.8"
   },
   "peerDependencies": {
-    "@material-ui/core": ">=4.0.0-beta.0",
-    "@material-ui/styles": ">=4.0.0-beta.0",
+    "@material-ui/core": ">=4.0.0",
+    "@material-ui/styles": ">=4.0.0",
     "gatsby": "^2.0.75",
     "react-helmet": "^5.2.0"
   }

packages/gatsby-theme-material-ui/src/components/button.js

@@ -1,13 +1,5 @@
-import React from 'react';
-import MuiButton from '@material-ui/core/Button';
+import Button from '@material-ui/core/Button';
 
-import GatsbyLink from './gatsby-link';
+import patchBaseButtonComponent from '../utils/patch-base-button-components';
 
-function Button(props) {
-  const { to, href } = props;
-  const component = to || href ? GatsbyLink : 'button';
-
-  return <MuiButton component={component} {...props} />;
-}
-
-export default Button;
+export default patchBaseButtonComponent(Button);

packages/gatsby-theme-material-ui/src/components/card-action-area.js

@@ -1,13 +1,5 @@
-import React from 'react';
-import MuiCardActionArea from '@material-ui/core/CardActionArea';
+import CardActionArea from '@material-ui/core/CardActionArea';
 
-import GatsbyLink from './gatsby-link';
+import patchBaseButtonComponent from '../utils/patch-base-button-components';
 
-function CardActionArea(props) {
-  const { to, href } = props;
-  const component = to || href ? GatsbyLink : 'button';
-
-  return <MuiCardActionArea component={component} {...props} />;
-}
-
-export default CardActionArea;
+export default patchBaseButtonComponent(CardActionArea);

packages/gatsby-theme-material-ui/src/components/fab.js

@@ -0,0 +1,5 @@
+import Fab from '@material-ui/core/Fab';
+
+import patchBaseButtonComponent from '../utils/patch-base-button-components';
+
+export default patchBaseButtonComponent(Fab);

packages/gatsby-theme-material-ui/src/components/icon-button.js

@@ -1,13 +1,5 @@
-import React from 'react';
-import MuiIconButton from '@material-ui/core/IconButton';
+import IconButton from '@material-ui/core/IconButton';
 
-import GatsbyLink from './gatsby-link';
+import patchBaseButtonComponent from '../utils/patch-base-button-components';
 
-function IconButton(props) {
-  const { to, href } = props;
-  const component = to || href ? GatsbyLink : 'button';
-
-  return <MuiIconButton component={component} {...props} />;
-}
-
-export default IconButton;
+export default patchBaseButtonComponent(IconButton);

packages/gatsby-theme-material-ui/src/utils/patch-base-button-components.js

@@ -0,0 +1,12 @@
+import React from 'react';
+
+import GatsbyLink from '../components/gatsby-link';
+
+export default function patchBaseButtonComponent(BaseButtonComponent) {
+  return props => {
+    const { to, href } = props;
+    const component = to || href ? GatsbyLink : 'button';
+
+    return <BaseButtonComponent component={component} {...props} />;
+  };
+}

packages/material-ui-mdx/package.json

@@ -31,12 +31,12 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.4.4",
-    "@babel/core": "^7.4.4",
-    "@babel/preset-env": "^7.4.4",
+    "@babel/core": "^7.4.5",
+    "@babel/preset-env": "^7.4.5",
     "@babel/preset-react": "^7.0.0",
-    "@material-ui/core": "^4.0.0-beta.0",
-    "@material-ui/styles": "^4.0.0-beta.0",
-    "@mdx-js/mdx": "^1.0.16",
+    "@material-ui/core": "^4.0.0",
+    "@material-ui/styles": "^4.0.0",
+    "@mdx-js/mdx": "^1.0.19",
     "@mdx-js/react": "^1.0.16",
     "cross-env": "^5.2.0",
     "react": "^16.8.6",
@@ -45,6 +45,6 @@
   },
   "dependencies": {
     "prism-react-renderer": "^0.1.6",
-    "react-live": "^2.0.1"
+    "react-live": "^2.1.2"
   }
 }

www/README.md

@@ -1,3 +1,3 @@
-# example-composition
+[![Netlify Status](https://api.netlify.com/api/v1/badges/c611085a-2b6f-4ca0-8b5d-99c376829144/deploy-status)](https://app.netlify.com/sites/gatsby-theme-material-ui/deploys)
 
-Gatsby example site that shows how to compose themes.
+# gatsby-theme-material-ui

www/content/posts/test.md

@@ -0,0 +1,6 @@
+---
+title: test
+slug: test
+date: 2019-05-12T18:01:23.120Z
+---
+testhelllollorrrrr

www/gatsby-config.js

@@ -1,5 +1,3 @@
-const fsExpressAPI = require('netlify-cms-backend-fs/dist/fs');
-
 module.exports = {
   siteMetadata: {
     lang: `en`,
@@ -42,6 +40,10 @@ module.exports = {
       options: {
         docsPath: '/docs'
       }
+    },
+    {
+      resolve: `gatsby-theme-netlify-cms`,
+      options: {}
     }
   ],
   plugins: [
@@ -63,17 +65,6 @@ module.exports = {
         useGoogleAnalytics: true
       }
     },
-    {
-      resolve: 'gatsby-plugin-netlify-cms',
-      options: {
-        modulePath: `${__dirname}/src/cms/cms.js`,
-        enableIdentityWidget: false,
-        publicPath: 'admin',
-        htmlTitle: 'Content Manager',
-        manualInit: true
-      }
-    },
-    `gatsby-plugin-netlify`,
     {
       resolve: `gatsby-plugin-manifest`,
       options: {
@@ -87,6 +78,5 @@ module.exports = {
       }
     },
     `gatsby-plugin-offline`
-  ],
-  developMiddleware: fsExpressAPI
+  ]
 };

www/package.json

@@ -3,25 +3,21 @@
   "version": "1.0.8",
   "private": true,
   "dependencies": {
-    "@material-ui/core": "next",
-    "@material-ui/icons": "next",
-    "@material-ui/styles": "next",
+    "@material-ui/core": "4.0.0",
+    "@material-ui/icons": "4.0.0",
+    "@material-ui/styles": "4.0.0",
     "classnames": "^2.2.6",
-    "gatsby": "2.4.2",
-    "gatsby-plugin-google-analytics": "^2.0.19",
+    "gatsby": "2.7.1",
+    "gatsby-plugin-google-analytics": "^2.0.20",
     "gatsby-plugin-manifest": "^2.1.1",
-    "gatsby-plugin-netlify": "^2.0.16",
-    "gatsby-plugin-netlify-cms": "^4.0.0",
-    "gatsby-plugin-offline": "^2.1.0",
-    "gatsby-plugin-performance-metrics": "^1.0.0",
+    "gatsby-plugin-offline": "^2.1.1",
+    "gatsby-plugin-performance-metrics": "^1.0.1",
     "gatsby-theme-material-ui": "^0.0.22",
     "gatsby-theme-material-ui-blog": "^0.0.15",
     "gatsby-theme-material-ui-docs": "^0.0.9",
     "gatsby-theme-material-ui-landing-page": "^0.0.14",
     "gatsby-theme-material-ui-layout": "^0.0.5",
-    "netlify-cms-app": "^2.9.1",
-    "netlify-cms-backend-fs": "^0.4.4",
-    "netlify-cms-widget-mdx": "^0.4.0",
+    "gatsby-theme-netlify-cms": "^0.0.8",
     "react": "latest",
     "react-dom": "latest",
     "react-helmet": "5.2.1"