Unverified Commit 7085190f authored by Jiwon Choi's avatar Jiwon Choi Committed by GitHub

[dev-overlay] restructure dev-overlay project (#76291)

- Moved source files from `_experimental/` to `ui/`.
- Moved `dev-indicators` sources out of `internal/`.
- Renamed files and variables to have explicit `app-`, `App`, `pages-`
or `Pages` prefixes for better distinguish.
  - Updated snapshots that were caused by the name change.
- Added better type to `next-runtime.webpack-config.js`.
- Moved `font/` out of `ui/`.

---------
Co-authored-by: 's avatarJiachi Liu <inbox@huozhi.im>
Co-authored-by: 's avatarJimmy Lai <laijimmy0@gmail.com>
parent 7c8e2b4e
......@@ -10,11 +10,7 @@ function getAbsolutePath(value: string): any {
return dirname(require.resolve(join(value, 'package.json')))
}
const config: StorybookConfig = {
stories: [
// Could to '../src/**/*.stories.@(ts|tsx)', but not sure how much it'll affect perf.
// Scoped to experimental dev overlay for now.
'../src/client/components/react-dev-overlay/_experimental/**/*.stories.@(ts|tsx)',
],
stories: ['../src/client/components/react-dev-overlay/ui/**/*.stories.tsx'],
addons: [
getAbsolutePath('@storybook/addon-webpack5-compiler-swc'),
getAbsolutePath('@storybook/addon-essentials'),
......
......@@ -127,7 +127,16 @@ const bundleTypes = {
},
}
module.exports = ({ dev, turbo, bundleType, experimental }) => {
/**
* @param {Object} options
* @param {boolean} options.dev
* @param {boolean} options.turbo
* @param {keyof typeof bundleTypes} options.bundleType
* @param {boolean} options.experimental
* @param {Partial<webpack.Configuration>} options.rest
* @returns {webpack.Configuration}
*/
module.exports = ({ dev, turbo, bundleType, experimental, ...rest }) => {
const externalHandler = ({ context, request, getResolve }, callback) => {
;(async () => {
if (
......@@ -166,7 +175,6 @@ module.exports = ({ dev, turbo, bundleType, experimental }) => {
const bundledReactChannel = experimental ? '-experimental' : ''
/** @type {webpack.Configuration} */
return {
entry: bundleTypes[bundleType],
target: 'node',
......@@ -308,6 +316,7 @@ module.exports = ({ dev, turbo, bundleType, experimental }) => {
experiments: {
layers: true,
},
...rest,
}
}
......
......@@ -2,7 +2,7 @@ import { bold, red, yellow } from '../../lib/picocolors'
import stripAnsi from 'next/dist/compiled/strip-ansi'
import textTable from 'next/dist/compiled/text-table'
import createStore from 'next/dist/compiled/unistore'
import formatWebpackMessages from '../../client/components/react-dev-overlay/_experimental/internal/helpers/format-webpack-messages'
import formatWebpackMessages from '../../client/components/react-dev-overlay/utils/format-webpack-messages'
import { store as consoleStore } from './store'
import type { OutputState } from './store'
import type { webpack } from 'next/dist/compiled/webpack/webpack'
......
import type { webpack } from 'next/dist/compiled/webpack/webpack'
import { stringBufferUtils } from 'next/dist/compiled/webpack-sources3'
import { red } from '../../lib/picocolors'
import formatWebpackMessages from '../../client/components/react-dev-overlay/_experimental/internal/helpers/format-webpack-messages'
import formatWebpackMessages from '../../client/components/react-dev-overlay/utils/format-webpack-messages'
import { nonNullable } from '../../lib/non-nullable'
import type { COMPILER_INDEXES } from '../../shared/lib/constants'
import {
......
......@@ -8,7 +8,7 @@ import { PHASE_INFO } from '../shared/lib/constants'
import loadConfig from '../server/config'
import { getRegistry } from '../lib/helpers/get-registry'
import { parseVersionInfo } from '../server/dev/parse-version-info'
import { getStaleness } from '../client/components/react-dev-overlay/_experimental/internal/components/version-staleness-info/version-staleness-info'
import { getStaleness } from '../client/components/react-dev-overlay/ui/components/version-staleness-info/version-staleness-info'
import { warn } from '../build/output/log'
export type NextInfoOptions = {
......
TODO
### Folder Structure
- `ui` - This should be isolated from the rest of the codebase to make it easier to be excluded from compiliation and be bundled.
import type { OverlayState } from '../../shared'
import type { GlobalErrorComponent } from '../../../error-boundary'
import { useState } from 'react'
import { DevOverlayErrorBoundary } from './error-boundary'
import { ShadowPortal } from '../internal/components/shadow-portal'
import { Base } from '../internal/styles/base'
import { ComponentStyles } from '../internal/styles/component-styles'
import { CssReset } from '../internal/styles/css-reset'
import { Colors } from '../internal/styles/colors'
import { ErrorOverlay } from '../internal/components/errors/error-overlay/error-overlay'
import { DevToolsIndicator } from '../internal/components/errors/dev-tools-indicator/dev-tools-indicator'
import { RenderError } from '../internal/container/runtime-error/render-error'
import { FontStyles } from '../font/font-styles'
export default function ReactDevOverlay({
state,
globalError,
children,
}: {
state: OverlayState
globalError: [GlobalErrorComponent, React.ReactNode]
children: React.ReactNode
}) {
const [isErrorOverlayOpen, setIsErrorOverlayOpen] = useState(false)
const devOverlay = (
<>
{/* Fonts can only be loaded outside the Shadow DOM. */}
<FontStyles />
<ShadowPortal>
<CssReset />
<Base />
<Colors />
<ComponentStyles />
<RenderError state={state} isAppDir={true}>
{({ runtimeErrors, totalErrorCount }) => {
const isBuildError = runtimeErrors.length === 0
return (
<>
<DevToolsIndicator
state={state}
errorCount={totalErrorCount}
isBuildError={isBuildError}
setIsErrorOverlayOpen={setIsErrorOverlayOpen}
/>
<ErrorOverlay
state={state}
runtimeErrors={runtimeErrors}
isErrorOverlayOpen={isErrorOverlayOpen}
setIsErrorOverlayOpen={setIsErrorOverlayOpen}
/>
</>
)
}}
</RenderError>
</ShadowPortal>
</>
)
return (
<DevOverlayErrorBoundary
devOverlay={devOverlay}
globalError={globalError}
onError={setIsErrorOverlayOpen}
>
{children}
</DevOverlayErrorBoundary>
)
}
import * as React from 'react'
import { useState } from 'react'
import { ShadowPortal } from '../internal/components/shadow-portal'
import { Base } from '../internal/styles/base'
import { ComponentStyles } from '../internal/styles/component-styles'
import { CssReset } from '../internal/styles/css-reset'
import { DevOverlayErrorBoundary } from './error-boundary'
import { usePagesReactDevOverlay } from '../../pages/hooks'
import { Colors } from '../internal/styles/colors'
import { ErrorOverlay } from '../internal/components/errors/error-overlay/error-overlay'
import { DevToolsIndicator } from '../internal/components/errors/dev-tools-indicator/dev-tools-indicator'
import { RenderError } from '../internal/container/runtime-error/render-error'
import { FontStyles } from '../font/font-styles'
export type ErrorType = 'runtime' | 'build'
interface ReactDevOverlayProps {
children?: React.ReactNode
}
export default function ReactDevOverlay({ children }: ReactDevOverlayProps) {
const { state, onComponentError, hasRuntimeErrors, hasBuildError } =
usePagesReactDevOverlay()
const [isErrorOverlayOpen, setIsErrorOverlayOpen] = useState(true)
return (
<>
<DevOverlayErrorBoundary onError={onComponentError}>
{children ?? null}
</DevOverlayErrorBoundary>
{/* Fonts can only be loaded outside the Shadow DOM. */}
<FontStyles />
<ShadowPortal>
<CssReset />
<Base />
<Colors />
<ComponentStyles />
<RenderError state={state} isAppDir={false}>
{({ runtimeErrors, totalErrorCount }) => {
const isBuildError = runtimeErrors.length === 0
return (
<>
<DevToolsIndicator
state={state}
errorCount={totalErrorCount}
isBuildError={isBuildError}
setIsErrorOverlayOpen={setIsErrorOverlayOpen}
/>
{(hasRuntimeErrors || hasBuildError) && (
<ErrorOverlay
state={state}
runtimeErrors={runtimeErrors}
isErrorOverlayOpen={isErrorOverlayOpen}
setIsErrorOverlayOpen={setIsErrorOverlayOpen}
/>
)}
</>
)
}}
</RenderError>
</ShadowPortal>
</>
)
}
import type { GlobalErrorComponent } from '../../../error-boundary'
import type { GlobalErrorComponent } from '../../error-boundary'
import { PureComponent } from 'react'
import { RuntimeErrorHandler } from '../../../errors/runtime-error-handler'
import { RuntimeErrorHandler } from '../../errors/runtime-error-handler'
type DevOverlayErrorBoundaryProps = {
type AppDevOverlayErrorBoundaryProps = {
children: React.ReactNode
devOverlay: React.ReactNode
globalError: [GlobalErrorComponent, React.ReactNode]
onError: (value: boolean) => void
}
type DevOverlayErrorBoundaryState = {
type AppDevOverlayErrorBoundaryState = {
isReactError: boolean
reactError: unknown
}
......@@ -38,9 +38,9 @@ function ErroredHtml({
)
}
export class DevOverlayErrorBoundary extends PureComponent<
DevOverlayErrorBoundaryProps,
DevOverlayErrorBoundaryState
export class AppDevOverlayErrorBoundary extends PureComponent<
AppDevOverlayErrorBoundaryProps,
AppDevOverlayErrorBoundaryState
> {
state = { isReactError: false, reactError: null }
......
import type { OverlayState } from '../shared'
import type { GlobalErrorComponent } from '../../error-boundary'
import { useState } from 'react'
import { AppDevOverlayErrorBoundary } from './app-dev-overlay-error-boundary'
import { FontStyles } from '../font/font-styles'
import { DevOverlay } from '../ui/dev-overlay'
export function AppDevOverlay({
state,
globalError,
children,
}: {
state: OverlayState
globalError: [GlobalErrorComponent, React.ReactNode]
children: React.ReactNode
}) {
const [isErrorOverlayOpen, setIsErrorOverlayOpen] = useState(false)
const devOverlay = (
<>
{/* Fonts can only be loaded outside the Shadow DOM. */}
<FontStyles />
<DevOverlay
state={state}
isErrorOverlayOpen={isErrorOverlayOpen}
setIsErrorOverlayOpen={setIsErrorOverlayOpen}
/>
</>
)
return (
<AppDevOverlayErrorBoundary
devOverlay={devOverlay}
globalError={globalError}
onError={setIsErrorOverlayOpen}
>
{children}
</AppDevOverlayErrorBoundary>
)
}
import React from 'react'
import ReactDevOverlay from './react-dev-overlay'
import { getSocketUrl } from '../_experimental/internal/helpers/get-socket-url'
import { AppDevOverlay } from './app-dev-overlay'
import { getSocketUrl } from '../utils/get-socket-url'
import { INITIAL_OVERLAY_STATE } from '../shared'
import { HMR_ACTIONS_SENT_TO_BROWSER } from '../../../../server/dev/hot-reloader-types'
import GlobalError from '../../error-boundary'
......@@ -41,12 +41,12 @@ export function createRootLevelDevOverlayElement(reactEl: React.ReactElement) {
return (
<FallbackLayout>
<ReactDevOverlay
<AppDevOverlay
state={{ ...INITIAL_OVERLAY_STATE, rootLayoutMissingTags }}
globalError={[GlobalError, null]}
>
{reactEl}
</ReactDevOverlay>
</AppDevOverlay>
</FallbackLayout>
)
}
......@@ -8,7 +8,7 @@ import {
useSyncExternalStore,
} from 'react'
import stripAnsi from 'next/dist/compiled/strip-ansi'
import formatWebpackMessages from '../_experimental/internal/helpers/format-webpack-messages'
import formatWebpackMessages from '../utils/format-webpack-messages'
import { useRouter } from '../../navigation'
import {
ACTION_BEFORE_REFRESH,
......@@ -22,8 +22,8 @@ import {
ACTION_VERSION_INFO,
useErrorOverlayReducer,
} from '../shared'
import { parseStack } from '../_experimental/internal/helpers/parse-stack'
import ReactDevOverlay from './react-dev-overlay'
import { parseStack } from '../utils/parse-stack'
import { AppDevOverlay } from './app-dev-overlay'
import { useErrorHandler } from '../../errors/use-error-handler'
import { RuntimeErrorHandler } from '../../errors/runtime-error-handler'
import {
......@@ -31,8 +31,8 @@ import {
useTurbopack,
useWebsocket,
useWebsocketPing,
} from '../_experimental/internal/helpers/use-websocket'
import { parseComponentStack } from '../_experimental/internal/helpers/parse-component-stack'
} from '../utils/use-websocket'
import { parseComponentStack } from '../utils/parse-component-stack'
import type { VersionInfo } from '../../../../server/dev/parse-version-info'
import { HMR_ACTIONS_SENT_TO_BROWSER } from '../../../../server/dev/hot-reloader-types'
import type {
......@@ -704,9 +704,9 @@ export default function HotReload({
if (shouldRenderErrorOverlay) {
return (
<ReactDevOverlay state={state} globalError={globalError}>
<AppDevOverlay state={state} globalError={globalError}>
{children}
</ReactDevOverlay>
</AppDevOverlay>
)
}
......
import NewReactDevOverlay from '../_experimental/app/react-dev-overlay'
export default NewReactDevOverlay
import { noop as css } from '../internal/helpers/noop-template'
import { noop as css } from '../utils/noop-template'
import { useInsertionEffect } from 'react'
export const FontStyles = () => {
......
......@@ -2,8 +2,8 @@ import type { ServerResponse, IncomingMessage } from 'http'
import path from 'path'
import * as fs from 'fs/promises'
import { constants } from 'fs'
import * as Log from '../../../../../build/output/log'
import { middlewareResponse } from '../../server/middleware-response'
import * as Log from '../../../../build/output/log'
import { middlewareResponse } from '../server/middleware-response'
const FONT_PREFIX = '/__nextjs_font/'
......
import * as Bus from './bus'
import { parseStack } from '../_experimental/internal/helpers/parse-stack'
import { parseComponentStack } from '../_experimental/internal/helpers/parse-component-stack'
import { parseStack } from '../utils/parse-stack'
import { parseComponentStack } from '../utils/parse-component-stack'
import {
hydrationErrorState,
storeHydrationErrorStateFromConsoleArgs,
......@@ -138,6 +138,5 @@ export function onVersionInfo(versionInfo: VersionInfo) {
Bus.emit({ type: ACTION_VERSION_INFO, versionInfo })
}
export { getErrorByType } from '../_experimental/internal/helpers/get-error-by-type'
export { getServerError } from '../_experimental/internal/helpers/node-stack-frames'
export { default as ReactDevOverlay } from './react-dev-overlay'
export { getErrorByType } from '../utils/get-error-by-type'
export { getServerError } from '../utils/node-stack-frames'
import * as React from 'react'
type ErrorBoundaryProps = {
children?: React.ReactNode
onError: (error: Error, componentStack: string | null) => void
}
type ErrorBoundaryState = { error: Error | null }
export class ErrorBoundary extends React.PureComponent<
ErrorBoundaryProps,
ErrorBoundaryState
> {
state = { error: null }
static getDerivedStateFromError(error: Error) {
return { error }
}
componentDidCatch(
error: Error,
// Loosely typed because it depends on the React version and was
// accidentally excluded in some versions.
errorInfo?: { componentStack?: string | null }
) {
this.props.onError(error, errorInfo?.componentStack || null)
this.setState({ error })
}
// Explicit type is needed to avoid the generated `.d.ts` having a wide return type that could be specific to the `@types/react` version.
render(): React.ReactNode {
// The component has to be unmounted or else it would continue to error
return this.state.error ? null : this.props.children
}
}
......@@ -2,7 +2,7 @@ import React from 'react'
import * as Bus from './bus'
import { useErrorOverlayReducer } from '../shared'
export const usePagesReactDevOverlay = () => {
export const usePagesDevOverlay = () => {
const [state, dispatch] = useErrorOverlayReducer()
React.useEffect(() => {
......@@ -19,12 +19,7 @@ export const usePagesReactDevOverlay = () => {
[]
)
const hasBuildError = state.buildError != null
const hasRuntimeErrors = Boolean(state.errors.length)
return {
hasBuildError,
hasRuntimeErrors,
state,
onComponentError,
}
......
......@@ -38,7 +38,7 @@ import {
} from './client'
import stripAnsi from 'next/dist/compiled/strip-ansi'
import { addMessageListener, sendMessage } from './websocket'
import formatWebpackMessages from '../_experimental/internal/helpers/format-webpack-messages'
import formatWebpackMessages from '../utils/format-webpack-messages'
import { HMR_ACTIONS_SENT_TO_BROWSER } from '../../../../server/dev/hot-reloader-types'
import type {
HMR_ACTION_TYPES,
......
import * as React from 'react'
import React from 'react'
type DevOverlayErrorBoundaryProps = {
type PagesDevOverlayErrorBoundaryProps = {
children?: React.ReactNode
onError: (error: Error, componentStack: string | null) => void
}
type DevOverlayErrorBoundaryState = { error: Error | null }
type PagesDevOverlayErrorBoundaryState = { error: Error | null }
export class DevOverlayErrorBoundary extends React.PureComponent<
DevOverlayErrorBoundaryProps,
DevOverlayErrorBoundaryState
export class PagesDevOverlayErrorBoundary extends React.PureComponent<
PagesDevOverlayErrorBoundaryProps,
PagesDevOverlayErrorBoundaryState
> {
state = { error: null }
......
import { useState } from 'react'
import { PagesDevOverlayErrorBoundary } from './pages-dev-overlay-error-boundary'
import { usePagesDevOverlay } from './hooks'
import { FontStyles } from '../font/font-styles'
import { DevOverlay } from '../ui/dev-overlay'
export type ErrorType = 'runtime' | 'build'
export type PagesDevOverlayType = typeof PagesDevOverlay
interface PagesDevOverlayProps {
children?: React.ReactNode
}
export function PagesDevOverlay({ children }: PagesDevOverlayProps) {
const { state, onComponentError } = usePagesDevOverlay()
const [isErrorOverlayOpen, setIsErrorOverlayOpen] = useState(true)
return (
<>
<PagesDevOverlayErrorBoundary onError={onComponentError}>
{children ?? null}
</PagesDevOverlayErrorBoundary>
{/* Fonts can only be loaded outside the Shadow DOM. */}
<FontStyles />
<DevOverlay
state={state}
isErrorOverlayOpen={isErrorOverlayOpen}
setIsErrorOverlayOpen={setIsErrorOverlayOpen}
/>
</>
)
}
import NewReactDevOverlay from '../_experimental/pages/react-dev-overlay'
const ReactDevOverlay = NewReactDevOverlay
export type ReactDevOverlayType = typeof ReactDevOverlay
export default ReactDevOverlay
......@@ -2,7 +2,7 @@ import {
HMR_ACTIONS_SENT_TO_BROWSER,
type HMR_ACTION_TYPES,
} from '../../../../server/dev/hot-reloader-types'
import { getSocketUrl } from '../_experimental/internal/helpers/get-socket-url'
import { getSocketUrl } from '../utils/get-socket-url'
let source: WebSocket
......
......@@ -9,7 +9,7 @@ import { middlewareResponse } from './middleware-response'
import fs, { constants as FS } from 'fs/promises'
import path from 'path'
import url from 'url'
import { launchEditor } from '../_experimental/internal/helpers/launch-editor'
import { launchEditor } from '../utils/launch-editor'
import type { StackFrame } from 'next/dist/compiled/stacktrace-parser'
import {
SourceMapConsumer,
......@@ -17,7 +17,7 @@ import {
type NullableMappedPosition,
} from 'next/dist/compiled/source-map08'
import type { Project, TurbopackStackFrame } from '../../../../build/swc/types'
import { getSourceMapFromFile } from '../_experimental/internal/helpers/get-source-map-from-file'
import { getSourceMapFromFile } from '../utils/get-source-map-from-file'
import { findSourceMap, type SourceMapPayload } from 'node:module'
import { pathToFileURL } from 'node:url'
import { inspect } from 'node:util'
......
......@@ -7,8 +7,8 @@ import {
type BasicSourceMapConsumer,
} from 'next/dist/compiled/source-map08'
import type { StackFrame } from 'next/dist/compiled/stacktrace-parser'
import { getSourceMapFromFile } from '../_experimental/internal/helpers/get-source-map-from-file'
import { launchEditor } from '../_experimental/internal/helpers/launch-editor'
import { getSourceMapFromFile } from '../utils/get-source-map-from-file'
import { launchEditor } from '../utils/launch-editor'
import {
getOriginalCodeFrame,
type OriginalStackFrameResponse,
......@@ -16,8 +16,8 @@ import {
type OriginalStackFramesResponse,
} from './shared'
import { middlewareResponse } from './middleware-response'
export { getServerError } from '../_experimental/internal/helpers/node-stack-frames'
export { parseStack } from '../_experimental/internal/helpers/parse-stack'
export { getServerError } from '../utils/node-stack-frames'
export { parseStack } from '../utils/parse-stack'
export { getSourceMapFromFile }
import type { IncomingMessage, ServerResponse } from 'http'
......@@ -26,7 +26,7 @@ import type {
NullableMappedPosition,
RawSourceMap,
} from 'next/dist/compiled/source-map08'
import { formatFrameSourceFile } from '../_experimental/internal/helpers/webpack-module-path'
import { formatFrameSourceFile } from '../utils/webpack-module-path'
import type { MappedPosition } from 'source-map'
import { inspect } from 'util'
......
......@@ -2,8 +2,8 @@ import { useReducer } from 'react'
import type { StackFrame } from 'next/dist/compiled/stacktrace-parser'
import type { VersionInfo } from '../../../server/dev/parse-version-info'
import type { SupportedErrorEvent } from './_experimental/internal/container/runtime-error/render-error'
import type { ComponentStackFrame } from './_experimental/internal/helpers/parse-component-stack'
import type { SupportedErrorEvent } from './ui/container/runtime-error/render-error'
import type { ComponentStackFrame } from './utils/parse-component-stack'
import type { DebugInfo } from './types'
type FastRefreshState =
......
import type { StackFrame } from 'next/dist/compiled/stacktrace-parser'
import type { OriginalStackFrame } from '../../helpers/stack-frame'
import type { OriginalStackFrame } from '../../../utils/stack-frame'
import { HotlinkedText } from '../hot-linked-text'
import { ExternalIcon } from '../../icons/external'
import { getFrameSource } from '../../helpers/stack-frame'
import { useOpenInEditor } from '../../helpers/use-open-in-editor'
import { noop as css } from '../../helpers/noop-template'
import { getFrameSource } from '../../../utils/stack-frame'
import { useOpenInEditor } from '../../utils/use-open-in-editor'
import { noop as css } from '../../../utils/noop-template'
export const CallStackFrame: React.FC<{
frame: OriginalStackFrame
......
......@@ -5,9 +5,9 @@ import stripAnsi from 'next/dist/compiled/strip-ansi'
import { useMemo } from 'react'
import { HotlinkedText } from '../hot-linked-text'
import { getFrameSource } from '../../helpers/stack-frame'
import { useOpenInEditor } from '../../helpers/use-open-in-editor'
import { noop as css } from '../../helpers/noop-template'
import { getFrameSource } from '../../../utils/stack-frame'
import { useOpenInEditor } from '../../utils/use-open-in-editor'
import { noop as css } from '../../../utils/noop-template'
import { ExternalIcon } from '../../icons/external'
import { FileIcon } from '../../icons/file'
......
import * as React from 'react'
import { noop as css } from '../../helpers/noop-template'
import { cx } from '../../helpers/cx'
import { noop as css } from '../../../utils/noop-template'
import { cx } from '../../utils/cx'
function useCopyLegacy(content: string) {
type CopyState =
......
import { noop as css } from '../../helpers/noop-template'
import { noop as css } from '../../../utils/noop-template'
const styles = css`
[data-nextjs-dialog-root] {
......
import type { OriginalStackFrame } from '../../../helpers/stack-frame'
import type { OriginalStackFrame } from '../../../../utils/stack-frame'
import { useMemo, useState, useRef } from 'react'
import { CallStackFrame } from '../../call-stack-frame/call-stack-frame'
import { noop as css } from '../../../helpers/noop-template'
import { noop as css } from '../../../../utils/noop-template'
interface CallStackProps {
frames: OriginalStackFrame[]
......
import type { Meta, StoryObj } from '@storybook/react'
import { DevToolsIndicator } from './dev-tools-indicator'
import { withShadowPortal } from '../../../storybook/with-shadow-portal'
import type { VersionInfo } from '../../../../../../../../server/dev/parse-version-info'
import type { OverlayState } from '../../../../../shared'
import type { VersionInfo } from '../../../../../../../server/dev/parse-version-info'
import type { OverlayState } from '../../../../shared'
const meta: Meta<typeof DevToolsIndicator> = {
component: DevToolsIndicator,
......
import type { Dispatch, SetStateAction } from 'react'
import type { OverlayState } from '../../../../../shared'
import type { OverlayState } from '../../../../shared'
import { useState, useEffect, useRef, createContext, useContext } from 'react'
import { Toast } from '../../toast'
import { NextLogo } from './internal/next-logo'
import { useIsDevBuilding } from '../../../../../../../dev/dev-build-indicator/internal/initialize'
import { useIsDevRendering } from './internal/dev-render-indicator'
import { NextLogo } from './next-logo'
import { useIsDevBuilding } from '../../../../../../dev/dev-build-indicator/internal/initialize'
import { useIsDevRendering } from '../../../../utils/dev-indicator/dev-render-indicator'
import { useDelayedRender } from '../../../hooks/use-delayed-render'
import { noop as css } from '../../../helpers/noop-template'
import { noop as css } from '../../../../utils/noop-template'
import { TurbopackInfo } from './dev-tools-info/turbopack-info'
import { RouteInfo } from './dev-tools-info/route-info'
import { StopIcon } from '../../../icons/stop-icon'
......@@ -31,7 +31,7 @@ export function DevToolsIndicator({
state: OverlayState
errorCount: number
isBuildError: boolean
setIsErrorOverlayOpen: Dispatch<SetStateAction<boolean>>
setIsErrorOverlayOpen: (isOverlayOpen: boolean) => void
// Technically this prop isn't needed, but useful for testing.
position?: DevToolsIndicatorPosition
}) {
......@@ -87,7 +87,7 @@ function DevToolsPopover({
position: DevToolsIndicatorPosition
isBuildError: boolean
hide: () => void
setIsErrorOverlayOpen: Dispatch<SetStateAction<boolean>>
setIsErrorOverlayOpen: (isOverlayOpen: boolean) => void
}) {
const menuRef = useRef<HTMLDivElement>(null)
const triggerRef = useRef<HTMLButtonElement | null>(null)
......
import { DevToolsInfo } from './dev-tools-info'
import { noop as css } from '../../../../helpers/noop-template'
import { noop as css } from '../../../../../utils/noop-template'
function StaticRouteContent() {
return (
......
import { DevToolsInfo } from './dev-tools-info'
import { CopyButton } from '../../../copy-button'
import { noop as css } from '../../../../helpers/noop-template'
import { noop as css } from '../../../../../utils/noop-template'
export function TurbopackInfo({
isOpen,
......
import type { Meta, StoryObj } from '@storybook/react'
import { NextLogo } from './next-logo'
import { withShadowPortal } from '../../../../storybook/with-shadow-portal'
import { withShadowPortal } from '../../../storybook/with-shadow-portal'
const meta: Meta<typeof NextLogo> = {
component: NextLogo,
......
import { forwardRef, useEffect, useRef, useState } from 'react'
import { noop as css } from '../../../../helpers/noop-template'
import mergeRefs from '../../../../helpers/merge-refs'
import { noop as css } from '../../../../utils/noop-template'
import mergeRefs from '../../../utils/merge-refs'
import { useMinimumLoadingTimeMultiple } from './use-minimum-loading-time-multiple'
interface Props extends React.ComponentProps<'button'> {
......
import { noop as css } from '../../../helpers/noop-template'
import { noop as css } from '../../../../utils/noop-template'
import { DialogBody } from '../../dialog'
type ErrorOverlayDialogBodyProps = {
......
import { Dialog } from '../../dialog/dialog'
import { noop as css } from '../../../helpers/noop-template'
import { noop as css } from '../../../../utils/noop-template'
type ErrorOverlayDialogProps = {
children?: React.ReactNode
......
import { DialogHeader } from '../../dialog/dialog-header'
import { noop as css } from '../../../helpers/noop-template'
import { noop as css } from '../../../../utils/noop-template'
type ErrorOverlayDialogHeaderProps = {
children?: React.ReactNode
......
import { useState, useRef, useLayoutEffect } from 'react'
import { noop as css } from '../../../helpers/noop-template'
import { noop as css } from '../../../../utils/noop-template'
export type ErrorMessageType = React.ReactNode
......
import { useState, useCallback } from 'react'
import { ThumbsUp } from '../../../../icons/thumbs/thumbs-up'
import { ThumbsDown } from '../../../../icons/thumbs/thumbs-down'
import { noop as css } from '../../../../helpers/noop-template'
import { cx } from '../../../../helpers/cx'
import { noop as css } from '../../../../../utils/noop-template'
import { cx } from '../../../../utils/cx'
interface ErrorFeedbackProps {
errorCode: string
......
import { ErrorFeedback } from './error-feedback/error-feedback'
import { styles as feedbackStyles } from './error-feedback/error-feedback'
import { noop as css } from '../../../helpers/noop-template'
import { noop as css } from '../../../../utils/noop-template'
export type ErrorOverlayFooterProps = {
errorCode: string | undefined
......
import type { DebugInfo } from '../../../../../types'
import type { DebugInfo } from '../../../../types'
import type { ErrorMessageType } from '../error-message/error-message'
import type { ErrorType } from '../error-type-label/error-type-label'
......@@ -8,7 +8,7 @@ import {
styles as toolbarStyles,
} from '../error-overlay-toolbar/error-overlay-toolbar'
import { ErrorOverlayFooter } from '../error-overlay-footer/error-overlay-footer'
import { noop as css } from '../../../helpers/noop-template'
import { noop as css } from '../../../../utils/noop-template'
import {
ErrorMessage,
styles as errorMessageStyles,
......@@ -32,7 +32,7 @@ import { CALL_STACK_STYLES } from '../call-stack/call-stack'
import { OVERLAY_STYLES, ErrorOverlayOverlay } from '../overlay/overlay'
import { ErrorOverlayBottomStack } from '../error-overlay-bottom-stack'
import type { ErrorBaseProps } from '../error-overlay/error-overlay'
import type { ReadyRuntimeError } from '../../../helpers/get-error-by-type'
import type { ReadyRuntimeError } from '../../../../utils/get-error-by-type'
import { EnvironmentNameLabel } from '../environment-name-label/environment-name-label'
interface ErrorOverlayLayoutProps extends ErrorBaseProps {
......
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 { VersionStalenessInfo } from '../../version-staleness-info/version-staleness-info'
import { noop as css } from '../../../helpers/noop-template'
import type { ReadyRuntimeError } from '../../../helpers/get-error-by-type'
import { noop as css } from '../../../../utils/noop-template'
import type { ReadyRuntimeError } from '../../../../utils/get-error-by-type'
type ErrorOverlayNavProps = {
runtimeErrors?: ReadyRuntimeError[]
......
......@@ -5,10 +5,10 @@ import {
useRef,
useState,
} from 'react'
import { noop as css } from '../../../helpers/noop-template'
import { noop as css } from '../../../../utils/noop-template'
import { LeftArrow } from '../../../icons/left-arrow'
import { RightArrow } from '../../../icons/right-arrow'
import type { ReadyRuntimeError } from '../../../helpers/get-error-by-type'
import type { ReadyRuntimeError } from '../../../../utils/get-error-by-type'
type ErrorPaginationProps = {
runtimeErrors: ReadyRuntimeError[]
......
import { parseUrlFromText } from '../../../helpers/parse-url-from-text'
import { parseUrlFromText } from '../../../utils/parse-url-from-text'
const docsURLAllowlist = ['https://nextjs.org', 'https://react.dev']
......
import type { DebugInfo } from '../../../../../types'
import type { DebugInfo } from '../../../../types'
import { NodejsInspectorButton } from './nodejs-inspector-button'
import { noop as css } from '../../../helpers/noop-template'
import { noop as css } from '../../../../utils/noop-template'
import { CopyStackTraceButton } from './copy-stack-trace-button'
import { DocsLinkButton } from './docs-link-button'
......
import type { OverlayState } from '../../../../../shared'
import type { OverlayState } from '../../../../shared'
import { BuildError } from '../../../container/build-error'
import { Errors } from '../../../container/errors'
import { RootLayoutMissingTagsError } from '../../../container/root-layout-missing-tags-error'
import { useDelayedRender } from '../../../hooks/use-delayed-render'
import type { ReadyRuntimeError } from '../../../helpers/get-error-by-type'
import type { ReadyRuntimeError } from '../../../../utils/get-error-by-type'
const transitionDurationMs = 200
......
import { noop as css } from '../../../helpers/noop-template'
import { noop as css } from '../../../../utils/noop-template'
import { Overlay, type OverlayProps } from '../../overlay/overlay'
export function ErrorOverlayOverlay({ children, ...props }: OverlayProps) {
......
......@@ -2,7 +2,7 @@ import React from 'react'
import {
decodeMagicIdentifier,
MAGIC_IDENTIFIER_REGEX,
} from '../../../../../../../shared/lib/magic-identifier'
} from '../../../../../../shared/lib/magic-identifier'
const linkRegex = /https?:\/\/[^\s/$.?#].[^\s)'"]*/i
......
import { useMemo, useState } from 'react'
import { CollapseIcon } from '../_experimental/internal/icons/collapse-icon'
import { CollapseIcon } from '../../icons/collapse-icon'
/**
*
* Format component stack into pseudo HTML
......
import { noop as css } from '../../helpers/noop-template'
import { noop as css } from '../../../utils/noop-template'
const styles = css`
[data-nextjs-dialog-overlay] {
......
import { useOpenInEditor } from '../../helpers/use-open-in-editor'
import { noop as css } from '../../helpers/noop-template'
import { useOpenInEditor } from '../../utils/use-open-in-editor'
import { noop as css } from '../../../utils/noop-template'
type EditorLinkProps = {
file: string
......
......@@ -3,9 +3,9 @@ import * as React from 'react'
import { HotlinkedText } from '../hot-linked-text'
import { EditorLink } from './editor-link'
import { ExternalIcon } from '../../icons/external'
import { noop as css } from '../../helpers/noop-template'
import { getFrameSource } from '../../helpers/stack-frame'
import { useOpenInEditor } from '../../helpers/use-open-in-editor'
import { noop as css } from '../../../utils/noop-template'
import { getFrameSource } from '../../../utils/stack-frame'
import { useOpenInEditor } from '../../utils/use-open-in-editor'
import { FileIcon } from '../../icons/file'
export type TerminalProps = { content: string }
......
import { noop as css } from '../../helpers/noop-template'
import { noop as css } from '../../../utils/noop-template'
const styles = css`
.nextjs-toast {
......
import * as React from 'react'
import { cx } from '../../helpers/cx'
import { cx } from '../../utils/cx'
export type ToastProps = React.HTMLProps<HTMLDivElement> & {
children?: React.ReactNode
onClick?: () => void
......
import type { VersionInfo } from '../../../../../../../server/dev/parse-version-info'
import { cx } from '../../helpers/cx'
import { noop as css } from '../../helpers/noop-template'
import type { VersionInfo } from '../../../../../../server/dev/parse-version-info'
import { cx } from '../../utils/cx'
import { noop as css } from '../../../utils/noop-template'
export function VersionStalenessInfo({
versionInfo,
......
import React, { useCallback, useMemo } from 'react'
import stripAnsi from 'next/dist/compiled/strip-ansi'
import { Terminal } from '../components/terminal'
import { noop as css } from '../helpers/noop-template'
import { noop as css } from '../../utils/noop-template'
import { ErrorOverlayLayout } from '../components/errors/error-overlay-layout/error-overlay-layout'
import type { ErrorBaseProps } from '../components/errors/error-overlay/error-overlay'
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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