microsoft · rchiodo · Mar 6, 2019 · Feb 28, 2019 · Feb 28, 2019 · Mar 1, 2019
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -68,6 +68,9 @@
                 "--extensionDevelopmentPath=${workspaceFolder}",
                 "--extensionTestsPath=${workspaceFolder}/out/test"
             ],
+            "env": {
+                "VSC_PYTHON_CI_TEST_GREP": "" // Modify this to run a subset of the single workspace tests
+            },
             "stopOnEntry": false,
             "sourceMaps": true,
             "outFiles": [

diff --git a/build/webpack/common.js b/build/webpack/common.js
@@ -1,47 +1,50 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-'use strict';
-Object.defineProperty(exports, "__esModule", { value: true });
-const glob = require("glob");
-const path = require("path");
-const webpack_bundle_analyzer_1 = require("webpack-bundle-analyzer");
-const constants_1 = require("../constants");
-exports.nodeModulesToExternalize = [
-    'unicode/category/Lu',
-    'unicode/category/Ll',
-    'unicode/category/Lt',
-    'unicode/category/Lo',
-    'unicode/category/Lm',
-    'unicode/category/Nl',
-    'unicode/category/Mn',
-    'unicode/category/Mc',
-    'unicode/category/Nd',
-    'unicode/category/Pc',
-    '@jupyterlab/services',
-    'azure-storage',
-    'request',
-    'request-progress',
-    'source-map-support',
-    'diff-match-patch',
-    'sudo-prompt',
-    'node-stream-zip',
-    'xml2js',
-    'vsls/vscode'
-];
-function getDefaultPlugins(name) {
-    const plugins = [];
-    if (!constants_1.isCI) {
-        plugins.push(new webpack_bundle_analyzer_1.BundleAnalyzerPlugin({
-            analyzerMode: 'static',
-            reportFilename: `${name}.analyzer.html`
-        }));
-    }
-    return plugins;
-}
-exports.getDefaultPlugins = getDefaultPlugins;
-function getListOfExistingModulesInOutDir() {
-    const outDir = path.join(constants_1.ExtensionRootDir, 'out', 'client');
-    const files = glob.sync('**/*.js', { sync: true, cwd: outDir });
-    return files.map(filePath => `./${filePath.slice(0, -3)}`);
-}
-exports.getListOfExistingModulesInOutDir = getListOfExistingModulesInOutDir;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+const glob = require("glob");
+const path = require("path");
+const webpack_bundle_analyzer_1 = require("webpack-bundle-analyzer");
+const constants_1 = require("../constants");
+exports.nodeModulesToExternalize = [
+    'unicode/category/Lu',
+    'unicode/category/Ll',
+    'unicode/category/Lt',
+    'unicode/category/Lo',
+    'unicode/category/Lm',
+    'unicode/category/Nl',
+    'unicode/category/Mn',
+    'unicode/category/Mc',
+    'unicode/category/Nd',
+    'unicode/category/Pc',
+    '@jupyterlab/services',
+    'azure-storage',
+    'request',
+    'request-progress',
+    'source-map-support',
+    'diff-match-patch',
+    'sudo-prompt',
+    'node-stream-zip',
+    'xml2js',
+    'vsls/vscode',
+];
+exports.nodeModulesToReplacePaths = [
+    ...exports.nodeModulesToExternalize
+];
+function getDefaultPlugins(name) {
+    const plugins = [];
+    if (!constants_1.isCI) {
+        plugins.push(new webpack_bundle_analyzer_1.BundleAnalyzerPlugin({
+            analyzerMode: 'static',
+            reportFilename: `${name}.analyzer.html`
+        }));
+    }
+    return plugins;
+}
+exports.getDefaultPlugins = getDefaultPlugins;
+function getListOfExistingModulesInOutDir() {
+    const outDir = path.join(constants_1.ExtensionRootDir, 'out', 'client');
+    const files = glob.sync('**/*.js', { sync: true, cwd: outDir });
+    return files.map(filePath => `./${filePath.slice(0, -3)}`);
+}
+exports.getListOfExistingModulesInOutDir = getListOfExistingModulesInOutDir;
diff --git a/build/webpack/common.ts b/build/webpack/common.ts
@@ -28,9 +28,13 @@ export const nodeModulesToExternalize = [
     'sudo-prompt',
     'node-stream-zip',
     'xml2js',
-    'vsls/vscode'
+    'vsls/vscode',
 ];
 
+export const nodeModulesToReplacePaths = [
+    ...nodeModulesToExternalize
+]
+
 export function getDefaultPlugins(name: 'extension' | 'debugger' | 'dependencies' | 'datascience-ui') {
     const plugins = [];
     if (!isCI) {

diff --git a/build/webpack/loaders/externalizeDependencies.js b/build/webpack/loaders/externalizeDependencies.js
@@ -1,21 +1,21 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-'use strict';
-Object.defineProperty(exports, "__esModule", { value: true });
-const common_1 = require("../common");
-function replaceModule(contents, moduleName, quotes) {
-    const stringToSearch = `${quotes}${moduleName}${quotes}`;
-    const stringToReplaceWith = `${quotes}./node_modules/${moduleName}${quotes}`;
-    return contents.replace(new RegExp(stringToSearch, 'gm'), stringToReplaceWith);
-}
-// tslint:disable:no-default-export no-invalid-this
-function default_1(source) {
-    common_1.nodeModulesToExternalize.forEach(moduleName => {
-        if (source.indexOf(moduleName) > 0) {
-            source = replaceModule(source, moduleName, '"');
-            source = replaceModule(source, moduleName, '\'');
-        }
-    });
-    return source;
-}
-exports.default = default_1;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+const common_1 = require("../common");
+function replaceModule(contents, moduleName, quotes) {
+    const stringToSearch = `${quotes}${moduleName}${quotes}`;
+    const stringToReplaceWith = `${quotes}./node_modules/${moduleName}${quotes}`;
+    return contents.replace(new RegExp(stringToSearch, 'gm'), stringToReplaceWith);
+}
+// tslint:disable:no-default-export no-invalid-this
+function default_1(source) {
+    common_1.nodeModulesToReplacePaths.forEach(moduleName => {
+        if (source.indexOf(moduleName) > 0) {
+            source = replaceModule(source, moduleName, '"');
+            source = replaceModule(source, moduleName, '\'');
+        }
+    });
+    return source;
+}
+exports.default = default_1;
diff --git a/build/webpack/loaders/externalizeDependencies.ts b/build/webpack/loaders/externalizeDependencies.ts
@@ -3,7 +3,7 @@
 
 'use strict';
 
-import { nodeModulesToExternalize } from '../common';
+import { nodeModulesToReplacePaths } from '../common';
 
 function replaceModule(contents: string, moduleName: string, quotes: '"' | '\''): string {
     const stringToSearch = `${quotes}${moduleName}${quotes}`;
@@ -12,7 +12,7 @@ function replaceModule(contents: string, moduleName: string, quotes: '"' | '\'')
 }
 // tslint:disable:no-default-export no-invalid-this
 export default function (source: string) {
-    nodeModulesToExternalize.forEach(moduleName => {
+    nodeModulesToReplacePaths.forEach(moduleName => {
         if (source.indexOf(moduleName) > 0) {
             source = replaceModule(source, moduleName, '"');
             source = replaceModule(source, moduleName, '\'');

diff --git a/build/webpack/webpack.extension.dependencies.config.js b/build/webpack/webpack.extension.dependencies.config.js
@@ -1,51 +1,57 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-'use strict';
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = require("path");
-const constants_1 = require("../constants");
-const common_1 = require("./common");
-const entryItems = {};
-common_1.nodeModulesToExternalize.forEach(moduleName => {
-    entryItems[`node_modules/${moduleName}`] = `./node_modules/${moduleName}`;
-});
-const config = {
-    mode: 'production',
-    target: 'node',
-    entry: entryItems,
-    devtool: 'source-map',
-    node: {
-        __dirname: false
-    },
-    module: {
-        rules: [
-            {
-                // JupyterServices imports node-fetch using `eval`.
-                test: /@jupyterlab[\\\/]services[\\\/].*js$/,
-                use: [
-                    {
-                        loader: path.join(__dirname, 'loaders', 'fixEvalRequire.js')
-                    }
-                ]
-            }
-        ]
-    },
-    externals: [
-        'vscode',
-        'commonjs'
-    ],
-    plugins: [
-        ...common_1.getDefaultPlugins('dependencies')
-    ],
-    resolve: {
-        extensions: ['.js']
-    },
-    output: {
-        filename: '[name].js',
-        path: path.resolve(constants_1.ExtensionRootDir, 'out', 'client'),
-        libraryTarget: 'commonjs2',
-        devtoolModuleFilenameTemplate: '../../[resource-path]'
-    }
-};
-// tslint:disable-next-line:no-default-export
-exports.default = config;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = require("path");
+const constants_1 = require("../constants");
+const common_1 = require("./common");
+const copyWebpackPlugin = require("copy-webpack-plugin");
+const entryItems = {};
+common_1.nodeModulesToExternalize.forEach(moduleName => {
+    entryItems[`node_modules/${moduleName}`] = `./node_modules/${moduleName}`;
+});
+const config = {
+    mode: 'production',
+    target: 'node',
+    entry: entryItems,
+    devtool: 'source-map',
+    node: {
+        __dirname: false
+    },
+    module: {
+        rules: [
+            {
+                // JupyterServices imports node-fetch using `eval`.
+                test: /@jupyterlab[\\\/]services[\\\/].*js$/,
+                use: [
+                    {
+                        loader: path.join(__dirname, 'loaders', 'fixEvalRequire.js')
+                    }
+                ]
+            }
+        ]
+    },
+    externals: [
+        'vscode',
+        'commonjs'
+    ],
+    plugins: [
+        ...common_1.getDefaultPlugins('dependencies'),
+        // vsls requires our package.json to be next to node_modules. It's how they
+        // 'find' the calling extension.
+        new copyWebpackPlugin([
+            { from: './package.json', to: '.' }
+        ])
+    ],
+    resolve: {
+        extensions: ['.js']
+    },
+    output: {
+        filename: '[name].js',
+        path: path.resolve(constants_1.ExtensionRootDir, 'out', 'client'),
+        libraryTarget: 'commonjs2',
+        devtoolModuleFilenameTemplate: '../../[resource-path]'
+    }
+};
+// tslint:disable-next-line:no-default-export
+exports.default = config;
diff --git a/build/webpack/webpack.extension.dependencies.config.ts b/build/webpack/webpack.extension.dependencies.config.ts
@@ -7,6 +7,7 @@ import * as path from 'path';
 import * as webpack from 'webpack';
 import { ExtensionRootDir } from '../constants';
 import { getDefaultPlugins, nodeModulesToExternalize } from './common';
+import copyWebpackPlugin = require('copy-webpack-plugin');
 
 const entryItems: Record<string, string> = {};
 nodeModulesToExternalize.forEach(moduleName => {
@@ -31,15 +32,20 @@ const config: webpack.Configuration = {
                         loader: path.join(__dirname, 'loaders', 'fixEvalRequire.js')
                     }
                 ]
-            }
+            }            
         ]
     },
     externals: [
         'vscode',
         'commonjs'
     ],
     plugins: [
-        ...getDefaultPlugins('dependencies')
+        ...getDefaultPlugins('dependencies'),
+        // vsls requires our package.json to be next to node_modules. It's how they
+        // 'find' the calling extension.
+        new copyWebpackPlugin([
+            { from: './package.json', to: '.' }
+        ])
     ],
     resolve: {
         extensions: ['.js']

diff --git a/news/3 Code Health/4521.md b/news/3 Code Health/4521.md
@@ -0,0 +1 @@
+Add tests for live share support.
diff --git a/news/3 Code Health/4529.md b/news/3 Code Health/4529.md
@@ -0,0 +1 @@
+Fix running liveshare support in a release build.
diff --git a/package-lock.json b/package-lock.json
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix running liveshare support in a release build.