Unverified Commit 495c3183 authored by Yavor Punchev's avatar Yavor Punchev Committed by GitHub

Redesign dev overlay: cleaner shell + instant fix-card guidance (#93755)

## Summary

### Error overlay shell
- Clean up nav, dialog frame, footer placement, and button styles across
the overlay
- Remove unused `fader` and notch components
- Tighten layout spacing throughout the dialog

### Instant error guidance (fix cards)
- New data-driven fix-card grid for instant errors: each card has a
`group` (Stream / Cache / Block / Static / Dynamic / Client / Defer /
Measure / Prerender), an icon, a color, and an optional docs link
- Whole card is clickable when a docs link is present, with an
always-visible external-link indicator
- Centralized group metadata (label / color / icon) in
`instant-guidance-data.ts` so cards stay consistent across the overlay
and the docs surface
- Outlined SVG icons live in a dedicated `fix-card-icons.tsx`
- Snippets refined: cache cards trimmed to 3 lines, client sync-IO defer
cards use block-body arrow syntax so longer expressions don't overflow

### Code frame
- Restore the red bar / caret on the errored line (parser previously
only matched storybook synthetic frames)
- Fix caret alignment with `codeFrameColumns` output
- Style inline error code snippets

### Storybook & examples
- Add error examples and instant-error fixtures for development/testing
- Align all 11 instant storybook fixtures with canary factory output and
the matching test-app routes

---------
Co-authored-by: 's avatarAurora Scharff <aurora.sofie@gmail.com>
Co-authored-by: 's avatarCursor <cursoragent@cursor.com>
Co-authored-by: 's avatarAurora Scharff <66901228+aurorascharff@users.noreply.github.com>
parent f3f56ece
import type { DispatcherEvent, OverlayState } from '../shared' import type {
DispatcherEvent,
OverlayState,
} from '../../src/next-devtools/dev-overlay/shared'
import { useReducer } from 'react' import { useReducer } from 'react'
import { import {
...@@ -29,7 +32,7 @@ import { ...@@ -29,7 +32,7 @@ import {
ACTION_UNHANDLED_REJECTION, ACTION_UNHANDLED_REJECTION,
ACTION_VERSION_INFO, ACTION_VERSION_INFO,
INITIAL_OVERLAY_STATE, INITIAL_OVERLAY_STATE,
} from '../shared' } from '../../src/next-devtools/dev-overlay/shared'
export const storybookDefaultOverlayState: OverlayState = { export const storybookDefaultOverlayState: OverlayState = {
...INITIAL_OVERLAY_STATE, ...INITIAL_OVERLAY_STATE,
......
...@@ -2,12 +2,18 @@ import { useRef, useState, type Dispatch, type SetStateAction } from 'react' ...@@ -2,12 +2,18 @@ import { useRef, useState, type Dispatch, type SetStateAction } from 'react'
import { import {
DevOverlayContext, DevOverlayContext,
useDevOverlayContext, useDevOverlayContext,
} from '../../dev-overlay.browser' } from '../../src/next-devtools/dev-overlay.browser'
import { RenderErrorContext } from '../dev-overlay' import { RenderErrorContext } from '../../src/next-devtools/dev-overlay/dev-overlay'
import { PanelRouterContext, type PanelStateKind } from '../menu/context' import {
import { INITIAL_OVERLAY_STATE } from '../shared' PanelRouterContext,
import type { OverlayState, DispatcherEvent } from '../shared' type PanelStateKind,
import type { ReadyRuntimeError } from '../utils/get-error-by-type' } from '../../src/next-devtools/dev-overlay/menu/context'
import { INITIAL_OVERLAY_STATE } from '../../src/next-devtools/dev-overlay/shared'
import type {
OverlayState,
DispatcherEvent,
} from '../../src/next-devtools/dev-overlay/shared'
import type { ReadyRuntimeError } from '../../src/next-devtools/dev-overlay/utils/get-error-by-type'
interface WithDevOverlayContextsOptions { interface WithDevOverlayContextsOptions {
state?: Partial<OverlayState> state?: Partial<OverlayState>
......
import '../global.css' import '../../src/next-devtools/dev-overlay/global.css'
import { ComponentStyles } from '../styles/component-styles' import { ComponentStyles } from '../../src/next-devtools/dev-overlay/styles/component-styles'
import { ShadowPortal } from '../components/shadow-portal' import { ShadowPortal } from '../../src/next-devtools/dev-overlay/components/shadow-portal'
export const withShadowPortal = (Story: any) => ( export const withShadowPortal = (Story: any) => (
<ShadowPortal> <ShadowPortal>
......
import type { Preview } from '@storybook/react' import type { Preview } from '@storybook/react'
import { withDevOverlayContexts } from '../src/next-devtools/dev-overlay/storybook/with-dev-overlay-contexts' import { withDevOverlayContexts } from './decorators/with-dev-overlay-contexts'
const portalNode = document.querySelector('nextjs-portal')! const portalNode = document.querySelector('nextjs-portal')!
const shadowRoot = portalNode.attachShadow({ mode: 'open' }) const shadowRoot = portalNode.attachShadow({ mode: 'open' })
......
import type { Meta, StoryObj } from '@storybook/react' import type { Meta, StoryObj } from '@storybook/react'
import { CallStackFrame } from './call-stack-frame' import { CallStackFrame } from './call-stack-frame'
import { withShadowPortal } from '../../storybook/with-shadow-portal' import { withShadowPortal } from '../../../../../.storybook/decorators/with-shadow-portal'
const meta: Meta<typeof CallStackFrame> = { const meta: Meta<typeof CallStackFrame> = {
component: CallStackFrame, component: CallStackFrame,
......
...@@ -70,15 +70,10 @@ export const CallStackFrame: React.FC<{ ...@@ -70,15 +70,10 @@ export const CallStackFrame: React.FC<{
export const CALL_STACK_FRAME_STYLES = ` export const CALL_STACK_FRAME_STYLES = `
[data-nextjs-call-stack-frame-no-source] { [data-nextjs-call-stack-frame-no-source] {
padding: 6px 8px; padding: 6px 8px;
margin-bottom: 4px;
border-radius: var(--rounded-lg); border-radius: var(--rounded-lg);
} }
[data-nextjs-call-stack-frame-no-source]:last-child {
margin-bottom: 0;
}
[data-nextjs-call-stack-frame-ignored="true"] { [data-nextjs-call-stack-frame-ignored="true"] {
opacity: 0.6; opacity: 0.6;
} }
...@@ -93,7 +88,7 @@ export const CALL_STACK_FRAME_STYLES = ` ...@@ -93,7 +88,7 @@ export const CALL_STACK_FRAME_STYLES = `
-moz-user-select: text; -moz-user-select: text;
-ms-user-select: text; -ms-user-select: text;
padding: 6px 8px; padding: 0;
border-radius: var(--rounded-lg); border-radius: var(--rounded-lg);
} }
...@@ -103,7 +98,7 @@ export const CALL_STACK_FRAME_STYLES = ` ...@@ -103,7 +98,7 @@ export const CALL_STACK_FRAME_STYLES = `
align-items: center; align-items: center;
gap: 4px; gap: 4px;
margin-bottom: 4px; margin: 0;
font-family: var(--font-stack-monospace); font-family: var(--font-stack-monospace);
color: var(--color-gray-1000); color: var(--color-gray-1000);
...@@ -112,8 +107,8 @@ export const CALL_STACK_FRAME_STYLES = ` ...@@ -112,8 +107,8 @@ export const CALL_STACK_FRAME_STYLES = `
line-height: var(--size-20); line-height: var(--size-20);
svg { svg {
width: var(--size-16px); width: var(--size-16);
height: var(--size-16px); height: var(--size-16);
} }
} }
...@@ -136,13 +131,17 @@ export const CALL_STACK_FRAME_STYLES = ` ...@@ -136,13 +131,17 @@ export const CALL_STACK_FRAME_STYLES = `
} }
&:hover { &:hover {
background: var(--color-gray-100); background: var(--color-gray-alpha-100);
}
&:active {
background: var(--color-gray-alpha-200);
} }
} }
.call-stack-frame-file { .call-stack-frame-file {
color: var(--color-gray-900); color: var(--color-gray-900);
font-size: var(--size-14); font-size: var(--size-13);
line-height: var(--size-20); line-height: var(--size-20);
word-wrap: break-word; word-wrap: break-word;
} }
......
import type { Meta, StoryObj } from '@storybook/react' import type { Meta, StoryObj } from '@storybook/react'
import { CallStack } from './call-stack' import { CallStack } from './call-stack'
import { withShadowPortal } from '../../storybook/with-shadow-portal' import { withShadowPortal } from '../../../../../.storybook/decorators/with-shadow-portal'
const meta: Meta<typeof CallStack> = { const meta: Meta<typeof CallStack> = {
component: CallStack, component: CallStack,
......
...@@ -43,8 +43,12 @@ export function CallStack({ ...@@ -43,8 +43,12 @@ export function CallStack({
export const CALL_STACK_STYLES = css` export const CALL_STACK_STYLES = css`
[data-nextjs-call-stack-container] { [data-nextjs-call-stack-container] {
display: flex;
flex-direction: column;
gap: 12px;
position: relative; position: relative;
margin-top: 8px; margin: 0;
padding: 20px 0 0;
} }
[data-nextjs-call-stack-header] { [data-nextjs-call-stack-header] {
...@@ -52,7 +56,7 @@ export const CALL_STACK_STYLES = css` ...@@ -52,7 +56,7 @@ export const CALL_STACK_STYLES = css`
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
min-height: var(--size-28); min-height: var(--size-28);
padding: 8px 8px 12px 4px; padding: 0;
width: 100%; width: 100%;
} }
...@@ -74,8 +78,9 @@ export const CALL_STACK_STYLES = css` ...@@ -74,8 +78,9 @@ export const CALL_STACK_STYLES = css`
justify-content: center; justify-content: center;
align-items: center; align-items: center;
width: var(--size-20); padding: 0 6px;
height: var(--size-20); height: var(--size-20);
min-width: var(--size-20);
gap: 4px; gap: 4px;
color: var(--color-gray-1000); color: var(--color-gray-1000);
...@@ -85,7 +90,7 @@ export const CALL_STACK_STYLES = css` ...@@ -85,7 +90,7 @@ export const CALL_STACK_STYLES = css`
line-height: var(--size-16); line-height: var(--size-16);
border-radius: var(--rounded-full); border-radius: var(--rounded-full);
background: var(--color-gray-300); background: var(--color-gray-200);
} }
[data-nextjs-call-stack-ignored-list-toggle-button] { [data-nextjs-call-stack-ignored-list-toggle-button] {
...@@ -96,11 +101,9 @@ export const CALL_STACK_STYLES = css` ...@@ -96,11 +101,9 @@ export const CALL_STACK_STYLES = css`
color: var(--color-gray-900); color: var(--color-gray-900);
font-size: var(--size-14); font-size: var(--size-14);
line-height: var(--size-20); line-height: var(--size-20);
border-radius: 6px; border-radius: var(--rounded-md-2);
padding: 4px 6px; padding: 4px 6px;
margin-right: -6px; margin-right: -6px;
transition: background 150ms ease;
&:hover { &:hover {
background: var(--color-gray-100); background: var(--color-gray-100);
} }
......
import type { Meta, StoryObj } from '@storybook/react' import type { Meta, StoryObj } from '@storybook/react'
import { CodeFrame } from './code-frame' import { CodeFrame } from './code-frame'
import { withShadowPortal } from '../../storybook/with-shadow-portal' import { withShadowPortal } from '../../../../../.storybook/decorators/with-shadow-portal'
const meta: Meta<typeof CodeFrame> = { const meta: Meta<typeof CodeFrame> = {
component: CodeFrame, component: CodeFrame,
......
...@@ -34,8 +34,6 @@ export function CodeFrame({ stackFrame, codeFrame }: CodeFrameProps) { ...@@ -34,8 +34,6 @@ export function CodeFrame({ stackFrame, codeFrame }: CodeFrameProps) {
}) })
const fileExtension = stackFrame?.file?.split('.').pop() const fileExtension = stackFrame?.file?.split('.').pop()
// TODO: make the caret absolute
return ( return (
<div data-nextjs-codeframe> <div data-nextjs-codeframe>
<div className="code-frame-header"> <div className="code-frame-header">
...@@ -57,9 +55,7 @@ export function CodeFrame({ stackFrame, codeFrame }: CodeFrameProps) { ...@@ -57,9 +55,7 @@ export function CodeFrame({ stackFrame, codeFrame }: CodeFrameProps) {
data-with-open-in-editor-link-source-file data-with-open-in-editor-link-source-file
onClick={open} onClick={open}
> >
<span className="code-frame-icon" data-icon="right"> <ExternalIcon />
<ExternalIcon width={16} height={16} />
</span>
</button> </button>
</p> </p>
</div> </div>
...@@ -108,16 +104,17 @@ export function CodeFrame({ stackFrame, codeFrame }: CodeFrameProps) { ...@@ -108,16 +104,17 @@ export function CodeFrame({ stackFrame, codeFrame }: CodeFrameProps) {
export const CODE_FRAME_STYLES = ` export const CODE_FRAME_STYLES = `
[data-nextjs-codeframe] { [data-nextjs-codeframe] {
--code-frame-padding: 12px; --code-frame-padding: 12px;
--code-frame-line-height: var(--size-16); --code-frame-line-height: var(--size-20);
background-color: var(--color-background-200); background-color: var(--color-background-200);
color: var(--color-gray-1000); color: var(--color-gray-1000);
text-overflow: ellipsis; text-overflow: ellipsis;
border: 1px solid var(--color-gray-400); border: 1px solid var(--color-gray-400);
border-radius: 8px; border-radius: var(--rounded-xl);
font-family: var(--font-stack-monospace); font-family: var(--font-stack-monospace);
font-size: var(--size-12); font-size: var(--size-13);
line-height: var(--code-frame-line-height); line-height: var(--code-frame-line-height);
margin: 8px 0; margin: 0;
overflow: hidden;
svg { svg {
width: var(--size-16); width: var(--size-16);
...@@ -130,31 +127,50 @@ export const CODE_FRAME_STYLES = ` ...@@ -130,31 +127,50 @@ export const CODE_FRAME_STYLES = `
padding: var(--code-frame-padding); padding: var(--code-frame-padding);
} }
.code-frame-pre {
background: var(--color-background-100) !important;
border: 1px solid var(--color-gray-200);
border-radius: var(--rounded-xl);
border-bottom: none;
margin-left: -1px !important;
width: calc(100% + 2px);
max-width: calc(100% + 2px) !important;
}
.code-frame-link svg { .code-frame-link svg {
display: block;
flex-shrink: 0; flex-shrink: 0;
} }
[data-with-open-in-editor-link-source-file] svg {
width: var(--size-14);
height: var(--size-14);
}
.code-frame-lines { .code-frame-lines {
min-width: max-content; min-width: max-content;
} }
.code-frame-link [data-text] { .code-frame-link [data-text] {
font-size: var(--size-12);
text-align: left; text-align: left;
margin: auto 6px;
} }
.code-frame-header { .code-frame-header {
width: 100%; width: 100%;
transition: background 100ms ease-out; transition: background 100ms ease-out;
border-radius: 8px 8px 0 0; border-radius: var(--rounded-lg) var(--rounded-lg) 0 0;
border-bottom: 1px solid var(--color-gray-400);
} }
[data-with-open-in-editor-link-source-file] { [data-with-open-in-editor-link-source-file] {
display: flex;
align-items: center;
justify-content: center;
width: var(--size-24);
height: var(--size-24);
padding: 4px; padding: 4px;
margin: -4px 0 -4px auto;
border-radius: var(--rounded-full);
margin-left: auto; margin-left: auto;
border-radius: var(--rounded-full);
&:focus-visible { &:focus-visible {
outline: var(--focus-ring); outline: var(--focus-ring);
...@@ -162,7 +178,11 @@ export const CODE_FRAME_STYLES = ` ...@@ -162,7 +178,11 @@ export const CODE_FRAME_STYLES = `
} }
&:hover { &:hover {
background: var(--color-gray-100); background: var(--color-gray-alpha-100);
}
&:active {
background: var(--color-gray-alpha-200);
} }
} }
...@@ -197,6 +217,15 @@ export const CODE_FRAME_STYLES = ` ...@@ -197,6 +217,15 @@ export const CODE_FRAME_STYLES = `
} }
} }
[data-nextjs-codeframe-line] > span:first-child {
color: var(--color-gray-alpha-700) !important;
}
[data-nextjs-codeframe-line][data-nextjs-codeframe-line--errored="true"]
> span:first-child {
color: var(--color-gray-alpha-1000) !important;
}
[data-nextjs-codeframe] > * { [data-nextjs-codeframe] > * {
margin: 0; margin: 0;
...@@ -204,13 +233,14 @@ export const CODE_FRAME_STYLES = ` ...@@ -204,13 +233,14 @@ export const CODE_FRAME_STYLES = `
.code-frame-link { .code-frame-link {
display: flex; display: flex;
align-items: center;
gap: 6px;
margin: 0; margin: 0;
outline: 0; outline: 0;
padding-top: 8px;
padding-bottom: 8px;
padding-right: 8px;
} }
.code-frame-link [data-icon='right'] {
margin-left: auto;
}
.code-frame-pre { .code-frame-pre {
overflow-x: auto; overflow-x: auto;
overflow-y: hidden; overflow-y: hidden;
......
...@@ -41,11 +41,11 @@ describe('parse line numbers', () => { ...@@ -41,11 +41,11 @@ describe('parse line numbers', () => {
isErroredLine: true, isErroredLine: true,
}) })
// Line of ^ marker // Line of ^ marker — no line number on this line, return undefined.
expect( expect(
parseLineNumberFromCodeFrameLine(decodedLines[2], input.stackFrame) parseLineNumberFromCodeFrameLine(decodedLines[2], input.stackFrame)
).toEqual({ ).toEqual({
lineNumber: '', lineNumber: undefined,
isErroredLine: false, isErroredLine: false,
}) })
}) })
......
...@@ -72,24 +72,27 @@ export function groupCodeFrameLines(formattedFrame: string) { ...@@ -72,24 +72,27 @@ export function groupCodeFrameLines(formattedFrame: string) {
return lines return lines
} }
// `>` marker or whitespace padding that sits before the line-number token.
function isLineNumberPrefixToken(content: string | undefined): boolean {
return (
content !== undefined && /^[\s>]+$/.test(content) && !content.includes('|')
)
}
export function parseLineNumberFromCodeFrameLine( export function parseLineNumberFromCodeFrameLine(
line: AnserJsonEntry[], line: AnserJsonEntry[],
stackFrame: StackFrame stackFrame: StackFrame
) { ) {
let lineNumberToken: AnserJsonEntry | undefined let i = 0
let line1: string | undefined while (i < line.length && isLineNumberPrefixToken(line[i]?.content)) {
// parse line number from line first 2 tokens i++
// e.g. ` > 1 | const foo = 'bar'` => `1`, first token is `1 |`
// e.g. ` 2 | const foo = 'bar'` => `2`. first 2 tokens are ' ' and ' 2 |'
if (line[0]?.content === '>' || line[0]?.content === ' ') {
lineNumberToken = line[1]
line1 = lineNumberToken?.content?.replace('|', '')?.trim()
} }
const trimmed = line[i]?.content?.replace('|', '').trim()
const line1 = trimmed && /^\d+$/.test(trimmed) ? trimmed : undefined
// When the line number is possibly undefined, it can be just the non-source code line
// e.g. the ^ sign can also take a line, we skip rendering line number for it
return { return {
lineNumber: line1, lineNumber: line1,
isErroredLine: line1 === stackFrame.line1?.toString(), isErroredLine:
line1 !== undefined && line1 === stackFrame.line1?.toString(),
} }
} }
...@@ -215,6 +215,6 @@ export const COPY_BUTTON_STYLES = ` ...@@ -215,6 +215,6 @@ export const COPY_BUTTON_STYLES = `
color: var(--color-ansi-red); color: var(--color-ansi-red);
} }
.nextjs-data-copy-button--success:not([aria-disabled="true"]) { .nextjs-data-copy-button--success:not([aria-disabled="true"]) {
color: var(--color-ansi-green); color: var(--color-gray-900);
} }
` `
import type { Meta, StoryObj } from '@storybook/react' import type { Meta, StoryObj } from '@storybook/react'
import { DevToolsIndicator } from './devtools-indicator' import { DevToolsIndicator } from './devtools-indicator'
import { withShadowPortal } from '../../storybook/with-shadow-portal' import { withShadowPortal } from '../../../../../.storybook/decorators/with-shadow-portal'
import { withDevOverlayContexts } from '../../storybook/with-dev-overlay-contexts' import { withDevOverlayContexts } from '../../../../../.storybook/decorators/with-dev-overlay-contexts'
import { INITIAL_OVERLAY_STATE, type OverlayState } from '../../shared' import { INITIAL_OVERLAY_STATE, type OverlayState } from '../../shared'
const meta: Meta<typeof DevToolsIndicator> = { const meta: Meta<typeof DevToolsIndicator> = {
......
import type { Meta, StoryObj } from '@storybook/react' import type { Meta, StoryObj } from '@storybook/react'
import { NextLogo } from './next-logo' import { NextLogo } from './next-logo'
import { withShadowPortal } from '../../storybook/with-shadow-portal' import { withShadowPortal } from '../../../../../.storybook/decorators/with-shadow-portal'
import { withDevOverlayContexts } from '../../storybook/with-dev-overlay-contexts' import { withDevOverlayContexts } from '../../../../../.storybook/decorators/with-dev-overlay-contexts'
const meta: Meta<typeof NextLogo> = { const meta: Meta<typeof NextLogo> = {
component: NextLogo, component: NextLogo,
......
...@@ -6,9 +6,11 @@ export const styles = css` ...@@ -6,9 +6,11 @@ export const styles = css`
--next-dialog-max-width: 960px; --next-dialog-max-width: 960px;
--next-dialog-row-padding: 16px; --next-dialog-row-padding: 16px;
--next-dialog-padding: 12px; --next-dialog-padding: 12px;
--next-dialog-notch-height: 42px;
--next-dialog-border-width: 1px; --next-dialog-border-width: 1px;
background-color: var(--color-gray-100);
padding: 0 4px 4px 4px;
border-radius: var(--rounded-2xl);
display: flex; display: flex;
flex-direction: column; flex-direction: column;
width: 100%; width: 100%;
...@@ -26,15 +28,6 @@ export const styles = css` ...@@ -26,15 +28,6 @@ export const styles = css`
opacity: 1; opacity: 1;
scale: 1; scale: 1;
} }
[data-nextjs-scroll-fader][data-side='top'] {
left: 1px;
top: calc(
var(--next-dialog-notch-height) + var(--next-dialog-border-width)
);
width: calc(100% - var(--next-dialog-padding));
opacity: 0;
}
} }
[data-nextjs-dialog] { [data-nextjs-dialog] {
...@@ -61,12 +54,16 @@ export const styles = css` ...@@ -61,12 +54,16 @@ export const styles = css`
display: flex; display: flex;
flex-direction: column; flex-direction: column;
position: relative; position: relative;
padding: var(--next-dialog-padding); padding: 0;
} }
[data-nextjs-dialog-content] > [data-nextjs-dialog-header] { [data-nextjs-dialog-content] > [data-nextjs-dialog-header] {
display: flex;
flex-direction: column;
flex-shrink: 0; flex-shrink: 0;
gap: 4px;
margin-bottom: 8px; margin-bottom: 8px;
padding: 20px;
} }
[data-nextjs-dialog-content] > [data-nextjs-dialog-body] { [data-nextjs-dialog-content] > [data-nextjs-dialog-body] {
......
...@@ -13,4 +13,10 @@ export function ErrorOverlayDialogBody({ ...@@ -13,4 +13,10 @@ export function ErrorOverlayDialogBody({
) )
} }
export const DIALOG_BODY_STYLES = `` export const DIALOG_BODY_STYLES = `
[data-nextjs-dialog-body] {
padding-left: 20px;
padding-right: 20px;
padding-bottom: 20px;
}
`
...@@ -3,13 +3,11 @@ import { Dialog } from '../../dialog/dialog' ...@@ -3,13 +3,11 @@ import { Dialog } from '../../dialog/dialog'
type ErrorOverlayDialogProps = { type ErrorOverlayDialogProps = {
children?: React.ReactNode children?: React.ReactNode
onClose?: () => void onClose?: () => void
footer?: React.ReactNode
} & React.HTMLAttributes<HTMLDivElement> } & React.HTMLAttributes<HTMLDivElement>
export function ErrorOverlayDialog({ export function ErrorOverlayDialog({
children, children,
onClose, onClose,
footer,
...props ...props
}: ErrorOverlayDialogProps) { }: ErrorOverlayDialogProps) {
return ( return (
...@@ -23,7 +21,6 @@ export function ErrorOverlayDialog({ ...@@ -23,7 +21,6 @@ export function ErrorOverlayDialog({
> >
{children} {children}
</Dialog> </Dialog>
{footer}
</div> </div>
) )
} }
...@@ -34,8 +31,7 @@ export const DIALOG_STYLES = ` ...@@ -34,8 +31,7 @@ export const DIALOG_STYLES = `
flex-direction: column; flex-direction: column;
background: var(--color-background-100); background: var(--color-background-100);
background-clip: padding-box; background-clip: padding-box;
border: var(--next-dialog-border-width) solid var(--color-gray-400); border-radius: var(--next-dialog-radius);
border-radius: 0 0 var(--next-dialog-radius) var(--next-dialog-radius);
box-shadow: var(--shadow-menu); box-shadow: var(--shadow-menu);
position: relative; position: relative;
overflow: hidden; overflow: hidden;
......
...@@ -18,6 +18,9 @@ export const DIALOG_HEADER_STYLES = ` ...@@ -18,6 +18,9 @@ export const DIALOG_HEADER_STYLES = `
.nextjs-container-errors-header { .nextjs-container-errors-header {
position: relative; position: relative;
} }
[data-nextjs-dialog-content] > .nextjs-container-errors-header {
margin-bottom: 0;
}
.nextjs-container-errors-header > h1 { .nextjs-container-errors-header > h1 {
font-size: var(--size-20); font-size: var(--size-20);
line-height: var(--size-24); line-height: var(--size-24);
...@@ -38,8 +41,7 @@ export const DIALOG_HEADER_STYLES = ` ...@@ -38,8 +41,7 @@ export const DIALOG_HEADER_STYLES = `
margin-top: 4px; margin-top: 4px;
} }
.nextjs-container-errors-header > p > a { .nextjs-container-errors-header > p > a {
color: inherit; font-weight: 600;
font-weight: bold;
} }
.nextjs-container-errors-header .nextjs-container-errors-header
> .nextjs-container-build-error-version-status { > .nextjs-container-build-error-version-status {
......
import type { Meta, StoryObj } from '@storybook/react' import type { Meta, StoryObj } from '@storybook/react'
import { EnvironmentNameLabel } from './environment-name-label' import { EnvironmentNameLabel } from './environment-name-label'
import { withShadowPortal } from '../../../storybook/with-shadow-portal' import { withShadowPortal } from '../../../../../../.storybook/decorators/with-shadow-portal'
const meta: Meta<typeof EnvironmentNameLabel> = { const meta: Meta<typeof EnvironmentNameLabel> = {
component: EnvironmentNameLabel, component: EnvironmentNameLabel,
......
import type { Meta, StoryObj } from '@storybook/react' import type { Meta, StoryObj } from '@storybook/react'
import { ErrorMessage } from './error-message' import { ErrorMessage } from './error-message'
import { withShadowPortal } from '../../../storybook/with-shadow-portal' import { withShadowPortal } from '../../../../../../.storybook/decorators/with-shadow-portal'
const meta: Meta<typeof ErrorMessage> = { const meta: Meta<typeof ErrorMessage> = {
component: ErrorMessage, component: ErrorMessage,
......
...@@ -23,13 +23,13 @@ export function ErrorMessage({ errorMessage, errorType }: ErrorMessageProps) { ...@@ -23,13 +23,13 @@ export function ErrorMessage({ errorMessage, errorType }: ErrorMessageProps) {
return null return null
} }
// The "Blocking Route" error message is specifically formatted to look nice // Instant errors are formatted specifically for the overlay rather than
// in the overlay (rather than just passed through from the console), so we // passed through from the console, so we don't truncate them — they rely
// intentionally don't truncate it and rely on the scroll overflow instead. // on scroll overflow instead.
const shouldTruncate = const shouldTruncate = isTooTall && errorType !== 'Instant'
isTooTall && errorType !== 'Blocking Route' && errorType !== 'Instant'
return ( return (
<>
<div className="nextjs__container_errors_wrapper"> <div className="nextjs__container_errors_wrapper">
<div <div
ref={messageRef} ref={messageRef}
...@@ -38,6 +38,7 @@ export function ErrorMessage({ errorMessage, errorType }: ErrorMessageProps) { ...@@ -38,6 +38,7 @@ export function ErrorMessage({ errorMessage, errorType }: ErrorMessageProps) {
> >
{errorMessage} {errorMessage}
</div> </div>
</div>
{shouldTruncate && !isExpanded && ( {shouldTruncate && !isExpanded && (
<> <>
<div className="nextjs__container_errors_gradient_overlay" /> <div className="nextjs__container_errors_gradient_overlay" />
...@@ -51,18 +52,16 @@ export function ErrorMessage({ errorMessage, errorType }: ErrorMessageProps) { ...@@ -51,18 +52,16 @@ export function ErrorMessage({ errorMessage, errorType }: ErrorMessageProps) {
</button> </button>
</> </>
)} )}
</div> </>
) )
} }
export const styles = ` export const styles = `
.nextjs__container_errors_wrapper { .nextjs__container_errors_wrapper {
position: relative;
} }
.nextjs__container_errors_desc { .nextjs__container_errors_desc {
margin: 0; margin: 0;
margin-left: 4px;
color: var(--color-red-900); color: var(--color-red-900);
font-weight: 500; font-weight: 500;
font-size: var(--size-16); font-size: var(--size-16);
...@@ -73,7 +72,7 @@ export const styles = ` ...@@ -73,7 +72,7 @@ export const styles = `
} }
.nextjs__container_errors_desc.nextjs__container_errors_desc_instant { .nextjs__container_errors_desc.nextjs__container_errors_desc_instant {
color: var(--color-gray-900); color: var(--color-gray-1000);
} }
.nextjs__container_errors_desc.truncated { .nextjs__container_errors_desc.truncated {
...@@ -81,6 +80,17 @@ export const styles = ` ...@@ -81,6 +80,17 @@ export const styles = `
overflow: hidden; overflow: hidden;
} }
.nextjs__container_errors_desc code {
font-family: var(--font-stack-monospace);
font-weight: 500;
line-height: var(--size-20);
color: var(--color-gray-1000);
padding: 2px 6px;
background: var(--color-background-200);
border: 1px solid var(--color-gray-200);
border-radius: var(--rounded-md-2);
}
.nextjs__container_errors_gradient_overlay { .nextjs__container_errors_gradient_overlay {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
...@@ -101,13 +111,14 @@ export const styles = ` ...@@ -101,13 +111,14 @@ export const styles = `
transform: translateX(-50%); transform: translateX(-50%);
display: flex; display: flex;
align-items: center; align-items: center;
padding: 6px 8px; padding: 6px 12px;
background: var(--color-background-100); background: var(--color-background-100);
border: 1px solid var(--color-gray-alpha-400); border: none;
border-radius: 999px; border-radius: var(--rounded-full);
box-shadow: box-shadow:
0px 2px 2px var(--color-gray-alpha-100), 0px 2px 2px var(--color-gray-alpha-100),
0px 8px 8px -8px var(--color-gray-alpha-100); 0px 8px 8px -8px var(--color-gray-alpha-100),
0px 0px 0px 1px var(--color-gray-alpha-400);
font-size: var(--size-13); font-size: var(--size-13);
cursor: pointer; cursor: pointer;
color: var(--color-gray-900); color: var(--color-gray-900);
......
export function ErrorOverlayBottomStack({
errorCount,
activeIdx,
}: {
errorCount: number
activeIdx: number
}) {
// If there are more than 2 errors to navigate, the stack count should remain at 2.
const stackCount = Math.min(errorCount - activeIdx - 1, 2)
return (
<div aria-hidden className="error-overlay-bottom-stack">
<div
className="error-overlay-bottom-stack-stack"
data-stack-count={stackCount}
>
<div className="error-overlay-bottom-stack-layer error-overlay-bottom-stack-layer-1">
1
</div>
<div className="error-overlay-bottom-stack-layer error-overlay-bottom-stack-layer-2">
2
</div>
</div>
</div>
)
}
export const styles = `
.error-overlay-bottom-stack-layer {
width: 100%;
height: var(--stack-layer-height);
position: relative;
border: 1px solid var(--color-gray-400);
border-radius: var(--rounded-xl);
background: var(--color-background-200);
transition:
translate 350ms var(--timing-swift),
box-shadow 350ms var(--timing-swift);
}
.error-overlay-bottom-stack-layer-1 {
width: calc(100% - var(--size-24));
}
.error-overlay-bottom-stack-layer-2 {
width: calc(100% - var(--size-48));
z-index: -1;
}
.error-overlay-bottom-stack {
width: 100%;
position: absolute;
bottom: -1px;
height: 0;
overflow: visible;
}
.error-overlay-bottom-stack-stack {
--stack-layer-height: 44px;
--stack-layer-height-half: calc(var(--stack-layer-height) / 2);
--stack-layer-trim: 13px;
--shadow: 0px 0.925px 0.925px 0px rgba(0, 0, 0, 0.02),
0px 3.7px 7.4px -3.7px rgba(0, 0, 0, 0.04),
0px 14.8px 22.2px -7.4px rgba(0, 0, 0, 0.06);
display: grid;
place-items: center center;
width: 100%;
position: fixed;
height: 0;
overflow: visible;
z-index: -1;
max-width: var(--next-dialog-max-width);
.error-overlay-bottom-stack-layer {
grid-area: 1 / 1;
/* Hide */
translate: 0 calc(var(--stack-layer-height) * -1);
}
&[data-stack-count='1'],
&[data-stack-count='2'] {
.error-overlay-bottom-stack-layer-1 {
translate: 0
calc(var(--stack-layer-height-half) * -1 - var(--stack-layer-trim));
}
}
&[data-stack-count='2'] {
.error-overlay-bottom-stack-layer-2 {
translate: 0 calc(var(--stack-layer-trim) * -1 * 2);
}
}
/* Only the bottom stack should have the shadow */
&[data-stack-count='1'] .error-overlay-bottom-stack-layer-1 {
box-shadow: var(--shadow);
}
&[data-stack-count='2'] {
.error-overlay-bottom-stack-layer-2 {
box-shadow: var(--shadow);
}
}
}
`
import type { Meta, StoryObj } from '@storybook/react' import type { Meta, StoryObj } from '@storybook/react'
import { ErrorOverlayCallStack } from './error-overlay-call-stack' import { ErrorOverlayCallStack } from './error-overlay-call-stack'
import { withShadowPortal } from '../../../storybook/with-shadow-portal' import { withShadowPortal } from '../../../../../../.storybook/decorators/with-shadow-portal'
const meta: Meta<typeof ErrorOverlayCallStack> = { const meta: Meta<typeof ErrorOverlayCallStack> = {
component: ErrorOverlayCallStack, component: ErrorOverlayCallStack,
......
...@@ -122,7 +122,7 @@ export const styles = ` ...@@ -122,7 +122,7 @@ export const styles = `
.feedback-button { .feedback-button {
background: none; background: none;
border: none; border: none;
border-radius: var(--rounded-md); border-radius: var(--rounded-full);
width: var(--size-24); width: var(--size-24);
height: var(--size-24); height: var(--size-24);
display: flex; display: flex;
......
...@@ -22,9 +22,7 @@ export const styles = ` ...@@ -22,9 +22,7 @@ export const styles = `
justify-content: space-between; justify-content: space-between;
gap: 8px; gap: 8px;
padding: 12px; padding: 12px 12px 8px 12px;
background: var(--color-background-200);
border-top: 1px solid var(--color-gray-400);
} }
.error-feedback { .error-feedback {
......
import type { Meta, StoryObj } from '@storybook/react' import type { Meta, StoryObj } from '@storybook/react'
import { ErrorOverlayLayout } from './error-overlay-layout' import { ErrorOverlayLayout } from './error-overlay-layout'
import { withShadowPortal } from '../../../storybook/with-shadow-portal' import { withShadowPortal } from '../../../../../../.storybook/decorators/with-shadow-portal'
const meta: Meta<typeof ErrorOverlayLayout> = { const meta: Meta<typeof ErrorOverlayLayout> = {
component: ErrorOverlayLayout, component: ErrorOverlayLayout,
......
...@@ -4,10 +4,7 @@ import type { ErrorMessageType } from '../error-message/error-message' ...@@ -4,10 +4,7 @@ import type { ErrorMessageType } from '../error-message/error-message'
import type { ErrorType } from '../error-type-label/error-type-label' import type { ErrorType } from '../error-type-label/error-type-label'
import { DialogContent } from '../../dialog' import { DialogContent } from '../../dialog'
import { import { styles as toolbarStyles } from '../error-overlay-toolbar/error-overlay-toolbar'
ErrorOverlayToolbar,
styles as toolbarStyles,
} from '../error-overlay-toolbar/error-overlay-toolbar'
import { ErrorOverlayFooter } from '../error-overlay-footer/error-overlay-footer' import { ErrorOverlayFooter } from '../error-overlay-footer/error-overlay-footer'
import { import {
ErrorMessage, ErrorMessage,
...@@ -29,12 +26,10 @@ import { ...@@ -29,12 +26,10 @@ import {
} from '../dialog/header' } from '../dialog/header'
import { ErrorOverlayDialogBody, DIALOG_BODY_STYLES } from '../dialog/body' import { ErrorOverlayDialogBody, DIALOG_BODY_STYLES } from '../dialog/body'
import { OVERLAY_STYLES, ErrorOverlayOverlay } from '../overlay/overlay' import { OVERLAY_STYLES, ErrorOverlayOverlay } from '../overlay/overlay'
import { ErrorOverlayBottomStack } from '../error-overlay-bottom-stack'
import type { ErrorBaseProps } from '../error-overlay/error-overlay' import type { ErrorBaseProps } from '../error-overlay/error-overlay'
import type { ReadyRuntimeError } from '../../../utils/get-error-by-type' import type { ReadyRuntimeError } from '../../../utils/get-error-by-type'
import { EnvironmentNameLabel } from '../environment-name-label/environment-name-label' import { EnvironmentNameLabel } from '../environment-name-label/environment-name-label'
import { useFocusTrap } from '../dev-tools-indicator/utils' import { useFocusTrap } from '../dev-tools-indicator/utils'
import { Fader } from '../../fader'
import { Resizer } from '../../resizer' import { Resizer } from '../../resizer'
import { OverlayBackdrop } from '../../overlay' import { OverlayBackdrop } from '../../overlay'
...@@ -42,6 +37,7 @@ export interface ErrorOverlayLayoutProps extends ErrorBaseProps { ...@@ -42,6 +37,7 @@ export interface ErrorOverlayLayoutProps extends ErrorBaseProps {
errorMessage: ErrorMessageType errorMessage: ErrorMessageType
errorType: ErrorType errorType: ErrorType
children?: React.ReactNode children?: React.ReactNode
headerChildren?: React.ReactNode
errorCode?: string errorCode?: string
error: ReadyRuntimeError['error'] error: ReadyRuntimeError['error']
debugInfo?: DebugInfo debugInfo?: DebugInfo
...@@ -59,8 +55,9 @@ export function ErrorOverlayLayout({ ...@@ -59,8 +55,9 @@ export function ErrorOverlayLayout({
errorMessage, errorMessage,
errorType, errorType,
children, children,
headerChildren,
errorCode, errorCode,
errorCount, errorCount: _errorCount,
error, error,
debugInfo, debugInfo,
isBuildError, isBuildError,
...@@ -69,7 +66,6 @@ export function ErrorOverlayLayout({ ...@@ -69,7 +66,6 @@ export function ErrorOverlayLayout({
runtimeErrors, runtimeErrors,
activeIdx, activeIdx,
setActiveIndex, setActiveIndex,
isTurbopack,
dialogResizerRef, dialogResizerRef,
generateErrorInfo, generateErrorInfo,
// This prop is used to animate the dialog, it comes from a parent component (<ErrorOverlay>) // This prop is used to animate the dialog, it comes from a parent component (<ErrorOverlay>)
...@@ -89,18 +85,10 @@ export function ErrorOverlayLayout({ ...@@ -89,18 +85,10 @@ export function ErrorOverlayLayout({
Boolean(transitionDurationMs) Boolean(transitionDurationMs)
) )
const faderRef = React.useRef<HTMLDivElement | null>(null)
const hasFooter = Boolean(errorCode) const hasFooter = Boolean(errorCode)
const dialogRef = React.useRef<HTMLDivElement | null>(null) const dialogRef = React.useRef<HTMLDivElement | null>(null)
useFocusTrap(dialogRef, null, rendered) useFocusTrap(dialogRef, null, rendered)
function onScroll(e: React.UIEvent<HTMLDivElement>) {
if (faderRef.current) {
const opacity = clamp(e.currentTarget.scrollTop / 17, [0, 1])
faderRef.current.style.opacity = String(opacity)
}
}
function onTransitionEnd({ propertyName, target }: React.TransitionEvent) { function onTransitionEnd({ propertyName, target }: React.TransitionEvent) {
// We can only measure height after the `scale` transition ends, // We can only measure height after the `scale` transition ends,
// otherwise we will measure height as a multiple of the animating value // otherwise we will measure height as a multiple of the animating value
...@@ -124,14 +112,11 @@ export function ErrorOverlayLayout({ ...@@ -124,14 +112,11 @@ export function ErrorOverlayLayout({
activeIdx={activeIdx} activeIdx={activeIdx}
setActiveIndex={setActiveIndex} setActiveIndex={setActiveIndex}
versionInfo={versionInfo} versionInfo={versionInfo}
isTurbopack={isTurbopack} error={error}
debugInfo={debugInfo}
generateErrorInfo={generateErrorInfo}
/> />
<ErrorOverlayDialog <ErrorOverlayDialog onClose={onClose} data-has-footer={hasFooter}>
onClose={onClose}
data-has-footer={hasFooter}
onScroll={onScroll}
footer={hasFooter && <ErrorOverlayFooter errorCode={errorCode} />}
>
<Resizer <Resizer
ref={dialogResizerRef} ref={dialogResizerRef}
measure={!animating} measure={!animating}
...@@ -144,6 +129,10 @@ export function ErrorOverlayLayout({ ...@@ -144,6 +129,10 @@ export function ErrorOverlayLayout({
// allow assertion in tests before error rating is implemented // allow assertion in tests before error rating is implemented
data-nextjs-error-code={errorCode} data-nextjs-error-code={errorCode}
> >
<ErrorMessage
errorMessage={errorMessage}
errorType={errorType}
/>
<span data-nextjs-error-label-group> <span data-nextjs-error-label-group>
<ErrorTypeLabel errorType={errorType} /> <ErrorTypeLabel errorType={errorType} />
{error.environmentName && ( {error.environmentName && (
...@@ -152,37 +141,19 @@ export function ErrorOverlayLayout({ ...@@ -152,37 +141,19 @@ export function ErrorOverlayLayout({
/> />
)} )}
</span> </span>
<ErrorOverlayToolbar
error={error}
debugInfo={debugInfo}
generateErrorInfo={generateErrorInfo}
/>
</div> </div>
<ErrorMessage {headerChildren}
errorMessage={errorMessage}
errorType={errorType}
/>
</ErrorOverlayDialogHeader> </ErrorOverlayDialogHeader>
<ErrorOverlayDialogBody>{children}</ErrorOverlayDialogBody> <ErrorOverlayDialogBody>{children}</ErrorOverlayDialogBody>
</DialogContent> </DialogContent>
</Resizer> </Resizer>
<ErrorOverlayBottomStack
errorCount={errorCount}
activeIdx={activeIdx ?? 0}
/>
</ErrorOverlayDialog> </ErrorOverlayDialog>
<Fader ref={faderRef} side="top" stop="50%" blur="4px" height={48} /> {hasFooter && <ErrorOverlayFooter errorCode={errorCode} />}
</div> </div>
</ErrorOverlayOverlay> </ErrorOverlayOverlay>
) )
} }
function clamp(value: number, [min, max]: [number, number]) {
return Math.min(Math.max(value, min), max)
}
export const styles = ` export const styles = `
${OVERLAY_STYLES} ${OVERLAY_STYLES}
${DIALOG_STYLES} ${DIALOG_STYLES}
...@@ -198,5 +169,7 @@ export const styles = ` ...@@ -198,5 +169,7 @@ export const styles = `
display: flex; display: flex;
align-items: center; align-items: center;
gap: 8px; gap: 8px;
white-space: nowrap;
flex-shrink: 0;
} }
` `
import type { Meta, StoryObj } from '@storybook/react' import type { Meta, StoryObj } from '@storybook/react'
import { ErrorOverlayNav } from './error-overlay-nav' import { ErrorOverlayNav } from './error-overlay-nav'
import { withShadowPortal } from '../../../storybook/with-shadow-portal' import { withShadowPortal } from '../../../../../../.storybook/decorators/with-shadow-portal'
const meta: Meta<typeof ErrorOverlayNav> = { const meta: Meta<typeof ErrorOverlayNav> = {
component: ErrorOverlayNav, component: ErrorOverlayNav,
...@@ -39,6 +39,8 @@ export const Default: Story = { ...@@ -39,6 +39,8 @@ export const Default: Story = {
}, },
], ],
activeIdx: 1, activeIdx: 1,
error: new Error('Second error message'),
generateErrorInfo: async () => '## Error Type\nRuntime Error',
versionInfo: { versionInfo: {
installed: '15.0.0', installed: '15.0.0',
staleness: 'stale-major', staleness: 'stale-major',
......
import type { DebugInfo } from '../../../../shared/types'
import type { VersionInfo } from '../../../../../server/dev/parse-version-info' import type { VersionInfo } from '../../../../../server/dev/parse-version-info'
import { ErrorOverlayPagination } from '../error-overlay-pagination/error-overlay-pagination' import { ErrorOverlayPagination } from '../error-overlay-pagination/error-overlay-pagination'
import { VersionStalenessInfo } from '../../version-staleness-info/version-staleness-info' import { ErrorOverlayToolbar } from '../error-overlay-toolbar/error-overlay-toolbar'
import type { ReadyRuntimeError } from '../../../utils/get-error-by-type' import type { ReadyRuntimeError } from '../../../utils/get-error-by-type'
type ErrorOverlayNavProps = { type ErrorOverlayNavProps = {
...@@ -9,7 +10,9 @@ type ErrorOverlayNavProps = { ...@@ -9,7 +10,9 @@ type ErrorOverlayNavProps = {
activeIdx?: number activeIdx?: number
setActiveIndex?: (index: number) => void setActiveIndex?: (index: number) => void
versionInfo?: VersionInfo versionInfo?: VersionInfo
isTurbopack?: boolean error: ReadyRuntimeError['error']
debugInfo?: DebugInfo
generateErrorInfo: () => Promise<string>
} }
export function ErrorOverlayNav({ export function ErrorOverlayNav({
...@@ -17,30 +20,33 @@ export function ErrorOverlayNav({ ...@@ -17,30 +20,33 @@ export function ErrorOverlayNav({
activeIdx, activeIdx,
setActiveIndex, setActiveIndex,
versionInfo, versionInfo,
error,
debugInfo,
generateErrorInfo,
}: ErrorOverlayNavProps) { }: ErrorOverlayNavProps) {
const bundlerName = (process.env.__NEXT_BUNDLER || 'Turbopack') as const bundlerName = (process.env.__NEXT_BUNDLER || 'Turbopack') as
| 'Turbopack' | 'Turbopack'
| 'Webpack' | 'Webpack'
| 'Rspack' | 'Rspack'
return ( return (
<div data-nextjs-error-overlay-nav> <div data-nextjs-error-overlay-nav>
<Notch side="left"> <NavItem side="left">
{/* TODO: better passing data instead of nullish coalescing */} {/* TODO: better passing data instead of nullish coalescing */}
<ErrorOverlayPagination <ErrorOverlayPagination
runtimeErrors={runtimeErrors ?? []} runtimeErrors={runtimeErrors ?? []}
activeIdx={activeIdx ?? 0} activeIdx={activeIdx ?? 0}
onActiveIndexChange={setActiveIndex ?? (() => {})} onActiveIndexChange={setActiveIndex ?? (() => {})}
/> />
</Notch> </NavItem>
{versionInfo && ( <NavItem side="right">
<Notch side="right"> <ErrorOverlayToolbar
<VersionStalenessInfo error={error}
debugInfo={debugInfo}
generateErrorInfo={generateErrorInfo}
versionInfo={versionInfo} versionInfo={versionInfo}
bundlerName={bundlerName} bundlerName={bundlerName}
/> />
</Notch> </NavItem>
)}
</div> </div>
) )
} }
...@@ -52,6 +58,7 @@ export const styles = ` ...@@ -52,6 +58,7 @@ export const styles = `
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
flex-shrink: 0;
width: 100%; width: 100%;
...@@ -61,79 +68,25 @@ export const styles = ` ...@@ -61,79 +68,25 @@ export const styles = `
translate: var(--next-dialog-border-width) var(--next-dialog-border-width); translate: var(--next-dialog-border-width) var(--next-dialog-border-width);
max-width: var(--next-dialog-max-width); max-width: var(--next-dialog-max-width);
.error-overlay-notch { .error-overlay-nav-item {
translate: calc(var(--next-dialog-border-width) * -1); translate: calc(var(--next-dialog-border-width) * -1);
width: auto; width: auto;
height: var(--next-dialog-notch-height);
padding: 12px; padding: 12px;
background: var(--background-color);
border: var(--next-dialog-border-width) solid var(--stroke-color);
border-bottom: none;
position: relative; position: relative;
&[data-side='left'] { &[data-side='left'] {
padding-right: 0; padding-right: 0;
border-radius: var(--next-dialog-radius) 0 0 0;
.error-overlay-notch-tail {
right: -54px;
}
> *:not(.error-overlay-notch-tail) {
margin-right: -10px;
}
} }
&[data-side='right'] { &[data-side='right'] {
padding-left: 0; padding-left: 0;
border-radius: 0 var(--next-dialog-radius) 0 0;
.error-overlay-notch-tail {
left: -54px;
transform: rotateY(180deg);
}
> *:not(.error-overlay-notch-tail) {
margin-left: -12px;
}
}
.error-overlay-notch-tail {
position: absolute;
top: calc(var(--next-dialog-border-width) * -1);
pointer-events: none;
z-index: -1;
height: calc(100% + var(--next-dialog-border-width));
} }
} }
} }
@media (max-width: 600px) {
[data-nextjs-error-overlay-nav] {
background: var(--background-color);
border-radius: var(--next-dialog-radius) var(--next-dialog-radius) 0 0;
border: var(--next-dialog-border-width) solid var(--stroke-color);
border-bottom: none;
overflow: hidden;
translate: 0 var(--next-dialog-border-width);
.error-overlay-notch {
border-radius: 0;
border: 0;
&[data-side="left"], &[data-side="right"] {
border-radius: 0;
}
.error-overlay-notch-tail {
display: none;
}
}
}
}
` `
function Notch({ function NavItem({
children, children,
side = 'left', side = 'left',
}: { }: {
...@@ -141,80 +94,8 @@ function Notch({ ...@@ -141,80 +94,8 @@ function Notch({
side?: 'left' | 'right' side?: 'left' | 'right'
}) { }) {
return ( return (
<div className="error-overlay-notch" data-side={side}> <div className="error-overlay-nav-item" data-side={side}>
{children} {children}
<Tail />
</div> </div>
) )
} }
function Tail() {
return (
<svg
width="60"
height="42"
viewBox="0 0 60 42"
fill="none"
xmlns="http://www.w3.org/2000/svg"
className="error-overlay-notch-tail"
preserveAspectRatio="none"
>
<mask
id="error_overlay_nav_mask0_2667_14687"
style={{
maskType: 'alpha',
}}
maskUnits="userSpaceOnUse"
x="0"
y="-1"
width="60"
height="43"
>
<mask
id="error_overlay_nav_path_1_outside_1_2667_14687"
maskUnits="userSpaceOnUse"
x="0"
y="-1"
width="60"
height="43"
fill="black"
>
<rect fill="white" y="-1" width="60" height="43" />
<path d="M1 0L8.0783 0C15.772 0 22.7836 4.41324 26.111 11.3501L34.8889 29.6498C38.2164 36.5868 45.228 41 52.9217 41H60H1L1 0Z" />
</mask>
<path
d="M1 0L8.0783 0C15.772 0 22.7836 4.41324 26.111 11.3501L34.8889 29.6498C38.2164 36.5868 45.228 41 52.9217 41H60H1L1 0Z"
fill="white"
/>
<path
d="M1 0V-1H0V0L1 0ZM1 41H0V42H1V41ZM34.8889 29.6498L33.9873 30.0823L34.8889 29.6498ZM26.111 11.3501L27.0127 10.9177L26.111 11.3501ZM1 1H8.0783V-1H1V1ZM60 40H1V42H60V40ZM2 41V0L0 0L0 41H2ZM25.2094 11.7826L33.9873 30.0823L35.7906 29.2174L27.0127 10.9177L25.2094 11.7826ZM52.9217 42H60V40H52.9217V42ZM33.9873 30.0823C37.4811 37.3661 44.8433 42 52.9217 42V40C45.6127 40 38.9517 35.8074 35.7906 29.2174L33.9873 30.0823ZM8.0783 1C15.3873 1 22.0483 5.19257 25.2094 11.7826L27.0127 10.9177C23.5188 3.6339 16.1567 -1 8.0783 -1V1Z"
fill="black"
mask="url(#error_overlay_nav_path_1_outside_1_2667_14687)"
/>
</mask>
<g mask="url(#error_overlay_nav_mask0_2667_14687)">
<mask
id="error_overlay_nav_path_3_outside_2_2667_14687"
maskUnits="userSpaceOnUse"
x="-1"
y="0.0244141"
width="60"
height="43"
fill="black"
>
<rect fill="white" x="-1" y="0.0244141" width="60" height="43" />
<path d="M0 1.02441H7.0783C14.772 1.02441 21.7836 5.43765 25.111 12.3746L33.8889 30.6743C37.2164 37.6112 44.228 42.0244 51.9217 42.0244H59H0L0 1.02441Z" />
</mask>
<path
d="M0 1.02441H7.0783C14.772 1.02441 21.7836 5.43765 25.111 12.3746L33.8889 30.6743C37.2164 37.6112 44.228 42.0244 51.9217 42.0244H59H0L0 1.02441Z"
fill="var(--background-color)"
/>
<path
d="M0 1.02441L0 0.0244141H-1V1.02441H0ZM0 42.0244H-1V43.0244H0L0 42.0244ZM33.8889 30.6743L32.9873 31.1068L33.8889 30.6743ZM25.111 12.3746L26.0127 11.9421L25.111 12.3746ZM0 2.02441H7.0783V0.0244141H0L0 2.02441ZM59 41.0244H0L0 43.0244H59V41.0244ZM1 42.0244L1 1.02441H-1L-1 42.0244H1ZM24.2094 12.8071L32.9873 31.1068L34.7906 30.2418L26.0127 11.9421L24.2094 12.8071ZM51.9217 43.0244H59V41.0244H51.9217V43.0244ZM32.9873 31.1068C36.4811 38.3905 43.8433 43.0244 51.9217 43.0244V41.0244C44.6127 41.0244 37.9517 36.8318 34.7906 30.2418L32.9873 31.1068ZM7.0783 2.02441C14.3873 2.02441 21.0483 6.21699 24.2094 12.8071L26.0127 11.9421C22.5188 4.65831 15.1567 0.0244141 7.0783 0.0244141V2.02441Z"
fill="var(--stroke-color)"
mask="url(#error_overlay_nav_path_3_outside_2_2667_14687)"
/>
</g>
</svg>
)
}
import type { Meta, StoryObj } from '@storybook/react' import type { Meta, StoryObj } from '@storybook/react'
import { ErrorOverlayPagination } from './error-overlay-pagination' import { ErrorOverlayPagination } from './error-overlay-pagination'
import { withShadowPortal } from '../../../storybook/with-shadow-portal' import { withShadowPortal } from '../../../../../../.storybook/decorators/with-shadow-portal'
import { useState } from 'react' import { useState } from 'react'
import type { ReadyRuntimeError } from '../../../utils/get-error-by-type' import type { ReadyRuntimeError } from '../../../utils/get-error-by-type'
......
...@@ -157,15 +157,21 @@ export const styles = ` ...@@ -157,15 +157,21 @@ export const styles = `
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
gap: 8px; gap: 6px;
width: fit-content; width: fit-content;
} }
@media (max-width: 575px) {
.error-overlay-pagination {
gap: 4px;
}
}
.error-overlay-pagination-count { .error-overlay-pagination-count {
color: var(--color-gray-900); color: var(--color-gray-900);
text-align: center; text-align: center;
font-size: var(--size-14); font-size: var(--size-14);
font-weight: 500; font-family: var(--font-mono);
line-height: var(--size-16); line-height: var(--size-16);
font-variant-numeric: tabular-nums; font-variant-numeric: tabular-nums;
} }
...@@ -177,7 +183,7 @@ export const styles = ` ...@@ -177,7 +183,7 @@ export const styles = `
width: var(--size-24); width: var(--size-24);
height: var(--size-24); height: var(--size-24);
background: var(--color-gray-300); background: none;
flex-shrink: 0; flex-shrink: 0;
border: none; border: none;
...@@ -192,8 +198,12 @@ export const styles = ` ...@@ -192,8 +198,12 @@ export const styles = `
outline: var(--focus-ring); outline: var(--focus-ring);
} }
&:not(:disabled):hover {
background: var(--color-gray-alpha-100);
}
&:not(:disabled):active { &:not(:disabled):active {
background: var(--color-gray-500); background: var(--color-gray-alpha-200);
} }
&:disabled { &:disabled {
......
import type { Meta, StoryObj } from '@storybook/react' import type { Meta, StoryObj } from '@storybook/react'
import { CopyErrorButton } from './copy-error-button' import { CopyErrorButton } from './copy-error-button'
import { withShadowPortal } from '../../../storybook/with-shadow-portal' import { withShadowPortal } from '../../../../../../.storybook/decorators/with-shadow-portal'
const meta: Meta<typeof CopyErrorButton> = { const meta: Meta<typeof CopyErrorButton> = {
component: CopyErrorButton, component: CopyErrorButton,
......
import type { Meta, StoryObj } from '@storybook/react' import type { Meta, StoryObj } from '@storybook/react'
import { DocsLinkButton } from './docs-link-button' import { DocsLinkButton } from './docs-link-button'
import { withShadowPortal } from '../../../storybook/with-shadow-portal' import { withShadowPortal } from '../../../../../../.storybook/decorators/with-shadow-portal'
const meta: Meta<typeof DocsLinkButton> = { const meta: Meta<typeof DocsLinkButton> = {
component: DocsLinkButton, component: DocsLinkButton,
......
import type { Meta, StoryObj } from '@storybook/react' import type { Meta, StoryObj } from '@storybook/react'
import { ErrorOverlayToolbar } from './error-overlay-toolbar' import { ErrorOverlayToolbar } from './error-overlay-toolbar'
import { withShadowPortal } from '../../../storybook/with-shadow-portal' import { withShadowPortal } from '../../../../../../.storybook/decorators/with-shadow-portal'
const meta: Meta<typeof ErrorOverlayToolbar> = { const meta: Meta<typeof ErrorOverlayToolbar> = {
component: ErrorOverlayToolbar, component: ErrorOverlayToolbar,
......
import type { VersionInfo } from '../../../../../server/dev/parse-version-info'
import type { DebugInfo } from '../../../../shared/types' import type { DebugInfo } from '../../../../shared/types'
import { NodejsInspectorButton } from './nodejs-inspector-button' import { NodejsInspectorButton } from './nodejs-inspector-button'
import { CopyErrorButton } from './copy-error-button' import { CopyErrorButton } from './copy-error-button'
import { DocsLinkButton } from './docs-link-button' import { DocsLinkButton } from './docs-link-button'
import { VersionStalenessInfo } from '../../version-staleness-info/version-staleness-info'
type ErrorOverlayToolbarProps = { type ErrorOverlayToolbarProps = {
error: Error error: Error
debugInfo: DebugInfo | undefined debugInfo: DebugInfo | undefined
feedbackButton?: React.ReactNode feedbackButton?: React.ReactNode
generateErrorInfo: () => Promise<string> generateErrorInfo: () => Promise<string>
versionInfo?: VersionInfo
bundlerName?: 'Turbopack' | 'Webpack' | 'Rspack'
} }
export function ErrorOverlayToolbar({ export function ErrorOverlayToolbar({
...@@ -15,6 +19,8 @@ export function ErrorOverlayToolbar({ ...@@ -15,6 +19,8 @@ export function ErrorOverlayToolbar({
debugInfo, debugInfo,
feedbackButton, feedbackButton,
generateErrorInfo, generateErrorInfo,
versionInfo,
bundlerName,
}: ErrorOverlayToolbarProps) { }: ErrorOverlayToolbarProps) {
return ( return (
<span className="error-overlay-toolbar"> <span className="error-overlay-toolbar">
...@@ -26,6 +32,12 @@ export function ErrorOverlayToolbar({ ...@@ -26,6 +32,12 @@ export function ErrorOverlayToolbar({
key={debugInfo?.devtoolsFrontendUrl} key={debugInfo?.devtoolsFrontendUrl}
defaultDevtoolsFrontendUrl={debugInfo?.devtoolsFrontendUrl} defaultDevtoolsFrontendUrl={debugInfo?.devtoolsFrontendUrl}
/> />
{versionInfo && bundlerName && (
<VersionStalenessInfo
versionInfo={versionInfo}
bundlerName={bundlerName}
/>
)}
</span> </span>
) )
} }
...@@ -36,6 +48,12 @@ export const styles = ` ...@@ -36,6 +48,12 @@ export const styles = `
gap: 6px; gap: 6px;
} }
@media (max-width: 575px) {
.error-overlay-toolbar {
gap: 4px;
}
}
.nodejs-inspector-button, .nodejs-inspector-button,
.copy-error-button, .copy-error-button,
.docs-link-button { .docs-link-button {
...@@ -43,12 +61,10 @@ export const styles = ` ...@@ -43,12 +61,10 @@ export const styles = `
justify-content: center; justify-content: center;
align-items: center; align-items: center;
width: var(--size-28); width: var(--size-24);
height: var(--size-28); height: var(--size-24);
background: var(--color-background-100); background: none;
background-clip: padding-box; border: none;
border: 1px solid var(--color-gray-alpha-400);
box-shadow: var(--shadow-small);
border-radius: var(--rounded-full); border-radius: var(--rounded-full);
svg { svg {
...@@ -69,7 +85,7 @@ export const styles = ` ...@@ -69,7 +85,7 @@ export const styles = `
} }
&:disabled { &:disabled {
background-color: var(--color-gray-100); opacity: 0.5;
cursor: not-allowed; cursor: not-allowed;
} }
} }
......
import type { Meta, StoryObj } from '@storybook/react' import type { Meta, StoryObj } from '@storybook/react'
import { NodejsInspectorButton } from './nodejs-inspector-button' import { NodejsInspectorButton } from './nodejs-inspector-button'
import { withShadowPortal } from '../../../storybook/with-shadow-portal' import { withShadowPortal } from '../../../../../../.storybook/decorators/with-shadow-portal'
const meta: Meta<typeof NodejsInspectorButton> = { const meta: Meta<typeof NodejsInspectorButton> = {
component: NodejsInspectorButton, component: NodejsInspectorButton,
......
import type { Meta, StoryObj } from '@storybook/react' import type { Meta, StoryObj } from '@storybook/react'
import { ErrorTypeLabel } from './error-type-label' import { ErrorTypeLabel } from './error-type-label'
import { withShadowPortal } from '../../../storybook/with-shadow-portal' import { withShadowPortal } from '../../../../../../.storybook/decorators/with-shadow-portal'
const meta: Meta<typeof ErrorTypeLabel> = { const meta: Meta<typeof ErrorTypeLabel> = {
component: ErrorTypeLabel, component: ErrorTypeLabel,
......
import { type CSSProperties, type Ref, forwardRef } from 'react'
export const Fader = forwardRef(function Fader(
{
stop,
blur,
side,
style,
height,
}: {
stop?: string
blur?: string
height?: number
side: 'top' | 'bottom' | 'left' | 'right'
className?: string
style?: CSSProperties
},
ref: Ref<HTMLDivElement>
) {
return (
<div
ref={ref}
aria-hidden
data-nextjs-scroll-fader
className="nextjs-scroll-fader"
data-side={side}
style={
{
'--stop': stop,
'--blur': blur,
'--height': `${height}px`,
...style,
} as React.CSSProperties
}
/>
)
})
export const FADER_STYLES = `
.nextjs-scroll-fader {
--blur: 1px;
--stop: 25%;
--height: 150px;
--color-bg: var(--color-background-100);
position: absolute;
pointer-events: none;
user-select: none;
width: 100%;
height: var(--height);
left: 0;
backdrop-filter: blur(var(--blur));
&[data-side="top"] {
top: 0;
background: linear-gradient(to top, transparent, var(--color-bg));
mask-image: linear-gradient(to bottom, var(--color-bg) var(--stop), transparent);
}
}
`
import type { Meta, StoryObj } from '@storybook/react' import type { Meta, StoryObj } from '@storybook/react'
import { Terminal } from './terminal' import { Terminal } from './terminal'
import { withShadowPortal } from '../../storybook/with-shadow-portal' import { withShadowPortal } from '../../../../../.storybook/decorators/with-shadow-portal'
const meta: Meta<typeof Terminal> = { const meta: Meta<typeof Terminal> = {
component: Terminal, component: Terminal,
......
import type { Meta, StoryObj } from '@storybook/react' import type { Meta, StoryObj } from '@storybook/react'
import { VersionStalenessInfo } from './version-staleness-info' import { VersionStalenessInfo } from './version-staleness-info'
import { withShadowPortal } from '../../storybook/with-shadow-portal' import { withShadowPortal } from '../../../../../.storybook/decorators/with-shadow-portal'
const meta: Meta<typeof VersionStalenessInfo> = { const meta: Meta<typeof VersionStalenessInfo> = {
component: VersionStalenessInfo, component: VersionStalenessInfo,
......
...@@ -57,12 +57,9 @@ export const styles = ` ...@@ -57,12 +57,9 @@ export const styles = `
align-items: center; align-items: center;
gap: 4px; gap: 4px;
height: var(--size-26); height: var(--size-24);
padding: 6px 8px 6px 6px; padding: 6px 8px 6px 6px;
background: var(--color-background-100); background: var(--color-background-100);
background-clip: padding-box;
border: 1px solid var(--color-gray-alpha-400);
box-shadow: var(--shadow-small);
border-radius: var(--rounded-full); border-radius: var(--rounded-full);
color: var(--color-gray-900); color: var(--color-gray-900);
......
import type { Meta, StoryObj } from '@storybook/react' import type { Meta, StoryObj } from '@storybook/react'
import { BuildError } from './build-error' import { BuildError } from './build-error'
import { withShadowPortal } from '../storybook/with-shadow-portal' import { withShadowPortal } from '../../../../.storybook/decorators/with-shadow-portal'
const meta: Meta<typeof BuildError> = { const meta: Meta<typeof BuildError> = {
component: BuildError, component: BuildError,
...@@ -40,3 +40,22 @@ export const Turbopack: Story = { ...@@ -40,3 +40,22 @@ export const Turbopack: Story = {
isTurbopack: true, isTurbopack: true,
}, },
} }
export const ParseError: Story = {
args: {
message: `./app/page.tsx:3:27
Syntax Error
1 | export default function Page() {
2 | return <div>Hello</div
> 3 | }
| ^
4 |
Expected '>', got '}'
`,
versionInfo: {
installed: '15.0.0',
staleness: 'fresh',
},
},
}
import type { Meta, StoryObj } from '@storybook/react' import type { Meta, StoryObj } from '@storybook/react'
import { Errors } from './errors' import { Errors } from './errors'
import { withShadowPortal } from '../storybook/with-shadow-portal' import { withShadowPortal } from '../../../../.storybook/decorators/with-shadow-portal'
import { lorem } from '../utils/lorem' import { lorem } from '../utils/lorem'
import { runtimeErrors } from '../storybook/errors' import {
instantCurrentTimeErrors,
instantClientMathRandomErrors,
instantCryptoRandomUUIDErrors,
instantMetadataErrors,
instantMetadataUncachedErrors,
instantMathRandomErrors,
instantRuntimeDataErrors,
instantUncachedDataErrors,
instantViewportErrors,
instantViewportUncachedErrors,
runtimeErrors,
} from '../../../../.storybook/fixtures/errors'
const meta: Meta<typeof Errors> = { const meta: Meta<typeof Errors> = {
component: Errors, component: Errors,
...@@ -96,3 +108,73 @@ export const WithHydrationWarning: Story = { ...@@ -96,3 +108,73 @@ export const WithHydrationWarning: Story = {
onClose: () => {}, onClose: () => {},
}, },
} }
export const InstantRuntimeData: Story = {
args: {
...Default.args,
runtimeErrors: instantRuntimeDataErrors,
},
}
export const InstantUncachedData: Story = {
args: {
...Default.args,
runtimeErrors: instantUncachedDataErrors,
},
}
export const InstantGenerateViewport: Story = {
args: {
...Default.args,
runtimeErrors: instantViewportErrors,
},
}
export const InstantGenerateViewportUncached: Story = {
args: {
...Default.args,
runtimeErrors: instantViewportUncachedErrors,
},
}
export const InstantGenerateMetadata: Story = {
args: {
...Default.args,
runtimeErrors: instantMetadataErrors,
},
}
export const InstantGenerateMetadataUncached: Story = {
args: {
...Default.args,
runtimeErrors: instantMetadataUncachedErrors,
},
}
export const InstantCurrentTime: Story = {
args: {
...Default.args,
runtimeErrors: instantCurrentTimeErrors,
},
}
export const InstantMathRandom: Story = {
args: {
...Default.args,
runtimeErrors: instantMathRandomErrors,
},
}
export const InstantCryptoRandomUUID: Story = {
args: {
...Default.args,
runtimeErrors: instantCryptoRandomUUIDErrors,
},
}
export const InstantClientMathRandom: Story = {
args: {
...Default.args,
runtimeErrors: instantClientMathRandomErrors,
},
}
...@@ -21,7 +21,10 @@ import { useActiveRuntimeError } from '../hooks/use-active-runtime-error' ...@@ -21,7 +21,10 @@ import { useActiveRuntimeError } from '../hooks/use-active-runtime-error'
import { formatCodeFrame } from '../components/code-frame/parse-code-frame' import { formatCodeFrame } from '../components/code-frame/parse-code-frame'
import stripAnsi from 'next/dist/compiled/strip-ansi' import stripAnsi from 'next/dist/compiled/strip-ansi'
import { import {
InstantHeaderExplanation,
InstantGuidance, InstantGuidance,
SYNC_IO_CLIENT_DOCS,
SYNC_IO_DOCS,
type GuidanceKind, type GuidanceKind,
type GuidanceVariant, type GuidanceVariant,
} from '../components/instant/instant-guidance' } from '../components/instant/instant-guidance'
...@@ -217,6 +220,7 @@ function InstantRuntimeError({ ...@@ -217,6 +220,7 @@ function InstantRuntimeError({
kind = 'blocking-route', kind = 'blocking-route',
explanation, explanation,
cause, cause,
showExplanation = true,
dialogResizerRef, dialogResizerRef,
}: { }: {
error: ReadyRuntimeError error: ReadyRuntimeError
...@@ -224,6 +228,7 @@ function InstantRuntimeError({ ...@@ -224,6 +228,7 @@ function InstantRuntimeError({
kind?: GuidanceKind kind?: GuidanceKind
explanation?: string explanation?: string
cause?: string cause?: string
showExplanation?: boolean
dialogResizerRef: React.RefObject<HTMLDivElement | null> dialogResizerRef: React.RefObject<HTMLDivElement | null>
}) { }) {
const frames = useFrames(error) const frames = useFrames(error)
...@@ -251,6 +256,7 @@ function InstantRuntimeError({ ...@@ -251,6 +256,7 @@ function InstantRuntimeError({
kind={kind} kind={kind}
explanation={explanation} explanation={explanation}
cause={cause} cause={cause}
showExplanation={showExplanation}
/> />
{frames.length > 0 && ( {frames.length > 0 && (
<ErrorOverlayCallStack <ErrorOverlayCallStack
...@@ -537,6 +543,7 @@ Next.js version: ${props.versionInfo.installed} (${process.env.__NEXT_BUNDLER})\ ...@@ -537,6 +543,7 @@ Next.js version: ${props.versionInfo.installed} (${process.env.__NEXT_BUNDLER})\
? 'Next.js encountered runtime data during the initial render.' ? 'Next.js encountered runtime data during the initial render.'
: 'Next.js encountered uncached data during the initial render.' : 'Next.js encountered uncached data during the initial render.'
} }
headerChildren={<InstantHeaderExplanation kind="blocking-route" />}
onClose={isServerError ? undefined : onClose} onClose={isServerError ? undefined : onClose}
debugInfo={debugInfo} debugInfo={debugInfo}
error={error} error={error}
...@@ -552,6 +559,7 @@ Next.js version: ${props.versionInfo.installed} (${process.env.__NEXT_BUNDLER})\ ...@@ -552,6 +559,7 @@ Next.js version: ${props.versionInfo.installed} (${process.env.__NEXT_BUNDLER})\
key={activeError.id.toString()} key={activeError.id.toString()}
error={activeError} error={activeError}
variant={errorDetails.variant} variant={errorDetails.variant}
showExplanation={false}
dialogResizerRef={dialogResizerRef} dialogResizerRef={dialogResizerRef}
/> />
</Suspense> </Suspense>
...@@ -575,6 +583,7 @@ Next.js version: ${props.versionInfo.installed} (${process.env.__NEXT_BUNDLER})\ ...@@ -575,6 +583,7 @@ Next.js version: ${props.versionInfo.installed} (${process.env.__NEXT_BUNDLER})\
</> </>
) )
} }
headerChildren={<InstantHeaderExplanation kind="metadata" />}
onClose={isServerError ? undefined : onClose} onClose={isServerError ? undefined : onClose}
debugInfo={debugInfo} debugInfo={debugInfo}
error={error} error={error}
...@@ -591,6 +600,7 @@ Next.js version: ${props.versionInfo.installed} (${process.env.__NEXT_BUNDLER})\ ...@@ -591,6 +600,7 @@ Next.js version: ${props.versionInfo.installed} (${process.env.__NEXT_BUNDLER})\
error={activeError} error={activeError}
variant={errorDetails.variant} variant={errorDetails.variant}
kind="metadata" kind="metadata"
showExplanation={false}
dialogResizerRef={dialogResizerRef} dialogResizerRef={dialogResizerRef}
/> />
</Suspense> </Suspense>
...@@ -614,6 +624,7 @@ Next.js version: ${props.versionInfo.installed} (${process.env.__NEXT_BUNDLER})\ ...@@ -614,6 +624,7 @@ Next.js version: ${props.versionInfo.installed} (${process.env.__NEXT_BUNDLER})\
</> </>
) )
} }
headerChildren={<InstantHeaderExplanation kind="viewport" />}
onClose={isServerError ? undefined : onClose} onClose={isServerError ? undefined : onClose}
debugInfo={debugInfo} debugInfo={debugInfo}
error={error} error={error}
...@@ -630,6 +641,7 @@ Next.js version: ${props.versionInfo.installed} (${process.env.__NEXT_BUNDLER})\ ...@@ -630,6 +641,7 @@ Next.js version: ${props.versionInfo.installed} (${process.env.__NEXT_BUNDLER})\
error={activeError} error={activeError}
variant={errorDetails.variant} variant={errorDetails.variant}
kind="viewport" kind="viewport"
showExplanation={false}
dialogResizerRef={dialogResizerRef} dialogResizerRef={dialogResizerRef}
/> />
</Suspense> </Suspense>
...@@ -646,6 +658,12 @@ Next.js version: ${props.versionInfo.installed} (${process.env.__NEXT_BUNDLER})\ ...@@ -646,6 +658,12 @@ Next.js version: ${props.versionInfo.installed} (${process.env.__NEXT_BUNDLER})\
explicit rendering intent. explicit rendering intent.
</> </>
} }
headerChildren={
<InstantHeaderExplanation
explanation="This value can change between renders, so it must be either prerendered or computed later."
docsUrl={SYNC_IO_DOCS[errorDetails.cause]}
/>
}
onClose={isServerError ? undefined : onClose} onClose={isServerError ? undefined : onClose}
debugInfo={debugInfo} debugInfo={debugInfo}
error={error} error={error}
...@@ -663,7 +681,7 @@ Next.js version: ${props.versionInfo.installed} (${process.env.__NEXT_BUNDLER})\ ...@@ -663,7 +681,7 @@ Next.js version: ${props.versionInfo.installed} (${process.env.__NEXT_BUNDLER})\
variant="runtime" variant="runtime"
kind="sync-io" kind="sync-io"
cause={errorDetails.cause} cause={errorDetails.cause}
explanation="This value can change between renders, so it must be either prerendered or computed later." showExplanation={false}
dialogResizerRef={dialogResizerRef} dialogResizerRef={dialogResizerRef}
/> />
</Suspense> </Suspense>
...@@ -680,6 +698,12 @@ Next.js version: ${props.versionInfo.installed} (${process.env.__NEXT_BUNDLER})\ ...@@ -680,6 +698,12 @@ Next.js version: ${props.versionInfo.installed} (${process.env.__NEXT_BUNDLER})\
Component. Component.
</> </>
} }
headerChildren={
<InstantHeaderExplanation
explanation="This value would be evaluated during the prerender and fixed at build time, instead of recomputed on each visit."
docsUrl={SYNC_IO_CLIENT_DOCS[errorDetails.cause]}
/>
}
onClose={isServerError ? undefined : onClose} onClose={isServerError ? undefined : onClose}
debugInfo={debugInfo} debugInfo={debugInfo}
error={error} error={error}
...@@ -697,6 +721,7 @@ Next.js version: ${props.versionInfo.installed} (${process.env.__NEXT_BUNDLER})\ ...@@ -697,6 +721,7 @@ Next.js version: ${props.versionInfo.installed} (${process.env.__NEXT_BUNDLER})\
variant="runtime" variant="runtime"
kind="sync-io-client" kind="sync-io-client"
cause={errorDetails.cause} cause={errorDetails.cause}
showExplanation={false}
dialogResizerRef={dialogResizerRef} dialogResizerRef={dialogResizerRef}
/> />
</Suspense> </Suspense>
...@@ -786,11 +811,10 @@ export const styles = ` ...@@ -786,11 +811,10 @@ export const styles = `
} }
.nextjs__container_errors__error_title { .nextjs__container_errors__error_title {
display: flex; display: flex;
align-items: center; align-items: start;
justify-content: space-between; justify-content: space-between;
flex-wrap: wrap; gap: 12px;
gap: 8px; position: relative;
margin-bottom: 14px;
} }
.error-overlay-notes-container { .error-overlay-notes-container {
margin: 8px 2px; margin: 8px 2px;
...@@ -798,6 +822,11 @@ export const styles = ` ...@@ -798,6 +822,11 @@ export const styles = `
.error-overlay-notes-container p { .error-overlay-notes-container p {
white-space: pre-wrap; white-space: pre-wrap;
} }
@media (max-width: 767px) {
.nextjs__container_errors__error_title {
flex-direction: column-reverse;
}
}
.external-link, .external-link:hover { .external-link, .external-link:hover {
color:inherit; color:inherit;
} }
......
import type { Meta, StoryObj } from '@storybook/react' import type { Meta, StoryObj } from '@storybook/react'
import { PseudoHtmlDiff } from './component-stack-pseudo-html' import { PseudoHtmlDiff } from './component-stack-pseudo-html'
import { withShadowPortal } from '../../storybook/with-shadow-portal' import { withShadowPortal } from '../../../../../.storybook/decorators/with-shadow-portal'
const meta: Meta<typeof PseudoHtmlDiff> = { const meta: Meta<typeof PseudoHtmlDiff> = {
component: PseudoHtmlDiff, component: PseudoHtmlDiff,
......
...@@ -5,11 +5,11 @@ import type { OverlayState } from './shared' ...@@ -5,11 +5,11 @@ import type { OverlayState } from './shared'
import imgApp from './app.png' import imgApp from './app.png'
import { DevOverlay } from './dev-overlay' import { DevOverlay } from './dev-overlay'
import { errors } from './storybook/errors' import { errors } from '../../../.storybook/fixtures/errors'
import { import {
storybookDefaultOverlayState, storybookDefaultOverlayState,
useStorybookOverlayReducer, useStorybookOverlayReducer,
} from './storybook/use-overlay-reducer' } from '../../../.storybook/decorators/use-overlay-reducer'
import { DevOverlayContext, useDevOverlayContext } from '../dev-overlay.browser' import { DevOverlayContext, useDevOverlayContext } from '../dev-overlay.browser'
const meta: Meta<typeof DevOverlay> = { const meta: Meta<typeof DevOverlay> = {
......
...@@ -22,18 +22,16 @@ export function SourceMappingErrorIcon(props: React.SVGProps<SVGSVGElement>) { ...@@ -22,18 +22,16 @@ export function SourceMappingErrorIcon(props: React.SVGProps<SVGSVGElement>) {
return ( return (
<svg <svg
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
height="16"
strokeLinejoin="round"
viewBox="-4 -4 24 24"
width="16" width="16"
height="16"
viewBox="0 0 16 16"
fill="none"
{...props} {...props}
> >
<path <path
fillRule="evenodd" d="M8.13748 3C8.69243 3.00017 9.20256 3.30665 9.46267 3.79688L13.5642 11.5312C13.9172 12.1971 13.434 12.9997 12.6804 13H3.32595C2.57197 13 2.08881 12.1973 2.44217 11.5312L6.54763 3.79688C6.80787 3.30678 7.31792 3.00005 7.87283 3H8.13748ZM4.15701 11.5H11.8494L8.13748 4.5H7.87283L4.15701 11.5ZM8.00857 9.55176C8.38926 9.55189 8.69788 9.86053 8.69802 10.2412C8.69802 10.622 8.38935 10.9305 8.00857 10.9307C7.62768 10.9307 7.31912 10.6221 7.31912 10.2412C7.31926 9.86045 7.62777 9.55176 8.00857 9.55176ZM8.75467 9H7.25467V6.25H8.75467V9Z"
clipRule="evenodd"
d="M8.55846 2H7.44148L1.88975 13.5H14.1102L8.55846 2ZM9.90929 1.34788C9.65902 0.829456 9.13413 0.5 8.55846 0.5H7.44148C6.86581 0.5 6.34092 0.829454 6.09065 1.34787L0.192608 13.5653C-0.127943 14.2293 0.355835 15 1.09316 15H14.9068C15.6441 15 16.1279 14.2293 15.8073 13.5653L9.90929 1.34788ZM8.74997 4.75V5.5V8V8.75H7.24997V8V5.5V4.75H8.74997ZM7.99997 12C8.55226 12 8.99997 11.5523 8.99997 11C8.99997 10.4477 8.55226 10 7.99997 10C7.44769 10 6.99997 10.4477 6.99997 11C6.99997 11.5523 7.44769 12 7.99997 12Z"
fill="currentColor" fill="currentColor"
></path> />
</svg> </svg>
) )
} }
const ICON_PROPS = {
width: 16,
height: 16,
viewBox: '0 0 24 24',
fill: 'none',
stroke: 'currentColor',
strokeWidth: 2,
strokeLinecap: 'round' as const,
strokeLinejoin: 'round' as const,
}
export function FixCardAlignLeftIcon() {
return (
<svg {...ICON_PROPS}>
<path d="M3 6h18M3 12h12M3 18h18" />
</svg>
)
}
export function FixCardServerStackIcon() {
return (
<svg
width="16"
height="16"
viewBox="0 0 16 16"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
fill="currentColor"
fillRule="evenodd"
clipRule="evenodd"
d="M13.5 1.5h-11v3a1 1 0 0 0 1 1h9a1 1 0 0 0 1-1zM15 0H1v4.5A2.5 2.5 0 0 0 3.5 7h9A2.5 2.5 0 0 0 15 4.5V0M2.5 13.5v-3h11v3a1 1 0 0 1-1 1h-9a1 1 0 0 1-1-1M1 9h14v4.5a2.5 2.5 0 0 1-2.5 2.5h-9A2.5 2.5 0 0 1 1 13.5V9m3.75 4.25a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5M8 12.5a.75.75 0 1 1-1.5 0 .75.75 0 0 1 1.5 0m2.5-9a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0m-1.75.75a.75.75 0 1 1 0-1.5.75.75 0 0 1 0 1.5"
/>
</svg>
)
}
export function FixCardHistoryIcon() {
return (
<svg {...ICON_PROPS}>
<path d="M3 12a9 9 0 109-9 9.75 9.75 0 00-6.74 2.74L3 8" />
<path d="M3 3v5h5" />
<path d="M12 7v5l4 2" />
</svg>
)
}
export function FixCardOctagonIcon() {
return (
<svg
width="16"
height="16"
viewBox="0 0 16 16"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
fill="currentColor"
fillRule="evenodd"
clipRule="evenodd"
d="M14.5 8a6.5 6.5 0 1 1-13 0 6.5 6.5 0 0 1 13 0M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0m-5.5-2.5h-5v5h5z"
/>
</svg>
)
}
export function FixCardLayoutIcon() {
return (
<svg
width="16"
height="16"
viewBox="0 0 16 16"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
fill="currentColor"
fillRule="evenodd"
clipRule="evenodd"
d="M0 2a1 1 0 0 1 1-1h14a1 1 0 0 1 1 1v8.5a1 1 0 0 1-1 1H8.75v3h1.75V16h-5v-1.5h1.75v-3H1a1 1 0 0 1-1-1zm1.5.5V10h13V2.5z"
/>
</svg>
)
}
export function FixCardZapIcon() {
return (
<svg
width="16"
height="16"
viewBox="0 0 16 16"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
fill="currentColor"
fillRule="evenodd"
clipRule="evenodd"
d="M6.94 2.06 8 1l1.06 1.06 4.88 4.88L15 8l-1.06 1.06-4.88 4.88L8 15l-1.06-1.06-4.88-4.88L1 8l1.06-1.06zM3.12 8 8 12.88 12.88 8 8 3.12z"
/>
</svg>
)
}
export function FixCardTimerIcon() {
return (
<svg
width="16"
height="16"
viewBox="0 0 16 16"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
fill="currentColor"
fillRule="evenodd"
clipRule="evenodd"
d="M7.25 1.25v.79a7 7 0 0 0-3.64 1.5l-.58-.57-.53-.53L1.44 3.5l.53.53.58.58a7 7 0 1 0 10.9 0l.58-.58.53-.53-1.06-1.06-.53.53-.58.58a7 7 0 0 0-3.64-1.51v-.79H10v-1.5H6v1.5h1.25M2.5 9a5.5 5.5 0 1 1 11 0 5.5 5.5 0 0 1-11 0m6.25-2.25V6h-1.5v3.75h1.5v-3"
/>
</svg>
)
}
export function FixCardDatabaseIcon() {
return (
<svg
width="16"
height="16"
viewBox="0 0 16 16"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
fill="currentColor"
fillRule="evenodd"
clipRule="evenodd"
d="M3.3.79C4.54.29 6.2 0 8 0s3.46.29 4.7.79a5 5 0 0 1 1.57.94c.41.39.73.9.73 1.52v9.5a2 2 0 0 1-.73 1.52 5 5 0 0 1-1.57.94c-1.24.5-2.9.79-4.7.79s-3.46-.29-4.7-.79a5 5 0 0 1-1.57-.94A2 2 0 0 1 1 12.75v-9.5c0-.62.32-1.13.73-1.52A5 5 0 0 1 3.3.8m-.8 4.54V8c0 .07.03.22.26.43q.33.33 1.1.64c1.02.41 2.49.68 4.14.68s3.12-.27 4.14-.68q.77-.31 1.1-.64c.23-.21.26-.36.26-.43V5.33a6 6 0 0 1-.8.38c-1.24.5-2.9.79-4.7.79s-3.46-.29-4.7-.79a6 6 0 0 1-.8-.38m11-2.08c0 .07-.03.22-.26.43q-.33.33-1.1.64C11.12 4.73 9.65 5 8 5s-3.12-.27-4.14-.68q-.77-.31-1.1-.64c-.23-.21-.26-.36-.26-.43s.03-.22.26-.43q.33-.33 1.1-.64C4.88 1.77 6.35 1.5 8 1.5s3.12.27 4.14.68q.77.31 1.1.64c.23.21.26.36.26.43m0 6.83a6 6 0 0 1-.8.38c-1.24.5-2.9.79-4.7.79s-3.46-.29-4.7-.79a6 6 0 0 1-.8-.38v2.67c0 .07.03.22.26.43q.33.33 1.1.64c1.02.41 2.49.68 4.14.68s3.12-.27 4.14-.68q.77-.31 1.1-.64c.23-.21.26-.36.26-.43z"
/>
</svg>
)
}
export function FixCardPointerClickIcon() {
return (
<svg
width="16"
height="16"
viewBox="0 0 16 16"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
fill="currentColor"
fillRule="evenodd"
clipRule="evenodd"
d="M5.5 2V0H7v2zm-4.53.03 1.5 1.5 1.06-1.06-1.5-1.5zm3.28 2.22.55 1.5 3 8.26.67 1.84.73-1.82 1.07-2.7 3.2 3.2 1.06-1.06-3.2-3.2 2.7-1.07 1.82-.73-1.84-.67-8.25-3zm7.4 4.28-1.53.61q-.7.29-.98.98l-.6 1.53-1.79-4.9zM0 7h2V5.5H0z"
/>
</svg>
)
}
...@@ -90,6 +90,18 @@ ...@@ -90,6 +90,18 @@
--color-blue-900: #0067d6; --color-blue-900: #0067d6;
--color-blue-1000: #0025ad; --color-blue-1000: #0025ad;
/* Purple Scale Light */
--color-purple-100: #f9f3fd;
--color-purple-200: #f8f2fd;
--color-purple-300: #f1ecfb;
--color-purple-400: #eadff7;
--color-purple-500: #d4bced;
--color-purple-600: #bd92e9;
--color-purple-700: #8250dc;
--color-purple-800: #6f47c4;
--color-purple-900: #6a2db5;
--color-purple-1000: #2e004d;
/* Red Scale Light */ /* Red Scale Light */
--color-red-100: #fff0f0; --color-red-100: #fff0f0;
--color-red-200: #ffebeb; --color-red-200: #ffebeb;
......
import { CODE_FRAME_STYLES } from '../components/code-frame/code-frame' import { CODE_FRAME_STYLES } from '../components/code-frame/code-frame'
import { styles as dialog } from '../components/dialog' import { styles as dialog } from '../components/dialog'
import { styles as errorLayout } from '../components/errors/error-overlay-layout/error-overlay-layout' import { styles as errorLayout } from '../components/errors/error-overlay-layout/error-overlay-layout'
import { styles as bottomStack } from '../components/errors/error-overlay-bottom-stack'
import { styles as pagination } from '../components/errors/error-overlay-pagination/error-overlay-pagination' import { styles as pagination } from '../components/errors/error-overlay-pagination/error-overlay-pagination'
import { styles as overlay } from '../components/overlay/styles' import { styles as overlay } from '../components/overlay/styles'
import { styles as footer } from '../components/errors/error-overlay-footer/error-overlay-footer' import { styles as footer } from '../components/errors/error-overlay-footer/error-overlay-footer'
...@@ -16,7 +15,6 @@ import { css } from '../utils/css' ...@@ -16,7 +15,6 @@ import { css } from '../utils/css'
import { EDITOR_LINK_STYLES } from '../components/terminal/editor-link' import { EDITOR_LINK_STYLES } from '../components/terminal/editor-link'
import { ENVIRONMENT_NAME_LABEL_STYLES } from '../components/errors/environment-name-label/environment-name-label' import { ENVIRONMENT_NAME_LABEL_STYLES } from '../components/errors/environment-name-label/environment-name-label'
import { DEV_TOOLS_INFO_USER_PREFERENCES_STYLES } from '../components/errors/dev-tools-indicator/dev-tools-info/user-preferences' import { DEV_TOOLS_INFO_USER_PREFERENCES_STYLES } from '../components/errors/dev-tools-indicator/dev-tools-info/user-preferences'
import { FADER_STYLES } from '../components/fader'
import { CALL_STACK_STYLES } from '../components/call-stack/call-stack' import { CALL_STACK_STYLES } from '../components/call-stack/call-stack'
import { SHORTCUT_RECORDER_STYLES } from '../components/errors/dev-tools-indicator/dev-tools-info/shortcut-recorder' import { SHORTCUT_RECORDER_STYLES } from '../components/errors/dev-tools-indicator/dev-tools-info/shortcut-recorder'
import { INSTANT_GUIDANCE_STYLES } from '../components/instant/instant-guidance' import { INSTANT_GUIDANCE_STYLES } from '../components/instant/instant-guidance'
...@@ -33,7 +31,6 @@ export function ComponentStyles() { ...@@ -33,7 +31,6 @@ export function ComponentStyles() {
${dialog} ${dialog}
${errorLayout} ${errorLayout}
${footer} ${footer}
${bottomStack}
${pagination} ${pagination}
${CODE_FRAME_STYLES} ${CODE_FRAME_STYLES}
${TERMINAL_STYLES} ${TERMINAL_STYLES}
...@@ -43,7 +40,6 @@ export function ComponentStyles() { ...@@ -43,7 +40,6 @@ export function ComponentStyles() {
${containerRuntimeErrorStyles} ${containerRuntimeErrorStyles}
${versionStaleness} ${versionStaleness}
${DEV_TOOLS_INFO_USER_PREFERENCES_STYLES} ${DEV_TOOLS_INFO_USER_PREFERENCES_STYLES}
${FADER_STYLES}
${SHORTCUT_RECORDER_STYLES} ${SHORTCUT_RECORDER_STYLES}
${INSTANT_GUIDANCE_STYLES} ${INSTANT_GUIDANCE_STYLES}
`} `}
......
...@@ -57,6 +57,18 @@ ...@@ -57,6 +57,18 @@
--color-blue-900: #52a9ff; --color-blue-900: #52a9ff;
--color-blue-1000: #eaf6ff; --color-blue-1000: #eaf6ff;
/* Purple Scale Dark */
--color-purple-100: #391c4a;
--color-purple-200: #422154;
--color-purple-300: #53306a;
--color-purple-400: #5f3a79;
--color-purple-500: #6d4790;
--color-purple-600: #8e63d2;
--color-purple-700: #8e63d2;
--color-purple-800: #7d53c4;
--color-purple-900: #c79bfb;
--color-purple-1000: #f7f0ff;
/* Red Scale Dark */ /* Red Scale Dark */
--color-red-100: #2a1314; --color-red-100: #2a1314;
--color-red-200: #3d1719; --color-red-200: #3d1719;
...@@ -172,6 +184,18 @@ ...@@ -172,6 +184,18 @@
--color-blue-900: #52a9ff; --color-blue-900: #52a9ff;
--color-blue-1000: #eaf6ff; --color-blue-1000: #eaf6ff;
/* Purple Scale Dark */
--color-purple-100: #391c4a;
--color-purple-200: #422154;
--color-purple-300: #53306a;
--color-purple-400: #5f3a79;
--color-purple-500: #6d4790;
--color-purple-600: #8e63d2;
--color-purple-700: #8e63d2;
--color-purple-800: #7d53c4;
--color-purple-900: #c79bfb;
--color-purple-1000: #f7f0ff;
/* Red Scale Dark */ /* Red Scale Dark */
--color-red-100: #2a1314; --color-red-100: #2a1314;
--color-red-200: #3d1719; --color-red-200: #3d1719;
......
...@@ -1182,7 +1182,7 @@ export function getRedboxTitle(browser: Playwright): Promise<string | null> { ...@@ -1182,7 +1182,7 @@ export function getRedboxTitle(browser: Playwright): Promise<string | null> {
const root = portal.shadowRoot const root = portal.shadowRoot
return ( return (
root.querySelector( root.querySelector(
'[data-nextjs-dialog-header] .nextjs__container_errors__error_title' '[data-nextjs-dialog-header] [data-nextjs-error-label-group]'
)?.innerText ?? null )?.innerText ?? null
) )
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment