diff --git a/README.md b/README.md index daf51354b..a0139af4e 100644 --- a/README.md +++ b/README.md @@ -78,6 +78,7 @@ The following table describes which version of **monaco-languageclient** and **m | monaco-languageclient | monaco-vscode-api | monaco-editor | comment | | :---- | :---- | :--- | :--- | +| 6.1.1 | 1.79.2 | 0.39.0 | Released 2023-06-1x | | 6.1.0 | 1.79.1 | 0.38.0 | Released 2023-06-12 | | 6.0.3 | 1.78.8 | 0.37.1 | Released 2023-05-31 | | 6.0.2 | 1.78.6 | 0.37.1 | Released 2023-05-24 | diff --git a/package-lock.json b/package-lock.json index d5fef44cf..f70471b8c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -711,9 +711,9 @@ } }, "node_modules/@types/eslint": { - "version": "8.40.0", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.40.0.tgz", - "integrity": "sha512-nbq2mvc/tBrK9zQQuItvjJl++GTN5j06DaPtp3hZCpngmG6Q3xoyEmd0TwZI0gAy/G1X0zhGBbr2imsGFdFV0g==", + "version": "8.40.2", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.40.2.tgz", + "integrity": "sha512-PRVjQ4Eh9z9pmmtaq8nTjZjQwKFk7YIHIud3lRoKRBgUQjgjRmoGxxGEPXQkF+lH7QkHJRNr5F4aBgYCW0lqpQ==", "dev": true, "peer": true, "dependencies": { @@ -782,9 +782,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.16.16", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.16.tgz", - "integrity": "sha512-NpaM49IGQQAUlBhHMF82QH80J08os4ZmyF9MkpCzWAGuOHqE4gTEbhzd7L3l5LmWuZ6E0OiC1FweQ4tsiW35+g==", + "version": "18.16.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.18.tgz", + "integrity": "sha512-/aNaQZD0+iSBAGnvvN2Cx92HqE5sZCPZtx2TsK+4nvV23fFe09jVDvpArXr2j9DnYlzuU9WuoykDDc6wqvpNcw==", "dev": true }, "node_modules/@types/prop-types": { @@ -806,9 +806,9 @@ "dev": true }, "node_modules/@types/react": { - "version": "18.2.8", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.8.tgz", - "integrity": "sha512-lTyWUNrd8ntVkqycEEplasWy2OxNlShj3zqS0LuB1ENUGis5HodmhM7DtCoUGbxj3VW/WsGA0DUhpG6XrM7gPA==", + "version": "18.2.12", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.12.tgz", + "integrity": "sha512-ndmBMLCgn38v3SntMeoJaIrO6tGHYKMEBohCUmw8HoLLQdRMOIGXfeYaBTLe2lsFaSB3MOK1VXscYFnmLtTSmw==", "dev": true, "dependencies": { "@types/prop-types": "*", @@ -817,9 +817,9 @@ } }, "node_modules/@types/react-dom": { - "version": "18.2.4", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.4.tgz", - "integrity": "sha512-G2mHoTMTL4yoydITgOGwWdWMVd8sNgyEP85xVmMKAPUBwQWm9wBPQUmvbeF4V3WBY1P7mmL4BkjQ0SqUpf1snw==", + "version": "18.2.5", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.5.tgz", + "integrity": "sha512-sRQsOS/sCLnpQhR4DSKGTtWFE3FZjpQa86KPVbhUqdYMRZ9FEFcfAytKhR/vUG2rH1oFbOOej6cuD7MFSobDRQ==", "dev": true, "dependencies": { "@types/react": "*" @@ -864,24 +864,24 @@ "dev": true }, "node_modules/@types/ws": { - "version": "8.5.4", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.4.tgz", - "integrity": "sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==", + "version": "8.5.5", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz", + "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.59.8", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.8.tgz", - "integrity": "sha512-JDMOmhXteJ4WVKOiHXGCoB96ADWg9q7efPWHRViT/f09bA8XOMLAVHHju3l0MkZnG1izaWXYmgvQcUjTRcpShQ==", + "version": "5.59.11", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.11.tgz", + "integrity": "sha512-XxuOfTkCUiOSyBWIvHlUraLw/JT/6Io1365RO6ZuI88STKMavJZPNMU0lFcUTeQXEhHiv64CbxYxBNoDVSmghg==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.4.0", - "@typescript-eslint/scope-manager": "5.59.8", - "@typescript-eslint/type-utils": "5.59.8", - "@typescript-eslint/utils": "5.59.8", + "@typescript-eslint/scope-manager": "5.59.11", + "@typescript-eslint/type-utils": "5.59.11", + "@typescript-eslint/utils": "5.59.11", "debug": "^4.3.4", "grapheme-splitter": "^1.0.4", "ignore": "^5.2.0", @@ -907,14 +907,14 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "5.59.8", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.8.tgz", - "integrity": "sha512-AnR19RjJcpjoeGojmwZtCwBX/RidqDZtzcbG3xHrmz0aHHoOcbWnpDllenRDmDvsV0RQ6+tbb09/kyc+UT9Orw==", + "version": "5.59.11", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.59.11.tgz", + "integrity": "sha512-s9ZF3M+Nym6CAZEkJJeO2TFHHDsKAM3ecNkLuH4i4s8/RCPnF5JRip2GyviYkeEAcwGMJxkqG9h2dAsnA1nZpA==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.59.8", - "@typescript-eslint/types": "5.59.8", - "@typescript-eslint/typescript-estree": "5.59.8", + "@typescript-eslint/scope-manager": "5.59.11", + "@typescript-eslint/types": "5.59.11", + "@typescript-eslint/typescript-estree": "5.59.11", "debug": "^4.3.4" }, "engines": { @@ -934,13 +934,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.59.8", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.8.tgz", - "integrity": "sha512-/w08ndCYI8gxGf+9zKf1vtx/16y8MHrZs5/tnjHhMLNSixuNcJavSX4wAiPf4aS5x41Es9YPCn44MIe4cxIlig==", + "version": "5.59.11", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.59.11.tgz", + "integrity": "sha512-dHFOsxoLFtrIcSj5h0QoBT/89hxQONwmn3FOQ0GOQcLOOXm+MIrS8zEAhs4tWl5MraxCY3ZJpaXQQdFMc2Tu+Q==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.59.8", - "@typescript-eslint/visitor-keys": "5.59.8" + "@typescript-eslint/types": "5.59.11", + "@typescript-eslint/visitor-keys": "5.59.11" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -951,13 +951,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "5.59.8", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.8.tgz", - "integrity": "sha512-+5M518uEIHFBy3FnyqZUF3BMP+AXnYn4oyH8RF012+e7/msMY98FhGL5SrN29NQ9xDgvqCgYnsOiKp1VjZ/fpA==", + "version": "5.59.11", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.59.11.tgz", + "integrity": "sha512-LZqVY8hMiVRF2a7/swmkStMYSoXMFlzL6sXV6U/2gL5cwnLWQgLEG8tjWPpaE4rMIdZ6VKWwcffPlo1jPfk43g==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "5.59.8", - "@typescript-eslint/utils": "5.59.8", + "@typescript-eslint/typescript-estree": "5.59.11", + "@typescript-eslint/utils": "5.59.11", "debug": "^4.3.4", "tsutils": "^3.21.0" }, @@ -978,9 +978,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "5.59.8", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.8.tgz", - "integrity": "sha512-+uWuOhBTj/L6awoWIg0BlWy0u9TyFpCHrAuQ5bNfxDaZ1Ppb3mx6tUigc74LHcbHpOHuOTOJrBoAnhdHdaea1w==", + "version": "5.59.11", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.59.11.tgz", + "integrity": "sha512-epoN6R6tkvBYSc+cllrz+c2sOFWkbisJZWkOE+y3xHtvYaOE6Wk6B8e114McRJwFRjGvYdJwLXQH5c9osME/AA==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -991,13 +991,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.59.8", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.8.tgz", - "integrity": "sha512-Jy/lPSDJGNow14vYu6IrW790p7HIf/SOV1Bb6lZ7NUkLc2iB2Z9elESmsaUtLw8kVqogSbtLH9tut5GCX1RLDg==", + "version": "5.59.11", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.11.tgz", + "integrity": "sha512-YupOpot5hJO0maupJXixi6l5ETdrITxeo5eBOeuV7RSKgYdU3G5cxO49/9WRnJq9EMrB7AuTSLH/bqOsXi7wPA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.59.8", - "@typescript-eslint/visitor-keys": "5.59.8", + "@typescript-eslint/types": "5.59.11", + "@typescript-eslint/visitor-keys": "5.59.11", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -1018,17 +1018,17 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "5.59.8", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.8.tgz", - "integrity": "sha512-Tr65630KysnNn9f9G7ROF3w1b5/7f6QVCJ+WK9nhIocWmx9F+TmCAcglF26Vm7z8KCTwoKcNEBZrhlklla3CKg==", + "version": "5.59.11", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.59.11.tgz", + "integrity": "sha512-didu2rHSOMUdJThLk4aZ1Or8IcO3HzCw/ZvEjTTIfjIrcdd5cvSIwwDy2AOlE7htSNp7QIZ10fLMyRCveesMLg==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@types/json-schema": "^7.0.9", "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.59.8", - "@typescript-eslint/types": "5.59.8", - "@typescript-eslint/typescript-estree": "5.59.8", + "@typescript-eslint/scope-manager": "5.59.11", + "@typescript-eslint/types": "5.59.11", + "@typescript-eslint/typescript-estree": "5.59.11", "eslint-scope": "^5.1.1", "semver": "^7.3.7" }, @@ -1044,12 +1044,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.59.8", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.8.tgz", - "integrity": "sha512-pJhi2ms0x0xgloT7xYabil3SGGlojNNKjK/q6dB3Ey0uJLMjK2UDGJvHieiyJVW/7C3KI+Z4Q3pEHkm4ejA+xQ==", + "version": "5.59.11", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.11.tgz", + "integrity": "sha512-KGYniTGG3AMTuKF9QBD7EIrvufkB6O6uX3knP73xbKLMpH+QRPcgnCxjWXSHjMRuOxFLovljqQgQpR0c7GvjoA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.59.8", + "@typescript-eslint/types": "5.59.11", "eslint-visitor-keys": "^3.3.0" }, "engines": { @@ -1586,9 +1586,9 @@ } }, "node_modules/browserslist": { - "version": "4.21.7", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.7.tgz", - "integrity": "sha512-BauCXrQ7I2ftSqd2mvKHGo85XR0u7Ru3C/Hxsy/0TkfCtjrmAbPdzLGasmoiBxplpDXlPvdjX9u7srIMfgasNA==", + "version": "4.21.8", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.8.tgz", + "integrity": "sha512-j+7xYe+v+q2Id9qbBeCI8WX5NmZSRe8es1+0xntD/+gaWXznP8tFEkv5IgSaHf5dS1YwVMbX/4W6m937mj+wQw==", "dev": true, "funding": [ { @@ -1606,8 +1606,8 @@ ], "peer": true, "dependencies": { - "caniuse-lite": "^1.0.30001489", - "electron-to-chromium": "^1.4.411", + "caniuse-lite": "^1.0.30001502", + "electron-to-chromium": "^1.4.428", "node-releases": "^2.0.12", "update-browserslist-db": "^1.0.11" }, @@ -1674,9 +1674,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001494", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001494.tgz", - "integrity": "sha512-sY2B5Qyl46ZzfYDegrl8GBCzdawSLT4ThM9b9F+aDYUrAG2zCOyMbd2Tq34mS1g4ZKBfjRlzOohQMxx28x6wJg==", + "version": "1.0.30001502", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001502.tgz", + "integrity": "sha512-AZ+9tFXw1sS0o0jcpJQIXvFTOB/xGiQ4OQ2t98QX3NDn2EZTSRBC801gxrsGgViuq2ak/NLkNgSNEPtCr5lfKg==", "dev": true, "funding": [ { @@ -2010,9 +2010,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.4.419", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.419.tgz", - "integrity": "sha512-jdie3RiEgygvDTyS2sgjq71B36q2cDSBfPlwzUyuOrfYTNoYWyBxxjGJV/HAu3A2hB0Y+HesvCVkVAFoCKwCSw==", + "version": "1.4.429", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.429.tgz", + "integrity": "sha512-COua8RvN548KwPFzKMrTjFbmDsQRgdi0zSAhmo70TwC1tfLOSqq8p09n+GkdF5buvzE/NEYn1dP3itbfhun9gg==", "dev": true, "peer": true }, @@ -2025,9 +2025,9 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.14.1", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.14.1.tgz", - "integrity": "sha512-Vklwq2vDKtl0y/vtwjSesgJ5MYS7Etuk5txS8VdKL4AOS1aUlD96zqIfsOSLQsdv3xgMRbtkWM8eG9XDfKUPow==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", + "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", "dev": true, "dependencies": { "graceful-fs": "^4.2.4", @@ -2098,9 +2098,9 @@ } }, "node_modules/es-module-lexer": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.2.1.tgz", - "integrity": "sha512-9978wrXM50Y4rTMmW5kXIC09ZdXQZqkE4mxhwkd8VbzsGkXGPgV4zWuqQJgCEzYngdo2dYDa0l8xhX4fkSwJSg==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz", + "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==", "dev": true, "peer": true }, @@ -4221,9 +4221,9 @@ } }, "node_modules/monaco-editor": { - "version": "0.38.0", - "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.38.0.tgz", - "integrity": "sha512-11Fkh6yzEmwx7O0YoLxeae0qEGFwmyPRlVxpg7oF9czOOCB/iCjdJrG5I67da5WiXK3YJCxoz9TJFE8Tfq/v9A==" + "version": "0.39.0", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.39.0.tgz", + "integrity": "sha512-zhbZ2Nx93tLR8aJmL2zI1mhJpsl87HMebNBM6R8z4pLfs8pj604pIVIVwyF1TivcfNtIPpMXL+nb3DsBmE/x6Q==" }, "node_modules/monaco-editor-workers": { "version": "0.38.0", @@ -4980,9 +4980,9 @@ } }, "node_modules/rollup": { - "version": "3.23.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.23.1.tgz", - "integrity": "sha512-ybRdFVHOoljGEFILHLd2g/qateqUdjE6YS41WXq4p3C/WwD3xtWxV4FYWETA1u9TeXQc5K8L8zHE5d/scOvrOQ==", + "version": "3.25.1", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.25.1.tgz", + "integrity": "sha512-tywOR+rwIt5m2ZAWSe5AIJcTat8vGlnPFAv15ycCrw33t6iFsXZ6mzHVFh2psSjxQPmI+xgzMZZizUAukBI4aQ==", "dev": true, "bin": { "rollup": "dist/bin/rollup" @@ -5065,9 +5065,9 @@ } }, "node_modules/schema-utils": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.2.tgz", - "integrity": "sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.2.0.tgz", + "integrity": "sha512-0zTyLGyDJYd/MBxG1AhJkKa6fpEBds4OQO2ut0w7OYG+ZGhGea09lijvzsqegYSik88zc7cUtIlnnO+/BvD6gQ==", "dev": true, "peer": true, "dependencies": { @@ -5459,9 +5459,9 @@ } }, "node_modules/terser": { - "version": "5.17.7", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.17.7.tgz", - "integrity": "sha512-/bi0Zm2C6VAexlGgLlVxA0P2lru/sdLyfCVaRMfKVo9nWxbmz7f/sD8VPybPeSUJaJcwmCJis9pBIhcVcG1QcQ==", + "version": "5.18.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.18.0.tgz", + "integrity": "sha512-pdL757Ig5a0I+owA42l6tIuEycRuM7FPY4n62h44mRLRfnOxJkkOHd6i89dOpwZlpF6JXBwaAHF6yWzFrt+QyA==", "dev": true, "peer": true, "dependencies": { @@ -5896,16 +5896,23 @@ }, "node_modules/vscode": { "name": "@codingame/monaco-vscode-api", - "version": "1.79.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.79.1.tgz", - "integrity": "sha512-S6t3ZnnonHy0SqpUdRg60YcFluUGLj6S8KXiu//WQgfmZ/ccsc5gASMSjlcZLRGzs02KOXKppNGwHSgq6Cx3Tg==", + "version": "1.79.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.79.2.tgz", + "integrity": "sha512-U4Th1VlMSVuS6DN7REwKUe34SGEXyciA9RTTC6nFLeJb4+a8YLZKCORakQsuZCsAjpeJ1huc8Zl6rLln0u+HsA==", "bin": { "monaco-treemending": "monaco-treemending.js" }, "peerDependencies": { - "monaco-editor": "0.38.0", + "monaco-editor": "0.39.0", "vscode-oniguruma": "^1.7.0", "vscode-textmate": "^9.0.0", + "xterm": "5.2.1", + "xterm-addon-canvas": "0.4.0", + "xterm-addon-image": "0.4.1", + "xterm-addon-search": "0.12.0", + "xterm-addon-serialize": "0.10.0", + "xterm-addon-unicode11": "0.5.0", + "xterm-addon-webgl": "0.15.0", "yauzl": "^2.10.0" } }, @@ -6019,9 +6026,9 @@ } }, "node_modules/webpack": { - "version": "5.85.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.85.0.tgz", - "integrity": "sha512-7gazTiYqwo5OSqwH1tigLDL2r3qDeP2dOKYgd+LlXpsUMqDTklg6tOghexqky0/+6QY38kb/R/uRPUleuL43zg==", + "version": "5.86.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.86.0.tgz", + "integrity": "sha512-3BOvworZ8SO/D4GVP+GoRC3fVeg5MO4vzmq8TJJEkdmopxyazGDxN8ClqN12uzrZW9Tv8EED8v5VSb6Sqyi0pg==", "dev": true, "peer": true, "dependencies": { @@ -6271,6 +6278,66 @@ } } }, + "node_modules/xterm": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/xterm/-/xterm-5.2.1.tgz", + "integrity": "sha512-cs5Y1fFevgcdoh2hJROMVIWwoBHD80P1fIP79gopLHJIE4kTzzblanoivxTiQ4+92YM9IxS36H1q0MxIJXQBcA==", + "peer": true + }, + "node_modules/xterm-addon-canvas": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/xterm-addon-canvas/-/xterm-addon-canvas-0.4.0.tgz", + "integrity": "sha512-iTC8CdjX9+hGX7jiEuiDMXzHsY/FKJdVnbjep5xjRXNu7RKOk15xuecIkJ7HZORqMVPpr4DGS3jyd9XUoBuxqw==", + "peer": true, + "peerDependencies": { + "xterm": "^5.0.0" + } + }, + "node_modules/xterm-addon-image": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/xterm-addon-image/-/xterm-addon-image-0.4.1.tgz", + "integrity": "sha512-iJpYyvtbHg4oXSv+D6J73ZfCjnboZpbZ567MLplXDBlYSUknv3kvPTfVMPJATV7Zsx7+bDgyXboCh9vsDf/m/w==", + "peer": true, + "peerDependencies": { + "xterm": "~5.2.0" + } + }, + "node_modules/xterm-addon-search": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/xterm-addon-search/-/xterm-addon-search-0.12.0.tgz", + "integrity": "sha512-hXAuO7Ts2+Jf9K8mZrUx8IFd7c/Flgks/jyqA1L4reymyfmXtcsd+WDLel8R9Tgy2CLyKABVBP09/Ua/FmXcvg==", + "peer": true, + "peerDependencies": { + "xterm": "^5.0.0" + } + }, + "node_modules/xterm-addon-serialize": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/xterm-addon-serialize/-/xterm-addon-serialize-0.10.0.tgz", + "integrity": "sha512-Syp9eSBypn70iAczcJ+kAi0foQIepAvFS6x53JwI4XylTBHn87Ep9fovslhwmUV3rwH2yMnpdDjXH5W/whx2lA==", + "peer": true, + "peerDependencies": { + "xterm": "^5.0.0" + } + }, + "node_modules/xterm-addon-unicode11": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/xterm-addon-unicode11/-/xterm-addon-unicode11-0.5.0.tgz", + "integrity": "sha512-Jm4/g4QiTxiKiTbYICQgC791ubhIZyoIwxAIgOW8z8HWFNY+lwk+dwaKEaEeGBfM48Vk8fklsUW9u/PlenYEBg==", + "peer": true, + "peerDependencies": { + "xterm": "^5.0.0" + } + }, + "node_modules/xterm-addon-webgl": { + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/xterm-addon-webgl/-/xterm-addon-webgl-0.15.0.tgz", + "integrity": "sha512-ZLcqogMFHr4g/YRhcCh3xE8tTklnyut/M+O/XhVsFBRB/YCvYhPdLQ5/AQk54V0wjWAQpa8CF3W8DVR9OqyMCg==", + "peer": true, + "peerDependencies": { + "xterm": "^5.0.0" + } + }, "node_modules/yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", @@ -6309,12 +6376,12 @@ }, "packages/client": { "name": "monaco-languageclient", - "version": "6.1.0", + "version": "6.1.1", "hasInstallScript": true, "license": "MIT", "dependencies": { - "monaco-editor": "~0.38.0", - "vscode": "npm:@codingame/monaco-vscode-api@~1.79.1", + "monaco-editor": "~0.39.0", + "vscode": "npm:@codingame/monaco-vscode-api@~1.79.2", "vscode-jsonrpc": "~8.1.0", "vscode-languageclient": "~8.1.0" }, @@ -6323,8 +6390,8 @@ "npm": ">=9.0.0" }, "peerDependencies": { - "monaco-editor": "~0.38.0", - "vscode": "npm:@codingame/monaco-vscode-api@~1.79.1" + "monaco-editor": "~0.39.0", + "vscode": "npm:@codingame/monaco-vscode-api@~1.79.2" }, "peerDependenciesMeta": { "monaco-editor": { @@ -6343,7 +6410,7 @@ "langium": "~1.2.0", "langium-statemachine-dsl": "~1.2.0", "monaco-editor-workers": "0.38.0", - "monaco-languageclient": "6.1.0", + "monaco-languageclient": "6.1.1", "normalize-url": "~8.0.0", "react": "~18.2.0", "react-dom": "~18.2.0", @@ -6370,7 +6437,7 @@ "version": "0.0.0", "dependencies": { "monaco-editor-workers": "0.38.0", - "monaco-languageclient": "6.1.0", + "monaco-languageclient": "6.1.1", "normalize-url": "~8.0.0", "vscode-ws-jsonrpc": "3.0.0" }, @@ -6383,7 +6450,7 @@ "version": "0.0.0", "dependencies": { "monaco-editor-workers": "0.38.0", - "monaco-languageclient": "6.1.0", + "monaco-languageclient": "6.1.1", "normalize-url": "~8.0.0", "vscode-ws-jsonrpc": "3.0.0" }, diff --git a/packages/client/CHANGELOG.md b/packages/client/CHANGELOG.md index efe0016ed..3e6a584e9 100644 --- a/packages/client/CHANGELOG.md +++ b/packages/client/CHANGELOG.md @@ -2,7 +2,11 @@ All notable changes to this npm module are documented in this file. -## [6.1.0] - 2023-06-0x +## [6.1.1] - 2023-06-12 + +- Updated to `monaco-vscode-api` version `1.79.2` and `monaco-editor` version `0.39.0` [#503](https://github.com/TypeFox/monaco-languageclient/pull/503) + +## [6.1.0] - 2023-06-12 - Updated to `monaco-vscode-api` version `1.79.0` and `monaco-editor` version `0.38.0` [#493](https://github.com/TypeFox/monaco-languageclient/issues/493) - Updated to `monaco-vscode-api` version `1.79.1` [#501](https://github.com/TypeFox/monaco-languageclient/pull/501) diff --git a/packages/client/package.json b/packages/client/package.json index 1823923bf..21194ff5b 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "monaco-languageclient", - "version": "6.1.0", + "version": "6.1.1", "description": "Monaco Language client implementation", "author": { "name": "TypeFox GmbH", @@ -48,14 +48,14 @@ "License.txt" ], "dependencies": { - "monaco-editor": "~0.38.0", - "vscode": "npm:@codingame/monaco-vscode-api@~1.79.1", + "monaco-editor": "~0.39.0", + "vscode": "npm:@codingame/monaco-vscode-api@~1.79.2", "vscode-jsonrpc": "~8.1.0", "vscode-languageclient": "~8.1.0" }, "peerDependencies": { - "monaco-editor": "~0.38.0", - "vscode": "npm:@codingame/monaco-vscode-api@~1.79.1" + "monaco-editor": "~0.39.0", + "vscode": "npm:@codingame/monaco-vscode-api@~1.79.2" }, "peerDependenciesMeta": { "monaco-editor": { diff --git a/packages/client/src/monaco-vscode-api-services.ts b/packages/client/src/monaco-vscode-api-services.ts index 6ba077ff9..511b4b362 100644 --- a/packages/client/src/monaco-vscode-api-services.ts +++ b/packages/client/src/monaco-vscode-api-services.ts @@ -7,6 +7,7 @@ import { editor, Environment, Uri } from 'monaco-editor/esm/vs/editor/editor.api import { initialize as initializeMonacoService } from 'vscode/services'; import { initialize as initializeVscodeExtensions } from 'vscode/extensions'; import type { OpenEditor } from 'vscode/service-override/editor'; +import { ITerminalBackend } from 'vscode/service-override/terminal'; interface MonacoEnvironmentEnhanced extends Environment { vscodeApiInitialised: boolean; @@ -34,6 +35,12 @@ export type InitializeServiceConfig = { enablePreferencesService?: boolean; enableSnippetsService?: boolean; enableQuickaccessService?: boolean; + enableOutputService?: boolean; + configureTerminalServiceConfig?: { + backendImpl: ITerminalBackend + } + enableSearchService?: boolean; + enableMarkersService?: boolean; userServices?: editor.IEditorOverrideServices; debugLogging?: boolean; }; @@ -53,7 +60,11 @@ export const initServices = async (config?: InitializeServiceConfig) => { } if (!window.MonacoEnvironment) { - window.MonacoEnvironment = {}; + window.MonacoEnvironment = { + createTrustedTypesPolicy: (_policyName: string) => { + return undefined; + } + }; } (window.MonacoEnvironment as MonacoEnvironmentEnhanced).vscodeApiInitialised = true; }; @@ -86,9 +97,6 @@ const importAllServices = async (config?: InitializeServiceConfig) => { addService('editor', import('vscode/service-override/editor')); } } - if (lc.enableQuickaccessService === true) { - addService('quickaccess', import('vscode/service-override/quickaccess')); - } if (lc.configureConfigurationServiceConfig !== undefined) { addService('configuration', import('vscode/service-override/configuration')); } @@ -122,6 +130,21 @@ const importAllServices = async (config?: InitializeServiceConfig) => { if (lc.enableSnippetsService === true) { addService('snippets', import('vscode/service-override/snippets')); } + if (lc.enableQuickaccessService === true) { + addService('quickaccess', import('vscode/service-override/quickaccess')); + } + if (lc.enableOutputService === true) { + addService('output', import('vscode/service-override/output')); + } + if (lc.configureTerminalServiceConfig !== undefined) { + addService('terminal', import('vscode/service-override/terminal')); + } + if (lc.enableSearchService === true) { + addService('search', import('vscode/service-override/search')); + } + if (lc.enableMarkersService === true) { + addService('markers', import('vscode/service-override/markers')); + } const reportServiceLoading = (origin: string, services: editor.IEditorOverrideServices, debugLogging: boolean) => { for (const serviceName of Object.keys(services)) { @@ -180,8 +203,14 @@ const importAllServices = async (config?: InitializeServiceConfig) => { services = loadedImport.default(lc.configureEditorOrViewsServiceConfig.openEditorFunc); } } else if (serviceName === 'configuration') { - const uri = Uri.file(lc.configureConfigurationServiceConfig!.defaultWorkspaceUri); - services = loadedImport.default(uri); + if (lc.configureConfigurationServiceConfig?.defaultWorkspaceUri) { + const uri = Uri.file(lc.configureConfigurationServiceConfig!.defaultWorkspaceUri); + services = loadedImport.default(uri); + } + } else if (serviceName === 'terminal') { + if (lc.configureTerminalServiceConfig?.backendImpl) { + services = loadedImport.default(lc.configureTerminalServiceConfig.backendImpl); + } } else { services = loadedImport.default(); } diff --git a/packages/examples/main/package.json b/packages/examples/main/package.json index 828a63284..c535a9655 100644 --- a/packages/examples/main/package.json +++ b/packages/examples/main/package.json @@ -23,7 +23,7 @@ "langium": "~1.2.0", "langium-statemachine-dsl": "~1.2.0", "monaco-editor-workers": "0.38.0", - "monaco-languageclient": "6.1.0", + "monaco-languageclient": "6.1.1", "normalize-url": "~8.0.0", "react": "~18.2.0", "react-dom": "~18.2.0", diff --git a/packages/examples/main/src/langium/main.ts b/packages/examples/main/src/langium/main.ts index e70311e01..5f20f1504 100644 --- a/packages/examples/main/src/langium/main.ts +++ b/packages/examples/main/src/langium/main.ts @@ -144,6 +144,9 @@ try { enablePreferencesService: true, enableSnippetsService: true, enableQuickaccessService: true, + enableOutputService: false, + enableSearchService: false, + enableMarkersService: false, userServices: { // manually add the files service ...getFileServiceOverride() diff --git a/packages/verify/pnpm/package.json b/packages/verify/pnpm/package.json index f1660d87f..544c8ca93 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.1.0", - "monaco-editor": "~0.38.0", - "vscode": "npm:@codingame/monaco-vscode-api@~1.79.1" + "monaco-languageclient": "6.1.1", + "monaco-editor": "~0.39.0", + "vscode": "npm:@codingame/monaco-vscode-api@~1.79.2" }, "devDependencies": { "shx": "~0.3.4" diff --git a/packages/verify/vite/package.json b/packages/verify/vite/package.json index cdc4367f6..6fccbbd22 100644 --- a/packages/verify/vite/package.json +++ b/packages/verify/vite/package.json @@ -5,7 +5,7 @@ "type": "module", "dependencies": { "monaco-editor-workers": "0.38.0", - "monaco-languageclient": "6.1.0", + "monaco-languageclient": "6.1.1", "vscode-ws-jsonrpc": "3.0.0", "normalize-url": "~8.0.0" }, diff --git a/packages/verify/webpack/package.json b/packages/verify/webpack/package.json index 7123591db..95d28f722 100644 --- a/packages/verify/webpack/package.json +++ b/packages/verify/webpack/package.json @@ -5,7 +5,7 @@ "type": "module", "dependencies": { "monaco-editor-workers": "0.38.0", - "monaco-languageclient": "6.1.0", + "monaco-languageclient": "6.1.1", "vscode-ws-jsonrpc": "3.0.0", "normalize-url": "~8.0.0" }, diff --git a/packages/verify/yarn/package.json b/packages/verify/yarn/package.json index 7494fe03a..b488fc6cc 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.1.0" + "monaco-languageclient": "6.1.1" }, "devDependencies": { "shx": "~0.3.4"