diff --git a/extensions/emmet/extension.webpack.config.js b/extensions/emmet/extension.webpack.config.js
index 5534ef2030b55ef81dd2b6e34b16319ddabb4617..752505a410837123775972495ef2de5ddc6a9bc1 100644
--- a/extensions/emmet/extension.webpack.config.js
+++ b/extensions/emmet/extension.webpack.config.js
@@ -8,8 +8,8 @@
 const path = require('path');
 
 module.exports = {
-	stats: 'errors-only',
-	// mode: 'none', // default is production
+	mode: 'production',
+	// mode: 'none',
 	context: __dirname,
 	target: 'node',
 	resolve: {
@@ -26,4 +26,13 @@ module.exports = {
 	externals: {
 		'vscode': 'commonjs vscode',
 	},
+	stats: 'errors-only',
+	devtool: 'source-map',
+	module: {
+		rules: [{
+			test: /\.js$/,
+			use: ["source-map-loader"],
+			enforce: "pre"
+		}]
+	}
 };
diff --git a/extensions/git/extension.webpack.config.js b/extensions/git/extension.webpack.config.js
index d2c8a4eee952b09c288e145353b6afed2398cf2d..2562c12140bd188207be485ca9e82cba4f659e0c 100644
--- a/extensions/git/extension.webpack.config.js
+++ b/extensions/git/extension.webpack.config.js
@@ -9,8 +9,8 @@ const path = require('path');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 
 module.exports = {
-	stats: 'errors-only',
-	// mode: 'none', // default is production
+	mode: 'production',
+	// mode: 'none',
 	context: __dirname,
 	target: 'node',
 	node: {
@@ -33,5 +33,14 @@ module.exports = {
 	},
 	plugins: [
 		new CopyWebpackPlugin([{ from: './out/*.sh', to: '[name].sh' }])
-	]
+	],
+	stats: 'errors-only',
+	devtool: 'source-map',
+	module: {
+		rules: [{
+			test: /\.js$/,
+			use: ["source-map-loader"],
+			enforce: "pre"
+		}]
+	}
 };
diff --git a/package.json b/package.json
index 38d58c1f3618d1041a66fee0f3ab4181ab104692..8c84cfd30865657db818d527b24bf2b9d3d7df2b 100644
--- a/package.json
+++ b/package.json
@@ -117,6 +117,7 @@
     "rimraf": "^2.2.8",
     "sinon": "^1.17.2",
     "source-map": "^0.4.4",
+    "source-map-loader": "^0.2.3",
     "tslint": "^5.9.1",
     "typescript": "2.9.2",
     "typescript-formatter": "7.1.0",
diff --git a/yarn.lock b/yarn.lock
index 8b5ee32b9da320f920c994e84d5ad450cc7f4518..ed7f6ddf6782810eb2f8f7309b7306f4ff16fc00 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -540,6 +540,12 @@ async@^2.0.1:
   dependencies:
     lodash "^4.14.0"
 
+async@^2.5.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
+  dependencies:
+    lodash "^4.17.10"
+
 async@~0.2.8:
   version "0.2.10"
   resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
@@ -4314,6 +4320,15 @@ loader-utils@^1.1.0:
     emojis-list "^2.0.0"
     json5 "^0.5.0"
 
+loader-utils@~0.2.2:
+  version "0.2.17"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
+  dependencies:
+    big.js "^3.1.3"
+    emojis-list "^2.0.0"
+    json5 "^0.5.0"
+    object-assign "^4.0.1"
+
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -4556,6 +4571,10 @@ lodash@^4.0.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.3.0:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
+lodash@^4.17.10:
+  version "4.17.10"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+
 lodash@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
@@ -6841,6 +6860,14 @@ source-list-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
 
+source-map-loader@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.2.3.tgz#d4b0c8cd47d54edce3e6bfa0f523f452b5b0e521"
+  dependencies:
+    async "^2.5.0"
+    loader-utils "~0.2.2"
+    source-map "~0.6.1"
+
 source-map-resolve@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.3.1.tgz#610f6122a445b8dd51535a2a71b783dfc1248761"