@vendure/dashboard 3.4.0-minor-202506250934 → 3.4.0

package/vite/utils/plugin-discovery.ts

@@ -0,0 +1,494 @@
+import { parse } from 'acorn';
+import { simple as walkSimple } from 'acorn-walk';
+import glob from 'fast-glob';
+import fs from 'fs-extra';
+import { open } from 'fs/promises';
+import path from 'path';
+import * as ts from 'typescript';
+import { fileURLToPath } from 'url';
+
+import { Logger, PluginInfo, TransformTsConfigPathMappingsFn } from '../types.js';
+
+import { PackageScannerConfig } from './compiler.js';
+import { findTsConfigPaths, TsConfigPathsConfig } from './tsconfig-utils.js';
+
+export async function discoverPlugins({
+    vendureConfigPath,
+    transformTsConfigPathMappings,
+    logger,
+    outputPath,
+    pluginPackageScanner,
+}: {
+    vendureConfigPath: string;
+    transformTsConfigPathMappings: TransformTsConfigPathMappingsFn;
+    logger: Logger;
+    outputPath: string;
+    pluginPackageScanner?: PackageScannerConfig;
+}): Promise<PluginInfo[]> {
+    const plugins: PluginInfo[] = [];
+
+    // Analyze source files to find local plugins and package imports
+    const { localPluginLocations, packageImports } = await analyzeSourceFiles(
+        vendureConfigPath,
+        pluginPackageScanner?.nodeModulesRoot ?? guessNodeModulesRoot(vendureConfigPath, logger),
+        logger,
+        transformTsConfigPathMappings,
+    );
+    logger.debug(
+        `[discoverPlugins] Found ${localPluginLocations.size} local plugins: ${JSON.stringify([...localPluginLocations.entries()], null, 2)}`,
+    );
+    logger.debug(
+        `[discoverPlugins] Found ${packageImports.length} package imports: ${JSON.stringify(packageImports, null, 2)}`,
+    );
+
+    const filePaths = await findVendurePluginFiles({
+        logger,
+        nodeModulesRoot: pluginPackageScanner?.nodeModulesRoot,
+        packageGlobs: packageImports.map(pkg => pkg + '/**/*.js'),
+        outputPath,
+        vendureConfigPath,
+    });
+
+    for (const filePath of filePaths) {
+        const content = await fs.readFile(filePath, 'utf-8');
+        logger.debug(`[discoverPlugins] Checking file ${filePath}`);
+
+        // First check if this file imports from @vendure/core
+        if (!content.includes('@vendure/core')) {
+            continue;
+        }
+
+        try {
+            const ast = parse(content, {
+                ecmaVersion: 'latest',
+                sourceType: 'module',
+            });
+
+            let hasVendurePlugin = false;
+            let pluginName: string | undefined;
+            let dashboardPath: string | undefined;
+
+            // Walk the AST to find the plugin class and its decorator
+            walkSimple(ast, {
+                CallExpression(node: any) {
+                    // Look for __decorate calls
+                    const calleeName = node.callee.name;
+                    const nodeArgs = node.arguments;
+                    const isDecoratorWithArgs = calleeName === '__decorate' && nodeArgs.length >= 2;
+
+                    if (isDecoratorWithArgs) {
+                        // Check the decorators array (first argument)
+                        const decorators = nodeArgs[0];
+                        if (decorators.type === 'ArrayExpression') {
+                            for (const decorator of decorators.elements) {
+                                const props = getDecoratorObjectProps(decorator);
+                                for (const prop of props) {
+                                    const isDashboardProd =
+                                        prop.key.name === 'dashboard' && prop.value.type === 'Literal';
+                                    if (isDashboardProd) {
+                                        dashboardPath = prop.value.value;
+                                        hasVendurePlugin = true;
+                                    }
+                                }
+                            }
+                        }
+                        // Get the plugin class name (second argument)
+                        const targetClass = nodeArgs[1];
+                        if (targetClass.type === 'Identifier') {
+                            pluginName = targetClass.name;
+                        }
+                    }
+                },
+            });
+
+            if (hasVendurePlugin && pluginName && dashboardPath) {
+                logger.debug(`[discoverPlugins] Found plugin "${pluginName}" in file: ${filePath}`);
+                // Keep the dashboard path relative to the plugin file
+                const resolvedDashboardPath = dashboardPath.startsWith('.')
+                    ? dashboardPath // Keep the relative path as-is
+                    : './' + path.relative(path.dirname(filePath), dashboardPath); // Make absolute path relative
+
+                // Check if this is a local plugin we found earlier
+                const sourcePluginPath = localPluginLocations.get(pluginName);
+
+                plugins.push({
+                    name: pluginName,
+                    pluginPath: filePath,
+                    dashboardEntryPath: resolvedDashboardPath,
+                    ...(sourcePluginPath && { sourcePluginPath }),
+                });
+            }
+        } catch (e) {
+            logger.error(`Failed to parse ${filePath}: ${e instanceof Error ? e.message : String(e)}`);
+        }
+    }
+
+    return plugins;
+}
+
+function getDecoratorObjectProps(decorator: any): any[] {
+    if (
+        decorator.type === 'CallExpression' &&
+        decorator.arguments.length === 1 &&
+        decorator.arguments[0].type === 'ObjectExpression'
+    ) {
+        // Look for the dashboard property in the decorator config
+        return decorator.arguments[0].properties ?? [];
+    }
+    return [];
+}
+
+async function isSymlinkedLocalPackage(
+    packageName: string,
+    nodeModulesRoot: string,
+): Promise<string | undefined> {
+    try {
+        const packagePath = path.join(nodeModulesRoot, packageName);
+        const stats = await fs.lstat(packagePath);
+        if (stats.isSymbolicLink()) {
+            // Get the real path that the symlink points to
+            const realPath = await fs.realpath(packagePath);
+            // If the real path is within the project directory (i.e. not in some other node_modules),
+            // then it's a local package
+            if (!realPath.includes('node_modules')) {
+                return realPath;
+            }
+        }
+    } catch (e) {
+        // Package doesn't exist or other error - not a local package
+        return undefined;
+    }
+    return undefined;
+}
+
+/**
+ * Analyzes TypeScript source files starting from the config file to discover:
+ * 1. Local Vendure plugins
+ * 2. All non-local package imports that could contain plugins
+ */
+export async function analyzeSourceFiles(
+    vendureConfigPath: string,
+    nodeModulesRoot: string,
+    logger: Logger,
+    transformTsConfigPathMappings: TransformTsConfigPathMappingsFn,
+): Promise<{
+    localPluginLocations: Map<string, string>;
+    packageImports: string[];
+}> {
+    const localPluginLocations = new Map<string, string>();
+    const visitedFiles = new Set<string>();
+    const packageImportsSet = new Set<string>();
+
+    // Get tsconfig paths for resolving aliases
+    const tsConfigInfo = await findTsConfigPaths(
+        vendureConfigPath,
+        logger,
+        'compiling',
+        transformTsConfigPathMappings,
+    );
+
+    async function processFile(filePath: string) {
+        if (visitedFiles.has(filePath)) {
+            return;
+        }
+        visitedFiles.add(filePath);
+
+        try {
+            // First check if this is a directory
+            const stat = await fs.stat(filePath);
+            if (stat.isDirectory()) {
+                // If it's a directory, try to find the plugin file
+                const indexFilePath = path.join(filePath, 'index.ts');
+                if (await fs.pathExists(indexFilePath)) {
+                    await processFile(indexFilePath);
+                }
+                return;
+            }
+
+            const content = await fs.readFile(filePath, 'utf-8');
+            const sourceFile = ts.createSourceFile(filePath, content, ts.ScriptTarget.Latest, true);
+
+            // Track imports to follow
+            const importsToFollow: string[] = [];
+
+            async function visit(node: ts.Node) {
+                // Look for VendurePlugin decorator
+                const vendurePluginClassName = getVendurePluginClassName(node);
+                if (vendurePluginClassName) {
+                    localPluginLocations.set(vendurePluginClassName, filePath);
+                    logger.debug(`Found plugin "${vendurePluginClassName}" at ${filePath}`);
+                }
+
+                // Handle both imports and exports
+                const isImportOrExport = ts.isImportDeclaration(node) || ts.isExportDeclaration(node);
+                if (isImportOrExport) {
+                    const moduleSpecifier = node.moduleSpecifier;
+                    if (moduleSpecifier && ts.isStringLiteral(moduleSpecifier)) {
+                        const importPath = moduleSpecifier.text;
+
+                        // Track non-local imports (packages)
+                        const npmPackageName = getNpmPackageNameFromImport(importPath);
+                        if (npmPackageName) {
+                            // Check if this is actually a symlinked local package
+                            const localPackagePath = await isSymlinkedLocalPackage(
+                                npmPackageName,
+                                nodeModulesRoot,
+                            );
+                            if (localPackagePath) {
+                                // If it is local, follow it like a local import
+                                importsToFollow.push(localPackagePath);
+                                logger.debug(
+                                    `Found symlinked local package "${npmPackageName}" at ${localPackagePath}`,
+                                );
+                            } else {
+                                packageImportsSet.add(npmPackageName);
+                            }
+                        }
+                        // Handle path aliases and local imports
+                        const pathAliasImports = getPotentialPathAliasImportPaths(importPath, tsConfigInfo);
+                        if (pathAliasImports.length) {
+                            importsToFollow.push(...pathAliasImports);
+                        }
+                        // Also handle local imports
+                        if (importPath.startsWith('.')) {
+                            const resolvedPath = path.resolve(path.dirname(filePath), importPath);
+                            importsToFollow.push(resolvedPath);
+                        }
+                    }
+                }
+
+                // Visit children
+                const promises: Array<Promise<void>> = [];
+                ts.forEachChild(node, child => {
+                    promises.push(visit(child));
+                });
+                await Promise.all(promises);
+            }
+
+            await visit(sourceFile);
+
+            // Follow imports
+            for (const importPath of importsToFollow) {
+                // Try all possible file paths
+                const possiblePaths = [
+                    importPath + '.ts',
+                    importPath + '.js',
+                    path.join(importPath, 'index.ts'),
+                    path.join(importPath, 'index.js'),
+                    importPath,
+                ];
+                if (importPath.endsWith('.js')) {
+                    possiblePaths.push(importPath.replace(/.js$/, '.ts'));
+                }
+                // Try each possible path
+                let found = false;
+                for (const possiblePath of possiblePaths) {
+                    const possiblePathExists = await fs.pathExists(possiblePath);
+                    if (possiblePathExists) {
+                        await processFile(possiblePath);
+                        found = true;
+                        break;
+                    }
+                }
+
+                // If none of the file paths worked, try the raw import path
+                // (it might be a directory)
+                const tryRawPath = !found && (await fs.pathExists(importPath));
+                if (tryRawPath) {
+                    await processFile(importPath);
+                }
+            }
+        } catch (e) {
+            const message = e instanceof Error ? e.message : String(e);
+            logger.error(`Failed to process ${filePath}: ${message}`);
+        }
+    }
+
+    await processFile(vendureConfigPath);
+    return {
+        localPluginLocations,
+        packageImports: Array.from(packageImportsSet),
+    };
+}
+
+/**
+ * If this is a class declaration that is decorated with the `VendurePlugin` decorator,
+ * we want to return that class name, as we have found a local Vendure plugin.
+ */
+function getVendurePluginClassName(node: ts.Node): string | undefined {
+    if (ts.isClassDeclaration(node)) {
+        const decorators = ts.canHaveDecorators(node) ? ts.getDecorators(node) : undefined;
+        if (decorators?.length) {
+            for (const decorator of decorators) {
+                const decoratorName = getDecoratorName(decorator);
+                if (decoratorName === 'VendurePlugin') {
+                    const className = node.name?.text;
+                    if (className) {
+                        return className;
+                    }
+                }
+            }
+        }
+    }
+}
+
+function getNpmPackageNameFromImport(importPath: string): string | undefined {
+    if (!importPath.startsWith('.') && !importPath.startsWith('/')) {
+        // Get the root package name (e.g. '@scope/package/subpath' -> '@scope/package')
+        const packageName = importPath.startsWith('@')
+            ? importPath.split('/').slice(0, 2).join('/')
+            : importPath.split('/')[0];
+        return packageName;
+    }
+}
+
+function getPotentialPathAliasImportPaths(importPath: string, tsConfigInfo?: TsConfigPathsConfig) {
+    const importsToFollow: string[] = [];
+    if (!tsConfigInfo) {
+        return importsToFollow;
+    }
+    for (const [alias, patterns] of Object.entries(tsConfigInfo.paths)) {
+        const aliasPattern = alias.replace(/\*$/, '');
+        if (importPath.startsWith(aliasPattern)) {
+            const relativePart = importPath.slice(aliasPattern.length);
+            // Try each pattern
+            for (const pattern of patterns) {
+                const resolvedPattern = pattern.replace(/\*$/, '');
+                const resolvedPath = path.resolve(tsConfigInfo.baseUrl, resolvedPattern, relativePart);
+                importsToFollow.push(resolvedPath);
+            }
+        }
+    }
+    return importsToFollow;
+}
+
+function getDecoratorName(decorator: ts.Decorator): string | undefined {
+    if (ts.isCallExpression(decorator.expression)) {
+        const expression = decorator.expression.expression;
+        // Handle both direct usage and imported usage
+        if (ts.isIdentifier(expression)) {
+            return expression.text;
+        }
+        // Handle property access like `Decorators.VendurePlugin`
+        if (ts.isPropertyAccessExpression(expression)) {
+            return expression.name.text;
+        }
+    }
+    return undefined;
+}
+
+interface FindPluginFilesOptions {
+    outputPath: string;
+    vendureConfigPath: string;
+    logger: Logger;
+    packageGlobs: string[];
+    nodeModulesRoot?: string;
+}
+
+export async function findVendurePluginFiles({
+    outputPath,
+    vendureConfigPath,
+    logger,
+    nodeModulesRoot: providedNodeModulesRoot,
+    packageGlobs,
+}: FindPluginFilesOptions): Promise<string[]> {
+    let nodeModulesRoot = providedNodeModulesRoot;
+    const readStart = Date.now();
+    if (!nodeModulesRoot) {
+        nodeModulesRoot = guessNodeModulesRoot(vendureConfigPath, logger);
+    }
+
+    const patterns = [
+        // Local compiled plugins in temp dir
+        path.join(outputPath, '**/*.js'),
+        // Node modules patterns
+        ...packageGlobs.map(pattern => path.join(nodeModulesRoot, pattern)),
+    ].map(p => p.replace(/\\/g, '/'));
+
+    logger.debug(`Finding Vendure plugins using patterns: ${patterns.join('\n')}`);
+
+    const globStart = Date.now();
+    const files = await glob(patterns, {
+        ignore: [
+            // Standard test & doc files
+            '**/node_modules/**/node_modules/**',
+            '**/*.spec.js',
+            '**/*.test.js',
+        ],
+        onlyFiles: true,
+        absolute: true,
+        followSymbolicLinks: false,
+        stats: false,
+    });
+    logger.debug(`Glob found ${files.length} files in ${Date.now() - globStart}ms`);
+
+    // Read files in larger parallel batches
+    const batchSize = 100; // Increased batch size
+    const potentialPluginFiles: string[] = [];
+
+    for (let i = 0; i < files.length; i += batchSize) {
+        const batch = files.slice(i, i + batchSize);
+        const results = await Promise.all(
+            batch.map(async file => {
+                try {
+                    // Try reading just first 3000 bytes first - most imports are at the top
+                    const fileHandle = await open(file, 'r');
+                    try {
+                        const buffer = Buffer.alloc(3000);
+                        const { bytesRead } = await fileHandle.read(buffer, 0, 3000, 0);
+                        let content = buffer.toString('utf8', 0, bytesRead);
+
+                        // Quick check for common indicators
+                        if (content.includes('@vendure/core')) {
+                            return file;
+                        }
+
+                        // If we find a promising indicator but no definitive match,
+                        // read more of the file
+                        if (content.includes('@vendure') || content.includes('VendurePlugin')) {
+                            const largerBuffer = Buffer.alloc(5000);
+                            const { bytesRead: moreBytes } = await fileHandle.read(largerBuffer, 0, 5000, 0);
+                            content = largerBuffer.toString('utf8', 0, moreBytes);
+                            if (content.includes('@vendure/core')) {
+                                return file;
+                            }
+                        }
+                    } finally {
+                        await fileHandle.close();
+                    }
+                } catch (e: any) {
+                    logger.warn(`Failed to read file ${file}: ${e instanceof Error ? e.message : String(e)}`);
+                }
+                return null;
+            }),
+        );
+
+        const validResults = results.filter((f): f is string => f !== null);
+        potentialPluginFiles.push(...validResults);
+    }
+
+    logger.info(
+        `Found ${potentialPluginFiles.length} potential plugin files in ${Date.now() - readStart}ms ` +
+            `(scanned ${files.length} files)`,
+    );
+
+    return potentialPluginFiles;
+}
+
+function guessNodeModulesRoot(vendureConfigPath: string, logger: Logger): string {
+    let nodeModulesRoot: string;
+    // If the node_modules root path has not been explicitly
+    // specified, we will try to guess it by resolving the
+    // `@vendure/core` package.
+    try {
+        const coreUrl = import.meta.resolve('@vendure/core');
+        logger.debug(`Found core URL: ${coreUrl}`);
+        const corePath = fileURLToPath(coreUrl);
+        logger.debug(`Found core path: ${corePath}`);
+        nodeModulesRoot = path.join(path.dirname(corePath), '..', '..', '..');
+    } catch (e) {
+        logger.warn(`Failed to resolve @vendure/core: ${e instanceof Error ? e.message : String(e)}`);
+        nodeModulesRoot = path.dirname(vendureConfigPath);
+    }
+    return nodeModulesRoot;
+}

package/vite/utils/tsconfig-utils.ts

@@ -0,0 +1,79 @@
+import fs from 'fs-extra';
+import path from 'path';
+import { CompilerOptions } from 'typescript';
+
+import { Logger, TransformTsConfigPathMappingsFn } from '../types.js';
+
+export interface TsConfigPathsConfig {
+    baseUrl: string;
+    paths: Record<string, string[]>;
+}
+
+/**
+ * Finds and parses tsconfig files in the given directory and its parent directories.
+ */
+export async function findTsConfigPaths(
+    configPath: string,
+    logger: Logger,
+    phase: 'compiling' | 'loading',
+    transformTsConfigPathMappings: TransformTsConfigPathMappingsFn,
+): Promise<TsConfigPathsConfig | undefined> {
+    let currentDir = path.dirname(configPath);
+
+    while (currentDir !== path.parse(currentDir).root) {
+        try {
+            const files = await fs.readdir(currentDir);
+            const tsConfigFiles = files.filter(file => /^tsconfig(\..*)?\.json$/.test(file));
+
+            for (const fileName of tsConfigFiles) {
+                const tsConfigFilePath = path.join(currentDir, fileName);
+                try {
+                    const { paths, baseUrl } = await getCompilerOptionsFromFile(tsConfigFilePath);
+                    if (paths) {
+                        const tsConfigBaseUrl = path.resolve(currentDir, baseUrl || '.');
+                        const pathMappings = getTransformedPathMappings(
+                            paths,
+                            phase,
+                            transformTsConfigPathMappings,
+                        );
+                        return { baseUrl: tsConfigBaseUrl, paths: pathMappings };
+                    }
+                } catch (e) {
+                    logger.warn(
+                        `Could not read or parse tsconfig file ${tsConfigFilePath}: ${e instanceof Error ? e.message : String(e)}`,
+                    );
+                }
+            }
+        } catch (e) {
+            logger.warn(
+                `Could not read directory ${currentDir}: ${e instanceof Error ? e.message : String(e)}`,
+            );
+        }
+        currentDir = path.dirname(currentDir);
+    }
+    return undefined;
+}
+
+async function getCompilerOptionsFromFile(tsConfigFilePath: string): Promise<CompilerOptions> {
+    const tsConfigContent = await fs.readFile(tsConfigFilePath, 'utf-8');
+    const tsConfig = JSON.parse(tsConfigContent);
+    return tsConfig.compilerOptions || {};
+}
+
+function getTransformedPathMappings(
+    paths: Required<CompilerOptions>['paths'],
+    phase: 'compiling' | 'loading',
+    transformTsConfigPathMappings: TransformTsConfigPathMappingsFn,
+) {
+    const pathMappings: Record<string, string[]> = {};
+
+    for (const [alias, patterns] of Object.entries(paths)) {
+        const normalizedPatterns = patterns.map(pattern => pattern.replace(/\\/g, '/'));
+        pathMappings[alias] = transformTsConfigPathMappings({
+            phase,
+            alias,
+            patterns: normalizedPatterns,
+        });
+    }
+    return pathMappings;
+}

package/vite/utils/ui-config.ts

@@ -3,7 +3,6 @@ import {
     DEFAULT_AUTH_TOKEN_HEADER_KEY,
     DEFAULT_CHANNEL_TOKEN_KEY,
 } from '@vendure/common/lib/shared-constants';
-import { AdminUiConfig } from '@vendure/common/lib/shared-types';
 import { VendureConfig } from '@vendure/core';
 
 import {
@@ -12,53 +11,42 @@ import {
     defaultLanguage,
     defaultLocale,
 } from '../constants.js';
+import { ResolvedUiConfig, UiConfigPluginOptions } from '../vite-plugin-ui-config.js';
 
-export function getAdminUiConfig(
-    config: VendureConfig,
-    adminUiConfig?: Partial<AdminUiConfig>,
-): AdminUiConfig {
+export function getUiConfig(config: VendureConfig, pluginOptions: UiConfigPluginOptions): ResolvedUiConfig {
     const { authOptions, apiOptions } = config;
 
-    const propOrDefault = <Prop extends keyof AdminUiConfig>(
-        prop: Prop,
-        defaultVal: AdminUiConfig[Prop],
-        isArray: boolean = false,
-    ): AdminUiConfig[Prop] => {
-        if (isArray) {
-            const isValidArray = !!adminUiConfig
-                ? !!((adminUiConfig as AdminUiConfig)[prop] as any[])?.length
-                : false;
+    // Merge API configuration with defaults
+    const api = {
+        adminApiPath: pluginOptions.api?.adminApiPath ?? apiOptions.adminApiPath ?? ADMIN_API_PATH,
+        host: pluginOptions.api?.host ?? 'auto',
+        port: pluginOptions.api?.port ?? 'auto',
+        tokenMethod:
+            pluginOptions.api?.tokenMethod ?? (authOptions.tokenMethod === 'bearer' ? 'bearer' : 'cookie'),
+        authTokenHeaderKey:
+            pluginOptions.api?.authTokenHeaderKey ??
+            authOptions.authTokenHeaderKey ??
+            DEFAULT_AUTH_TOKEN_HEADER_KEY,
+        channelTokenKey:
+            pluginOptions.api?.channelTokenKey ?? apiOptions.channelTokenKey ?? DEFAULT_CHANNEL_TOKEN_KEY,
+    };
 
-            return !!adminUiConfig && isValidArray ? (adminUiConfig as AdminUiConfig)[prop] : defaultVal;
-        } else {
-            return adminUiConfig ? (adminUiConfig as AdminUiConfig)[prop] || defaultVal : defaultVal;
-        }
+    // Merge i18n configuration with defaults
+    const i18n = {
+        defaultLanguage: pluginOptions.i18n?.defaultLanguage ?? defaultLanguage,
+        defaultLocale: pluginOptions.i18n?.defaultLocale ?? defaultLocale,
+        availableLanguages:
+            pluginOptions.i18n?.availableLanguages && pluginOptions.i18n.availableLanguages.length > 0
+                ? pluginOptions.i18n.availableLanguages
+                : defaultAvailableLanguages,
+        availableLocales:
+            pluginOptions.i18n?.availableLocales && pluginOptions.i18n.availableLocales.length > 0
+                ? pluginOptions.i18n.availableLocales
+                : defaultAvailableLocales,
     };
 
     return {
-        adminApiPath: propOrDefault('adminApiPath', apiOptions.adminApiPath || ADMIN_API_PATH),
-        apiHost: propOrDefault('apiHost', 'auto'),
-        apiPort: propOrDefault('apiPort', 'auto'),
-        tokenMethod: propOrDefault('tokenMethod', authOptions.tokenMethod === 'bearer' ? 'bearer' : 'cookie'),
-        authTokenHeaderKey: propOrDefault(
-            'authTokenHeaderKey',
-            authOptions.authTokenHeaderKey || DEFAULT_AUTH_TOKEN_HEADER_KEY,
-        ),
-        channelTokenKey: propOrDefault(
-            'channelTokenKey',
-            apiOptions.channelTokenKey || DEFAULT_CHANNEL_TOKEN_KEY,
-        ),
-        defaultLanguage: propOrDefault('defaultLanguage', defaultLanguage),
-        defaultLocale: propOrDefault('defaultLocale', defaultLocale),
-        availableLanguages: propOrDefault('availableLanguages', defaultAvailableLanguages, true),
-        availableLocales: propOrDefault('availableLocales', defaultAvailableLocales, true),
-        brand: adminUiConfig?.brand,
-        hideVendureBranding: propOrDefault(
-            'hideVendureBranding',
-            adminUiConfig?.hideVendureBranding || false,
-        ),
-        hideVersion: propOrDefault('hideVersion', adminUiConfig?.hideVersion || false),
-        loginImageUrl: adminUiConfig?.loginImageUrl,
-        cancellationReasons: propOrDefault('cancellationReasons', undefined),
+        api,
+        i18n,
     };
 }