Skip to content

cleanup(2.0): dev overlay classes #2089

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
lxsmnsyc wants to merge 2 commits into
base: main
Choose a base branch
from
+84 −86
Open

cleanup(2.0): dev overlay classes #2089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba318e2
cleanup: dev overlay classes
lxsmnsyc Feb 26, 2026
07e2a25
Update is-server-nested.tsx
lxsmnsyc Feb 26, 2026
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
12 changes: 5 additions & 7 deletions packages/start/src/shared/dev-overlay/CodeView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
// @refresh skip
import { getSingletonHighlighter, type BuiltinLanguage, type Highlighter } from "shiki";
import { type BuiltinLanguage, getSingletonHighlighter, type Highlighter } from "shiki";
import { loadWasm } from "shiki/engine/oniguruma";
import { createEffect, createResource, type JSX } from "solid-js";

import url from "shiki/onig.wasm?url";

import langJS from "shiki/langs/javascript.mjs";
import langJSX from "shiki/langs/jsx.mjs";
import langTSX from "shiki/langs/tsx.mjs";
import langTS from "shiki/langs/typescript.mjs";
import url from "shiki/onig.wasm?url";
import darkPlus from "shiki/themes/dark-plus.mjs";
import { createEffect, createResource, type JSX } from "solid-js";

let HIGHLIGHTER: Highlighter;

Expand Down Expand Up @@ -74,7 +72,7 @@ export function CodeView(props: CodeViewProps): JSX.Element | null {
for (let i = 0, len = lines.length; i < len; i++) {
const el = lines[i] as HTMLElement;
if (props.line - minLine() - 1 === i) {
el.classList.add("dev-overlay-error-line");
el.dataset.startDevOverlayErrorLine = '';
}
}
}
Expand All @@ -83,7 +81,7 @@ export function CodeView(props: CodeViewProps): JSX.Element | null {
return (
<div
ref={ref}
class="dev-overlay-code-view"
data-start-dev-overlay-code-view
style={{
"--dev-overlay-code-view-start": minLine() + 1,
}}
Expand Down
68 changes: 34 additions & 34 deletions packages/start/src/shared/dev-overlay/DevOverlayDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import ErrorStackParser from "error-stack-parser";
import * as htmlToImage from "html-to-image";
import type { JSX } from "solid-js";
import { ErrorBoundary, For, Show, Suspense, createMemo, createSignal } from "solid-js";
import { createMemo, createSignal, ErrorBoundary, For, Show, Suspense } from "solid-js";
import { Portal } from "solid-js/web";
// @ts-ignore - terracotta module resolution issue with NodeNext
import { Dialog, DialogOverlay, DialogPanel, Select, SelectOption } from "terracotta";
Expand Down Expand Up @@ -47,9 +47,9 @@ function ErrorInfo(props: ErrorInfoProps): JSX.Element {
});

return (
<span class="dev-overlay-error-info">
<span class="dev-overlay-error-info-name">{error().name}</span>
<span class="dev-overlay-error-info-message">{error().message}</span>
<span data-start-dev-overlay-error-info>
<span data-start-dev-overlay-error-info-name>{error().name}</span>
<span data-start-dev-overlay-error-info-message>{error().message}</span>
</span>
);
}
Expand Down Expand Up @@ -77,7 +77,7 @@ function getFilePath(source: StackFrameSource) {

function CodeFallback(): JSX.Element {
return (
<div class="dev-overlay-stack-frames-code-fallback">
<div data-start-dev-overlay-stack-frames-code-fallback>
<span>Source not available.</span>
</div>
);
Expand All @@ -89,8 +89,8 @@ function StackFramesContent(props: StackFramesContentProps) {
const [selectedFrame, setSelectedFrame] = createSignal(stackframes[0]!);

return (
<div class="dev-overlay-stack-frames-content">
<div class="dev-overlay-stack-frames-code">
<div data-start-dev-overlay-stack-frames-content>
<div data-start-dev-overlay-stack-frames-code>
<ErrorBoundary fallback={null}>
{(() => {
const data = createStackFrame(selectedFrame(), () => props.isCompiled);
Expand All @@ -99,8 +99,8 @@ function StackFramesContent(props: StackFramesContentProps) {
<Show when={data()} keyed fallback={<CodeFallback />}>
{source => (
<>
<span class="dev-overlay-stack-frames-code-source">{source.source}</span>
<div class="dev-overlay-stack-frames-code-container">
<span data-start-dev-overlay-stack-frames-code-source>{source.source}</span>
<div data-start-dev-overlay-stack-frames-code-container>
<CodeView
fileName={source.source}
line={source.line}
Expand All @@ -116,19 +116,19 @@ function StackFramesContent(props: StackFramesContentProps) {
</ErrorBoundary>
</div>
<Select<ErrorStackParser.StackFrame>
class="dev-overlay-stack-frames"
data-start-dev-overlay-stack-frames
value={selectedFrame()}
onChange={setSelectedFrame}
>
<For each={stackframes}>
{current => (
<ErrorBoundary
fallback={
<div class="dev-overlay-stack-frame">
<span class="dev-overlay-stack-frame-function">
<div data-start-dev-overlay-stack-frame>
<span data-start-dev-overlay-stack-frame-function>
{current.functionName ?? "<anonymous>"}
</span>
<span class="dev-overlay-stack-frame-file">
<span data-start-dev-overlay-stack-frame-file>
{getFilePath({
source: current.getFileName()!,
content: "",
Expand All @@ -146,11 +146,11 @@ function StackFramesContent(props: StackFramesContentProps) {
<Suspense>
<Show when={data()} keyed>
{source => (
<SelectOption class="dev-overlay-stack-frame" value={current}>
<span class="dev-overlay-stack-frame-function">
<SelectOption data-start-dev-overlay-stack-frame value={current}>
<span data-start-dev-overlay-stack-frame-function>
{source.name ?? "<anonymous>"}
</span>
<span class="dev-overlay-stack-frame-file">{getFilePath(source)}</span>
<span data-start-dev-overlay-stack-frame-file>{getFilePath(source)}</span>
</SelectOption>
)}
</Show>
Expand Down Expand Up @@ -249,59 +249,59 @@ export default function DevOverlayDialog(props: DevOverlayDialogProps): JSX.Elem

return (
<Portal>
<Dialog class="dev-overlay" isOpen>
<Dialog data-start-dev-overlay isOpen>
<div>
<DialogOverlay class="dev-overlay-background" />
<DialogPanel ref={setPanel} class="dev-overlay-panel-container">
<div class="dev-overlay-panel">
<div class="dev-overlay-navbar">
<div class="dev-overlay-navbar-left">
<div class="dev-overlay-version">
<DialogOverlay data-start-dev-overlay-background />
<DialogPanel ref={setPanel} data-start-dev-overlay-panel-container>
<div data-start-dev-overlay-panel>
<div data-start-dev-overlay-navbar>
<div data-start-dev-overlay-navbar-left>
<div data-start-dev-overlay-version>
<div>
<SolidStartIcon title="Solid Start Version" />
</div>
<span>{info.version as string}</span>
</div>
<Show when={props.errors.length > 1}>
<div class="dev-overlay-pagination">
<button class="dev-overlay-button" onClick={goPrev} type="button">
<div data-start-dev-overlay-pagination>
<button data-start-dev-overlay-button onClick={goPrev} type="button">
<ArrowLeftIcon title="Go Previous" />
</button>
<div class="dev-overlay-page-counter">
<div data-start-dev-overlay-page-counter>
{`${truncated()} of ${props.errors.length}`}
</div>
<button class="dev-overlay-button" onClick={goNext} type="button">
<button data-start-dev-overlay-button onClick={goNext} type="button">
<ArrowRightIcon title="Go Next" />
</button>
</div>
</Show>
</div>
<div class="dev-overlay-controls">
<button class="dev-overlay-button" onClick={redirectToGithub} type="button">
<div data-start-dev-overlay-controls>
<button data-start-dev-overlay-button onClick={redirectToGithub} type="button">
<GithubIcon title="Create an issue thread on Github" />
</button>
<button class="dev-overlay-button" onClick={redirectToDiscord} type="button">
<button data-start-dev-overlay-button onClick={redirectToDiscord} type="button">
<DiscordIcon title="Join our Discord Channel" />
</button>
<button class="dev-overlay-button" onClick={downloadScreenshot} type="button">
<button data-start-dev-overlay-button onClick={downloadScreenshot} type="button">
<CameraIcon title="Capture Error Overlay" />
</button>
<button class="dev-overlay-button" onClick={toggleIsCompiled} type="button">
<button data-start-dev-overlay-button onClick={toggleIsCompiled} type="button">
<Show
when={isCompiled()}
fallback={<ViewOriginalIcon title="View Original Source" />}
>
<ViewCompiledIcon title="View Compiled Source" />
</Show>
</button>
<button class="dev-overlay-button" onClick={props.resetError} type="button">
<button data-start-dev-overlay-button onClick={props.resetError} type="button">
<RefreshIcon title="Reset Error" />
</button>
</div>
</div>
<Show when={props.errors[truncated() - 1]} keyed>
{current => (
<div class="dev-overlay-content">
<div data-start-dev-overlay-content>
<ErrorInfo error={current} />
<StackFrames error={current} isCompiled={isCompiled()} />
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/start/src/shared/dev-overlay/get-source-map.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { RawSourceMap, SourceMapConsumer } from "source-map-js";
import { type RawSourceMap, SourceMapConsumer } from "source-map-js";

const INLINE_SOURCEMAP_REGEX = /^data:application\/json[^,]+base64,/;
const SOURCEMAP_REGEX =
Expand Down
8 changes: 4 additions & 4 deletions packages/start/src/shared/dev-overlay/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// @refresh skip
import {
ErrorBoundary,
Show,
createEffect,
createSignal,
ErrorBoundary,
type JSX,
onCleanup,
resetErrorBoundaries,
type JSX,
Show,
} from "solid-js";
import { HttpStatusCode } from "../HttpStatusCode.ts";
import clientOnly from "../clientOnly.ts";
import { HttpStatusCode } from "../HttpStatusCode.ts";

export interface DevOverlayProps {
children?: JSX.Element;
Expand Down
Loading
Loading