diff --git a/README.md b/README.md index d1129fbaf..15ad1d56a 100644 --- a/README.md +++ b/README.md @@ -94,6 +94,7 @@ The following table describes which version of **monaco-languageclient** and **@ | monaco-languageclient | @codingame/monaco-vscode-api | monaco-editor | comment | | :---- | :---- | :--- | :--- | +| 6.6.0 | 1.83.0 | 0.44.0 | Released 2023-10-1x | | 6.5.3 | 1.82.5 | 0.43.0 | Released 2023-10-11 | | 6.5.2 | 1.82.4 | 0.43.0 | Released 2023-10-07 | | 6.5.1 | 1.82.3 | 0.43.0 | Released 2023-10-04 | diff --git a/package-lock.json b/package-lock.json index 32f4dc5aa..a2186b461 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "packages/verify/vite" ], "devDependencies": { - "@types/vscode": "~1.82.0", + "@types/vscode": "~1.83.0", "@typescript-eslint/eslint-plugin": "~6.7.4", "@typescript-eslint/parser": "~6.7.4", "editorconfig": "~2.0.0", @@ -71,103 +71,143 @@ "integrity": "sha512-YslZMgtJUyuMbZ+aKvfF3x1f5liK4mWNxghFRv7jqRR9C3R3fAOGTTKvxXDa2Y1s9zSbcpuO0cAxDYsc9SrXoQ==" }, "node_modules/@codingame/monaco-vscode-configuration-service-override": { - "version": "1.82.5", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-configuration-service-override/-/monaco-vscode-configuration-service-override-1.82.5.tgz", - "integrity": "sha512-Oas1EdniEZbvDrxBcVxTemoJYMHwWpD2PLTlFv37aeRVpuyk5DKqQu5HUhNVdN1epwCFRZ8efGpJ6nV+d5hh+A==", + "version": "1.83.0-next.0", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-configuration-service-override/-/monaco-vscode-configuration-service-override-1.83.0-next.0.tgz", + "integrity": "sha512-1xdOaUCRp0i0YI3KHXBEVEPyTB6FWsfZt9IEGtn22FnCK3GHQbyZEkpIPMcQkYpICZDIOIcELoSo78VO4LCmcA==", "dependencies": { - "monaco-editor": "0.43.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.82.5" + "monaco-editor": "0.44.0", + "vscode": "npm:@codingame/monaco-vscode-api@1.83.0-next.0" } }, + "node_modules/@codingame/monaco-vscode-configuration-service-override/node_modules/monaco-editor": { + "version": "0.44.0", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.44.0.tgz", + "integrity": "sha512-5SmjNStN6bSuSE5WPT2ZV+iYn1/yI9sd4Igtk23ChvqB7kDk9lZbB9F5frsuvpB+2njdIeGGFf2G4gbE6rCC9Q==" + }, "node_modules/@codingame/monaco-vscode-editor-service-override": { - "version": "1.82.5", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-editor-service-override/-/monaco-vscode-editor-service-override-1.82.5.tgz", - "integrity": "sha512-IU3oEPdxJHgfzVKPEow4tzt0lA1p+oQrVAErAP/Fz02DHKydDI/Zjdn65dqGqc3jNaBq8DZGdrvLwMcL0jwb1Q==", + "version": "1.83.0-next.0", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-editor-service-override/-/monaco-vscode-editor-service-override-1.83.0-next.0.tgz", + "integrity": "sha512-mVeWQeNpHtVY8CkzwooSxpIv0mD3GGKaf2E9CTDbfbDUpEHboLXtpmvmq782BLq5kbTfPmdqOa5h25Bv9+se2Q==", "dependencies": { - "monaco-editor": "0.43.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.82.5" + "monaco-editor": "0.44.0", + "vscode": "npm:@codingame/monaco-vscode-api@1.83.0-next.0" } }, + "node_modules/@codingame/monaco-vscode-editor-service-override/node_modules/monaco-editor": { + "version": "0.44.0", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.44.0.tgz", + "integrity": "sha512-5SmjNStN6bSuSE5WPT2ZV+iYn1/yI9sd4Igtk23ChvqB7kDk9lZbB9F5frsuvpB+2njdIeGGFf2G4gbE6rCC9Q==" + }, "node_modules/@codingame/monaco-vscode-files-service-override": { - "version": "1.82.5", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-files-service-override/-/monaco-vscode-files-service-override-1.82.5.tgz", - "integrity": "sha512-vQ3RuzcXaD6q+9VbaDvg8f1Xt/w3+CyEBYim3xDpZyz/XrRGTPkRUX88w/KoNQIDVL9CIZGqKE7S2YsIl/BAjw==", + "version": "1.83.0-next.0", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-files-service-override/-/monaco-vscode-files-service-override-1.83.0-next.0.tgz", + "integrity": "sha512-TZybQsaIK5oJLOekui+SZoLOrCwsdMf16bNW+4ssvHphPwN1FBu8tklWncFFLrhhJl25ze4JLgwB1cx7laR1Lg==", "dependencies": { - "monaco-editor": "0.43.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.82.5" + "monaco-editor": "0.44.0", + "vscode": "npm:@codingame/monaco-vscode-api@1.83.0-next.0" } }, + "node_modules/@codingame/monaco-vscode-files-service-override/node_modules/monaco-editor": { + "version": "0.44.0", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.44.0.tgz", + "integrity": "sha512-5SmjNStN6bSuSE5WPT2ZV+iYn1/yI9sd4Igtk23ChvqB7kDk9lZbB9F5frsuvpB+2njdIeGGFf2G4gbE6rCC9Q==" + }, "node_modules/@codingame/monaco-vscode-json-default-extension": { - "version": "1.82.5", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-json-default-extension/-/monaco-vscode-json-default-extension-1.82.5.tgz", - "integrity": "sha512-0OzbW76ViMVHhc5SsxgU4HNgVzgxLO5SBN2WXmBcRCTN2peWmjXmTMLqfiGoMsgj07hPP9WayFpbUSsIi/csBA==", + "version": "1.83.0-next.0", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-json-default-extension/-/monaco-vscode-json-default-extension-1.83.0-next.0.tgz", + "integrity": "sha512-y1V4OM8NAUxWKO1BWkjrL2zWN5G7SLOgU2gX40pmiVggiwMfsPurfSc6ajRIDsas8R39Aq73lLphs7Fsm68jgA==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@1.82.5" + "vscode": "npm:@codingame/monaco-vscode-api@1.83.0-next.0" } }, "node_modules/@codingame/monaco-vscode-keybindings-service-override": { - "version": "1.82.5", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-keybindings-service-override/-/monaco-vscode-keybindings-service-override-1.82.5.tgz", - "integrity": "sha512-rDBNwUkrcgyRRKyF9CedQEI7ek0eeOeEtYs6X9+dzMlwLoz2CNa9R+S6l8BI2B+3kK2J+46Ph4OrDay3gTSWwA==", + "version": "1.83.0-next.0", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-keybindings-service-override/-/monaco-vscode-keybindings-service-override-1.83.0-next.0.tgz", + "integrity": "sha512-sBcsxz6aukyCF9FkBOsp37zF1z6aUrhm3Cdk9wONnw4ONvF0Ca/OdpU/Oc56EwDFNAidjoXTIrU4nuH8w5ppmQ==", "dependencies": { - "monaco-editor": "0.43.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.82.5" + "monaco-editor": "0.44.0", + "vscode": "npm:@codingame/monaco-vscode-api@1.83.0-next.0" } }, + "node_modules/@codingame/monaco-vscode-keybindings-service-override/node_modules/monaco-editor": { + "version": "0.44.0", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.44.0.tgz", + "integrity": "sha512-5SmjNStN6bSuSE5WPT2ZV+iYn1/yI9sd4Igtk23ChvqB7kDk9lZbB9F5frsuvpB+2njdIeGGFf2G4gbE6rCC9Q==" + }, "node_modules/@codingame/monaco-vscode-languages-service-override": { - "version": "1.82.5", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-languages-service-override/-/monaco-vscode-languages-service-override-1.82.5.tgz", - "integrity": "sha512-zxwoi1dtwG7b2NLN6+uRG6rhBFvpB+7zpB6GmegOhdx8USMiVNejaPLbNrcYqDw8hObFr9WC465JK3LbJA+JHQ==", + "version": "1.83.0-next.0", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-languages-service-override/-/monaco-vscode-languages-service-override-1.83.0-next.0.tgz", + "integrity": "sha512-HkerRNYBRWD4GoA0mgyk8Z2sNE57bK+FESplW228DCy2002vTuWnh4QRAAfVi6z7nsSqUelQb0oouT0ev8lziw==", "dependencies": { - "monaco-editor": "0.43.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.82.5" + "monaco-editor": "0.44.0", + "vscode": "npm:@codingame/monaco-vscode-api@1.83.0-next.0" } }, + "node_modules/@codingame/monaco-vscode-languages-service-override/node_modules/monaco-editor": { + "version": "0.44.0", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.44.0.tgz", + "integrity": "sha512-5SmjNStN6bSuSE5WPT2ZV+iYn1/yI9sd4Igtk23ChvqB7kDk9lZbB9F5frsuvpB+2njdIeGGFf2G4gbE6rCC9Q==" + }, "node_modules/@codingame/monaco-vscode-model-service-override": { - "version": "1.82.5", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-model-service-override/-/monaco-vscode-model-service-override-1.82.5.tgz", - "integrity": "sha512-D/6KK0wwPcdQE9cax48tgMFopqHCliUcgqk2n7iPv3Cch0gVFdIIVfWiJQbZ7VUVz5Ig/UeeRcXfqGRHUqwzWQ==", + "version": "1.83.0-next.0", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-model-service-override/-/monaco-vscode-model-service-override-1.83.0-next.0.tgz", + "integrity": "sha512-LJhhvD9iOxFibjhyu+uc4dMJ2U0VDelii95f0w5d+MpilJ16q5xpfYTVk/tYvd0IMdR5opmXbDACZFBVltdN8g==", "dependencies": { - "monaco-editor": "0.43.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.82.5" + "monaco-editor": "0.44.0", + "vscode": "npm:@codingame/monaco-vscode-api@1.83.0-next.0" } }, + "node_modules/@codingame/monaco-vscode-model-service-override/node_modules/monaco-editor": { + "version": "0.44.0", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.44.0.tgz", + "integrity": "sha512-5SmjNStN6bSuSE5WPT2ZV+iYn1/yI9sd4Igtk23ChvqB7kDk9lZbB9F5frsuvpB+2njdIeGGFf2G4gbE6rCC9Q==" + }, "node_modules/@codingame/monaco-vscode-python-default-extension": { - "version": "1.82.5", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-python-default-extension/-/monaco-vscode-python-default-extension-1.82.5.tgz", - "integrity": "sha512-cQBsGAPIV4M6twV5sEWKlm7UWp2/ANxlF51V2vyOziyKUzBl/kPXWThyU4O6dD1SunbyR9Gr1WY+jq68zgmtLA==", + "version": "1.83.0-next.0", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-python-default-extension/-/monaco-vscode-python-default-extension-1.83.0-next.0.tgz", + "integrity": "sha512-BAnWAVUo5OtxR76SygnXpAHcnIWQOYE9bk+3yK+N4apxMo9m2GTGQDPjsUidv5mD79TAf2NFxL8k/xPh/tnt4g==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@1.82.5" + "vscode": "npm:@codingame/monaco-vscode-api@1.83.0-next.0" } }, "node_modules/@codingame/monaco-vscode-textmate-service-override": { - "version": "1.82.5", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-textmate-service-override/-/monaco-vscode-textmate-service-override-1.82.5.tgz", - "integrity": "sha512-5mUVYKyxftEmOJvjZl5QSVv7RCTRBOL0mGTQZVsElkrvWfwwkvxSZo1ug9Ot6quuRrxuZ4tk/i9VnrnU+U4PeA==", + "version": "1.83.0-next.0", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-textmate-service-override/-/monaco-vscode-textmate-service-override-1.83.0-next.0.tgz", + "integrity": "sha512-5UrCluPd3YstOTj/AIlj8LoJJk/bVGD3w5LUl6wUcXEIREcqhYabq8ivQ+1+7ivcPp9FY3G617x97EY8rJAGeg==", "dependencies": { - "monaco-editor": "0.43.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.82.5", - "vscode-oniguruma": "^2.0.0", - "vscode-textmate": "^9.0.0" + "monaco-editor": "0.44.0", + "vscode": "npm:@codingame/monaco-vscode-api@1.83.0-next.0", + "vscode-oniguruma": "1.7.0", + "vscode-textmate": "9.0.0" } }, + "node_modules/@codingame/monaco-vscode-textmate-service-override/node_modules/monaco-editor": { + "version": "0.44.0", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.44.0.tgz", + "integrity": "sha512-5SmjNStN6bSuSE5WPT2ZV+iYn1/yI9sd4Igtk23ChvqB7kDk9lZbB9F5frsuvpB+2njdIeGGFf2G4gbE6rCC9Q==" + }, "node_modules/@codingame/monaco-vscode-theme-defaults-default-extension": { - "version": "1.82.5", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-theme-defaults-default-extension/-/monaco-vscode-theme-defaults-default-extension-1.82.5.tgz", - "integrity": "sha512-8bDhQtNlmNG0GHmSNuEwHDN5eaU50LYhS+R0FvKhQQ1Gg+w1VKliguS4YtWekNjfCpM4MfI9tg3nMc0GTcXgoQ==", + "version": "1.83.0-next.0", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-theme-defaults-default-extension/-/monaco-vscode-theme-defaults-default-extension-1.83.0-next.0.tgz", + "integrity": "sha512-lvMFkiRTXjsJPMnEpJQroxkvUmxcJgXpf6V9ZGpHLsuDpOUlMxZZ0MSPQPBRxv+cTma32Ss7aV3YkQ/ZqG4+Ww==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@1.82.5" + "vscode": "npm:@codingame/monaco-vscode-api@1.83.0-next.0" } }, "node_modules/@codingame/monaco-vscode-theme-service-override": { - "version": "1.82.5", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-theme-service-override/-/monaco-vscode-theme-service-override-1.82.5.tgz", - "integrity": "sha512-CJX0+e6DNKs+QFkI69otp4VpqJFRifY/OGhEd6QsEN56n6wHT/mRSZtoft3Tg581GZ1EFhQkkn7G5KuHrx+CPA==", + "version": "1.83.0-next.0", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-theme-service-override/-/monaco-vscode-theme-service-override-1.83.0-next.0.tgz", + "integrity": "sha512-PJoZWv0S/RN4ZkXQiI2ba467NRXvOmxKsK1IaQCIxB1aa2dsorhSrAzCB33zBFPwbOKg/q7q0dZ2L61Iv3PCnA==", "dependencies": { - "monaco-editor": "0.43.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.82.5" + "monaco-editor": "0.44.0", + "vscode": "npm:@codingame/monaco-vscode-api@1.83.0-next.0" } }, + "node_modules/@codingame/monaco-vscode-theme-service-override/node_modules/monaco-editor": { + "version": "0.44.0", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.44.0.tgz", + "integrity": "sha512-5SmjNStN6bSuSE5WPT2ZV+iYn1/yI9sd4Igtk23ChvqB7kDk9lZbB9F5frsuvpB+2njdIeGGFf2G4gbE6rCC9Q==" + }, "node_modules/@cspotcode/source-map-support": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", @@ -974,9 +1014,9 @@ } }, "node_modules/@types/vscode": { - "version": "1.82.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.82.0.tgz", - "integrity": "sha512-VSHV+VnpF8DEm8LNrn8OJ8VuUNcBzN3tMvKrNpbhhfuVjFm82+6v44AbDhLvVFgCzn6vs94EJNTp7w8S6+Q1Rw==", + "version": "1.83.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.83.0.tgz", + "integrity": "sha512-3mUtHqLAVz9hegut9au4xehuBrzRE3UJiQMpoEHkNl6XHliihO7eATx2BMHs0odsmmrwjJrlixx/Pte6M3ygDQ==", "dev": true }, "node_modules/@types/ws": { @@ -6023,26 +6063,26 @@ }, "node_modules/vscode": { "name": "@codingame/monaco-vscode-api", - "version": "1.82.5", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.82.5.tgz", - "integrity": "sha512-FkIETLRm2BrjOraRuM+VcTcDkvf59TVLfRfj9wUUbK/i9Zm/yof6RQZSXaPTf9ECC6effg0CBd0VmM2zIeVxWg==", + "version": "1.83.0-next.0", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.83.0-next.0.tgz", + "integrity": "sha512-fRNLNqwF1ut6Ja6xkB9n9X3j0XIJsLz0mnjQljd4U5407LZ6Mv5uvE+Q+s0syJC2lgQIRZEJgJFdjAfPKr0Dww==", "dependencies": { - "monaco-editor": "0.43.0" + "monaco-editor": "0.44.0" }, "bin": { "monaco-treemending": "monaco-treemending.js" } }, "node_modules/vscode-json-languageservice": { - "version": "5.3.6", - "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.3.6.tgz", - "integrity": "sha512-P4kthBi3GMLKi7Lmp24nkKHAWxbFfCsIDBPlMrK1Tag1aqbl3l60UferDkfAasupDVBM2dekbArzGycUjw8OHA==", + "version": "5.3.7", + "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.3.7.tgz", + "integrity": "sha512-jdDggN2SLMQw4C/tLr11v6/OK4cMVGy7tbyZRHQvukQ6lcflY3UV+ZMkmwHKCqXz2TmxkjQb536eJW6JMEVeew==", "dependencies": { "@vscode/l10n": "^0.0.16", "jsonc-parser": "^3.2.0", - "vscode-languageserver-textdocument": "^1.0.8", - "vscode-languageserver-types": "^3.17.3", - "vscode-uri": "^3.0.7" + "vscode-languageserver-textdocument": "^1.0.11", + "vscode-languageserver-types": "^3.17.5", + "vscode-uri": "^3.0.8" } }, "node_modules/vscode-jsonrpc": { @@ -6113,9 +6153,9 @@ "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==" }, "node_modules/vscode-oniguruma": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-2.0.1.tgz", - "integrity": "sha512-poJU8iHIWnC3vgphJnrLZyI3YdqRlR27xzqDmpPXYzA93R4Gk8z7T6oqDzDoHjoikA2aS82crdXFkjELCdJsjQ==" + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz", + "integrity": "sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==" }, "node_modules/vscode-textmate": { "version": "9.0.0", @@ -6131,6 +6171,11 @@ "resolved": "packages/vscode-ws-jsonrpc", "link": true }, + "node_modules/vscode/node_modules/monaco-editor": { + "version": "0.44.0", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.44.0.tgz", + "integrity": "sha512-5SmjNStN6bSuSE5WPT2ZV+iYn1/yI9sd4Igtk23ChvqB7kDk9lZbB9F5frsuvpB+2njdIeGGFf2G4gbE6rCC9Q==" + }, "node_modules/watchpack": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", @@ -6449,15 +6494,15 @@ }, "packages/client": { "name": "monaco-languageclient", - "version": "6.5.3", + "version": "6.6.0-next.0", "hasInstallScript": true, "license": "MIT", "dependencies": { - "@codingame/monaco-vscode-editor-service-override": "~1.82.5", - "@codingame/monaco-vscode-languages-service-override": "~1.82.5", - "@codingame/monaco-vscode-model-service-override": "~1.82.5", - "monaco-editor": "~0.43.0", - "vscode": "npm:@codingame/monaco-vscode-api@>=1.82.5 <1.83.0", + "@codingame/monaco-vscode-editor-service-override": "~1.83.0-next.0", + "@codingame/monaco-vscode-languages-service-override": "~1.83.0-next.0", + "@codingame/monaco-vscode-model-service-override": "~1.83.0-next.0", + "monaco-editor": "~0.44.0", + "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.0-next.0 <1.84.0", "vscode-languageclient": "~8.1.0" }, "engines": { @@ -6465,8 +6510,8 @@ "npm": ">=9.0.0" }, "peerDependencies": { - "monaco-editor": "~0.43.0", - "vscode": "npm:@codingame/monaco-vscode-api@>=1.82.5 <1.83.0" + "monaco-editor": "~0.44.0", + "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.0-next.0 <1.84.0" }, "peerDependenciesMeta": { "monaco-editor": { @@ -6477,30 +6522,35 @@ } } }, + "packages/client/node_modules/monaco-editor": { + "version": "0.44.0", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.44.0.tgz", + "integrity": "sha512-5SmjNStN6bSuSE5WPT2ZV+iYn1/yI9sd4Igtk23ChvqB7kDk9lZbB9F5frsuvpB+2njdIeGGFf2G4gbE6rCC9Q==" + }, "packages/examples": { "name": "monaco-languageclient-examples", - "version": "6.5.3", + "version": "6.6.0-next.0", "license": "MIT", "dependencies": { - "@codingame/monaco-vscode-configuration-service-override": "~1.82.5", - "@codingame/monaco-vscode-editor-service-override": "~1.82.5", - "@codingame/monaco-vscode-files-service-override": "~1.82.5", - "@codingame/monaco-vscode-json-default-extension": "~1.82.5", - "@codingame/monaco-vscode-keybindings-service-override": "~1.82.5", - "@codingame/monaco-vscode-python-default-extension": "~1.82.5", - "@codingame/monaco-vscode-textmate-service-override": "~1.82.5", - "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.82.5", - "@codingame/monaco-vscode-theme-service-override": "~1.82.5", + "@codingame/monaco-vscode-configuration-service-override": "~1.83.0-next.0", + "@codingame/monaco-vscode-editor-service-override": "~1.83.0-next.0", + "@codingame/monaco-vscode-files-service-override": "~1.83.0-next.0", + "@codingame/monaco-vscode-json-default-extension": "~1.83.0-next.0", + "@codingame/monaco-vscode-keybindings-service-override": "~1.83.0-next.0", + "@codingame/monaco-vscode-python-default-extension": "~1.83.0-next.0", + "@codingame/monaco-vscode-textmate-service-override": "~1.83.0-next.0", + "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.83.0-next.0", + "@codingame/monaco-vscode-theme-service-override": "~1.83.0-next.0", "express": "~4.18.2", "langium": "~2.0.2", "langium-statemachine-dsl": "~2.0.0", "monaco-editor-workers": "~0.43.0", - "monaco-languageclient": "~6.5.3", + "monaco-languageclient": "~6.6.0-next.0", "pyright": "~1.1.330", "react": "~18.2.0", "react-dom": "~18.2.0", "request-light": "~0.7.0", - "vscode-json-languageservice": "~5.3.6", + "vscode-json-languageservice": "~5.3.7", "vscode-languageserver": "~8.1.0", "vscode-uri": "~3.0.8", "vscode-ws-jsonrpc": "~3.0.0", @@ -6521,8 +6571,8 @@ "version": "0.0.0", "dependencies": { "monaco-editor-workers": "~0.43.0", - "monaco-languageclient": "~6.5.3", - "monaco-languageclient-examples": "~6.5.3", + "monaco-languageclient": "~6.6.0-next.0", + "monaco-languageclient-examples": "~6.6.0-next.0", "vscode-ws-jsonrpc": "~3.0.0" }, "devDependencies": { @@ -6534,8 +6584,8 @@ "version": "0.0.0", "dependencies": { "monaco-editor-workers": "~0.43.0", - "monaco-languageclient": "~6.5.3", - "monaco-languageclient-examples": "~6.5.3", + "monaco-languageclient": "~6.6.0-next.0", + "monaco-languageclient-examples": "~6.6.0-next.0", "vscode-ws-jsonrpc": "~3.0.0" }, "devDependencies": { diff --git a/package.json b/package.json index a33f8dc94..80b78e339 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "private": true, "type": "module", "devDependencies": { - "@types/vscode": "~1.82.0", + "@types/vscode": "~1.83.0", "@typescript-eslint/eslint-plugin": "~6.7.4", "@typescript-eslint/parser": "~6.7.4", "editorconfig": "~2.0.0", @@ -17,8 +17,8 @@ "vite": "~4.4.11" }, "volta": { - "node": "18.18.0", - "npm": "9.8.1" + "node": "18.18.1", + "npm": "9.9.0" }, "scripts": { "clean": "npm run clean --workspaces", diff --git a/packages/client/CHANGELOG.md b/packages/client/CHANGELOG.md index 3a0673911..c5632a960 100644 --- a/packages/client/CHANGELOG.md +++ b/packages/client/CHANGELOG.md @@ -2,9 +2,13 @@ All notable changes to this npm module are documented in this file. +## [6.6.0] - 2023-10-1x + +- Updated to `monaco-editor` `0.44.0` and `monaco-vscode-api` `1.83.0`. + ## [6.5.3] - 2023-10-11 -- Updated to `monaco-vscode-api` `1.82.5`. Fixes requirung `"skipLibCheck": true` with previous versions of 1.82. +- Updated to `monaco-vscode-api` `1.82.5`. Fixes requirung `"skipLibCheck": true` with previous versions of 1.82.x. ## [6.5.2] - 2023-10-07 diff --git a/packages/client/package.json b/packages/client/package.json index cc15b8d4a..0d20da082 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "monaco-languageclient", - "version": "6.5.3", + "version": "6.6.0-next.0", "description": "Monaco Language client implementation", "author": { "name": "TypeFox GmbH", @@ -37,8 +37,8 @@ "npm": ">=9.0.0" }, "volta": { - "node": "18.18.0", - "npm": "9.8.1" + "node": "18.18.1", + "npm": "9.9.0" }, "files": [ "lib", @@ -48,16 +48,16 @@ "License.txt" ], "dependencies": { - "monaco-editor": "~0.43.0", - "vscode": "npm:@codingame/monaco-vscode-api@>=1.82.5 <1.83.0", - "@codingame/monaco-vscode-editor-service-override": "~1.82.5", - "@codingame/monaco-vscode-languages-service-override": "~1.82.5", - "@codingame/monaco-vscode-model-service-override": "~1.82.5", + "monaco-editor": "~0.44.0", + "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.0-next.0 <1.84.0", + "@codingame/monaco-vscode-editor-service-override": "~1.83.0-next.0", + "@codingame/monaco-vscode-languages-service-override": "~1.83.0-next.0", + "@codingame/monaco-vscode-model-service-override": "~1.83.0-next.0", "vscode-languageclient": "~8.1.0" }, "peerDependencies": { - "monaco-editor": "~0.43.0", - "vscode": "npm:@codingame/monaco-vscode-api@>=1.82.5 <1.83.0" + "monaco-editor": "~0.44.0", + "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.0-next.0 <1.84.0" }, "peerDependenciesMeta": { "monaco-editor": { diff --git a/packages/examples/CHANGELOG.md b/packages/examples/CHANGELOG.md index 40fa99207..97488e295 100644 --- a/packages/examples/CHANGELOG.md +++ b/packages/examples/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this npm module are documented in this file. +## [6.6.0] - 2023-10-1x + +- Updated to `monaco-languageclient@6.6.0` + ## [6.5.3] - 2023-10-11 - Updated to `monaco-languageclient@6.5.3` diff --git a/packages/examples/package.json b/packages/examples/package.json index db36734d2..ab2a01d9c 100644 --- a/packages/examples/package.json +++ b/packages/examples/package.json @@ -1,6 +1,6 @@ { "name": "monaco-languageclient-examples", - "version": "6.5.3", + "version": "6.6.0-next.0", "description": "Monaco Language client examples", "author": { "name": "TypeFox GmbH", @@ -43,25 +43,25 @@ } }, "dependencies": { - "@codingame/monaco-vscode-configuration-service-override": "~1.82.5", - "@codingame/monaco-vscode-editor-service-override": "~1.82.5", - "@codingame/monaco-vscode-files-service-override": "~1.82.5", - "@codingame/monaco-vscode-json-default-extension": "~1.82.5", - "@codingame/monaco-vscode-keybindings-service-override": "~1.82.5", - "@codingame/monaco-vscode-python-default-extension": "~1.82.5", - "@codingame/monaco-vscode-textmate-service-override": "~1.82.5", - "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.82.5", - "@codingame/monaco-vscode-theme-service-override": "~1.82.5", + "@codingame/monaco-vscode-configuration-service-override": "~1.83.0-next.0", + "@codingame/monaco-vscode-editor-service-override": "~1.83.0-next.0", + "@codingame/monaco-vscode-files-service-override": "~1.83.0-next.0", + "@codingame/monaco-vscode-json-default-extension": "~1.83.0-next.0", + "@codingame/monaco-vscode-keybindings-service-override": "~1.83.0-next.0", + "@codingame/monaco-vscode-python-default-extension": "~1.83.0-next.0", + "@codingame/monaco-vscode-textmate-service-override": "~1.83.0-next.0", + "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.83.0-next.0", + "@codingame/monaco-vscode-theme-service-override": "~1.83.0-next.0", "express": "~4.18.2", "langium": "~2.0.2", "langium-statemachine-dsl": "~2.0.0", "monaco-editor-workers": "~0.43.0", - "monaco-languageclient": "~6.5.3", + "monaco-languageclient": "~6.6.0-next.0", "pyright": "~1.1.330", "react": "~18.2.0", "react-dom": "~18.2.0", "request-light": "~0.7.0", - "vscode-json-languageservice": "~5.3.6", + "vscode-json-languageservice": "~5.3.7", "vscode-languageserver": "~8.1.0", "vscode-uri": "~3.0.8", "vscode-ws-jsonrpc": "~3.0.0", @@ -77,8 +77,8 @@ "vscode-languageserver-types": "~3.17.3" }, "volta": { - "node": "18.18.0", - "npm": "9.8.1" + "node": "18.18.1", + "npm": "9.9.0" }, "files": [ "dist", diff --git a/packages/examples/src/browser/main.ts b/packages/examples/src/browser/main.ts index d9da956c0..10db3d796 100644 --- a/packages/examples/src/browser/main.ts +++ b/packages/examples/src/browser/main.ts @@ -58,8 +58,8 @@ export const startBrowserEditor = async () => { return protocolConverter.asCompletionResult(completionList); }, - resolveCompletionItem(item, _token) { - return jsonService.doResolve(codeConverter.asCompletionItem(item)).then(result => protocolConverter.asCompletionItem(result)); + async resolveCompletionItem(item, _token) { + return await jsonService.doResolve(codeConverter.asCompletionItem(item)).then(result => protocolConverter.asCompletionItem(result)); } }); @@ -80,10 +80,10 @@ export const startBrowserEditor = async () => { }); languages.registerHoverProvider(languageId, { - provideHover(vscodeDocument, position, _token) { + async provideHover(vscodeDocument, position, _token) { const document = createDocument(vscodeDocument); const jsonDocument = jsonService.parseJSONDocument(document); - return jsonService.doHover(document, codeConverter.asPosition(position), jsonDocument).then((hover) => { + return await jsonService.doHover(document, codeConverter.asPosition(position), jsonDocument).then((hover) => { return protocolConverter.asHover(hover)!; }); } diff --git a/packages/verify/pnpm/package.json b/packages/verify/pnpm/package.json index e4ece63e2..bf8fefe07 100644 --- a/packages/verify/pnpm/package.json +++ b/packages/verify/pnpm/package.json @@ -3,9 +3,9 @@ "version": "0.0.0", "private": "true", "dependencies": { - "monaco-languageclient": "~6.5.3", - "monaco-editor": "~0.43.0", - "vscode": "npm:@codingame/monaco-vscode-api@>=1.82.5 <1.83.0" + "monaco-languageclient": "~6.6.0-next.0", + "monaco-editor": "~0.44.0", + "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.0-next.0 <1.84.0" }, "devDependencies": { "shx": "~0.3.4" @@ -15,7 +15,7 @@ "test:treemending": "monaco-treemending" }, "volta": { - "node": "18.18.0", - "npm": "9.8.1" + "node": "18.18.1", + "npm": "9.9.0" } } \ No newline at end of file diff --git a/packages/verify/vite/package.json b/packages/verify/vite/package.json index 4c67262a3..0c1c83eea 100644 --- a/packages/verify/vite/package.json +++ b/packages/verify/vite/package.json @@ -5,16 +5,16 @@ "type": "module", "dependencies": { "monaco-editor-workers": "~0.43.0", - "monaco-languageclient": "~6.5.3", - "monaco-languageclient-examples": "~6.5.3", + "monaco-languageclient": "~6.6.0-next.0", + "monaco-languageclient-examples": "~6.6.0-next.0", "vscode-ws-jsonrpc": "~3.0.0" }, "devDependencies": { "http-server": "~14.1.1" }, "volta": { - "node": "18.18.0", - "npm": "9.8.1" + "node": "18.18.1", + "npm": "9.9.0" }, "scripts": { "clean": "shx rm -fr dist", diff --git a/packages/verify/webpack/package.json b/packages/verify/webpack/package.json index 983be78b9..8e36d9868 100644 --- a/packages/verify/webpack/package.json +++ b/packages/verify/webpack/package.json @@ -5,8 +5,8 @@ "type": "module", "dependencies": { "monaco-editor-workers": "~0.43.0", - "monaco-languageclient": "~6.5.3", - "monaco-languageclient-examples": "~6.5.3", + "monaco-languageclient": "~6.6.0-next.0", + "monaco-languageclient-examples": "~6.6.0-next.0", "vscode-ws-jsonrpc": "~3.0.0" }, "devDependencies": { @@ -18,8 +18,8 @@ "http-server": "~14.1.1" }, "volta": { - "node": "18.18.0", - "npm": "9.8.1" + "node": "18.18.1", + "npm": "9.9.0" }, "scripts": { "clean": "shx rm -fr dist *.tsbuildinfo", diff --git a/packages/verify/yarn/package.json b/packages/verify/yarn/package.json index e8ea54372..f947ceddd 100644 --- a/packages/verify/yarn/package.json +++ b/packages/verify/yarn/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": "true", "dependencies": { - "monaco-languageclient": "~6.5.3" + "monaco-languageclient": "~6.6.0-next.0" }, "devDependencies": { "shx": "~0.3.4" @@ -13,7 +13,7 @@ "test:treemending": "monaco-treemending" }, "volta": { - "node": "18.18.0", + "node": "18.18.1", "yarn": "1.22.19" } } \ No newline at end of file diff --git a/packages/vscode-ws-jsonrpc/package.json b/packages/vscode-ws-jsonrpc/package.json index 386f81227..ada046402 100644 --- a/packages/vscode-ws-jsonrpc/package.json +++ b/packages/vscode-ws-jsonrpc/package.json @@ -51,8 +51,8 @@ "npm": ">=8.0.0" }, "volta": { - "node": "18.18.0", - "npm": "9.8.1" + "node": "18.18.1", + "npm": "9.9.0" }, "files": [ "lib",