sanitizes config before build
This commit is contained in:
@@ -4,12 +4,14 @@
|
||||
const webpack = require('webpack');
|
||||
const getWebpackProdConfig = require('../webpack/getWebpackProdConfig');
|
||||
const findConfig = require('../utilities/findConfig');
|
||||
const sanitizeConfig = require('../utilities/sanitizeConfig');
|
||||
|
||||
module.exports = () => {
|
||||
const configPath = findConfig();
|
||||
|
||||
try {
|
||||
const config = require(configPath);
|
||||
const unsanitizedConfig = require(configPath);
|
||||
const config = sanitizeConfig(unsanitizedConfig);
|
||||
|
||||
const webpackProdConfig = getWebpackProdConfig({
|
||||
...config,
|
||||
|
||||
@@ -24,7 +24,7 @@ function recursivelyAddFieldComponents(fields) {
|
||||
};
|
||||
}
|
||||
|
||||
if (field.components || field.fields) {
|
||||
if (field.admin.components || field.fields) {
|
||||
const fieldComponents = {
|
||||
...(field.admin.components || {}),
|
||||
};
|
||||
|
||||
@@ -38,6 +38,7 @@ const sanitizeConfig = (config) => {
|
||||
|
||||
sanitizedConfig.components = { ...(config.components || {}) };
|
||||
sanitizedConfig.hooks = { ...(config.hooks || {}) };
|
||||
sanitizedConfig.admin = { ...(config.admin || {}) };
|
||||
|
||||
return sanitizedConfig;
|
||||
};
|
||||
|
||||
@@ -2,6 +2,7 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
|
||||
const Dotenv = require('dotenv-webpack');
|
||||
// const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
|
||||
const webpack = require('webpack');
|
||||
const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
|
||||
const path = require('path');
|
||||
const getStyleLoaders = require('./getStyleLoaders');
|
||||
|
||||
@@ -15,6 +16,9 @@ module.exports = (config) => {
|
||||
publicPath: `${config.routes.admin}/`,
|
||||
filename: '[name].[chunkhash].js',
|
||||
},
|
||||
optimization: {
|
||||
minimizer: [new UglifyJsPlugin()],
|
||||
},
|
||||
mode: 'production',
|
||||
resolveLoader: { modules: ['node_modules', path.join(__dirname, '../../node_modules')] },
|
||||
module: {
|
||||
@@ -124,7 +128,6 @@ module.exports = (config) => {
|
||||
new Dotenv({
|
||||
silent: true,
|
||||
}),
|
||||
new webpack.optimize.UglifyJSPlugin(),
|
||||
];
|
||||
|
||||
if (config.webpackIgnorePlugin instanceof RegExp) {
|
||||
|
||||
Reference in New Issue
Block a user