Merge branch 'master' into fix-access-control-args

keystonejs · Oct 30, 2020 · b3ee14e · b3ee14e
2 parents 90b714d + 574a5f2
commit b3ee14e
Show file tree

Hide file tree

Showing 104 changed files with 449 additions and 369 deletions.
diff --git a/design-system/packages/button/package.json b/design-system/packages/button/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keystone-ui/button",
-  "version": "1.0.0",
+  "version": "0.0.0",
   "private": true,
   "license": "MIT",
   "main": "dist/button.cjs.js",
@@ -10,9 +10,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.12.1",
-    "@keystone-ui/core": "*",
-    "@keystone-ui/icons": "*",
-    "@keystone-ui/loading": "*",
+    "@keystone-ui/core": "^0.0.0",
+    "@keystone-ui/icons": "^0.0.0",
+    "@keystone-ui/loading": "^0.0.0",
     "react": "^16.14.0"
   },
   "engines": {

diff --git a/design-system/packages/core/package.json b/design-system/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keystone-ui/core",
-  "version": "1.0.0",
+  "version": "0.0.0",
   "private": true,
   "license": "MIT",
   "main": "dist/core.cjs.js",

diff --git a/design-system/packages/fields/package.json b/design-system/packages/fields/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keystone-ui/fields",
-  "version": "1.0.0",
+  "version": "0.0.0",
   "private": true,
   "license": "MIT",
   "main": "dist/fields.cjs.js",
@@ -10,8 +10,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.12.1",
-    "@keystone-ui/core": "*",
-    "@keystone-ui/icons": "*",
+    "@keystone-ui/core": "^0.0.0",
+    "@keystone-ui/icons": "^0.0.0",
     "@types/react-select": "^3.0.22",
     "react": "^16.14.0",
     "react-select": "^3.1.0"

diff --git a/design-system/packages/icons/package.json b/design-system/packages/icons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keystone-ui/icons",
-  "version": "1.0.0",
+  "version": "0.0.0",
   "private": true,
   "license": "MIT",
   "main": "dist/icons.cjs.js",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.12.1",
-    "@keystone-ui/core": "*"
+    "@keystone-ui/core": "^0.0.0"
   },
   "peerDependencies": {
     "react": "^16.14.0"

diff --git a/design-system/packages/loading/package.json b/design-system/packages/loading/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keystone-ui/loading",
-  "version": "1.0.0",
+  "version": "0.0.0",
   "private": true,
   "license": "MIT",
   "main": "dist/loading.cjs.js",
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.12.1",
-    "@keystone-ui/core": "*",
+    "@keystone-ui/core": "^0.0.0",
     "react": "^16.14.0"
   },
   "engines": {

diff --git a/design-system/packages/modals/package.json b/design-system/packages/modals/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keystone-ui/modals",
-  "version": "1.0.0",
+  "version": "0.0.0",
   "private": true,
   "license": "MIT",
   "main": "dist/modals.cjs.js",
@@ -10,8 +10,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.12.1",
-    "@keystone-ui/button": "*",
-    "@keystone-ui/core": "*",
+    "@keystone-ui/button": "^0.0.0",
+    "@keystone-ui/core": "^0.0.0",
     "react": "^16.14.0",
     "react-focus-lock": "^2.4.1",
     "react-remove-scroll": "^2.4.0",

diff --git a/design-system/packages/notice/package.json b/design-system/packages/notice/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keystone-ui/notice",
-  "version": "1.0.0",
+  "version": "0.0.0",
   "private": true,
   "license": "MIT",
   "main": "dist/notice.cjs.js",
@@ -10,9 +10,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.12.1",
-    "@keystone-ui/button": "*",
-    "@keystone-ui/core": "*",
-    "@keystone-ui/icons": "*",
+    "@keystone-ui/button": "^0.0.0",
+    "@keystone-ui/core": "^0.0.0",
+    "@keystone-ui/icons": "^0.0.0",
     "react": "^16.14.0"
   },
   "engines": {

diff --git a/design-system/packages/options/package.json b/design-system/packages/options/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keystone-ui/options",
-  "version": "1.0.0",
+  "version": "0.0.0",
   "private": true,
   "license": "MIT",
   "main": "dist/options.cjs.js",
@@ -13,9 +13,9 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.12.1",
-    "@keystone-ui/core": "*",
-    "@keystone-ui/fields": "*",
-    "@keystone-ui/icons": "*",
+    "@keystone-ui/core": "^0.0.0",
+    "@keystone-ui/fields": "^0.0.0",
+    "@keystone-ui/icons": "^0.0.0",
     "@types/react-select": "^3.0.22",
     "react-select": "^3.1.0"
   },

diff --git a/design-system/packages/pill/package.json b/design-system/packages/pill/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keystone-ui/pill",
-  "version": "1.0.0",
+  "version": "0.0.0",
   "private": true,
   "license": "MIT",
   "main": "dist/pill.cjs.js",
@@ -13,8 +13,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.12.1",
-    "@keystone-ui/core": "*",
-    "@keystone-ui/icons": "*"
+    "@keystone-ui/core": "^0.0.0",
+    "@keystone-ui/icons": "^0.0.0"
   },
   "engines": {
     "node": ">=10.0.0"

diff --git a/design-system/packages/popover/package.json b/design-system/packages/popover/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keystone-ui/popover",
-  "version": "1.0.0",
+  "version": "0.0.0",
   "private": true,
   "license": "MIT",
   "main": "dist/popover.cjs.js",
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.12.1",
-    "@keystone-ui/core": "*",
+    "@keystone-ui/core": "^0.0.0",
     "@popperjs/core": "^2.5.3",
     "react-popper": "^2.2.3"
   },

diff --git a/design-system/packages/segmented-control/package.json b/design-system/packages/segmented-control/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keystone-ui/segmented-control",
-  "version": "1.0.0",
+  "version": "0.0.0",
   "private": true,
   "license": "MIT",
   "main": "dist/segmented-control.cjs.js",
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.12.1",
-    "@keystone-ui/core": "*"
+    "@keystone-ui/core": "^0.0.0"
   },
   "peerDependencies": {
     "react": "^16.14.0"

diff --git a/design-system/packages/toast/package.json b/design-system/packages/toast/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keystone-ui/toast",
-  "version": "1.0.0",
+  "version": "0.0.0",
   "private": true,
   "license": "MIT",
   "main": "dist/toast.cjs.js",
@@ -11,8 +11,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.12.1",
-    "@keystone-ui/core": "*",
-    "@keystone-ui/icons": "*"
+    "@keystone-ui/core": "^0.0.0",
+    "@keystone-ui/icons": "^0.0.0"
   },
   "peerDependencies": {
     "react": "^16.14.0"

diff --git a/design-system/packages/tooltip/package.json b/design-system/packages/tooltip/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@keystone-ui/tooltip",
-  "version": "1.0.0",
+  "version": "0.0.0",
   "private": true,
   "license": "MIT",
   "main": "dist/tooltip.cjs.js",
@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.12.1",
-    "@keystone-ui/core": "*",
-    "@keystone-ui/popover": "*"
+    "@keystone-ui/core": "^0.0.0",
+    "@keystone-ui/popover": "^0.0.0"
   },
   "engines": {
     "node": ">=10.0.0"

diff --git a/design-system/website/CHANGELOG.md b/design-system/website/CHANGELOG.md
diff --git a/design-system/website/package.json b/design-system/website/package.json
@@ -1,25 +1,25 @@
 {
   "name": "@keystone-ui/website",
-  "version": "1.0.1",
+  "version": "0.0.0",
   "private": true,
   "license": "MIT",
   "scripts": {
     "dev": "next -p 8080"
   },
   "dependencies": {
     "@babel/runtime": "^7.12.1",
-    "@keystone-ui/button": "*",
-    "@keystone-ui/core": "*",
-    "@keystone-ui/fields": "*",
-    "@keystone-ui/loading": "*",
-    "@keystone-ui/modals": "*",
-    "@keystone-ui/notice": "*",
-    "@keystone-ui/options": "*",
-    "@keystone-ui/pill": "*",
-    "@keystone-ui/popover": "*",
-    "@keystone-ui/segmented-control": "*",
-    "@keystone-ui/toast": "*",
-    "@keystone-ui/tooltip": "*",
+    "@keystone-ui/button": "^0.0.0",
+    "@keystone-ui/core": "^0.0.0",
+    "@keystone-ui/fields": "^0.0.0",
+    "@keystone-ui/loading": "^0.0.0",
+    "@keystone-ui/modals": "^0.0.0",
+    "@keystone-ui/notice": "^0.0.0",
+    "@keystone-ui/options": "^0.0.0",
+    "@keystone-ui/pill": "^0.0.0",
+    "@keystone-ui/popover": "^0.0.0",
+    "@keystone-ui/segmented-control": "^0.0.0",
+    "@keystone-ui/toast": "^0.0.0",
+    "@keystone-ui/tooltip": "^0.0.0",
     "@preconstruct/next": "^2.0.0",
     "@types/react": "^16.9.53",
     "@types/react-dom": "^16.9.9",

diff --git a/examples-next/auth/keystone.ts b/examples-next/auth/keystone.ts
@@ -1,7 +1,7 @@
-import { config } from '@keystone-spike/keystone/schema';
-import { statelessSessions, withItemData } from '@keystone-spike/keystone/session';
+import { config } from '@keystone-next/keystone/schema';
+import { statelessSessions, withItemData } from '@keystone-next/keystone/session';
 import { lists } from './schema';
-import { createAuth } from '@keystone-spike/auth';
+import { createAuth } from '@keystone-next/auth';
 
 /**
  * TODO: Implement validateItem. Would be invoked by the getItem() method in

diff --git a/examples-next/auth/package.json b/examples-next/auth/package.json
@@ -1,16 +1,16 @@
 {
-  "name": "@keystone-spike/example-auth",
-  "version": "1.0.0",
+  "name": "@keystone-next/example-auth",
+  "version": "0.0.0",
   "private": true,
   "license": "MIT",
   "scripts": {
     "dev": "keystone-next"
   },
   "dependencies": {
-    "@keystone-spike/admin-ui": "*",
-    "@keystone-spike/auth": "*",
-    "@keystone-spike/fields": "*",
-    "@keystone-spike/keystone": "*",
+    "@keystone-next/admin-ui": "^0.0.0",
+    "@keystone-next/auth": "^0.0.0",
+    "@keystone-next/fields": "^0.0.0",
+    "@keystone-next/keystone": "^0.0.0",
     "next": "^10.0.0",
     "react": "^16.14.0",
     "react-dom": "^16.14.0"

diff --git a/examples-next/auth/schema.ts b/examples-next/auth/schema.ts
@@ -1,5 +1,5 @@
-import { createSchema, list } from '@keystone-spike/keystone/schema';
-import { text, checkbox, password } from '@keystone-spike/fields';
+import { createSchema, list } from '@keystone-next/keystone/schema';
+import { text, checkbox, password } from '@keystone-next/fields';
 
 export const lists = createSchema({
   User: list({

diff --git a/examples-next/basic/.keystone/schema-types.ts b/examples-next/basic/.keystone/schema-types.ts
@@ -4,7 +4,7 @@ type Scalars = {
   readonly String: string;
   readonly Int: number;
   readonly Float: number;
-  readonly JSON: import('@keystone-spike/types').JSONValue;
+  readonly JSON: import('@keystone-next/types').JSONValue;
 };
 
 export type PostRelateToManyInput = {
@@ -472,11 +472,11 @@ export type UserListTypeInfo = {
 };
 
 export type UserListFn = (
-  listConfig: import('@keystone-spike/keystone/schema').ListConfig<
+  listConfig: import('@keystone-next/keystone/schema').ListConfig<
     UserListTypeInfo,
     UserListTypeInfo['fields']
   >
-) => import('@keystone-spike/keystone/schema').ListConfig<
+) => import('@keystone-next/keystone/schema').ListConfig<
   UserListTypeInfo,
   UserListTypeInfo['fields']
 >;
@@ -516,11 +516,11 @@ export type PostListTypeInfo = {
 };
 
 export type PostListFn = (
-  listConfig: import('@keystone-spike/keystone/schema').ListConfig<
+  listConfig: import('@keystone-next/keystone/schema').ListConfig<
     PostListTypeInfo,
     PostListTypeInfo['fields']
   >
-) => import('@keystone-spike/keystone/schema').ListConfig<
+) => import('@keystone-next/keystone/schema').ListConfig<
   PostListTypeInfo,
   PostListTypeInfo['fields']
 >;

diff --git a/examples-next/basic/admin/config.tsx b/examples-next/basic/admin/config.tsx
@@ -1,8 +1,8 @@
 // import React from 'react';
 
-import { AdminConfig } from '@keystone-spike/types';
+import { AdminConfig } from '@keystone-next/types';
 
-// import { DarkTheme } from '@keystone-spike/admin-ui/themes';
+// import { DarkTheme } from '@keystone-next/admin-ui/themes';
 // export const theme = DarkTheme;
 
 // const CustomLogo = () => <h1>Keystone!</h1>;

diff --git a/examples-next/basic/keystone.ts b/examples-next/basic/keystone.ts
@@ -1,7 +1,7 @@
-import { config } from '@keystone-spike/keystone/schema';
-import { statelessSessions, withItemData } from '@keystone-spike/keystone/session';
+import { config } from '@keystone-next/keystone/schema';
+import { statelessSessions, withItemData } from '@keystone-next/keystone/session';
 import { lists, extendGraphqlSchema } from './schema';
-import { createAuth } from '@keystone-spike/auth';
+import { createAuth } from '@keystone-next/auth';
 
 let sessionSecret = '-- DEV COOKIE SECRET; CHANGE ME --';
 let sessionMaxAge = 60 * 60 * 24 * 30; // 30 days