mirror of
https://github.com/Microsoft/vscode
synced 2024-10-02 17:32:41 +00:00
polish webpack configs
This commit is contained in:
parent
7ded90e452
commit
cde5781978
|
@ -9,7 +9,6 @@
|
|||
|
||||
const withDefaults = require('../shared.webpack.config');
|
||||
const path = require('path');
|
||||
const webpack = require('webpack');
|
||||
|
||||
const config = withDefaults({
|
||||
context: path.join(__dirname, 'client'),
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
|
||||
const withDefaults = require('../../shared.webpack.config');
|
||||
const path = require('path');
|
||||
const webpack = require('webpack');
|
||||
|
||||
const config = withDefaults({
|
||||
context: path.join(__dirname),
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
|
||||
'use strict';
|
||||
|
||||
const path = require('path');
|
||||
const withDefaults = require('../shared.webpack.config');
|
||||
|
||||
module.exports = withDefaults({
|
||||
|
|
|
@ -7,8 +7,6 @@
|
|||
|
||||
'use strict';
|
||||
|
||||
const path = require('path');
|
||||
|
||||
const withDefaults = require('../shared.webpack.config');
|
||||
|
||||
module.exports = withDefaults({
|
||||
|
|
|
@ -64,13 +64,13 @@ function withNodeDefaults(/**@type WebpackConfig*/extConfig) {
|
|||
},
|
||||
// yes, really source maps
|
||||
devtool: 'source-map',
|
||||
plugins: getDefaultNodePlugins(extConfig.context),
|
||||
plugins: nodePlugins(extConfig.context),
|
||||
};
|
||||
|
||||
return merge(defaultConfig, extConfig);
|
||||
}
|
||||
|
||||
function getDefaultNodePlugins(context) {
|
||||
function nodePlugins(context) {
|
||||
// Need to find the top-most `package.json` file
|
||||
const folderName = path.relative(__dirname, context).split(/[\\\/]/)[0];
|
||||
const pkgPath = path.join(__dirname, folderName, 'package.json');
|
||||
|
@ -136,31 +136,30 @@ function withBrowserDefaults(/**@type WebpackConfig*/extConfig) {
|
|||
},
|
||||
// yes, really source maps
|
||||
devtool: 'source-map',
|
||||
plugins: getDefaultBrowserPlugins()
|
||||
plugins: browserPlugins
|
||||
};
|
||||
|
||||
return merge(defaultConfig, extConfig);
|
||||
}
|
||||
|
||||
function getDefaultBrowserPlugins() {
|
||||
return [
|
||||
new CopyWebpackPlugin({
|
||||
patterns: [
|
||||
{ from: 'src', to: '.', globOptions: { ignore: ['**/test/**', '**/*.ts'] }, noErrorOnMissing: true }
|
||||
]
|
||||
}),
|
||||
new DefinePlugin({
|
||||
'process.env': JSON.stringify({}),
|
||||
'process.env.BROWSER_ENV': JSON.stringify('true')
|
||||
})
|
||||
];
|
||||
}
|
||||
const browserPlugins = [
|
||||
new CopyWebpackPlugin({
|
||||
patterns: [
|
||||
{ from: 'src', to: '.', globOptions: { ignore: ['**/test/**', '**/*.ts'] }, noErrorOnMissing: true }
|
||||
]
|
||||
}),
|
||||
new DefinePlugin({
|
||||
'process.env': JSON.stringify({}),
|
||||
'process.env.BROWSER_ENV': JSON.stringify('true')
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
|
||||
|
||||
module.exports = withNodeDefaults;
|
||||
module.exports.node = withNodeDefaults;
|
||||
module.exports.browser = withBrowserDefaults;
|
||||
module.exports.getNodePlugins = getDefaultNodePlugins;
|
||||
module.exports.getBrowserPlugins = getDefaultBrowserPlugins;
|
||||
module.exports.nodePlugins = nodePlugins;
|
||||
module.exports.browserPlugins = browserPlugins;
|
||||
|
||||
|
|
|
@ -9,9 +9,9 @@
|
|||
const CopyPlugin = require('copy-webpack-plugin');
|
||||
const Terser = require('terser');
|
||||
|
||||
const defaultConnfig = require('../shared.webpack.config');
|
||||
const withBrowserDefaults = defaultConnfig.browser;
|
||||
const getBrowserPlugins = defaultConnfig.getBrowserPlugins;
|
||||
const defaultConfig = require('../shared.webpack.config');
|
||||
const withBrowserDefaults = defaultConfig.browser;
|
||||
const browserPlugins = defaultConfig.browserPlugins;
|
||||
|
||||
const languages = [
|
||||
'zh-tw',
|
||||
|
@ -34,13 +34,8 @@ module.exports = withBrowserDefaults({
|
|||
entry: {
|
||||
extension: './src/extension.browser.ts',
|
||||
},
|
||||
resolve: {
|
||||
fallback: {
|
||||
os: false
|
||||
}
|
||||
},
|
||||
plugins: [
|
||||
...getBrowserPlugins(), // add plugins, don't replace inherited
|
||||
...browserPlugins, // add plugins, don't replace inherited
|
||||
|
||||
// @ts-ignore
|
||||
new CopyPlugin({
|
||||
|
|
Loading…
Reference in a new issue