merge

windmill-labs · Jan 18, 2025 · 87180bd · 87180bd
1 parent de910dd
commit 87180bd
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 27,403 deletions.
diff --git a/frontend/package.json b/frontend/package.json
@@ -86,15 +86,8 @@
 	"dependencies": {
 		"@anthropic-ai/sdk": "^0.32.1",
 		"@aws-crypto/sha256-js": "^4.0.0",
-<<<<<<< HEAD
-		"@mistralai/mistralai": "^1.3.0",
 		"@codingame/monaco-vscode-configuration-service-override": "~11.1.2",
 		"@codingame/monaco-vscode-standalone-css-language-features": "~11.1.2",
-		"@codingame/monaco-vscode-standalone-html-language-features": "~11.1.2",
-=======
-		"@codingame/monaco-vscode-configuration-service-override": "~11.1.2",
-		"@codingame/monaco-vscode-standalone-css-language-features": "~11.1.2",
->>>>>>> main
 		"@codingame/monaco-vscode-standalone-json-language-features": "~11.1.2",
 		"@codingame/monaco-vscode-standalone-languages": "~11.1.2",
 		"@codingame/monaco-vscode-standalone-typescript-language-features": "~11.1.2",

diff --git a/frontend/src/lib/components/Editor.svelte b/frontend/src/lib/components/Editor.svelte
@@ -752,12 +752,7 @@
 								})
 						}
 					}
-<<<<<<< HEAD
 				},
-				messageTransports: transports
-=======
-				}
->>>>>>> main
 			})
 			return client
 		}

diff --git a/frontend/src/lib/components/SimpleEditor.svelte b/frontend/src/lib/components/SimpleEditor.svelte
@@ -54,14 +54,7 @@
 		type IDisposable
 	} from 'monaco-editor'
 
-<<<<<<< HEAD
-	// import '@codingame/monaco-vscode-standalone-languages'
-	import '@codingame/monaco-vscode-standalone-json-language-features'
-	import '@codingame/monaco-vscode-standalone-css-language-features'
-	import '@codingame/monaco-vscode-standalone-typescript-language-features'
 
-=======
->>>>>>> main
 	import { allClasses } from './apps/editor/componentsPanel/cssUtils'
 
 	import { createEventDispatcher, onDestroy, onMount } from 'svelte'

diff --git a/frontend/src/lib/components/vscode.ts b/frontend/src/lib/components/vscode.ts
@@ -5,12 +5,7 @@ import getMonarchServiceOverride from '@codingame/monaco-vscode-monarch-service-
 import '@codingame/monaco-vscode-standalone-typescript-language-features'
 import getConfigurationServiceOverride from '@codingame/monaco-vscode-configuration-service-override'
 import { editor as meditor } from 'monaco-editor/esm/vs/editor/editor.api'
-<<<<<<< HEAD
-import { ConsoleLogger } from 'monaco-languageclient/tools'
-import { LogLevel } from 'vscode'
-=======
 import getConfigurationServiceOverride from '@codingame/monaco-vscode-configuration-service-override'
->>>>>>> main
 
 export let isInitialized = false
 export let isInitializing = false
@@ -22,30 +17,6 @@ export async function initializeVscode(caller?: string, htmlContainer?: HTMLElem
 
 		try {
 			// init vscode-api
-<<<<<<< HEAD
-			// await initServices({
-			// 	serviceConfig: {
-			// 		userServices: {
-			// 			// ...getThemeServiceOverride(),
-			// 			// ...getTextmateServiceOverride()
-			// 			...getMonarchServiceOverride()
-			// 		},
-			// 		debugLogging: true,
-			// 		enableExtHostWorker: false
-			// 	}
-			// })
-			const logger = new ConsoleLogger(LogLevel.Debug)
-			await initServices(
-				{
-					serviceOverrides: {
-						...getMonarchServiceOverride(),
-						...getConfigurationServiceOverride()
-					}
-				},
-				{
-					htmlContainer,
-					logger
-=======
 			await initServices({
 				serviceOverrides: {
 					// ...getThemeServiceOverride(),
@@ -58,9 +29,8 @@ export async function initializeVscode(caller?: string, htmlContainer?: HTMLElem
 					json: JSON.stringify({
 						'editor.experimental.asyncTokenization': true
 					})
->>>>>>> main
 				}
-			)
+			})
 
 			isInitialized = true
 			meditor.defineTheme('nord', {