Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build: upgrade mini-css-extract-plugin-with-rtl to npm-published a8c fork #38001

Merged
merged 1 commit into from
Jan 17, 2020
Merged

Build: upgrade mini-css-extract-plugin-with-rtl to npm-published a8c fork #38001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
157 changes: 83 additions & 74 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions packages/calypso-build/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# next

- Upgrade [mini-css-extract-plugin-with-rtl](https://github.com/Automattic/mini-css-extract-plugin-with-rtl) to 0.8.0, use an npm-published version instead of GitHub branch reference

# 6.0.0

- Breaking Change: Replace `copy-styles` with a generic `copy-assets` script to handle both styles and images.
Expand Down
3 changes: 1 addition & 2 deletions packages/calypso-build/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"extends @wordpress/browserslist-config"
],
"dependencies": {
"@automattic/mini-css-extract-plugin-with-rtl": "0.8.0",
"@babel/cli": "7.7.5",
"@babel/core": "7.7.5",
"@babel/plugin-proposal-class-properties": "7.7.4",
Expand Down Expand Up @@ -62,7 +63,6 @@
"jest-config": "24.9.0",
"jest-emotion": "^10.0.27",
"jest-enzyme": "7.1.2",
"mini-css-extract-plugin-with-rtl": "github:Automattic/mini-css-extract-plugin-with-rtl#v0.7.0-with-rtl",
"node-sass": "4.13.0",
"postcss-custom-properties": "9.0.2",
"postcss-loader": "3.0.0",
Expand All @@ -73,7 +73,6 @@
"typescript": "3.7.3",
"webpack": "4.41.3",
"webpack-cli": "3.3.10",
"webpack-filter-warnings-plugin": "1.2.1",
"webpack-rtl-plugin": "2.0.0"
},
"peerDependencies": {
Expand Down
9 changes: 2 additions & 7 deletions packages/calypso-build/webpack/sass.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
/**
* External dependencies
*/
const FilterWarningsPlugin = require( 'webpack-filter-warnings-plugin' );
const MiniCssExtractPluginWithRTL = require( 'mini-css-extract-plugin-with-rtl' );
const MiniCssExtractPluginWithRTL = require( '@automattic/mini-css-extract-plugin-with-rtl' );
const WebpackRTLPlugin = require( 'webpack-rtl-plugin' );

/**
Expand Down Expand Up @@ -57,13 +56,9 @@ module.exports.plugins = ( { chunkFilename, filename, minify } ) => [
new MiniCssExtractPluginWithRTL( {
chunkFilename,
filename,
ignoreOrder: true, // suppress conflicting order warnings from mini-css-extract-plugin
rtlEnabled: true,
} ),
new FilterWarningsPlugin( {
// suppress conflicting order warnings from mini-css-extract-plugin.
// see https://github.com/webpack-contrib/mini-css-extract-plugin/issues/250
exclude: /mini-css-extract-plugin[^]*Conflicting order between:/,
} ),
new WebpackRTLPlugin( {
minify,
} ),
Expand Down