Merge from vscode 2cd495805cf99b31b6926f08ff4348124b2cf73d

extensions/json-language-features/server/extension-browser.webpack.config.js

@@ -7,11 +7,10 @@
 
 'use strict';
 
-const withDefaults = require('../../shared.webpack.config');
+const withBrowserDefaults = require('../../shared.webpack.config').browser;
 const path = require('path');
 
-const serverConfig = withDefaults({
-	target: 'webworker',
+module.exports = withBrowserDefaults({
 	context: __dirname,
 	entry: {
 		extension: './src/browser/jsonServerMain.ts',
@@ -20,16 +19,5 @@ const serverConfig = withDefaults({
 		filename: 'jsonServerMain.js',
 		path: path.join(__dirname, 'dist', 'browser'),
 		libraryTarget: 'var'
-	},
-	performance: {
-		hints: false
-	},
-	resolve: {
-		alias: {
-			'vscode-nls': path.resolve(__dirname, '../../../build/polyfills/vscode-nls.js')
-		}
 	}
 });
-serverConfig.module.rules[0].use.shift(); // remove nls loader
-
-module.exports = serverConfig;

extensions/json-language-features/server/package.json

@@ -10,7 +10,7 @@
   "bin": {
     "vscode-json-languageserver": "./bin/vscode-json-languageserver"
   },
-  "main": "./out/jsonServerMain",
+  "main": "./out/node/jsonServerMain",
   "dependencies": {
     "jsonc-parser": "^2.2.1",
     "request-light": "^0.3.0",