diff --git a/build/lib/electron.js b/build/lib/electron.js
index 871cf232322..f5ce733ffcc 100644
--- a/build/lib/electron.js
+++ b/build/lib/electron.js
@@ -12,7 +12,7 @@ const filter = require("gulp-filter");
 const _ = require("underscore");
 const util = require("./util");
 function isDocumentSuffix(str) {
-    return str != undefined && (str === 'document' || str === 'script' || str === 'file' || str === 'source code');
+    return str === 'document' || str === 'script' || str === 'file' || str === 'source code';
 }
 const root = path.dirname(path.dirname(__dirname));
 const product = JSON.parse(fs.readFileSync(path.join(root, 'product.json'), 'utf8'));
diff --git a/build/lib/extensions.js b/build/lib/extensions.js
index 2648235fcc8..271a1464e62 100644
--- a/build/lib/extensions.js
+++ b/build/lib/extensions.js
@@ -21,6 +21,8 @@ const fancyLog = require("fancy-log");
 const ansiColors = require("ansi-colors");
 const buffer = require('gulp-buffer');
 const jsoncParser = require("jsonc-parser");
+const dependencies_1 = require("./dependencies");
+const _ = require("underscore");
 const util = require('./util');
 const root = path.dirname(path.dirname(__dirname));
 const commit = util.getVersion(root);
@@ -242,8 +244,10 @@ function packageLocalExtensionsStream(forWeb) {
         result = localExtensionsStream;
     }
     else {
-        // also include shared node modules
-        result = es.merge(localExtensionsStream, gulp.src('extensions/node_modules/**', { base: '.' }));
+        // also include shared production node modules
+        const productionDependencies = (0, dependencies_1.getProductionDependencies)('extensions/');
+        const dependenciesSrc = _.flatten(productionDependencies.map(d => path.relative(root, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`]));
+        result = es.merge(localExtensionsStream, gulp.src(dependenciesSrc, { base: '.' }));
     }
     return (result
         .pipe(util2.setExecutableBit(['**/*.sh'])));
diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts
index 8e091cae74b..d11ecac3442 100644
--- a/build/lib/extensions.ts
+++ b/build/lib/extensions.ts
@@ -21,6 +21,8 @@ import * as ansiColors from 'ansi-colors';
 const buffer = require('gulp-buffer');
 import * as jsoncParser from 'jsonc-parser';
 import webpack = require('webpack');
+import { getProductionDependencies } from './dependencies';
+import _ = require('underscore');
 const util = require('./util');
 const root = path.dirname(path.dirname(__dirname));
 const commit = util.getVersion(root);
@@ -302,8 +304,10 @@ export function packageLocalExtensionsStream(forWeb: boolean): Stream {
 	if (forWeb) {
 		result = localExtensionsStream;
 	} else {
-		// also include shared node modules
-		result = es.merge(localExtensionsStream, gulp.src('extensions/node_modules/**', { base: '.' }));
+		// also include shared production node modules
+		const productionDependencies = getProductionDependencies('extensions/');
+		const dependenciesSrc = _.flatten(productionDependencies.map(d => path.relative(root, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`]));
+		result = es.merge(localExtensionsStream, gulp.src(dependenciesSrc, { base: '.' }));
 	}
 
 	return (