From 6b110cf4d0e759ab0fa6fd5c5091b8e1091c0658 Mon Sep 17 00:00:00 2001 From: Eric Mc Sween <5454374+emcsween@users.noreply.github.com> Date: Tue, 4 Apr 2023 08:14:23 -0400 Subject: [PATCH] Merge pull request #12481 from overleaf/td-history-remove-source-editor-imports Remove accidental imports from source-editor module in history GitOrigin-RevId: 808597e113c3b1e74cacc712313af0e20b0e1786 --- .../components/diff-view/document-diff-viewer.tsx | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/services/web/frontend/js/features/history/components/diff-view/document-diff-viewer.tsx b/services/web/frontend/js/features/history/components/diff-view/document-diff-viewer.tsx index a49bf5b86c..3277a2e5cd 100644 --- a/services/web/frontend/js/features/history/components/diff-view/document-diff-viewer.tsx +++ b/services/web/frontend/js/features/history/components/diff-view/document-diff-viewer.tsx @@ -2,20 +2,18 @@ import { useCallback, useEffect, useRef, useState } from 'react' import withErrorBoundary from '../../../../infrastructure/error-boundary' import { ErrorBoundaryFallback } from '../../../../shared/components/error-boundary-fallback' import { EditorState, Extension } from '@codemirror/state' -import { EditorView } from '@codemirror/view' -import { lineNumbers } from '../../../../../../modules/source-editor/frontend/js/extensions/line-numbers' +import { EditorView, lineNumbers } from '@codemirror/view' import { indentationMarkers } from '@replit/codemirror-indentation-markers' import { highlights, setHighlightsEffect } from '../../extensions/highlights' import useScopeValue from '../../../../shared/hooks/use-scope-value' -import { - FontFamily, - LineHeight, - OverallTheme, -} from '../../../../../../modules/source-editor/frontend/js/extensions/theme' import { theme, Options } from '../../extensions/theme' import { indentUnit } from '@codemirror/language' import { Highlight } from '../../services/types/doc' +type FontFamily = 'monaco' | 'lucida' +type LineHeight = 'compact' | 'normal' | 'wide' +type OverallTheme = '' | 'light-' + function extensions(themeOptions: Options): Extension[] { return [ EditorView.editable.of(false),