Skip to content

[beta] fix console type #4677

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

Merged
merged 1 commit into from
May 24, 2022
Merged

[beta] fix console type #4677

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
2 changes: 1 addition & 1 deletion beta/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
35 changes: 0 additions & 35 deletions beta/patches/@codesandbox+sandpack-client+0.19.8-experimental.0.patch
View file
Open in desktop

This file was deleted.

24 changes: 7 additions & 17 deletions beta/src/components/MDX/Sandpack/Console.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
Expand All @@ -19,25 +22,12 @@ const getType = (message: Methods): 'info' | 'warning' | 'error' => {
type ConsoleData = Array<{
data: Array<string | Record<string, string>>;
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<ConsoleData>([]);
const wrapperRef = React.useRef<HTMLDivElement>(null);
Expand All @@ -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];
Expand Down
16 changes: 9 additions & 7 deletions beta/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]":
version "0.19.8-experimental.0"
resolved "https://registry.yarnpkg.com/@codesandbox/sandpack-react/-/sandpack-react-0.19.8-experimental.0.tgz#0a86971be53f5d177d61796d4e048998c2dcc271"
"@codesandbox/[email protected]":
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"
Expand All @@ -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"
Expand Down