Merge branch 'master' into gautamsi/add-facebook-login

subhashchy · Apr 1, 2019 · ebdc45c · ebdc45c
2 parents b8f2d50 + 1b8cb17
commit ebdc45c
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 7 deletions.
diff --git a/.changeset/34cf3aa9/changes.json b/.changeset/34cf3aa9/changes.json
@@ -0,0 +1,8 @@
+{
+  "releases": [
+    { "name": "@keystone-alpha/admin-ui", "type": "patch" },
+    { "name": "@keystone-alpha/fields", "type": "patch" },
+    { "name": "@keystone-alpha/test-utils", "type": "patch" }
+  ],
+  "dependents": []
+}
diff --git a/.changeset/34cf3aa9/changes.md b/.changeset/34cf3aa9/changes.md
@@ -0,0 +1 @@
+- Update external dependencies
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -32,6 +32,7 @@ module.exports = {
           '**/tests/**/*.js',
           '**/examples/**/*.js',
           '**/build/**/*.js',
+          `packages/fields/types/**/filterTests.js`,
         ],
       },
     ],

diff --git a/demo-projects/todo/public/index.html b/demo-projects/todo/public/index.html
@@ -21,8 +21,8 @@
     </style>
     <!-- This is really slow, please don't do this in production! -->
     <script src="https://unpkg.com/babel-standalone@6/babel.min.js"></script>
-    <script src="https://unpkg.com/react@16.8.0-alpha.1/umd/react.development.js"></script>
-    <script src="https://unpkg.com/react-dom@16.8.0-alpha.1/umd/react-dom.development.js"></script>
+    <script src="https://unpkg.com/react@16.8.6/umd/react.development.js"></script>
+    <script src="https://unpkg.com/react-dom@16.8.6/umd/react-dom.development.js"></script>
   </head>
   <body>
     <div id="app"></div>

diff --git a/package.json b/package.json
@@ -116,6 +116,7 @@
     "hoist-non-react-statics": "^3.0.1",
     "html-webpack-plugin": "^3.2.0",
     "image-extensions": "^1.1.0",
+    "immutable": "^3.8.1",
     "inflection": "^1.12.0",
     "intersection-observer": "^0.5.1",
     "is-hotkey": "^0.1.4",
@@ -264,6 +265,7 @@
     "is-ci": "^2.0.0",
     "jade": "^1.11.0",
     "jest": "^24.5.0",
+    "jest-haste-map": "^24.5.0",
     "jest-junit": "^6.3.0",
     "jest-resolve": "^24.5.0",
     "mjml-react": "^1.0.51",

diff --git a/packages/admin-ui/package.json b/packages/admin-ui/package.json
@@ -59,6 +59,7 @@
     "express": "^4.16.3",
     "falsey": "^1.0.0",
     "file-loader": "^3.0.1",
+    "graphql": "^14.0.2",
     "graphql-tag": "^2.10.1",
     "html-webpack-plugin": "^3.2.0",
     "lodash.debounce": "^4.0.8",
@@ -85,4 +86,4 @@
     "webpack-dev-middleware": "^3.6.1",
     "webpack-hot-middleware": "^2.24.3"
   }
-}
+}
diff --git a/packages/fields/package.json b/packages/fields/package.json
@@ -32,7 +32,6 @@
     "@keystone-alpha/access-control": "^1.0.2",
     "@keystone-alpha/adapter-knex": "^1.0.4",
     "@keystone-alpha/adapter-mongoose": "^1.0.4",
-    "@keystone-alpha/test-utils": "^1.1.3",
     "@keystone-alpha/utils": "^2.0.0",
     "apollo-errors": "^1.9.0",
     "apply-ref": "^0.1.1",
@@ -43,6 +42,7 @@
     "graphql": "^14.0.2",
     "graphql-tag": "^2.10.1",
     "image-extensions": "^1.1.0",
+    "immutable": "^3.8.1",
     "inflection": "^1.12.0",
     "intersection-observer": "^0.5.1",
     "is-hotkey": "^0.1.4",
@@ -66,6 +66,7 @@
     "slate-react": "^0.21.18"
   },
   "devDependencies": {
+    "@keystone-alpha/test-utils": "^1.1.3",
     "cuid": "^2.1.6"
   },
   "preconstruct": {
@@ -77,4 +78,4 @@
       "types/Content/views/blocks/*"
     ]
   }
-}
+}
diff --git a/packages/fields/types/Float/FilterTests.js → packages/fields/types/Float/filterTests.js b/packages/fields/types/Float/FilterTests.js → packages/fields/types/Float/filterTests.js
@@ -1,6 +1,6 @@
 import { matchFilter } from '@keystone-alpha/test-utils';
 import Text from '../Text';
-import Float from './';
+import Float from '.';
 
 export const name = 'Float';
 

diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
@@ -17,4 +17,4 @@
     "p-finally": "^1.0.0",
     "supertest-light": "^1.0.2"
   }
-}
+}
diff --git a/yarn.lock b/yarn.lock
@@ -10383,6 +10383,11 @@ immutable-tuple@^0.4.9:
   resolved "https://registry.yarnpkg.com/immutable-tuple/-/immutable-tuple-0.4.9.tgz#473ebdd6c169c461913a454bf87ef8f601a20ff0"
   integrity sha512-LWbJPZnidF8eczu7XmcnLBsumuyRBkpwIRPCZxlojouhBo5jEBO4toj6n7hMy6IxHU/c+MqDSWkvaTpPlMQcyA==
 
+immutable@^3.8.1:
+  version "3.8.2"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
+  integrity sha1-wkOZUUVbs5kT2vKBN28VMOEErfM=
+
 immutable@^4.0.0-rc.9:
   version "4.0.0-rc.12"
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0-rc.12.tgz#ca59a7e4c19ae8d9bf74a97bdf0f6e2f2a5d0217"
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,4 +17,4 @@ @@
         "p-finally": "^1.0.0",
         "supertest-light": "^1.0.2"
       }
-    }
+    }