Skip to content

fix: inject ck theme before the rspress theme #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbroma merged 1 commit into from
Jan 9, 2026
Merged

fix: inject ck theme before the rspress theme #97

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 23 additions & 19 deletions packages/theme/src/plugin/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,39 +28,43 @@ interface PluginCallstackThemeOptions {

const dirname = path.dirname(fileURLToPath(import.meta.url));

function excludeFalse<T>(value: T): value is Exclude<T, false> {
return value !== false;
}

function getThemeAliases(
existingThemeAlias: AliasEntry
): Record<string, string | string[]> {
const ckThemeExportsPath = path.join(dirname, 'theme');

const { resolve } = createRequire(import.meta.url);
const rspressCoreThemePath = resolve('@rspress/core/theme', {
const rspressCoreThemeEntry = resolve('@rspress/core/theme', {
paths: [resolve('@rspress/core/package.json')],
});
const rspressCoreThemePath = path.dirname(rspressCoreThemeEntry);

const aliases: Record<string, string | string[]> = {};

// Handle @theme alias
if (Array.isArray(existingThemeAlias)) {
const index = existingThemeAlias.indexOf(rspressCoreThemePath);
if (index !== -1) {
aliases['@theme'] = existingThemeAlias.filter(excludeFalse).slice();
aliases['@theme'].splice(index, 0, ckThemeExportsPath);
} else {
// Add CK theme path to existing array
aliases['@theme'] = existingThemeAlias
.filter(excludeFalse)
.concat(ckThemeExportsPath);
}
} else {
// Replace single string with CK theme path
aliases['@theme'] = ckThemeExportsPath;
// Order matters here: project theme -> CK theme -> Rspress default theme.
const existingThemeAliasList = Array.isArray(existingThemeAlias)
? existingThemeAlias
: typeof existingThemeAlias === 'string'
? [existingThemeAlias]
: [];

const themeAliasCandidates = existingThemeAliasList
.filter((value): value is string => typeof value === 'string')
// Ensure we don't duplicate/mis-order our theme if this runs multiple times.
.filter((value) => value !== ckThemeExportsPath);

// Ensure the Rspress default theme is always the final fallback.
if (!themeAliasCandidates.includes(rspressCoreThemePath)) {
themeAliasCandidates.push(rspressCoreThemePath);
}

// Inject CK theme after the project theme but before the Rspress theme.
const rspressThemeIndex = themeAliasCandidates.indexOf(rspressCoreThemePath);
themeAliasCandidates.splice(rspressThemeIndex, 0, ckThemeExportsPath);

aliases['@theme'] = themeAliasCandidates;

// Add alias for @default-theme to avoid circular dependency
aliases['@default-theme'] = rspressCoreThemePath;
// Alias rspress/theme to our theme to keep the theme override pattern from Rspress docs
Expand Down