MU WPCOM: Add more defensive checks when loading the Coming Soon feature #41273

taipeicoder · 2025-01-23T04:20:24Z

Proposed changes:

This PR adds more checks in the ETK version comparison to ensure that the plugin file exists before calling the function get_plugin_data().

Other information:

Have you written new tests for your changes, if applicable?
Have you checked the E2E test CI results, and verified that your changes do not break them?
Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

Does this pull request change what data or activity we track or use?

Testing instructions:

Smoke-test the Coming Soon functionality.

github-actions · 2025-01-23T04:21:10Z

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

To test on WoA, go to the Plugins menu on a WordPress.com Simple site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin, and enable the update/jetpack-mu-wpcom-load-coming-soon-remove-etk-version-check branch.
- For jetpack-mu-wpcom changes, also add define( 'JETPACK_MU_WPCOM_LOAD_VIA_BETA_PLUGIN', true ); to your wp-config.php file.

To test on Simple, run the following command on your sandbox:

bin/jetpack-downloader test jetpack-mu-wpcom-plugin update/jetpack-mu-wpcom-load-coming-soon-remove-etk-version-check

Interested in more tips and information?

In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
Read more about our development workflow here: PCYsg-eg0-p2
Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

github-actions · 2025-01-23T04:21:21Z

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

✅ Include a description of your PR changes.
✅ Add a "[Status]" label (In Progress, Needs Team Review, ...).
✅ Add a "[Type]" label (Bug, Enhancement, Janitorial, Task).
✅ Add testing instructions.
✅ Specify whether this PR includes any changes to data or privacy.
✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖

The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available.

Follow this PR Review Process:

Ensure all required checks appearing at the bottom of this PR are passing.
Choose a review path based on your changes:
- A. Team Review: add the "[Status] Needs Team Review" label
  - For most changes, including minor cross-team impacts.
  - Example: Updating a team-specific component or a small change to a shared library.
- B. Crew Review: add the "[Status] Needs Review" label
  - For significant changes to core functionality.
  - Example: Major updates to a shared library or complex features.
- C. Both: Start with Team, then request Crew
  - For complex changes or when you need extra confidence.
  - Example: Refactor affecting multiple systems.
Get at least one approval before merging.

Still unsure? Reach out in #jetpack-developers for guidance!

fushar

✅ Smoke-tested the Coming Soon functionality.

fushar · 2025-01-23T04:45:16Z

projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php

-		 */
-		$invalid_fse_version_active =
-			is_plugin_active( 'full-site-editing/full-site-editing-plugin.php' ) &&
-			version_compare( get_plugin_data( WP_PLUGIN_DIR . '/full-site-editing/full-site-editing-plugin.php', false )['Version'], '3.56084', '<' );


Hmmm.... could it have actually broken sites that "On WoA sites, users may be using non-symlinked older versions of the FSE plugin."

ref:

https://github.com/Automattic/jetpack/pull/28932/files#diff-d5a84593bf9ba4c065049a4ecf67ee10ee2b3840eb67825a8646fe1c94b1ae50R49

arthur791004

Tested and works as expected.

If we have any concerns, we can check whether the plugin is installed first before checking whether it's active

taipeicoder · 2025-01-23T06:43:30Z

Updated the PR to ensure that the FSE file exist before calling get_plugin_data().

arthur791004 · 2025-01-23T07:00:15Z

projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php

-			is_plugin_active( 'full-site-editing/full-site-editing-plugin.php' ) &&
-			version_compare( get_plugin_data( WP_PLUGIN_DIR . '/full-site-editing/full-site-editing-plugin.php', false )['Version'], '3.56084', '<' );
+			is_plugin_active( $fse_plugin ) &&
+			file_exists( $fse_plugin_path ) &&


looks like we have to check it before is_plugin_active?

IIRC is_plugin_active() checks site options, but moving it in front doesn't hurt 🙂
The issue is that full-site-editing/full-site-editing-plugin.php is still in site options but the plugin file doesn't exist anymore.

arthur791004

👍

…ure (#41273)

taipeicoder added 2 commits January 23, 2025 11:45

Remove ETK version check in load_coming_soon

63299b7

Changelog

f21f943

taipeicoder requested a review from a team January 23, 2025 04:20

taipeicoder self-assigned this Jan 23, 2025

github-actions bot added [Package] Jetpack mu wpcom WordPress.com Features [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! labels Jan 23, 2025

taipeicoder added Lego Maintenance [Status] Needs Team Review [Type] Janitorial labels Jan 23, 2025

fushar previously approved these changes Jan 23, 2025

View reviewed changes

arthur791004 previously approved these changes Jan 23, 2025

View reviewed changes

Add defensive checks

7118918

taipeicoder dismissed stale reviews from arthur791004 and fushar via 7118918 January 23, 2025 06:41

taipeicoder changed the title ~~MU WPCOM: Remove ETK version check when loading the Coming Soon feature~~ MU WPCOM: Add more defensive checks when loading the Coming Soon feature Jan 23, 2025

taipeicoder added 2 commits January 23, 2025 14:44

Update changelog

aa3925b

Syntax

7d02b94

arthur791004 reviewed Jan 23, 2025

View reviewed changes

Reorder checks

b06e784

arthur791004 approved these changes Jan 23, 2025

View reviewed changes

taipeicoder merged commit 5cc8dfc into trunk Jan 23, 2025
60 checks passed

taipeicoder deleted the update/jetpack-mu-wpcom-load-coming-soon-remove-etk-version-check branch January 23, 2025 07:12

github-actions bot removed [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! [Status] Needs Team Review labels Jan 23, 2025

coder-karen pushed a commit that referenced this pull request Jan 24, 2025

MU WPCOM: Add more defensive checks when loading the Coming Soon feat…

429ecc3

…ure (#41273)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MU WPCOM: Add more defensive checks when loading the Coming Soon feature #41273

MU WPCOM: Add more defensive checks when loading the Coming Soon feature #41273

taipeicoder commented Jan 23, 2025 •

edited

Loading

github-actions bot commented Jan 23, 2025 •

edited

Loading

github-actions bot commented Jan 23, 2025 •

edited

Loading

fushar left a comment

fushar Jan 23, 2025

arthur791004 left a comment

taipeicoder commented Jan 23, 2025

arthur791004 Jan 23, 2025

taipeicoder Jan 23, 2025

arthur791004 left a comment

MU WPCOM: Add more defensive checks when loading the Coming Soon feature #41273

MU WPCOM: Add more defensive checks when loading the Coming Soon feature #41273

Conversation

taipeicoder commented Jan 23, 2025 • edited Loading

Proposed changes:

Other information:

Jetpack product discussion

Does this pull request change what data or activity we track or use?

Testing instructions:

github-actions bot commented Jan 23, 2025 • edited Loading

github-actions bot commented Jan 23, 2025 • edited Loading

fushar left a comment

Choose a reason for hiding this comment

fushar Jan 23, 2025

Choose a reason for hiding this comment

arthur791004 left a comment

Choose a reason for hiding this comment

taipeicoder commented Jan 23, 2025

arthur791004 Jan 23, 2025

Choose a reason for hiding this comment

taipeicoder Jan 23, 2025

Choose a reason for hiding this comment

arthur791004 left a comment

Choose a reason for hiding this comment

taipeicoder commented Jan 23, 2025 •

edited

Loading

github-actions bot commented Jan 23, 2025 •

edited

Loading

github-actions bot commented Jan 23, 2025 •

edited

Loading