From bb620aba2402c1d8fbbc1272d94b72852f5301c6 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Thu, 12 Sep 2024 21:41:00 +0200 Subject: [PATCH] appselect default value fix nit + editor workers are url based --- .../apps/components/inputs/AppSelect.svelte | 2 +- frontend/src/lib/components/build_workers.ts | 43 +++++++++++-------- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/frontend/src/lib/components/apps/components/inputs/AppSelect.svelte b/frontend/src/lib/components/apps/components/inputs/AppSelect.svelte index a25ca2d623..25dcd54388 100644 --- a/frontend/src/lib/components/apps/components/inputs/AppSelect.svelte +++ b/frontend/src/lib/components/apps/components/inputs/AppSelect.svelte @@ -194,7 +194,7 @@ $: resolvedConfig.defaultValue && handleDefault() function handleDefault() { - if (resolvedConfig.defaultValue) { + if (resolvedConfig.defaultValue != undefined) { const nvalue = resolvedConfig.defaultValue value = JSON.stringify(nvalue) outputs?.result.set(nvalue) diff --git a/frontend/src/lib/components/build_workers.ts b/frontend/src/lib/components/build_workers.ts index b25b4f4097..172f74a20a 100644 --- a/frontend/src/lib/components/build_workers.ts +++ b/frontend/src/lib/components/build_workers.ts @@ -1,41 +1,46 @@ import { useWorkerFactory } from 'monaco-editor-wrapper/workerFactory' -import cssWorker from 'monaco-editor-wrapper/workers/module/css?worker' -import htmlWorker from 'monaco-editor-wrapper/workers/module/html?worker' -import tsWorker from 'monaco-editor-wrapper/workers/module/ts?worker' -import jsonWorker from 'monaco-editor-wrapper/workers/module/json?worker' -import editorWorker from 'monaco-editor-wrapper/workers/module/editor?worker' + +import tsWorker from 'monaco-editor-wrapper/workers/module/ts?url' +import cssWorker from 'monaco-editor-wrapper/workers/module/css?url' +import htmlWorker from 'monaco-editor-wrapper/workers/module/html?url' +import jsonWorker from 'monaco-editor-wrapper/workers/module/json?url' +import editorWorker from 'monaco-editor-wrapper/workers/module/editor?url' export function buildWorkerDefinition(workerPath: string, basePath: string, ...args: any[]) { useWorkerFactory({ ignoreMapping: true, workerLoaders: { editorWorkerService: () => { - console.log('editorWorkerService') - return new editorWorker() + return new Worker(new URL(editorWorker, import.meta.url), { + type: 'module' + }) }, javascript: () => { - console.log('javascript') - return new tsWorker() + return new Worker(new URL(tsWorker, import.meta.url), { + type: 'module' + }) }, - typescript: () => { - console.log('typescript') - return new tsWorker() + return new Worker(new URL(tsWorker, import.meta.url), { + type: 'module' + }) }, json: () => { - console.log('json') - return new jsonWorker() + return new Worker(new URL(jsonWorker, import.meta.url), { + type: 'module' + }) }, html: () => { - console.log('html') - return new htmlWorker() + return new Worker(new URL(htmlWorker, import.meta.url), { + type: 'module' + }) }, css: () => { - console.log('html') - return new cssWorker() + return new Worker(new URL(cssWorker, import.meta.url), { + type: 'module' + }) }, graphql: () => { - console.log('graphql') const workerFilename = `graphql.worker.bundle.js` const workerPathLocal = `${workerPath}/${workerFilename}` const workerUrl = new URL(workerPathLocal, basePath)