Merge branch 'master' into knex-db-defaults-form-submit

.changeset/hungry-seas-rush.md

@@ -0,0 +1,5 @@
+---
+'@keystonejs/app-admin-ui': patch
+---
+
+Fixed items being flagged as changed even if input did not differ.

README.md

@@ -11,7 +11,7 @@
 </div>
 <br>
 
-[![Build Status](https://img.shields.io/circleci/project/github/keystonejs/keystone/master.svg)](https://circleci.com/gh/emotion-js/emotion)
+[![Build Status](https://img.shields.io/circleci/project/github/keystonejs/keystone/master.svg)](https://circleci.com/gh/keystonejs/keystone)
 [![slack](https://keystone-community.now.sh//badge.svg)](https://keystone-community.now.sh/)
 [![Supported by Thinkmill](https://thinkmill.github.io/badge/heart.svg)](http://thinkmill.com.au/?utm_source=github&utm_medium=badge&utm_campaign=react-select)
 

demo-projects/blog/CHANGELOG.md

@@ -1,5 +1,26 @@
 # keystone_demo_blog
 
+## 5.2.1
+
+### Patch Changes
+
+- [`d8a7b8a2`](https://github.com/keystonejs/keystone/commit/d8a7b8a23b4c3e1545d101a92323be165ad362e2) [#2395](https://github.com/keystonejs/keystone/pull/2395) Thanks [@timleslie](https://github.com/timleslie)! - Upgraded all `@emotion.*` dependencies.
+
+* [`535ea6a9`](https://github.com/keystonejs/keystone/commit/535ea6a93d74eced46a8e5711a2e6aafa0dca95b) [#2390](https://github.com/keystonejs/keystone/pull/2390) Thanks [@Vultraz](https://github.com/Vultraz)! - Update `cross-env` dependency to 7.0.0.
+
+- [`d89b7bf7`](https://github.com/keystonejs/keystone/commit/d89b7bf7da85436c7c3a94543370fa5d377f6b33) [#2089](https://github.com/keystonejs/keystone/pull/2089) Thanks [@Vultraz](https://github.com/Vultraz)! - Updated Blog demo to use Apollo hooks.
+
+- Updated dependencies [[`0c9d3125`](https://github.com/keystonejs/keystone/commit/0c9d3125d9b4bb37047a6c6ed61796e52fba8b17), [`7ce804a8`](https://github.com/keystonejs/keystone/commit/7ce804a877300709375e5bc14206080ab15aec54), [`d8a7b8a2`](https://github.com/keystonejs/keystone/commit/d8a7b8a23b4c3e1545d101a92323be165ad362e2), [`5c6ee24c`](https://github.com/keystonejs/keystone/commit/5c6ee24ceea951d7add79af55ef5a408edd8b763), [`9a388f01`](https://github.com/keystonejs/keystone/commit/9a388f01e388272d56f81af2247d8030e0f2c972), [`6b1ea0ec`](https://github.com/keystonejs/keystone/commit/6b1ea0ec1b536b5c9098105f5e77c0cd5feaf6b0), [`7c552a14`](https://github.com/keystonejs/keystone/commit/7c552a14078843710b7f225a88d1cd2024514981), [`b30d1361`](https://github.com/keystonejs/keystone/commit/b30d13612c54c0a3f0ebc2fc9c777954d4c4727f), [`bd4096ee`](https://github.com/keystonejs/keystone/commit/bd4096ee86f7790c76db23090b38f880e5aa7ecc), [`fd94849b`](https://github.com/keystonejs/keystone/commit/fd94849bccaf13426d2f7bcc2cd82fe81da7be7e), [`b14a513e`](https://github.com/keystonejs/keystone/commit/b14a513e3c52e3f41bd4341b7b7faea2b9f8f2e9), [`5e8c6df3`](https://github.com/keystonejs/keystone/commit/5e8c6df3e7c8bee4c76ca4d5be38cd6aff198bd8), [`1b3ee45e`](https://github.com/keystonejs/keystone/commit/1b3ee45e9ec6e52329b208c73e5a3597aea69799), [`dcdd8ed9`](https://github.com/keystonejs/keystone/commit/dcdd8ed9142cf3328a7af80bc167ef93c7669b09), [`3abc5883`](https://github.com/keystonejs/keystone/commit/3abc58831e0f9b5871569a3fa6b21be7dc269cf3), [`8bdbb114`](https://github.com/keystonejs/keystone/commit/8bdbb114f6b2864693ae6e534df6fe8ee8345a60), [`4313b645`](https://github.com/keystonejs/keystone/commit/4313b64554b1cc64e64245706b00c0510a5dd0b4), [`362efbc2`](https://github.com/keystonejs/keystone/commit/362efbc2e054fa48aedb515c54b5a64757832be9), [`c059b63c`](https://github.com/keystonejs/keystone/commit/c059b63c6ebdbb60ac4095d1efd791d598b2756c)]:
+  - @keystonejs/app-admin-ui@5.9.0
+  - @keystonejs/keystone@5.6.0
+  - @arch-ui/layout@0.2.9
+  - @arch-ui/typography@0.0.13
+  - @keystonejs/fields-markdown@5.1.1
+  - @keystonejs/fields-wysiwyg-tinymce@5.1.1
+  - @keystonejs/fields@6.3.1
+  - @keystonejs/oembed-adapters@5.1.1
+  - @keystonejs/app-graphql@5.1.1
+
 ## 5.2.0
 
 ### Minor Changes

demo-projects/blog/app/lib/with-apollo-client.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import initApollo from './init-apollo';
 import Head from 'next/head';
-import { getDataFromTree } from 'react-apollo';
+import { getDataFromTree } from '@apollo/react-ssr';
 
 export default App => {
   return class Apollo extends React.Component {

demo-projects/blog/app/pages/_app.js

@@ -1,7 +1,7 @@
 import App from 'next/app';
 import React from 'react';
 import withApolloClient from '../lib/with-apollo-client';
-import { ApolloProvider } from 'react-apollo';
+import { ApolloProvider } from '@apollo/react-hooks';
 
 class MyApp extends App {
   render() {

demo-projects/blog/app/pages/index.js

@@ -1,7 +1,7 @@
 import Link from 'next/link';
 
 import gql from 'graphql-tag';
-import { Query } from 'react-apollo';
+import { useQuery } from '@apollo/react-hooks';
 
 import { jsx } from '@emotion/core';
 import { format } from 'date-fns';
@@ -41,52 +41,52 @@ const Post = ({ post }) => {
   );
 };
 
-export default () => (
-  <Layout>
-    <Header />
-    <section css={{ margin: '48px 0' }}>
-      <h2>About</h2>
-      <p>
-        This blog was created in KeystoneJS, a fantastic open source framework for developing
-        database-driven websites, applications and APIs in Node.js and GraphQL.
-      </p>
-    </section>
+export default function() {
+  const { data, loading, error } = useQuery(gql`
+    query {
+      allPosts {
+        title
+        id
+        body
+        posted
+        slug
+        image {
+          publicUrl
+        }
+        author {
+          name
+        }
+      }
+    }
+  `);
 
-    <section css={{ margin: '48px 0' }}>
-      <h2>Latest Posts</h2>
-      <Query
-        query={gql`
-          {
-            allPosts {
-              title
-              id
-              body
-              posted
-              slug
-              image {
-                publicUrl
-              }
-              author {
-                name
-              }
-            }
-          }
-        `}
-      >
-        {({ data, loading, error }) => {
-          if (loading) return <p>loading...</p>;
-          if (error) return <p>Error!</p>;
-          return (
-            <div>
-              {data.allPosts.length ? (
-                data.allPosts.map(post => <Post post={post} key={post.id} />)
-              ) : (
-                <p>No posts to display</p>
-              )}
-            </div>
-          );
-        }}
-      </Query>
-    </section>
-  </Layout>
-);
+  return (
+    <Layout>
+      <Header />
+      <section css={{ margin: '48px 0' }}>
+        <h2>About</h2>
+        <p>
+          This blog was created in KeystoneJS, a fantastic open source framework for developing
+          database-driven websites, applications and APIs in Node.js and GraphQL.
+        </p>
+      </section>
+
+      <section css={{ margin: '48px 0' }}>
+        <h2>Latest Posts</h2>
+        {loading ? (
+          <p>loading...</p>
+        ) : error ? (
+          <p>Error!</p>
+        ) : (
+          <div>
+            {data.allPosts.length ? (
+              data.allPosts.map(post => <Post post={post} key={post.id} />)
+            ) : (
+              <p>No posts to display</p>
+            )}
+          </div>
+        )}
+      </section>
+    </Layout>
+  );
+}