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.

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

Update WordPress packages #4408

Merged
merged 12 commits into from
May 2, 2020
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"root": true,
"extends": [
"plugin:@wordpress/eslint-plugin/recommended",
"plugin:@wordpress/eslint-plugin/recommended-with-formatting",
"plugin:import/recommended",
"plugin:eslint-comments/recommended"
],
Expand Down
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ module.exports = function( grunt ) {
'composer remove cweagans/composer-patches --update-no-dev -o',
'rm -r ' + productionVendorExcludedFilePatterns.join( ' ' ),
'if [ -d vendor/ampproject/common/vendor ]; then rm -r vendor/ampproject/common/vendor; fi',
'if [ -d vendor/ampproject/optimizer/vendor ]; then rm -r vendor/ampproject/optimizer/vendor; fi'
'if [ -d vendor/ampproject/optimizer/vendor ]; then rm -r vendor/ampproject/optimizer/vendor; fi',
].join( ' && ' ),
},
create_build_zip: {
Expand Down
6 changes: 3 additions & 3 deletions assets/src/admin/paired-browsing/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -311,9 +311,9 @@ class PairedBrowsingApp {
this.removeAmpQueryVars( this.removeUrlHash( win.location.href ) )
)
) {
const url = oppositeWindow === this.ampIframe.contentWindow ?
this.addAmpQueryVar( win.location.href ) :
this.removeAmpQueryVars( win.location.href );
const url = oppositeWindow === this.ampIframe.contentWindow
? this.addAmpQueryVar( win.location.href )
: this.removeAmpQueryVars( win.location.href );

oppositeWindow.location.replace( url );

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const ValidationErrorMessage = ( { title, message, code } ) => {
}

if ( title ) {
return <span dangerouslySetInnerHTML={ { __html: title } } />
return <span dangerouslySetInnerHTML={ { __html: title } } />;
}

return (
Expand Down