feat: add support for newest rspress 2 beta

packages/tester/package.json

@@ -11,7 +11,7 @@
     "preview": "rspress preview"
   },
   "dependencies": {
-    "rspress": "^2.0.0-beta.21",
+    "@rspress/core": "^2.0.0-beta.31",
     "@callstack/rspress-theme": "workspace:*"
   },
   "devDependencies": {

packages/tester/rspress.config.ts

@@ -1,6 +1,6 @@
 import * as path from 'node:path';
 import { pluginCallstackTheme } from '@callstack/rspress-theme/plugin';
-import { defineConfig } from 'rspress/config';
+import { defineConfig } from '@rspress/core';
 
 export default defineConfig({
   root: path.join(__dirname, 'docs'),

packages/tester/theme/index.tsx

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

packages/theme/README.md

@@ -31,7 +31,7 @@ To use the `rspress-theme` package, you need to add the plugin to the Rspress co
 In your `rspress.config.ts` file, import `pluginCallstackTheme` from `@callstack/rspress-theme/plugin` and add it to the plugins array:
 
 ```ts
-import { defineConfig } from 'rspress/core';
+import { defineConfig } from '@rspress/core';
 import { pluginCallstackTheme } from '@callstack/rspress-theme/plugin';
 
 export default defineConfig({
@@ -87,7 +87,7 @@ import { Announcement } from '@callstack/rspress-theme';
 
 ```ts
 import path from 'node:path';
-import { defineConfig } from 'rspress/core';
+import { defineConfig } from '@rspress/core';
 import { pluginCallstackTheme } from '@callstack/rspress-theme/plugin';
 
 export default defineConfig({

packages/theme/package.json

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

packages/theme/src/plugin/index.ts

@@ -2,7 +2,7 @@ import fs from 'node:fs';
 import { createRequire } from 'node:module';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import type { RspressPlugin, UserConfig } from 'rspress/core';
+import type { RspressPlugin, UserConfig } from '@rspress/core';
 
 type BuilderConfig = NonNullable<UserConfig['builderConfig']>;
 type AliasEntry = string | (false | string)[] | false | undefined;
@@ -15,7 +15,6 @@ interface PluginCallstackThemeOptions {
   };
 }
 
-const { resolve } = createRequire(import.meta.url);
 const dirname = path.dirname(fileURLToPath(import.meta.url));
 
 function excludeFalse<T>(value: T): value is Exclude<T, false> {
@@ -37,8 +36,10 @@ 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', {
-    paths: [resolve('rspress')],
+    paths: [resolve('@rspress/core')],
   });
 
   const aliases: Record<string, string | string[]> = {};
@@ -63,7 +64,7 @@ function getThemeAliases(
   // Add alias for @default-theme to avoid circular dependency
   aliases['@default-theme'] = rspressThemeDefaultPath;
   // Alias rspress/theme to our theme to keep the theme override pattern from Rspress docs
-  aliases['rspress/theme'] = ckThemeExportsPath;
+  aliases['@rspress/core/theme'] = ckThemeExportsPath;
 
   return aliases;
 }

packages/theme/src/theme/components/announcement/index.tsx

@@ -1,5 +1,5 @@
+import { NoSSR } from '@rspress/core/runtime';
 import { useState } from 'react';
-import { NoSSR } from 'rspress/runtime';
 import IconClose from '../../assets/close.svg?react';
 import styles from './index.module.scss';
 

packages/theme/src/theme/components/home-feature/index.tsx

@@ -2,7 +2,7 @@ import {
   isExternalUrl,
   normalizeHrefInRuntime,
   withBase,
-} from 'rspress/runtime';
+} from '@rspress/core/runtime';
 import type { Feature, FrontMatterMeta } from '../../types';
 import { renderHtmlOrText } from '../../utils';
 import styles from './index.module.scss';

packages/theme/src/theme/components/home-footer/index.tsx

@@ -1,5 +1,5 @@
+import { usePageData } from '@rspress/core/runtime';
 import { Link, SocialLinks } from '@theme';
-import { usePageData } from 'rspress/runtime';
 import CKLogoDark from '../../assets/ck-logo-dark.svg?react';
 import CKLogoLight from '../../assets/ck-logo-light.svg?react';
 import styles from './index.module.scss';

packages/theme/src/theme/components/home-hero/index.tsx

@@ -3,7 +3,7 @@ import {
   normalizeHrefInRuntime,
   normalizeImagePath,
   withBase,
-} from 'rspress/runtime';
+} from '@rspress/core/runtime';
 import type { FrontMatterMeta, Hero } from '../../types';
 import { renderHtmlOrText } from '../../utils';
 import { Button } from '../button';

packages/theme/src/theme/components/switch-appearance/index.tsx

@@ -1,5 +1,5 @@
+import { ThemeContext, flushSync, useSite } from '@rspress/core/runtime';
 import { type MouseEvent, useContext } from 'react';
-import { DataContext, ThemeContext, flushSync } from 'rspress/runtime';
 import IconMoon from '../../assets/moon.svg?react';
 import IconSun from '../../assets/sun.svg?react';
 import './index.module.scss';
@@ -26,12 +26,12 @@ const removeClipViewTransition = () => {
 };
 
 export function SwitchAppearance({ onClick }: { onClick?: () => void }) {
-  const { data: pageData } = useContext(DataContext);
+  const { site: siteData } = useSite();
   const { theme, setTheme = () => {} } = useContext(ThemeContext);
 
   const handleClick = (event: MouseEvent) => {
     const supported = supportAppearanceTransition();
-    const enabled = pageData.siteData?.themeConfig?.enableAppearanceAnimation;
+    const enabled = siteData.themeConfig?.enableAppearanceAnimation;
 
     const nextTheme = theme === 'dark' ? 'light' : 'dark';
     const isDark = nextTheme === 'dark';

packages/theme/src/theme/components/version-badge/index.tsx

@@ -1,5 +1,5 @@
+import { usePageData } from '@rspress/core/runtime';
 import { Badge } from '@theme';
-import { usePageData } from 'rspress/runtime';
 import styles from './index.module.scss';
 
 interface VersionBadgeProps {