From ffe5da332d35b342bc19fef5efc0aee81b40fe5c Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 22 Aug 2018 11:35:27 +0200
Subject: [PATCH] bundle node_modules and (shallow) exclude them from the
 extension #56081

---
 extensions/emmet/.vscodeignore               |  4 ++++
 extensions/emmet/extension.webpack.config.js |  4 ----
 extensions/git/.vscodeignore                 |  5 +++++
 extensions/git/extension.webpack.config.js   | 11 +----------
 extensions/shared.webpack.config.js          |  3 +++
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/extensions/emmet/.vscodeignore b/extensions/emmet/.vscodeignore
index 05dfeabaa1c..61ece8e14f8 100644
--- a/extensions/emmet/.vscodeignore
+++ b/extensions/emmet/.vscodeignore
@@ -2,3 +2,7 @@ test/**
 src/**
 out/**
 tsconfig.json
+node_modules/@emmetio/css-parser/**
+node_modules/@emmetio/html-matcher/**
+node_modules/@emmetio/math-expression/**
+node_modules/image-size/**
diff --git a/extensions/emmet/extension.webpack.config.js b/extensions/emmet/extension.webpack.config.js
index d066fbf4bb4..d5064ef4517 100644
--- a/extensions/emmet/extension.webpack.config.js
+++ b/extensions/emmet/extension.webpack.config.js
@@ -15,10 +15,6 @@ module.exports = withDefaults({
 		extension: './src/extension.ts',
 	},
 	externals: {
-		'@emmetio/css-parser': 'commonjs @emmetio/css-parser',
-		'@emmetio/html-matcher': 'commonjs @emmetio/html-matcher',
-		'@emmetio/math-expression': 'commonjs @emmetio/math-expression',
-		'image-size': 'commonjs image-size',
 		'vscode-emmet-helper': 'commonjs vscode-emmet-helper',
 	},
 });
diff --git a/extensions/git/.vscodeignore b/extensions/git/.vscodeignore
index 894e6f24870..5c006f2a394 100644
--- a/extensions/git/.vscodeignore
+++ b/extensions/git/.vscodeignore
@@ -3,3 +3,8 @@ test/**
 out/**
 tsconfig.json
 build/**
+node_modules/byline/**
+node_modules/file-type/**
+node_modules/iconv-lite/**
+node_modules/jschardet/**
+node_modules/which/**
diff --git a/extensions/git/extension.webpack.config.js b/extensions/git/extension.webpack.config.js
index 1573e4928ab..5f3997a61ca 100644
--- a/extensions/git/extension.webpack.config.js
+++ b/extensions/git/extension.webpack.config.js
@@ -25,14 +25,5 @@ module.exports = withDefaults({
 			{ from: './out/*.sh', to: '[name].sh' },
 			{ from: './out/nls.*.json', to: '[name].json' }
 		])
-	],
-	externals: {
-		"byline": 'commonjs byline',
-		"file-type": 'commonjs file-type',
-		"iconv-lite": 'commonjs iconv-lite',
-		"jschardet": 'commonjs jschardet',
-		"vscode-extension-telemetry": 'commonjs vscode-extension-telemetry',
-		"vscode-nls": 'commonjs vscode-nls',
-		"which": 'commonjs which',
-	},
+	]
 });
diff --git a/extensions/shared.webpack.config.js b/extensions/shared.webpack.config.js
index 78ecff5f03b..ad169b3eb88 100644
--- a/extensions/shared.webpack.config.js
+++ b/extensions/shared.webpack.config.js
@@ -46,6 +46,9 @@ module.exports = function withDefaults(/**@type WebpackConfig*/extConfig) {
 		},
 		externals: {
 			'vscode': 'commonjs vscode', // ignored because it doesn't exist
+
+			"vscode-extension-telemetry": 'commonjs vscode-extension-telemetry', // commonly used
+			"vscode-nls": 'commonjs vscode-nls',
 		},
 		output: {
 			// all output goes into `dist`.