@opensaas/keystone-nextjs-auth 12.0.2 → 14.0.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @opensaas-keystone/nextjs-auth
 
+## 14.0.0
+
+### Major Changes
+
+- 5a64376: Upgrade to keystone-next version 26
+
+## 13.0.2
+
+### Patch Changes
+
+- 06cf34e: fix up next-config
+
+## 13.0.1
+
+### Patch Changes
+
+- fb84793: next 11 fixes for next-config
+
+## 13.0.0
+
+### Major Changes
+
+- e5d413a: Keystone Version upgrade to 25.0.0
+
 ## 12.0.2
 
 ### Patch Changes

package/dist/declarations/src/gql/getBaseAuthSchema.d.ts

@@ -1,4 +1,4 @@
-import type { GraphQLSchemaExtension } from '@keystone-next/types';
+import type { GraphQLSchemaExtension } from '@keystone-next/keystone/types';
 import { AuthGqlNames } from '../types';
 export declare function getBaseAuthSchema<I extends string, S extends string>({ listKey, gqlNames, }: {
     listKey: string;

package/dist/declarations/src/index.d.ts

@@ -1,4 +1,4 @@
-import { BaseGeneratedListTypes, KeystoneConfig } from '@keystone-next/types';
+import { BaseGeneratedListTypes, KeystoneConfig } from '@keystone-next/keystone/types';
 import { AuthConfig, KeystoneAuthConfig } from './types';
 export declare const nextAuthProviders: import("next-auth/providers").BuiltInProviders;
 /**

package/dist/declarations/src/lib/findMatchingIdentity.d.ts

@@ -1,4 +1,4 @@
-import type { KeystoneListsAPI } from '@keystone-next/types';
+import type { KeystoneListsAPI } from '@keystone-next/keystone/types';
 import { AuthTokenRequestErrorCode } from '../types';
 export declare function findMatchingIdentity(identityField: string, identity: string, itemAPI: KeystoneListsAPI<any>[string]): Promise<{
     success: false;

package/dist/declarations/src/lib/validateNextAuth.d.ts

@@ -1,4 +1,4 @@
-import type { KeystoneListsAPI } from '@keystone-next/types';
+import type { KeystoneListsAPI } from '@keystone-next/keystone/types';
 import { NextAuthErrorCode } from '../types';
 export declare function validateNextAuth(list: any, identityField: string, identity: string, protectIdentities: boolean, itemAPI: KeystoneListsAPI<any>[string]): Promise<{
     success: false;

package/dist/declarations/src/pages/NextAuthPage.d.ts

@@ -1,10 +1,10 @@
 import { Provider } from 'next-auth/providers';
-import type { KeystoneListsAPI } from '@keystone-next/types';
+import type { KeystoneListsAPI } from '@keystone-next/keystone/types';
 declare type NextAuthPageProps = {
     identityField: string;
     mutationName: string;
     providers: Provider[];
-    lists: KeystoneListsAPI<any>;
+    query: KeystoneListsAPI<any>;
     sessionData: string;
     listKey: string;
     autoCreate: boolean;

package/dist/declarations/src/schema.d.ts

@@ -1,4 +1,4 @@
-import { ExtendGraphqlSchema } from '@keystone-next/types';
+import { ExtendGraphqlSchema } from '@keystone-next/keystone/types';
 import { AuthGqlNames } from './types';
 export declare const getSchemaExtension: ({ identityField, listKey, gqlNames, }: {
     identityField: string;

package/dist/declarations/src/types.d.ts

@@ -1,4 +1,4 @@
-import { BaseGeneratedListTypes, KeystoneContext, KeystoneConfig } from '@keystone-next/types';
+import { BaseGeneratedListTypes, KeystoneConfig } from '@keystone-next/keystone/types';
 import { Provider } from 'next-auth/providers';
 export declare type AuthGqlNames = {
     CreateInitialInput: string;
@@ -8,18 +8,6 @@ export declare type AuthGqlNames = {
     ItemAuthenticationWithPasswordSuccess: string;
     ItemAuthenticationWithPasswordFailure: string;
 };
-export declare type SendTokenFn = (args: {
-    itemId: string | number;
-    identity: string;
-    token: string;
-    context: KeystoneContext;
-}) => Promise<void> | void;
-export declare type AuthTokenTypeConfig = {
-    /** Called when a user should be sent the magic signin token they requested */
-    sendToken: SendTokenFn;
-    /** How long do tokens stay valid for from time of issue, in minutes * */
-    tokensValidForMins?: number;
-};
 export declare type NextAuthSession = {
     listKey: string;
     itemId: string;

package/dist/opensaas-keystone-nextjs-auth.cjs.dev.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
-var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
 var _includesInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/includes');
+var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
 var _JSON$stringify = require('@babel/runtime-corejs3/core-js-stable/json/stringify');
 var _URL = require('@babel/runtime-corejs3/core-js-stable/url');
 var url = require('url');
@@ -13,8 +13,8 @@ var client = require('next-auth/client');
 var Providers = require('next-auth/providers');
 var cookie = require('cookie');
 var ejs = require('ejs');
-var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
 var _reduceInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/reduce');
+var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
 var merge = require('@graphql-tools/merge');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
@@ -39,16 +39,16 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var _mapInstanceProperty__default = /*#__PURE__*/_interopDefault(_mapInstanceProperty);
 var _includesInstanceProperty__default = /*#__PURE__*/_interopDefault(_includesInstanceProperty);
+var _mapInstanceProperty__default = /*#__PURE__*/_interopDefault(_mapInstanceProperty);
 var _JSON$stringify__default = /*#__PURE__*/_interopDefault(_JSON$stringify);
 var _URL__default = /*#__PURE__*/_interopDefault(_URL);
 var url__default = /*#__PURE__*/_interopDefault(url);
 var Providers__default = /*#__PURE__*/_interopDefault(Providers);
 var cookie__namespace = /*#__PURE__*/_interopNamespace(cookie);
 var ejs__default = /*#__PURE__*/_interopDefault(ejs);
-var _filterInstanceProperty__default = /*#__PURE__*/_interopDefault(_filterInstanceProperty);
 var _reduceInstanceProperty__default = /*#__PURE__*/_interopDefault(_reduceInstanceProperty);
+var _filterInstanceProperty__default = /*#__PURE__*/_interopDefault(_filterInstanceProperty);
 
 const template$1 = `
 const Path = require('path');
@@ -56,6 +56,12 @@ const Path = require('path');
 const withPreconstruct = require('@preconstruct/next');
 
 module.exports = withPreconstruct({
+  typescript: {
+    ignoreBuildErrors: true,
+  },
+  eslint: {
+    ignoreDuringBuilds: true,
+  },
   webpack(config, { isServer }) {
     config.resolve.alias = {
       ...config.resolve.alias,
@@ -68,8 +74,7 @@ module.exports = withPreconstruct({
     if (isServer) {
       config.externals = [
         ...config.externals, 
-        /@keystone-next\\/keystone(?!\\/___internal-do-not-use-will-break-in-patch\\/admin-ui\\/id-field-view)/,
-        /@keystone-next\\/types/, 
+        /@keystone-next\\/keystone(?!\\/___internal-do-not-use-will-break-in-patch\\/admin-ui\\/id-field-view|\\/fields\\/types\\/[^\\/]+\\/views)/,
         /.prisma\\/client/
       ];
     }
@@ -159,7 +164,7 @@ const getSchemaExtension = ({
 const template = `
 import getNextAuthPage from '@opensaas/keystone-nextjs-auth/pages/NextAuthPage';
 import { nextAuthProviders as Providers } from '@opensaas/keystone-nextjs-auth';
-import { lists } from '.keystone/api';
+import { query } from '.keystone/api';
 import keystoneConfig from '../../../../../keystone';
 
 export default getNextAuthPage({
@@ -172,7 +177,7 @@ export default getNextAuthPage({
         profileMap: <%- JSON.stringify(profileMap) %>,
         autoCreate: <%= autoCreate %>,
         providers: keystoneConfig.providers,
-        lists,
+        query,
     });
   `;
 const authTemplate = ({
@@ -443,7 +448,7 @@ function createAuth({
           const headers = (_context$req = context.req) === null || _context$req === void 0 ? void 0 : _context$req.headers;
           const host = headers ? headers['x-forwarded-host'] || headers.host : null;
           const thisUrl = headers !== null && headers !== void 0 && headers.referer ? new _URL__default['default'](headers.referer) : undefined;
-          const accessingInitPage = (thisUrl === null || thisUrl === void 0 ? void 0 : thisUrl.pathname) === '/init' && (thisUrl === null || thisUrl === void 0 ? void 0 : thisUrl.host) === host && (await context.sudo().lists[listKey].count({})) === 0;
+          const accessingInitPage = (thisUrl === null || thisUrl === void 0 ? void 0 : thisUrl.pathname) === '/init' && (thisUrl === null || thisUrl === void 0 ? void 0 : thisUrl.host) === host && (await context.sudo().query[listKey].count({})) === 0;
           return accessingInitPage || ((_keystoneConfig$ui2 = keystoneConfig.ui) !== null && _keystoneConfig$ui2 !== void 0 && _keystoneConfig$ui2.isAccessAllowed ? keystoneConfig.ui.isAccessAllowed(context) : context.session !== undefined);
         }
       });

package/dist/opensaas-keystone-nextjs-auth.cjs.prod.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
-var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
 var _includesInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/includes');
+var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/map');
 var _JSON$stringify = require('@babel/runtime-corejs3/core-js-stable/json/stringify');
 var _URL = require('@babel/runtime-corejs3/core-js-stable/url');
 var url = require('url');
@@ -13,8 +13,8 @@ var client = require('next-auth/client');
 var Providers = require('next-auth/providers');
 var cookie = require('cookie');
 var ejs = require('ejs');
-var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
 var _reduceInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/reduce');
+var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/filter');
 var merge = require('@graphql-tools/merge');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
@@ -39,16 +39,16 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var _mapInstanceProperty__default = /*#__PURE__*/_interopDefault(_mapInstanceProperty);
 var _includesInstanceProperty__default = /*#__PURE__*/_interopDefault(_includesInstanceProperty);
+var _mapInstanceProperty__default = /*#__PURE__*/_interopDefault(_mapInstanceProperty);
 var _JSON$stringify__default = /*#__PURE__*/_interopDefault(_JSON$stringify);
 var _URL__default = /*#__PURE__*/_interopDefault(_URL);
 var url__default = /*#__PURE__*/_interopDefault(url);
 var Providers__default = /*#__PURE__*/_interopDefault(Providers);
 var cookie__namespace = /*#__PURE__*/_interopNamespace(cookie);
 var ejs__default = /*#__PURE__*/_interopDefault(ejs);
-var _filterInstanceProperty__default = /*#__PURE__*/_interopDefault(_filterInstanceProperty);
 var _reduceInstanceProperty__default = /*#__PURE__*/_interopDefault(_reduceInstanceProperty);
+var _filterInstanceProperty__default = /*#__PURE__*/_interopDefault(_filterInstanceProperty);
 
 const template$1 = `
 const Path = require('path');
@@ -56,6 +56,12 @@ const Path = require('path');
 const withPreconstruct = require('@preconstruct/next');
 
 module.exports = withPreconstruct({
+  typescript: {
+    ignoreBuildErrors: true,
+  },
+  eslint: {
+    ignoreDuringBuilds: true,
+  },
   webpack(config, { isServer }) {
     config.resolve.alias = {
       ...config.resolve.alias,
@@ -68,8 +74,7 @@ module.exports = withPreconstruct({
     if (isServer) {
       config.externals = [
         ...config.externals, 
-        /@keystone-next\\/keystone(?!\\/___internal-do-not-use-will-break-in-patch\\/admin-ui\\/id-field-view)/,
-        /@keystone-next\\/types/, 
+        /@keystone-next\\/keystone(?!\\/___internal-do-not-use-will-break-in-patch\\/admin-ui\\/id-field-view|\\/fields\\/types\\/[^\\/]+\\/views)/,
         /.prisma\\/client/
       ];
     }
@@ -159,7 +164,7 @@ const getSchemaExtension = ({
 const template = `
 import getNextAuthPage from '@opensaas/keystone-nextjs-auth/pages/NextAuthPage';
 import { nextAuthProviders as Providers } from '@opensaas/keystone-nextjs-auth';
-import { lists } from '.keystone/api';
+import { query } from '.keystone/api';
 import keystoneConfig from '../../../../../keystone';
 
 export default getNextAuthPage({
@@ -172,7 +177,7 @@ export default getNextAuthPage({
         profileMap: <%- JSON.stringify(profileMap) %>,
         autoCreate: <%= autoCreate %>,
         providers: keystoneConfig.providers,
-        lists,
+        query,
     });
   `;
 const authTemplate = ({
@@ -443,7 +448,7 @@ function createAuth({
           const headers = (_context$req = context.req) === null || _context$req === void 0 ? void 0 : _context$req.headers;
           const host = headers ? headers['x-forwarded-host'] || headers.host : null;
           const thisUrl = headers !== null && headers !== void 0 && headers.referer ? new _URL__default['default'](headers.referer) : undefined;
-          const accessingInitPage = (thisUrl === null || thisUrl === void 0 ? void 0 : thisUrl.pathname) === '/init' && (thisUrl === null || thisUrl === void 0 ? void 0 : thisUrl.host) === host && (await context.sudo().lists[listKey].count({})) === 0;
+          const accessingInitPage = (thisUrl === null || thisUrl === void 0 ? void 0 : thisUrl.pathname) === '/init' && (thisUrl === null || thisUrl === void 0 ? void 0 : thisUrl.host) === host && (await context.sudo().query[listKey].count({})) === 0;
           return accessingInitPage || ((_keystoneConfig$ui2 = keystoneConfig.ui) !== null && _keystoneConfig$ui2 !== void 0 && _keystoneConfig$ui2.isAccessAllowed ? keystoneConfig.ui.isAccessAllowed(context) : context.session !== undefined);
         }
       });

package/dist/opensaas-keystone-nextjs-auth.esm.js

@@ -1,7 +1,7 @@
 import _objectSpread from '@babel/runtime/helpers/esm/objectSpread2';
 import _objectWithoutProperties from '@babel/runtime/helpers/esm/objectWithoutProperties';
-import _mapInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/map';
 import _includesInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/includes';
+import _mapInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/map';
 import _JSON$stringify from '@babel/runtime-corejs3/core-js-stable/json/stringify';
 import _URL from '@babel/runtime-corejs3/core-js-stable/url';
 import url from 'url';
@@ -9,8 +9,8 @@ import { getSession } from 'next-auth/client';
 import Providers from 'next-auth/providers';
 import * as cookie from 'cookie';
 import ejs from 'ejs';
-import _filterInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/filter';
 import _reduceInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/reduce';
+import _filterInstanceProperty from '@babel/runtime-corejs3/core-js-stable/instance/filter';
 import { mergeSchemas } from '@graphql-tools/merge';
 
 const template$1 = `
@@ -19,6 +19,12 @@ const Path = require('path');
 const withPreconstruct = require('@preconstruct/next');
 
 module.exports = withPreconstruct({
+  typescript: {
+    ignoreBuildErrors: true,
+  },
+  eslint: {
+    ignoreDuringBuilds: true,
+  },
   webpack(config, { isServer }) {
     config.resolve.alias = {
       ...config.resolve.alias,
@@ -31,8 +37,7 @@ module.exports = withPreconstruct({
     if (isServer) {
       config.externals = [
         ...config.externals, 
-        /@keystone-next\\/keystone(?!\\/___internal-do-not-use-will-break-in-patch\\/admin-ui\\/id-field-view)/,
-        /@keystone-next\\/types/, 
+        /@keystone-next\\/keystone(?!\\/___internal-do-not-use-will-break-in-patch\\/admin-ui\\/id-field-view|\\/fields\\/types\\/[^\\/]+\\/views)/,
         /.prisma\\/client/
       ];
     }
@@ -122,7 +127,7 @@ const getSchemaExtension = ({
 const template = `
 import getNextAuthPage from '@opensaas/keystone-nextjs-auth/pages/NextAuthPage';
 import { nextAuthProviders as Providers } from '@opensaas/keystone-nextjs-auth';
-import { lists } from '.keystone/api';
+import { query } from '.keystone/api';
 import keystoneConfig from '../../../../../keystone';
 
 export default getNextAuthPage({
@@ -135,7 +140,7 @@ export default getNextAuthPage({
         profileMap: <%- JSON.stringify(profileMap) %>,
         autoCreate: <%= autoCreate %>,
         providers: keystoneConfig.providers,
-        lists,
+        query,
     });
   `;
 const authTemplate = ({
@@ -406,7 +411,7 @@ function createAuth({
           const headers = (_context$req = context.req) === null || _context$req === void 0 ? void 0 : _context$req.headers;
           const host = headers ? headers['x-forwarded-host'] || headers.host : null;
           const thisUrl = headers !== null && headers !== void 0 && headers.referer ? new _URL(headers.referer) : undefined;
-          const accessingInitPage = (thisUrl === null || thisUrl === void 0 ? void 0 : thisUrl.pathname) === '/init' && (thisUrl === null || thisUrl === void 0 ? void 0 : thisUrl.host) === host && (await context.sudo().lists[listKey].count({})) === 0;
+          const accessingInitPage = (thisUrl === null || thisUrl === void 0 ? void 0 : thisUrl.pathname) === '/init' && (thisUrl === null || thisUrl === void 0 ? void 0 : thisUrl.host) === host && (await context.sudo().query[listKey].count({})) === 0;
           return accessingInitPage || ((_keystoneConfig$ui2 = keystoneConfig.ui) !== null && _keystoneConfig$ui2 !== void 0 && _keystoneConfig$ui2.isAccessAllowed ? keystoneConfig.ui.isAccessAllowed(context) : context.session !== undefined);
         }
       });

package/package.json

@@ -1,30 +1,28 @@
 {
   "name": "@opensaas/keystone-nextjs-auth",
-  "version": "12.0.2",
+  "version": "14.0.0",
   "repository": "https://github.com/opensaasau/keystone-nextjs-auth",
   "license": "MIT",
   "main": "dist/opensaas-keystone-nextjs-auth.cjs.js",
   "module": "dist/opensaas-keystone-nextjs-auth.esm.js",
   "dependencies": {
-    "@babel/runtime": "^7.15.3",
+    "@babel/runtime": "^7.15.4",
     "@babel/runtime-corejs3": "^7.15.3",
     "@graphql-tools/merge": "^6.2.14",
-    "@keystone-next/admin-ui-utils": "^5.0.6",
-    "@keystone-next/fields": "^14.0.0",
-    "@keystone-next/types": "^24.0.0",
+    "@keystone-next/admin-ui-utils": "^6.0.0",
     "@types/ejs": "^3.0.6",
     "cookie": "^0.4.1",
     "cross-fetch": "^3.1.4",
     "ejs": "^3.1.6",
     "fast-deep-equal": "^3.1.3",
-    "next-auth": "^3.28.0"
+    "next-auth": "^3.29.0"
   },
   "devDependencies": {
-    "@keystone-next/keystone": "^24.0.1",
+    "@keystone-next/keystone": "^26.0.0",
     "react": "^17.0.2"
   },
   "peerDependencies": {
-    "@keystone-next/keystone": "^24.0.1",
+    "@keystone-next/keystone": "^26.0.0",
     "react": "^17.0.2"
   },
   "engines": {

package/pages/NextAuthPage/dist/opensaas-keystone-nextjs-auth-pages-NextAuthPage.cjs.dev.js

@@ -62,7 +62,7 @@ async function validateNextAuth(list, identityField, identity, protectIdentities
 function NextAuthPage(props) {
   const {
     providers,
-    lists,
+    query,
     identityField,
     sessionData,
     listKey,
@@ -71,15 +71,15 @@ function NextAuthPage(props) {
     accountMap,
     profileMap
   } = props;
-  const list = lists[listKey];
-  const itemAPI = lists[listKey];
+  const list = query[listKey];
+  const queryAPI = query[listKey];
   const protectIdentities = true;
   return NextAuth__default['default']({
     providers,
     callbacks: {
       async signIn(user, account, profile) {
         const identity = user.id;
-        const result = await validateNextAuth(list, identityField, identity, protectIdentities, itemAPI);
+        const result = await validateNextAuth(list, identityField, identity, protectIdentities, queryAPI);
         const data = {}; // eslint-disable-next-line no-restricted-syntax
 
         for (const key in userMap) {
@@ -146,13 +146,13 @@ function NextAuthPage(props) {
         const identity = token.sub;
 
         if (!token.itemId) {
-          const result = await validateNextAuth(list, identityField, identity, protectIdentities, itemAPI);
+          const result = await validateNextAuth(list, identityField, identity, protectIdentities, queryAPI);
 
           if (!result.success) {
             return;
           }
 
-          const data = await lists[listKey].findOne({
+          const data = await query[listKey].findOne({
             where: {
               id: result.item.id
             },
@@ -177,5 +177,5 @@ function NextAuthPage(props) {
 }
 const getNextAuthPage = props => () => NextAuthPage(_objectSpread({}, props));
 
-exports.default = NextAuthPage;
+exports['default'] = NextAuthPage;
 exports.getNextAuthPage = getNextAuthPage;

package/pages/NextAuthPage/dist/opensaas-keystone-nextjs-auth-pages-NextAuthPage.cjs.prod.js

@@ -62,7 +62,7 @@ async function validateNextAuth(list, identityField, identity, protectIdentities
 function NextAuthPage(props) {
   const {
     providers,
-    lists,
+    query,
     identityField,
     sessionData,
     listKey,
@@ -71,15 +71,15 @@ function NextAuthPage(props) {
     accountMap,
     profileMap
   } = props;
-  const list = lists[listKey];
-  const itemAPI = lists[listKey];
+  const list = query[listKey];
+  const queryAPI = query[listKey];
   const protectIdentities = true;
   return NextAuth__default['default']({
     providers,
     callbacks: {
       async signIn(user, account, profile) {
         const identity = user.id;
-        const result = await validateNextAuth(list, identityField, identity, protectIdentities, itemAPI);
+        const result = await validateNextAuth(list, identityField, identity, protectIdentities, queryAPI);
         const data = {}; // eslint-disable-next-line no-restricted-syntax
 
         for (const key in userMap) {
@@ -146,13 +146,13 @@ function NextAuthPage(props) {
         const identity = token.sub;
 
         if (!token.itemId) {
-          const result = await validateNextAuth(list, identityField, identity, protectIdentities, itemAPI);
+          const result = await validateNextAuth(list, identityField, identity, protectIdentities, queryAPI);
 
           if (!result.success) {
             return;
           }
 
-          const data = await lists[listKey].findOne({
+          const data = await query[listKey].findOne({
             where: {
               id: result.item.id
             },
@@ -177,5 +177,5 @@ function NextAuthPage(props) {
 }
 const getNextAuthPage = props => () => NextAuthPage(_objectSpread({}, props));
 
-exports.default = NextAuthPage;
+exports['default'] = NextAuthPage;
 exports.getNextAuthPage = getNextAuthPage;

package/pages/NextAuthPage/dist/opensaas-keystone-nextjs-auth-pages-NextAuthPage.esm.js

@@ -54,7 +54,7 @@ async function validateNextAuth(list, identityField, identity, protectIdentities
 function NextAuthPage(props) {
   const {
     providers,
-    lists,
+    query,
     identityField,
     sessionData,
     listKey,
@@ -63,15 +63,15 @@ function NextAuthPage(props) {
     accountMap,
     profileMap
   } = props;
-  const list = lists[listKey];
-  const itemAPI = lists[listKey];
+  const list = query[listKey];
+  const queryAPI = query[listKey];
   const protectIdentities = true;
   return NextAuth({
     providers,
     callbacks: {
       async signIn(user, account, profile) {
         const identity = user.id;
-        const result = await validateNextAuth(list, identityField, identity, protectIdentities, itemAPI);
+        const result = await validateNextAuth(list, identityField, identity, protectIdentities, queryAPI);
         const data = {}; // eslint-disable-next-line no-restricted-syntax
 
         for (const key in userMap) {
@@ -138,13 +138,13 @@ function NextAuthPage(props) {
         const identity = token.sub;
 
         if (!token.itemId) {
-          const result = await validateNextAuth(list, identityField, identity, protectIdentities, itemAPI);
+          const result = await validateNextAuth(list, identityField, identity, protectIdentities, queryAPI);
 
           if (!result.success) {
             return;
           }
 
-          const data = await lists[listKey].findOne({
+          const data = await query[listKey].findOne({
             where: {
               id: result.item.id
             },
@@ -169,5 +169,4 @@ function NextAuthPage(props) {
 }
 const getNextAuthPage = props => () => NextAuthPage(_objectSpread({}, props));
 
-export default NextAuthPage;
-export { getNextAuthPage };
+export { NextAuthPage as default, getNextAuthPage };

package/src/gql/getBaseAuthSchema.ts

@@ -1,7 +1,7 @@
 import type {
   GraphQLSchemaExtension,
   KeystoneContext,
-} from '@keystone-next/types';
+} from '@keystone-next/keystone/types';
 
 import { AuthGqlNames } from '../types';
 

package/src/gql/getInitFirstItemSchema.ts

@@ -1,5 +1,10 @@
-import type { GraphQLSchemaExtension } from '@keystone-next/types';
-import { assertInputObjectType, GraphQLInputObjectType, GraphQLSchema, printType } from 'graphql';
+import type { GraphQLSchemaExtension } from '@keystone-next/keystone/types';
+import {
+  assertInputObjectType,
+  GraphQLInputObjectType,
+  GraphQLSchema,
+  printType,
+} from 'graphql';
 
 import { AuthGqlNames, InitFirstItemConfig } from '../types';
 
@@ -24,7 +29,9 @@ export function getInitFirstItemSchema({
     new GraphQLInputObjectType({
       ...createInputConfig,
       fields: Object.fromEntries(
-        Object.entries(createInputConfig.fields).filter(([fieldKey]) => fieldsSet.has(fieldKey))
+        Object.entries(createInputConfig.fields).filter(([fieldKey]) =>
+          fieldsSet.has(fieldKey)
+        )
       ),
       name: gqlNames.CreateInitialInput,
     })
@@ -50,12 +57,19 @@ export function getInitFirstItemSchema({
           const dbItemAPI = context.sudo().db.lists[listKey];
           const count = await dbItemAPI.count({});
           if (count !== 0) {
-            throw new Error('Initial items can only be created when no items exist in that list');
+            throw new Error(
+              'Initial items can only be created when no items exist in that list'
+            );
           }
 
           // Update system state
-          const item = await dbItemAPI.createOne({ data: { ...data, ...itemData } });
-          const sessionToken = await context.startSession({ listKey, itemId: item.id });
+          const item = await dbItemAPI.createOne({
+            data: { ...data, ...itemData },
+          });
+          const sessionToken = await context.startSession({
+            listKey,
+            itemId: item.id,
+          });
           return { item, sessionToken };
         },
       },

package/src/index.ts

@@ -6,7 +6,7 @@ import {
   KeystoneContext,
   AdminUIConfig,
   SessionStrategy,
-} from '@keystone-next/types';
+} from '@keystone-next/keystone/types';
 import { getSession } from 'next-auth/client';
 import Providers from 'next-auth/providers';
 import * as cookie from 'cookie';
@@ -256,7 +256,7 @@ export function createAuth<GeneratedListTypes extends BaseGeneratedListTypes>({
           const accessingInitPage =
             thisUrl?.pathname === '/init' &&
             thisUrl?.host === host &&
-            (await context.sudo().lists[listKey].count({})) === 0;
+            (await context.sudo().query[listKey].count({})) === 0;
           return (
             accessingInitPage ||
             (keystoneConfig.ui?.isAccessAllowed

package/src/lib/findMatchingIdentity.ts

@@ -1,4 +1,4 @@
-import type { KeystoneListsAPI } from '@keystone-next/types';
+import type { KeystoneListsAPI } from '@keystone-next/keystone/types';
 
 import { AuthTokenRequestErrorCode } from '../types';
 

package/src/lib/validateNextAuth.ts

@@ -1,4 +1,4 @@
-import type { KeystoneListsAPI } from '@keystone-next/types';
+import type { KeystoneListsAPI } from '@keystone-next/keystone/types';
 import { NextAuthErrorCode } from '../types';
 import { findMatchingIdentity } from './findMatchingIdentity';
 
@@ -10,13 +10,13 @@ export async function validateNextAuth(
   itemAPI: KeystoneListsAPI<any>[string]
 ): Promise<
   | { success: false; code: NextAuthErrorCode }
-  | { success: true; item: { id: any;[prop: string]: any } }
+  | { success: true; item: { id: any; [prop: string]: any } }
 > {
   const match = await findMatchingIdentity(identityField, identity, itemAPI);
 
   const { item } = match as {
     success: true;
-    item: { id: any;[prop: string]: any };
+    item: { id: any; [prop: string]: any };
   };
 
   if (item) {

package/src/pages/NextAuthPage.tsx

@@ -1,6 +1,6 @@
 import NextAuth from 'next-auth';
 import { Provider } from 'next-auth/providers';
-import type { KeystoneListsAPI } from '@keystone-next/types';
+import type { KeystoneListsAPI } from '@keystone-next/keystone/types';
 import { validateNextAuth } from '../lib/validateNextAuth';
 
 // Need to bring in correct props
@@ -8,7 +8,7 @@ type NextAuthPageProps = {
   identityField: string;
   mutationName: string;
   providers: Provider[];
-  lists: KeystoneListsAPI<any>;
+  query: KeystoneListsAPI<any>;
   sessionData: string;
   listKey: string;
   autoCreate: boolean;
@@ -20,7 +20,7 @@ type NextAuthPageProps = {
 export default function NextAuthPage(props: NextAuthPageProps) {
   const {
     providers,
-    lists,
+    query,
     identityField,
     sessionData,
     listKey,
@@ -29,8 +29,8 @@ export default function NextAuthPage(props: NextAuthPageProps) {
     accountMap,
     profileMap,
   } = props;
-  const list = lists[listKey];
-  const itemAPI = lists[listKey];
+  const list = query[listKey];
+  const queryAPI = query[listKey];
   const protectIdentities = true;
 
   return NextAuth({
@@ -43,7 +43,7 @@ export default function NextAuthPage(props: NextAuthPageProps) {
           identityField,
           identity,
           protectIdentities,
-          itemAPI
+          queryAPI
         );
         const data = {};
         // eslint-disable-next-line no-restricted-syntax
@@ -113,14 +113,14 @@ export default function NextAuthPage(props: NextAuthPageProps) {
             identityField,
             identity,
             protectIdentities,
-            itemAPI
+            queryAPI
           );
 
           if (!result.success) {
             return;
           }
 
-          const data = await lists[listKey].findOne({
+          const data = await query[listKey].findOne({
             where: { id: result.item.id },
             query: sessionData || 'id',
           });

package/src/schema.ts

@@ -1,5 +1,5 @@
 import { mergeSchemas } from '@graphql-tools/merge';
-import { ExtendGraphqlSchema } from '@keystone-next/types';
+import { ExtendGraphqlSchema } from '@keystone-next/keystone/types';
 
 import { AuthGqlNames } from './types';
 import { getBaseAuthSchema } from './gql/getBaseAuthSchema';

package/src/templates/auth.ts

@@ -4,7 +4,7 @@ import { AuthGqlNames } from '../types';
 const template = `
 import getNextAuthPage from '@opensaas/keystone-nextjs-auth/pages/NextAuthPage';
 import { nextAuthProviders as Providers } from '@opensaas/keystone-nextjs-auth';
-import { lists } from '.keystone/api';
+import { query } from '.keystone/api';
 import keystoneConfig from '../../../../../keystone';
 
 export default getNextAuthPage({
@@ -17,7 +17,7 @@ export default getNextAuthPage({
         profileMap: <%- JSON.stringify(profileMap) %>,
         autoCreate: <%= autoCreate %>,
         providers: keystoneConfig.providers,
-        lists,
+        query,
     });
   `;
 

package/src/templates/next-config.ts

@@ -6,6 +6,12 @@ const Path = require('path');
 const withPreconstruct = require('@preconstruct/next');
 
 module.exports = withPreconstruct({
+  typescript: {
+    ignoreBuildErrors: true,
+  },
+  eslint: {
+    ignoreDuringBuilds: true,
+  },
   webpack(config, { isServer }) {
     config.resolve.alias = {
       ...config.resolve.alias,
@@ -18,8 +24,7 @@ module.exports = withPreconstruct({
     if (isServer) {
       config.externals = [
         ...config.externals, 
-        /@keystone-next\\/keystone(?!\\/___internal-do-not-use-will-break-in-patch\\/admin-ui\\/id-field-view)/,
-        /@keystone-next\\/types/, 
+        /@keystone-next\\/keystone(?!\\/___internal-do-not-use-will-break-in-patch\\/admin-ui\\/id-field-view|\\/fields\\/types\\/[^\\/]+\\/views)/,
         /.prisma\\/client/
       ];
     }

package/src/types.ts

@@ -1,8 +1,7 @@
 import {
   BaseGeneratedListTypes,
-  KeystoneContext,
   KeystoneConfig,
-} from '@keystone-next/types';
+} from '@keystone-next/keystone/types';
 import { Provider } from 'next-auth/providers';
 
 export type AuthGqlNames = {
@@ -14,20 +13,6 @@ export type AuthGqlNames = {
   ItemAuthenticationWithPasswordFailure: string;
 };
 
-export type SendTokenFn = (args: {
-  itemId: string | number;
-  identity: string;
-  token: string;
-  context: KeystoneContext;
-}) => Promise<void> | void;
-
-export type AuthTokenTypeConfig = {
-  /** Called when a user should be sent the magic signin token they requested */
-  sendToken: SendTokenFn;
-  /** How long do tokens stay valid for from time of issue, in minutes * */
-  tokensValidForMins?: number;
-};
-
 export type NextAuthSession = { listKey: string; itemId: string; data: any };
 
 export type NextAuthProviders = [Provider];