Skip to content

Commit

Permalink
Revert "Moved postcss config to its own file. Updated webpack depende…
Browse files Browse the repository at this point in the history
…ncies (#888)"

This reverts commit bd3ee8d.
  • Loading branch information
Jaime Mackey committed Oct 6, 2017
1 parent aaafda9 commit f2faab9
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 43 deletions.
4 changes: 1 addition & 3 deletions package.json
Expand Up @@ -97,8 +97,6 @@
"stylelint": "~8.0.0",
"stylelint-config-sass-guidelines": "^3.0.0",
"stylelint-suitcss": "^1.0.0",
"terra-toolkit": "^2.1.0",
"webpack": "^3.6.0",
"webpack-dev-server": "^2.9.1"
"terra-toolkit": "^2.0.0"
}
}
26 changes: 13 additions & 13 deletions packages/terra-site/package.json
Expand Up @@ -88,25 +88,25 @@
"devDependencies": {
"autoprefixer": "^6.7.7",
"babel-cli": "^6.24.1",
"babel-loader": "^7.1.2",
"babel-loader": "^7.0.0",
"babel-polyfill": "^6.23.0",
"clean-webpack-plugin": "^0.1.17",
"css-loader": "^0.28.7",
"extract-text-webpack-plugin": "^3.0.1",
"file-loader": "^1.1.5",
"clean-webpack-plugin": "^0.1.16",
"css-loader": "^0.28.0",
"extract-text-webpack-plugin": "^2.1.0",
"file-loader": "^0.11.1",
"gh-pages": "^0.12.0",
"html-webpack-plugin": "^2.30.0",
"json-loader": "^0.5.7",
"html-webpack-plugin": "^2.28.0",
"json-loader": "^0.5.4",
"node-sass": "^4.5.2",
"postcss-custom-properties": "^6.0.1",
"postcss-loader": "^2.0.6",
"postcss-rtl": "^1.1.2",
"postcss-loader": "^1.3.3",
"postcss-rtl": "^0.5.10",
"raw-loader": "^0.5.1",
"react": "^15.4.2",
"react-dom": "^15.4.2",
"sass-loader": "^6.0.6",
"style-loader": "^0.19.0",
"webpack": "^3.6.0",
"webpack-dev-server": "^2.9.1"
"sass-loader": "^6.0.3",
"style-loader": "^0.16.1",
"webpack": "^2.6.1",
"webpack-dev-server": "^2.4.5"
}
}
24 changes: 0 additions & 24 deletions packages/terra-site/postcss.config.js

This file was deleted.

22 changes: 22 additions & 0 deletions packages/terra-site/webpack.config.js
Expand Up @@ -4,10 +4,14 @@
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: {
Expand Down Expand Up @@ -37,6 +41,24 @@ 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',
Expand Down
3 changes: 0 additions & 3 deletions postcss.config.js

This file was deleted.

0 comments on commit f2faab9

Please sign in to comment.