From 94b1b7cc0fcefb0e470cbd131c1c1462e1246a60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=80=E1=85=B5=E1=86=B7=E1=84=89=E1=85=A1=E1=86=BC?= =?UTF-8?q?=E1=84=83=E1=85=AE?= Date: Tue, 10 Jun 2025 22:40:08 +0900 Subject: [PATCH 1/3] fix: website ts version error --- packages/website/src/components/Playground.tsx | 1 + packages/website/src/components/editor/useSandboxServices.ts | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/website/src/components/Playground.tsx b/packages/website/src/components/Playground.tsx index f3c13bee498b..d6ddcb5efe19 100644 --- a/packages/website/src/components/Playground.tsx +++ b/packages/website/src/components/Playground.tsx @@ -152,6 +152,7 @@ function Playground(): React.JSX.Element { onMarkersChange={setMarkers} onSelect={setPosition} selectedRange={selectedRange} + setState={setState} /> diff --git a/packages/website/src/components/editor/useSandboxServices.ts b/packages/website/src/components/editor/useSandboxServices.ts index d3a6e7fc00e3..9dd9760e1857 100644 --- a/packages/website/src/components/editor/useSandboxServices.ts +++ b/packages/website/src/components/editor/useSandboxServices.ts @@ -7,7 +7,7 @@ import semverSatisfies from 'semver/functions/satisfies'; import type { createTypeScriptSandbox } from '../../vendor/sandbox'; import type { CreateLinter } from '../linter/createLinter'; import type { PlaygroundSystem } from '../linter/types'; -import type { RuleDetails } from '../types'; +import type { ConfigModel, RuleDetails } from '../types'; import type { CommonEditorProps } from './types'; import rootPackageJson from '../../../../../package.json'; @@ -23,6 +23,7 @@ export interface SandboxServicesProps { ruleDetails: RuleDetails[], tsVersions: readonly string[], ) => void; + readonly setState: (value: Partial) => void; readonly ts: string; } @@ -139,6 +140,7 @@ export const useSandboxServices = ( }); }) .catch((err: unknown) => { + props.setState({ ts: process.env.TS_VERSION }); if (err instanceof Error) { setServices(err); } else { From 75c44e798925bc15ed78a7c22a3b6a16ab31bf99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=80=E1=85=B5=E1=86=B7=E1=84=89=E1=85=A1=E1=86=BC?= =?UTF-8?q?=E1=84=83=E1=85=AE?= Date: Tue, 10 Jun 2025 22:49:53 +0900 Subject: [PATCH 2/3] feat: add error validation --- .../website/src/components/editor/useSandboxServices.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/website/src/components/editor/useSandboxServices.ts b/packages/website/src/components/editor/useSandboxServices.ts index 9dd9760e1857..9ead2325ba05 100644 --- a/packages/website/src/components/editor/useSandboxServices.ts +++ b/packages/website/src/components/editor/useSandboxServices.ts @@ -140,8 +140,14 @@ export const useSandboxServices = ( }); }) .catch((err: unknown) => { - props.setState({ ts: process.env.TS_VERSION }); + // props.setState({ ts: process.env.TS_VERSION }); if (err instanceof Error) { + if ( + err.message === + 'Could not get all the dependencies of sandbox set up!' + ) { + props.setState({ ts: process.env.TS_VERSION }); + } setServices(err); } else { setServices(new Error(String(err))); From 95ba0c0379ffcf132b08d48792553679684e2078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=80=E1=85=B5=E1=86=B7=E1=84=89=E1=85=A1=E1=86=BC?= =?UTF-8?q?=E1=84=83=E1=85=AE?= Date: Tue, 10 Jun 2025 22:52:31 +0900 Subject: [PATCH 3/3] fix: remove comment --- packages/website/src/components/editor/useSandboxServices.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/website/src/components/editor/useSandboxServices.ts b/packages/website/src/components/editor/useSandboxServices.ts index 9ead2325ba05..138ae7f58973 100644 --- a/packages/website/src/components/editor/useSandboxServices.ts +++ b/packages/website/src/components/editor/useSandboxServices.ts @@ -140,7 +140,6 @@ export const useSandboxServices = ( }); }) .catch((err: unknown) => { - // props.setState({ ts: process.env.TS_VERSION }); if (err instanceof Error) { if ( err.message ===