Opened 4 months ago
Closed 3 weeks ago
#64595 closed task (blessed) (fixed)
Update Gutenberg ref in package.json for WP 7.0
| Reported by: |
|
Owned by: |
|
|---|---|---|---|
| Milestone: | 7.0 | Priority: | normal |
| Severity: | normal | Version: | 7.0 |
| Component: | General | Keywords: | has-patch dev-reviewed fixed-major |
| Focuses: | Cc: |
Description (last modified by )
Opening this ticket as a reference for commits. We can probably keep this open for all ref updates during this release cycle.
See also #64393.
Change History (70)
This ticket was mentioned in PR #10865 on WordPress/wordpress-develop by @ellatrix.
4 months ago
#2
- Keywords has-patch added
@desrosj commented on PR #10865:
4 months ago
#3
Do we have a good way to track which changes (features, bugs, etc.) are being included in each ref update? Apologies if I missed it, but are we bumping to refs representing specific changes, such as releases or certain milestone completions?
Without the SVN commit messages noting what is included in each ref bump, there will inevitably be situations where tracking the introduction of certain changes is near impossible.
This ticket was mentioned in Slack in #core-editor by ella. View the logs.
4 months ago
@ellatrix commented on PR #10865:
4 months ago
#5
Do we have a good way to track which changes (features, bugs, etc.) are being included in each ref update? Apologies if I missed it, but are we bumping to refs representing specific changes, such as releases or certain milestone completions?
Without the SVN commit messages noting what is included in each ref bump, there will inevitably be situations where tracking the introduction of certain changes is near impossible.
We have not done this for package updates either. I think this would be good to discuss separately, I don't want it to distract from getting core updated with the latest GB changes as soon as possible.
This ticket was mentioned in Slack in #meta by ella. View the logs.
4 months ago
#8
@
4 months ago
Commit at https://core.trac.wordpress.org/changeset/61605, Trac is having issues displaying it, it seems.
This ticket was mentioned in Slack in #core by juanmaguitar. View the logs.
4 months ago
This ticket was mentioned in PR #10968 on WordPress/wordpress-develop by @ellatrix.
4 months ago
#10
Trac ticket: https://core.trac.wordpress.org/ticket/64595
## Use of AI Tools
@ellatrix commented on PR #10968:
4 months ago
#11
@adamsilverstein There's an issue with the vips package:
Running "verify:source-maps" task Warning: The build/wp-includes/js/dist/script-modules/vips/worker.js file must not contain a sourceMappingURL. Use --force to continue.
Do you know what needs to be fixed here?
@adamsilverstein commented on PR #10968:
4 months ago
#12
Not sure off hand, I'll take a look.
@adamsilverstein commented on PR #10968:
4 months ago
#13
@adamsilverstein[[Image(chrome-extension://hgomfjikakokcbkjlfgodhklifiplmpg/images/wp-logo.png)]] There's an issue with the
vipspackage:
Running "verify:source-maps" task Warning: The build/wp-includes/js/dist/script-modules/vips/worker.js file must not contain a sourceMappingURL.� Use --force to continue.Do you know what needs to be fixed here?
I asked Claude why this is failing and the explaination seemed valid:
oot Cause
The new Gutenberg ref adds the @wordpress/vips package, which uses a web worker bundle built by esbuild with sourcemap: true. This is defined in packages/wp-build/lib/worker-build.mjs:
esbuild.build({
...
sourcemap: true, adds # sourceMappingURL=... to output
...
})
The build process is:
- esbuild bundles the worker with sourcemap: true → produces worker.mjs with a # sourceMappingURL
- esbuild then re-transpiles worker-code.mjs (which embeds the worker content as a string) with sourcemap: true → adds another # sourceMappingURL
- webpack bundles the module entry point (vips-worker.mjs which imports worker-code.mjs etc.) into build/modules/vips/worker.js — concatenating multiple modules, each potentially carrying their own # sourceMappingURL comments
When copy-gutenberg-build.js copies this file, the removeSourceMaps function at line 894 only removes the first match because it's missing the /g flag:
const removeSourceMaps = ( content ) => {
return content.replace( /\/\/# sourceMappingURL=.*$/m, ).trimEnd();
no /g flag — only removes first match!
};
The remaining sourceMappingURL comment(s) are then caught by the verify:source-maps task in the Gruntfile, which correctly checks for any occurrence.
Notably, the existing replace:source-maps Grunt task at Gruntfile.js:1314 already uses the /g flag:
match: new RegExp( '\/\/# sourceMappingURL=.*
s*', 'g' ),
The Fix
Add the /g flag to the regex in copy-gutenberg-build.js.
I will work on a PR for this.
@youknowriad commented on PR #10968:
4 months ago
#14
I wish we could run gutenberg e2e test on these changes. I can't spot any obvious issues.
@ellatrix commented on PR #10968:
4 months ago
#15
Yes, we can look into running the e2e test on wordpress-develop, but that will add even more tests will long test times no? During the last release I kept a branch in the GB repo without the GB plugin active to double check all tests pass.
This ticket was mentioned in PR #10988 on WordPress/wordpress-develop by @ellatrix.
4 months ago
#17
This ticket was mentioned in PR #11059 on WordPress/wordpress-develop by @ellatrix.
3 months ago
#19
#21
@
3 months ago
I've been thinking about the commit messages for these new hash bumps and I have some suggestions for improvement to make them more useful and informative.
- Let's make sure to begin the short description with
Component:prepended. This usually should match the component selected for the corresponding Trac ticket. I'm undecided on where these tickets fit best. General feels just OK, External Libraries and Editor feels wrong. Maybe Build/Test Tools? It is a tooling change after all. I'll give this one more thought. - For each commit, let's include the following as the first sentence in the message: "This updates the pinned commit hash of the Gutenberg repository from
OLD_FULL_HASHtoNEW_FULL_HASH. - Instead of listing the command that was run to generate the list (
git log --reverse --format. etc.), let's instead include a link to the comparison view on GitHub. For example on [61750], that would be https://github.com/WordPress/gutenberg/compare/23b566c72e9c4a36219ef5d6e62890f05551f6cb...022d8dd3d461f91b15c1f0410649d3ebb027207f. This is more useful because someone can click it to view all of the commits, file diffs, etc. and follow various paths to dig deeper. The command that was run is important, but that's more of a detail for committers to be aware of that can be listed in the handbook. The previous suggestion also lists out the two hashes which makes it unnecessary. How about "A full list of changes included in this commit can be found on GitHub:LINK". - I don't think the link to the "CI run" or "Developed in is necessary for these. The pull requests now are essentially just a hash bump, so there's really no development that happens. The commit messages for the merges are really long (which is good), but I think this detail can be left out.
- Let's move the list of changes above the "Props" and "See/Fixes". I think I can guess why you chose to put them above the list, but I believe that they are supposed to be at the end of the commit message. It's possible there is a parsing tool somewhere that is expecting that.
- I came to this ticket because I was looking for information about which version of Gutenberg was included in the most recent bump prior to
7.0-beta2but noticed that is not included in the messages. It would be really great to always pin hashes that correspond to tags, and thus releases. But I recognize this may not always be desired. It would still be nice to explain how the included changes line up to those tagged versions, especially since we reference them in the beta 1 post and a few locations in the user documentation. If it lines up directly, including the version number in parentheses next to the old and new hashes could work. Otherwise, a note like "This merges all changes that were cherry-picked to thewp/7.0branch between WordPress7.0-beta1and today (preparing for7.0-beta2).
Once this is dialed in, let's add a message template for these merge commits to the Commit Messages Best Practices page in the Core handbook once.
Putting this all together, this is the template I think so far:
Component: Bump the pinned hash from the Gutenberg repository. (WITH versions aligning with tags) This updates the pinned commit hash of the Gutenberg repository from `%%OLD_FULL_HASH%%` (version `v25.0.0`) to `%%NEW_FULL_HASH%%` (version `26.0.0`). (Without versions aligning with tags) This updates the pinned commit hash of the Gutenberg repository from `%%OLD_FULL_HASH%%` to `%%NEW_FULL_HASH%%` and merges all of the changes that were cherry-picked to the `wp/7.0` branch between WordPress `7.0-beta1` and today (preparing for `7.0-beta2`). A full list of changes included in this commit can be found on GitHub: %%LINK%%. The following commits are included: - Pattern Editing: The best pattern feature yet! (https://github.com/WordPress/gutenberg/pull/#####) - Global Styles: Adding support for feature X within the block styles. (https://github.com/WordPress/gutenberg/pull/#####) - etc.. Follow-up to [27195], [41062]. (optional) Reviewed by a-fellow-committer, maybe-multiple. Merges [26851] to the x.x branch. (both of these are only required when backporting from `trunk`) Props person, another. Fixes #30000. See #20202, #105.
This ticket was mentioned in PR #11167 on WordPress/wordpress-develop by @ellatrix.
3 months ago
#22
#26
@
3 months ago
@desrosj Sorry, only now saw your message while catching up with mail. Not sure I like the link. What if Github is down or goes away? You're right, people can still copy the commits and compare locally I guess. I do like that you can quickly see all the changes though.
I don't think including the version is doable. Ideally we sync more often, and ideally others can do it too to test their features.
The bigger problem to solve imo is: https://github.com/WordPress/wordpress-develop/pull/11080#issuecomment-3991404084.
How can others update the ref when changes are required from Gutenberg within their core PR. Ideally we don't leave trunk in a broken state. And how do we ensure people include the changelog?
This ticket was mentioned in PR #11212 on WordPress/wordpress-develop by @desrosj.
3 months ago
#27
This updates the pinned gutenberg repository hash from https://github.com/WordPress/gutenberg/commit/f4d8a5803aa2fbe26e7d9af4d17e80a622b7bab8 to https://github.com/WordPress/gutenberg/commit/7b7fa2bc97a8029a302bd6511cf0d206b5953172.
## Included Changes
The following changes are included in this update:
- Sort registry files by handle/ID. (https://github.com/WordPress/gutenberg/pull/75755)
- Obey undoIgnore flag in editEntityRecord (https://github.com/WordPress/gutenberg/pull/76206)
- RTC: Fix
post-editor-template-modeE2E test (https://github.com/WordPress/gutenberg/pull/76209) - Publish built Gutenberg plugin to the GitHub Container Registry (https://github.com/WordPress/gutenberg/pull/75844) (https://github.com/WordPress/gutenberg/pull/76273)
- Connectors: Improve placeholder text and make it translatable (https://github.com/WordPress/gutenberg/pull/75996)
- Block context menu: context menu not closing for disconnecting unsynced pattern menu items (https://github.com/WordPress/gutenberg/pull/75405)
- Connectors: Improve responsive layout for small viewports (https://github.com/WordPress/gutenberg/pull/76231)
- theme.json schema: fix pseudo-class definition for button block (https://github.com/WordPress/gutenberg/pull/76272)
- Navigation block: fix submenu chevron toggle on touch devices (https://github.com/WordPress/gutenberg/pull/76197)
Trac ticket: Core-64595.
## Use of AI Tools
No use of AI.
@desrosj commented on PR #11212:
3 months ago
#29
This ticket was mentioned in PR #11214 on WordPress/wordpress-develop by @desrosj.
3 months ago
#30
This updates the pinned gutenberg repository hash from https://github.com/WordPress/gutenberg/commit/7b7fa2bc97a8029a302bd6511cf0d206b5953172 to https://github.com/WordPress/gutenberg/commit/f290e6cb50d66809787fe198ef1cbc222482f37d.
## Included Changes
The following changes are included in this update:
- Use V2 Yjs methods for HTTP Polling (https://github.com/WordPress/gutenberg/pull/76304)
- Plugin: Include Icons assets in ZIP (https://github.com/WordPress/gutenberg/pull/75866)
- Ensure consistent, repeatable build results when inlining WASM files via
wasmInlinePlugin(https://github.com/WordPress/gutenberg/pull/76113) - Account
IS_WORDPRESS_COREis set. (https://github.com/WordPress/gutenberg/pull/76334)
Trac ticket: Core-64595.
## Use of AI Tools
No use of AI.
@desrosj commented on PR #11214:
3 months ago
#32
Merged in r61870.
This ticket was mentioned in PR #11239 on WordPress/wordpress-develop by @ellatrix.
3 months ago
#33
This ticket was mentioned in PR #11300 on WordPress/wordpress-develop by @ellatrix.
3 months ago
#35
This ticket was mentioned in PR #11317 on WordPress/wordpress-develop by @ellatrix.
3 months ago
#37
This ticket was mentioned in PR #11343 on WordPress/wordpress-develop by @ellatrix.
2 months ago
#39
This ticket was mentioned in PR #11360 on WordPress/wordpress-develop by @ellatrix.
2 months ago
#41
This ticket was mentioned in PR #11362 on WordPress/wordpress-develop by @ellatrix.
2 months ago
#45
@ellatrix commented on PR #11360:
2 months ago
#46
New rebased PR: https://github.com/WordPress/wordpress-develop/pull/11362
This ticket was mentioned in PR #11454 on WordPress/wordpress-develop by @jorgefilipecosta.
2 months ago
#49
## Summary
Update Gutenberg packages to include the latest fixes and improvements.
## Gutenberg changelog
- Style Book: Fix missing styles for classic themes in stylebook route (https://github.com/WordPress/gutenberg/pull/76843)
- RTC: Fix stuck "Join" link in post list when lock expires (https://github.com/WordPress/gutenberg/pull/76795)
- Icon: Fix center alignment in the editor for classic themes (https://github.com/WordPress/gutenberg/pull/76878)
- RTC: Fix notes not syncing between collaborative editors (https://github.com/WordPress/gutenberg/pull/76873)
- Latest Comments: Fix v1 deprecated block missing supports (https://github.com/WordPress/gutenberg/pull/76877)
- Connectors: Add Akismet as a default connector (https://github.com/WordPress/gutenberg/pull/76828)
- Restore with compaction update (https://github.com/WordPress/gutenberg/pull/76872)
- Improve JSDoc for abilities API (https://github.com/WordPress/gutenberg/pull/76824)
- Connectors: Replace plugin.slug with plugin.file (https://github.com/WordPress/gutenberg/pull/76909)
- Block visibility badge: use canvas iframe for viewport detection (https://github.com/WordPress/gutenberg/pull/76889)
- Connectors: Update help text from 'reset' to 'manage' (https://github.com/WordPress/gutenberg/pull/76963)
- Connectors: Hide Akismet unless already installed (https://github.com/WordPress/gutenberg/pull/76962)
- Wrap sync update processing in try/catch (https://github.com/WordPress/gutenberg/pull/76968)
- Backport: Improve validation and permission checks for
WP_HTTP_Polling_Sync_Server(https://github.com/WordPress/gutenberg/pull/76987) - Connectors: account for mu-plugins when resolving plugin.file status (https://github.com/WordPress/gutenberg/pull/76994)
## Command used to generate the log
git log --reverse --format="- %s" 2cf4831201cc0fdb1bed0d1794d27e10e3c18484..e2970ba736edb99e08fb369d4fb0c378189468ee | sed 's|#\([0-9][0-9]*\)|https://github.com/WordPress/gutenberg/pull/\1|g; /github\.com\/WordPress\/gutenberg\/pull/!d' | pbcopy
## Commit message:
Editor: Bump pinned hash for the Gutenberg repository. This updates the pinned hash from the `gutenberg` from `0d133bf7e7437d65d68a06551f3d613a7d8e4361` to `e2970ba736edb99e08fb369d4fb0c378189468ee`. The following changes are included: - https://github.com/WordPress/gutenberg/pull/76478 Boot: Fix black area below content when sidebar is taller than page c… (https://github.com/WordPress/gutenberg/pull/76764) - Style Book: Fix missing styles for classic themes in stylebook route (https://github.com/WordPress/gutenberg/pull/76843) - RTC: Fix stuck "Join" link in post list when lock expires (https://github.com/WordPress/gutenberg/pull/76795) - Icon: Fix center alignment in the editor for classic themes (https://github.com/WordPress/gutenberg/pull/76878) - RTC: Fix notes not syncing between collaborative editors (https://github.com/WordPress/gutenberg/pull/76873) - Latest Comments: Fix v1 deprecated block missing supports (https://github.com/WordPress/gutenberg/pull/76877) - Connectors: Add Akismet as a default connector (https://github.com/WordPress/gutenberg/pull/76828) - Restore with compaction update (https://github.com/WordPress/gutenberg/pull/76872) - Improve JSDoc for abilities API (https://github.com/WordPress/gutenberg/pull/76824) - Connectors: Replace plugin.slug with plugin.file (https://github.com/WordPress/gutenberg/pull/76909) - Block visibility badge: use canvas iframe for viewport detection (https://github.com/WordPress/gutenberg/pull/76889) - Connectors: Update help text from 'reset' to 'manage' (https://github.com/WordPress/gutenberg/pull/76963) - Connectors: Hide Akismet unless already installed (https://github.com/WordPress/gutenberg/pull/76962) - Wrap sync update processing in try/catch (https://github.com/WordPress/gutenberg/pull/76968) - Backport: Improve validation and permission checks for `WP_HTTP_Polling_Sync_Server` (https://github.com/WordPress/gutenberg/pull/76987) - Connectors: account for mu-plugins when resolving plugin.file status (https://github.com/WordPress/gutenberg/pull/76994) A full list of changes can be found on GitHub: https://github.com/WordPress/gutenberg/compare/0d133bf7e7437d65d68a06551f3d613a7d8e4361…e2970ba736edb99e08fb369d4fb0c378189468ee. Log created with: git log --reverse --format="- %s" 0d133bf7e7437d65d68a06551f3d613a7d8e4361..e2970ba736edb99e08fb369d4fb0c378189468ee | sed 's|#\([0-9][0-9]*\)|https://github.com/WordPress/gutenberg/pull/\1|g; /github\.com\/WordPress\/gutenberg\/pull/!d' | pbcopy See #64595.
@jorgefilipecosta commented on PR #11454:
2 months ago
#52
This ticket was mentioned in Slack in #core by jorbin. View the logs.
5 weeks ago
This ticket was mentioned in PR #11760 on WordPress/wordpress-develop by @ellatrix.
4 weeks ago
#54
Trac ticket: https://core.trac.wordpress.org/ticket/64595
## Use of AI Tools
#57
@
4 weeks ago
- Keywords dev-reviewed added; dev-feedback removed
[62333] looks good to backport. Going to handle that now.
#59
@
4 weeks ago
- Keywords fixed-major commit dev-reviewed removed
Resetting the keywords for the next hash bump.
This ticket was mentioned in PR #11832 on WordPress/wordpress-develop by @ellatrix.
3 weeks ago
#60
#62
@
3 weeks ago
- Keywords commit fixed-major dev-reviewed added
[62360] looks good to backport, but it looks like it was committed directly to the 7.0 branch. I am going to forward-merge this to trunk.
There is some initial discussion in Slack about the right process for this. It's likely that committing SHA bumps from the respective wp/X.Y branches directly to numbered branches is the right thing to do. But there are some nuances and edge cases that need to be discussed and documented first.
#64
@
3 weeks ago
- Keywords commit fixed-major dev-reviewed removed
Resetting keywords for the next hash bump.
This ticket was mentioned in PR #11862 on WordPress/wordpress-develop by @ellatrix.
3 weeks ago
#65
#67
@
3 weeks ago
- Keywords dev-feedback added
- Summary changed from Update Gutenberg ref in package.json to Update Gutenberg ref in package.json for WP 7.0
Let's scope this ticket to 7.0 so we can close it after a last backport.
#68
@
3 weeks ago
Worth nothing that a few of the items in the last commit only affect the GB plugin, not the core build, see https://wordpress.slack.com/archives/C02QB2JS7/p1778914109616809.
#69
@
3 weeks ago
- Keywords dev-reviewed fixed-major added; dev-feedback removed
I have some concerns regarding the docblock located on /wp-includes/build/pages/options-connectors/page-wp-admin.php but I think we can backport it and fix these small docblock formatting issues later in 7.0.1 or so.
So this is a second committer sign-off, @ellatrix.
Trac ticket: https://core.trac.wordpress.org/ticket/64595