windmill-components 1.394.6 → 1.394.8

package/package/components/DiffEditor.svelte

@@ -6,8 +6,8 @@ import '@codingame/monaco-vscode-standalone-typescript-language-features';
 import { editor as meditor } from 'monaco-editor';
 import { initializeVscode } from './vscode';
 import EditorTheme from './EditorTheme.svelte';
-import { buildWorkerDefinition } from './build_workers';
-buildWorkerDefinition('../../../workers', import.meta.url, false);
+import { buildWorkerDefinition } from '../monaco_workers/build_workers';
+buildWorkerDefinition();
 const SIDE_BY_SIDE_MIN_WIDTH = 700;
 export let automaticLayout = true;
 export let fixedOverflowWidgets = true;

package/package/components/Editor.svelte

@@ -115,7 +115,6 @@ import { CloseAction, ErrorAction, RequestType } from 'vscode-languageclient';
 import { MonacoBinding } from 'y-monaco';
 import { dbSchemas, copilotInfo, codeCompletionSessionEnabled, lspTokenStore, formatOnSave, vimMode } from '../stores';
 import { createHash as randomHash, editorConfig, langToExt, updateOptions } from '../editorUtils';
-import { buildWorkerDefinition } from './build_workers';
 import { workspaceStore } from '../stores';
 import { UserService } from '../gen';
 import { initializeVscode } from './vscode';
@@ -128,6 +127,7 @@ import { BIGQUERY_TYPES, MSSQL_TYPES, MYSQL_TYPES, POSTGRES_TYPES, SNOWFLAKE_TYP
 import { setupTypeAcquisition } from '../ata/index';
 import { initWasmTs, parseDeps } from '../infer';
 import { initVim } from './monaco_keybindings';
+import { buildWorkerDefinition } from '../monaco_workers/build_workers';
 // import EditorTheme from './EditorTheme.svelte'
 let divEl = null;
 let editor = null;
@@ -183,7 +183,7 @@ const uri = lang != 'go' && lang != 'typescript' && lang != 'python'
     ? `file:///${filePath ?? rHash}.${langToExt(lang)}`
     : `file:///tmp/monaco/${randomHash()}.${langToExt(lang)}`;
 console.log('uri', uri);
-buildWorkerDefinition('../../../workers', import.meta.url, false);
+buildWorkerDefinition();
 export function getCode() {
     return editor?.getValue() ?? '';
 }

package/package/components/SimpleEditor.svelte

@@ -39,12 +39,12 @@ import { allClasses } from './apps/editor/componentsPanel/cssUtils';
 import { createEventDispatcher, onDestroy, onMount } from 'svelte';
 import libStdContent from '../es6.d.ts.txt?raw';
 import domContent from '../dom.d.ts.txt?raw';
-import { buildWorkerDefinition } from './build_workers';
 import { initializeVscode } from './vscode';
 import EditorTheme from './EditorTheme.svelte';
 import { writable } from 'svelte/store';
 import { vimMode } from '../stores';
 import { initVim } from './monaco_keybindings';
+import { buildWorkerDefinition } from '../monaco_workers/build_workers';
 // import { createConfiguredEditor } from 'vscode/monaco'
 // import type { IStandaloneCodeEditor } from 'vscode/vscode/vs/editor/standalone/browser/standaloneCodeEditor'
 let divEl = null;
@@ -67,7 +67,7 @@ export let allowVim = false;
 export let tailwindClasses = [];
 const dispatch = createEventDispatcher();
 const uri = `file:///${hash}.${langToExt(lang)}`;
-buildWorkerDefinition('../../../workers', import.meta.url);
+buildWorkerDefinition();
 export function getCode() {
     return editor?.getValue() ?? '';
 }

package/package/components/TemplateEditor.svelte

@@ -4,11 +4,11 @@ import libStdContent from '../es6.d.ts.txt?raw';
 import { editor as meditor, Uri as mUri, languages, Range, KeyMod, KeyCode } from 'monaco-editor';
 import { createEventDispatcher, getContext, onDestroy, onMount } from 'svelte';
 import { writable } from 'svelte/store';
-import { buildWorkerDefinition } from './build_workers';
 import '@codingame/monaco-vscode-standalone-languages';
 import '@codingame/monaco-vscode-standalone-typescript-language-features';
 import { initializeVscode } from './vscode';
 import EditorTheme from './EditorTheme.svelte';
+import { buildWorkerDefinition } from '../monaco_workers/build_workers';
 export const conf = {
     wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g,
     comments: {
@@ -336,7 +336,7 @@ if (typeof code != 'string') {
 const lang = 'template';
 const dispatch = createEventDispatcher();
 const uri = `file:///${hash}.ts`;
-buildWorkerDefinition('../../../workers', import.meta.url, false);
+buildWorkerDefinition();
 export function insertAtCursor(code) {
     if (editor) {
         editor.trigger('keyboard', 'type', { text: code });

package/package/monaco_workers/build_workers.d.ts

@@ -0,0 +1 @@
+export declare function buildWorkerDefinition(): void;

package/package/{components → monaco_workers}/build_workers.js

@@ -3,7 +3,7 @@ import { useWorkerFactory } from 'monaco-editor-wrapper/workerFactory';
 // import htmlWorker from 'monaco-editor-wrapper/workers/module/html?worker&url'
 // import jsonWorker from 'monaco-editor-wrapper/workers/module/json?worker&url'
 // import editorWorker from 'monaco-editor-wrapper/workers/module/editor?worker&url'
-export function buildWorkerDefinition(workerPath, basePath, ...args) {
+export function buildWorkerDefinition() {
     useWorkerFactory({
         ignoreMapping: true,
         workerLoaders: {
@@ -38,10 +38,8 @@ export function buildWorkerDefinition(workerPath, basePath, ...args) {
                 });
             },
             graphql: () => {
-                const workerFilename = `graphql.worker.bundle.js`;
-                const workerPathLocal = `${workerPath}/${workerFilename}`;
-                const workerUrl = new URL(workerPathLocal, basePath);
-                return new Worker(workerUrl.href, {
+                console.log('Creating graphql worker');
+                return new Worker(new URL(`./graphql.worker.bundle.js`, import.meta.url), {
                     name: 'graphql'
                 });
             }