Skip to content

Commit dcd0a60

Browse files
authored
[devtool] unify the bundler field (#86514)
1 parent 261614d commit dcd0a60

File tree

8 files changed

+26
-196
lines changed

8 files changed

+26
-196
lines changed

packages/next/src/next-devtools/dev-overlay/components/errors/dev-tools-indicator/dev-tools-info/route-info.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,5 +128,3 @@ export function RouteInfoBody({
128128
<DynamicRouteContent routerType={routerType} {...props} />
129129
)
130130
}
131-
132-
export const DEV_TOOLS_INFO_ROUTE_INFO_STYLES = ``

packages/next/src/next-devtools/dev-overlay/components/errors/dev-tools-indicator/dev-tools-info/turbopack-info.tsx

Lines changed: 0 additions & 159 deletions
This file was deleted.

packages/next/src/next-devtools/dev-overlay/components/errors/error-overlay-nav/error-overlay-nav.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ export function ErrorOverlayNav({
1818
setActiveIndex,
1919
versionInfo,
2020
}: ErrorOverlayNavProps) {
21-
const bundlerName = (process.env.__NEXT_BUNDLER || 'Webpack') as
22-
| 'Webpack'
21+
const bundlerName = (process.env.__NEXT_BUNDLER || 'Turbopack') as
2322
| 'Turbopack'
23+
| 'Webpack'
2424
| 'Rspack'
2525

2626
return (

packages/next/src/next-devtools/dev-overlay/menu/context.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ export type PanelStateKind =
1010
| 'route-type'
1111
| 'segment-explorer'
1212
| 'panel-selector'
13-
| 'turbo-info'
1413

1514
export const PanelRouterContext = createContext<{
1615
panel: PanelStateKind | null

packages/next/src/next-devtools/dev-overlay/menu/panel-router.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,8 @@
1717
opacity: var(--panel-opacity);
1818
transition: var(--panel-transition);
1919
}
20+
21+
.turbopack-upgrade-link {
22+
text-decoration: underline;
23+
font-weight: 500;
24+
}

packages/next/src/next-devtools/dev-overlay/menu/panel-router.tsx

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import {
66
RouteInfoBody,
77
} from '../components/errors/dev-tools-indicator/dev-tools-info/route-info'
88
import { PageSegmentTree } from '../components/overview/segment-explorer'
9-
import { TurbopackInfoBody } from '../components/errors/dev-tools-indicator/dev-tools-info/turbopack-info'
109
import { DevToolsHeader } from '../components/errors/dev-tools-indicator/dev-tools-info/dev-tools-header'
1110
import { useDelayedRender } from '../hooks/use-delayed-render'
1211
import {
@@ -82,15 +81,23 @@ const MenuPanel = () => {
8281
!!process.env.TURBOPACK
8382
? {
8483
title: 'Turbopack is enabled.',
85-
label: 'Turbopack',
86-
value: 'Enabled',
84+
label: 'Bundler',
85+
value: 'Turbopack',
8786
}
8887
: {
8988
title:
9089
'Learn about Turbopack and how to enable it in your application.',
91-
label: 'Try Turbopack',
92-
value: <ChevronRight />,
93-
onClick: () => setPanel('turbo-info'),
90+
label: 'Bundler',
91+
value: (
92+
<a
93+
href="https://nextjs.org/docs/app/api-reference/config/next-config-js/turbopack"
94+
target="_blank"
95+
rel="noreferrer noopener"
96+
className="turbopack-upgrade-link"
97+
>
98+
{process.env.__NEXT_BUNDLER || 'Turbopack'}
99+
</a>
100+
),
94101
},
95102
!!process.env.__NEXT_CACHE_COMPONENTS && {
96103
title: 'Cache Components is enabled.',
@@ -236,24 +243,6 @@ export const PanelRouter = () => {
236243
</DynamicPanel>
237244
</PanelRoute>
238245
)}
239-
240-
<PanelRoute name="turbo-info">
241-
<DynamicPanel
242-
sharePanelSizeGlobally={false}
243-
sizeConfig={{
244-
kind: 'fixed',
245-
height: 470 / state.scale,
246-
width: 400 / state.scale,
247-
}}
248-
closeOnClickOutside
249-
header={<DevToolsHeader title="Try Turbopack" />}
250-
>
251-
<div className="panel-content">
252-
<TurbopackInfoBody />
253-
<InfoFooter href="https://nextjs.org/docs/app/api-reference/turbopack" />
254-
</div>
255-
</DynamicPanel>
256-
</PanelRoute>
257246
</>
258247
)
259248
}

packages/next/src/next-devtools/dev-overlay/styles/component-styles.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ import { CALL_STACK_FRAME_STYLES } from '../components/call-stack-frame/call-sta
1515
import { css } from '../utils/css'
1616
import { EDITOR_LINK_STYLES } from '../components/terminal/editor-link'
1717
import { ENVIRONMENT_NAME_LABEL_STYLES } from '../components/errors/environment-name-label/environment-name-label'
18-
import { DEV_TOOLS_INFO_TURBOPACK_INFO_STYLES } from '../components/errors/dev-tools-indicator/dev-tools-info/turbopack-info'
19-
import { DEV_TOOLS_INFO_ROUTE_INFO_STYLES } from '../components/errors/dev-tools-indicator/dev-tools-info/route-info'
2018
import { DEV_TOOLS_INFO_USER_PREFERENCES_STYLES } from '../components/errors/dev-tools-indicator/dev-tools-info/user-preferences'
2119
import { FADER_STYLES } from '../components/fader'
2220
import { CALL_STACK_STYLES } from '../components/call-stack/call-stack'
@@ -43,8 +41,6 @@ export function ComponentStyles() {
4341
${containerErrorStyles}
4442
${containerRuntimeErrorStyles}
4543
${versionStaleness}
46-
${DEV_TOOLS_INFO_TURBOPACK_INFO_STYLES}
47-
${DEV_TOOLS_INFO_ROUTE_INFO_STYLES}
4844
${DEV_TOOLS_INFO_USER_PREFERENCES_STYLES}
4945
${FADER_STYLES}
5046
${SHORTCUT_RECORDER_STYLES}

test/development/client-dev-overlay/index.test.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ describe('client-dev-overlay', () => {
140140
1
141141
Route
142142
Static
143+
Bundler
143144
Turbopack
144-
Enabled
145145
Preferences"
146146
`)
147147
} else {
@@ -150,7 +150,8 @@ describe('client-dev-overlay', () => {
150150
1
151151
Route
152152
Static
153-
Try Turbopack
153+
Bundler
154+
Webpack
154155
Preferences"
155156
`)
156157
}
@@ -197,8 +198,8 @@ describe('client-dev-overlay with Cache Components', () => {
197198
1
198199
Route
199200
Static
201+
Bundler
200202
Turbopack
201-
Enabled
202203
Cache Components
203204
Enabled
204205
Preferences"
@@ -209,7 +210,8 @@ describe('client-dev-overlay with Cache Components', () => {
209210
1
210211
Route
211212
Static
212-
Try Turbopack
213+
Bundler
214+
Webpack
213215
Cache Components
214216
Enabled
215217
Preferences"

0 commit comments

Comments
 (0)