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

Update amp-instagram embed regex #4053

Merged
merged 2 commits into from
Jan 10, 2020
Merged

Update amp-instagram embed regex #4053

merged 2 commits into from
Jan 10, 2020

Conversation

pierlon
Copy link
Contributor

@pierlon pierlon commented Jan 10, 2020

Summary

Fixes #4040.

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).

@googlebot googlebot added the cla: yes Signed the Google CLA label Jan 10, 2020
@westonruter westonruter added this to the v1.4.3 milestone Jan 10, 2020
westonruter
westonruter reviewed Jan 10, 2020
View reviewed changes
tests/php/test-amp-instagram-embed.php
@@ -95,6 +103,11 @@ public function get_raw_embed_dataset() {
'<amp-instagram data-shortcode="BhsgU3jh6xE" layout="responsive" width="600" height="600"></amp-instagram>' . "\n\n",
],

'blockquote_tv_embed' => [
wpautop( '<blockquote class="instagram-media" data-instgrm-permalink="https://www.instagram.com/tv/BhsgU3jh6xE/"><div style="padding: 8px;">Lorem ipsum</div></blockquote> <script async defer src="//www.instagram.com/embed.js"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
'<amp-instagram data-shortcode="BhsgU3jh6xE" layout="responsive" width="600" height="600"></amp-instagram>' . "\n\n",
Copy link
Member

Choose a reason for hiding this comment

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

Aside: It would be nice if the <blockquote> were retained as fallback content inside of the <amp-instagram> perhaps. But this is for another day.

@westonruter westonruter merged commit 9c3a6c7 into develop Jan 10, 2020
@westonruter westonruter deleted the fix/4040-instagram-embed branch January 10, 2020 01:56
westonruter pushed a commit that referenced this pull request Jan 10, 2020
@pierlon @westonruter
Update amp-instagram embed regex (#4053)
64d1c3c 
* Update amp-instagram embed regex

* Add test for raw embed
westonruter added a commit to xwp/amp-wp that referenced this pull request Jan 10, 2020
@westonruter
Merge branch 'develop' of github.com:ampproject/amp-wp into add/spa-a…
8caa8db 
…mp-shadow-dom-updated

* 'develop' of github.com:ampproject/amp-wp: (233 commits)
  Ignore Story editor tests (ampproject#4043)
  Update dependency eslint-plugin-jest to v23.4.0 (ampproject#4056)
  Update dependency xwp/wp-dev-lib to v1.4.0
  Update amp-video embed regex pattern to include other Vimeo URL formats (ampproject#4051)
  Update amp-instagram embed regex (ampproject#4053)
  Update dependency terser-webpack-plugin to v2.3.2 (ampproject#4047)
  Fix ability to update the status of a validation error
  Update wp-dev-lib package (ampproject#4029)
  Update dependency core-js to v3.6.2 (ampproject#4028)
  Update dependency @wordpress/element to v2.10.0 (ampproject#3986)
  Update dependency browserslist to v4.8.3 (ampproject#4021)
  Update dependency grunt-http to v2.3.3 (ampproject#4022)
  Update dependency postcss to v7.0.26 (ampproject#4017)
  Update dependency eslint-utils to v2 (ampproject#4012)
  Update dependency eslint-plugin-jest to v23.3.0 (ampproject#4016)
  Update dependency css-loader to v3.4.1 (ampproject#4023)
  Update dependency webpack to v4.41.5 (ampproject#4014)
  Update dependency core-js to v3.6.1 (ampproject#4011)
  Update dependency eslint to v6.8.0 (ampproject#4002)
  Swap PHP 5.4 for 5.6 to run external-http tests
  ...
westonruter added a commit that referenced this pull request Feb 13, 2020
@westonruter
Merge tag '1.4.3'
06162df 
* tag '1.4.3': (22 commits)
  Update readme and screenshots for Stories removal (#4259)
  Open story export instructions in a new window (#4258)
  Bump version to 1.4.3-RC1
  Hide Stories options and add deprecation notice (#4219)
  Fix malformed conversion of relative action URLs for forms (#4250)
  Limit Stories experience to WP 5.3 & Gutenberg 7.1.0 (#4217)
  Prevent errors in admin bar filters from non-array arguments (#4207)
  Update @wordpress/e2e-test-utils dependency
  Revert update of mustache/mustache dependency
  Update composer.lock
  Update WP CLI to 2.4.0
  For WordPress.tv embed, Use an oembed filter instead of block filter (#4164)
  Update readme to add FAQs section (#4159)
  Apply workaround to fix test__multiple_valid_image_files (#4034)
  Ignore Story editor tests (#4043)
  Update amp-video embed regex pattern to include other Vimeo URL formats (#4051)
  Update amp-instagram embed regex (#4053)
  Update wp-dev-lib package (#4029)
  Fix conversion of forms with relative action URLs (#4003)
  Improve release instructions (#3995)
  ...
delawski added a commit to xwp/amp-wp that referenced this pull request Jul 22, 2020
@delawski
Merge branch 'add/spa-amp-shadow-dom' into xwp/add/spa-amp-shadow-dom
22cff74 
* add/spa-amp-shadow-dom: (3410 commits)
  Improve copy in comment and error message
  Reuse constant
  Revert introduction of amp_document_output filter for now
  attachShadowDocAsStream expects a string type variable
  AppShell polyfill: Update to latest version - 2.4.1
  Add a filter to allow altering AMP output from themes
  Ensure .site-content-contain element exists
  Amp-Wp-App-Shell - Improve flexibility for different types of caching
  AppShell polyfill: Update to latest version - 2.4.0
  Fix eslint issues
  Fix build and unit tests by preserving uncompiled scripts
  Make use of new Amp\AmpWP\Document methods; add line breaks
  Restore missing live_list_offline_commenting to AMP_Service_Worker
  Fix phpcs linting issues
  Add missing changes to style sanitizer; remove duplicated autoloader entry
  Ignore Story editor tests (ampproject#4043)
  Update dependency eslint-plugin-jest to v23.4.0 (ampproject#4056)
  Update dependency xwp/wp-dev-lib to v1.4.0
  Update amp-video embed regex pattern to include other Vimeo URL formats (ampproject#4051)
  Update amp-instagram embed regex (ampproject#4053)
  ...

# Conflicts:
#	composer.json
delawski added a commit to xwp/amp-wp that referenced this pull request Jul 22, 2020
@delawski
Merge branch 'xwp/add/spa-amp-shadow-dom' into xwp/nova-app-shell
04eb817 
* xwp/add/spa-amp-shadow-dom: (250 commits)
  Improve copy in comment and error message
  Reuse constant
  Revert introduction of amp_document_output filter for now
  attachShadowDocAsStream expects a string type variable
  AppShell polyfill: Update to latest version - 2.4.1
  Add a filter to allow altering AMP output from themes
  Ensure .site-content-contain element exists
  Amp-Wp-App-Shell - Improve flexibility for different types of caching
  AppShell polyfill: Update to latest version - 2.4.0
  Fix eslint issues
  Fix build and unit tests by preserving uncompiled scripts
  Make use of new Amp\AmpWP\Document methods; add line breaks
  Restore missing live_list_offline_commenting to AMP_Service_Worker
  Fix phpcs linting issues
  Add missing changes to style sanitizer; remove duplicated autoloader entry
  Ignore Story editor tests (ampproject#4043)
  Update dependency eslint-plugin-jest to v23.4.0 (ampproject#4056)
  Update dependency xwp/wp-dev-lib to v1.4.0
  Update amp-video embed regex pattern to include other Vimeo URL formats (ampproject#4051)
  Update amp-instagram embed regex (ampproject#4053)
  ...

# Conflicts:
#	Gruntfile.js
#	assets/js/amp-wp-app-shell.js
#	includes/amp-helper-functions.php
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
v1.4.3
Development

Successfully merging this pull request may close these issues.

Instagram embed regex needs to be extended.
3 participants
@pierlon @westonruter @googlebot