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

Jump to bottom

Merge develop and resolve conflicts #5117

Merged
merged 3,064 commits into from
Jul 29, 2020
Merged

Merge develop and resolve conflicts #5117

merged 3,064 commits into from
Jul 29, 2020

Conversation

delawski
Copy link
Collaborator

@delawski delawski commented Jul 28, 2020 •
edited by westonruter
Loading

Summary

This PR merges the latest changes done in the develop branch (2.0.0-beta1) into add/spa-amp-shadow-dom branch (1.5.0-alpha) and resolves code conflicts that found along the way. Amends #1519.

For a clearer picture, it's useful to check a diff between the feature branch in xwp/amp-wp fork and the origin develop branch.

Fixes n/a

Checklist

  • My pull request is addressing an open issue (please create one otherwise).
  • My code is tested and passes existing tests.
  • My code follows the Engineering Guidelines (updates are often made to the guidelines, check it out periodically).

johnwatkins0 and others added 30 commits July 14, 2020 22:37
@johnwatkins0
Checkbox styles
72ba284
@westonruter
Fix styling of reviewed validation errors
47fa459
@westonruter
Improve mechanism for separating components by whitespace
9460c2b
@johnwatkins0
CSS improvements
0aa3356
@westonruter
Fix is_removed and is_reviewed types sent from PHP
e4b0cde
@westonruter
Avoid using Author if undefined
b7bc60d
@westonruter
Remove unused uses
d01b51b
@johnwatkins0
Remove old files
87d86fe
@johnwatkins0
Merge remote-tracking branch 'origin/feature/5014-react-plugin-suppre…
8313ea4 
…ssion' into feature/5015-react-post-template-settings
@westonruter
Merge pull request ampproject#5040 from ampproject/feature/5014-react…
38d14b0 
…-plugin-suppression

Plugin settings: Handle plugin suppression section with REST/React components
@schlessera
Merge branch 'develop' into add/4970-server-timing
673a4ec
@johnwatkins0
Merge remote-tracking branch 'origin/develop' into feature/5015-react…
c795b85 
…-post-template-settings
@johnwatkins0
Fix failing phpunit test
c125be1
@schlessera
Adapt output to reduce header size
b001572
@schlessera
Adapt test for change in comma spacing
4f86948
@johnwatkins0
Remove obsolete assertions
9e129f9
@johnwatkins0
Add styles for button saving state
7621754
@johnwatkins0
Add a few phptest and remove obsolete e2e tests
ed3c50a
@johnwatkins0
Lint fix in test file
661822f
@johnwatkins0
Settings: set margin-bottom on headings to 0
edd3c11
@johnwatkins0
Remove bottom margin from toggle
2e6ddfe
@johnwatkins0
Reduce spacing between template mode selections
d3b73f0
@johnwatkins0
Updates for WP 5.0
871bd10
@johnwatkins0
Set max-width on setting spage content area
72e48e1
@johnwatkins0
Settings page sizing and spacing adjustments
b3b9a74
@johnwatkins0
Add visit customizer link
f647d36
@johnwatkins0
Fix supported templates visibility in reader mode and hide toggle for…
f27fec7 
… legacy
@johnwatkins0
Merge branch 'feature/5015-react-post-template-settings' into feature…
9a7aeb8 
…/5018-settings-screen-ui
@johnwatkins0
Make input borders consistent
3fba71a
@westonruter
Ensure that templatesToSwitch includes all recursive descendant suppo…
c4ea388 
…rtable templates
pierlon and others added 22 commits July 24, 2020 04:08
@pierlon
Modify the block attributes during its deprecation
6687931
@renovate-bot
Update dependency webpack to v4.44.0
795c1bc
@westonruter
Introduce ObsoleteBlockAttributeRemover service
b2901f0 
Partially reverts 6687931
@westonruter
Improve logic for obtaining obsolete attribute pattern
e3c7afb
@westonruter
Improve phpdoc for ObsoleteBlockAttributeRemover
48eb9d1
@westonruter
Harden pattern to match block comment and start tag
1fa5923
@pierlon
Revert block deprecation logic
9745353
@westonruter
Skip adding data attributes for gallery shortcodes
6eb20db
@westonruter
Add tests for ObsoleteBlockAttributeRemover
88d5ae9
@westonruter
Fix test failure in WP 4.9
9d7260f
@westonruter
Merge pull request ampproject#4775 from ampproject/fix/gallery-carous…
ca8078d 
…el-defaults

Rework how and whether galleries are rendered as carousels
@pierlon
Fix TikTok test
7525fa0
@westonruter
Merge pull request ampproject#5094 from ampproject/fix/tiktok-test
7d4f21b 
Fix TikTok test
@westonruter
Merge pull request ampproject#5091 from renovate-bot/renovate/webpack…
6e396d7 
…-4.x

Update dependency webpack to v4.44.0
@renovate-bot
Update dependency eslint-plugin-jest to v23.18.1
2bd3e77
@westonruter
Merge pull request ampproject#5096 from renovate-bot/renovate/eslint-…
5a0d540 
…plugin-jest-23.x

Update dependency eslint-plugin-jest to v23.18.1
@renovate-bot
Update dependency eslint-plugin-jest to v23.18.2
d55de1a
@westonruter
Merge pull request ampproject#5103 from renovate-bot/renovate/eslint-…
33592df 
…plugin-jest-23.x

Update dependency eslint-plugin-jest to v23.18.2
@delawski
Merge branch 'develop' into add/spa-amp-shadow-dom
7559130 
* develop: (2551 commits)
  Update dependency eslint-plugin-jest to v23.18.2
  Update dependency eslint-plugin-jest to v23.18.1
  Fix TikTok test
  Fix test failure in WP 4.9
  Add tests for ObsoleteBlockAttributeRemover
  Skip adding data attributes for gallery shortcodes
  Revert block deprecation logic
  Harden pattern to match block comment and start tag
  Improve phpdoc for ObsoleteBlockAttributeRemover
  Improve logic for obtaining obsolete attribute pattern
  Introduce ObsoleteBlockAttributeRemover service
  Update dependency webpack to v4.44.0
  Modify the block attributes during its deprecation
  Use DOMElement as return type for HasCaption::get_caption_element()
  Prevent removal of data attributes in sanitize_raw_embeds and fix boolean checks
  Ensure data-amp-carousel=true attribute is present for proper styling of gallery block
  Supply missing attribute value for gallery shortcode output
  Ensure comments_popup_link() is also filtered to prevent mobile redirection
  Test AMP_Theme_Support::amend_comments_link
  Remove unused imports
  ...

# Conflicts:
#	amp.php
#	includes/amp-helper-functions.php
#	includes/class-amp-theme-support.php
#	includes/sanitizers/class-amp-style-sanitizer.php
#	includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php
@delawski
Fix indentation
fd23c00
@delawski
Use proper method name
25045a7
@delawski
Fix lint issues
7b9077d
@google-cla
Copy link

google-cla bot commented Jul 28, 2020

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

@google-cla google-cla bot added the cla: no Has not signed the Google CLA label Jul 28, 2020
@delawski
Copy link
Collaborator Author

@googlebot I consent.

@google-cla
Copy link

google-cla bot commented Jul 28, 2020

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

@westonruter westonruter added cla: yes Signed the Google CLA and removed cla: no Has not signed the Google CLA labels Jul 29, 2020
westonruter
westonruter approved these changes Jul 29, 2020
View reviewed changes
Copy link
Member

@westonruter westonruter left a comment

Choose a reason for hiding this comment

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

I'm just going to assume this works. 😅

@westonruter westonruter merged commit 77fca7d into ampproject:add/spa-amp-shadow-dom Jul 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@westonruter westonruter westonruter approved these changes

Assignees
No one assigned
Labels
cla: yes Signed the Google CLA
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@delawski @westonruter @johnwatkins0 @schlessera @pierlon @renovate-bot