Skip to content

Commit 3fe0380

Browse files
committed
[dev-overlay] Move code into new top-level folder in src/
1 parent 3411cb6 commit 3fe0380

File tree

197 files changed

+271
-253
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+271
-253
lines changed

.eslintrc.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,17 @@
297297
"no-octal": "error",
298298
"no-octal-escape": "error",
299299
"no-regex-spaces": "error",
300+
"no-restricted-imports": [
301+
"error",
302+
{
303+
"patterns": [
304+
{
305+
"group": ["*/next-devtools/dev-overlay*"],
306+
"message": "Use `next/dist/compiled/next-devtools` (`src/next-devtools/dev-overlay/entrypoint.ts`) instead. Prefer `src/next-devtools/shared/` for shared utils."
307+
}
308+
]
309+
}
310+
],
300311
"no-restricted-syntax": [
301312
"error",
302313
"WithStatement",

packages/next/next-devtools.webpack-config.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ module.exports = ({ dev, ...rest }) => {
2525
const target = `browserslist:${MODERN_BROWSERSLIST_TARGET.join(', ')}`
2626

2727
return {
28-
entry: path.join(
29-
__dirname,
30-
'src/client/components/react-dev-overlay/entrypoint.js'
31-
),
28+
entry: path.join(__dirname, 'src/next-devtools/entrypoint.ts'),
3229
target,
3330
mode: dev ? 'development' : 'production',
3431
output: {

packages/next/src/build/output/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { bold, red, yellow } from '../../lib/picocolors'
22
import stripAnsi from 'next/dist/compiled/strip-ansi'
33
import textTable from 'next/dist/compiled/text-table'
44
import createStore from 'next/dist/compiled/unistore'
5-
import formatWebpackMessages from '../../client/components/react-dev-overlay/utils/format-webpack-messages'
5+
import formatWebpackMessages from '../../shared/lib/format-webpack-messages'
66
import { store as consoleStore } from './store'
77
import type { OutputState } from './store'
88
import type { webpack } from 'next/dist/compiled/webpack/webpack'

packages/next/src/build/webpack-build/impl.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { webpack } from 'next/dist/compiled/webpack/webpack'
22
import { stringBufferUtils } from 'next/dist/compiled/webpack-sources3'
33
import { red } from '../../lib/picocolors'
4-
import formatWebpackMessages from '../../client/components/react-dev-overlay/utils/format-webpack-messages'
4+
import formatWebpackMessages from '../../shared/lib/format-webpack-messages'
55
import { nonNullable } from '../../lib/non-nullable'
66
import type { COMPILER_INDEXES } from '../../shared/lib/constants'
77
import {

packages/next/src/build/webpack/plugins/wellknown-errors-plugin/parseNotFoundError.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { SimpleWebpackError } from './simpleWebpackError'
33
import {
44
createOriginalStackFrame,
55
getIgnoredSources,
6-
} from '../../../../client/components/react-dev-overlay/server/middleware-webpack'
6+
} from '../../../../server/dev/middleware-webpack'
77
import type { webpack } from 'next/dist/compiled/webpack/webpack'
88

99
// Based on https://github.com/webpack/webpack/blob/fcdd04a833943394bbb0a9eeb54a962a24cc7e41/lib/stats/DefaultStatsFactoryPlugin.js#L422-L431

packages/next/src/cli/next-info.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { PHASE_INFO } from '../shared/lib/constants'
88
import loadConfig from '../server/config'
99
import { getRegistry } from '../lib/helpers/get-registry'
1010
import { parseVersionInfo } from '../server/dev/parse-version-info'
11-
import { getStaleness } from '../client/components/react-dev-overlay/ui/components/version-staleness-info/version-staleness-info'
11+
import { getStaleness } from '../next-devtools/shared/version-staleness'
1212
import { warn } from '../build/output/log'
1313

1414
export type NextInfoOptions = {

packages/next/src/client/app-index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ export function hydrate(
272272
// Server rendering failed, fall back to client-side rendering
273273
if (process.env.NODE_ENV !== 'production') {
274274
const { createRootLevelDevOverlayElement } =
275-
require('./components/react-dev-overlay/app/client-entry') as typeof import('./components/react-dev-overlay/app/client-entry')
275+
require('../next-devtools/userspace/app/client-entry') as typeof import('../next-devtools/userspace/app/client-entry')
276276

277277
// Note this won't cause hydration mismatch because we are doing CSR w/o hydration
278278
element = createRootLevelDevOverlayElement(element)

packages/next/src/client/app-next-dev.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { appBootstrap } from './app-bootstrap'
77
import {
88
getComponentStack,
99
getOwnerStack,
10-
} from './components/react-dev-overlay/app/errors/stitched-error'
10+
} from '../next-devtools/userspace/app/errors/stitched-error'
1111
import { isRecoverableError } from './react-client-callbacks/on-recoverable-error'
1212

1313
// eslint-disable-next-line @next/internal/typechecked-require

packages/next/src/client/app-next-turbopack.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { appBootstrap } from './app-bootstrap'
22
import {
33
getComponentStack,
44
getOwnerStack,
5-
} from './components/react-dev-overlay/app/errors/stitched-error'
5+
} from '../next-devtools/userspace/app/errors/stitched-error'
66
import { isRecoverableError } from './react-client-callbacks/on-recoverable-error'
77

88
window.next.version += '-turbo'

packages/next/src/client/components/react-dev-overlay/entrypoint.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)