Unverified Commit 01e1854f authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

[segment explorer] remove dev panel ui flag (#81670)

Remove panel ui flag

---------
Co-authored-by: 's avatarRobPruzan <rapruzan@buffalo.edu>
parent 3c38722a
...@@ -119,8 +119,6 @@ export function getDefineEnv({ ...@@ -119,8 +119,6 @@ export function getDefineEnv({
const isDynamicIOEnabled = !!config.experimental.dynamicIO const isDynamicIOEnabled = !!config.experimental.dynamicIO
const isUseCacheEnabled = !!config.experimental.useCache const isUseCacheEnabled = !!config.experimental.useCache
const isDevToolPanelUIEnabled = Boolean(config.experimental.devtoolNewPanelUI)
const defineEnv: DefineEnv = { const defineEnv: DefineEnv = {
// internal field to identify the plugin config // internal field to identify the plugin config
__NEXT_DEFINE_ENV: true, __NEXT_DEFINE_ENV: true,
...@@ -317,9 +315,7 @@ export function getDefineEnv({ ...@@ -317,9 +315,7 @@ export function getDefineEnv({
} }
: {}), : {}),
'process.env.__NEXT_DEVTOOL_SEGMENT_EXPLORER': 'process.env.__NEXT_DEVTOOL_SEGMENT_EXPLORER':
// Enable segment explorer in devtools !!config.experimental.devtoolSegmentExplorer,
isDevToolPanelUIEnabled || !!config.experimental.devtoolSegmentExplorer,
'process.env.__NEXT_DEVTOOL_NEW_PANEL_UI': isDevToolPanelUIEnabled,
'process.env.__NEXT_BROWSER_DEBUG_INFO_IN_TERMINAL': JSON.stringify( 'process.env.__NEXT_BROWSER_DEBUG_INFO_IN_TERMINAL': JSON.stringify(
config.experimental.browserDebugInfoInTerminal || false config.experimental.browserDebugInfoInTerminal || false
......
...@@ -24,7 +24,6 @@ export function DevToolsIndicatorNew() { ...@@ -24,7 +24,6 @@ export function DevToolsIndicatorNew() {
const { state, dispatch } = useDevOverlayContext() const { state, dispatch } = useDevOverlayContext()
const { panel, setPanel, setSelectedIndex } = usePanelRouterContext() const { panel, setPanel, setSelectedIndex } = usePanelRouterContext()
const updateAllPanelPositions = useUpdateAllPanelPositions() const updateAllPanelPositions = useUpdateAllPanelPositions()
const [vertical, horizontal] = state.devToolsPosition.split('-', 2) const [vertical, horizontal] = state.devToolsPosition.split('-', 2)
return ( return (
...@@ -39,7 +38,6 @@ export function DevToolsIndicatorNew() { ...@@ -39,7 +38,6 @@ export function DevToolsIndicatorNew() {
boxShadow: 'none', boxShadow: 'none',
[vertical]: `${INDICATOR_PADDING}px`, [vertical]: `${INDICATOR_PADDING}px`,
[horizontal]: `${INDICATOR_PADDING}px`, [horizontal]: `${INDICATOR_PADDING}px`,
visibility: state.isErrorOverlayOpen ? 'hidden' : 'visible',
} as CSSProperties } as CSSProperties
} }
> >
......
...@@ -7,7 +7,10 @@ import { Warning } from '../../icons/warning' ...@@ -7,7 +7,10 @@ import { Warning } from '../../icons/warning'
import { css } from '../../utils/css' import { css } from '../../utils/css'
import { useDevOverlayContext } from '../../../dev-overlay.browser' import { useDevOverlayContext } from '../../../dev-overlay.browser'
import { useRenderErrorContext } from '../../dev-overlay' import { useRenderErrorContext } from '../../dev-overlay'
import { ACTION_ERROR_OVERLAY_OPEN } from '../../shared' import {
ACTION_ERROR_OVERLAY_CLOSE,
ACTION_ERROR_OVERLAY_OPEN,
} from '../../shared'
import { usePanelRouterContext } from '../../menu/context' import { usePanelRouterContext } from '../../menu/context'
import { BASE_LOGO_SIZE } from '../../utils/indicator-metrics' import { BASE_LOGO_SIZE } from '../../utils/indicator-metrics'
...@@ -418,7 +421,12 @@ export function NextLogoNew({ ...@@ -418,7 +421,12 @@ export function NextLogoNew({
data-issues-open data-issues-open
aria-label="Open issues overlay" aria-label="Open issues overlay"
onClick={() => { onClick={() => {
// wait this is wrong if (state.isErrorOverlayOpen) {
dispatch({
type: ACTION_ERROR_OVERLAY_CLOSE,
})
return
}
dispatch({ type: ACTION_ERROR_OVERLAY_OPEN }) dispatch({ type: ACTION_ERROR_OVERLAY_OPEN })
setPanel(null) setPanel(null)
}} }}
......
...@@ -84,14 +84,6 @@ export const Default: Story = { ...@@ -84,14 +84,6 @@ export const Default: Story = {
// todo: fix story with "Context arg provider" wrapper // todo: fix story with "Context arg provider" wrapper
export const WithPanel: Story = { export const WithPanel: Story = {
beforeEach: () => {
process.env.__NEXT_DEVTOOL_NEW_PANEL_UI = 'true'
// clean up callback function
return () => {
delete process.env.__NEXT_DEVTOOL_NEW_PANEL_UI
}
},
render: function DevOverlayStory() { render: function DevOverlayStory() {
const [state, dispatch] = useStorybookOverlayReducer(initialState) const [state, dispatch] = useStorybookOverlayReducer(initialState)
return ( return (
......
...@@ -41,9 +41,7 @@ export function DevOverlay({ ...@@ -41,9 +41,7 @@ export function DevOverlay({
return ( return (
<ShadowPortal> <ShadowPortal>
<CssReset /> <CssReset />
<Base <Base scale={state.scale} />
scale={process.env.__NEXT_DEVTOOL_NEW_PANEL_UI ? state.scale : scale}
/>
<Colors /> <Colors />
<ComponentStyles /> <ComponentStyles />
<DarkTheme /> <DarkTheme />
...@@ -52,8 +50,7 @@ export function DevOverlay({ ...@@ -52,8 +50,7 @@ export function DevOverlay({
{({ runtimeErrors, totalErrorCount }) => { {({ runtimeErrors, totalErrorCount }) => {
return ( return (
<> <>
{state.showIndicator && {state.showIndicator ? (
process.env.__NEXT_DEVTOOL_NEW_PANEL_UI ? (
<> <>
<RenderErrorContext <RenderErrorContext
value={{ runtimeErrors, totalErrorCount }} value={{ runtimeErrors, totalErrorCount }}
......
...@@ -160,7 +160,7 @@ export const DevtoolMenu = ({ ...@@ -160,7 +160,7 @@ export const DevtoolMenu = ({
borderRadius: 'var(--rounded-xl)', borderRadius: 'var(--rounded-xl)',
position: 'fixed', position: 'fixed',
fontFamily: 'var(--font-stack-sans)', fontFamily: 'var(--font-stack-sans)',
zIndex: 3, zIndex: 'var(--top-z-index)',
overflow: 'hidden', overflow: 'hidden',
opacity: 1, opacity: 1,
minWidth: '248px', minWidth: '248px',
......
...@@ -21,6 +21,7 @@ import { ...@@ -21,6 +21,7 @@ import {
ACTION_DEV_INDICATOR_SET, ACTION_DEV_INDICATOR_SET,
ACTION_DEVTOOLS_POSITION, ACTION_DEVTOOLS_POSITION,
ACTION_DEVTOOLS_SCALE, ACTION_DEVTOOLS_SCALE,
ACTION_ERROR_OVERLAY_CLOSE,
ACTION_ERROR_OVERLAY_OPEN, ACTION_ERROR_OVERLAY_OPEN,
} from '../shared' } from '../shared'
import GearIcon from '../icons/gear-icon' import GearIcon from '../icons/gear-icon'
...@@ -41,6 +42,13 @@ const MenuPanel = () => { ...@@ -41,6 +42,13 @@ const MenuPanel = () => {
label: 'Issues', label: 'Issues',
value: <IssueCount>{totalErrorCount}</IssueCount>, value: <IssueCount>{totalErrorCount}</IssueCount>,
onClick: () => { onClick: () => {
if (state.isErrorOverlayOpen) {
dispatch({
type: ACTION_ERROR_OVERLAY_CLOSE,
})
setPanel(null)
return
}
setPanel(null) setPanel(null)
setSelectedIndex(-1) setSelectedIndex(-1)
if (totalErrorCount > 0) { if (totalErrorCount > 0) {
......
...@@ -501,7 +501,6 @@ export const configSchema: zod.ZodType<NextConfig> = z.lazy(() => ...@@ -501,7 +501,6 @@ export const configSchema: zod.ZodType<NextConfig> = z.lazy(() =>
.optional(), .optional(),
globalNotFound: z.boolean().optional(), globalNotFound: z.boolean().optional(),
devtoolSegmentExplorer: z.boolean().optional(), devtoolSegmentExplorer: z.boolean().optional(),
devtoolNewPanelUI: z.boolean().optional(),
browserDebugInfoInTerminal: z browserDebugInfoInTerminal: z
.union([ .union([
z.boolean(), z.boolean(),
......
...@@ -741,11 +741,6 @@ export interface ExperimentalConfig { ...@@ -741,11 +741,6 @@ export interface ExperimentalConfig {
*/ */
devtoolSegmentExplorer?: boolean devtoolSegmentExplorer?: boolean
/**
* Enable new panel UI for the Next.js DevTools.
*/
devtoolNewPanelUI?: boolean
/** /**
* Enable debug information to be forwarded from browser to dev server stdout/stderr * Enable debug information to be forwarded from browser to dev server stdout/stderr
*/ */
...@@ -1496,8 +1491,7 @@ export const defaultConfig = Object.freeze({ ...@@ -1496,8 +1491,7 @@ export const defaultConfig = Object.freeze({
useCache: undefined, useCache: undefined,
slowModuleDetection: undefined, slowModuleDetection: undefined,
globalNotFound: false, globalNotFound: false,
devtoolNewPanelUI: process.env.__NEXT_DEVTOOL_NEW_PANEL_UI === 'true', devtoolSegmentExplorer: false,
devtoolSegmentExplorer: process.env.__NEXT_DEVTOOL_NEW_PANEL_UI === 'true',
browserDebugInfoInTerminal: false, browserDebugInfoInTerminal: false,
optimizeRouterScrolling: false, optimizeRouterScrolling: false,
}, },
......
...@@ -499,10 +499,6 @@ function assignDefaults( ...@@ -499,10 +499,6 @@ function assignDefaults(
} }
} }
if (result.experimental.devtoolNewPanelUI) {
result.experimental.devtoolSegmentExplorer = true
}
warnCustomizedOption( warnCustomizedOption(
result, result,
'experimental.esmExternals', 'experimental.esmExternals',
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
*/ */
const nextConfig = { const nextConfig = {
experimental: { experimental: {
devtoolNewPanelUI: true, devtoolSegmentExplorer: true,
}, },
} }
......
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