From f21f01bb0500f0dbec3c415f12e1c23d243d9d2e Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Wed, 6 May 2020 17:02:56 +0300 Subject: [PATCH] Use root build config --- babel.config.json | 3 --- postcss.config.js | 3 ++- webpack.dev.js | 18 ++++++++++++++++-- webpack.prod.js | 18 ++++++++++++++++-- 4 files changed, 34 insertions(+), 8 deletions(-) delete mode 100644 babel.config.json diff --git a/babel.config.json b/babel.config.json deleted file mode 100644 index 1320b9a32..000000000 --- a/babel.config.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "presets": ["@babel/preset-env"] -} diff --git a/postcss.config.js b/postcss.config.js index 9ce2e16af..0e19ca6e1 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -1,10 +1,11 @@ +const packageConfig = require('./package.json'); const postcssPresetEnv = require('postcss-preset-env'); const autoprefixer = require('autoprefixer'); const cssnano = require('cssnano'); const config = () => ({ plugins: [ - postcssPresetEnv(), + postcssPresetEnv({browsers: packageConfig.browserslist}), autoprefixer(), cssnano() ] diff --git a/webpack.dev.js b/webpack.dev.js index 4545cc7c3..c28e4f6b1 100644 --- a/webpack.dev.js +++ b/webpack.dev.js @@ -1,6 +1,8 @@ const path = require('path'); const common = require('./webpack.common'); const merge = require('webpack-merge'); +const packageConfig = require('./package.json'); +const postcssConfig = require('./postcss.config.js'); module.exports = merge(common, { mode: 'development', @@ -15,11 +17,23 @@ module.exports = merge(common, { { test: /\.js$/, exclude: /node_modules[\\/](?!query-string|split-on-first|strict-uri-encode)/, - loader: 'babel-loader' + use: { + loader: 'babel-loader', + options: { + presets: packageConfig.babel.presets + } + } }, { test: /\.css$/i, - use: ['style-loader', 'css-loader', 'postcss-loader'] + use: [ + 'style-loader', + 'css-loader', + { + loader: 'postcss-loader', + options: postcssConfig() + } + ] }, { test: /\.(png|jpg|gif)$/i, diff --git a/webpack.prod.js b/webpack.prod.js index 582d24be5..c21394688 100644 --- a/webpack.prod.js +++ b/webpack.prod.js @@ -1,5 +1,7 @@ const common = require('./webpack.common'); const merge = require('webpack-merge'); +const packageConfig = require('./package.json'); +const postcssConfig = require('./postcss.config.js'); module.exports = merge(common, { mode: 'production', @@ -8,11 +10,23 @@ module.exports = merge(common, { { test: /\.js$/, exclude: /node_modules[\\/](?!query-string|split-on-first|strict-uri-encode)/, - loader: 'babel-loader' + use: { + loader: 'babel-loader', + options: { + presets: packageConfig.babel.presets + } + } }, { test: /\.css$/i, - use: ['style-loader', 'css-loader', 'postcss-loader'] + use: [ + 'style-loader', + 'css-loader', + { + loader: 'postcss-loader', + options: postcssConfig() + } + ] }, { test: /\.(png|jpg|gif)$/i,