Merge branch 'master' into feat/prism-ts

Author: hasparus

CHANGELOG.md

@@ -5,8 +5,9 @@
 - Removes overriding property on editor combobox
 - Adjust media query sort logic #600
 - Fixed link to Gatsby Plugin page in `getting-started` page. Issue #602
+- Fix broken base-preset link on `theming` page
 
-## v0.3.0 2019-01-22
+## v0.3.0 2020-01-22
 
 - Split theme-ui package into `@theme-ui/core`, `@theme-ui/mdx`, and `@theme-ui/color-modes`
 - Removes `context.components` (still available through MDX context)

examples/codesandbox-starter/package.json

@@ -1,7 +1,7 @@
 {
   "name": "theme-ui-starter",
   "private": "true",
-  "version": "0.4.0-alpha.0",
+  "version": "0.4.0-alpha.1",
   "description": "A sandbox configured with Theme UI, including the `base` theme.",
   "main": "index.html",
   "scripts": {
@@ -11,10 +11,10 @@
   "dependencies": {
     "@emotion/core": "^10.0.17",
     "@mdx-js/react": "^1.4.5",
-    "@theme-ui/presets": "^0.4.0-alpha.0",
+    "@theme-ui/presets": "^0.4.0-alpha.1",
     "react": "^16.12.0",
     "react-dom": "^16.9.0",
-    "theme-ui": "^0.4.0-alpha.0"
+    "theme-ui": "^0.4.0-alpha.1"
   },
   "devDependencies": {
     "@babel/core": "^7.7.4",

examples/custom-pragma/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "custom-pragma-example",
-  "version": "0.4.0-alpha.0",
+  "version": "0.4.0-alpha.1",
   "main": "index.js",
   "author": "Brent Jackson <[email protected]>",
   "license": "MIT",
@@ -17,6 +17,6 @@
     "gatsby-plugin-mdx": "^1.0.4",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
-    "theme-ui": "^0.4.0-alpha.0"
+    "theme-ui": "^0.4.0-alpha.1"
   }
 }

examples/dark-mode/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "dark-mode-theme-ui-example",
-  "version": "0.4.0-alpha.0",
+  "version": "0.4.0-alpha.1",
   "main": "index.js",
   "author": "Brent Jackson <[email protected]>",
   "license": "MIT",
@@ -17,6 +17,6 @@
     "gatsby-plugin-mdx": "^1.0.4",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
-    "theme-ui": "^0.4.0-alpha.0"
+    "theme-ui": "^0.4.0-alpha.1"
   }
 }

examples/gatsby-plugin/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "gatsby-plugin-theme-ui-example",
-  "version": "0.4.0-alpha.0",
+  "version": "0.4.0-alpha.1",
   "main": "index.js",
   "author": "Brent Jackson <[email protected]>",
   "license": "MIT",
@@ -15,10 +15,10 @@
     "@mdx-js/react": "^1.0.16",
     "gatsby": "^2.6.3",
     "gatsby-plugin-mdx": "^1.0.4",
-    "gatsby-plugin-theme-ui": "^0.4.0-alpha.0",
+    "gatsby-plugin-theme-ui": "^0.4.0-alpha.1",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
-    "theme-ui": "^0.4.0-alpha.0"
+    "theme-ui": "^0.4.0-alpha.1"
   },
   "devDependencies": {
     "@testing-library/react": "^9.1.3",

examples/gatsby/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "gatsby-theme-ui-example",
-  "version": "0.4.0-alpha.0",
+  "version": "0.4.0-alpha.1",
   "main": "index.js",
   "author": "Brent Jackson <[email protected]>",
   "license": "MIT",
@@ -17,6 +17,6 @@
     "gatsby-plugin-mdx": "^1.0.4",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
-    "theme-ui": "^0.4.0-alpha.0"
+    "theme-ui": "^0.4.0-alpha.1"
   }
 }

examples/next/components/Header.js

@@ -1,14 +1,16 @@
 import React from 'react'
-import { useColorMode } from 'theme-ui'
+import { Button, useColorMode } from 'theme-ui'
 
-export default function Header() {
+const Header = () => {
   const [colorMode, setColorMode] = useColorMode()
   return (
     <header>
-      <button
+      <Button
         onClick={() => setColorMode(colorMode === 'light' ? 'dark' : 'light')}>
         Toggle {colorMode === 'light' ? 'Dark' : 'Light'}
-      </button>
+      </Button>
     </header>
   )
 }
+
+export default Header

examples/next/next.config.js

@@ -1,4 +1,2 @@
 const withMDX = require('@next/mdx')()
-module.exports = withMDX({
-  pageExtensions: ['js', 'mdx'],
-})
+module.exports = withMDX({ pageExtensions: ['js', 'mdx'] })

examples/next/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "next-theme-ui-example",
-  "version": "0.4.0-alpha.0",
+  "version": "0.4.0-alpha.1",
   "main": "index.js",
   "author": "Brent Jackson <[email protected]>",
   "license": "MIT",
@@ -11,12 +11,11 @@
     "start": "next start"
   },
   "dependencies": {
-    "@emotion/core": "^10.0.15",
-    "@mdx-js/loader": "^1.0.19",
-    "@next/mdx": "^9.0.3",
-    "next": "^9.0.2",
-    "react": "^16.8.6",
-    "react-dom": "^16.8.6",
-    "theme-ui": "^0.4.0-alpha.0"
+    "@mdx-js/loader": "^1.5.8",
+    "@next/mdx": "^9.3.4",
+    "next": "^9.3.4",
+    "react": "^16.13.1",
+    "react-dom": "^16.13.1",
+    "theme-ui": "^0.4.0-alpha.1"
   }
 }

examples/next/pages/_app.js

@@ -1,34 +1,18 @@
 import React from 'react'
-import App from 'next/app'
-import { ThemeProvider, Styled } from 'theme-ui'
+import NextApp from 'next/app'
 
 import Header from '../components/Header'
 import theme from '../src/theme'
+import { ThemeProvider } from 'theme-ui'
 
-class MyApp extends App {
-  // Only uncomment this method if you have blocking data requirements for
-  // every single page in your application. This disables the ability to
-  // perform automatic static optimization, causing every page in your app to
-  // be server-side rendered.
-  //
-  // static async getInitialProps(appContext) {
-  //   // calls page's `getInitialProps` and fills `appProps.pageProps`
-  //   const appProps = await App.getInitialProps(appContext);
-  //
-  //   return { ...appProps }
-  // }
-
+export default class App extends NextApp {
   render() {
     const { Component, pageProps } = this.props
     return (
       <ThemeProvider theme={theme}>
         <Header />
-        <Styled.root>
-          <Component {...pageProps} />
-        </Styled.root>
+        <Component {...pageProps} />
       </ThemeProvider>
     )
   }
 }
-
-export default MyApp