Compare commits
6 Commits
v1.306.1
...
rf/monacoU
| Author | SHA1 | Date | |
|---|---|---|---|
|
2f46459844 | ||
|
|
f82dfa7e97 | ||
|
|
a605d79f21 | ||
|
|
71635646e8 | ||
|
|
8783fe0c7d | ||
|
|
6ea5965819 |
@@ -1,5 +1,12 @@
|
||||
# Changelog
|
||||
|
||||
## [1.306.2](https://github.com/windmill-labs/windmill/compare/v1.306.1...v1.306.2) (2024-04-12)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* fix actions buttons error ([6ea5965](https://github.com/windmill-labs/windmill/commit/6ea59658196339600e39776c690d6924e355f471))
|
||||
|
||||
## [1.306.1](https://github.com/windmill-labs/windmill/compare/v1.306.0...v1.306.1) (2024-04-12)
|
||||
|
||||
|
||||
|
||||
40
backend/Cargo.lock
generated
40
backend/Cargo.lock
generated
@@ -3917,9 +3917,9 @@ checksum = "9028f49264629065d057f340a86acb84867925865f73bbf8d47b4d149a7e88b8"
|
||||
|
||||
[[package]]
|
||||
name = "jobserver"
|
||||
version = "0.1.29"
|
||||
version = "0.1.30"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f08474e32172238f2827bd160c67871cdb2801430f65c3979184dc362e3ca118"
|
||||
checksum = "685a7d121ee3f65ae4fddd72b25a04bb36b6af81bc0828f7d5434c0fe60fa3a2"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
@@ -9707,7 +9707,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||
|
||||
[[package]]
|
||||
name = "windmill"
|
||||
version = "1.306.1"
|
||||
version = "1.306.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"axum",
|
||||
@@ -9744,7 +9744,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "windmill-api"
|
||||
version = "1.306.1"
|
||||
version = "1.306.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"argon2",
|
||||
@@ -9821,7 +9821,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "windmill-api-client"
|
||||
version = "1.306.1"
|
||||
version = "1.306.2"
|
||||
dependencies = [
|
||||
"base64 0.21.7",
|
||||
"chrono",
|
||||
@@ -9839,7 +9839,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "windmill-audit"
|
||||
version = "1.306.1"
|
||||
version = "1.306.2"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"serde",
|
||||
@@ -9852,7 +9852,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "windmill-common"
|
||||
version = "1.306.1"
|
||||
version = "1.306.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"aws-config",
|
||||
@@ -9888,7 +9888,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "windmill-git-sync"
|
||||
version = "1.306.1"
|
||||
version = "1.306.2"
|
||||
dependencies = [
|
||||
"regex",
|
||||
"rsmq_async",
|
||||
@@ -9903,7 +9903,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "windmill-parser"
|
||||
version = "1.306.1"
|
||||
version = "1.306.2"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"serde_json",
|
||||
@@ -9911,7 +9911,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "windmill-parser-bash"
|
||||
version = "1.306.1"
|
||||
version = "1.306.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"lazy_static",
|
||||
@@ -9922,7 +9922,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "windmill-parser-go"
|
||||
version = "1.306.1"
|
||||
version = "1.306.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"gosyn",
|
||||
@@ -9934,7 +9934,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "windmill-parser-graphql"
|
||||
version = "1.306.1"
|
||||
version = "1.306.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"lazy_static",
|
||||
@@ -9945,7 +9945,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "windmill-parser-py"
|
||||
version = "1.306.1"
|
||||
version = "1.306.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"itertools 0.12.1",
|
||||
@@ -9956,7 +9956,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "windmill-parser-py-imports"
|
||||
version = "1.306.1"
|
||||
version = "1.306.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-recursion",
|
||||
@@ -9973,7 +9973,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "windmill-parser-sql"
|
||||
version = "1.306.1"
|
||||
version = "1.306.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"lazy_static",
|
||||
@@ -9984,7 +9984,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "windmill-parser-ts"
|
||||
version = "1.306.1"
|
||||
version = "1.306.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"convert_case 0.6.0",
|
||||
@@ -10002,7 +10002,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "windmill-parser-wasm"
|
||||
version = "1.306.1"
|
||||
version = "1.306.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"getrandom 0.2.14",
|
||||
@@ -10020,7 +10020,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "windmill-queue"
|
||||
version = "1.306.1"
|
||||
version = "1.306.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-recursion",
|
||||
@@ -10053,7 +10053,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "windmill-sql-datatype-parser-wasm"
|
||||
version = "1.306.1"
|
||||
version = "1.306.2"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"wasm-bindgen",
|
||||
@@ -10064,7 +10064,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "windmill-worker"
|
||||
version = "1.306.1"
|
||||
version = "1.306.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-recursion",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "windmill"
|
||||
version = "1.306.1"
|
||||
version = "1.306.2"
|
||||
authors.workspace = true
|
||||
edition.workspace = true
|
||||
|
||||
@@ -24,7 +24,7 @@ members = [
|
||||
]
|
||||
|
||||
[workspace.package]
|
||||
version = "1.306.1"
|
||||
version = "1.306.2"
|
||||
authors = ["Ruben Fiszel <ruben@windmill.dev>"]
|
||||
edition = "2021"
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
openapi: "3.0.3"
|
||||
|
||||
info:
|
||||
version: 1.306.1
|
||||
version: 1.306.2
|
||||
title: Windmill API
|
||||
|
||||
contact:
|
||||
|
||||
@@ -2,7 +2,7 @@ import { sleep } from "https://deno.land/x/sleep@v1.2.1/mod.ts";
|
||||
import * as windmill from "https://deno.land/x/windmill@v1.174.0/mod.ts";
|
||||
import * as api from "https://deno.land/x/windmill@v1.174.0/windmill-api/index.ts";
|
||||
|
||||
export const VERSION = "v1.306.1";
|
||||
export const VERSION = "v1.306.2";
|
||||
|
||||
export async function login(email: string, password: string): Promise<string> {
|
||||
return await windmill.UserService.login({
|
||||
|
||||
@@ -31,7 +31,7 @@ addEventListener("error", (event) => {
|
||||
}
|
||||
});
|
||||
|
||||
export const VERSION = "v1.306.1";
|
||||
export const VERSION = "v1.306.2";
|
||||
|
||||
let command: any = new Command()
|
||||
.name("wmill")
|
||||
|
||||
3710
frontend/package-lock.json
generated
3710
frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "windmill-components",
|
||||
"version": "1.306.1",
|
||||
"version": "1.306.9",
|
||||
"scripts": {
|
||||
"dev": "vite dev",
|
||||
"build": "vite build",
|
||||
@@ -17,6 +17,7 @@
|
||||
"filter-classes": "node filterTailwindClasses.js"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@codingame/esbuild-import-meta-url-plugin": "^1.0.2",
|
||||
"@floating-ui/core": "^1.3.1",
|
||||
"@playwright/test": "^1.34.3",
|
||||
"@rgossiaux/svelte-headlessui": "^2.0.0",
|
||||
@@ -81,17 +82,24 @@
|
||||
},
|
||||
"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-go-default-extension": "^4.2.1",
|
||||
"@codingame/monaco-vscode-javascript-default-extension": "^4.2.1",
|
||||
"@codingame/monaco-vscode-json-default-extension": "^4.2.1",
|
||||
"@codingame/monaco-vscode-powershell-default-extension": "^4.2.1",
|
||||
"@codingame/monaco-vscode-python-default-extension": "^4.2.1",
|
||||
"@codingame/monaco-vscode-shellscript-default-extension": "^4.2.1",
|
||||
"@codingame/monaco-vscode-sql-default-extension": "^4.2.1",
|
||||
"@codingame/monaco-vscode-standalone-css-language-features": "^4.2.1",
|
||||
"@codingame/monaco-vscode-standalone-html-language-features": "^4.2.1",
|
||||
"@codingame/monaco-vscode-standalone-json-language-features": "^4.2.1",
|
||||
"@codingame/monaco-vscode-standalone-typescript-language-features": "^4.2.1",
|
||||
"@codingame/monaco-vscode-typescript-basics-default-extension": "^4.2.1",
|
||||
"@codingame/monaco-vscode-typescript-language-features-default-extension": "^4.2.1",
|
||||
"@json2csv/plainjs": "^7.0.6",
|
||||
"@leeoniya/ufuzzy": "^1.0.8",
|
||||
"@popperjs/core": "^2.11.6",
|
||||
@@ -116,9 +124,14 @@
|
||||
"highlight.js": "^11.8.0",
|
||||
"lodash": "^4.17.21",
|
||||
"lucide-svelte": "^0.293.0",
|
||||
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
|
||||
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~4.2.1",
|
||||
"vscode": "npm:@codingame/monaco-vscode-api@~4.2.1",
|
||||
"vscode-languageclient": "~9.0.1",
|
||||
"vscode-uri": "~3.0.8",
|
||||
"vscode-ws-jsonrpc": "~3.3.1",
|
||||
"monaco-editor-wrapper": "^4.2.0",
|
||||
"monaco-graphql": "^1.5.1",
|
||||
"monaco-languageclient": "~7.0.1",
|
||||
"monaco-languageclient": "~8.3.0",
|
||||
"openai": "^4.3.0",
|
||||
"quill": "^1.3.7",
|
||||
"svelte-carousel": "^1.0.25",
|
||||
@@ -129,10 +142,6 @@
|
||||
"svelte-portal": "^2.2.1",
|
||||
"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-languageclient": "~9.0.1",
|
||||
"vscode-uri": "~3.0.8",
|
||||
"vscode-ws-jsonrpc": "~3.1.0",
|
||||
"windmill-parser-wasm": "^1.286.2",
|
||||
"windmill-sql-datatype-parser-wasm": "1.305.0",
|
||||
"y-monaco": "^0.1.4",
|
||||
@@ -291,6 +300,10 @@
|
||||
"types": "./package/gen/core/OpenAPI.d.ts",
|
||||
"default": "./package/gen/core/OpenAPI.js"
|
||||
},
|
||||
"./gen": {
|
||||
"default": "./package/gen/index.js",
|
||||
"types": "./package/gen/index.d.ts"
|
||||
},
|
||||
"./components/DropdownV2.svelte": {
|
||||
"types": "./package/components/DropdownV2.svelte.d.ts",
|
||||
"svelte": "./package/components/DropdownV2.svelte",
|
||||
@@ -377,6 +390,9 @@
|
||||
"stores": [
|
||||
"./package/stores.d.ts"
|
||||
],
|
||||
"gen": [
|
||||
"./package/gen/index.d.ts"
|
||||
],
|
||||
"components/flows/flowStore": [
|
||||
"./package/components/flows/flowStore.d.ts"
|
||||
],
|
||||
|
||||
@@ -3,17 +3,27 @@
|
||||
import { onMount } from 'svelte'
|
||||
|
||||
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 '@codingame/monaco-vscode-theme-defaults-default-extension'
|
||||
import '@codingame/monaco-vscode-json-default-extension'
|
||||
import '@codingame/monaco-vscode-standalone-json-language-features'
|
||||
import '@codingame/monaco-vscode-standalone-css-language-features'
|
||||
import '@codingame/monaco-vscode-standalone-html-language-features'
|
||||
import '@codingame/monaco-vscode-standalone-typescript-language-features'
|
||||
import '@codingame/monaco-vscode-typescript-basics-default-extension'
|
||||
import '@codingame/monaco-vscode-typescript-language-features-default-extension'
|
||||
import '@codingame/monaco-vscode-go-default-extension'
|
||||
import '@codingame/monaco-vscode-javascript-default-extension'
|
||||
import '@codingame/monaco-vscode-powershell-default-extension'
|
||||
import '@codingame/monaco-vscode-python-default-extension'
|
||||
import '@codingame/monaco-vscode-shellscript-default-extension'
|
||||
import '@codingame/monaco-vscode-sql-default-extension'
|
||||
|
||||
import { initializeVscode } from './vscode'
|
||||
import EditorTheme from './EditorTheme.svelte'
|
||||
import { buildWorkerDefinition } from './build_workers'
|
||||
import { configureMonacoWorkers } from './build_workers'
|
||||
|
||||
buildWorkerDefinition('../../../workers', import.meta.url, false)
|
||||
configureMonacoWorkers()
|
||||
|
||||
const SIDE_BY_SIDE_MIN_WIDTH = 700
|
||||
|
||||
|
||||
@@ -7,23 +7,27 @@
|
||||
|
||||
import * as vscode from 'vscode'
|
||||
|
||||
import { editor as meditor, languages, KeyCode, KeyMod, type IRange } from 'monaco-editor'
|
||||
|
||||
import '@codingame/monaco-vscode-theme-defaults-default-extension'
|
||||
import '@codingame/monaco-vscode-json-default-extension'
|
||||
import '@codingame/monaco-vscode-standalone-json-language-features'
|
||||
import '@codingame/monaco-vscode-standalone-css-language-features'
|
||||
import '@codingame/monaco-vscode-standalone-html-language-features'
|
||||
import '@codingame/monaco-vscode-standalone-typescript-language-features'
|
||||
import '@codingame/monaco-vscode-typescript-basics-default-extension'
|
||||
import '@codingame/monaco-vscode-typescript-language-features-default-extension'
|
||||
import '@codingame/monaco-vscode-go-default-extension'
|
||||
import '@codingame/monaco-vscode-javascript-default-extension'
|
||||
import '@codingame/monaco-vscode-powershell-default-extension'
|
||||
import '@codingame/monaco-vscode-python-default-extension'
|
||||
import '@codingame/monaco-vscode-shellscript-default-extension'
|
||||
import '@codingame/monaco-vscode-sql-default-extension'
|
||||
import {
|
||||
editor as meditor,
|
||||
languages,
|
||||
KeyCode,
|
||||
KeyMod,
|
||||
Uri as mUri,
|
||||
type IRange
|
||||
} 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/basic-languages/graphql/graphql.contribution'
|
||||
import 'monaco-editor/esm/vs/basic-languages/powershell/powershell.contribution'
|
||||
import 'monaco-editor/esm/vs/language/typescript/monaco.contribution'
|
||||
import 'monaco-editor/esm/vs/basic-languages/css/css.contribution'
|
||||
RegisteredFileSystemProvider,
|
||||
registerFileSystemOverlay,
|
||||
RegisteredMemoryFile
|
||||
} from '@codingame/monaco-vscode-files-service-override'
|
||||
|
||||
import libStdContent from '$lib/es6.d.ts.txt?raw'
|
||||
import denoFetchContent from '$lib/deno_fetch.d.ts.txt?raw'
|
||||
@@ -50,7 +54,6 @@
|
||||
} from '$lib/editorUtils'
|
||||
import type { Disposable } from 'vscode'
|
||||
import type { DocumentUri, MessageTransports } from 'vscode-languageclient'
|
||||
import { buildWorkerDefinition } from './build_workers'
|
||||
import { workspaceStore } from '$lib/stores'
|
||||
import { Preview, UserService } from '$lib/gen'
|
||||
import type { Text } from 'yjs'
|
||||
@@ -69,6 +72,7 @@
|
||||
} from '$lib/consts'
|
||||
import { setupTypeAcquisition } from '$lib/ata/index'
|
||||
import { initWasm, parseDeps } from '$lib/infer'
|
||||
import { configureMonacoWorkers } from './build_workers'
|
||||
// import EditorTheme from './EditorTheme.svelte'
|
||||
|
||||
let divEl: HTMLDivElement | null = null
|
||||
@@ -143,7 +147,7 @@
|
||||
|
||||
console.log('uri', uri)
|
||||
|
||||
buildWorkerDefinition('../../../workers', import.meta.url, false)
|
||||
configureMonacoWorkers()
|
||||
|
||||
export function getCode(): string {
|
||||
return editor?.getValue() ?? ''
|
||||
@@ -765,7 +769,7 @@
|
||||
if (scriptLang == 'bun' && ata == undefined) {
|
||||
const addLibraryToRuntime = async (code: string, _path: string) => {
|
||||
const path = 'file://' + _path
|
||||
let uri = mUri.parse(path)
|
||||
let uri = vscode.Uri.parse(path)
|
||||
console.log('adding library to runtime', path)
|
||||
languages.typescript.typescriptDefaults.addExtraLib(code, path)
|
||||
try {
|
||||
@@ -780,7 +784,7 @@
|
||||
// if (_path?.startsWith('/')) {
|
||||
// p = 'file://' + p
|
||||
// }
|
||||
let nuri = mUri.parse(p)
|
||||
let nuri = vscode.Uri.parse(p)
|
||||
console.log('adding local file', _path, nuri.toString())
|
||||
if (editor) {
|
||||
let localModel = meditor.getModel(nuri)
|
||||
@@ -1023,6 +1027,12 @@
|
||||
console.log('error initializing services', e)
|
||||
}
|
||||
|
||||
// register the JSON language with Monaco
|
||||
languages.register({
|
||||
id: 'typescript',
|
||||
extensions: ['.ts']
|
||||
})
|
||||
|
||||
// console.log('bef ready')
|
||||
// console.log('af ready')
|
||||
|
||||
@@ -1118,11 +1128,17 @@
|
||||
moduleResolution: languages.typescript.ModuleResolutionKind.NodeJs
|
||||
})
|
||||
|
||||
const fileSystemProvider = new RegisteredFileSystemProvider(false)
|
||||
fileSystemProvider.registerFile(
|
||||
new RegisteredMemoryFile(vscode.Uri.file('/workspace/hello.py'), code)
|
||||
)
|
||||
registerFileSystemOverlay(1, fileSystemProvider)
|
||||
|
||||
try {
|
||||
model = meditor.createModel(code, lang, mUri.parse(uri))
|
||||
model = meditor.createModel(code, lang, vscode.Uri.parse(uri))
|
||||
} catch (err) {
|
||||
console.log('model already existed', err)
|
||||
const nmodel = meditor.getModel(mUri.parse(uri))
|
||||
const nmodel = meditor.getModel(vscode.Uri.parse(uri))
|
||||
if (!nmodel) {
|
||||
throw err
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import { editor as meditor } from 'monaco-editor/esm/vs/editor/editor.api'
|
||||
import { editor as meditor } from 'monaco-editor'
|
||||
|
||||
import { onMount } from 'svelte'
|
||||
import DarkModeObserver from './DarkModeObserver.svelte'
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
import { BROWSER } from 'esm-env'
|
||||
|
||||
import { editor as meditor } from 'monaco-editor'
|
||||
import 'monaco-editor/esm/vs/basic-languages/graphql/graphql.contribution'
|
||||
|
||||
import { onDestroy, onMount } from 'svelte'
|
||||
|
||||
|
||||
@@ -15,12 +15,21 @@
|
||||
languages,
|
||||
type IRange
|
||||
} from 'monaco-editor'
|
||||
import 'monaco-editor/esm/vs/basic-languages/sql/sql.contribution'
|
||||
import 'monaco-editor/esm/vs/basic-languages/yaml/yaml.contribution'
|
||||
import 'monaco-editor/esm/vs/basic-languages/javascript/javascript.contribution'
|
||||
import 'monaco-editor/esm/vs/language/json/monaco.contribution'
|
||||
import 'monaco-editor/esm/vs/basic-languages/css/css.contribution'
|
||||
import 'monaco-editor/esm/vs/language/css/monaco.contribution'
|
||||
|
||||
import '@codingame/monaco-vscode-theme-defaults-default-extension'
|
||||
import '@codingame/monaco-vscode-json-default-extension'
|
||||
import '@codingame/monaco-vscode-standalone-json-language-features'
|
||||
import '@codingame/monaco-vscode-standalone-css-language-features'
|
||||
import '@codingame/monaco-vscode-standalone-html-language-features'
|
||||
import '@codingame/monaco-vscode-standalone-typescript-language-features'
|
||||
import '@codingame/monaco-vscode-typescript-basics-default-extension'
|
||||
import '@codingame/monaco-vscode-typescript-language-features-default-extension'
|
||||
import '@codingame/monaco-vscode-go-default-extension'
|
||||
import '@codingame/monaco-vscode-javascript-default-extension'
|
||||
import '@codingame/monaco-vscode-powershell-default-extension'
|
||||
import '@codingame/monaco-vscode-python-default-extension'
|
||||
import '@codingame/monaco-vscode-shellscript-default-extension'
|
||||
import '@codingame/monaco-vscode-sql-default-extension'
|
||||
|
||||
import { allClasses } from './apps/editor/componentsPanel/cssUtils'
|
||||
|
||||
@@ -28,11 +37,11 @@
|
||||
|
||||
import libStdContent from '$lib/es6.d.ts.txt?raw'
|
||||
import domContent from '$lib/dom.d.ts.txt?raw'
|
||||
import { buildWorkerDefinition } from './build_workers'
|
||||
import { initializeVscode } from './vscode'
|
||||
import EditorTheme from './EditorTheme.svelte'
|
||||
import { tailwindClasses } from './apps/editor/componentsPanel/tailwindUtils'
|
||||
import { writable } from 'svelte/store'
|
||||
import { configureMonacoWorkers } from './build_workers'
|
||||
// import { createConfiguredEditor } from 'vscode/monaco'
|
||||
// import type { IStandaloneCodeEditor } from 'vscode/vscode/vs/editor/standalone/browser/standaloneCodeEditor'
|
||||
|
||||
@@ -59,7 +68,7 @@
|
||||
|
||||
const uri = `file:///${hash}.${langToExt(lang)}`
|
||||
|
||||
buildWorkerDefinition('../../../workers', import.meta.url, false)
|
||||
configureMonacoWorkers()
|
||||
|
||||
export function getCode(): string {
|
||||
return editor?.getValue() ?? ''
|
||||
|
||||
@@ -13,12 +13,15 @@
|
||||
import { createEventDispatcher, getContext, onDestroy, onMount } from 'svelte'
|
||||
import type { AppViewerContext } from './apps/types'
|
||||
import { writable } from 'svelte/store'
|
||||
import { buildWorkerDefinition } from './build_workers'
|
||||
import 'monaco-editor/esm/vs/basic-languages/javascript/javascript.contribution'
|
||||
import 'monaco-editor/esm/vs/basic-languages/typescript/typescript.contribution'
|
||||
import 'monaco-editor/esm/vs/language/typescript/monaco.contribution'
|
||||
|
||||
import '@codingame/monaco-vscode-standalone-typescript-language-features'
|
||||
import '@codingame/monaco-vscode-typescript-basics-default-extension'
|
||||
import '@codingame/monaco-vscode-typescript-language-features-default-extension'
|
||||
import '@codingame/monaco-vscode-javascript-default-extension'
|
||||
|
||||
import { initializeVscode } from './vscode'
|
||||
import EditorTheme from './EditorTheme.svelte'
|
||||
import { configureMonacoWorkers } from './build_workers'
|
||||
|
||||
export const conf = {
|
||||
wordPattern:
|
||||
@@ -384,7 +387,7 @@
|
||||
|
||||
const uri = `file:///${hash}.ts`
|
||||
|
||||
buildWorkerDefinition('../../../workers', import.meta.url, false)
|
||||
configureMonacoWorkers()
|
||||
|
||||
export function insertAtCursor(code: string): void {
|
||||
if (editor) {
|
||||
|
||||
@@ -193,7 +193,10 @@ export function getNextGridItemId(app: App): string {
|
||||
const allIds = allItems(app.grid, app.subgrids).flatMap((x) => {
|
||||
if (x.data.type === 'tablecomponent') {
|
||||
return [x.id, ...x.data.actionButtons.map((x) => x.id)]
|
||||
} else if (x.data.type === 'aggridcomponent' || x.data.type === 'aggridcomponentee') {
|
||||
} else if (
|
||||
(x.data.type === 'aggridcomponent' || x.data.type === 'aggridcomponentee') &&
|
||||
Array.isArray(x.data.actions)
|
||||
) {
|
||||
return [x.id, ...x.data.actions.map((x) => x.id)]
|
||||
} else if (x.data.type === 'menucomponent') {
|
||||
return [x.id, ...x.data.menuItems.map((x) => x.id)]
|
||||
@@ -438,7 +441,7 @@ export function copyComponent(
|
||||
...item.data,
|
||||
id,
|
||||
actionButtons:
|
||||
item.data.actions.map((x) => ({
|
||||
(item.data.actions ?? []).map((x) => ({
|
||||
...x,
|
||||
id: x.id.replace(`${item.id}_`, `${id}_`)
|
||||
})) ?? []
|
||||
@@ -487,7 +490,7 @@ export function getAllSubgridsAndComponentIds(
|
||||
}
|
||||
|
||||
if (component.type === 'aggridcomponent' || component.type === 'aggridcomponentee') {
|
||||
components.push(...component.actions?.map((x) => x.id))
|
||||
components.push(...(component.actions?.map((x) => x.id) ?? []))
|
||||
}
|
||||
|
||||
if (component.type === 'menucomponent') {
|
||||
|
||||
@@ -63,7 +63,7 @@
|
||||
if (left.data.type === 'tablecomponent' && left.data.actionButtons.length >= 1) {
|
||||
$selectedComponent = [left.data.actionButtons[left.data.actionButtons.length - 1].id]
|
||||
} else if (
|
||||
(left.data.type === 'aggridcomponent' || left.data.type === 'aggridcomponentee') &&
|
||||
(left.data.type === 'aggridcomponent' || left.data.type === 'aggridcomponentee') && Array.isArray(left.data.actions) &&
|
||||
left.data.actions.length >= 1
|
||||
) {
|
||||
$selectedComponent = [left.data.actions[left.data.actions.length - 1].id]
|
||||
|
||||
@@ -91,7 +91,7 @@
|
||||
}
|
||||
|
||||
if (item?.data.type == 'aggridcomponent' || item?.data.type == 'aggridcomponentee') {
|
||||
for (let c of item.data.actions) {
|
||||
for (let c of item.data.actions ?? []) {
|
||||
let old = c.id
|
||||
c.id = c.id.replace(id + '_', newId + '_')
|
||||
propagateRename(old, c.id)
|
||||
@@ -119,7 +119,10 @@
|
||||
}
|
||||
}
|
||||
|
||||
if (data.type == 'aggridcomponent' || data.type == 'aggridcomponentee') {
|
||||
if (
|
||||
(data.type == 'aggridcomponent' || data.type == 'aggridcomponentee') &&
|
||||
Array.isArray(data.actions)
|
||||
) {
|
||||
for (let c of data.actions) {
|
||||
renameComponent(from, to, c)
|
||||
}
|
||||
|
||||
@@ -1,74 +1,7 @@
|
||||
import type { Environment } from 'monaco-editor/esm/vs/editor/editor.api.js'
|
||||
import cssWorker from 'monaco-editor/esm/vs/language/css/css.worker?worker'
|
||||
import htmlWorker from 'monaco-editor/esm/vs/language/html/html.worker?worker'
|
||||
import tsWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker'
|
||||
import jsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker'
|
||||
import editorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker'
|
||||
import { useWorkerFactory } from 'monaco-editor-wrapper/workerFactory'
|
||||
|
||||
interface MonacoEnvironmentEnhanced extends Environment {
|
||||
workerOverrideGlobals: WorkerOverrideGlobals
|
||||
}
|
||||
|
||||
type WorkerOverrideGlobals = {
|
||||
basePath: string
|
||||
workerPath: string
|
||||
workerOptions: WorkerOptions
|
||||
}
|
||||
|
||||
export function buildWorkerDefinition(
|
||||
workerPath: string,
|
||||
basePath: string,
|
||||
useModuleWorker: boolean
|
||||
) {
|
||||
const monWin = self as Window
|
||||
const workerOverrideGlobals: WorkerOverrideGlobals = {
|
||||
basePath: basePath,
|
||||
workerPath: workerPath,
|
||||
workerOptions: {
|
||||
type: useModuleWorker ? 'module' : 'classic'
|
||||
}
|
||||
}
|
||||
|
||||
if (!monWin.MonacoEnvironment) {
|
||||
monWin.MonacoEnvironment = {
|
||||
workerOverrideGlobals: workerOverrideGlobals,
|
||||
createTrustedTypesPolicy: (_policyName: string) => {
|
||||
return undefined
|
||||
}
|
||||
} as MonacoEnvironmentEnhanced
|
||||
}
|
||||
const monEnv = monWin.MonacoEnvironment as MonacoEnvironmentEnhanced
|
||||
monEnv.workerOverrideGlobals = workerOverrideGlobals
|
||||
|
||||
const getWorker = (_: string, label: string) => {
|
||||
console.log('getWorker: workerId: ' + _ + ' label: ' + label)
|
||||
|
||||
switch (label) {
|
||||
case 'template':
|
||||
case 'typescript':
|
||||
case 'javascript':
|
||||
return new tsWorker()
|
||||
case 'html':
|
||||
case 'handlebars':
|
||||
case 'razor':
|
||||
return new htmlWorker()
|
||||
case 'css':
|
||||
case 'scss':
|
||||
case 'less':
|
||||
return new cssWorker()
|
||||
case 'json':
|
||||
return new jsonWorker()
|
||||
case 'graphql':
|
||||
const workerFilename = `graphql.worker.bundle.js`
|
||||
const workerPathLocal = `${workerOverrideGlobals.workerPath}/${workerFilename}`
|
||||
const workerUrl = new URL(workerPathLocal, workerOverrideGlobals.basePath)
|
||||
return new Worker(workerUrl.href, {
|
||||
name: label
|
||||
})
|
||||
default:
|
||||
return new editorWorker()
|
||||
}
|
||||
}
|
||||
|
||||
monWin.MonacoEnvironment.getWorker = getWorker
|
||||
export const configureMonacoWorkers = () => {
|
||||
useWorkerFactory({
|
||||
basePath: '../../../node_modules'
|
||||
})
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { initServices } from 'monaco-languageclient'
|
||||
import { LogLevel } from 'vscode/services'
|
||||
import { editor as meditor } from 'monaco-editor/esm/vs/editor/editor.api'
|
||||
import { initServices } from 'monaco-languageclient/vscode/services'
|
||||
import getThemeServiceOverride from '@codingame/monaco-vscode-theme-service-override'
|
||||
import getTextmateServiceOverride from '@codingame/monaco-vscode-textmate-service-override'
|
||||
import { editor as meditor } from 'monaco-editor'
|
||||
export let isInitialized = false
|
||||
export let isInitializing = false
|
||||
|
||||
@@ -12,112 +13,117 @@ export async function initializeVscode() {
|
||||
try {
|
||||
// init vscode-api
|
||||
await initServices({
|
||||
debugLogging: true,
|
||||
logLevel: LogLevel.Info
|
||||
})
|
||||
meditor.defineTheme('nord', {
|
||||
base: 'vs-dark',
|
||||
inherit: true,
|
||||
rules: [
|
||||
{
|
||||
background: '2E3440',
|
||||
token: ''
|
||||
serviceConfig: {
|
||||
userServices: {
|
||||
...getThemeServiceOverride(),
|
||||
...getTextmateServiceOverride()
|
||||
},
|
||||
{
|
||||
foreground: '808b9f',
|
||||
token: 'comment'
|
||||
},
|
||||
{
|
||||
foreground: 'a3be8c',
|
||||
token: 'string'
|
||||
},
|
||||
{
|
||||
foreground: 'b48ead',
|
||||
token: 'constant.numeric'
|
||||
},
|
||||
{
|
||||
foreground: '81a1c1',
|
||||
token: 'constant.language'
|
||||
},
|
||||
{
|
||||
foreground: '81a1c1',
|
||||
token: 'keyword'
|
||||
},
|
||||
{
|
||||
foreground: '81a1c1',
|
||||
token: 'storage'
|
||||
},
|
||||
{
|
||||
foreground: '81a1c1',
|
||||
token: 'storage.type'
|
||||
},
|
||||
{
|
||||
foreground: '8fbcbb',
|
||||
token: 'entity.name.class'
|
||||
},
|
||||
{
|
||||
foreground: '8fbcbb',
|
||||
fontStyle: ' bold',
|
||||
token: 'entity.other.inherited-class'
|
||||
},
|
||||
{
|
||||
foreground: '88c0d0',
|
||||
token: 'entity.name.function'
|
||||
},
|
||||
{
|
||||
foreground: '81a1c1',
|
||||
token: 'entity.name.tag'
|
||||
},
|
||||
{
|
||||
foreground: '8fbcbb',
|
||||
token: 'entity.other.attribute-name'
|
||||
},
|
||||
{
|
||||
foreground: '88c0d0',
|
||||
token: 'support.function'
|
||||
},
|
||||
{
|
||||
foreground: 'f8f8f0',
|
||||
background: 'f92672',
|
||||
token: 'invalid'
|
||||
},
|
||||
{
|
||||
foreground: 'f8f8f0',
|
||||
background: 'ae81ff',
|
||||
token: 'invalid.deprecated'
|
||||
},
|
||||
{
|
||||
foreground: 'b48ead',
|
||||
token: 'constant.color.other.rgb-value'
|
||||
},
|
||||
{
|
||||
foreground: 'ebcb8b',
|
||||
token: 'constant.character.escape'
|
||||
},
|
||||
{
|
||||
foreground: '8fbcbb',
|
||||
token: 'variable.other.constant'
|
||||
}
|
||||
],
|
||||
colors: {
|
||||
'editor.foreground': '#D8DEE9',
|
||||
'editor.background': '#2E3440',
|
||||
'editor.selectionBackground': '#434C5ECC',
|
||||
'editor.lineHighlightBackground': '#3B4252',
|
||||
'editorCursor.foreground': '#D8DEE9',
|
||||
'editorWhitespace.foreground': '#434C5ECC'
|
||||
debugLogging: true
|
||||
}
|
||||
})
|
||||
// meditor.defineTheme('nord', {
|
||||
// base: 'vs-dark',
|
||||
// inherit: true,
|
||||
// rules: [
|
||||
// {
|
||||
// background: '2E3440',
|
||||
// token: ''
|
||||
// },
|
||||
// {
|
||||
// foreground: '808b9f',
|
||||
// token: 'comment'
|
||||
// },
|
||||
// {
|
||||
// foreground: 'a3be8c',
|
||||
// token: 'string'
|
||||
// },
|
||||
// {
|
||||
// foreground: 'b48ead',
|
||||
// token: 'constant.numeric'
|
||||
// },
|
||||
// {
|
||||
// foreground: '81a1c1',
|
||||
// token: 'constant.language'
|
||||
// },
|
||||
// {
|
||||
// foreground: '81a1c1',
|
||||
// token: 'keyword'
|
||||
// },
|
||||
// {
|
||||
// foreground: '81a1c1',
|
||||
// token: 'storage'
|
||||
// },
|
||||
// {
|
||||
// foreground: '81a1c1',
|
||||
// token: 'storage.type'
|
||||
// },
|
||||
// {
|
||||
// foreground: '8fbcbb',
|
||||
// token: 'entity.name.class'
|
||||
// },
|
||||
// {
|
||||
// foreground: '8fbcbb',
|
||||
// fontStyle: ' bold',
|
||||
// token: 'entity.other.inherited-class'
|
||||
// },
|
||||
// {
|
||||
// foreground: '88c0d0',
|
||||
// token: 'entity.name.function'
|
||||
// },
|
||||
// {
|
||||
// foreground: '81a1c1',
|
||||
// token: 'entity.name.tag'
|
||||
// },
|
||||
// {
|
||||
// foreground: '8fbcbb',
|
||||
// token: 'entity.other.attribute-name'
|
||||
// },
|
||||
// {
|
||||
// foreground: '88c0d0',
|
||||
// token: 'support.function'
|
||||
// },
|
||||
// {
|
||||
// foreground: 'f8f8f0',
|
||||
// background: 'f92672',
|
||||
// token: 'invalid'
|
||||
// },
|
||||
// {
|
||||
// foreground: 'f8f8f0',
|
||||
// background: 'ae81ff',
|
||||
// token: 'invalid.deprecated'
|
||||
// },
|
||||
// {
|
||||
// foreground: 'b48ead',
|
||||
// token: 'constant.color.other.rgb-value'
|
||||
// },
|
||||
// {
|
||||
// foreground: 'ebcb8b',
|
||||
// token: 'constant.character.escape'
|
||||
// },
|
||||
// {
|
||||
// foreground: '8fbcbb',
|
||||
// token: 'variable.other.constant'
|
||||
// }
|
||||
// ],
|
||||
// colors: {
|
||||
// 'editor.foreground': '#D8DEE9',
|
||||
// 'editor.background': '#2E3440',
|
||||
// 'editor.selectionBackground': '#434C5ECC',
|
||||
// 'editor.lineHighlightBackground': '#3B4252',
|
||||
// 'editorCursor.foreground': '#D8DEE9',
|
||||
// 'editorWhitespace.foreground': '#434C5ECC'
|
||||
// }
|
||||
// })
|
||||
|
||||
meditor.defineTheme('myTheme', {
|
||||
base: 'vs',
|
||||
inherit: true,
|
||||
rules: [],
|
||||
colors: {
|
||||
'editorLineNumber.foreground': '#999',
|
||||
'editorGutter.background': '#F9FAFB'
|
||||
}
|
||||
})
|
||||
// meditor.defineTheme('myTheme', {
|
||||
// base: 'vs',
|
||||
// inherit: true,
|
||||
// rules: [],
|
||||
// colors: {
|
||||
// 'editorLineNumber.foreground': '#999',
|
||||
// 'editorGutter.background': '#F9FAFB'
|
||||
// }
|
||||
// })
|
||||
|
||||
if (document.documentElement.classList.contains('dark')) {
|
||||
meditor.setTheme('nord')
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { languages } from 'monaco-editor/esm/vs/editor/editor.api'
|
||||
import { ShowLightbulbIconMode } from 'vscode/vscode/vs/editor/common/config/editorOptions'
|
||||
export function editorConfig(
|
||||
code: string,
|
||||
lang: string,
|
||||
@@ -21,7 +22,7 @@ export function editorConfig(
|
||||
enabled: false
|
||||
},
|
||||
lightbulb: {
|
||||
enabled: true
|
||||
enabled: ShowLightbulbIconMode.On
|
||||
},
|
||||
suggest: {
|
||||
showKeywords: true
|
||||
|
||||
@@ -13,7 +13,7 @@ export async function getUserExt(workspace: string): Promise<UserExt | undefined
|
||||
function mapUserToUserExt(user: User): UserExt {
|
||||
return {
|
||||
...user,
|
||||
groups: user.groups!,
|
||||
groups: user.groups ?? [],
|
||||
pgroups: user.groups!.map((x) => `g/${x}`)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ import { sveltekit } from '@sveltejs/kit/vite'
|
||||
import { readFileSync } from 'fs'
|
||||
import { fileURLToPath } from 'url'
|
||||
import circleDependency from 'vite-plugin-circular-dependency'
|
||||
import importMetaUrlPlugin from '@codingame/esbuild-import-meta-url-plugin'
|
||||
|
||||
const file = fileURLToPath(new URL('package.json', import.meta.url))
|
||||
const json = readFileSync(file, 'utf8')
|
||||
@@ -37,13 +38,16 @@ const config = {
|
||||
__pkg__: version
|
||||
},
|
||||
optimizeDeps: {
|
||||
include: ['highlight.js', 'highlight.js/lib/core']
|
||||
include: ['highlight.js', 'highlight.js/lib/core'],
|
||||
esbuildOptions: {
|
||||
plugins: [importMetaUrlPlugin]
|
||||
}
|
||||
},
|
||||
resolve: {
|
||||
alias: {
|
||||
path: 'path-browserify'
|
||||
},
|
||||
dedupe: ['monaco-editor', 'vscode']
|
||||
dedupe: ['vscode']
|
||||
},
|
||||
assetsInclude: ['**/*.wasm']
|
||||
}
|
||||
|
||||
@@ -4,8 +4,8 @@ verify_ssl = true
|
||||
name = "pypi"
|
||||
|
||||
[packages]
|
||||
wmill = ">=1.306.1"
|
||||
wmill_pg = ">=1.306.1"
|
||||
wmill = ">=1.306.2"
|
||||
wmill_pg = ">=1.306.2"
|
||||
sendgrid = "*"
|
||||
mysql-connector-python = "*"
|
||||
pymongo = "*"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
openapi: "3.0.3"
|
||||
|
||||
info:
|
||||
version: 1.306.1
|
||||
version: 1.306.2
|
||||
title: OpenFlow Spec
|
||||
contact:
|
||||
name: Ruben Fiszel
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[tool.poetry]
|
||||
name = "wmill"
|
||||
version = "1.306.1"
|
||||
version = "1.306.2"
|
||||
description = "A client library for accessing Windmill server wrapping the Windmill client API"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://windmill.dev"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[tool.poetry]
|
||||
name = "wmill-pg"
|
||||
version = "1.306.1"
|
||||
version = "1.306.2"
|
||||
description = "An extension client for the wmill client library focused on pg"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://windmill.dev"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "windmill-client",
|
||||
"description": "Windmill SDK client for browsers and Node.js",
|
||||
"version": "1.306.1",
|
||||
"version": "1.306.2",
|
||||
"author": "Ruben Fiszel",
|
||||
"license": "Apache 2.0",
|
||||
"devDependencies": {
|
||||
|
||||
@@ -1 +1 @@
|
||||
1.306.1
|
||||
1.306.2
|
||||
|
||||
Reference in New Issue
Block a user