update css/html/json dependencies and webpack cleanup (fixes #57431, fixes #58417)

This commit is contained in:
Martin Aeschlimann
2018-09-19 16:52:42 +02:00
parent d216f0e06e
commit 2dd4d2b56f
22 changed files with 133 additions and 216 deletions

View File

@@ -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/**

View File

@@ -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')
}
});

View File

@@ -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": {

View File

@@ -19,7 +19,6 @@ module.exports = withDefaults({
output: {
filename: 'htmlServerMain.js',
path: path.join(__dirname, 'dist'),
libraryTarget: "commonjs",
},
externals: {
'typescript': 'commonjs typescript'

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"