feat: add compatibility with @rspress/core@2.0.0-rc.3

packages/preset/package.json

@@ -42,20 +42,20 @@
   },
   "dependencies": {
     "@callstack/rspress-theme": "workspace:*",
-    "@rspress/plugin-llms": "2.0.0-beta.35",
-    "@rspress/plugin-sitemap": "2.0.0-beta.35",
+    "@rspress/plugin-llms": "2.0.0-rc.2",
+    "@rspress/plugin-sitemap": "2.0.0-rc.2",
     "@vercel/analytics": "^1.5.0",
     "rsbuild-plugin-open-graph": "^1.0.2",
     "zod": "^3.23.8"
   },
   "peerDependencies": {
-    "@rspress/core": "2.0.0-beta.35"
+    "@rspress/core": "2.0.0-rc.2"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.52.8",
     "@rslib/core": "^0.10.5",
-    "@rspress/core": "2.0.0-beta.35",
+    "@rspress/core": "2.0.0-rc.2",
     "@types/node": "^22",
-    "typescript": "^5.8.3"
+    "typescript": "^5.9.3"
   }
 }

packages/preset/src/preset.ts

@@ -14,7 +14,9 @@ const CALLSTACK_BASE_URL = 'https://www.callstack.com';
 const CALLSTACK_CONTACT_URL = 'https://www.callstack.com/contact';
 
 type SupportedSocialLinks = Exclude<
-  Parameters<typeof SocialLinksComponent>[0]['socialLinks'][number]['icon'],
+  NonNullable<
+    Parameters<typeof SocialLinksComponent>[0]['socialLinks']
+  >[number]['icon'],
   { svg: string }
 >;
 type Socials = Partial<Record<SupportedSocialLinks, string>>;
@@ -139,7 +141,6 @@ const createPreset = (config: PresetConfig): UserConfig => {
       },
       editLink: {
         docRepoBaseUrl: docs.editUrl,
-        text: 'Edit this page on GitHub',
       },
       socialLinks: createSocialLinks(docs.socials),
     },

packages/tester/package.json

@@ -11,12 +11,12 @@
     "preview": "rspress preview"
   },
   "dependencies": {
-    "@rspress/core": "^2.0.0-beta.35",
+    "@rspress/core": "^2.0.0-rc.2",
     "@callstack/rspress-preset": "workspace:*",
     "@callstack/rspress-theme": "workspace:*"
   },
   "devDependencies": {
     "@types/node": "^22",
-    "@types/react": "^19"
+    "@types/react": "^19.2.0"
   }
 }

packages/tester/rspress.config.ts

@@ -1,7 +1,56 @@
 import * as path from 'node:path';
 import { withCallstackPreset } from '@callstack/rspress-preset';
+import { pluginCallstackTheme } from '@callstack/rspress-theme/plugin';
+import { defineConfig } from '@rspress/core';
 
-export default withCallstackPreset(
+const isDev = process.env.NODE_ENV === 'development';
+
+const themeOptions = {
+  content: {
+    homeBannerButtonText: 'Home Banner Button Text',
+    homeBannerDescription: 'Home Banner Description',
+    homeBannerHeadline: 'Home Banner Headline',
+    outlineCTAButtonText: 'Outline CTA Button Text',
+    outlineCTADescription: 'Outline CTA Description',
+    outlineCTAHeadline: 'Outline CTA Headline',
+  },
+};
+
+const devConfig = defineConfig({
+  root: path.join(__dirname, 'docs'),
+  title: 'My Site',
+  description: 'My Site Description',
+  logo: {
+    dark: '/logo-dark.png',
+    light: '/logo-light.png',
+  },
+  themeConfig: {
+    editLink: {
+      docRepoBaseUrl: 'https://github.com/callstack/rspress-theme',
+    },
+    socialLinks: [
+      {
+        icon: 'github',
+        mode: 'link',
+        content: 'https://github.com/callstack/rspress-theme',
+      },
+      { icon: 'X', mode: 'link', content: 'https://x.com/repack_rn' },
+      {
+        icon: 'discord',
+        mode: 'link',
+        content: 'https://github.com/callstack/rspress-theme',
+      },
+    ],
+  },
+  plugins: [pluginCallstackTheme(themeOptions)],
+  builderConfig: {
+    performance: {
+      buildCache: false,
+    },
+  },
+});
+
+const prodConfig = withCallstackPreset(
   {
     context: path.join(__dirname),
     docs: {
@@ -16,16 +65,7 @@ export default withCallstackPreset(
         discord: 'https://github.com/callstack/rspress-theme',
       },
     },
-    theme: {
-      content: {
-        homeBannerButtonText: 'Home Banner Button Text',
-        homeBannerDescription: 'Home Banner Description',
-        homeBannerHeadline: 'Home Banner Headline',
-        outlineCTAButtonText: 'Outline CTA Button Text',
-        outlineCTADescription: 'Outline CTA Description',
-        outlineCTAHeadline: 'Outline CTA Headline',
-      },
-    },
+    theme: themeOptions,
   },
   {
     builderConfig: {
@@ -35,3 +75,5 @@ export default withCallstackPreset(
     },
   }
 );
+
+export default isDev ? devConfig : prodConfig;

packages/tester/theme/index.tsx

@@ -1,5 +1,5 @@
 import { Announcement, VersionBadge } from '@callstack/rspress-theme';
-import { Layout as RspressLayout } from '@rspress/core/theme';
+import { Layout as RspressLayout } from '@rspress/core/theme-original';
 
 const Layout = () => {
   return (
@@ -18,4 +18,4 @@ const Layout = () => {
 
 export { Layout };
 
-export * from '@rspress/core/theme';
+export * from '@rspress/core/theme-original';

packages/theme/package.json

@@ -45,8 +45,9 @@
     "typecheck": "tsc --noEmit"
   },
   "peerDependencies": {
-    "@rspress/core": "^2.0.0-beta.35",
-    "react": "^19.0.0"
+    "@rspress/core": "^2.0.0-rc.2",
+    "react": "^19.2.0",
+    "react-dom": "^19.2.0"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.52.8",
@@ -55,10 +56,12 @@
     "@rsbuild/plugin-sass": "^1.3.3",
     "@rsbuild/plugin-svgr": "^1.2.1",
     "@rslib/core": "^0.10.5",
-    "@rspress/core": "^2.0.0-beta.35",
+    "@rspress/core": "^2.0.0-rc.2",
     "@types/node": "^22",
-    "@types/react": "^19",
-    "react": "^19",
-    "typescript": "^5.8.3"
+    "@types/react": "^19.2.0",
+    "@types/react-dom": "^19.2.0",
+    "react": "^19.2.0",
+    "react-dom": "^19.2.0",
+    "typescript": "^5.9.3"
   }
 }

packages/theme/src/plugin/const.ts

@@ -3,9 +3,9 @@ export const OUTLINE_TITLE = 'Contents';
 export const SEARCH_NO_RESULTS_TEXT =
   'No results found, try something different than';
 
-export const SEARCH_SUGGESTED_QUERY_TEXT = '';
+export const SEARCH_SUGGESTED_QUERY_TEXT = ' ';
 
-export const OVERVIEW_FILTER_NAME_TEXT = '';
+export const OVERVIEW_FILTER_NAME_TEXT = ' ';
 
 export const OUTLINE_CTA_BUTTON_TEXT = "Let's talk";
 export const OUTLINE_CTA_DESCRIPTION =
@@ -27,3 +27,5 @@ export const HOME_BANNER_BUTTON_TEXT = "Let's talk";
 export const HOME_BANNER_LINK = 'https://www.callstack.com/contact';
 
 export const HOME_FOOTER_LINK = 'https://callstack.com';
+
+export const EDIT_LINK_TEXT = 'Edit this page on GitHub';

packages/theme/src/plugin/global.d.ts

@@ -0,0 +1,4 @@
+declare module '*.svg' {
+  const content: string;
+  export default content;
+}

packages/theme/src/plugin/index.ts

@@ -1,4 +1,3 @@
-import fs from 'node:fs';
 import { createRequire } from 'node:module';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -33,32 +32,21 @@ function excludeFalse<T>(value: T): value is Exclude<T, false> {
   return value !== false;
 }
 
-function getThemeAssets() {
-  const assetsDirPath = path.join(dirname, '../assets');
-  const contents = fs.readdirSync(assetsDirPath);
-  return contents
-    .map(path.parse)
-    .map(({ base, name }) => [
-      `@theme-assets/${name}`,
-      path.join(assetsDirPath, base),
-    ]);
-}
-
 function getThemeAliases(
   existingThemeAlias: AliasEntry
 ): Record<string, string | string[]> {
   const ckThemeExportsPath = path.join(dirname, 'theme');
 
   const { resolve } = createRequire(import.meta.url);
-  const rspressThemeDefaultPath = resolve('@rspress/theme-default', {
+  const rspressCoreThemePath = resolve('@rspress/core/theme', {
     paths: [resolve('@rspress/core/package.json')],
   });
 
   const aliases: Record<string, string | string[]> = {};
 
   // Handle @theme alias
   if (Array.isArray(existingThemeAlias)) {
-    const index = existingThemeAlias.indexOf(rspressThemeDefaultPath);
+    const index = existingThemeAlias.indexOf(rspressCoreThemePath);
     if (index !== -1) {
       aliases['@theme'] = existingThemeAlias.filter(excludeFalse).slice();
       aliases['@theme'].splice(index, 0, ckThemeExportsPath);
@@ -74,29 +62,13 @@ function getThemeAliases(
   }
 
   // Add alias for @default-theme to avoid circular dependency
-  aliases['@default-theme'] = rspressThemeDefaultPath;
+  aliases['@default-theme'] = rspressCoreThemePath;
   // Alias rspress/theme to our theme to keep the theme override pattern from Rspress docs
   aliases['@rspress/core/theme'] = ckThemeExportsPath;
-
-  return aliases;
-}
-
-function getThemeAssetAlias(
-  existingAssetAlias: AliasEntry
-): Record<string, string | string[]> {
-  const assetOverrides = getThemeAssets();
-  const aliases: Record<string, string | string[]> = {};
-
-  for (const [assetAlias, assetPath] of assetOverrides) {
-    if (Array.isArray(existingAssetAlias)) {
-      aliases[assetAlias] = existingAssetAlias.filter(excludeFalse);
-      aliases[assetAlias].push(assetPath);
-    } else if (existingAssetAlias) {
-      aliases[assetAlias] = [existingAssetAlias, assetPath];
-    } else {
-      aliases[assetAlias] = assetPath;
-    }
-  }
+  // Alias @theme-original and @rspress/core/theme-original to always override
+  // the original theme
+  aliases['@theme-original'] = ckThemeExportsPath;
+  aliases['@rspress/core/theme-original'] = ckThemeExportsPath;
 
   return aliases;
 }
@@ -137,16 +109,6 @@ function getBuilderConfig(options: PluginCallstackThemeOptions): BuilderConfig {
     },
     resolve: {
       alias: (alias) => {
-        // add '@theme-assets' aliases but keep the custom ones from user
-        const assetAliases = getThemeAssetAlias(alias['@theme-assets']);
-        Object.assign(alias, assetAliases);
-
-        // remove & add existing @theme-assets alias to keep specific aliases on top
-        const themeAssetsAlias = alias['@theme-assets'];
-        // biome-ignore lint/performance/noDelete: change property order
-        delete alias['@theme-assets'];
-        Object.assign(alias, { '@theme-assets': themeAssetsAlias });
-
         // add '@theme', '@default-theme' & 'rspress/theme' aliases
         // @ts-ignore
         const themeAliases = getThemeAliases(alias['@theme']);
@@ -156,26 +118,49 @@ function getBuilderConfig(options: PluginCallstackThemeOptions): BuilderConfig {
   };
 }
 
-function addThemeOverrides(themeConfig: UserConfig['themeConfig'] = {}) {
-  if (!themeConfig.overview) {
-    themeConfig.overview = { filterNameText: consts.OVERVIEW_FILTER_NAME_TEXT };
-  } else if (!themeConfig.overview.filterNameText) {
-    themeConfig.overview.filterNameText = consts.OVERVIEW_FILTER_NAME_TEXT;
+function getI18nSourceOverrides(
+  existingI18nSource: UserConfig['i18nSource'] = {}
+): UserConfig['i18nSource'] {
+  const i18nSource: UserConfig['i18nSource'] = {
+    ...existingI18nSource,
+  };
+
+  if (!i18nSource['overview.filterNameText']) {
+    i18nSource['overview.filterNameText'] = {
+      en: consts.OVERVIEW_FILTER_NAME_TEXT,
+      zh: consts.OVERVIEW_FILTER_NAME_TEXT,
+    };
+  }
+
+  if (!i18nSource.outlineTitle) {
+    i18nSource.outlineTitle = {
+      en: consts.OUTLINE_TITLE,
+      zh: consts.OUTLINE_TITLE,
+    };
   }
 
-  if (!themeConfig.outlineTitle) {
-    themeConfig.outlineTitle = consts.OUTLINE_TITLE;
+  if (!i18nSource.searchNoResultsText) {
+    i18nSource.searchNoResultsText = {
+      en: consts.SEARCH_NO_RESULTS_TEXT,
+      zh: consts.SEARCH_NO_RESULTS_TEXT,
+    };
   }
 
-  if (!themeConfig.searchNoResultsText) {
-    themeConfig.searchNoResultsText = consts.SEARCH_NO_RESULTS_TEXT;
+  if (!i18nSource.searchSuggestedQueryText) {
+    i18nSource.searchSuggestedQueryText = {
+      en: consts.SEARCH_SUGGESTED_QUERY_TEXT,
+      zh: consts.SEARCH_SUGGESTED_QUERY_TEXT,
+    };
   }
 
-  if (!themeConfig.searchSuggestedQueryText) {
-    themeConfig.searchSuggestedQueryText = consts.SEARCH_SUGGESTED_QUERY_TEXT;
+  if (!i18nSource.editLinkText) {
+    i18nSource.editLinkText = {
+      en: consts.EDIT_LINK_TEXT,
+      zh: consts.EDIT_LINK_TEXT,
+    };
   }
 
-  return themeConfig;
+  return i18nSource;
 }
 
 function normalizeOptions(options: PluginCallstackThemeOptions) {
@@ -218,9 +203,8 @@ export function pluginCallstackTheme(
     name: 'plugin-callstack-theme',
     // replace default theme & theme assets
     builderConfig: getBuilderConfig(normalizedOptions),
-    // add ck theme defaults if not present
     config: (config) => {
-      config.themeConfig = addThemeOverrides(config.themeConfig);
+      config.i18nSource = getI18nSourceOverrides(config.i18nSource);
       return config;
     },
     // inject style overrides