Skip to content

fix: Sandpack hydration error #434

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

Open
krispya wants to merge 1 commit into
base: main
Choose a base branch
from
+76 −44
Open

fix: Sandpack hydration error #434

Show file tree
Hide file tree
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
57 changes: 13 additions & 44 deletions src/components/mdx/Sandpack/Sandpack.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
import cn from '@/lib/cn'
import { crawl } from '@/utils/docs'
import {
SandpackCodeEditor,
SandpackFileExplorer,
SandpackLayout,
SandpackPreview,
SandpackProvider,
type SandpackFiles,
type SandpackProviderProps,
} from '@codesandbox/sandpack-react'
import fs from 'node:fs'
import path from 'node:path'
import { ComponentProps } from 'react'

import { SandpackClient } from './SandpackClient'
import { SandpackCodeViewer } from './SandpackCodeViewer'

import { ComponentProps } from 'react'

function getSandpackDependencies(folder: string) {
const pkgPath = `${folder}/package.json`
if (!fs.existsSync(pkgPath)) return null
Expand All @@ -34,7 +31,6 @@ async function getSandpackFiles(
(dir) =>
!dir.includes('node_modules') && extensions.map((ext) => dir.endsWith(ext)).some(Boolean),
)
// console.log('filepaths', filepaths)

return filepaths.reduce((acc, filepath) => {
const relativeFilepath = path.relative(folder, filepath)
Expand Down Expand Up @@ -68,8 +64,6 @@ export const Sandpack = async ({
preview?: ComponentProps<typeof SandpackPreview>
fileExplorer?: boolean | ComponentProps<typeof SandpackFileExplorer>
}) => {
// console.log('folder', folder)

const _files = folder ? await getSandpackFiles(folder, props.files) : props.files

const pkgDeps = folder ? getSandpackDependencies(folder) : null
Expand All @@ -78,48 +72,23 @@ export const Sandpack = async ({
...props.customSetup,
dependencies,
}
// console.log('customSetup', customSetup)

const options = {
...props.options,
// editorHeight: 350
}

return (
<div className={cn(className, 'sandpack')}>
<SandpackProvider
{...props}
theme={{
colors: {
surface1: 'var(--mcu-surface-container-low)',
surface2: 'var(--mcu-surface-container)',
surface3: 'var(--mcu-surface-container-high)',
},
font: {
mono: 'var(--font-mono)',
},
}}
files={_files}
customSetup={customSetup}
options={options}
// @ts-ignore
style={{ '--sp-border-radius': '0.5rem' }}
>
<SandpackLayout>
{fileExplorer && (
<SandpackFileExplorer
{...(typeof fileExplorer !== 'boolean' ? fileExplorer : undefined)}
/>
)}
{codeViewer ? (
<SandpackCodeViewer {...(typeof codeViewer !== 'boolean' ? codeViewer : undefined)} />
) : (
<SandpackCodeEditor showTabs={fileExplorer ? false : undefined} {...codeEditor} />
)}

<SandpackPreview {...preview} />
</SandpackLayout>
</SandpackProvider>
</div>
<SandpackClient
className={className}
files={_files}
customSetup={customSetup}
options={options}
fileExplorer={fileExplorer}
codeEditor={codeEditor}
codeViewer={codeViewer}
preview={preview}
{...props}
/>
)
}
63 changes: 63 additions & 0 deletions src/components/mdx/Sandpack/SandpackClient.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
'use client'

import cn from '@/lib/cn'
import {
SandpackCodeEditor,
SandpackFileExplorer,
SandpackLayout,
SandpackPreview,
SandpackProvider,
type SandpackProviderProps,
} from '@codesandbox/sandpack-react'
import { ComponentProps } from 'react'
import { SandpackCodeViewer } from './SandpackCodeViewer'

export function SandpackClient({
className,
fileExplorer,
codeEditor,
codeViewer,
preview,
...props
}: SandpackProviderProps & {
className?: string
codeEditor?: ComponentProps<typeof SandpackCodeEditor>
codeViewer?: boolean | ComponentProps<typeof SandpackCodeViewer>
preview?: ComponentProps<typeof SandpackPreview>
fileExplorer?: boolean | ComponentProps<typeof SandpackFileExplorer>
}) {
return (
<div className={cn(className, 'sandpack')}>
<SandpackProvider
{...props}
theme={{
colors: {
surface1: 'var(--mcu-surface-container-low)',
surface2: 'var(--mcu-surface-container)',
surface3: 'var(--mcu-surface-container-high)',
},
font: {
mono: 'var(--font-mono)',
},
}}
// @ts-ignore
style={{ '--sp-border-radius': '0.5rem' }}
>
<SandpackLayout>
{fileExplorer && (
<SandpackFileExplorer
{...(typeof fileExplorer !== 'boolean' ? fileExplorer : undefined)}
/>
)}
{codeViewer ? (
<SandpackCodeViewer {...(typeof codeViewer !== 'boolean' ? codeViewer : undefined)} />
) : (
<SandpackCodeEditor showTabs={fileExplorer ? false : undefined} {...codeEditor} />
)}

<SandpackPreview {...preview} />
</SandpackLayout>
</SandpackProvider>
</div>
)
}