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

Cherry Pick PR's for WordPress 5.4 RC 1 #20593

Merged
merged 27 commits into from
Mar 2, 2020
Merged

Conversation

jorgefilipecosta
Copy link
Member

@jorgefilipecosta jorgefilipecosta commented Mar 2, 2020

Description

This PR cherry picks the following PR's into wp/trunk:

PR titleAuthor
wp-env: no longer show error message twice@noahtallen
wp-env: Add custom port numbers to .wp-env.json@noahtallen
wp-env: Fix issue where docker & wp had different URLs@noahtallen
wp-env: override generated file directory with environment variable@noahtallen
Env: Add debug mode.@epiqueras
Env: Add support for local override files.@epiqueras
Env: Check for legacy installs and provide the option to delete them.@epiqueras
Env: Support wp-config.php overrides.@epiqueras
@wordpress/env: Fix testsPath on local sources@noisysocks
@wordpress/env: Use user with UID=33 to run WP CLI commands@noisysocks
Remove !important override from Buttons block@marekhrabe
Env: Add support for ZIP URL sources.@epiqueras
Block Library: Social Link: Fix label attribute type as string@aduth
Block Library: Social Link: Escape generated class name@aduth
Block Library: Social Link: Use placeholder for default label@aduth
Block Editor: Typewriter: Skip entire component for IE@aduth
@wordpress/env: Set owner of wp-content to www-data@noisysocks
Block Editor: Fix `LinkControl` text wrapping.@epiqueras
Editor: Shim meta attributes for early block registrations@aduth
Add missing accessibility attributes in the svg icons@donmhico
@wordpress/env: Fix accidental quotes in Site Title@noisysocks
Revert/top toolbar tab order@ellatrix
Block Editor: Add closing parenthesis on selector@aduth
Rich Text: Avoid activeElement focus call@aduth
Block Library: Columns: Force 50% column width at mid-range viewport@aduth
[LatestPosts] Fixes the excerpt length@draganescu
Framework: Travis: Avoid skipping Puppeteer download@aduth

These PR's will be part of WordPress 5.4 RC 1.

How has this been tested?

I did some smoke tests and verified the branch, in fact, contained the expected fixes.

noahtallen and others added 23 commits March 2, 2020 17:42
* Handle errors more robustly

- Separate cases for errors we know about
- More straightforward general error case

* Update tests to handle the new error format
Allows the user to set `port` and `testsPort` in .wp-env.json.

- Port must be a number
- Ports must be different
- Ports can still be overridden with the environment variables
- Fixed: docker and WP had different URLs
   Caused by WordPress install not using the
   .wp-env.json custom port values, so it
   would redirect you to the default port.

- Added: validation function for numeric env vars
- Added: tests to validate port override behavior
- Uses a non-hidden default directory for Linux (~/wp-env)
- Allows a user to override the directory in which wp-env
  creates generated files with the WP_ENV_HOME environment
  variable.

Work towards #20180, but will need to continue in a follow-up.
* Env: Add debug flag.

* Env: Log Docker commands in debug mode.

* Env: Log Git commands in debug mode.

* Env: Log config and Docker Compose file in debug mode and log using the spinner.
* Env: Add support for local override files.

* Document
…#20340)

* Env: Check for legacy installs and provide the option to delete them.

* Fix tests.
* Env: Support wp-config.php overrides.

* Env: Move WORDPRESS_DEBUG to work through the new config.

* Fix bugs.

* Handle string values.
* @wordpress/env: Fix testsPath on local sources

When using a local source (e.g. ~/path/to/wordpress), the tests
WordPress directory should be at ~/.wp-env/$hash/tests-wordpress instead
of ~/path/to/tests-wordpress.

* @wordpress/env: Show debug output from docker-compose stop in wp-env start
The www-data user in wordpress:cli has a different UID (82) to the
www-data user in wordpress (33). Ensure we use the wordpress www-data
user for CLI commands.

See docker-library/wordpress#256 for more
discussion.
Makes the WordPress content directories (wp-content, wp-content/plugins,
wp-content/themes) owned by the www-data user. This ensures that WordPress
can write to these directories.

This is necessary when running wp-env with `"core": null` because Docker
will automatically create these directories as the root user when binding
volumes during `docker-compose up`, and `docker-compose up` doesn't support
the `-u` option.

See docker-library/wordpress#436.
* Editor: Shim meta attributes for early block registrations

* E2E Tests: Add meta block early registration test

* Editor: Clarify comment regarding meta attribute shim
* Revert "Fix e2e tests"

This reverts commit b7fc515.

* Revert "Top toolbar: adjust tab order"

This reverts commit a6bfb67.
Co-Authored-By: Christian Wood <cwood821@users.noreply.github.com>

Co-authored-by: Christian Wood <christian@christianwood.net>
@aduth
Copy link
Member

aduth commented Mar 2, 2020

From the build failure, it appears it may be affected by the same issue intended to be fixed by #20547, since the wp/trunk branch doesn't include that fix and thus would be susceptible to the problem described there.

It may be necessary to cherry-pick the commit of that pull request as well, in order for the build to pass.

draganescu and others added 4 commits March 2, 2020 21:59
* adds a filter that sets the excerpt length to what was set in the editor

* adds named function as excerpt filter and removes after use

* adds PHP doc to the new filter callback and global variable

* default to using an anonymous function since it appears that it can be remove and is not affecting theme set length

* revert to named function for excerpt length filter

* proper function names for Guternberg namespace

* lower default priority for the latest posts excerpt length filter
* Rich Text: Avoid activeElement focus call

* Rich Text: Restore focus, accounting for null activeElement

* Rich Text: Verify activeElement instanceof HTMLElement
Copy link
Member

@aduth aduth left a comment

Choose a reason for hiding this comment

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

I can only confidently speak to changes of my own involvement, but in looking through the changes and a smoke-test of the editor and especially changes I was involved with, this looks in good shape to me 👍

@jorgefilipecosta
Copy link
Member Author

Thank you for the review @aduth!

@jorgefilipecosta jorgefilipecosta merged commit 59c3919 into wp/trunk Mar 2, 2020
@jorgefilipecosta jorgefilipecosta deleted the wp/trunk-5-4-0-rc-1 branch March 2, 2020 22:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants