Skip to content

Conversation

@ellatrix
Copy link
Member

@ellatrix ellatrix commented Nov 5, 2025

What?

This reverts template activation on the wp/6.9 first, we'll see if we can improve trunk or revert there as well.

Why?

After feedback and review with multiple Gutenberg contributors, we decided to delay this to 7.0.

How?

We have to set the env WP version to 6.8 instead of trunk so the tests pass. When we revert the changes in core, we can restore it to trunk again.

Testing Instructions

Everything should work as before in 6.8.

Testing Instructions for Keyboard

Screenshots or screencast

Before After

…lates query when no slugs are left to find (#72795)"

This reverts commit ad996fb.
…ould always result in active template (#72770)"

This reverts commit c7a8088.
@github-actions
Copy link

github-actions bot commented Nov 5, 2025

Flaky tests detected in 1ad0abe.
Some tests passed with failed attempts. The failures may not be related to this commit but are still reported for visibility. See the documentation for more information.

🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/19121177434
📝 Reported issues:

@t-hamano t-hamano added the [Feature] Templates API Related to API powering block template functionality in the Site Editor label Nov 5, 2025
@github-project-automation github-project-automation bot moved this to 🔎 Needs Review in WordPress 6.9 Editor Tasks Nov 5, 2025
@ramonjd
Copy link
Member

ramonjd commented Nov 6, 2025

For what it's worth I checked this branch against WP 6.8.3 (with the Gutenberg plugin deactivated) and the following are working identically for me:

  • browsing all/theme templates
  • creating new templates
  • resetting edited theme templates
  • general editing of templates
6 8 3 - templates

I'll let folks more familiar with the feature make the final call, but LGTM so far.

we'll see if we can improve trunk or revert there as well.

Just a question, I'm extending the templates controller for an unrelated content only feature in #72988

Should we hold off merging that until we know what's going on in trunk?

Copy link
Contributor

@t-hamano t-hamano 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 not familiar with the implementation details, so I'd like to ask someone else to provide a more detailed review, but I'll leave one piece of feedback.

{
"$schema": "./schemas/json/wp-env.json",
"core": "WordPress/WordPress",
"core": "WordPress/WordPress#6.8.3",
Copy link
Contributor

Choose a reason for hiding this comment

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

This change is unnecessary?

Copy link
Contributor

Choose a reason for hiding this comment

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

I see this justification in the PR description:

We have to set the env WP version to 6.8 instead of trunk so the tests pass. When we revert the changes in core, we can restore it to trunk again.

@ellatrix ellatrix requested a review from desrosj as a code owner November 6, 2025 18:22
@mcsf
Copy link
Contributor

mcsf commented Nov 6, 2025

Not sure how it should be handled, but I see that I now have duplicate and misbehaving templates due to changes I made while this feature was live.

Screenshot 2025-11-06 at 18 47 34

First sign was this classic console warning:

Warning: Encountered two children with the same key, twentytwentyfive//404

The respective records (as returned by useEntityRecordsWithPermissions) seem identical.

Screenshot 2025-11-06 at 18 48 56

@ellatrix
Copy link
Member Author

ellatrix commented Nov 6, 2025

@mcsf That's fine I think, it's something that we should think about if we want to revert it in GB trunk as well, but for the wp/6.9 branch, 6.9 has yet to be released.

Copy link
Contributor

@mcsf mcsf left a comment

Choose a reason for hiding this comment

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

I cannot thoroughly vet this, but the commit list is clear and the functionality seems back to what it was. :)

@ellatrix ellatrix merged commit 1fcf747 into wp/6.9 Nov 6, 2025
35 checks passed
@ellatrix ellatrix deleted the revert/template-activation branch November 6, 2025 23:21
@github-project-automation github-project-automation bot moved this from 🔎 Needs Review to ✅ Done in WordPress 6.9 Editor Tasks Nov 6, 2025
@ellatrix
Copy link
Member Author

ellatrix commented Nov 6, 2025

Whoops, forgot the props. I will give you all props on the WP core PR :)

Copy link
Contributor

@kmanijak kmanijak left a comment

Choose a reason for hiding this comment

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

Late to the party but I smoke tested the changes (on wp/6.9 branch) and everything seems to be back to previous state. I also run WooCommerce E2E tests with this change and they prove the same (run).

Thanks for all the effort on this @ellatrix and looking forward to 7.0!

pento pushed a commit to WordPress/wordpress-develop that referenced this pull request Nov 7, 2025
This commit reverts the PHP changes that were made to support the template activation feature. The UI was already reverted through the packages sync in [61177] (Gutenberg PR: WordPress/gutenberg#73025).

Developed in #10473.

Fixes #64214.
Props ellatrix, t-hamano, mcsf, ramonjd.

git-svn-id: https://develop.svn.wordpress.org/trunk@61178 602fd350-edb4-49c9-b593-d223f7449a82
github-actions bot pushed a commit to platformsh/wordpress-performance that referenced this pull request Nov 7, 2025
This commit reverts the PHP changes that were made to support the template activation feature. The UI was already reverted through the packages sync in [61177] (Gutenberg PR: WordPress/gutenberg#73025).

Developed in WordPress/wordpress-develop#10473.

Fixes #64214.
Props ellatrix, t-hamano, mcsf, ramonjd.
Built from https://develop.svn.wordpress.org/trunk@61178


git-svn-id: https://core.svn.wordpress.org/trunk@60514 1a063a9b-81f0-0310-95a4-ce76da25c4cd
markjaquith pushed a commit to WordPress/WordPress that referenced this pull request Nov 7, 2025
This commit reverts the PHP changes that were made to support the template activation feature. The UI was already reverted through the packages sync in [61177] (Gutenberg PR: WordPress/gutenberg#73025).

Developed in WordPress/wordpress-develop#10473.

Fixes #64214.
Props ellatrix, t-hamano, mcsf, ramonjd.
Built from https://develop.svn.wordpress.org/trunk@61178


git-svn-id: http://core.svn.wordpress.org/trunk@60514 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

[Feature] Templates API Related to API powering block template functionality in the Site Editor [Type] Task Issues or PRs that have been broken down into an individual action to take

Projects

Development

Successfully merging this pull request may close these issues.

6 participants