From bd3ee8db58f94ad07112314adc90e511713ce17a Mon Sep 17 00:00:00 2001 From: Mike Hemesath Date: Thu, 5 Oct 2017 15:15:46 -0500 Subject: [PATCH] Moved postcss config to its own file. Updated webpack dependencies (#888) --- package.json | 4 +++- packages/terra-site/package.json | 26 +++++++++++++------------- packages/terra-site/postcss.config.js | 24 ++++++++++++++++++++++++ packages/terra-site/webpack.config.js | 22 ---------------------- postcss.config.js | 3 +++ 5 files changed, 43 insertions(+), 36 deletions(-) create mode 100644 packages/terra-site/postcss.config.js create mode 100644 postcss.config.js diff --git a/package.json b/package.json index af27f174624..365f1dc8c39 100644 --- a/package.json +++ b/package.json @@ -97,6 +97,8 @@ "stylelint": "~8.0.0", "stylelint-config-sass-guidelines": "^3.0.0", "stylelint-suitcss": "^1.0.0", - "terra-toolkit": "^2.0.0" + "terra-toolkit": "^2.1.0", + "webpack": "^3.6.0", + "webpack-dev-server": "^2.9.1" } } diff --git a/packages/terra-site/package.json b/packages/terra-site/package.json index adcffcbb6d8..3ce191ed31b 100644 --- a/packages/terra-site/package.json +++ b/packages/terra-site/package.json @@ -88,25 +88,25 @@ "devDependencies": { "autoprefixer": "^6.7.7", "babel-cli": "^6.24.1", - "babel-loader": "^7.0.0", + "babel-loader": "^7.1.2", "babel-polyfill": "^6.23.0", - "clean-webpack-plugin": "^0.1.16", - "css-loader": "^0.28.0", - "extract-text-webpack-plugin": "^2.1.0", - "file-loader": "^0.11.1", + "clean-webpack-plugin": "^0.1.17", + "css-loader": "^0.28.7", + "extract-text-webpack-plugin": "^3.0.1", + "file-loader": "^1.1.5", "gh-pages": "^0.12.0", - "html-webpack-plugin": "^2.28.0", - "json-loader": "^0.5.4", + "html-webpack-plugin": "^2.30.0", + "json-loader": "^0.5.7", "node-sass": "^4.5.2", "postcss-custom-properties": "^6.0.1", - "postcss-loader": "^1.3.3", - "postcss-rtl": "^0.5.10", + "postcss-loader": "^2.0.6", + "postcss-rtl": "^1.1.2", "raw-loader": "^0.5.1", "react": "^15.4.2", "react-dom": "^15.4.2", - "sass-loader": "^6.0.3", - "style-loader": "^0.16.1", - "webpack": "^2.6.1", - "webpack-dev-server": "^2.4.5" + "sass-loader": "^6.0.6", + "style-loader": "^0.19.0", + "webpack": "^3.6.0", + "webpack-dev-server": "^2.9.1" } } diff --git a/packages/terra-site/postcss.config.js b/packages/terra-site/postcss.config.js new file mode 100644 index 00000000000..2675de954c6 --- /dev/null +++ b/packages/terra-site/postcss.config.js @@ -0,0 +1,24 @@ +/* eslint-disable import/no-extraneous-dependencies */ +const Autoprefixer = require('autoprefixer'); +const CustomProperties = require('postcss-custom-properties'); +const rtl = require('postcss-rtl'); +const ThemingPlugin = require('./theming-plugin'); + +module.exports = { + plugins() { + return [ + Autoprefixer({ + browsers: [ + 'ie >= 10', + 'last 2 versions', + 'last 2 android versions', + 'last 2 and_chr versions', + 'iOS >= 10', + ], + }), + CustomProperties({ preserve: true, warnings: false }), + ThemingPlugin, + rtl(), + ]; + }, +}; diff --git a/packages/terra-site/webpack.config.js b/packages/terra-site/webpack.config.js index db79b860f1e..72190823554 100644 --- a/packages/terra-site/webpack.config.js +++ b/packages/terra-site/webpack.config.js @@ -4,14 +4,10 @@ const webpack = require('webpack'); const path = require('path'); -const Autoprefixer = require('autoprefixer'); const ExtractTextPlugin = require('extract-text-webpack-plugin'); const HtmlWebpackPlugin = require('html-webpack-plugin'); const I18nAggregatorPlugin = require('terra-i18n-plugin'); const i18nSupportedLocales = require('terra-i18n/lib/i18nSupportedLocales'); -const CustomProperties = require('postcss-custom-properties'); -const rtl = require('postcss-rtl'); -const ThemingPlugin = require('./theming-plugin'); module.exports = { entry: { @@ -41,24 +37,6 @@ module.exports = { }, }, { loader: 'postcss-loader', - options: { - plugins() { - return [ - Autoprefixer({ - browsers: [ - 'ie >= 10', - 'last 2 versions', - 'last 2 android versions', - 'last 2 and_chr versions', - 'iOS >= 8', - ], - }), - CustomProperties({ preserve: true, warnings: false }), - ThemingPlugin, - rtl(), - ]; - }, - }, }, { loader: 'sass-loader', diff --git a/postcss.config.js b/postcss.config.js new file mode 100644 index 00000000000..a9d25018d53 --- /dev/null +++ b/postcss.config.js @@ -0,0 +1,3 @@ +const config = require('./packages/terra-site/postcss.config'); + +module.exports = config;