Removes duplicate graph components

Author: d13

src/webviews/apps/plus/graph-next/graph-app.ts

@@ -5,14 +5,13 @@ import { customElement, query } from 'lit/decorators.js';
 import { when } from 'lit/directives/when.js';
 import type { CustomEventType } from '../../shared/components/element';
 import { emitTelemetrySentEvent } from '../../shared/telemetry';
+import type { GraphMinimapDaySelectedEventDetail } from '../graph/minimap/minimap';
+import type { GlGraphMinimapContainer } from '../graph/minimap/minimap-container';
 import { stateContext } from './context';
 import type { GLGraphWrapper } from './graph-wrapper/graph-wrapper';
-import type { GraphMinimapDaySelectedEventDetail } from './minimap/minimap';
-import type { GlGraphMinimapContainer } from './minimap/minimap-container';
 import { graphStateContext } from './stateProvider';
+import '../graph/minimap/minimap-container';
 import './graph-wrapper/graph-wrapper';
-import './hover/graphHover';
-import './minimap/minimap-container';
 import './sidebar/sidebar';
 import './graph-header';
 import './gate';

src/webviews/apps/plus/graph-next/graph-wrapper/graph-wrapper.ts

@@ -31,11 +31,11 @@ import type { CustomEventType } from '../../../shared/components/element';
 import { ipcContext } from '../../../shared/contexts/ipc';
 import type { TelemetryContext } from '../../../shared/contexts/telemetry';
 import { telemetryContext } from '../../../shared/contexts/telemetry';
+import type { GlGraphHover } from '../../graph/hover/graphHover';
 import { stateContext } from '../context';
-import type { GlGraphHover } from '../hover/graphHover';
 import { graphStateContext } from '../stateProvider';
 import { GraphWrapperReact } from './graph-wrapper.react';
-import '../hover/graphHover';
+import '../../graph/hover/graphHover';
 
 const WebGraph = r2wc(GraphWrapperReact, {
 	props: {
@@ -263,7 +263,7 @@ export class GLGraphWrapper extends SignalWatcher(LitElement) {
 
 	private ref?: GraphContainer;
 
-	@query('gl-graph-hover-next#commit-hover')
+	@query('gl-graph-hover#commit-hover')
 	private readonly graphHover!: GlGraphHover;
 
 	resetHover() {
@@ -275,7 +275,7 @@ export class GLGraphWrapper extends SignalWatcher(LitElement) {
 	}
 
 	override render() {
-		return html`<gl-graph-hover-next id="commit-hover" distance=${0} skidding=${15}></gl-graph-hover-next
+		return html`<gl-graph-hover id="commit-hover" distance=${0} skidding=${15}></gl-graph-hover
 			><web-graph
 				nonce=${ifDefined(this.hostState.nonce)}
 				activeRow=${ifDefined(this.graphAppState.activeRow)}