Skip to content
This repository has been archived by the owner on May 24, 2024. It is now read-only.

Moved postcss config to its own file. Updated webpack dependencies #888

Merged
merged 7 commits into from
Oct 5, 2017
Merged

Moved postcss config to its own file. Updated webpack dependencies #888

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c700c57
Moved postcss config to its own file. Updated webpack dependencies
Oct 5, 2017
746ef97
Bump autoprefixer iOS to 10
Oct 5, 2017
29c4901
Fix lint issue
Oct 5, 2017
cbfb740
Merge branch 'master' into postcss-refactor
bjankord Oct 5, 2017
3124929
Merge branch 'master' into postcss-refactor
bjankord Oct 5, 2017
08e389c
update to latest terra-toolkit
Oct 5, 2017
3c016e0
Merge branch 'postcss-refactor' of https://github.com/cerner/terra-co…
Oct 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 13 additions & 13 deletions packages/terra-site/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Copy link
Contributor

@emilyrohrbough emilyrohrbough Oct 5, 2017 •
edited by bjankord

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if we will be able to bump webpack versions until terra-toolkit's webpack version is bumped. When I made changes in toolkit for nightwatch, I ran across webpack chunk issues in consumer when trying to run nightwatch tests.

Do the nightwatch tests run without error?

Copy link
Contributor

@bjankord bjankord Oct 5, 2017 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll see after travisCI runs. I'd say +1 on this provided travisCI passes.

Copy link
Contributor

@bjankord bjankord Oct 5, 2017 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It appears there are nightwatch tests failures after updating webpack. We'll want to get this resolved, feel free to reach out to @emilyrohrbough and @ryanthemanuel as they are the most familiar with the nightwatch / webpack / toolkit setup.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR should address those failures https://github.com/cerner/terra-toolkit/pull/14/files

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gonna clear out travis CI's node_modules cache and rerun the build. This should pick up the toolkit v2.1.0 release

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, i explicitly updated to it

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might need to update the version in terra-site as well: https://github.com/cerner/terra-core/blob/master/packages/terra-site/package.json#L109-L110

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i don't think it actually uses that version

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok once tests pass, lets get this merged down.

"webpack-dev-server": "^2.9.1"
}
}
23 changes: 23 additions & 0 deletions packages/terra-site/postcss.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
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(),
];
},
};
22 changes: 0 additions & 22 deletions packages/terra-site/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down Expand Up @@ -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',
Expand Down
3 changes: 3 additions & 0 deletions postcss.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
const config = require('./packages/terra-site/postcss.config');

module.exports = config;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this file doesn't do anything right now, but it will be used by storybook once its added and will ensure storybook uses the same postcss config as terra-site.