Unverified Commit 0d7b49b1 authored by Sebastian "Sebbie" Silbermann's avatar Sebastian "Sebbie" Silbermann Committed by GitHub

[dev-overlay] Move code into new top-level folder in src/next-devtools (#80281)

parent 2b76ed70
...@@ -297,6 +297,17 @@ ...@@ -297,6 +297,17 @@
"no-octal": "error", "no-octal": "error",
"no-octal-escape": "error", "no-octal-escape": "error",
"no-regex-spaces": "error", "no-regex-spaces": "error",
"no-restricted-imports": [
"error",
{
"patterns": [
{
"group": ["*/next-devtools/dev-overlay*"],
"message": "Use `next/dist/compiled/next-devtools` (`src/next-devtools/dev-overlay/entrypoint.ts`) instead. Prefer `src/next-devtools/shared/` for shared utils."
}
]
}
],
"no-restricted-syntax": [ "no-restricted-syntax": [
"error", "error",
"WithStatement", "WithStatement",
......
...@@ -10,7 +10,7 @@ function getAbsolutePath(value: string): any { ...@@ -10,7 +10,7 @@ function getAbsolutePath(value: string): any {
return dirname(require.resolve(join(value, 'package.json'))) return dirname(require.resolve(join(value, 'package.json')))
} }
const config: StorybookConfig = { const config: StorybookConfig = {
stories: ['../src/client/components/react-dev-overlay/ui/**/*.stories.tsx'], stories: ['../src/next-devtools/dev-overlay/**/*.stories.tsx'],
addons: [ addons: [
getAbsolutePath('@storybook/addon-webpack5-compiler-swc'), getAbsolutePath('@storybook/addon-webpack5-compiler-swc'),
getAbsolutePath('@storybook/addon-essentials'), getAbsolutePath('@storybook/addon-essentials'),
......
...@@ -25,10 +25,7 @@ module.exports = ({ dev, ...rest }) => { ...@@ -25,10 +25,7 @@ module.exports = ({ dev, ...rest }) => {
const target = `browserslist:${MODERN_BROWSERSLIST_TARGET.join(', ')}` const target = `browserslist:${MODERN_BROWSERSLIST_TARGET.join(', ')}`
return { return {
entry: path.join( entry: path.join(__dirname, 'src/next-devtools/entrypoint.ts'),
__dirname,
'src/client/components/react-dev-overlay/entrypoint.js'
),
target, target,
mode: dev ? 'development' : 'production', mode: dev ? 'development' : 'production',
output: { output: {
......
...@@ -93,7 +93,7 @@ const sharedExternals = [ ...@@ -93,7 +93,7 @@ const sharedExternals = [
const externalsMap = { const externalsMap = {
'./web/sandbox': 'next/dist/server/web/sandbox', './web/sandbox': 'next/dist/server/web/sandbox',
'next/dist/compiled/next-devtools': 'next/dist/compiled/next-devtools':
'commonjs next/dist/client/components/react-dev-overlay/dev-overlay.shim.js', 'commonjs next/dist/next-devtools/dev-overlay.shim.js',
} }
const externalsRegexMap = { const externalsRegexMap = {
......
...@@ -2,7 +2,7 @@ import { bold, red, yellow } from '../../lib/picocolors' ...@@ -2,7 +2,7 @@ import { bold, red, yellow } from '../../lib/picocolors'
import stripAnsi from 'next/dist/compiled/strip-ansi' import stripAnsi from 'next/dist/compiled/strip-ansi'
import textTable from 'next/dist/compiled/text-table' import textTable from 'next/dist/compiled/text-table'
import createStore from 'next/dist/compiled/unistore' import createStore from 'next/dist/compiled/unistore'
import formatWebpackMessages from '../../client/components/react-dev-overlay/utils/format-webpack-messages' import formatWebpackMessages from '../../shared/lib/format-webpack-messages'
import { store as consoleStore } from './store' import { store as consoleStore } from './store'
import type { OutputState } 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 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 { stringBufferUtils } from 'next/dist/compiled/webpack-sources3'
import { red } from '../../lib/picocolors' import { red } from '../../lib/picocolors'
import formatWebpackMessages from '../../client/components/react-dev-overlay/utils/format-webpack-messages' import formatWebpackMessages from '../../shared/lib/format-webpack-messages'
import { nonNullable } from '../../lib/non-nullable' import { nonNullable } from '../../lib/non-nullable'
import type { COMPILER_INDEXES } from '../../shared/lib/constants' import type { COMPILER_INDEXES } from '../../shared/lib/constants'
import { import {
......
...@@ -3,7 +3,7 @@ import { SimpleWebpackError } from './simpleWebpackError' ...@@ -3,7 +3,7 @@ import { SimpleWebpackError } from './simpleWebpackError'
import { import {
createOriginalStackFrame, createOriginalStackFrame,
getIgnoredSources, getIgnoredSources,
} from '../../../../client/components/react-dev-overlay/server/middleware-webpack' } from '../../../../server/dev/middleware-webpack'
import type { webpack } from 'next/dist/compiled/webpack/webpack' import type { webpack } from 'next/dist/compiled/webpack/webpack'
// Based on https://github.com/webpack/webpack/blob/fcdd04a833943394bbb0a9eeb54a962a24cc7e41/lib/stats/DefaultStatsFactoryPlugin.js#L422-L431 // Based on https://github.com/webpack/webpack/blob/fcdd04a833943394bbb0a9eeb54a962a24cc7e41/lib/stats/DefaultStatsFactoryPlugin.js#L422-L431
......
...@@ -8,7 +8,7 @@ import { PHASE_INFO } from '../shared/lib/constants' ...@@ -8,7 +8,7 @@ import { PHASE_INFO } from '../shared/lib/constants'
import loadConfig from '../server/config' import loadConfig from '../server/config'
import { getRegistry } from '../lib/helpers/get-registry' import { getRegistry } from '../lib/helpers/get-registry'
import { parseVersionInfo } from '../server/dev/parse-version-info' import { parseVersionInfo } from '../server/dev/parse-version-info'
import { getStaleness } from '../client/components/react-dev-overlay/ui/components/version-staleness-info/version-staleness-info' import { getStaleness } from '../next-devtools/shared/version-staleness'
import { warn } from '../build/output/log' import { warn } from '../build/output/log'
export type NextInfoOptions = { export type NextInfoOptions = {
......
// imports polyfill from `@next/polyfill-module` after build. // imports polyfill from `@next/polyfill-module` after build.
import '../build/polyfills/polyfill-module' import '../build/polyfills/polyfill-module'
import './components/react-dev-overlay/app/app-dev-overlay-setup' import '../next-devtools/userspace/app/app-dev-overlay-setup'
import ReactDOMClient from 'react-dom/client' import ReactDOMClient from 'react-dom/client'
import React, { use } from 'react' import React, { use } from 'react'
...@@ -272,7 +272,7 @@ export function hydrate( ...@@ -272,7 +272,7 @@ export function hydrate(
// Server rendering failed, fall back to client-side rendering // Server rendering failed, fall back to client-side rendering
if (process.env.NODE_ENV !== 'production') { if (process.env.NODE_ENV !== 'production') {
const { createRootLevelDevOverlayElement } = const { createRootLevelDevOverlayElement } =
require('./components/react-dev-overlay/app/client-entry') as typeof import('./components/react-dev-overlay/app/client-entry') require('../next-devtools/userspace/app/client-entry') as typeof import('../next-devtools/userspace/app/client-entry')
// Note this won't cause hydration mismatch because we are doing CSR w/o hydration // Note this won't cause hydration mismatch because we are doing CSR w/o hydration
element = createRootLevelDevOverlayElement(element) element = createRootLevelDevOverlayElement(element)
......
...@@ -7,7 +7,7 @@ import { appBootstrap } from './app-bootstrap' ...@@ -7,7 +7,7 @@ import { appBootstrap } from './app-bootstrap'
import { import {
getComponentStack, getComponentStack,
getOwnerStack, getOwnerStack,
} from './components/react-dev-overlay/app/errors/stitched-error' } from '../next-devtools/userspace/app/errors/stitched-error'
import { isRecoverableError } from './react-client-callbacks/on-recoverable-error' import { isRecoverableError } from './react-client-callbacks/on-recoverable-error'
// eslint-disable-next-line @next/internal/typechecked-require // eslint-disable-next-line @next/internal/typechecked-require
......
...@@ -2,7 +2,7 @@ import { appBootstrap } from './app-bootstrap' ...@@ -2,7 +2,7 @@ import { appBootstrap } from './app-bootstrap'
import { import {
getComponentStack, getComponentStack,
getOwnerStack, getOwnerStack,
} from './components/react-dev-overlay/app/errors/stitched-error' } from '../next-devtools/userspace/app/errors/stitched-error'
import { isRecoverableError } from './react-client-callbacks/on-recoverable-error' import { isRecoverableError } from './react-client-callbacks/on-recoverable-error'
window.next.version += '-turbo' window.next.version += '-turbo'
......
export function getSourceMapUrl(fileContents: string): string | null {
const regex = /\/\/[#@] ?sourceMappingURL=([^\s'"]+)\s*$/gm
let match = null
for (;;) {
let next = regex.exec(fileContents)
if (next == null) {
break
}
match = next
}
if (!(match && match[1])) {
return null
}
return match[1].toString()
}
...@@ -36,7 +36,7 @@ export function useActionQueue( ...@@ -36,7 +36,7 @@ export function useActionQueue(
// weird implementation details. // weird implementation details.
if (process.env.NODE_ENV !== 'production') { if (process.env.NODE_ENV !== 'production') {
const { useAppDevRenderingIndicator } = const { useAppDevRenderingIndicator } =
require('./react-dev-overlay/utils/dev-indicator/use-app-dev-rendering-indicator') as typeof import('./react-dev-overlay/utils/dev-indicator/use-app-dev-rendering-indicator') require('../../next-devtools/userspace/use-app-dev-rendering-indicator') as typeof import('../../next-devtools/userspace/use-app-dev-rendering-indicator')
// eslint-disable-next-line react-hooks/rules-of-hooks // eslint-disable-next-line react-hooks/rules-of-hooks
const appDevRenderingIndicator = useAppDevRenderingIndicator() const appDevRenderingIndicator = useAppDevRenderingIndicator()
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
import type { ReactNode } from 'react' import type { ReactNode } from 'react'
import { useEffect, startTransition, useRef } from 'react' import { useEffect, startTransition, useRef } from 'react'
import stripAnsi from 'next/dist/compiled/strip-ansi' import stripAnsi from 'next/dist/compiled/strip-ansi'
import formatWebpackMessages from '../../../components/react-dev-overlay/utils/format-webpack-messages' import formatWebpackMessages from '../../../../shared/lib/format-webpack-messages'
import { useRouter } from '../../../components/navigation' import { useRouter } from '../../../components/navigation'
import { import {
REACT_REFRESH_FULL_RELOAD, REACT_REFRESH_FULL_RELOAD,
...@@ -11,10 +11,10 @@ import { ...@@ -11,10 +11,10 @@ import {
reportInvalidHmrMessage, reportInvalidHmrMessage,
} from '../shared' } from '../shared'
import { dispatcher } from 'next/dist/compiled/next-devtools' import { dispatcher } from 'next/dist/compiled/next-devtools'
import { ReplaySsrOnlyErrors } from '../../../components/react-dev-overlay/app/errors/replay-ssr-only-errors' import { ReplaySsrOnlyErrors } from '../../../../next-devtools/userspace/app/errors/replay-ssr-only-errors'
import { AppDevOverlayErrorBoundary } from '../../../components/react-dev-overlay/app/app-dev-overlay-error-boundary' import { AppDevOverlayErrorBoundary } from '../../../../next-devtools/userspace/app/app-dev-overlay-error-boundary'
import { useErrorHandler } from '../../../components/react-dev-overlay/app/errors/use-error-handler' import { useErrorHandler } from '../../../../next-devtools/userspace/app/errors/use-error-handler'
import { RuntimeErrorHandler } from '../../../components/react-dev-overlay/runtime-error-handler' import { RuntimeErrorHandler } from '../../runtime-error-handler'
import { import {
useSendMessage, useSendMessage,
useTurbopack, useTurbopack,
...@@ -28,8 +28,8 @@ import type { ...@@ -28,8 +28,8 @@ import type {
} from '../../../../server/dev/hot-reloader-types' } from '../../../../server/dev/hot-reloader-types'
import { useUntrackedPathname } from '../../../components/navigation-untracked' import { useUntrackedPathname } from '../../../components/navigation-untracked'
import type { GlobalErrorComponent } from '../../../components/global-error' import type { GlobalErrorComponent } from '../../../components/global-error'
import reportHmrLatency from '../../../components/react-dev-overlay/utils/report-hmr-latency' import reportHmrLatency from '../../report-hmr-latency'
import { TurbopackHmr } from '../../../components/react-dev-overlay/utils/turbopack-hot-reloader-common' import { TurbopackHmr } from '../turbopack-hot-reloader-common'
import { NEXT_HMR_REFRESH_HASH_COOKIE } from '../../../components/app-router-headers' import { NEXT_HMR_REFRESH_HASH_COOKIE } from '../../../components/app-router-headers'
let mostRecentCompilationHash: any = null let mostRecentCompilationHash: any = null
......
...@@ -33,10 +33,10 @@ ...@@ -33,10 +33,10 @@
/// <reference types="webpack/module.d.ts" /> /// <reference types="webpack/module.d.ts" />
import { dispatcher } from 'next/dist/compiled/next-devtools' import { dispatcher } from 'next/dist/compiled/next-devtools'
import { register } from '../../../components/react-dev-overlay/pages/pages-dev-overlay-setup' import { register } from '../../../../next-devtools/userspace/pages/pages-dev-overlay-setup'
import stripAnsi from 'next/dist/compiled/strip-ansi' import stripAnsi from 'next/dist/compiled/strip-ansi'
import { addMessageListener, sendMessage } from './websocket' import { addMessageListener, sendMessage } from './websocket'
import formatWebpackMessages from '../../../components/react-dev-overlay/utils/format-webpack-messages' import formatWebpackMessages from '../../../../shared/lib/format-webpack-messages'
import { HMR_ACTIONS_SENT_TO_BROWSER } from '../../../../server/dev/hot-reloader-types' import { HMR_ACTIONS_SENT_TO_BROWSER } from '../../../../server/dev/hot-reloader-types'
import type { import type {
HMR_ACTION_TYPES, HMR_ACTION_TYPES,
...@@ -47,9 +47,9 @@ import { ...@@ -47,9 +47,9 @@ import {
REACT_REFRESH_FULL_RELOAD_FROM_ERROR, REACT_REFRESH_FULL_RELOAD_FROM_ERROR,
reportInvalidHmrMessage, reportInvalidHmrMessage,
} from '../shared' } from '../shared'
import { RuntimeErrorHandler } from '../../../components/react-dev-overlay/runtime-error-handler' import { RuntimeErrorHandler } from '../../runtime-error-handler'
import reportHmrLatency from '../../../components/react-dev-overlay/utils/report-hmr-latency' import reportHmrLatency from '../../report-hmr-latency'
import { TurbopackHmr } from '../../../components/react-dev-overlay/utils/turbopack-hot-reloader-common' import { TurbopackHmr } from '../turbopack-hot-reloader-common'
// This alternative WebpackDevServer combines the functionality of: // This alternative WebpackDevServer combines the functionality of:
// https://github.com/webpack/webpack-dev-server/blob/webpack-1/client/index.js // https://github.com/webpack/webpack-dev-server/blob/webpack-1/client/index.js
......
import type { TurbopackMessageAction } from '../../../../server/dev/hot-reloader-types' import type { TurbopackMessageAction } from '../../../server/dev/hot-reloader-types'
import type { Update as TurbopackUpdate } from '../../../../build/swc/types' import type { Update as TurbopackUpdate } from '../../../build/swc/types'
declare global { declare global {
interface Window { interface Window {
......
...@@ -180,7 +180,7 @@ class Container extends React.Component<{ ...@@ -180,7 +180,7 @@ class Container extends React.Component<{
return this.props.children return this.props.children
} else { } else {
const { PagesDevOverlayBridge } = const { PagesDevOverlayBridge } =
require('./components/react-dev-overlay/pages/pages-dev-overlay-setup') as typeof import('./components/react-dev-overlay/pages/pages-dev-overlay-setup') require('../next-devtools/userspace/pages/pages-dev-overlay-setup') as typeof import('../next-devtools/userspace/pages/pages-dev-overlay-setup')
return ( return (
<PagesDevOverlayBridge>{this.props.children}</PagesDevOverlayBridge> <PagesDevOverlayBridge>{this.props.children}</PagesDevOverlayBridge>
) )
...@@ -918,7 +918,7 @@ export async function hydrate(opts?: { beforeRender?: () => Promise<void> }) { ...@@ -918,7 +918,7 @@ export async function hydrate(opts?: { beforeRender?: () => Promise<void> }) {
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
const getServerError = ( const getServerError = (
require('./components/react-dev-overlay/utils/node-stack-frames') as typeof import('./components/react-dev-overlay/utils/node-stack-frames') require('../server/dev/node-stack-frames') as typeof import('../server/dev/node-stack-frames')
).getServerError ).getServerError
// Server-side runtime errors need to be re-thrown on the client-side so // Server-side runtime errors need to be re-thrown on the client-side so
// that the overlay is rendered. // that the overlay is rendered.
......
...@@ -11,7 +11,7 @@ import { ...@@ -11,7 +11,7 @@ import {
urlQueryToSearchParams, urlQueryToSearchParams,
} from '../shared/lib/router/utils/querystring' } from '../shared/lib/router/utils/querystring'
import { HMR_ACTIONS_SENT_TO_BROWSER } from '../server/dev/hot-reloader-types' import { HMR_ACTIONS_SENT_TO_BROWSER } from '../server/dev/hot-reloader-types'
import { RuntimeErrorHandler } from './components/react-dev-overlay/runtime-error-handler' import { RuntimeErrorHandler } from './dev/runtime-error-handler'
import { REACT_REFRESH_FULL_RELOAD_FROM_ERROR } from './dev/hot-reloader/shared' import { REACT_REFRESH_FULL_RELOAD_FROM_ERROR } from './dev/hot-reloader/shared'
import { performFullReload } from './dev/hot-reloader/pages/hot-reloader-pages' import { performFullReload } from './dev/hot-reloader/pages/hot-reloader-pages'
import { dispatcher } from 'next/dist/compiled/next-devtools' import { dispatcher } from 'next/dist/compiled/next-devtools'
......
...@@ -5,12 +5,12 @@ import { ...@@ -5,12 +5,12 @@ import {
setOwnerStackIfAvailable, setOwnerStackIfAvailable,
setComponentStack, setComponentStack,
coerceError, coerceError,
} from '../components/react-dev-overlay/app/errors/stitched-error' } from '../../next-devtools/userspace/app/errors/stitched-error'
import { handleClientError } from '../components/react-dev-overlay/app/errors/use-error-handler' import { handleClientError } from '../../next-devtools/userspace/app/errors/use-error-handler'
import { isNextRouterError } from '../components/is-next-router-error' import { isNextRouterError } from '../components/is-next-router-error'
import { isBailoutToCSRError } from '../../shared/lib/lazy-dynamic/bailout-to-csr' import { isBailoutToCSRError } from '../../shared/lib/lazy-dynamic/bailout-to-csr'
import { reportGlobalError } from './report-global-error' import { reportGlobalError } from './report-global-error'
import { originConsoleError } from '../components/react-dev-overlay/app/errors/intercept-console-error' import { originConsoleError } from '../../next-devtools/userspace/app/errors/intercept-console-error'
import { ErrorBoundaryHandler } from '../components/error-boundary' import { ErrorBoundaryHandler } from '../components/error-boundary'
import DefaultErrorBoundary from '../components/global-error' import DefaultErrorBoundary from '../components/global-error'
...@@ -24,7 +24,7 @@ export function onCaughtError( ...@@ -24,7 +24,7 @@ export function onCaughtError(
if (process.env.NODE_ENV !== 'production') { if (process.env.NODE_ENV !== 'production') {
const { AppDevOverlayErrorBoundary } = const { AppDevOverlayErrorBoundary } =
require('../components/react-dev-overlay/app/app-dev-overlay-error-boundary') as typeof import('../components/react-dev-overlay/app/app-dev-overlay-error-boundary') require('../../next-devtools/userspace/app/app-dev-overlay-error-boundary') as typeof import('../../next-devtools/userspace/app/app-dev-overlay-error-boundary')
isImplicitErrorBoundary = isImplicitErrorBoundary =
errorBoundaryComponent === AppDevOverlayErrorBoundary errorBoundaryComponent === AppDevOverlayErrorBoundary
......
...@@ -6,7 +6,7 @@ import { ...@@ -6,7 +6,7 @@ import {
setOwnerStackIfAvailable, setOwnerStackIfAvailable,
setComponentStack, setComponentStack,
coerceError, coerceError,
} from '../components/react-dev-overlay/app/errors/stitched-error' } from '../../next-devtools/userspace/app/errors/stitched-error'
import isError from '../../lib/is-error' import isError from '../../lib/is-error'
import { reportGlobalError } from './report-global-error' import { reportGlobalError } from './report-global-error'
......
...@@ -2,12 +2,16 @@ ...@@ -2,12 +2,16 @@
## Project Structure ## Project Structure
- `app/` - Main entrypoint and related files for App Router dev overlay. - `next-devtools/dev-overlay/` - The UI that Next.js developers can interact with in development.
- `font/` - Includes Geist fonts that will be served to the client via the internal `/__nextjs_font/...` route. - `next-devtools/server/` - Code that runs in the Next.js development server.
- `pages/` - Main entrypoint and related files for Pages Router dev overlay. - `next-devtools/shared/` - Anything that doesn't fit in
- `server/` - Source files related to the dev overlay that are to run on the server and not sent to the client. - `next-devtools/userspace/` - Code that runs in the user's application.
- `ui/` - Main source files that build the UI of the dev overlay. It is recommended to keep this directory isolated from the rest of the codebase to make it easier to be excluded from compiliation and be bundled in the future.
- `utils/` - Utils that can also be used outside of this project unlike the ones inside the `ui/` directory. Modules in `dev-overlay/` are isolated from the rest of the source. Any stateful module will not share state with e.g. `userspace/`. Stateful modules in `shared/` cannot be used to pass data from `dev-overlay/` to `userspace/` or vice versa.
`userspace/` code can send messages to `dev-overlay/` via the `dispatcher` imported from `next/dist/compiled/next-devtools`.
Keep processing in `userspace/` to a minimum and prefer deriving data in `dev-overlay/`.
## Development ## Development
......
...@@ -17,16 +17,16 @@ import { ...@@ -17,16 +17,16 @@ import {
ACTION_BUILDING_INDICATOR_SHOW, ACTION_BUILDING_INDICATOR_SHOW,
ACTION_RENDERING_INDICATOR_HIDE, ACTION_RENDERING_INDICATOR_HIDE,
ACTION_RENDERING_INDICATOR_SHOW, ACTION_RENDERING_INDICATOR_SHOW,
} from './shared' } from './dev-overlay/shared'
import { startTransition, useInsertionEffect } from 'react' import { startTransition, useInsertionEffect } from 'react'
import { createRoot } from 'react-dom/client' import { createRoot } from 'react-dom/client'
import { FontStyles } from './font/font-styles' import { FontStyles } from './dev-overlay/font/font-styles'
import type { HydrationErrorState } from './pages/hydration-error-state' import type { HydrationErrorState } from './shared/hydration-error'
import type { DebugInfo } from './types' import type { DebugInfo } from './shared/types'
import { DevOverlay } from './ui/dev-overlay' import { DevOverlay } from './dev-overlay/dev-overlay'
import type { DevIndicatorServerState } from '../../../server/dev/dev-indicator-server-state' import type { DevIndicatorServerState } from '../server/dev/dev-indicator-server-state'
import type { VersionInfo } from '../../../server/dev/parse-version-info' import type { VersionInfo } from '../server/dev/parse-version-info'
export interface Dispatcher { export interface Dispatcher {
onBuildOk(): void onBuildOk(): void
......
import type { StackFrame } from 'next/dist/compiled/stacktrace-parser' import type { StackFrame } from 'next/dist/compiled/stacktrace-parser'
import type { OriginalStackFrame } from '../../../utils/stack-frame' import type { OriginalStackFrame } from '../../../shared/stack-frame'
import { HotlinkedText } from '../hot-linked-text' import { HotlinkedText } from '../hot-linked-text'
import { ExternalIcon, SourceMappingErrorIcon } from '../../icons/external' import { ExternalIcon, SourceMappingErrorIcon } from '../../icons/external'
import { getFrameSource } from '../../../utils/stack-frame' import { getFrameSource } from '../../../shared/stack-frame'
import { useOpenInEditor } from '../../utils/use-open-in-editor' import { useOpenInEditor } from '../../utils/use-open-in-editor'
export const CallStackFrame: React.FC<{ export const CallStackFrame: React.FC<{
......
import type { StackFrame } from 'next/dist/compiled/stacktrace-parser' import type { StackFrame } from 'next/dist/compiled/stacktrace-parser'
import { useMemo } from 'react' import { useMemo } from 'react'
import { HotlinkedText } from '../hot-linked-text' import { HotlinkedText } from '../hot-linked-text'
import { getFrameSource } from '../../../utils/stack-frame' import { getFrameSource } from '../../../shared/stack-frame'
import { useOpenInEditor } from '../../utils/use-open-in-editor' import { useOpenInEditor } from '../../utils/use-open-in-editor'
import { ExternalIcon } from '../../icons/external' import { ExternalIcon } from '../../icons/external'
import { FileIcon } from '../../icons/file' import { FileIcon } from '../../icons/file'
......
import type { OriginalStackFrame } from '../../../../utils/stack-frame' import type { OriginalStackFrame } from '../../../../shared/stack-frame'
import { useMemo, useState, useRef } from 'react' import { useMemo, useState, useRef } from 'react'
import { CallStackFrame } from '../../call-stack-frame/call-stack-frame' import { CallStackFrame } from '../../call-stack-frame/call-stack-frame'
......
import type { Meta, StoryObj } from '@storybook/react' import type { Meta, StoryObj } from '@storybook/react'
import { DevToolsIndicator } from './dev-tools-indicator' import { DevToolsIndicator } from './dev-tools-indicator'
import { withShadowPortal } from '../../../storybook/with-shadow-portal' import { withShadowPortal } from '../../../storybook/with-shadow-portal'
import type { VersionInfo } from '../../../../../../../server/dev/parse-version-info' import type { VersionInfo } from '../../../../../server/dev/parse-version-info'
import type { OverlayState } from '../../../../shared' import type { OverlayState } from '../../../shared'
const meta: Meta<typeof DevToolsIndicator> = { const meta: Meta<typeof DevToolsIndicator> = {
component: DevToolsIndicator, component: DevToolsIndicator,
......
...@@ -5,7 +5,7 @@ import { ...@@ -5,7 +5,7 @@ import {
STORAGE_KEY_POSITION, STORAGE_KEY_POSITION,
type OverlayDispatch, type OverlayDispatch,
type OverlayState, type OverlayState,
} from '../../../../shared' } from '../../../shared'
import { useState, useEffect, useRef, createContext, useContext } from 'react' import { useState, useEffect, useRef, createContext, useContext } from 'react'
import { Toast } from '../../toast' import { Toast } from '../../toast'
......
...@@ -3,7 +3,7 @@ import { ...@@ -3,7 +3,7 @@ import {
STORAGE_KEY_POSITION, STORAGE_KEY_POSITION,
STORAGE_KEY_SCALE, STORAGE_KEY_SCALE,
STORAGE_KEY_THEME, STORAGE_KEY_THEME,
} from '../../../../../shared' } from '../../../../shared'
const INDICATOR_POSITION = const INDICATOR_POSITION =
(process.env (process.env
......
import { useState, type HTMLProps } from 'react' import { useState, type HTMLProps } from 'react'
import { css } from '../../../../../utils/css' import { css } from '../../../../utils/css'
import EyeIcon from '../../../../icons/eye-icon' import EyeIcon from '../../../../icons/eye-icon'
import { STORAGE_KEY_POSITION, STORAGE_KEY_THEME } from '../../../../../shared' import { STORAGE_KEY_POSITION, STORAGE_KEY_THEME } from '../../../../shared'
import LightIcon from '../../../../icons/light-icon' import LightIcon from '../../../../icons/light-icon'
import DarkIcon from '../../../../icons/dark-icon' import DarkIcon from '../../../../icons/dark-icon'
import SystemIcon from '../../../../icons/system-icon' import SystemIcon from '../../../../icons/system-icon'
......
import { forwardRef, useEffect, useRef, useState } from 'react' import { forwardRef, useEffect, useRef, useState } from 'react'
import { css } from '../../../../utils/css' import { css } from '../../../utils/css'
import mergeRefs from '../../../utils/merge-refs' import mergeRefs from '../../../utils/merge-refs'
import { useMinimumLoadingTimeMultiple } from './use-minimum-loading-time-multiple' import { useMinimumLoadingTimeMultiple } from './use-minimum-loading-time-multiple'
import type { DevToolsScale } from './dev-tools-info/preferences' import type { DevToolsScale } from './dev-tools-info/preferences'
......
import * as React from 'react' import * as React from 'react'
import type { DebugInfo } from '../../../../types' import type { DebugInfo } from '../../../../shared/types'
import type { ErrorMessageType } from '../error-message/error-message' 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'
...@@ -32,7 +32,7 @@ import { CALL_STACK_STYLES } from '../call-stack/call-stack' ...@@ -32,7 +32,7 @@ import { CALL_STACK_STYLES } from '../call-stack/call-stack'
import { OVERLAY_STYLES, ErrorOverlayOverlay } from '../overlay/overlay' import { OVERLAY_STYLES, ErrorOverlayOverlay } from '../overlay/overlay'
import { ErrorOverlayBottomStack } from '../error-overlay-bottom-stack' 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 { Fader } from '../../fader'
......
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 { VersionStalenessInfo } from '../../version-staleness-info/version-staleness-info'
import type { ReadyRuntimeError } from '../../../../utils/get-error-by-type' import type { ReadyRuntimeError } from '../../../utils/get-error-by-type'
type ErrorOverlayNavProps = { type ErrorOverlayNavProps = {
runtimeErrors?: ReadyRuntimeError[] runtimeErrors?: ReadyRuntimeError[]
......
...@@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react' ...@@ -2,7 +2,7 @@ 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/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'
const meta: Meta<typeof ErrorOverlayPagination> = { const meta: Meta<typeof ErrorOverlayPagination> = {
component: ErrorOverlayPagination, component: ErrorOverlayPagination,
......
...@@ -7,7 +7,7 @@ import { ...@@ -7,7 +7,7 @@ import {
} from 'react' } from 'react'
import { LeftArrow } from '../../../icons/left-arrow' import { LeftArrow } from '../../../icons/left-arrow'
import { RightArrow } from '../../../icons/right-arrow' import { RightArrow } from '../../../icons/right-arrow'
import type { ReadyRuntimeError } from '../../../../utils/get-error-by-type' import type { ReadyRuntimeError } from '../../../utils/get-error-by-type'
type ErrorPaginationProps = { type ErrorPaginationProps = {
runtimeErrors: ReadyRuntimeError[] runtimeErrors: ReadyRuntimeError[]
......
import { import {
NEXTJS_HYDRATION_ERROR_LINK, NEXTJS_HYDRATION_ERROR_LINK,
REACT_HYDRATION_ERROR_LINK, REACT_HYDRATION_ERROR_LINK,
} from '../../../../../react-19-hydration-error' } from '../../../../shared/react-19-hydration-error'
import { parseUrlFromText } from '../../../utils/parse-url-from-text' import { parseUrlFromText } from '../../../utils/parse-url-from-text'
const docsURLAllowlist = ['https://nextjs.org', 'https://react.dev'] const docsURLAllowlist = ['https://nextjs.org', 'https://react.dev']
......
import type { DebugInfo } from '../../../../types' import type { DebugInfo } from '../../../../shared/types'
import { NodejsInspectorButton } from './nodejs-inspector-button' import { NodejsInspectorButton } from './nodejs-inspector-button'
import { CopyStackTraceButton } from './copy-stack-trace-button' import { CopyStackTraceButton } from './copy-stack-trace-button'
import { DocsLinkButton } from './docs-link-button' import { DocsLinkButton } from './docs-link-button'
......
...@@ -2,14 +2,14 @@ import { ...@@ -2,14 +2,14 @@ import {
ACTION_ERROR_OVERLAY_CLOSE, ACTION_ERROR_OVERLAY_CLOSE,
type OverlayDispatch, type OverlayDispatch,
type OverlayState, type OverlayState,
} from '../../../../shared' } from '../../../shared'
import { Suspense } from 'react' import { Suspense } from 'react'
import { BuildError } from '../../../container/build-error' import { BuildError } from '../../../container/build-error'
import { Errors } from '../../../container/errors' import { Errors } from '../../../container/errors'
import { useDelayedRender } from '../../../hooks/use-delayed-render' import { useDelayedRender } from '../../../hooks/use-delayed-render'
import type { ReadyRuntimeError } from '../../../../utils/get-error-by-type' import type { ReadyRuntimeError } from '../../../utils/get-error-by-type'
import type { HydrationErrorState } from '../../../../pages/hydration-error-state' import type { HydrationErrorState } from '../../../../shared/hydration-error'
const transitionDurationMs = 200 const transitionDurationMs = 200
......
...@@ -2,7 +2,7 @@ import React from 'react' ...@@ -2,7 +2,7 @@ import React from 'react'
import { import {
decodeMagicIdentifier, decodeMagicIdentifier,
MAGIC_IDENTIFIER_REGEX, MAGIC_IDENTIFIER_REGEX,
} from '../../../../../../shared/lib/magic-identifier' } from '../../../../shared/lib/magic-identifier'
const linkRegex = /https?:\/\/[^\s/$.?#].[^\s)'"]*/i const linkRegex = /https?:\/\/[^\s/$.?#].[^\s)'"]*/i
......
import type { HTMLProps } from 'react' import type { HTMLProps } from 'react'
import { css } from '../../../utils/css' import { css } from '../../utils/css'
import type { DevToolsInfoPropsCore } from '../errors/dev-tools-indicator/dev-tools-info/dev-tools-info' import type { DevToolsInfoPropsCore } from '../errors/dev-tools-indicator/dev-tools-info/dev-tools-info'
import { DevToolsInfo } from '../errors/dev-tools-indicator/dev-tools-info/dev-tools-info' import { DevToolsInfo } from '../errors/dev-tools-indicator/dev-tools-info/dev-tools-info'
import { cx } from '../../utils/cx' import { cx } from '../../utils/cx'
import { import {
useSegmentTreeClientState,
type SegmentNode, type SegmentNode,
} from '../../../../../../shared/lib/devtool/app-segment-tree' useSegmentTreeClientState,
import type { Trie, TrieNode } from '../../../../../../shared/lib/devtool/trie' } from '../../../../shared/lib/devtool/app-segment-tree'
import type { Trie, TrieNode } from '../../../../shared/lib/devtool/trie'
const IconLayout = (props: React.SVGProps<SVGSVGElement>) => { const IconLayout = (props: React.SVGProps<SVGSVGElement>) => {
return ( return (
......
import * as React from 'react' import * as React from 'react'
import { createPortal } from 'react-dom' import { createPortal } from 'react-dom'
import { STORAGE_KEY_THEME } from '../../shared' import { STORAGE_KEY_THEME } from '../shared'
export function ShadowPortal({ children }: { children: React.ReactNode }) { export function ShadowPortal({ children }: { children: React.ReactNode }) {
let portalNode = React.useRef<HTMLElement | null>(null) let portalNode = React.useRef<HTMLElement | null>(null)
......
...@@ -3,7 +3,7 @@ import * as React from 'react' ...@@ -3,7 +3,7 @@ import * as React from 'react'
import { HotlinkedText } from '../hot-linked-text' import { HotlinkedText } from '../hot-linked-text'
import { EditorLink } from './editor-link' import { EditorLink } from './editor-link'
import { ExternalIcon } from '../../icons/external' import { ExternalIcon } from '../../icons/external'
import { getFrameSource } from '../../../utils/stack-frame' import { getFrameSource } from '../../../shared/stack-frame'
import { useOpenInEditor } from '../../utils/use-open-in-editor' import { useOpenInEditor } from '../../utils/use-open-in-editor'
import { FileIcon } from '../../icons/file' import { FileIcon } from '../../icons/file'
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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