kalugin66/windmill
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

editor bump + fixes

Browse Source
This commit is contained in:
Ruben Fiszel
2022-07-03 03:52:37 +02:00
parent dd461fa04a
commit e75537bf0c
5 changed files with 50 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
frontend/package-lock.json generated
View File

@@ -13,7 +13,7 @@
"fuse.js": "^6.4.6",
"highlight.js": "^11.5.1",
"monaco-editor": "^0.33.0",
"monaco-languageclient": "^1.0.1",
"monaco-languageclient": "^2.0.2",
"vscode-ws-jsonrpc": "^1.0.1"
},
"devDependencies": {
@@ -4171,14 +4171,15 @@
"integrity": "sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw=="
},
"node_modules/monaco-languageclient": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/monaco-languageclient/-/monaco-languageclient-1.0.1.tgz",
"integrity": "sha512-zEc0vbZHk0WAh08n1+z+T61fMJBfPWlpQO+APkre5GNX+f4tUSgD/EiiiU5TcIRY2MJsM7wTjKE4kzHsIkpIng==",
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/monaco-languageclient/-/monaco-languageclient-2.0.2.tgz",
"integrity": "sha512-r9Zm6IrVuoJI/9BT8avCXkOXqWApvwQ/f1R9d5ZJHkDHUae/iOYvu9LLQHkMdsG4ilPfDsWoGTN51EVUAHtppw==",
"dependencies": {
"glob-to-regexp": "^0.4.1",
"glob-to-regexp": "0.4.1",
"vscode": "npm:@codingame/monaco-vscode-api@^1.68.4",
"vscode-jsonrpc": "8.0.1",
"vscode-languageclient": "8.0.1",
"vscode-languageserver-textdocument": "1.0.4",
"vscode-languageserver-textdocument": "1.0.5",
"vscode-uri": "3.0.3"
}
},
@@ -6611,6 +6612,15 @@
}
}
},
"node_modules/vscode": {
"name": "@codingame/monaco-vscode-api",
"version": "1.68.7",
"resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.68.7.tgz",
"integrity": "sha512-pJ5ukCDNrHh6rgE0GnGWXVWdE9T8UWqM0mju3LfDQ5iP6NjxEQsBmZsb+lEtzPGWwv5y/WWchztMzoW0qF/Z4Q==",
"dependencies": {
"monaco-editor": "^0.33.0"
}
},
"node_modules/vscode-jsonrpc": {
"version": "8.0.1",
"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.1.tgz",
@@ -6642,9 +6652,9 @@
}
},
"node_modules/vscode-languageserver-textdocument": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.4.tgz",
"integrity": "sha512-/xhqXP/2A2RSs+J8JNXpiiNVvvNM0oTosNVmQnunlKvq9o4mupHOBAnnzH0lwIPKazXKvAKsVp1kr+H/K4lgoQ=="
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.5.tgz",
"integrity": "sha512-1ah7zyQjKBudnMiHbZmxz5bYNM9KKZYz+5VQLj+yr8l+9w3g+WAhCkUkWbhMEdC5u0ub4Ndiye/fDyS8ghIKQg=="
},
"node_modules/vscode-languageserver-types": {
"version": "3.17.1",
@@ -9740,14 +9750,15 @@
"integrity": "sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw=="
},
"monaco-languageclient": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/monaco-languageclient/-/monaco-languageclient-1.0.1.tgz",
"integrity": "sha512-zEc0vbZHk0WAh08n1+z+T61fMJBfPWlpQO+APkre5GNX+f4tUSgD/EiiiU5TcIRY2MJsM7wTjKE4kzHsIkpIng==",
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/monaco-languageclient/-/monaco-languageclient-2.0.2.tgz",
"integrity": "sha512-r9Zm6IrVuoJI/9BT8avCXkOXqWApvwQ/f1R9d5ZJHkDHUae/iOYvu9LLQHkMdsG4ilPfDsWoGTN51EVUAHtppw==",
"requires": {
"glob-to-regexp": "^0.4.1",
"glob-to-regexp": "0.4.1",
"vscode": "npm:@codingame/monaco-vscode-api@^1.68.4",
"vscode-jsonrpc": "8.0.1",
"vscode-languageclient": "8.0.1",
"vscode-languageserver-textdocument": "1.0.4",
"vscode-languageserver-textdocument": "1.0.5",
"vscode-uri": "3.0.3"
}
},
@@ -11438,6 +11449,14 @@
"rollup": "^2.59.0"
}
},
"vscode": {
"version": "npm:@codingame/monaco-vscode-api@1.68.7",
"resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.68.7.tgz",
"integrity": "sha512-pJ5ukCDNrHh6rgE0GnGWXVWdE9T8UWqM0mju3LfDQ5iP6NjxEQsBmZsb+lEtzPGWwv5y/WWchztMzoW0qF/Z4Q==",
"requires": {
"monaco-editor": "^0.33.0"
}
},
"vscode-jsonrpc": {
"version": "8.0.1",
"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.1.tgz",
@@ -11463,9 +11482,9 @@
}
},
"vscode-languageserver-textdocument": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.4.tgz",
"integrity": "sha512-/xhqXP/2A2RSs+J8JNXpiiNVvvNM0oTosNVmQnunlKvq9o4mupHOBAnnzH0lwIPKazXKvAKsVp1kr+H/K4lgoQ=="
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.5.tgz",
"integrity": "sha512-1ah7zyQjKBudnMiHbZmxz5bYNM9KKZYz+5VQLj+yr8l+9w3g+WAhCkUkWbhMEdC5u0ub4Ndiye/fDyS8ghIKQg=="
},
"vscode-languageserver-types": {
"version": "3.17.1",

2
frontend/package.json
View File

@@ -56,7 +56,7 @@
"fuse.js": "^6.4.6",
"highlight.js": "^11.5.1",
"monaco-editor": "^0.33.0",
"monaco-languageclient": "^1.0.1",
"monaco-languageclient": "^2.0.2",
"vscode-ws-jsonrpc": "^1.0.1"
}
}

18
frontend/src/lib/components/Editor.svelte
View File

@@ -87,6 +87,7 @@
const { RequestType, toSocket, WebSocketMessageReader, WebSocketMessageWriter } =
await import('vscode-ws-jsonrpc')
function createLanguageClient(
transports: MessageTransports,
name: string,
@@ -148,13 +149,18 @@
console.error(err)
}
})
vscode.commands.registerCommand('deno.cache', (uris: DocumentUri[] = []) => {
languageClient.sendRequest(new RequestType('deno/cache'), {
referrer: { uri },
uris: uris.map((uri) => ({ uri }))
if (name == 'deno') {
vscode.commands.getCommands().then((v) => {
if (!v.includes('deno.cache')) {
vscode.commands.registerCommand('deno.cache', (uris: DocumentUri[] = []) => {
languageClient.sendRequest(new RequestType('deno/cache'), {
referrer: { uri },
uris: uris.map((uri) => ({ uri }))
})
})
}
})
})
}
websocketAlive[name] = true
}

2
frontend/src/routes/__layout-root.svelte
View File

@@ -25,7 +25,7 @@
'Model not found',
'Connection is disposed.',
'Connection got disposed.',
'Stopping server timed out.'
'Stopping the server timed out'
]
async function loadUser() {

9
frontend/svelte.config.js
View File

@@ -34,17 +34,8 @@ const config = {
include: [
'highlight.js',
'highlight.js/lib/core',
'monaco-languageclient/vscode-compatibility'
]
},
resolve: {
alias: [
{
find: 'vscode',
replacement: 'monaco-languageclient/vscode-compatibility'
}
]
}
},
adapter: adapter({
// default options are shown