diff --git a/tsconfig.json b/tsconfig.json
index 85238fc47..5d6407daa 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "allowJs": true,
-    "sourceMap": false,
+    "sourceMap": true,
     "noImplicitAny": true,
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true,
diff --git a/webpack.config.js b/webpack.config.js
index afa0e4a63..bfcc861cd 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -109,6 +109,7 @@ module.exports = function(env = {}, argv = {}) {
     mode === "development"
       ? new webpack.EvalSourceMapDevToolPlugin({})
       : new webpack.SourceMapDevToolPlugin({
+          // test: [".js", ".mjs", ".css", ".ts", ".tsx"],
           filename: "[name].js.map",
           exclude: [/vendor/]
         });
@@ -174,6 +175,7 @@ module.exports = function(env = {}, argv = {}) {
       patterns: [{ from: "DataExplorer.nuspec" }, { from: "web.config" }, { from: "quickstart/*.zip" }]
     }),
     new EnvironmentPlugin(envVars),
+    new webpack.optimize.LimitChunkCountPlugin({ maxChunks: 1 }),
     sourceMapPlugin
   ];
 
@@ -216,6 +218,7 @@ module.exports = function(env = {}, argv = {}) {
       minimize: mode === "production" ? true : false,
       minimizer: [
         new TerserPlugin({
+          sourceMap: true,
           cache: ".cache/terser",
           terserOptions: {
             // These options increase our initial bundle size by ~5% but the builds are significantly faster and won't run out of memory