diff --git a/extensions/css-language-features/.vscodeignore b/extensions/css-language-features/.vscodeignore index 89a62ee0761..15d7373fbf0 100644 --- a/extensions/css-language-features/.vscodeignore +++ b/extensions/css-language-features/.vscodeignore @@ -1,7 +1,6 @@ test/** .vscode/** server/.vscode/** -node_modules/** server/node_modules/** client/src/** server/src/** @@ -16,6 +15,4 @@ server/yarn.lock server/.npmignore yarn.lock server/extension.webpack.config.js -extension.webpack.config.js -!node_modules/vscode-nls/** -!server/node_modules/vscode-nls/** \ No newline at end of file +extension.webpack.config.js \ No newline at end of file diff --git a/extensions/css-language-features/extension.webpack.config.js b/extensions/css-language-features/extension.webpack.config.js index 014213183cb..dec7ad5afb4 100644 --- a/extensions/css-language-features/extension.webpack.config.js +++ b/extensions/css-language-features/extension.webpack.config.js @@ -8,7 +8,6 @@ 'use strict'; const withDefaults = require('../shared.webpack.config'); -const CopyWebpackPlugin = require('copy-webpack-plugin'); const path = require('path'); module.exports = withDefaults({ @@ -18,16 +17,6 @@ module.exports = withDefaults({ }, output: { filename: 'cssMain.js', - path: path.join(__dirname, 'client', 'dist'), - libraryTarget: "commonjs", - }, - externals: { - './files': 'commonjs', // ignored because it doesn't exist - }, - plugins: [ - new CopyWebpackPlugin([ - { from: './out/*.sh', to: '[name].sh' }, - { from: './out/nls.*.json', to: '[name].json' } - ]) - ] + path: path.join(__dirname, 'client', 'dist') + } }); diff --git a/extensions/css-language-features/package.json b/extensions/css-language-features/package.json index a565f4309ef..c779f246284 100644 --- a/extensions/css-language-features/package.json +++ b/extensions/css-language-features/package.json @@ -708,7 +708,7 @@ ] }, "dependencies": { - "vscode-languageclient": "^5.1.0-next.9", + "vscode-languageclient": "^5.1.0", "vscode-nls": "^4.0.0" }, "devDependencies": { diff --git a/extensions/css-language-features/server/extension.webpack.config.js b/extensions/css-language-features/server/extension.webpack.config.js index 2a8aeff057d..17dc2d39e34 100644 --- a/extensions/css-language-features/server/extension.webpack.config.js +++ b/extensions/css-language-features/server/extension.webpack.config.js @@ -18,11 +18,7 @@ module.exports = withDefaults({ }, output: { filename: 'cssServerMain.js', - path: path.join(__dirname, 'dist'), - libraryTarget: "commonjs", - }, - externals: { - "vscode-nls": 'commonjs vscode-nls', + path: path.join(__dirname, 'dist') }, plugins: [ new webpack.NormalModuleReplacementPlugin( diff --git a/extensions/css-language-features/server/package.json b/extensions/css-language-features/server/package.json index 0ef07147fe0..8c4d387acca 100644 --- a/extensions/css-language-features/server/package.json +++ b/extensions/css-language-features/server/package.json @@ -9,8 +9,8 @@ }, "main": "./out/cssServerMain", "dependencies": { - "vscode-css-languageservice": "^3.0.11-next.2", - "vscode-languageserver": "^5.1.0-next.5" + "vscode-css-languageservice": "^3.0.11", + "vscode-languageserver": "^5.1.0" }, "devDependencies": { "@types/mocha": "2.2.33", diff --git a/extensions/css-language-features/server/yarn.lock b/extensions/css-language-features/server/yarn.lock index 7e5589b98e8..ba4e48c8366 100644 --- a/extensions/css-language-features/server/yarn.lock +++ b/extensions/css-language-features/server/yarn.lock @@ -194,44 +194,40 @@ supports-color@5.4.0: dependencies: has-flag "^3.0.0" -vscode-css-languageservice@^3.0.11-next.2: - version "3.0.11-next.2" - resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.11-next.2.tgz#7aa41a895abbcb3c0884d9612ae546c39de8b984" +vscode-css-languageservice@^3.0.11: + version "3.0.11" + resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.11.tgz#0e75e1870d59fddbfb6021efd5d80df08c9faaeb" dependencies: - vscode-languageserver-types "^3.12.0" - vscode-nls "^3.2.5" + vscode-languageserver-types "^3.13.0" + vscode-nls "^4.0.0" -vscode-jsonrpc@^3.6.2: - version "3.6.2" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.2.tgz#3b5eef691159a15556ecc500e9a8a0dd143470c8" +vscode-jsonrpc@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz#a7bf74ef3254d0a0c272fab15c82128e378b3be9" -vscode-languageserver-protocol@^3.13.0-next.1: - version "3.13.0-next.1" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0-next.1.tgz#24d15aa5769e4b035f6ce38342685959e1eb454e" +vscode-languageserver-protocol@3.13.0: + version "3.13.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0.tgz#710d8e42119bb3affb1416e1e104bd6b4d503595" dependencies: - vscode-jsonrpc "^3.6.2" - vscode-languageserver-types "^3.13.0-next.1" + vscode-jsonrpc "^4.0.0" + vscode-languageserver-types "3.13.0" -vscode-languageserver-types@^3.12.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.12.0.tgz#f96051381b6a050b7175b37d6cb5d2f2eb64b944" +vscode-languageserver-types@3.13.0, vscode-languageserver-types@^3.13.0: + version "3.13.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0.tgz#b704b024cef059f7b326611c99b9c8753c0a18b4" -vscode-languageserver-types@^3.13.0-next.1: - version "3.13.0-next.1" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0-next.1.tgz#dd91b78b13a2a6c7131e8291e3db3183cf566280" - -vscode-languageserver@^5.1.0-next.5: - version "5.1.0-next.5" - resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.1.0-next.5.tgz#d343278b4de448a31f9db146b98638898c8d4f55" +vscode-languageserver@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.1.0.tgz#012a28f154cc7a848c443d217894942e4c3eeb39" dependencies: - vscode-languageserver-protocol "^3.13.0-next.1" - vscode-uri "^1.0.5" + vscode-languageserver-protocol "3.13.0" + vscode-uri "^1.0.6" -vscode-nls@^3.2.5: - version "3.2.5" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.5.tgz#25520c1955108036dec607c85e00a522f247f1a4" +vscode-nls@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002" -vscode-uri@^1.0.5: +vscode-uri@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.6.tgz#6b8f141b0bbc44ad7b07e94f82f168ac7608ad4d" diff --git a/extensions/css-language-features/yarn.lock b/extensions/css-language-features/yarn.lock index b0af5d6319b..290bf45b413 100644 --- a/extensions/css-language-features/yarn.lock +++ b/extensions/css-language-features/yarn.lock @@ -137,27 +137,27 @@ supports-color@5.4.0: dependencies: has-flag "^3.0.0" -vscode-jsonrpc@^3.7.0-next.1: - version "3.7.0-next.1" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.7.0-next.1.tgz#e7521cd8135006ba8bf57ebcedbf5b03ce17b23e" +vscode-jsonrpc@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz#a7bf74ef3254d0a0c272fab15c82128e378b3be9" -vscode-languageclient@^5.1.0-next.9: - version "5.1.0-next.9" - resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.1.0-next.9.tgz#fe56c523637c118f7b262952b889f760223ab75a" +vscode-languageclient@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.1.0.tgz#650ab0dc9fd0daaade058a8471aaff5bc3f9580e" dependencies: semver "^5.5.0" - vscode-languageserver-protocol "^3.13.0-next.2" + vscode-languageserver-protocol "3.13.0" -vscode-languageserver-protocol@^3.13.0-next.2: - version "3.13.0-next.2" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0-next.2.tgz#7083e50d0d2096ba52de448082445b9c39081fdb" +vscode-languageserver-protocol@3.13.0: + version "3.13.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0.tgz#710d8e42119bb3affb1416e1e104bd6b4d503595" dependencies: - vscode-jsonrpc "^3.7.0-next.1" - vscode-languageserver-types "^3.13.0-next.1" + vscode-jsonrpc "^4.0.0" + vscode-languageserver-types "3.13.0" -vscode-languageserver-types@^3.13.0-next.1: - version "3.13.0-next.1" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0-next.1.tgz#dd91b78b13a2a6c7131e8291e3db3183cf566280" +vscode-languageserver-types@3.13.0: + version "3.13.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0.tgz#b704b024cef059f7b326611c99b9c8753c0a18b4" vscode-nls@^4.0.0: version "4.0.0" diff --git a/extensions/html-language-features/.vscodeignore b/extensions/html-language-features/.vscodeignore index 8d0ba59e94c..1d547a84e6d 100644 --- a/extensions/html-language-features/.vscodeignore +++ b/extensions/html-language-features/.vscodeignore @@ -1,7 +1,6 @@ test/** .vscode/** server/.vscode/** -node_modules/** server/node_modules/** client/src/** server/src/** @@ -17,11 +16,3 @@ server/.npmignore yarn.lock server/extension.webpack.config.js extension.webpack.config.js -!node_modules/vscode-nls/** -!node_modules/applicationinsights/** -!node_modules/diagnostic-channel-publishers/** -!node_modules/diagnostic-channel/** -!node_modules/semver/** -!node_modules/vscode-extension-telemetry/** -!node_modules/zone.js/** -!server/node_modules/vscode-nls/** \ No newline at end of file diff --git a/extensions/html-language-features/extension.webpack.config.js b/extensions/html-language-features/extension.webpack.config.js index 59f9aa519df..9624295ff5b 100644 --- a/extensions/html-language-features/extension.webpack.config.js +++ b/extensions/html-language-features/extension.webpack.config.js @@ -8,7 +8,6 @@ 'use strict'; const withDefaults = require('../shared.webpack.config'); -const CopyWebpackPlugin = require('copy-webpack-plugin'); const path = require('path'); module.exports = withDefaults({ @@ -18,16 +17,6 @@ module.exports = withDefaults({ }, output: { filename: 'htmlMain.js', - path: path.join(__dirname, 'client', 'dist'), - libraryTarget: "commonjs", - }, - externals: { - './files': 'commonjs', // ignored because it doesn't exist - }, - plugins: [ - new CopyWebpackPlugin([ - { from: './out/*.sh', to: '[name].sh' }, - { from: './out/nls.*.json', to: '[name].json' } - ]) - ] + path: path.join(__dirname, 'client', 'dist') + } }); diff --git a/extensions/html-language-features/package.json b/extensions/html-language-features/package.json index 62e2716b243..fae409ca0a8 100644 --- a/extensions/html-language-features/package.json +++ b/extensions/html-language-features/package.json @@ -176,7 +176,7 @@ }, "dependencies": { "vscode-extension-telemetry": "0.0.19", - "vscode-languageclient": "^5.1.0-next.9", + "vscode-languageclient": "^5.1.0", "vscode-nls": "^4.0.0" }, "devDependencies": { diff --git a/extensions/html-language-features/server/extension.webpack.config.js b/extensions/html-language-features/server/extension.webpack.config.js index 4d7e21d324b..a535ddeae9a 100644 --- a/extensions/html-language-features/server/extension.webpack.config.js +++ b/extensions/html-language-features/server/extension.webpack.config.js @@ -19,7 +19,6 @@ module.exports = withDefaults({ output: { filename: 'htmlServerMain.js', path: path.join(__dirname, 'dist'), - libraryTarget: "commonjs", }, externals: { 'typescript': 'commonjs typescript' diff --git a/extensions/html-language-features/server/package.json b/extensions/html-language-features/server/package.json index 333da1fbfb8..b0c7e58c85e 100644 --- a/extensions/html-language-features/server/package.json +++ b/extensions/html-language-features/server/package.json @@ -11,7 +11,7 @@ "dependencies": { "vscode-css-languageservice": "^3.0.11", "vscode-html-languageservice": "^2.1.9", - "vscode-languageserver": "^5.1.0-next.5", + "vscode-languageserver": "^5.1.0", "vscode-languageserver-types": "^3.13.0", "vscode-nls": "^4.0.0", "vscode-uri": "^1.0.6" diff --git a/extensions/html-language-features/server/yarn.lock b/extensions/html-language-features/server/yarn.lock index 8a3ed1dd2ec..e73589332f5 100644 --- a/extensions/html-language-features/server/yarn.lock +++ b/extensions/html-language-features/server/yarn.lock @@ -209,40 +209,32 @@ vscode-html-languageservice@^2.1.9: vscode-nls "^4.0.0" vscode-uri "^1.0.6" -vscode-jsonrpc@^3.6.2: - version "3.6.2" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.2.tgz#3b5eef691159a15556ecc500e9a8a0dd143470c8" +vscode-jsonrpc@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz#a7bf74ef3254d0a0c272fab15c82128e378b3be9" -vscode-languageserver-protocol@^3.13.0-next.1: - version "3.13.0-next.1" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0-next.1.tgz#24d15aa5769e4b035f6ce38342685959e1eb454e" +vscode-languageserver-protocol@3.13.0: + version "3.13.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0.tgz#710d8e42119bb3affb1416e1e104bd6b4d503595" dependencies: - vscode-jsonrpc "^3.6.2" - vscode-languageserver-types "^3.13.0-next.1" + vscode-jsonrpc "^4.0.0" + vscode-languageserver-types "3.13.0" -vscode-languageserver-types@^3.13.0: +vscode-languageserver-types@3.13.0, vscode-languageserver-types@^3.13.0: version "3.13.0" resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0.tgz#b704b024cef059f7b326611c99b9c8753c0a18b4" -vscode-languageserver-types@^3.13.0-next.1: - version "3.13.0-next.1" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0-next.1.tgz#dd91b78b13a2a6c7131e8291e3db3183cf566280" - -vscode-languageserver@^5.1.0-next.5: - version "5.1.0-next.5" - resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.1.0-next.5.tgz#d343278b4de448a31f9db146b98638898c8d4f55" +vscode-languageserver@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.1.0.tgz#012a28f154cc7a848c443d217894942e4c3eeb39" dependencies: - vscode-languageserver-protocol "^3.13.0-next.1" - vscode-uri "^1.0.5" + vscode-languageserver-protocol "3.13.0" + vscode-uri "^1.0.6" vscode-nls@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002" -vscode-uri@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.5.tgz#3b899a8ef71c37f3054d79bdbdda31c7bf36f20d" - vscode-uri@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.6.tgz#6b8f141b0bbc44ad7b07e94f82f168ac7608ad4d" diff --git a/extensions/html-language-features/yarn.lock b/extensions/html-language-features/yarn.lock index b9a44757e3a..1ede17b79c0 100644 --- a/extensions/html-language-features/yarn.lock +++ b/extensions/html-language-features/yarn.lock @@ -34,27 +34,27 @@ vscode-extension-telemetry@0.0.19: dependencies: applicationinsights "1.0.3" -vscode-jsonrpc@^3.7.0-next.1: - version "3.7.0-next.1" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.7.0-next.1.tgz#e7521cd8135006ba8bf57ebcedbf5b03ce17b23e" +vscode-jsonrpc@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz#a7bf74ef3254d0a0c272fab15c82128e378b3be9" -vscode-languageclient@^5.1.0-next.9: - version "5.1.0-next.9" - resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.1.0-next.9.tgz#fe56c523637c118f7b262952b889f760223ab75a" +vscode-languageclient@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.1.0.tgz#650ab0dc9fd0daaade058a8471aaff5bc3f9580e" dependencies: semver "^5.5.0" - vscode-languageserver-protocol "^3.13.0-next.2" + vscode-languageserver-protocol "3.13.0" -vscode-languageserver-protocol@^3.13.0-next.2: - version "3.13.0-next.2" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0-next.2.tgz#7083e50d0d2096ba52de448082445b9c39081fdb" +vscode-languageserver-protocol@3.13.0: + version "3.13.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0.tgz#710d8e42119bb3affb1416e1e104bd6b4d503595" dependencies: - vscode-jsonrpc "^3.7.0-next.1" - vscode-languageserver-types "^3.13.0-next.1" + vscode-jsonrpc "^4.0.0" + vscode-languageserver-types "3.13.0" -vscode-languageserver-types@^3.13.0-next.1: - version "3.13.0-next.1" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0-next.1.tgz#dd91b78b13a2a6c7131e8291e3db3183cf566280" +vscode-languageserver-types@3.13.0: + version "3.13.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0.tgz#b704b024cef059f7b326611c99b9c8753c0a18b4" vscode-nls@^4.0.0: version "4.0.0" diff --git a/extensions/json-language-features/.vscodeignore b/extensions/json-language-features/.vscodeignore index d6de18538dd..b3cba2c6a80 100644 --- a/extensions/json-language-features/.vscodeignore +++ b/extensions/json-language-features/.vscodeignore @@ -1,6 +1,5 @@ .vscode/** server/.vscode/** -node_modules/** server/node_modules/** client/src/** server/src/** @@ -15,12 +14,4 @@ server/yarn.lock server/.npmignore yarn.lock server/extension.webpack.config.js -extension.webpack.config.js -!node_modules/vscode-nls/** -!node_modules/applicationinsights/** -!node_modules/diagnostic-channel-publishers/** -!node_modules/diagnostic-channel/** -!node_modules/semver/** -!node_modules/vscode-extension-telemetry/** -!node_modules/zone.js/** -!server/node_modules/vscode-nls/** \ No newline at end of file +extension.webpack.config.js \ No newline at end of file diff --git a/extensions/json-language-features/client/src/jsonMain.ts b/extensions/json-language-features/client/src/jsonMain.ts index 88326058e17..41a6ab1931f 100644 --- a/extensions/json-language-features/client/src/jsonMain.ts +++ b/extensions/json-language-features/client/src/jsonMain.ts @@ -234,7 +234,11 @@ function getSettings(): Settings { if (folders) { for (let folder of folders) { let folderUri = folder.uri; + let schemaConfigInfo = workspace.getConfiguration('json', folderUri).inspect('schemas'); + console.log(`workspaceValue : ${!!schemaConfigInfo!.workspaceValue}`); + console.log(`workspaceFolderValue : ${!!schemaConfigInfo!.workspaceFolderValue}`); + let folderSchemas = schemaConfigInfo!.workspaceFolderValue; if (Array.isArray(folderSchemas)) { let folderPath = folderUri.toString(); diff --git a/extensions/json-language-features/extension.webpack.config.js b/extensions/json-language-features/extension.webpack.config.js index 0885d961c9f..4c2ab99cf25 100644 --- a/extensions/json-language-features/extension.webpack.config.js +++ b/extensions/json-language-features/extension.webpack.config.js @@ -8,7 +8,6 @@ 'use strict'; const withDefaults = require('../shared.webpack.config'); -const CopyWebpackPlugin = require('copy-webpack-plugin'); const path = require('path'); module.exports = withDefaults({ @@ -18,16 +17,6 @@ module.exports = withDefaults({ }, output: { filename: 'jsonMain.js', - path: path.join(__dirname, 'client', 'dist'), - libraryTarget: "commonjs", - }, - externals: { - './files': 'commonjs', // ignored because it doesn't exist - }, - plugins: [ - new CopyWebpackPlugin([ - { from: './out/*.sh', to: '[name].sh' }, - { from: './out/nls.*.json', to: '[name].json' } - ]) - ] + path: path.join(__dirname, 'client', 'dist') + } }); diff --git a/extensions/json-language-features/package.json b/extensions/json-language-features/package.json index 4759619f9e0..c125a0ce9c7 100644 --- a/extensions/json-language-features/package.json +++ b/extensions/json-language-features/package.json @@ -101,7 +101,7 @@ }, "dependencies": { "vscode-extension-telemetry": "0.0.19", - "vscode-languageclient": "^5.1.0-next.9", + "vscode-languageclient": "^5.1.0", "vscode-nls": "^4.0.0" }, "devDependencies": { diff --git a/extensions/json-language-features/server/extension.webpack.config.js b/extensions/json-language-features/server/extension.webpack.config.js index 6f97a3d8129..b31abe55f25 100644 --- a/extensions/json-language-features/server/extension.webpack.config.js +++ b/extensions/json-language-features/server/extension.webpack.config.js @@ -18,11 +18,7 @@ module.exports = withDefaults({ }, output: { filename: 'jsonServerMain.js', - path: path.join(__dirname, 'dist'), - libraryTarget: "commonjs", - }, - externals: { - "vscode-nls": 'commonjs vscode-nls', + path: path.join(__dirname, 'dist') }, plugins: [ new webpack.NormalModuleReplacementPlugin( diff --git a/extensions/json-language-features/server/package.json b/extensions/json-language-features/server/package.json index 5d0708d1af2..eed412e17d1 100644 --- a/extensions/json-language-features/server/package.json +++ b/extensions/json-language-features/server/package.json @@ -13,9 +13,9 @@ "main": "./out/jsonServerMain", "dependencies": { "jsonc-parser": "^2.0.2", - "request-light": "^0.2.3", - "vscode-json-languageservice": "^3.1.6", - "vscode-languageserver": "^5.1.0-next.3", + "request-light": "^0.2.4", + "vscode-json-languageservice": "^3.1.7", + "vscode-languageserver": "^5.1.0", "vscode-nls": "^4.0.0", "vscode-uri": "^1.0.6" }, diff --git a/extensions/json-language-features/server/yarn.lock b/extensions/json-language-features/server/yarn.lock index 7ad4e279765..5de4ddef09c 100644 --- a/extensions/json-language-features/server/yarn.lock +++ b/extensions/json-language-features/server/yarn.lock @@ -46,10 +46,6 @@ https-proxy-agent@^2.2.1: agent-base "^4.1.0" debug "^3.1.0" -jsonc-parser@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.1.tgz#9d23cd2709714fff508a1a6679d82135bee1ae60" - jsonc-parser@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.2.tgz#42fcf56d70852a043fadafde51ddb4a85649978d" @@ -58,57 +54,49 @@ ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" -request-light@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.2.3.tgz#a18635ec6dd92f8705c019c42ef645f684d94f7e" +request-light@^0.2.4: + version "0.2.4" + resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.2.4.tgz#3cea29c126682e6bcadf7915353322eeba01a755" dependencies: http-proxy-agent "^2.1.0" https-proxy-agent "^2.2.1" - vscode-nls "^3.2.2" + vscode-nls "^4.0.0" -vscode-json-languageservice@^3.1.6: - version "3.1.6" - resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.1.6.tgz#272e21eb9abcefe6c1ed38be141f0a76d5ddf0cd" +vscode-json-languageservice@^3.1.7: + version "3.1.7" + resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.1.7.tgz#ace6ef40c340262b2a6fcd7f72be99c99751010c" dependencies: - jsonc-parser "^2.0.1" - vscode-languageserver-types "^3.12.0" - vscode-nls "^3.2.4" + jsonc-parser "^2.0.2" + vscode-languageserver-types "^3.13.0" + vscode-nls "^4.0.0" vscode-uri "^1.0.6" -vscode-jsonrpc@^3.6.2: - version "3.6.2" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.2.tgz#3b5eef691159a15556ecc500e9a8a0dd143470c8" +vscode-jsonrpc@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz#a7bf74ef3254d0a0c272fab15c82128e378b3be9" -vscode-languageserver-protocol@^3.12.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.12.0.tgz#5b23501292abad88f0463b01e83ff98e64a37652" +vscode-languageserver-protocol@3.13.0: + version "3.13.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0.tgz#710d8e42119bb3affb1416e1e104bd6b4d503595" dependencies: - vscode-jsonrpc "^3.6.2" - vscode-languageserver-types "^3.12.0" + vscode-jsonrpc "^4.0.0" + vscode-languageserver-types "3.13.0" -vscode-languageserver-types@^3.12.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.12.0.tgz#f96051381b6a050b7175b37d6cb5d2f2eb64b944" +vscode-languageserver-types@3.13.0, vscode-languageserver-types@^3.13.0: + version "3.13.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0.tgz#b704b024cef059f7b326611c99b9c8753c0a18b4" -vscode-languageserver@^5.1.0-next.3: - version "5.1.0-next.3" - resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.1.0-next.3.tgz#352ce1f0f8bdfc47c1236277ebe865e25b087ccd" +vscode-languageserver@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.1.0.tgz#012a28f154cc7a848c443d217894942e4c3eeb39" dependencies: - vscode-languageserver-protocol "^3.12.0" - vscode-uri "^1.0.5" - -vscode-nls@^3.2.2, vscode-nls@^3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398" + vscode-languageserver-protocol "3.13.0" + vscode-uri "^1.0.6" vscode-nls@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002" -vscode-uri@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.5.tgz#3b899a8ef71c37f3054d79bdbdda31c7bf36f20d" - vscode-uri@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.6.tgz#6b8f141b0bbc44ad7b07e94f82f168ac7608ad4d" diff --git a/extensions/json-language-features/yarn.lock b/extensions/json-language-features/yarn.lock index 393ed3d4b06..cff6637f988 100644 --- a/extensions/json-language-features/yarn.lock +++ b/extensions/json-language-features/yarn.lock @@ -38,27 +38,27 @@ vscode-extension-telemetry@0.0.19: dependencies: applicationinsights "1.0.3" -vscode-jsonrpc@^3.7.0-next.1: - version "3.7.0-next.1" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.7.0-next.1.tgz#e7521cd8135006ba8bf57ebcedbf5b03ce17b23e" +vscode-jsonrpc@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz#a7bf74ef3254d0a0c272fab15c82128e378b3be9" -vscode-languageclient@^5.1.0-next.9: - version "5.1.0-next.9" - resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.1.0-next.9.tgz#fe56c523637c118f7b262952b889f760223ab75a" +vscode-languageclient@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.1.0.tgz#650ab0dc9fd0daaade058a8471aaff5bc3f9580e" dependencies: semver "^5.5.0" - vscode-languageserver-protocol "^3.13.0-next.2" + vscode-languageserver-protocol "3.13.0" -vscode-languageserver-protocol@^3.13.0-next.2: - version "3.13.0-next.2" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0-next.2.tgz#7083e50d0d2096ba52de448082445b9c39081fdb" +vscode-languageserver-protocol@3.13.0: + version "3.13.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0.tgz#710d8e42119bb3affb1416e1e104bd6b4d503595" dependencies: - vscode-jsonrpc "^3.7.0-next.1" - vscode-languageserver-types "^3.13.0-next.1" + vscode-jsonrpc "^4.0.0" + vscode-languageserver-types "3.13.0" -vscode-languageserver-types@^3.13.0-next.1: - version "3.13.0-next.1" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0-next.1.tgz#dd91b78b13a2a6c7131e8291e3db3183cf566280" +vscode-languageserver-types@3.13.0: + version "3.13.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0.tgz#b704b024cef059f7b326611c99b9c8753c0a18b4" vscode-nls@^4.0.0: version "4.0.0"