fix: update monaco-editor to latest monaco/language-client (windmill-…

…labs#4285) * all * all * all * recomment useless extralib imports * small impr
shashtag · Aug 25, 2024 · 32c0b89 · 32c0b89
1 parent 2382a7d
commit 32c0b89
Show file tree

Hide file tree

Showing 19 changed files with 3,148 additions and 490 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.383.1",
+	"version": "1.383.8",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
@@ -17,6 +17,7 @@
 		"filter-classes": "node filterTailwindClasses.js"
 	},
 	"devDependencies": {
+		"@windmill-labs/esbuild-import-meta-url-plugin": "0.0.0-semantic-release",
 		"@floating-ui/core": "^1.3.1",
 		"@hey-api/openapi-ts": "^0.43.0",
 		"@playwright/test": "^1.34.3",
@@ -72,25 +73,25 @@
 		"@rgossiaux/svelte-headlessui": {
 			"svelte": "$svelte"
 		},
-		"ag-grid-svelte": {
-			"svelte": "$svelte"
+		"monaco-graphql": {
+			"monaco-editor": "$monaco-editor"
 		},
 		"svelte-chartjs": {
 			"svelte": "$svelte"
-		},
-		"svelte-timezone-picker": {
-			"svelte": "$svelte"
-		},
-		"monaco-editor": "$monaco-editor",
-		"vscode": "$vscode"
-	},
-	"resolutions": {
-		"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
-		"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.5 <1.84.0"
+		}
 	},
 	"type": "module",
 	"dependencies": {
 		"@aws-crypto/sha256-js": "^4.0.0",
+		"@codingame/monaco-vscode-configuration-service-override": "~8.0.2",
+		"@codingame/monaco-vscode-files-service-override": "~8.0.2",
+		"@codingame/monaco-vscode-keybindings-service-override": "~8.0.2",
+		"@codingame/monaco-vscode-lifecycle-service-override": "~8.0.2",
+		"@codingame/monaco-vscode-localization-service-override": "~8.0.2",
+		"@codingame/monaco-vscode-standalone-json-language-features": "~8.0.2",
+		"@codingame/monaco-vscode-standalone-languages": "~8.0.2",
+		"@codingame/monaco-vscode-standalone-css-language-features": "~8.0.2",
+		"@codingame/monaco-vscode-standalone-typescript-language-features": "~8.0.2",
 		"@json2csv/plainjs": "^7.0.6",
 		"@leeoniya/ufuzzy": "^1.0.8",
 		"@popperjs/core": "^2.11.6",
@@ -117,9 +118,10 @@
 		"highlight.js": "^11.8.0",
 		"lucide-svelte": "^0.293.0",
 		"minimatch": "^10.0.1",
-		"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
-		"monaco-graphql": "^1.5.1",
-		"monaco-languageclient": "~7.0.1",
+		"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~8.0.2",
+		"monaco-editor-wrapper": "^5.5.2",
+		"monaco-graphql": "^1.6.0",
+		"monaco-languageclient": "~8.8.2",
 		"ol": "^7.4.0",
 		"openai": "^4.47.1",
 		"p-limit": "^6.1.0",
@@ -132,10 +134,10 @@
 		"svelte-infinite-loading": "^1.3.8",
 		"svelte-tiny-virtual-list": "^2.0.5",
 		"tailwind-merge": "^1.13.2",
-		"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.5 <1.84.0",
+		"vscode": "npm:@codingame/monaco-vscode-api@~8.0.2",
 		"vscode-languageclient": "~9.0.1",
 		"vscode-uri": "~3.0.8",
-		"vscode-ws-jsonrpc": "~3.1.0",
+		"vscode-ws-jsonrpc": "~3.3.2",
 		"windmill-parser-wasm": "^1.367.2",
 		"windmill-sql-datatype-parser-wasm": "^1.318.0",
 		"y-monaco": "^0.1.4",

diff --git a/frontend/src/lib/components/DiffDrawer.svelte b/frontend/src/lib/components/DiffDrawer.svelte
@@ -209,6 +209,7 @@
 							{#key diffType}
 								{#if contentType === 'content'}
 									<DiffEditor
+										open={true}
 										automaticLayout
 										class="h-full"
 										defaultLang={lang}
@@ -219,6 +220,7 @@
 									/>
 								{:else if contentType === 'metadata'}
 									<DiffEditor
+										open={true}
 										automaticLayout
 										class="h-full"
 										defaultLang="yaml"

diff --git a/frontend/src/lib/components/DiffEditor.svelte b/frontend/src/lib/components/DiffEditor.svelte
@@ -2,13 +2,11 @@
 	import { BROWSER } from 'esm-env'
 	import { onMount } from 'svelte'
 
+	import '@codingame/monaco-vscode-standalone-languages'
+	import '@codingame/monaco-vscode-standalone-json-language-features'
+	import '@codingame/monaco-vscode-standalone-typescript-language-features'
 	import { editor as meditor } from 'monaco-editor'
-	import 'monaco-editor/esm/vs/basic-languages/python/python.contribution'
-	import 'monaco-editor/esm/vs/basic-languages/go/go.contribution'
-	import 'monaco-editor/esm/vs/basic-languages/shell/shell.contribution'
-	import 'monaco-editor/esm/vs/basic-languages/typescript/typescript.contribution'
-	import 'monaco-editor/esm/vs/basic-languages/sql/sql.contribution'
-	import 'monaco-editor/esm/vs/language/typescript/monaco.contribution'
+
 	import { initializeVscode } from './vscode'
 	import EditorTheme from './EditorTheme.svelte'
 	import { buildWorkerDefinition } from './build_workers'
@@ -29,6 +27,7 @@
 	let diffDivEl: HTMLDivElement | null = null
 	let editorWidth: number = SIDE_BY_SIDE_MIN_WIDTH
 
+	export let open = false
 	async function loadDiffEditor() {
 		await initializeVscode()
 
@@ -55,7 +54,10 @@
 			defaultModified !== undefined &&
 			defaultLang !== undefined
 		) {
+			console.log('SETUP')
 			setupModel(defaultLang, defaultOriginal, defaultModified, defaultModifiedLang)
+		} else {
+			console.log('NO SETUP', defaultOriginal, defaultModified, defaultLang)
 		}
 	}
 
@@ -78,7 +80,9 @@
 	}
 
 	export function setOriginal(code: string) {
+		console.log('setOriginal', code)
 		diffEditor?.getModel()?.original?.setValue(code)
+		defaultOriginal = code
 	}
 
 	export function getOriginal(): string {
@@ -87,17 +91,19 @@
 
 	export function setModified(code: string) {
 		diffEditor?.getModel()?.modified?.setValue(code)
+		defaultModified = code
 	}
 
 	export function getModified(): string {
 		return diffEditor?.getModel()?.modified.getValue() ?? ''
 	}
 
 	export function show(): void {
-		diffDivEl?.classList.remove('hidden')
+		console.log('show')
+		open = true
 	}
 	export function hide(): void {
-		diffDivEl?.classList.add('hidden')
+		open = false
 	}
 
 	function onWidthChange(editorWidth: number) {
@@ -106,16 +112,18 @@
 
 	$: onWidthChange(editorWidth)
 
+	$: open && diffDivEl && loadDiffEditor()
+
 	onMount(() => {
 		if (BROWSER) {
-			loadDiffEditor()
 			return () => {
 				diffEditor?.dispose()
 			}
 		}
 	})
 </script>
 
-<EditorTheme />
-
-<div bind:this={diffDivEl} class="{$$props.class} editor" bind:clientWidth={editorWidth} />
+{#if open}
+	<EditorTheme />
+	<div bind:this={diffDivEl} class="{$$props.class} editor" bind:clientWidth={editorWidth} />
+{/if}