webpack - use mainFields: ['module', 'main'] for everyone

jrieken · jrieken · commit f1962fe5adba · 2018-09-13T11:48:06.000+02:00
diff --git a/extensions/css-language-features/extension.webpack.config.js b/extensions/css-language-features/extension.webpack.config.js
@@ -16,10 +16,6 @@ module.exports = withDefaults({
 	entry: {
 		extension: './src/cssMain.ts',
 	},
-	resolve: {
-		mainFields: ['module', 'main'],
-		extensions: ['.ts', '.js'] // support ts-files and js-files
-	},
 	output: {
 		filename: 'cssMain.js',
 		path: path.join(__dirname, 'client', 'dist'),
diff --git a/extensions/css-language-features/server/extension.webpack.config.js b/extensions/css-language-features/server/extension.webpack.config.js
@@ -16,10 +16,6 @@ module.exports = withDefaults({
 	entry: {
 		extension: './src/cssServerMain.ts',
 	},
-	resolve: {
-		mainFields: ['module', 'main'],
-		extensions: ['.ts', '.js'] // support ts-files and js-files
-	},
 	output: {
 		filename: 'cssServerMain.js',
 		path: path.join(__dirname, 'dist'),
diff --git a/extensions/extension-editing/extension.webpack.config.js b/extensions/extension-editing/extension.webpack.config.js
@@ -14,10 +14,6 @@ module.exports = withDefaults({
 	entry: {
 		extension: './src/extension.ts',
 	},
-	resolve: {
-		mainFields: ['module', 'main'],
-		extensions: ['.ts', '.js'] // support ts-files and js-files
-	},
 	externals: {
 		'../../../product.json': 'commonjs ../../../product.json',
 		'typescript': 'commonjs typescript'
diff --git a/extensions/html-language-features/extension.webpack.config.js b/extensions/html-language-features/extension.webpack.config.js
@@ -16,10 +16,6 @@ module.exports = withDefaults({
 	entry: {
 		extension: './src/htmlMain.ts',
 	},
-	resolve: {
-		mainFields: ['module', 'main'],
-		extensions: ['.ts', '.js'] // support ts-files and js-files
-	},
 	output: {
 		filename: 'htmlMain.js',
 		path: path.join(__dirname, 'client', 'dist'),
diff --git a/extensions/html-language-features/server/extension.webpack.config.js b/extensions/html-language-features/server/extension.webpack.config.js
@@ -16,10 +16,6 @@ module.exports = withDefaults({
 	entry: {
 		extension: './src/htmlServerMain.ts',
 	},
-	resolve: {
-		mainFields: ['module', 'main'],
-		extensions: ['.ts', '.js'] // support ts-files and js-files
-	},
 	output: {
 		filename: 'htmlServerMain.js',
 		path: path.join(__dirname, 'dist'),
diff --git a/extensions/json-language-features/extension.webpack.config.js b/extensions/json-language-features/extension.webpack.config.js
@@ -16,10 +16,6 @@ module.exports = withDefaults({
 	entry: {
 		extension: './src/jsonMain.ts',
 	},
-	resolve: {
-		mainFields: ['module', 'main'],
-		extensions: ['.ts', '.js'] // support ts-files and js-files
-	},
 	output: {
 		filename: 'jsonMain.js',
 		path: path.join(__dirname, 'client', 'dist'),
diff --git a/extensions/json-language-features/server/extension.webpack.config.js b/extensions/json-language-features/server/extension.webpack.config.js
@@ -16,10 +16,6 @@ module.exports = withDefaults({
 	entry: {
 		extension: './src/jsonServerMain.ts',
 	},
-	resolve: {
-		mainFields: ['module', 'main'],
-		extensions: ['.ts', '.js'] // support ts-files and js-files
-	},
 	output: {
 		filename: 'jsonServerMain.js',
 		path: path.join(__dirname, 'dist'),
diff --git a/extensions/npm/extension.webpack.config.js b/extensions/npm/extension.webpack.config.js
@@ -14,11 +14,7 @@ module.exports = withDefaults({
 	entry: {
 		extension: './src/main.ts',
 	},
-	resolve: {
-		mainFields: ['module', 'main'],
-		extensions: ['.ts', '.js'] // support ts-files and js-files
-	},
 	externals: {
 		'vscode-nls': 'commonjs vscode-nls',
 	},
-});
+});
diff --git a/extensions/shared.webpack.config.js b/extensions/shared.webpack.config.js
@@ -23,7 +23,7 @@ module.exports = function withDefaults(/**@type WebpackConfig*/extConfig) {
 			__dirname: false // leave the __dirname-behaviour intact
 		},
 		resolve: {
-			mainFields: ['main'], // prefer the main-entry of package.json files
+			mainFields: ['module', 'main'],
 			extensions: ['.ts', '.js'] // support ts-files and js-files
 		},
 		module: {
