used shared webpack-config for browser

aeschli · aeschli · commit 16be2c98854b · 2020-06-25T23:22:02.000+02:00
diff --git a/extensions/configuration-editing/extension-browser.webpack.config.js b/extensions/configuration-editing/extension-browser.webpack.config.js
@@ -7,27 +7,15 @@
 
 'use strict';
 
-const withDefaults = require('../shared.webpack.config');
-const path = require('path');
+const withBrowserDefaults = require('../shared.webpack.config').browser;
 
-const clientConfig = withDefaults({
-	target: 'webworker',
+module.exports = withBrowserDefaults({
 	context: __dirname,
 	entry: {
 		extension: './src/configurationEditingMain.ts'
 	},
 	output: {
 		filename: 'configurationEditingMain.js'
-	},
-	performance: {
-		hints: false
-	},
-	resolve: {
-		alias: {
-			'vscode-nls': path.resolve(__dirname, '../../build/polyfills/vscode-nls.js')
-		}
 	}
 });
-clientConfig.module.rules[0].use.shift(); // remove nls loader
 
-module.exports = clientConfig;
diff --git a/extensions/configuration-editing/package.json b/extensions/configuration-editing/package.json
@@ -13,7 +13,7 @@
     "onLanguage:jsonc"
   ],
   "main": "./out/configurationEditingMain",
-  "browser": "./dist/configurationEditingMain",
+  "browser": "./dist/browser/configurationEditingMain",
   "scripts": {
     "compile": "gulp compile-extension:configuration-editing",
     "watch": "gulp watch-extension:configuration-editing"
diff --git a/extensions/css-language-features/extension-browser.webpack.config.js b/extensions/css-language-features/extension-browser.webpack.config.js
@@ -7,28 +7,16 @@
 
 'use strict';
 
-const withDefaults = require('../shared.webpack.config');
+const withBrowserDefaults = require('../shared.webpack.config').browser;
 const path = require('path');
 
-const clientConfig = withDefaults({
-	target: 'webworker',
+module.exports = withBrowserDefaults({
 	context: path.join(__dirname, 'client'),
 	entry: {
 		extension: './src/browser/cssClientMain.ts'
 	},
 	output: {
 		filename: 'cssClientMain.js',
 		path: path.join(__dirname, 'client', 'dist', 'browser')
-	},
-	performance: {
-		hints: false
-	},
-	resolve: {
-		alias: {
-			'vscode-nls': path.resolve(__dirname, '../../build/polyfills/vscode-nls.js')
-		}
 	}
 });
-clientConfig.module.rules[0].use.shift(); // remove nls loader
-
-module.exports = clientConfig;
diff --git a/extensions/css-language-features/server/extension-browser.webpack.config.js b/extensions/css-language-features/server/extension-browser.webpack.config.js
@@ -7,11 +7,10 @@
 
 'use strict';
 
-const withDefaults = require('../../shared.webpack.config');
+const withBrowserDefaults = require('../../shared.webpack.config').browser;
 const path = require('path');
 
-const serverConfig = withDefaults({
-	target: 'webworker',
+module.exports = withBrowserDefaults({
 	context: __dirname,
 	entry: {
 		extension: './src/browser/cssServerMain.ts',
@@ -20,16 +19,5 @@ const serverConfig = withDefaults({
 		filename: 'cssServerMain.js',
 		path: path.join(__dirname, 'dist', 'browser'),
 		libraryTarget: 'var'
-	},
-	performance: {
-		hints: false
-	},
-	resolve: {
-		alias: {
-			'vscode-nls': path.resolve(__dirname, '../../../build/polyfills/vscode-nls.js')
-		}
 	}
 });
-serverConfig.module.rules[0].use.shift(); // remove nls loader
-
-module.exports = serverConfig;
diff --git a/extensions/html-language-features/extension-browser.webpack.config.js b/extensions/html-language-features/extension-browser.webpack.config.js
@@ -7,28 +7,16 @@
 
 'use strict';
 
-const withDefaults = require('../shared.webpack.config');
+const withBrowserDefaults = require('../shared.webpack.config').browser;
 const path = require('path');
 
-const clientConfig = withDefaults({
-	target: 'webworker',
+module.exports = withBrowserDefaults({
 	context: path.join(__dirname, 'client'),
 	entry: {
 		extension: './src/browser/htmlClientMain.ts'
 	},
 	output: {
 		filename: 'htmlClientMain.js',
 		path: path.join(__dirname, 'client', 'dist', 'browser')
-	},
-	performance: {
-		hints: false
-	},
-	resolve: {
-		alias: {
-			'vscode-nls': path.resolve(__dirname, '../../build/polyfills/vscode-nls.js')
-		}
 	}
 });
-clientConfig.module.rules[0].use.shift(); // remove nls loader
-
-module.exports = clientConfig;
diff --git a/extensions/html-language-features/server/extension-browser.webpack.config.js b/extensions/html-language-features/server/extension-browser.webpack.config.js
@@ -7,36 +7,25 @@
 
 'use strict';
 
-const withDefaults = require('../../shared.webpack.config');
+const withBrowserDefaults = require('../../shared.webpack.config').browser;
 const path = require('path');
 
-const serverConfig = withDefaults({
-	target: 'webworker',
+const serverConfig = withBrowserDefaults({
 	context: __dirname,
 	entry: {
 		extension: './src/browser/htmlServerMain.ts',
-
 	},
 	output: {
 		filename: 'htmlServerMain.js',
 		path: path.join(__dirname, 'dist', 'browser'),
 		libraryTarget: 'var'
 	},
-	performance: {
-		hints: false
-	},
 	optimization: {
 		splitChunks: {
 			chunks: "async"
 		}
-	},
-	resolve: {
-		alias: {
-			'vscode-nls': path.resolve(__dirname, '../../../build/polyfills/vscode-nls.js')
-		}
 	}
 });
-serverConfig.module.rules[0].use.shift(); // remove nls loader
 serverConfig.module.noParse =  /typescript\/lib\/typescript\.js/;
 serverConfig.module.rules.push({
 	test: /javascriptLibs.ts$/,
diff --git a/extensions/image-preview/extension-browser.webpack.config.js b/extensions/image-preview/extension-browser.webpack.config.js
@@ -7,23 +7,11 @@
 
 'use strict';
 
-const withDefaults = require('../shared.webpack.config');
-const path = require('path');
+const withBrowserDefaults = require('../shared.webpack.config').browser;
 
-const clientConfig = withDefaults({
+module.exports = withBrowserDefaults({
 	context: __dirname,
-	target: 'webworker',
 	entry: {
 		extension: './src/extension.ts'
 	},
-	resolve: {
-		alias: {
-			'vscode-extension-telemetry': path.resolve(__dirname, '../../build/polyfills/vscode-extension-telemetry.js'),
-			'vscode-nls': path.resolve(__dirname, '../../build/polyfills/vscode-nls.js'),
-		},
-	}
 });
-
-clientConfig.module.rules[0].use.shift(); // remove nls loader
-
-module.exports =  clientConfig;
diff --git a/extensions/image-preview/package.json b/extensions/image-preview/package.json
@@ -16,7 +16,7 @@
     "vscode": "^1.39.0"
   },
   "main": "./out/extension",
-  "browser": "./dist/extension.js",
+  "browser": "./dist/browser/extension.js",
   "categories": [
     "Other"
   ],
diff --git a/extensions/json-language-features/extension-browser.webpack.config.js b/extensions/json-language-features/extension-browser.webpack.config.js
@@ -7,10 +7,10 @@
 
 'use strict';
 
-const withDefaults = require('../shared.webpack.config');
+const withBrowserDefaults = require('../shared.webpack.config').browser;
 const path = require('path');
 
-const clientConfig = withDefaults({
+module.exports = withBrowserDefaults({
 	target: 'webworker',
 	context: path.join(__dirname, 'client'),
 	entry: {
@@ -19,16 +19,5 @@ const clientConfig = withDefaults({
 	output: {
 		filename: 'jsonClientMain.js',
 		path: path.join(__dirname, 'client', 'dist', 'browser')
-	},
-	performance: {
-		hints: false
-	},
-	resolve: {
-		alias: {
-			'vscode-nls': path.resolve(__dirname, '../../build/polyfills/vscode-nls.js')
-		}
 	}
 });
-clientConfig.module.rules[0].use.shift(); // remove nls loader
-
-module.exports = clientConfig;
diff --git a/extensions/json-language-features/server/extension-browser.webpack.config.js b/extensions/json-language-features/server/extension-browser.webpack.config.js
@@ -7,11 +7,10 @@
 
 'use strict';
 
-const withDefaults = require('../../shared.webpack.config');
+const withBrowserDefaults = require('../../shared.webpack.config').browser;
 const path = require('path');
 
-const serverConfig = withDefaults({
-	target: 'webworker',
+module.exports = withBrowserDefaults({
 	context: __dirname,
 	entry: {
 		extension: './src/browser/jsonServerMain.ts',
@@ -20,16 +19,5 @@ const serverConfig = withDefaults({
 		filename: 'jsonServerMain.js',
 		path: path.join(__dirname, 'dist', 'browser'),
 		libraryTarget: 'var'
-	},
-	performance: {
-		hints: false
-	},
-	resolve: {
-		alias: {
-			'vscode-nls': path.resolve(__dirname, '../../../build/polyfills/vscode-nls.js')
-		}
 	}
 });
-serverConfig.module.rules[0].use.shift(); // remove nls loader
-
-module.exports = serverConfig;
diff --git a/extensions/markdown-language-features/extension-browser.webpack.config.js b/extensions/markdown-language-features/extension-browser.webpack.config.js
@@ -7,26 +7,11 @@
 
 'use strict';
 
-const withDefaults = require('../shared.webpack.config');
-const path = require('path');
+const withBrowserDefaults = require('../shared.webpack.config').browser;
 
-const clientConfig = withDefaults({
+module.exports = withBrowserDefaults({
 	context: __dirname,
-	target: 'webworker',
 	entry: {
 		extension: './src/extension.ts'
-	},
-	resolve: {
-		alias: {
-			'vscode-extension-telemetry': path.resolve(__dirname, '../../build/polyfills/vscode-extension-telemetry.js'),
-			'vscode-nls': path.resolve(__dirname, '../../build/polyfills/vscode-nls.js'),
-		},
-	},
-	performance: {
-		hints: false
-	},
+	}
 });
-
-clientConfig.module.rules[0].use.shift(); // remove nls loader
-
-module.exports =  clientConfig;
diff --git a/extensions/markdown-language-features/package.json b/extensions/markdown-language-features/package.json
@@ -12,7 +12,7 @@
 		"vscode": "^1.20.0"
 	},
 	"main": "./out/extension",
-	"browser": "./dist/extension.js",
+	"browser": "./dist/browser/extension",
 	"categories": [
 		"Programming Languages"
 	],
diff --git a/extensions/merge-conflict/extension-browser.webpack.config.js b/extensions/merge-conflict/extension-browser.webpack.config.js
@@ -7,27 +7,14 @@
 
 'use strict';
 
-const withDefaults = require('../shared.webpack.config');
-const path = require('path');
+const withBrowserDefaults = require('../shared.webpack.config').browser;
 
-const clientConfig = withDefaults({
-	target: 'webworker',
+module.exports = withBrowserDefaults({
 	context: __dirname,
 	entry: {
 		extension: './src/mergeConflictMain.ts'
 	},
 	output: {
 		filename: 'mergeConflictMain.js'
-	},
-	performance: {
-		hints: false
-	},
-	resolve: {
-		alias: {
-			'vscode-nls': path.resolve(__dirname, '../../build/polyfills/vscode-nls.js')
-		}
 	}
 });
-clientConfig.module.rules[0].use.shift(); // remove nls loader
-
-module.exports = clientConfig;
diff --git a/extensions/merge-conflict/package.json b/extensions/merge-conflict/package.json
@@ -17,7 +17,7 @@
     "*"
   ],
   "main": "./out/mergeConflictMain",
-  "browser": "./dist/mergeConflictMain",
+  "browser": "./dist/mergeConflictBrowserMain",
   "scripts": {
     "compile": "gulp compile-extension:merge-conflict",
     "watch": "gulp watch-extension:merge-conflict"
diff --git a/extensions/npm/extension-browser.webpack.config.js b/extensions/npm/extension-browser.webpack.config.js
@@ -7,30 +7,17 @@
 
 'use strict';
 
-const withDefaults = require('../shared.webpack.config');
-const path = require('path');
+const withBrowserDefaults = require('../shared.webpack.config').browser;
 
-const clientConfig = withDefaults({
-	target: 'webworker',
+module.exports = withBrowserDefaults({
 	context: __dirname,
 	entry: {
 		extension: './src/npmBrowserMain.ts'
 	},
 	output: {
 		filename: 'npmBrowserMain.js'
 	},
-	performance: {
-		hints: false
-	},
-	resolve: {
-		alias: {
-			'vscode-nls': path.resolve(__dirname, '../../build/polyfills/vscode-nls.js')
-		}
-	},
 	node: {
 		'child_process': 'empty'
 	}
 });
-clientConfig.module.rules[0].use.shift(); // remove nls loader
-
-module.exports = clientConfig;
diff --git a/extensions/npm/package.json b/extensions/npm/package.json
@@ -28,7 +28,7 @@
     "@types/node": "^12.11.7"
   },
   "main": "./out/npmMain",
-  "browser": "./dist/npmBrowserMain",
+  "browser": "./dist/browser/npmBrowserMain",
   "activationEvents": [
     "onCommand:workbench.action.tasks.runTask",
     "onCommand:npm.runScriptFromFolder",
diff --git a/extensions/python/extension-browser.webpack.config.js b/extensions/python/extension-browser.webpack.config.js
diff --git a/extensions/python/package.json b/extensions/python/package.json
diff --git a/extensions/shared.webpack.config.js b/extensions/shared.webpack.config.js
diff --git a/extensions/vscode-web-playground/extension-browser.webpack.config.js b/extensions/vscode-web-playground/extension-browser.webpack.config.js
diff --git a/extensions/vscode-web-playground/package.json b/extensions/vscode-web-playground/package.json
