This commit is contained in:
parent
d216f0e06e
commit
2dd4d2b56f
|
@ -1,7 +1,6 @@
|
||||||
test/**
|
test/**
|
||||||
.vscode/**
|
.vscode/**
|
||||||
server/.vscode/**
|
server/.vscode/**
|
||||||
node_modules/**
|
|
||||||
server/node_modules/**
|
server/node_modules/**
|
||||||
client/src/**
|
client/src/**
|
||||||
server/src/**
|
server/src/**
|
||||||
|
@ -16,6 +15,4 @@ server/yarn.lock
|
||||||
server/.npmignore
|
server/.npmignore
|
||||||
yarn.lock
|
yarn.lock
|
||||||
server/extension.webpack.config.js
|
server/extension.webpack.config.js
|
||||||
extension.webpack.config.js
|
extension.webpack.config.js
|
||||||
!node_modules/vscode-nls/**
|
|
||||||
!server/node_modules/vscode-nls/**
|
|
|
@ -8,7 +8,6 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
const withDefaults = require('../shared.webpack.config');
|
const withDefaults = require('../shared.webpack.config');
|
||||||
const CopyWebpackPlugin = require('copy-webpack-plugin');
|
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
|
|
||||||
module.exports = withDefaults({
|
module.exports = withDefaults({
|
||||||
|
@ -18,16 +17,6 @@ module.exports = withDefaults({
|
||||||
},
|
},
|
||||||
output: {
|
output: {
|
||||||
filename: 'cssMain.js',
|
filename: 'cssMain.js',
|
||||||
path: path.join(__dirname, 'client', 'dist'),
|
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' }
|
|
||||||
])
|
|
||||||
]
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -708,7 +708,7 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"vscode-languageclient": "^5.1.0-next.9",
|
"vscode-languageclient": "^5.1.0",
|
||||||
"vscode-nls": "^4.0.0"
|
"vscode-nls": "^4.0.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|
|
@ -18,11 +18,7 @@ module.exports = withDefaults({
|
||||||
},
|
},
|
||||||
output: {
|
output: {
|
||||||
filename: 'cssServerMain.js',
|
filename: 'cssServerMain.js',
|
||||||
path: path.join(__dirname, 'dist'),
|
path: path.join(__dirname, 'dist')
|
||||||
libraryTarget: "commonjs",
|
|
||||||
},
|
|
||||||
externals: {
|
|
||||||
"vscode-nls": 'commonjs vscode-nls',
|
|
||||||
},
|
},
|
||||||
plugins: [
|
plugins: [
|
||||||
new webpack.NormalModuleReplacementPlugin(
|
new webpack.NormalModuleReplacementPlugin(
|
||||||
|
|
|
@ -9,8 +9,8 @@
|
||||||
},
|
},
|
||||||
"main": "./out/cssServerMain",
|
"main": "./out/cssServerMain",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"vscode-css-languageservice": "^3.0.11-next.2",
|
"vscode-css-languageservice": "^3.0.11",
|
||||||
"vscode-languageserver": "^5.1.0-next.5"
|
"vscode-languageserver": "^5.1.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/mocha": "2.2.33",
|
"@types/mocha": "2.2.33",
|
||||||
|
|
|
@ -194,44 +194,40 @@ supports-color@5.4.0:
|
||||||
dependencies:
|
dependencies:
|
||||||
has-flag "^3.0.0"
|
has-flag "^3.0.0"
|
||||||
|
|
||||||
vscode-css-languageservice@^3.0.11-next.2:
|
vscode-css-languageservice@^3.0.11:
|
||||||
version "3.0.11-next.2"
|
version "3.0.11"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.11-next.2.tgz#7aa41a895abbcb3c0884d9612ae546c39de8b984"
|
resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.11.tgz#0e75e1870d59fddbfb6021efd5d80df08c9faaeb"
|
||||||
dependencies:
|
dependencies:
|
||||||
vscode-languageserver-types "^3.12.0"
|
vscode-languageserver-types "^3.13.0"
|
||||||
vscode-nls "^3.2.5"
|
vscode-nls "^4.0.0"
|
||||||
|
|
||||||
vscode-jsonrpc@^3.6.2:
|
vscode-jsonrpc@^4.0.0:
|
||||||
version "3.6.2"
|
version "4.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.2.tgz#3b5eef691159a15556ecc500e9a8a0dd143470c8"
|
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz#a7bf74ef3254d0a0c272fab15c82128e378b3be9"
|
||||||
|
|
||||||
vscode-languageserver-protocol@^3.13.0-next.1:
|
vscode-languageserver-protocol@3.13.0:
|
||||||
version "3.13.0-next.1"
|
version "3.13.0"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0-next.1.tgz#24d15aa5769e4b035f6ce38342685959e1eb454e"
|
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0.tgz#710d8e42119bb3affb1416e1e104bd6b4d503595"
|
||||||
dependencies:
|
dependencies:
|
||||||
vscode-jsonrpc "^3.6.2"
|
vscode-jsonrpc "^4.0.0"
|
||||||
vscode-languageserver-types "^3.13.0-next.1"
|
vscode-languageserver-types "3.13.0"
|
||||||
|
|
||||||
vscode-languageserver-types@^3.12.0:
|
vscode-languageserver-types@3.13.0, vscode-languageserver-types@^3.13.0:
|
||||||
version "3.12.0"
|
version "3.13.0"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.12.0.tgz#f96051381b6a050b7175b37d6cb5d2f2eb64b944"
|
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0.tgz#b704b024cef059f7b326611c99b9c8753c0a18b4"
|
||||||
|
|
||||||
vscode-languageserver-types@^3.13.0-next.1:
|
vscode-languageserver@^5.1.0:
|
||||||
version "3.13.0-next.1"
|
version "5.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0-next.1.tgz#dd91b78b13a2a6c7131e8291e3db3183cf566280"
|
resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.1.0.tgz#012a28f154cc7a848c443d217894942e4c3eeb39"
|
||||||
|
|
||||||
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"
|
|
||||||
dependencies:
|
dependencies:
|
||||||
vscode-languageserver-protocol "^3.13.0-next.1"
|
vscode-languageserver-protocol "3.13.0"
|
||||||
vscode-uri "^1.0.5"
|
vscode-uri "^1.0.6"
|
||||||
|
|
||||||
vscode-nls@^3.2.5:
|
vscode-nls@^4.0.0:
|
||||||
version "3.2.5"
|
version "4.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.5.tgz#25520c1955108036dec607c85e00a522f247f1a4"
|
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"
|
version "1.0.6"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.6.tgz#6b8f141b0bbc44ad7b07e94f82f168ac7608ad4d"
|
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.6.tgz#6b8f141b0bbc44ad7b07e94f82f168ac7608ad4d"
|
||||||
|
|
||||||
|
|
|
@ -137,27 +137,27 @@ supports-color@5.4.0:
|
||||||
dependencies:
|
dependencies:
|
||||||
has-flag "^3.0.0"
|
has-flag "^3.0.0"
|
||||||
|
|
||||||
vscode-jsonrpc@^3.7.0-next.1:
|
vscode-jsonrpc@^4.0.0:
|
||||||
version "3.7.0-next.1"
|
version "4.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.7.0-next.1.tgz#e7521cd8135006ba8bf57ebcedbf5b03ce17b23e"
|
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz#a7bf74ef3254d0a0c272fab15c82128e378b3be9"
|
||||||
|
|
||||||
vscode-languageclient@^5.1.0-next.9:
|
vscode-languageclient@^5.1.0:
|
||||||
version "5.1.0-next.9"
|
version "5.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.1.0-next.9.tgz#fe56c523637c118f7b262952b889f760223ab75a"
|
resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.1.0.tgz#650ab0dc9fd0daaade058a8471aaff5bc3f9580e"
|
||||||
dependencies:
|
dependencies:
|
||||||
semver "^5.5.0"
|
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:
|
vscode-languageserver-protocol@3.13.0:
|
||||||
version "3.13.0-next.2"
|
version "3.13.0"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0-next.2.tgz#7083e50d0d2096ba52de448082445b9c39081fdb"
|
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0.tgz#710d8e42119bb3affb1416e1e104bd6b4d503595"
|
||||||
dependencies:
|
dependencies:
|
||||||
vscode-jsonrpc "^3.7.0-next.1"
|
vscode-jsonrpc "^4.0.0"
|
||||||
vscode-languageserver-types "^3.13.0-next.1"
|
vscode-languageserver-types "3.13.0"
|
||||||
|
|
||||||
vscode-languageserver-types@^3.13.0-next.1:
|
vscode-languageserver-types@3.13.0:
|
||||||
version "3.13.0-next.1"
|
version "3.13.0"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0-next.1.tgz#dd91b78b13a2a6c7131e8291e3db3183cf566280"
|
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0.tgz#b704b024cef059f7b326611c99b9c8753c0a18b4"
|
||||||
|
|
||||||
vscode-nls@^4.0.0:
|
vscode-nls@^4.0.0:
|
||||||
version "4.0.0"
|
version "4.0.0"
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
test/**
|
test/**
|
||||||
.vscode/**
|
.vscode/**
|
||||||
server/.vscode/**
|
server/.vscode/**
|
||||||
node_modules/**
|
|
||||||
server/node_modules/**
|
server/node_modules/**
|
||||||
client/src/**
|
client/src/**
|
||||||
server/src/**
|
server/src/**
|
||||||
|
@ -17,11 +16,3 @@ server/.npmignore
|
||||||
yarn.lock
|
yarn.lock
|
||||||
server/extension.webpack.config.js
|
server/extension.webpack.config.js
|
||||||
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/**
|
|
|
@ -8,7 +8,6 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
const withDefaults = require('../shared.webpack.config');
|
const withDefaults = require('../shared.webpack.config');
|
||||||
const CopyWebpackPlugin = require('copy-webpack-plugin');
|
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
|
|
||||||
module.exports = withDefaults({
|
module.exports = withDefaults({
|
||||||
|
@ -18,16 +17,6 @@ module.exports = withDefaults({
|
||||||
},
|
},
|
||||||
output: {
|
output: {
|
||||||
filename: 'htmlMain.js',
|
filename: 'htmlMain.js',
|
||||||
path: path.join(__dirname, 'client', 'dist'),
|
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' }
|
|
||||||
])
|
|
||||||
]
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -176,7 +176,7 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"vscode-extension-telemetry": "0.0.19",
|
"vscode-extension-telemetry": "0.0.19",
|
||||||
"vscode-languageclient": "^5.1.0-next.9",
|
"vscode-languageclient": "^5.1.0",
|
||||||
"vscode-nls": "^4.0.0"
|
"vscode-nls": "^4.0.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|
|
@ -19,7 +19,6 @@ module.exports = withDefaults({
|
||||||
output: {
|
output: {
|
||||||
filename: 'htmlServerMain.js',
|
filename: 'htmlServerMain.js',
|
||||||
path: path.join(__dirname, 'dist'),
|
path: path.join(__dirname, 'dist'),
|
||||||
libraryTarget: "commonjs",
|
|
||||||
},
|
},
|
||||||
externals: {
|
externals: {
|
||||||
'typescript': 'commonjs typescript'
|
'typescript': 'commonjs typescript'
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"vscode-css-languageservice": "^3.0.11",
|
"vscode-css-languageservice": "^3.0.11",
|
||||||
"vscode-html-languageservice": "^2.1.9",
|
"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-languageserver-types": "^3.13.0",
|
||||||
"vscode-nls": "^4.0.0",
|
"vscode-nls": "^4.0.0",
|
||||||
"vscode-uri": "^1.0.6"
|
"vscode-uri": "^1.0.6"
|
||||||
|
|
|
@ -209,40 +209,32 @@ vscode-html-languageservice@^2.1.9:
|
||||||
vscode-nls "^4.0.0"
|
vscode-nls "^4.0.0"
|
||||||
vscode-uri "^1.0.6"
|
vscode-uri "^1.0.6"
|
||||||
|
|
||||||
vscode-jsonrpc@^3.6.2:
|
vscode-jsonrpc@^4.0.0:
|
||||||
version "3.6.2"
|
version "4.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.2.tgz#3b5eef691159a15556ecc500e9a8a0dd143470c8"
|
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz#a7bf74ef3254d0a0c272fab15c82128e378b3be9"
|
||||||
|
|
||||||
vscode-languageserver-protocol@^3.13.0-next.1:
|
vscode-languageserver-protocol@3.13.0:
|
||||||
version "3.13.0-next.1"
|
version "3.13.0"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0-next.1.tgz#24d15aa5769e4b035f6ce38342685959e1eb454e"
|
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0.tgz#710d8e42119bb3affb1416e1e104bd6b4d503595"
|
||||||
dependencies:
|
dependencies:
|
||||||
vscode-jsonrpc "^3.6.2"
|
vscode-jsonrpc "^4.0.0"
|
||||||
vscode-languageserver-types "^3.13.0-next.1"
|
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"
|
version "3.13.0"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0.tgz#b704b024cef059f7b326611c99b9c8753c0a18b4"
|
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0.tgz#b704b024cef059f7b326611c99b9c8753c0a18b4"
|
||||||
|
|
||||||
vscode-languageserver-types@^3.13.0-next.1:
|
vscode-languageserver@^5.1.0:
|
||||||
version "3.13.0-next.1"
|
version "5.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0-next.1.tgz#dd91b78b13a2a6c7131e8291e3db3183cf566280"
|
resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.1.0.tgz#012a28f154cc7a848c443d217894942e4c3eeb39"
|
||||||
|
|
||||||
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"
|
|
||||||
dependencies:
|
dependencies:
|
||||||
vscode-languageserver-protocol "^3.13.0-next.1"
|
vscode-languageserver-protocol "3.13.0"
|
||||||
vscode-uri "^1.0.5"
|
vscode-uri "^1.0.6"
|
||||||
|
|
||||||
vscode-nls@^4.0.0:
|
vscode-nls@^4.0.0:
|
||||||
version "4.0.0"
|
version "4.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
|
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:
|
vscode-uri@^1.0.6:
|
||||||
version "1.0.6"
|
version "1.0.6"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.6.tgz#6b8f141b0bbc44ad7b07e94f82f168ac7608ad4d"
|
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.6.tgz#6b8f141b0bbc44ad7b07e94f82f168ac7608ad4d"
|
||||||
|
|
|
@ -34,27 +34,27 @@ vscode-extension-telemetry@0.0.19:
|
||||||
dependencies:
|
dependencies:
|
||||||
applicationinsights "1.0.3"
|
applicationinsights "1.0.3"
|
||||||
|
|
||||||
vscode-jsonrpc@^3.7.0-next.1:
|
vscode-jsonrpc@^4.0.0:
|
||||||
version "3.7.0-next.1"
|
version "4.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.7.0-next.1.tgz#e7521cd8135006ba8bf57ebcedbf5b03ce17b23e"
|
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz#a7bf74ef3254d0a0c272fab15c82128e378b3be9"
|
||||||
|
|
||||||
vscode-languageclient@^5.1.0-next.9:
|
vscode-languageclient@^5.1.0:
|
||||||
version "5.1.0-next.9"
|
version "5.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.1.0-next.9.tgz#fe56c523637c118f7b262952b889f760223ab75a"
|
resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.1.0.tgz#650ab0dc9fd0daaade058a8471aaff5bc3f9580e"
|
||||||
dependencies:
|
dependencies:
|
||||||
semver "^5.5.0"
|
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:
|
vscode-languageserver-protocol@3.13.0:
|
||||||
version "3.13.0-next.2"
|
version "3.13.0"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0-next.2.tgz#7083e50d0d2096ba52de448082445b9c39081fdb"
|
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0.tgz#710d8e42119bb3affb1416e1e104bd6b4d503595"
|
||||||
dependencies:
|
dependencies:
|
||||||
vscode-jsonrpc "^3.7.0-next.1"
|
vscode-jsonrpc "^4.0.0"
|
||||||
vscode-languageserver-types "^3.13.0-next.1"
|
vscode-languageserver-types "3.13.0"
|
||||||
|
|
||||||
vscode-languageserver-types@^3.13.0-next.1:
|
vscode-languageserver-types@3.13.0:
|
||||||
version "3.13.0-next.1"
|
version "3.13.0"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0-next.1.tgz#dd91b78b13a2a6c7131e8291e3db3183cf566280"
|
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0.tgz#b704b024cef059f7b326611c99b9c8753c0a18b4"
|
||||||
|
|
||||||
vscode-nls@^4.0.0:
|
vscode-nls@^4.0.0:
|
||||||
version "4.0.0"
|
version "4.0.0"
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
.vscode/**
|
.vscode/**
|
||||||
server/.vscode/**
|
server/.vscode/**
|
||||||
node_modules/**
|
|
||||||
server/node_modules/**
|
server/node_modules/**
|
||||||
client/src/**
|
client/src/**
|
||||||
server/src/**
|
server/src/**
|
||||||
|
@ -15,12 +14,4 @@ server/yarn.lock
|
||||||
server/.npmignore
|
server/.npmignore
|
||||||
yarn.lock
|
yarn.lock
|
||||||
server/extension.webpack.config.js
|
server/extension.webpack.config.js
|
||||||
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/**
|
|
|
@ -234,7 +234,11 @@ function getSettings(): Settings {
|
||||||
if (folders) {
|
if (folders) {
|
||||||
for (let folder of folders) {
|
for (let folder of folders) {
|
||||||
let folderUri = folder.uri;
|
let folderUri = folder.uri;
|
||||||
|
|
||||||
let schemaConfigInfo = workspace.getConfiguration('json', folderUri).inspect<JSONSchemaSettings[]>('schemas');
|
let schemaConfigInfo = workspace.getConfiguration('json', folderUri).inspect<JSONSchemaSettings[]>('schemas');
|
||||||
|
console.log(`workspaceValue : ${!!schemaConfigInfo!.workspaceValue}`);
|
||||||
|
console.log(`workspaceFolderValue : ${!!schemaConfigInfo!.workspaceFolderValue}`);
|
||||||
|
|
||||||
let folderSchemas = schemaConfigInfo!.workspaceFolderValue;
|
let folderSchemas = schemaConfigInfo!.workspaceFolderValue;
|
||||||
if (Array.isArray(folderSchemas)) {
|
if (Array.isArray(folderSchemas)) {
|
||||||
let folderPath = folderUri.toString();
|
let folderPath = folderUri.toString();
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
const withDefaults = require('../shared.webpack.config');
|
const withDefaults = require('../shared.webpack.config');
|
||||||
const CopyWebpackPlugin = require('copy-webpack-plugin');
|
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
|
|
||||||
module.exports = withDefaults({
|
module.exports = withDefaults({
|
||||||
|
@ -18,16 +17,6 @@ module.exports = withDefaults({
|
||||||
},
|
},
|
||||||
output: {
|
output: {
|
||||||
filename: 'jsonMain.js',
|
filename: 'jsonMain.js',
|
||||||
path: path.join(__dirname, 'client', 'dist'),
|
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' }
|
|
||||||
])
|
|
||||||
]
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -101,7 +101,7 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"vscode-extension-telemetry": "0.0.19",
|
"vscode-extension-telemetry": "0.0.19",
|
||||||
"vscode-languageclient": "^5.1.0-next.9",
|
"vscode-languageclient": "^5.1.0",
|
||||||
"vscode-nls": "^4.0.0"
|
"vscode-nls": "^4.0.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|
|
@ -18,11 +18,7 @@ module.exports = withDefaults({
|
||||||
},
|
},
|
||||||
output: {
|
output: {
|
||||||
filename: 'jsonServerMain.js',
|
filename: 'jsonServerMain.js',
|
||||||
path: path.join(__dirname, 'dist'),
|
path: path.join(__dirname, 'dist')
|
||||||
libraryTarget: "commonjs",
|
|
||||||
},
|
|
||||||
externals: {
|
|
||||||
"vscode-nls": 'commonjs vscode-nls',
|
|
||||||
},
|
},
|
||||||
plugins: [
|
plugins: [
|
||||||
new webpack.NormalModuleReplacementPlugin(
|
new webpack.NormalModuleReplacementPlugin(
|
||||||
|
|
|
@ -13,9 +13,9 @@
|
||||||
"main": "./out/jsonServerMain",
|
"main": "./out/jsonServerMain",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"jsonc-parser": "^2.0.2",
|
"jsonc-parser": "^2.0.2",
|
||||||
"request-light": "^0.2.3",
|
"request-light": "^0.2.4",
|
||||||
"vscode-json-languageservice": "^3.1.6",
|
"vscode-json-languageservice": "^3.1.7",
|
||||||
"vscode-languageserver": "^5.1.0-next.3",
|
"vscode-languageserver": "^5.1.0",
|
||||||
"vscode-nls": "^4.0.0",
|
"vscode-nls": "^4.0.0",
|
||||||
"vscode-uri": "^1.0.6"
|
"vscode-uri": "^1.0.6"
|
||||||
},
|
},
|
||||||
|
|
|
@ -46,10 +46,6 @@ https-proxy-agent@^2.2.1:
|
||||||
agent-base "^4.1.0"
|
agent-base "^4.1.0"
|
||||||
debug "^3.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:
|
jsonc-parser@^2.0.2:
|
||||||
version "2.0.2"
|
version "2.0.2"
|
||||||
resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.2.tgz#42fcf56d70852a043fadafde51ddb4a85649978d"
|
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"
|
version "2.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
|
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
|
||||||
|
|
||||||
request-light@^0.2.3:
|
request-light@^0.2.4:
|
||||||
version "0.2.3"
|
version "0.2.4"
|
||||||
resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.2.3.tgz#a18635ec6dd92f8705c019c42ef645f684d94f7e"
|
resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.2.4.tgz#3cea29c126682e6bcadf7915353322eeba01a755"
|
||||||
dependencies:
|
dependencies:
|
||||||
http-proxy-agent "^2.1.0"
|
http-proxy-agent "^2.1.0"
|
||||||
https-proxy-agent "^2.2.1"
|
https-proxy-agent "^2.2.1"
|
||||||
vscode-nls "^3.2.2"
|
vscode-nls "^4.0.0"
|
||||||
|
|
||||||
vscode-json-languageservice@^3.1.6:
|
vscode-json-languageservice@^3.1.7:
|
||||||
version "3.1.6"
|
version "3.1.7"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.1.6.tgz#272e21eb9abcefe6c1ed38be141f0a76d5ddf0cd"
|
resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.1.7.tgz#ace6ef40c340262b2a6fcd7f72be99c99751010c"
|
||||||
dependencies:
|
dependencies:
|
||||||
jsonc-parser "^2.0.1"
|
jsonc-parser "^2.0.2"
|
||||||
vscode-languageserver-types "^3.12.0"
|
vscode-languageserver-types "^3.13.0"
|
||||||
vscode-nls "^3.2.4"
|
vscode-nls "^4.0.0"
|
||||||
vscode-uri "^1.0.6"
|
vscode-uri "^1.0.6"
|
||||||
|
|
||||||
vscode-jsonrpc@^3.6.2:
|
vscode-jsonrpc@^4.0.0:
|
||||||
version "3.6.2"
|
version "4.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.2.tgz#3b5eef691159a15556ecc500e9a8a0dd143470c8"
|
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz#a7bf74ef3254d0a0c272fab15c82128e378b3be9"
|
||||||
|
|
||||||
vscode-languageserver-protocol@^3.12.0:
|
vscode-languageserver-protocol@3.13.0:
|
||||||
version "3.12.0"
|
version "3.13.0"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.12.0.tgz#5b23501292abad88f0463b01e83ff98e64a37652"
|
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0.tgz#710d8e42119bb3affb1416e1e104bd6b4d503595"
|
||||||
dependencies:
|
dependencies:
|
||||||
vscode-jsonrpc "^3.6.2"
|
vscode-jsonrpc "^4.0.0"
|
||||||
vscode-languageserver-types "^3.12.0"
|
vscode-languageserver-types "3.13.0"
|
||||||
|
|
||||||
vscode-languageserver-types@^3.12.0:
|
vscode-languageserver-types@3.13.0, vscode-languageserver-types@^3.13.0:
|
||||||
version "3.12.0"
|
version "3.13.0"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.12.0.tgz#f96051381b6a050b7175b37d6cb5d2f2eb64b944"
|
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0.tgz#b704b024cef059f7b326611c99b9c8753c0a18b4"
|
||||||
|
|
||||||
vscode-languageserver@^5.1.0-next.3:
|
vscode-languageserver@^5.1.0:
|
||||||
version "5.1.0-next.3"
|
version "5.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.1.0-next.3.tgz#352ce1f0f8bdfc47c1236277ebe865e25b087ccd"
|
resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.1.0.tgz#012a28f154cc7a848c443d217894942e4c3eeb39"
|
||||||
dependencies:
|
dependencies:
|
||||||
vscode-languageserver-protocol "^3.12.0"
|
vscode-languageserver-protocol "3.13.0"
|
||||||
vscode-uri "^1.0.5"
|
vscode-uri "^1.0.6"
|
||||||
|
|
||||||
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-nls@^4.0.0:
|
vscode-nls@^4.0.0:
|
||||||
version "4.0.0"
|
version "4.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
|
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:
|
vscode-uri@^1.0.6:
|
||||||
version "1.0.6"
|
version "1.0.6"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.6.tgz#6b8f141b0bbc44ad7b07e94f82f168ac7608ad4d"
|
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.6.tgz#6b8f141b0bbc44ad7b07e94f82f168ac7608ad4d"
|
||||||
|
|
|
@ -38,27 +38,27 @@ vscode-extension-telemetry@0.0.19:
|
||||||
dependencies:
|
dependencies:
|
||||||
applicationinsights "1.0.3"
|
applicationinsights "1.0.3"
|
||||||
|
|
||||||
vscode-jsonrpc@^3.7.0-next.1:
|
vscode-jsonrpc@^4.0.0:
|
||||||
version "3.7.0-next.1"
|
version "4.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.7.0-next.1.tgz#e7521cd8135006ba8bf57ebcedbf5b03ce17b23e"
|
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz#a7bf74ef3254d0a0c272fab15c82128e378b3be9"
|
||||||
|
|
||||||
vscode-languageclient@^5.1.0-next.9:
|
vscode-languageclient@^5.1.0:
|
||||||
version "5.1.0-next.9"
|
version "5.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.1.0-next.9.tgz#fe56c523637c118f7b262952b889f760223ab75a"
|
resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-5.1.0.tgz#650ab0dc9fd0daaade058a8471aaff5bc3f9580e"
|
||||||
dependencies:
|
dependencies:
|
||||||
semver "^5.5.0"
|
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:
|
vscode-languageserver-protocol@3.13.0:
|
||||||
version "3.13.0-next.2"
|
version "3.13.0"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0-next.2.tgz#7083e50d0d2096ba52de448082445b9c39081fdb"
|
resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.13.0.tgz#710d8e42119bb3affb1416e1e104bd6b4d503595"
|
||||||
dependencies:
|
dependencies:
|
||||||
vscode-jsonrpc "^3.7.0-next.1"
|
vscode-jsonrpc "^4.0.0"
|
||||||
vscode-languageserver-types "^3.13.0-next.1"
|
vscode-languageserver-types "3.13.0"
|
||||||
|
|
||||||
vscode-languageserver-types@^3.13.0-next.1:
|
vscode-languageserver-types@3.13.0:
|
||||||
version "3.13.0-next.1"
|
version "3.13.0"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0-next.1.tgz#dd91b78b13a2a6c7131e8291e3db3183cf566280"
|
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.13.0.tgz#b704b024cef059f7b326611c99b9c8753c0a18b4"
|
||||||
|
|
||||||
vscode-nls@^4.0.0:
|
vscode-nls@^4.0.0:
|
||||||
version "4.0.0"
|
version "4.0.0"
|
||||||
|
|
Loading…
Reference in a new issue