Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
740 changes: 384 additions & 356 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

14 changes: 6 additions & 8 deletions website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,14 @@
"node": ">=20"
},
"scripts": {
"start": "rspress dev",
"export": "rspress build",
"preview": "rspress preview",
"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",
"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"
"dev": "rspress dev",
"build": "rspress build",
"preview": "rspress preview"
},
"dependencies": {
"@callstack/rspress-preset": "^0.4.5",
"@callstack/rspress-theme": "^0.4.5",
"@rspress/core": "2.0.0-beta.34"
"@callstack/rspress-preset": "^0.5.1",
"@callstack/rspress-theme": "^0.5.1",
"@rspress/core": "2.0.0-rc.4"
},
"devDependencies": {
"@types/node": "catalog:",
Expand Down
26 changes: 9 additions & 17 deletions website/src/latest/docs/guides/configuration.mdx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Tab, Tabs } from '@theme';
import { CodeBlock } from '@theme';
import { CodeBlockRuntime } from '@theme';
import RspackCJSTemplate from '../../../../../templates/rspack.config.cjs?raw';
import RspackESMTemplate from '../../../../../templates/rspack.config.mjs?raw';
import WebpackCJSTemplate from '../../../../../templates/webpack.config.cjs?raw';
Expand Down Expand Up @@ -36,24 +36,16 @@ These templates provide sensible defaults and common configurations for both Rsp

<Tabs>
<Tab label="Rspack ESM">
<CodeBlock language="js" title="rspack.config.mjs">
{RspackESMTemplate}
</CodeBlock>
<CodeBlockRuntime lang="js" title="rspack.config.mjs" code={RspackESMTemplate} />
</Tab>
<Tab label="Rspack CJS">
<CodeBlock language="js" title="rspack.config.cjs">
{RspackCJSTemplate}
</CodeBlock>
<CodeBlockRuntime lang="js" title="rspack.config.cjs" code={RspackCJSTemplate} />
</Tab>
<Tab label="webpack ESM">
<CodeBlock language="js" title="webpack.config.mjs">
{WebpackESMTemplate}
</CodeBlock>
<CodeBlockRuntime lang="js" title="webpack.config.mjs" code={WebpackESMTemplate} />
</Tab>
<Tab label="webpack CJS">
<CodeBlock language="js" title="webpack.config.cjs">
{WebpackCJSTemplate}
</CodeBlock>
<CodeBlockRuntime lang="js" title="webpack.config.cjs" code={WebpackCJSTemplate} />
</Tab>
</Tabs>

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

<Tabs>
<Tab label="Rspack">
<CodeBlock language="js">{`{
<CodeBlockRuntime lang="js" code={`{
devtool: "source-map",
experiments: {
parallelLoader: true,
Expand All @@ -256,10 +248,10 @@ These are the base defaults that Re.Pack provides regardless of the command bein
optimization: {
chunkIds: "named",
},
}`}</CodeBlock>
}`} />
</Tab>
<Tab label="webpack">
<CodeBlock language="js">{`{
<CodeBlockRuntime lang="js" code={`{
devtool: "source-map",
output: {
clean: true,
Expand All @@ -272,7 +264,7 @@ These are the base defaults that Re.Pack provides regardless of the command bein
optimization: {
chunkIds: "named",
},
}`}</CodeBlock>
}`} />
</Tab>
</Tabs>

Expand Down
17 changes: 5 additions & 12 deletions website/src/latest/docs/migration-guides/metro.mdx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { PackageManagerTabs, Steps, Tabs, Tab } from '@theme';
import { CodeBlock } from '@theme';
import { CodeBlockRuntime } from '@theme';
import RspackCJSTemplate from '../../../../../templates/rspack.config.cjs?raw';
import RspackESMTemplate from '../../../../../templates/rspack.config.mjs?raw';
import WebpackCJSTemplate from '../../../../../templates/webpack.config.cjs?raw';
Expand Down Expand Up @@ -56,24 +56,17 @@ Pick one of the templates below and create configuration file in the root direct

<Tabs>
<Tab label="Rspack ESM">
<CodeBlock language="js" title="rspack.config.mjs">
<CodeBlockRuntime lang="js" title="rspack.config.mjs" code={RspackESMTemplate} />
{RspackESMTemplate}
</CodeBlock>
</Tab>
<Tab label="Rspack CJS">
<CodeBlock language="js" title="rspack.config.cjs">
{RspackCJSTemplate}
</CodeBlock>
<CodeBlockRuntime lang="js" title="rspack.config.cjs" code={RspackCJSTemplate} />
</Tab>
<Tab label="webpack ESM">
<CodeBlock language="js" title="webpack.config.mjs">
{WebpackESMTemplate}
</CodeBlock>
<CodeBlockRuntime lang="js" title="webpack.config.mjs" code={WebpackESMTemplate} />
</Tab>
<Tab label="webpack CJS">
<CodeBlock language="js" title="webpack.config.cjs">
{WebpackCJSTemplate}
</CodeBlock>
<CodeBlockRuntime lang="js" title="webpack.config.cjs" code={WebpackCJSTemplate} />
</Tab>
</Tabs>

Expand Down
24 changes: 3 additions & 21 deletions website/theme/index.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import { PrevNextPage, VersionBadge } from '@callstack/rspress-theme';
import { VersionBadge } from '@callstack/rspress-theme';
import { NoSSR } from '@rspress/core/runtime';
import {
CodeBlockRuntime,
Link,
Layout as RspressLayout,
} from '@rspress/core/theme';
import { Link, Layout as RspressLayout } from '@rspress/core/theme-original';

const OldVersionAnnouncement = ({ version, latestVersion }) => (
<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">
Expand Down Expand Up @@ -46,18 +42,4 @@ const Layout = () => (

export { Layout };

/* expose internal CodeBlock component */
export const CodeBlock = ({ children, language, title }) => {
// @ts-ignore
return <CodeBlockRuntime lang={language} title={title} code={children} />;
};

/* omit rendering for edge cases */
const CustomPrevNextPage = (props) => {
if (!props.text) return null;
return <PrevNextPage {...props} />;
};

export { CustomPrevNextPage as PrevNextPage };

export * from '@rspress/core/theme';
export * from '@rspress/core/theme-original';
2 changes: 1 addition & 1 deletion website/vercel.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://openapi.vercel.sh/vercel.json",
"buildCommand": "pnpm export",
"buildCommand": "pnpm build",
"cleanUrls": true,
"framework": null,
"installCommand": "pnpm install",
Expand Down