From 7e4c8bf8a0746235d9eafae09b86e1cf8281322e Mon Sep 17 00:00:00 2001 From: Anthony Dresser Date: Mon, 12 Aug 2019 11:44:39 -0700 Subject: [PATCH] upgrade language client and remove from webpack (#6612) --- extensions/mssql/extension.webpack.config.js | 6 --- extensions/mssql/package.json | 4 +- extensions/mssql/yarn.lock | 52 +++++++++++--------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/extensions/mssql/extension.webpack.config.js b/extensions/mssql/extension.webpack.config.js index e42254fdf4..b63c59c65d 100644 --- a/extensions/mssql/extension.webpack.config.js +++ b/extensions/mssql/extension.webpack.config.js @@ -13,11 +13,5 @@ module.exports = withDefaults({ context: __dirname, entry: { main: './src/main.ts' - }, - externals: { - 'dataprotocol-client': 'commonjs dataprotocol-client', - 'vscode-languageclient': 'commonjs vscode-languageclient', - 'vscode-extension-telemetry': 'commonjs vscode-extension-telemetry', - 'request': 'commonjs request', } }); diff --git a/extensions/mssql/package.json b/extensions/mssql/package.json index 4d112d7b61..0482022017 100644 --- a/extensions/mssql/package.json +++ b/extensions/mssql/package.json @@ -20,7 +20,7 @@ "dependencies": { "buffer-stream-reader": "^0.1.1", "bytes": "^3.1.0", - "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#0.3.0", + "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#1.0.0", "error-ex": "^1.3.2", "figures": "^2.0.0", "find-remove": "1.2.1", @@ -31,7 +31,7 @@ "stream-meter": "^1.0.4", "uri-js": "^4.2.2", "vscode-extension-telemetry": "0.1.0", - "vscode-languageclient": "^3.5.1", + "vscode-languageclient": "5.2.1", "vscode-nls": "^4.0.0" }, "contributes": { diff --git a/extensions/mssql/yarn.lock b/extensions/mssql/yarn.lock index d8dfcb8b75..040f891368 100644 --- a/extensions/mssql/yarn.lock +++ b/extensions/mssql/yarn.lock @@ -170,11 +170,11 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" -"dataprotocol-client@github:Microsoft/sqlops-dataprotocolclient#0.3.0": - version "0.3.0" - resolved "https://codeload.github.com/Microsoft/sqlops-dataprotocolclient/tar.gz/21487d15a5f753ba885ce1e489abc0af03487544" +"dataprotocol-client@github:Microsoft/sqlops-dataprotocolclient#1.0.0": + version "1.0.0" + resolved "https://codeload.github.com/Microsoft/sqlops-dataprotocolclient/tar.gz/a3732fe6ba4fd9f13abb2c6c88ad00f59f06620e" dependencies: - vscode-languageclient "3.5.1" + vscode-languageclient "5.2.1" debug@3.1.0: version "3.1.0" @@ -791,6 +791,11 @@ semver@^5.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== +semver@^5.5.0: + version "5.7.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b" + integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA== + "service-downloader@github:anthonydresser/service-downloader#0.1.6": version "0.1.6" resolved "https://codeload.github.com/anthonydresser/service-downloader/tar.gz/fd4114b145ee2b4f1f7950c23f10f4b1b28a2bfc" @@ -948,30 +953,31 @@ vscode-extension-telemetry@0.1.0: dependencies: applicationinsights "1.0.6" -vscode-jsonrpc@3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0.tgz#87239d9e166b2d7352245b8a813597804c1d63aa" - integrity sha1-hyOdnhZrLXNSJFuKgTWXgEwdY6o= +vscode-jsonrpc@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz#a7bf74ef3254d0a0c272fab15c82128e378b3be9" + integrity sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg== -vscode-languageclient@3.5.1, vscode-languageclient@^3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-3.5.1.tgz#c78e582459c24e58f88020dfa34065e976186a98" - integrity sha512-GTQ+hSq/o4c/y6GYmyP9XNrVoIu0NFZ67KltSkqN+tO0eUNDIlrVNX+3DJzzyLhSsrctuGzuYWm3t87mNAcBmQ== +vscode-languageclient@5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.2.1.tgz#7cfc83a294c409f58cfa2b910a8cfeaad0397193" + integrity sha512-7jrS/9WnV0ruqPamN1nE7qCxn0phkH5LjSgSp9h6qoJGoeAKzwKz/PF6M+iGA/aklx4GLZg1prddhEPQtuXI1Q== dependencies: - vscode-languageserver-protocol "3.5.1" + semver "^5.5.0" + vscode-languageserver-protocol "3.14.1" -vscode-languageserver-protocol@3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.1.tgz#5144a3a9eeccbd83fe2745bd4ed75fad6cc45f0d" - integrity sha512-1fPDIwsAv1difCV+8daOrJEGunClNJWqnUHq/ncWrjhitKWXgGmRCjlwZ3gDUTt54yRcvXz1PXJDaRNvNH6pYA== +vscode-languageserver-protocol@3.14.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz#b8aab6afae2849c84a8983d39a1cf742417afe2f" + integrity sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g== dependencies: - vscode-jsonrpc "3.5.0" - vscode-languageserver-types "3.5.0" + vscode-jsonrpc "^4.0.0" + vscode-languageserver-types "3.14.0" -vscode-languageserver-types@3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz#e48d79962f0b8e02de955e3f524908e2b19c0374" - integrity sha1-5I15li8LjgLelV4/UkkI4rGcA3Q= +vscode-languageserver-types@3.14.0: + version "3.14.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743" + integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A== vscode-nls@^4.0.0: version "4.0.0"