Merge from vscode 2cd495805cf99b31b6926f08ff4348124b2cf73d

extensions/markdown-language-features/extension-browser.webpack.config.js

@@ -7,26 +7,11 @@
 
 'use strict';
 
-const withDefaults = require('../shared.webpack.config');
-const path = require('path');
+const withBrowserDefaults = require('../shared.webpack.config').browser;
 
-const clientConfig = withDefaults({
+module.exports = withBrowserDefaults({
 	context: __dirname,
-	target: 'webworker',
 	entry: {
 		extension: './src/extension.ts'
-	},
-	resolve: {
-		alias: {
-			'vscode-extension-telemetry': path.resolve(__dirname, '../../build/polyfills/vscode-extension-telemetry.js'),
-			'vscode-nls': path.resolve(__dirname, '../../build/polyfills/vscode-nls.js'),
-		},
-	},
-	performance: {
-		hints: false
-	},
+	}
 });
-
-clientConfig.module.rules[0].use.shift(); // remove nls loader
-
-module.exports =  clientConfig;

extensions/markdown-language-features/package.json

@@ -12,7 +12,7 @@
 		"vscode": "^1.20.0"
 	},
 	"main": "./out/extension",
-	"browser": "./dist/extension.js",
+	"browser": "./dist/browser/extension",
 	"categories": [
 		"Programming Languages"
 	],