create-keystone-app 5.0.1 → 6.0.1

package/starter/.keystone/admin/pages/_app.js

@@ -1,187 +1,19 @@
 import { getApp } from '@keystone-next/keystone/___internal-do-not-use-will-break-in-patch/admin-ui/pages/App';
 
-import * as view0 from '../../../../../node_modules/@keystone-next/keystone/___internal-do-not-use-will-break-in-patch/admin-ui/id-field-view';
-import * as view1 from '../../../../../node_modules/@keystone-next/keystone/fields/types/text/views';
-import * as view2 from '../../../../../node_modules/@keystone-next/keystone/fields/types/password/views';
-import * as view3 from '../../../../../node_modules/@keystone-next/keystone/fields/types/relationship/views';
-import * as view4 from '../../../../../node_modules/@keystone-next/keystone/fields/types/select/views';
-import * as view5 from '../../../../../node_modules/@keystone-next/fields-document/views';
-import * as view6 from '../../../../../node_modules/@keystone-next/keystone/fields/types/timestamp/views';
+import * as view0 from "../../../../../node_modules/@keystone-next/keystone/___internal-do-not-use-will-break-in-patch/admin-ui/id-field-view";
+import * as view1 from "../../../../../node_modules/@keystone-next/keystone/fields/types/text/views";
+import * as view2 from "../../../../../node_modules/@keystone-next/keystone/fields/types/password/views";
+import * as view3 from "../../../../../node_modules/@keystone-next/keystone/fields/types/relationship/views";
+import * as view4 from "../../../../../node_modules/@keystone-next/keystone/fields/types/select/views";
+import * as view5 from "../../../../../node_modules/@keystone-next/fields-document/views";
+import * as view6 from "../../../../../node_modules/@keystone-next/keystone/fields/types/timestamp/views";
 
 var adminConfig = {};
 
 export default getApp({
-  lazyMetadataQuery: {
-    kind: 'Document',
-    definitions: [
-      {
-        kind: 'OperationDefinition',
-        operation: 'query',
-        selectionSet: {
-          kind: 'SelectionSet',
-          selections: [
-            {
-              kind: 'Field',
-              name: {
-                kind: 'Name',
-                value: 'keystone',
-                loc: { start: 22, end: 30 },
-              },
-              arguments: [],
-              directives: [],
-              selectionSet: {
-                kind: 'SelectionSet',
-                selections: [
-                  {
-                    kind: 'Field',
-                    name: {
-                      kind: 'Name',
-                      value: 'adminMeta',
-                      loc: { start: 39, end: 48 },
-                    },
-                    arguments: [],
-                    directives: [],
-                    selectionSet: {
-                      kind: 'SelectionSet',
-                      selections: [
-                        {
-                          kind: 'Field',
-                          name: {
-                            kind: 'Name',
-                            value: 'lists',
-                            loc: { start: 59, end: 64 },
-                          },
-                          arguments: [],
-                          directives: [],
-                          selectionSet: {
-                            kind: 'SelectionSet',
-                            selections: [
-                              {
-                                kind: 'Field',
-                                name: {
-                                  kind: 'Name',
-                                  value: 'key',
-                                  loc: { start: 77, end: 80 },
-                                },
-                                arguments: [],
-                                directives: [],
-                                loc: { start: 77, end: 80 },
-                              },
-                              {
-                                kind: 'Field',
-                                name: {
-                                  kind: 'Name',
-                                  value: 'isHidden',
-                                  loc: { start: 91, end: 99 },
-                                },
-                                arguments: [],
-                                directives: [],
-                                loc: { start: 91, end: 99 },
-                              },
-                              {
-                                kind: 'Field',
-                                name: {
-                                  kind: 'Name',
-                                  value: 'fields',
-                                  loc: { start: 110, end: 116 },
-                                },
-                                arguments: [],
-                                directives: [],
-                                selectionSet: {
-                                  kind: 'SelectionSet',
-                                  selections: [
-                                    {
-                                      kind: 'Field',
-                                      name: {
-                                        kind: 'Name',
-                                        value: 'path',
-                                        loc: { start: 131, end: 135 },
-                                      },
-                                      arguments: [],
-                                      directives: [],
-                                      loc: { start: 131, end: 135 },
-                                    },
-                                    {
-                                      kind: 'Field',
-                                      name: {
-                                        kind: 'Name',
-                                        value: 'createView',
-                                        loc: { start: 148, end: 158 },
-                                      },
-                                      arguments: [],
-                                      directives: [],
-                                      selectionSet: {
-                                        kind: 'SelectionSet',
-                                        selections: [
-                                          {
-                                            kind: 'Field',
-                                            name: {
-                                              kind: 'Name',
-                                              value: 'fieldMode',
-                                              loc: { start: 175, end: 184 },
-                                            },
-                                            arguments: [],
-                                            directives: [],
-                                            loc: { start: 175, end: 184 },
-                                          },
-                                        ],
-                                        loc: { start: 159, end: 198 },
-                                      },
-                                      loc: { start: 148, end: 198 },
-                                    },
-                                  ],
-                                  loc: { start: 117, end: 210 },
-                                },
-                                loc: { start: 110, end: 210 },
-                              },
-                            ],
-                            loc: { start: 65, end: 220 },
-                          },
-                          loc: { start: 59, end: 220 },
-                        },
-                      ],
-                      loc: { start: 49, end: 228 },
-                    },
-                    loc: { start: 39, end: 228 },
-                  },
-                ],
-                loc: { start: 31, end: 234 },
-              },
-              loc: { start: 22, end: 234 },
-            },
-            {
-              kind: 'Field',
-              name: { kind: 'Name', value: 'authenticatedItem' },
-              selectionSet: {
-                kind: 'SelectionSet',
-                selections: [
-                  {
-                    kind: 'InlineFragment',
-                    typeCondition: {
-                      kind: 'NamedType',
-                      name: { kind: 'Name', value: 'User' },
-                    },
-                    selectionSet: {
-                      kind: 'SelectionSet',
-                      selections: [
-                        { kind: 'Field', name: { kind: 'Name', value: 'id' } },
-                        {
-                          kind: 'Field',
-                          name: { kind: 'Name', value: 'name' },
-                        },
-                      ],
-                    },
-                  },
-                ],
-              },
-            },
-          ],
-        },
-      },
-    ],
-  },
-  fieldViews: [view0, view1, view2, view3, view4, view5, view6],
-  adminMetaHash: 'n6lent',
+  lazyMetadataQuery: {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"keystone","loc":{"start":22,"end":30}},"arguments":[],"directives":[],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"adminMeta","loc":{"start":39,"end":48}},"arguments":[],"directives":[],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"lists","loc":{"start":59,"end":64}},"arguments":[],"directives":[],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"key","loc":{"start":77,"end":80}},"arguments":[],"directives":[],"loc":{"start":77,"end":80}},{"kind":"Field","name":{"kind":"Name","value":"isHidden","loc":{"start":91,"end":99}},"arguments":[],"directives":[],"loc":{"start":91,"end":99}},{"kind":"Field","name":{"kind":"Name","value":"fields","loc":{"start":110,"end":116}},"arguments":[],"directives":[],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"path","loc":{"start":131,"end":135}},"arguments":[],"directives":[],"loc":{"start":131,"end":135}},{"kind":"Field","name":{"kind":"Name","value":"createView","loc":{"start":148,"end":158}},"arguments":[],"directives":[],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"fieldMode","loc":{"start":175,"end":184}},"arguments":[],"directives":[],"loc":{"start":175,"end":184}}],"loc":{"start":159,"end":198}},"loc":{"start":148,"end":198}}],"loc":{"start":117,"end":210}},"loc":{"start":110,"end":210}}],"loc":{"start":65,"end":220}},"loc":{"start":59,"end":220}}],"loc":{"start":49,"end":228}},"loc":{"start":39,"end":228}}],"loc":{"start":31,"end":234}},"loc":{"start":22,"end":234}},{"kind":"Field","name":{"kind":"Name","value":"authenticatedItem"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"User"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}}]}}]},
+  fieldViews: [view0,view1,view2,view3,view4,view5,view6],
+  adminMetaHash: "2qivu7",
   adminConfig: adminConfig,
-  apiPath: '/api/graphql',
+  apiPath: "/api/graphql",
 });

package/starter/.keystone/admin/pages/api/__keystone_api_build.js

@@ -1,4 +1,3 @@
-export { default as config } from '../../../../keystone';
-export default function (req, res) {
-  return res.status(500);
-}
+exports.getConfig = () => require("../../../../keystone").default;
+const x = Math.random();
+exports.default = function (req, res) { return res.send(x.toString()) }

package/starter/.keystone/admin/pages/init.js

@@ -1,9 +1,5 @@
 import { getInitPage } from '@keystone-next/auth/pages/InitPage';
 
-const fieldPaths = ['name', 'email', 'password'];
+const fieldPaths = ["name","email","password"];
 
-export default getInitPage({
-  listKey: 'User',
-  fieldPaths: ['name', 'email', 'password'],
-  enableWelcome: true,
-});
+export default getInitPage({"listKey":"User","fieldPaths":["name","email","password"],"enableWelcome":true});

package/starter/.keystone/admin/pages/no-access.js

@@ -1,3 +1,3 @@
 import { getNoAccessPage } from '@keystone-next/keystone/___internal-do-not-use-will-break-in-patch/admin-ui/pages/NoAccessPage';
 
-export default getNoAccessPage({ sessionsEnabled: true });
+export default getNoAccessPage({"sessionsEnabled":true})

package/starter/.keystone/admin/pages/posts/[id].js

@@ -1,3 +1,3 @@
 import { getItemPage } from '@keystone-next/keystone/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ItemPage';
 
-export default getItemPage({ listKey: 'Post' });
+export default getItemPage({"listKey":"Post"})

package/starter/.keystone/admin/pages/posts/index.js

@@ -1,3 +1,3 @@
 import { getListPage } from '@keystone-next/keystone/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage';
 
-export default getListPage({ listKey: 'Post' });
+export default getListPage({"listKey":"Post"});

package/starter/.keystone/admin/pages/signin.js

@@ -1,9 +1,3 @@
-import { getSigninPage } from '@keystone-next/auth/pages/SigninPage';
+import { getSigninPage } from '@keystone-next/auth/pages/SigninPage'
 
-export default getSigninPage({
-  identityField: 'email',
-  secretField: 'password',
-  mutationName: 'authenticateUserWithPassword',
-  successTypename: 'UserAuthenticationWithPasswordSuccess',
-  failureTypename: 'UserAuthenticationWithPasswordFailure',
-});
+export default getSigninPage({"identityField":"email","secretField":"password","mutationName":"authenticateUserWithPassword","successTypename":"UserAuthenticationWithPasswordSuccess","failureTypename":"UserAuthenticationWithPasswordFailure"});

package/starter/.keystone/admin/pages/tags/[id].js

@@ -1,3 +1,3 @@
 import { getItemPage } from '@keystone-next/keystone/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ItemPage';
 
-export default getItemPage({ listKey: 'Tag' });
+export default getItemPage({"listKey":"Tag"})

package/starter/.keystone/admin/pages/tags/index.js

@@ -1,3 +1,3 @@
 import { getListPage } from '@keystone-next/keystone/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage';
 
-export default getListPage({ listKey: 'Tag' });
+export default getListPage({"listKey":"Tag"});

package/starter/.keystone/admin/pages/users/[id].js

@@ -1,3 +1,3 @@
 import { getItemPage } from '@keystone-next/keystone/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ItemPage';
 
-export default getItemPage({ listKey: 'User' });
+export default getItemPage({"listKey":"User"})

package/starter/.keystone/admin/pages/users/index.js

@@ -1,3 +1,3 @@
 import { getListPage } from '@keystone-next/keystone/___internal-do-not-use-will-break-in-patch/admin-ui/pages/ListPage';
 
-export default getListPage({ listKey: 'User' });
+export default getListPage({"listKey":"User"});

package/starter/.keystone/admin/tsconfig.json

@@ -14,7 +14,8 @@
     "module": "esnext",
     "moduleResolution": "node",
     "resolveJsonModule": true,
-    "isolatedModules": true
+    "isolatedModules": true,
+    "incremental": true
   },
   "exclude": ["node_modules"],
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"]

package/starter/CHANGELOG.md

@@ -1,5 +1,27 @@
 # keystone-next-app
 
+## 5.0.0
+
+### Major Changes
+
+- [#260](https://github.com/keystonejs/create-keystone-app/pull/260) [`6288ac4`](https://github.com/keystonejs/create-keystone-app/commit/6288ac493d82a4f4f669f70daa2f24cefd8e375e) Thanks [@bladey](https://github.com/bladey)! - Updated to use Keystone 6.
+
+## 3.1.0
+
+### Minor Changes
+
+- [#241](https://github.com/keystonejs/create-keystone-app/pull/241) [`d6ff06d`](https://github.com/keystonejs/create-keystone-app/commit/d6ff06d3a80830f37d5da07738a69e0af2edc039) Thanks [@bladey](https://github.com/bladey)! - Added engines to package.json to indicate required version of Node.js to run Keystone.
+
+### Patch Changes
+
+- [#237](https://github.com/keystonejs/create-keystone-app/pull/237) [`a65ef75`](https://github.com/keystonejs/create-keystone-app/commit/a65ef75c8ca21007aade0c77a6482cbf145ff679) Thanks [@renovate](https://github.com/apps/renovate)! - Updated Keystone dependencies to latest version.
+
+## 3.0.2
+
+### Patch Changes
+
+- [#235](https://github.com/keystonejs/create-keystone-app/pull/235) [`9a3c00c`](https://github.com/keystonejs/create-keystone-app/commit/9a3c00cb6a719cef330955f8014f431c0ffa38d0) Thanks [@bladey](https://github.com/bladey)! - Updated Keystone dependencies to latest version.
+
 ## 3.0.1
 
 ### Patch Changes

package/starter/auth.ts

@@ -7,10 +7,10 @@ Welcome to the auth file! Here we have put a config to do basic auth in Keystone
 For more on auth, check out: https://keystonejs.com/docs/apis/auth#authentication-api
 */
 
-import { createAuth } from '@keystone-next/auth';
+import { createAuth } from '@keystone-6/auth';
 
 // See https://keystonejs.com/docs/apis/session#session-api for the session docs
-import { statelessSessions } from '@keystone-next/keystone/session';
+import { statelessSessions } from '@keystone-6/core/session';
 
 let sessionSecret = process.env.SESSION_SECRET;
 

package/starter/keystone.ts

@@ -6,7 +6,7 @@ It looks at the default export, and expects a Keystone config object.
 You can find all the config options in our docs here: https://keystonejs.com/docs/apis/config
 */
 
-import { config } from '@keystone-next/keystone';
+import { config } from '@keystone-6/core';
 
 // Look in the schema file for how we define our lists, and how users interact with them through graphql or the Admin UI
 import { lists } from './schema';

package/starter/package.json

@@ -1,17 +1,20 @@
 {
   "name": "keystone-app",
-  "version": "3.0.1",
+  "version": "1.0.0",
   "private": true,
   "scripts": {
-    "dev": "keystone-next dev",
-    "start": "keystone-next start",
-    "build": "keystone-next build",
-    "postinstall": "keystone-next postinstall"
+    "dev": "keystone dev",
+    "start": "keystone start",
+    "build": "keystone build",
+    "postinstall": "keystone postinstall"
   },
   "dependencies": {
-    "@keystone-next/auth": "^34.0.0",
-    "@keystone-next/fields-document": "^11.0.0",
-    "@keystone-next/keystone": "^26.1.0",
-    "typescript": "^4.4.3"
+    "@keystone-6/auth": "^1.0.1",
+    "@keystone-6/core": "^1.0.1",
+    "@keystone-6/fields-document": "^1.0.1",
+    "typescript": "^4.5.4"
+  },
+  "engines": {
+    "node": "^14.15 || ^16.13"
   }
 }

package/starter/schema.graphql

@@ -1,56 +1,6 @@
 # This file is automatically generated by Keystone, do not modify it manually.
 # Modify your Keystone config when you want to change this.
 
-input CreateInitialUserInput {
-  name: String
-  email: String
-  password: String
-}
-
-type Mutation {
-  createInitialUser(
-    data: CreateInitialUserInput!
-  ): UserAuthenticationWithPasswordSuccess!
-  authenticateUserWithPassword(
-    email: String!
-    password: String!
-  ): UserAuthenticationWithPasswordResult!
-  createUser(data: UserCreateInput!): User
-  createUsers(data: [UserCreateInput!]!): [User]
-  updateUser(where: UserWhereUniqueInput!, data: UserUpdateInput!): User
-  updateUsers(data: [UserUpdateArgs!]!): [User]
-  deleteUser(where: UserWhereUniqueInput!): User
-  deleteUsers(where: [UserWhereUniqueInput!]!): [User]
-  createPost(data: PostCreateInput!): Post
-  createPosts(data: [PostCreateInput!]!): [Post]
-  updatePost(where: PostWhereUniqueInput!, data: PostUpdateInput!): Post
-  updatePosts(data: [PostUpdateArgs!]!): [Post]
-  deletePost(where: PostWhereUniqueInput!): Post
-  deletePosts(where: [PostWhereUniqueInput!]!): [Post]
-  createTag(data: TagCreateInput!): Tag
-  createTags(data: [TagCreateInput!]!): [Tag]
-  updateTag(where: TagWhereUniqueInput!, data: TagUpdateInput!): Tag
-  updateTags(data: [TagUpdateArgs!]!): [Tag]
-  deleteTag(where: TagWhereUniqueInput!): Tag
-  deleteTags(where: [TagWhereUniqueInput!]!): [Tag]
-  endSession: Boolean!
-}
-
-union AuthenticatedItem = User
-
-union UserAuthenticationWithPasswordResult =
-    UserAuthenticationWithPasswordSuccess
-  | UserAuthenticationWithPasswordFailure
-
-type UserAuthenticationWithPasswordSuccess {
-  sessionToken: String!
-  item: User!
-}
-
-type UserAuthenticationWithPasswordFailure {
-  message: String!
-}
-
 type User {
   id: ID!
   name: String
@@ -361,8 +311,55 @@ scalar JSON
     url: "http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf"
   )
 
+type Mutation {
+  createUser(data: UserCreateInput!): User
+  createUsers(data: [UserCreateInput!]!): [User]
+  updateUser(where: UserWhereUniqueInput!, data: UserUpdateInput!): User
+  updateUsers(data: [UserUpdateArgs!]!): [User]
+  deleteUser(where: UserWhereUniqueInput!): User
+  deleteUsers(where: [UserWhereUniqueInput!]!): [User]
+  createPost(data: PostCreateInput!): Post
+  createPosts(data: [PostCreateInput!]!): [Post]
+  updatePost(where: PostWhereUniqueInput!, data: PostUpdateInput!): Post
+  updatePosts(data: [PostUpdateArgs!]!): [Post]
+  deletePost(where: PostWhereUniqueInput!): Post
+  deletePosts(where: [PostWhereUniqueInput!]!): [Post]
+  createTag(data: TagCreateInput!): Tag
+  createTags(data: [TagCreateInput!]!): [Tag]
+  updateTag(where: TagWhereUniqueInput!, data: TagUpdateInput!): Tag
+  updateTags(data: [TagUpdateArgs!]!): [Tag]
+  deleteTag(where: TagWhereUniqueInput!): Tag
+  deleteTags(where: [TagWhereUniqueInput!]!): [Tag]
+  endSession: Boolean!
+  authenticateUserWithPassword(
+    email: String!
+    password: String!
+  ): UserAuthenticationWithPasswordResult
+  createInitialUser(
+    data: CreateInitialUserInput!
+  ): UserAuthenticationWithPasswordSuccess!
+}
+
+union UserAuthenticationWithPasswordResult =
+    UserAuthenticationWithPasswordSuccess
+  | UserAuthenticationWithPasswordFailure
+
+type UserAuthenticationWithPasswordSuccess {
+  sessionToken: String!
+  item: User!
+}
+
+type UserAuthenticationWithPasswordFailure {
+  message: String!
+}
+
+input CreateInitialUserInput {
+  name: String
+  email: String
+  password: String
+}
+
 type Query {
-  authenticatedItem: AuthenticatedItem
   users(
     where: UserWhereInput! = {}
     orderBy: [UserOrderByInput!]! = []
@@ -388,8 +385,11 @@ type Query {
   tag(where: TagWhereUniqueInput!): Tag
   tagsCount(where: TagWhereInput! = {}): Int
   keystone: KeystoneMeta!
+  authenticatedItem: AuthenticatedItem
 }
 
+union AuthenticatedItem = User
+
 type KeystoneMeta {
   adminMeta: KeystoneAdminMeta!
 }

package/starter/schema.prisma

@@ -7,9 +7,8 @@ datasource sqlite {
 }
 
 generator client {
-  provider   = "prisma-client-js"
-  output     = "node_modules/.prisma/client"
-  engineType = "binary"
+  provider = "prisma-client-js"
+  output   = "node_modules/.prisma/client"
 }
 
 model User {
@@ -28,7 +27,7 @@ model Post {
   publishDate DateTime?
   author      User?     @relation("Post_author", fields: [authorId], references: [id])
   authorId    String?   @map("author")
-  tags        Tag[]     @relation("Post_tags_Tag_posts")
+  tags        Tag[]     @relation("Post_tags")
 
   @@index([authorId])
 }
@@ -36,5 +35,5 @@ model Post {
 model Tag {
   id    String @id @default(cuid())
   name  String @default("")
-  posts Post[] @relation("Post_tags_Tag_posts")
+  posts Post[] @relation("Post_tags")
 }

package/starter/schema.ts

@@ -15,7 +15,7 @@ A field: The individual bits of data on your list, each with its own type.
 // Like the `config` function we use in keystone.ts, we use functions
 // for putting in our config so we get useful errors. With typescript,
 // we get these even before code runs.
-import { list } from '@keystone-next/keystone';
+import { list } from '@keystone-6/core';
 
 // We're using some common fields in the starter. Check out https://keystonejs.com/docs/apis/fields#fields-api
 // for the full list of fields.
@@ -25,16 +25,22 @@ import {
   password,
   timestamp,
   select,
-} from '@keystone-next/keystone/fields';
+} from '@keystone-6/core/fields';
 // The document field is a more complicated field, so it's in its own package
 // Keystone aims to have all the base field types, but you can make your own
 // custom ones.
-import { document } from '@keystone-next/fields-document';
+import { document } from '@keystone-6/fields-document';
+
+// We are using Typescript, and we want our types experience to be as strict as it can be.
+// By providing the Keystone generated `Lists` type to our lists object, we refine
+// our types to a stricter subset that is type-aware of other lists in our schema
+// that Typescript cannot easily infer.
+import { Lists } from '.keystone/types';
 
 // We have a users list, a blogs list, and tags for blog posts, so they can be filtered.
 // Each property on the exported object will become the name of a list (a.k.a. the `listKey`),
 // with the value being the definition of the list, including the fields.
-export const lists = {
+export const lists: Lists = {
   // Here we define the user list.
   User: list({
     // Here are the fields that `User` will have. We want an email and password so they can log in