revert basePath defaults

examples/auth/keystone.ts

@@ -59,7 +59,6 @@ export default withAuth<TypeInfo<Session>>(
     },
     lists,
     ui: {
-      basePath: '/',
       // only admins can view the AdminUI
       isAccessAllowed: (context) => {
         return context.session?.data?.isAdmin ?? false

packages/auth/src/pages/SigninPage.tsx

@@ -9,7 +9,7 @@ import { TextInput } from '@keystone-ui/fields'
 import { Notice } from '@keystone-ui/notice'
 
 import { useMutation, gql } from '@keystone-6/core/admin-ui/apollo'
-import { useKeystone, useRawKeystone, useReinitContext } from '@keystone-6/core/admin-ui/context'
+import { useRawKeystone, useReinitContext } from '@keystone-6/core/admin-ui/context'
 import { useRouter } from '@keystone-6/core/admin-ui/router'
 import { SigninContainer } from '../components/SigninContainer'
 

packages/core/src/___internal-do-not-use-will-break-in-patch/admin-ui/pages/HomePage/index.tsx

@@ -109,7 +109,6 @@ export function HomePage () {
   const {
     adminMeta: { lists },
     visibleLists,
-    adminPath,
   } = useKeystone()
   const query = useMemo(
     () => gql`

packages/core/src/admin-ui/templates/index.ts

@@ -28,7 +28,7 @@ export const writeAdminFiles = (
         graphQLSchema,
         { configFileExists },
         config.graphql?.path || '/api/graphql',
-        config.ui?.basePath?.replace(/\/$/, '') || ''
+        config.ui?.basePath || ''
       ),
       overwrite: true,
       outputPath: `.admin/index.${ext}`,

packages/core/src/lib/createAdminUIMiddleware.ts

@@ -22,10 +22,10 @@ export function createAdminUIMiddlewareWithNextApp (
       isAccessAllowed,
       pageMiddleware,
       publicPages,
+      basePath,
     },
   } = config
 
-  const basePath = config.ui?.basePath?.replace(/\/$/, '') || ''
   if (basePath.endsWith('/')) throw new TypeError('basePath must not end with a trailing slash')
 
   return async (req: express.Request, res: express.Response) => {

packages/core/src/lib/createSystem.ts

@@ -52,6 +52,7 @@ export function getSystemPaths (cwd: string, config: KeystoneConfig | __Resolved
 
   const srcPath = path.join(cwd, 'src')
   const hasSrc = fs.existsSync(srcPath)
+  // remove leading `/` if present
   const basePath = config.ui?.basePath?.replace(/^\//, '') ?? ''
   const adminPath = path.join(cwd, hasSrc ? 'src' : '', `app/${basePath || '(admin)'}`)
 

packages/core/src/lib/defaults.ts

@@ -100,6 +100,7 @@ export function resolveDefaults <TypeInfo extends BaseKeystoneTypeInfo> (config:
   if (config?.server && 'options' in config.server && config.server.options) {
     Object.assign(httpOptions, config.server.options)
   }
+
   return {
     types: {
       ...config.types,
@@ -140,7 +141,7 @@ export function resolveDefaults <TypeInfo extends BaseKeystoneTypeInfo> (config:
     telemetry: config.telemetry ?? true,
     ui: {
       ...config.ui,
-      basePath: config.ui?.basePath?.replace(/\/$/, '') ?? '/admin',
+      basePath: config.ui?.basePath ?? '',
       isAccessAllowed: config.ui?.isAccessAllowed ?? defaultIsAccessAllowed,
       isDisabled: config.ui?.isDisabled ?? false,
       getAdditionalFiles: config.ui?.getAdditionalFiles ?? [],

tests/api-tests/fields/types/relationship.test.ts

@@ -24,7 +24,7 @@ function getSchema (field: {
           },
         }),
       },
-    })
+    }) as any
   ).graphQLSchema
 }
 
@@ -140,7 +140,7 @@ describe('Reference errors', () => {
       config({
         db: { url: 'file:./thing.db', provider: 'sqlite' },
         lists,
-      })
+      }) as any
     ).graphQLSchema
   }
 

tests/test-projects/basic/keystone.ts

@@ -10,9 +10,5 @@ export default config({
     // WARNING: this is only needed for examples, dont do this
     ...fixPrismaPath,
   },
-  ui: {
-    basePath: '/admin',
-    tsx: true,
-  },
   lists,
 })