Skip to content

Commit ee59b58

Browse files
authored
Revert "fix: monaco editor upgrade (#42232)"
This reverts commit 0b1c02e.
1 parent 0b1c02e commit ee59b58

File tree

5 files changed

+24
-174
lines changed

5 files changed

+24
-174
lines changed

frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
"mathjax-full": "3.2.2",
187187
"md5": "^2.3.0",
188188
"mdast-util-find-and-replace": "^3.0.2",
189-
"monaco-editor": "^0.55.1",
189+
"monaco-editor": "^0.49.0",
190190
"natural-orderby": "^3.0.2",
191191
"openai": "^4.81.0",
192192
"papaparse": "^5.4.1",

frontend/src/lib/components/MonacoDiffEditor.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// adapted from https://github.com/react-monaco-editor/react-monaco-editor/blob/d2fd2521e0557c880dec93acaab9a087f025426c/src/diff.tsx
2-
import * as monaco from 'monaco-editor'
2+
import * as monaco from 'monaco-editor/esm/vs/editor/editor.api'
33
import { forwardRef, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react'
44

55
import { useOnMountEffect } from 'lib/hooks/useOnMountEffect'
@@ -15,8 +15,8 @@ interface MonacoDiffEditorProps {
1515
options?: monaco.editor.IDiffEditorConstructionOptions
1616
onChange?: (value: string, event: monaco.editor.IModelContentChangedEvent) => void
1717
className?: string | null
18-
originalUri?: (m: typeof monaco) => monaco.Uri
19-
modifiedUri?: (m: typeof monaco) => monaco.Uri
18+
originalUri?: (monaco: typeof import('monaco-editor')) => monaco.Uri
19+
modifiedUri?: (monaco: typeof import('monaco-editor')) => monaco.Uri
2020
}
2121

2222
const LINE_HEIGHT = 18

frontend/src/lib/monaco/CodeEditor.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import './CodeEditor.scss'
22

33
import MonacoEditor, { type EditorProps, Monaco, DiffEditor as MonacoDiffEditor, loader } from '@monaco-editor/react'
44
import { BuiltLogic, useMountedLogic, useValues } from 'kea'
5-
import * as monacoModule from 'monaco-editor'
5+
import * as monaco from 'monaco-editor'
66
import { IDisposable, editor, editor as importedEditor } from 'monaco-editor'
77
import { useEffect, useMemo, useRef, useState } from 'react'
88

@@ -23,7 +23,7 @@ import { themeLogic } from '~/layout/navigation-3000/themeLogic'
2323
import { AnyDataNode, HogLanguage, HogQLMetadataResponse, NodeKind } from '~/queries/schema/schema-general'
2424

2525
if (loader) {
26-
loader.config({ monaco: monacoModule })
26+
loader.config({ monaco })
2727
}
2828

2929
export interface CodeEditorProps extends Omit<EditorProps, 'loading' | 'theme'> {
@@ -180,10 +180,10 @@ export function CodeEditor({
180180
if (!monaco) {
181181
return
182182
}
183-
monacoModule.typescript.typescriptDefaults.setCompilerOptions({
183+
monaco.languages.typescript.typescriptDefaults.setCompilerOptions({
184184
jsx: editorProps?.path?.endsWith('.tsx')
185-
? monacoModule.typescript.JsxEmit.React
186-
: monacoModule.typescript.JsxEmit.Preserve,
185+
? monaco.languages.typescript.JsxEmit.React
186+
: monaco.languages.typescript.JsxEmit.Preserve,
187187
esModuleInterop: true,
188188
})
189189
}, [monaco, editorProps.path])
@@ -192,7 +192,7 @@ export function CodeEditor({
192192
if (!monaco) {
193193
return
194194
}
195-
monacoModule.json.jsonDefaults.setDiagnosticsOptions({
195+
monaco.languages.json.jsonDefaults.setDiagnosticsOptions({
196196
validate: true,
197197
schemas: schema
198198
? [

playwright/e2e/sql-editor.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ test.describe('SQL Editor', () => {
1919
test('Run query', async ({ page }) => {
2020
await expect(page.locator('[data-attr=sql-editor-output-pane-empty-state]')).toBeVisible()
2121
await page.locator('[data-attr=hogql-query-editor]').click()
22-
await page.locator('[data-attr=hogql-query-editor]').pressSequentially('SELECT 1')
22+
await page.locator('textarea[aria-roledescription="editor"]').fill('SELECT 1')
2323
await page.locator('[data-attr=sql-editor-run-button]').click()
2424

2525
// query run
@@ -30,7 +30,7 @@ test.describe('SQL Editor', () => {
3030
// Wait for the query editor to be visible and ready
3131
await expect(page.locator('[data-attr=hogql-query-editor]')).toBeVisible()
3232
await page.locator('[data-attr=hogql-query-editor]').click()
33-
await page.locator('[data-attr=hogql-query-editor]').pressSequentially('SELECT 1')
33+
await page.locator('textarea[aria-roledescription="editor"]').fill('SELECT 1')
3434

3535
// Wait for save button to be enabled before clicking
3636
await expect(page.locator('[data-attr=sql-editor-save-view-button]')).toBeEnabled()

pnpm-lock.yaml

Lines changed: 12 additions & 162 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)