align jsonrpc

This commit is contained in:
Ruben Fiszel
2022-05-17 23:01:02 +02:00
parent 865d728224
commit dbd6142997
4 changed files with 47 additions and 80 deletions
+41 -74
View File
@@ -8,8 +8,7 @@
"name": "windmill",
"version": "1.8.1",
"dependencies": {
"@codingame/monaco-jsonrpc": "^0.4.0",
"@codingame/monaco-languageclient": "^0.17.0",
"@codingame/monaco-jsonrpc": "^0.3.1",
"@fortawesome/free-brands-svg-icons": "^6.1.1",
"@fortawesome/free-solid-svg-icons": "^6.1.1",
"@types/vscode": "^1.63.0",
@@ -17,6 +16,7 @@
"fuse.js": "^6.4.6",
"highlight.js": "^11.5.1",
"monaco-editor": "^0.33.0",
"monaco-languageclient": "^0.18.1",
"svelte-awesome": "^3.0.0",
"svelte-markdown": "^0.2.1",
"svelte-split-pane": "^0.1.2"
@@ -185,34 +185,11 @@
}
},
"node_modules/@codingame/monaco-jsonrpc": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/@codingame/monaco-jsonrpc/-/monaco-jsonrpc-0.4.0.tgz",
"integrity": "sha512-5IQkYvFMyWQWutFhK77Tk5q1VIQoFySElqpAI1fUWXIIAepiYD7xJRawzMgJqhIzER7t44FbBN4uVvoXLRmJ6g==",
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/@codingame/monaco-jsonrpc/-/monaco-jsonrpc-0.3.1.tgz",
"integrity": "sha512-Zxilei5fGV89uGJcFKDQFfZfUbWdP8/NGympXQUX/XRle4CYUabfvEOdY0Diq0NruttlRH3RdWVZ7Nw6f4TClQ==",
"dependencies": {
"vscode-jsonrpc": "^8.0.1"
}
},
"node_modules/@codingame/monaco-languageclient": {
"version": "0.17.4",
"resolved": "https://registry.npmjs.org/@codingame/monaco-languageclient/-/monaco-languageclient-0.17.4.tgz",
"integrity": "sha512-0rz2vFH51q+bLwAMJIwSmX9zcpYCOVzICokzr+ACHc7bZq4RaLfmQ0n7iU8CjPjCB4D+/uykc3duLZakh4ug1w==",
"dependencies": {
"glob-to-regexp": "^0.4.1",
"vscode-jsonrpc": "6.0.0",
"vscode-languageclient": "7.0.0",
"vscode-languageserver-textdocument": "^1.0.1",
"vscode-uri": "^3.0.2"
},
"engines": {
"vscode": "^1.50.0"
}
},
"node_modules/@codingame/monaco-languageclient/node_modules/vscode-jsonrpc": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz",
"integrity": "sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==",
"engines": {
"node": ">=8.0.0 || >=10.0.0"
"vscode-jsonrpc": "^6.0.0"
}
},
"node_modules/@eslint/eslintrc": {
@@ -3282,6 +3259,18 @@
"resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.33.0.tgz",
"integrity": "sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw=="
},
"node_modules/monaco-languageclient": {
"version": "0.18.1",
"resolved": "https://registry.npmjs.org/monaco-languageclient/-/monaco-languageclient-0.18.1.tgz",
"integrity": "sha512-8x5YbYhtnS5xZ6+Xkk6lJcuMxLdKmc8Y7flW/u5MmFm5/qbe+uUV5vsmqPjcbJy6gAJF4pjFd0PtfhTtOiaxnw==",
"dependencies": {
"glob-to-regexp": "^0.4.1",
"vscode-jsonrpc": "6.0.0",
"vscode-languageclient": "7.0.0",
"vscode-languageserver-textdocument": "^1.0.4",
"vscode-uri": "^3.0.3"
}
},
"node_modules/mri": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz",
@@ -5354,11 +5343,11 @@
}
},
"node_modules/vscode-jsonrpc": {
"version": "8.0.1",
"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.1.tgz",
"integrity": "sha512-N/WKvghIajmEvXpatSzvTvOIz61ZSmOSa4BRA4pTLi+1+jozquQKP/MkaylP9iB68k73Oua1feLQvH3xQuigiQ==",
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz",
"integrity": "sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==",
"engines": {
"node": ">=14.0.0"
"node": ">=8.0.0 || >=10.0.0"
}
},
"node_modules/vscode-languageclient": {
@@ -5383,14 +5372,6 @@
"vscode-languageserver-types": "3.16.0"
}
},
"node_modules/vscode-languageserver-protocol/node_modules/vscode-jsonrpc": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz",
"integrity": "sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==",
"engines": {
"node": ">=8.0.0 || >=10.0.0"
}
},
"node_modules/vscode-languageserver-textdocument": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.4.tgz",
@@ -5621,30 +5602,11 @@
}
},
"@codingame/monaco-jsonrpc": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/@codingame/monaco-jsonrpc/-/monaco-jsonrpc-0.4.0.tgz",
"integrity": "sha512-5IQkYvFMyWQWutFhK77Tk5q1VIQoFySElqpAI1fUWXIIAepiYD7xJRawzMgJqhIzER7t44FbBN4uVvoXLRmJ6g==",
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/@codingame/monaco-jsonrpc/-/monaco-jsonrpc-0.3.1.tgz",
"integrity": "sha512-Zxilei5fGV89uGJcFKDQFfZfUbWdP8/NGympXQUX/XRle4CYUabfvEOdY0Diq0NruttlRH3RdWVZ7Nw6f4TClQ==",
"requires": {
"vscode-jsonrpc": "^8.0.1"
}
},
"@codingame/monaco-languageclient": {
"version": "0.17.4",
"resolved": "https://registry.npmjs.org/@codingame/monaco-languageclient/-/monaco-languageclient-0.17.4.tgz",
"integrity": "sha512-0rz2vFH51q+bLwAMJIwSmX9zcpYCOVzICokzr+ACHc7bZq4RaLfmQ0n7iU8CjPjCB4D+/uykc3duLZakh4ug1w==",
"requires": {
"glob-to-regexp": "^0.4.1",
"vscode-jsonrpc": "6.0.0",
"vscode-languageclient": "7.0.0",
"vscode-languageserver-textdocument": "^1.0.1",
"vscode-uri": "^3.0.2"
},
"dependencies": {
"vscode-jsonrpc": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz",
"integrity": "sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg=="
}
"vscode-jsonrpc": "^6.0.0"
}
},
"@eslint/eslintrc": {
@@ -7804,6 +7766,18 @@
"resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.33.0.tgz",
"integrity": "sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw=="
},
"monaco-languageclient": {
"version": "0.18.1",
"resolved": "https://registry.npmjs.org/monaco-languageclient/-/monaco-languageclient-0.18.1.tgz",
"integrity": "sha512-8x5YbYhtnS5xZ6+Xkk6lJcuMxLdKmc8Y7flW/u5MmFm5/qbe+uUV5vsmqPjcbJy6gAJF4pjFd0PtfhTtOiaxnw==",
"requires": {
"glob-to-regexp": "^0.4.1",
"vscode-jsonrpc": "6.0.0",
"vscode-languageclient": "7.0.0",
"vscode-languageserver-textdocument": "^1.0.4",
"vscode-uri": "^3.0.3"
}
},
"mri": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz",
@@ -9225,9 +9199,9 @@
}
},
"vscode-jsonrpc": {
"version": "8.0.1",
"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.1.tgz",
"integrity": "sha512-N/WKvghIajmEvXpatSzvTvOIz61ZSmOSa4BRA4pTLi+1+jozquQKP/MkaylP9iB68k73Oua1feLQvH3xQuigiQ=="
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz",
"integrity": "sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg=="
},
"vscode-languageclient": {
"version": "7.0.0",
@@ -9246,13 +9220,6 @@
"requires": {
"vscode-jsonrpc": "6.0.0",
"vscode-languageserver-types": "3.16.0"
},
"dependencies": {
"vscode-jsonrpc": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz",
"integrity": "sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg=="
}
}
},
"vscode-languageserver-textdocument": {
+2 -2
View File
@@ -42,8 +42,8 @@
},
"type": "module",
"dependencies": {
"@codingame/monaco-jsonrpc": "^0.4.0",
"@codingame/monaco-languageclient": "^0.17.0",
"@codingame/monaco-jsonrpc": "^0.3.1",
"monaco-languageclient": "^0.18.1",
"@fortawesome/free-brands-svg-icons": "^6.1.1",
"@fortawesome/free-solid-svg-icons": "^6.1.1",
"@types/vscode": "^1.63.0",
+2 -2
View File
@@ -81,7 +81,7 @@
if (lang == 'python' || deno) {
// install Monaco language client services
const { MonacoLanguageClient, CloseAction, ErrorAction, createConnection } = await import(
'@codingame/monaco-languageclient'
'monaco-languageclient'
)
function createLanguageClient(connection: any, name: string, initializationOptions?: any) {
@@ -309,7 +309,7 @@ export const params: any;
}
}
if (lang == 'python' || deno) {
const { MonacoServices } = await import('@codingame/monaco-languageclient')
const { MonacoServices } = await import('monaco-languageclient')
MonacoServices.install(monaco)
}
+2 -2
View File
@@ -36,14 +36,14 @@ const config = {
include: [
'highlight.js',
'highlight.js/lib/core',
'@codingame/monaco-languageclient/lib/vscode-compatibility'
'monaco-languageclient/lib/vscode-compatibility'
]
},
resolve: {
alias: [
{
find: 'vscode',
replacement: '@codingame/monaco-languageclient/lib/vscode-compatibility'
replacement: 'monaco-languageclient/lib/vscode-compatibility'
}
]
}