diff --git a/beta/package.json b/beta/package.json index d2fe90cb02d..0291f92ab21 100644 --- a/beta/package.json +++ b/beta/package.json @@ -22,7 +22,7 @@ "check-all": "npm-run-all prettier lint:fix tsc" }, "dependencies": { - "@codesandbox/sandpack-react": "v0.19.8-experimental.0", + "@codesandbox/sandpack-react": "v0.19.8-experimental.2", "@docsearch/css": "3.0.0-alpha.41", "@docsearch/react": "3.0.0-alpha.41", "@headlessui/react": "^1.3.0", diff --git a/beta/patches/@codesandbox+sandpack-client+0.19.8-experimental.0.patch b/beta/patches/@codesandbox+sandpack-client+0.19.8-experimental.0.patch deleted file mode 100644 index 4ed488955c1..00000000000 --- a/beta/patches/@codesandbox+sandpack-client+0.19.8-experimental.0.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/node_modules/@codesandbox/sandpack-client/dist/types/types.d.ts b/node_modules/@codesandbox/sandpack-client/dist/types/types.d.ts -index a18cc43..8b85844 100644 ---- a/node_modules/@codesandbox/sandpack-client/dist/types/types.d.ts -+++ b/node_modules/@codesandbox/sandpack-client/dist/types/types.d.ts -@@ -88,6 +88,7 @@ export interface SandpackErrorMessage { - export interface BaseSandpackMessage { - type: string; - $id?: number; -+ status?: ClientStatus - codesandbox?: boolean; - } - export declare type SandpackMessage = BaseSandpackMessage & ({ -@@ -152,4 +153,22 @@ export declare type SandpackMessage = BaseSandpackMessage & ({ - } | { - type: "activate-react-devtools"; - uid?: string; -+} | { -+ type: "console", -+ log: Array< -+ { -+ method: 'log' -+ | 'debug' -+ | 'info' -+ | 'warn' -+ | 'error' -+ | 'table' -+ | 'clear' -+ | 'time' -+ | 'timeEnd' -+ | 'count' -+ | 'assert', -+ id: string, -+ data: string[] -+ }>, - }); diff --git a/beta/src/components/MDX/Sandpack/Console.tsx b/beta/src/components/MDX/Sandpack/Console.tsx index 054a9d2436b..79967cbf68a 100644 --- a/beta/src/components/MDX/Sandpack/Console.tsx +++ b/beta/src/components/MDX/Sandpack/Console.tsx @@ -3,8 +3,11 @@ import * as React from 'react'; import {IconChevron} from 'components/Icon/IconChevron'; import {SandpackCodeViewer, useSandpack} from '@codesandbox/sandpack-react'; +import type {SandpackMessageConsoleMethods} from '@codesandbox/sandpack-client'; -const getType = (message: Methods): 'info' | 'warning' | 'error' => { +const getType = ( + message: SandpackMessageConsoleMethods +): 'info' | 'warning' | 'error' => { if (message === 'log' || message === 'info') { return 'info'; } @@ -19,25 +22,12 @@ const getType = (message: Methods): 'info' | 'warning' | 'error' => { type ConsoleData = Array<{ data: Array>; id: string; - method: Methods; + method: SandpackMessageConsoleMethods; }>; -type Methods = - | 'log' - | 'debug' - | 'info' - | 'warn' - | 'error' - | 'table' - | 'clear' - | 'time' - | 'timeEnd' - | 'count' - | 'assert'; - const MAX_MESSAGE_COUNT = 100; -export const SandpackConsole: React.FC<{clientId?: string}> = ({clientId}) => { +export const SandpackConsole: React.FC = () => { const {listen} = useSandpack(); const [logs, setLogs] = React.useState([]); const wrapperRef = React.useRef(null); @@ -47,7 +37,7 @@ export const SandpackConsole: React.FC<{clientId?: string}> = ({clientId}) => { if (message.type === 'start') { setLogs([]); } - // there is no such type as console in Sandpack + if (message.type === 'console' && message.codesandbox) { setLogs((prev) => { const messages = [...prev, ...message.log]; diff --git a/beta/yarn.lock b/beta/yarn.lock index aaa831be5c5..4de39c47180 100644 --- a/beta/yarn.lock +++ b/beta/yarn.lock @@ -483,16 +483,18 @@ style-mod "^4.0.0" w3c-keyname "^2.2.4" -"@codesandbox/sandpack-client@^0.19.8-experimental.0": - version "0.19.8-experimental.0" - resolved "https://registry.yarnpkg.com/@codesandbox/sandpack-client/-/sandpack-client-0.19.8-experimental.0.tgz#044afb1efce0356e18b6d644960694c817012a2a" +"@codesandbox/sandpack-client@^0.19.8-experimental.2": + version "0.19.9" + resolved "https://registry.yarnpkg.com/@codesandbox/sandpack-client/-/sandpack-client-0.19.9.tgz#29fded94a3087de155035634d596651268e27797" + integrity sha512-/PPFqAJ8NSlP1jpWjQtwvmVS5o1xLRVqdbzXF7Num7zVUdYLZAbpzT7KijneZSmdcJHOvCCAYGLKJg+TcgmLjw== dependencies: codesandbox-import-utils "^1.2.3" lodash.isequal "^4.5.0" -"@codesandbox/sandpack-react@v0.19.8-experimental.0": - version "0.19.8-experimental.0" - resolved "https://registry.yarnpkg.com/@codesandbox/sandpack-react/-/sandpack-react-0.19.8-experimental.0.tgz#0a86971be53f5d177d61796d4e048998c2dcc271" +"@codesandbox/sandpack-react@v0.19.8-experimental.2": + version "0.19.8-experimental.2" + resolved "https://registry.yarnpkg.com/@codesandbox/sandpack-react/-/sandpack-react-0.19.8-experimental.2.tgz#99b5f6a3c5ab056aaa0c9024e05704f53e245450" + integrity sha512-juaOZjlHVQ7BV6tj0d+RfhTptFp2AOBvVHI53Ze5T4hGmlCg6Ic8/DlStS98lygNWL9vKHiyv7umlN9Xom/EjQ== dependencies: "@code-hike/classer" "^0.0.0-aa6efee" "@codemirror/closebrackets" "^0.19.0" @@ -508,7 +510,7 @@ "@codemirror/matchbrackets" "^0.19.3" "@codemirror/state" "^0.19.6" "@codemirror/view" "^0.19.32" - "@codesandbox/sandpack-client" "^0.19.8-experimental.0" + "@codesandbox/sandpack-client" "^0.19.8-experimental.2" "@react-hook/intersection-observer" "^3.1.1" codesandbox-import-util-types "^2.2.3" lodash.isequal "^4.5.0"