microsoft
diff --git a/‎.vscode/launch.json
+2-2 b/‎.vscode/launch.json
+2-2
diff --git a/‎build/ci/templates/globals.yml
+1 b/‎build/ci/templates/globals.yml
+1
diff --git a/‎build/webpack/webpack.datascience-ui.config.builder.js
+1 b/‎build/webpack/webpack.datascience-ui.config.builder.js
+1
diff --git a/‎gulpfile.js
+3-1 b/‎gulpfile.js
+3-1
diff --git a/‎package-lock.json
+72 b/‎package-lock.json
+72
@@ -234,7 +234,7 @@
                 "--ui=tdd",
                 "--recursive",
                 "--colors",
-                //"--grep", "<suite name>",
+                //"--grep", "<suite>",
                 "--timeout=300000"
             ],
             "env": {
@@ -243,7 +243,7 @@
                 // Remove 'X' to turn on all logging in the debug output
                 "XVSC_PYTHON_FORCE_LOGGING": "1",
                 // Remove `X` prefix and update path to test with real python interpreter (for DS functional tests).
-                "XCI_PYTHON_PATH": "<Python Path>"
+                "XCI_PYTHON_PATH": "<Python Path>",
             },
             "outFiles": [
                 "${workspaceFolder}/out/**/*.js"
 
@@ -6,6 +6,7 @@ variables:
   MOCHA_REPORTER_JUNIT: true # Use the mocha-multi-reporters and send output to both console (spec) and JUnit (mocha-junit-reporter).
   VSC_PYTHON_FORCE_LOGGING: true # Enable this to turn on console output for the logger
   VSC_PYTHON_LOG_FILE: '$(Build.ArtifactStagingDirectory)/pvsc.log'
+  VSC_PYTHON_WEBVIEW_LOG_FILE: '$(Build.ArtifactStagingDirectory)/pvsc_webview.log'
   CI_BRANCH_NAME: ${Build.SourceBranchName}
   npm_config_cache: $(Pipeline.Workspace)/.npm
   vmImageMacOS: 'macOS-10.15'
@@ -190,6 +190,7 @@ function buildConfiguration(isNotebook) {
             }),
             ...getPlugins(isNotebook)
         ],
+        externals: ['log4js'],
         resolve: {
             // Add '.ts' and '.tsx' as resolvable extensions.
             extensions: ['.ts', '.tsx', '.js', '.json', '.svg']
 
@@ -274,7 +274,9 @@ function getAllowedWarningsForWebPack(buildConfig) {
                 'WARNING in ./node_modules/ws/lib/validation.js',
                 'WARNING in ./node_modules/@jupyterlab/services/node_modules/ws/lib/buffer-util.js',
                 'WARNING in ./node_modules/@jupyterlab/services/node_modules/ws/lib/validation.js',
-                'WARNING in ./node_modules/any-promise/register.js'
+                'WARNING in ./node_modules/any-promise/register.js',
+                'WARNING in ./node_modules/log4js/lib/appenders/index.js',
+                'WARNING in ./node_modules/log4js/lib/clustering.js'
             ];
         case 'extension':
             return [