Skip to content

Commit 8ecfdd5

Browse files
jbromajbroma
authored
chore: upgrade to rspress 2.0.0-rc.4 (#1324)
1 parent 8cfd95c commit 8ecfdd5

6 files changed

Lines changed: 408 additions & 415 deletions

File tree

‎pnpm-lock.yaml‎

Lines changed: 384 additions & 356 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎website/package.json‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@
66
"node": ">=20"
77
},
88
"scripts": {
9-
"start": "rspress dev",
10-
"export": "rspress build",
11-
"preview": "rspress preview",
12-
"diff:v3-v4:cjs": "git diff @callstack/repack@3.0.0:templates/webpack.config.cjs HEAD:templates/webpack.config.cjs > src/public/diffs/repack_v3-v4_cjs.diff",
13-
"diff:v3-v4:mjs": "git diff @callstack/repack@3.0.0:templates/webpack.config.mjs HEAD:templates/webpack.config.mjs > src/public/diffs/repack_v3-v4_mjs.diff"
9+
"dev": "rspress dev",
10+
"build": "rspress build",
11+
"preview": "rspress preview"
1412
},
1513
"dependencies": {
16-
"@callstack/rspress-preset": "^0.4.5",
17-
"@callstack/rspress-theme": "^0.4.5",
18-
"@rspress/core": "2.0.0-beta.34"
14+
"@callstack/rspress-preset": "^0.5.1",
15+
"@callstack/rspress-theme": "^0.5.1",
16+
"@rspress/core": "2.0.0-rc.4"
1917
},
2018
"devDependencies": {
2119
"@types/node": "catalog:",

‎website/src/latest/docs/guides/configuration.mdx‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Tab, Tabs } from '@theme';
2-
import { CodeBlock } from '@theme';
2+
import { CodeBlockRuntime } from '@theme';
33
import RspackCJSTemplate from '../../../../../templates/rspack.config.cjs?raw';
44
import RspackESMTemplate from '../../../../../templates/rspack.config.mjs?raw';
55
import WebpackCJSTemplate from '../../../../../templates/webpack.config.cjs?raw';
@@ -36,24 +36,16 @@ These templates provide sensible defaults and common configurations for both Rsp
3636

3737
<Tabs>
3838
<Tab label="Rspack ESM">
39-
<CodeBlock language="js" title="rspack.config.mjs">
40-
{RspackESMTemplate}
41-
</CodeBlock>
39+
<CodeBlockRuntime lang="js" title="rspack.config.mjs" code={RspackESMTemplate} />
4240
</Tab>
4341
<Tab label="Rspack CJS">
44-
<CodeBlock language="js" title="rspack.config.cjs">
45-
{RspackCJSTemplate}
46-
</CodeBlock>
42+
<CodeBlockRuntime lang="js" title="rspack.config.cjs" code={RspackCJSTemplate} />
4743
</Tab>
4844
<Tab label="webpack ESM">
49-
<CodeBlock language="js" title="webpack.config.mjs">
50-
{WebpackESMTemplate}
51-
</CodeBlock>
45+
<CodeBlockRuntime lang="js" title="webpack.config.mjs" code={WebpackESMTemplate} />
5246
</Tab>
5347
<Tab label="webpack CJS">
54-
<CodeBlock language="js" title="webpack.config.cjs">
55-
{WebpackCJSTemplate}
56-
</CodeBlock>
48+
<CodeBlockRuntime lang="js" title="webpack.config.cjs" code={WebpackCJSTemplate} />
5749
</Tab>
5850
</Tabs>
5951

@@ -240,7 +232,7 @@ These are the base defaults that Re.Pack provides regardless of the command bein
240232

241233
<Tabs>
242234
<Tab label="Rspack">
243-
<CodeBlock language="js">{`{
235+
<CodeBlockRuntime lang="js" code={`{
244236
devtool: "source-map",
245237
experiments: {
246238
parallelLoader: true,
@@ -256,10 +248,10 @@ These are the base defaults that Re.Pack provides regardless of the command bein
256248
optimization: {
257249
chunkIds: "named",
258250
},
259-
}`}</CodeBlock>
251+
}`} />
260252
</Tab>
261253
<Tab label="webpack">
262-
<CodeBlock language="js">{`{
254+
<CodeBlockRuntime lang="js" code={`{
263255
devtool: "source-map",
264256
output: {
265257
clean: true,
@@ -272,7 +264,7 @@ These are the base defaults that Re.Pack provides regardless of the command bein
272264
optimization: {
273265
chunkIds: "named",
274266
},
275-
}`}</CodeBlock>
267+
}`} />
276268
</Tab>
277269
</Tabs>
278270

‎website/src/latest/docs/migration-guides/metro.mdx‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { PackageManagerTabs, Steps, Tabs, Tab } from '@theme';
2-
import { CodeBlock } from '@theme';
2+
import { CodeBlockRuntime } from '@theme';
33
import RspackCJSTemplate from '../../../../../templates/rspack.config.cjs?raw';
44
import RspackESMTemplate from '../../../../../templates/rspack.config.mjs?raw';
55
import WebpackCJSTemplate from '../../../../../templates/webpack.config.cjs?raw';
@@ -56,24 +56,17 @@ Pick one of the templates below and create configuration file in the root direct
5656

5757
<Tabs>
5858
<Tab label="Rspack ESM">
59-
<CodeBlock language="js" title="rspack.config.mjs">
59+
<CodeBlockRuntime lang="js" title="rspack.config.mjs" code={RspackESMTemplate} />
6060
{RspackESMTemplate}
61-
</CodeBlock>
6261
</Tab>
6362
<Tab label="Rspack CJS">
64-
<CodeBlock language="js" title="rspack.config.cjs">
65-
{RspackCJSTemplate}
66-
</CodeBlock>
63+
<CodeBlockRuntime lang="js" title="rspack.config.cjs" code={RspackCJSTemplate} />
6764
</Tab>
6865
<Tab label="webpack ESM">
69-
<CodeBlock language="js" title="webpack.config.mjs">
70-
{WebpackESMTemplate}
71-
</CodeBlock>
66+
<CodeBlockRuntime lang="js" title="webpack.config.mjs" code={WebpackESMTemplate} />
7267
</Tab>
7368
<Tab label="webpack CJS">
74-
<CodeBlock language="js" title="webpack.config.cjs">
75-
{WebpackCJSTemplate}
76-
</CodeBlock>
69+
<CodeBlockRuntime lang="js" title="webpack.config.cjs" code={WebpackCJSTemplate} />
7770
</Tab>
7871
</Tabs>
7972

‎website/theme/index.tsx‎

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
import { PrevNextPage, VersionBadge } from '@callstack/rspress-theme';
1+
import { VersionBadge } from '@callstack/rspress-theme';
22
import { NoSSR } from '@rspress/core/runtime';
3-
import {
4-
CodeBlockRuntime,
5-
Link,
6-
Layout as RspressLayout,
7-
} from '@rspress/core/theme';
3+
import { Link, Layout as RspressLayout } from '@rspress/core/theme-original';
84

95
const OldVersionAnnouncement = ({ version, latestVersion }) => (
106
<div className="py-2 px-4 flex flex-col sm:flex-row items-center justify-center bg-amber-50 text-amber-900 border-b border-amber-200 text-sm">
@@ -46,18 +42,4 @@ const Layout = () => (
4642

4743
export { Layout };
4844

49-
/* expose internal CodeBlock component */
50-
export const CodeBlock = ({ children, language, title }) => {
51-
// @ts-ignore
52-
return <CodeBlockRuntime lang={language} title={title} code={children} />;
53-
};
54-
55-
/* omit rendering for edge cases */
56-
const CustomPrevNextPage = (props) => {
57-
if (!props.text) return null;
58-
return <PrevNextPage {...props} />;
59-
};
60-
61-
export { CustomPrevNextPage as PrevNextPage };
62-
63-
export * from '@rspress/core/theme';
45+
export * from '@rspress/core/theme-original';

‎website/vercel.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://openapi.vercel.sh/vercel.json",
3-
"buildCommand": "pnpm export",
3+
"buildCommand": "pnpm build",
44
"cleanUrls": true,
55
"framework": null,
66
"installCommand": "pnpm install",

0 commit comments

Comments
 (0)