framework/bedrock
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for preset specific Webpack config (#2083)

Browse Source
This commit is contained in:
Nathan Knowler
2018-07-17 11:58:16 -06:00
committed by QWp6t
parent fd2a94fa1b
commit 61f923413a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
resources/assets/build/webpack.config.js
View File

@@ -8,6 +8,7 @@ const StyleLintPlugin = require('stylelint-webpack-plugin');
const CopyGlobsPlugin = require('copy-globs-webpack-plugin');
const FriendlyErrorsWebpackPlugin = require('friendly-errors-webpack-plugin');
const desire = require('./util/desire');
const config = require('./config');
const assetsFilenames = (config.enabled.cacheBusting) ? config.cacheBusting : '[name]';
@@ -213,4 +214,4 @@ if (config.enabled.watcher) {
webpackConfig = merge(webpackConfig, require('./webpack.config.watch'));
}
module.exports = webpackConfig;
module.exports = merge(webpackConfig, desire(`${__dirname}/webpack.config.preset`));