Cherry pick commit from Update theme.json version (#36917) to add correct version validation to theme.json #38294
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The schema in 5.9 should basically be the same as what is in trunk now, but I'm seeing quite a large diff, so there are other commits that also need to be cherry picked.
|
|
I was looking for a good way to see which ones exist in trunk and not wp/5.9, but the best I could come up with is this diff. diff -ud <(git log --format=format:%s wp/5.9 -- schemas && echo) <(git log --format=format:%s trunk -- schemas && echo)--- /dev/fd/11 2022-01-27 14:38:59.114477021 -0600
+++ /dev/fd/13 2022-01-27 14:38:59.116020679 -0600
@@ -1,5 +1,25 @@
+Update core/archive block schema to reflect no block-level settings support. (#37778)
+Block.json schema: update fontSize and lineHeight props (#37853)
+Schema: Fix appearanceTools in theme.json schema (#37762)
+Update theme.json schema to allow for per-block management of settings. (#36746)
+Docs: Add automated theme.json reference documentation (#37569)
+Update README.md (#37294)
+Remove versioning in theme schema descriptions (#37165)
+Update theme.json version (#36917)
Update the block theme folders to templates and parts (#36647)
+Schemas: Allow custom blocks in theme.json styles (#36411)
theme.json: add `appearanceTools` flag to opt-in into appearance UI controls (#36646)
Color UI component: reorder palettes and update names (core by defaults, user by custom) (#36622)
Fix: allow themes to opt out from core color palette (#36492)
-Merge changes published in the Gutenberg plugin "release/11.9" branch
+Tests: Add integration tests for block schema validation (#36351)
+fix schema to allow for custom blocks in theme.json (#36341)
+add pattern to `name` key in block.json Schema (#36343)
+Schema: Allow block.json attribute type to be an array (#36295)
+Blocks: Update schema to require either a type or an enum (#36267)
+Blocks: Document changes to style and editorStyle in `block.json` (#36218)
+Block Library: Remove `post-` prefix from Comment Template inner blocks (#36171)
+Migrate theme.json v1 to v2 (#36155)
+Blocks: Add view script to block schema and docs (#36175)
+Docs: Fix schema file url (#36157)
+Schemas: Add title to templateParts (#36145)
+Add schemas package (#35998)The added (+) lines above the release/11.9 commit are what we should evaluate for inclusion. I'm assuming everything below that was included in the release/11.9 commit. |
|
Thanks for digging in further, I was too narrowly focused on the |
|
@ryanwelcher I tested things out by cherry-picking them locally and found a couple more commits that needed to be added that affected the block.json schema. I saw you asked in #core-editor about backporting them—thank you for doing that. I added the I'll let you double check things, but if it all looks good to you, this PR can probably be closed. |
|
I may have spoken a bit too soon. Looks like there's still a small diff from #36351 that didn't make it in the block.json schema. That one also updates the package.json and package-lock.json which might be a bit trickier to backport. @gziolo do you know if that will cause any issues with the process or if it's fine to go ahead and add the label to that PR too? |
|
The version was updated in b23854a. Most of the PR mentioned #38294 (comment) were backported too so this seems the way to go here. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Description
This PR cherry-pick a commit from #36917 to update the theme.json schema to correctly validate using
version: 2.Closes #38242
Please let me know if there is a different process I should take for updating the branch.
Testing Instructions
Link to the schema definition in this PR in a theme.json file.
Types of changes
Schema updates.
Checklist:
*.native.jsfiles for terms that need renaming or removal).