diff --git a/packages/payload/src/bin/generateImportMap/index.ts b/packages/payload/src/bin/generateImportMap/index.ts index 8bde204855f..c728650cb7e 100644 --- a/packages/payload/src/bin/generateImportMap/index.ts +++ b/packages/payload/src/bin/generateImportMap/index.ts @@ -148,6 +148,7 @@ export async function generateImportMap( await writeImportMap({ componentMap: importMap, + config, fileName: 'importMap.js', force: options?.force, importMap: imports, @@ -158,6 +159,7 @@ export async function generateImportMap( export async function writeImportMap({ componentMap, + config, fileName, force, importMap, @@ -165,6 +167,7 @@ export async function writeImportMap({ rootDir, }: { componentMap: InternalImportMap + config: SanitizedConfig fileName: string force?: boolean importMap: Imports @@ -172,13 +175,14 @@ export async function writeImportMap({ rootDir: string }) { let importMapFolderPath = '' - if (fs.existsSync(path.resolve(rootDir, 'app/(payload)/admin/'))) { - importMapFolderPath = path.resolve(rootDir, 'app/(payload)/admin/') - } else if (fs.existsSync(path.resolve(rootDir, 'src/app/(payload)/admin/'))) { - importMapFolderPath = path.resolve(rootDir, 'src/app/(payload)/admin/') + const adminPath = config.routes.admin || '/admin' + if (fs.existsSync(path.resolve(rootDir, `app/(payload)${adminPath}/`))) { + importMapFolderPath = path.resolve(rootDir, `app/(payload)${adminPath}/`) + } else if (fs.existsSync(path.resolve(rootDir, `src/app/(payload)${adminPath}/`))) { + importMapFolderPath = path.resolve(rootDir, `src/app/(payload)${adminPath}/`) } else { throw new Error( - `Could not find the payload admin directory. Looked in ${path.resolve(rootDir, 'app/(payload)/admin/')} and ${path.resolve(rootDir, 'src/app/(payload)/admin/')}`, + `Could not find the payload admin directory. Looked in ${path.resolve(rootDir, `app/(payload)${adminPath}/`)} and ${path.resolve(rootDir, `src/app/(payload)${adminPath}/`)}`, ) }