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

wp-env.json: Bump tt1-blocks dependency to v0.4.5 #30045

Merged
merged 6 commits into from
Apr 15, 2021

Conversation

ockham
Copy link
Contributor

@ockham ockham commented Mar 19, 2021

Description

As of #28741, we've been pinning the version of the Twenty Twenty One Blocks theme (tt1-blocks) used by Gutenberg to a fixed version, in order to prevent breakage of e2e tests by changes to that theme, as previously seen with #28638.

The version we pinned tt1-blocks to was 0.4.3. A new version -- 0.4.4 0.4.5 -- has now been tagged, so let's try to update Gutenberg to use that.

How has this been tested?

Verify that tests (unit and e2e) are passing (see cI). Some additional smoke testing (especially of the Site Editor) is also recommended.

@ockham ockham added the [Type] Automated Testing Testing infrastructure changes impacting the execution of end-to-end (E2E) and/or unit tests. label Mar 19, 2021
@github-actions
Copy link

github-actions bot commented Mar 19, 2021

Size Change: 0 B

Total Size: 1.46 MB

ℹ️ View Unchanged
Filename Size Change
build/a11y/index.js 1.14 kB 0 B
build/annotations/index.js 3.78 kB 0 B
build/api-fetch/index.js 3.41 kB 0 B
build/autop/index.js 2.82 kB 0 B
build/blob/index.js 664 B 0 B
build/block-directory/index.js 8.62 kB 0 B
build/block-directory/style-rtl.css 1 kB 0 B
build/block-directory/style.css 1.01 kB 0 B
build/block-editor/index.js 128 kB 0 B
build/block-editor/style-rtl.css 12.5 kB 0 B
build/block-editor/style.css 12.5 kB 0 B
build/block-library/blocks/archives/editor-rtl.css 61 B 0 B
build/block-library/blocks/archives/editor.css 60 B 0 B
build/block-library/blocks/audio/editor-rtl.css 58 B 0 B
build/block-library/blocks/audio/editor.css 58 B 0 B
build/block-library/blocks/audio/style-rtl.css 112 B 0 B
build/block-library/blocks/audio/style.css 112 B 0 B
build/block-library/blocks/block/editor-rtl.css 161 B 0 B
build/block-library/blocks/block/editor.css 161 B 0 B
build/block-library/blocks/button/editor-rtl.css 475 B 0 B
build/block-library/blocks/button/editor.css 474 B 0 B
build/block-library/blocks/button/style-rtl.css 503 B 0 B
build/block-library/blocks/button/style.css 503 B 0 B
build/block-library/blocks/buttons/editor-rtl.css 315 B 0 B
build/block-library/blocks/buttons/editor.css 315 B 0 B
build/block-library/blocks/buttons/style-rtl.css 368 B 0 B
build/block-library/blocks/buttons/style.css 368 B 0 B
build/block-library/blocks/calendar/style-rtl.css 208 B 0 B
build/block-library/blocks/calendar/style.css 208 B 0 B
build/block-library/blocks/categories/editor-rtl.css 84 B 0 B
build/block-library/blocks/categories/editor.css 83 B 0 B
build/block-library/blocks/categories/style-rtl.css 79 B 0 B
build/block-library/blocks/categories/style.css 79 B 0 B
build/block-library/blocks/code/style-rtl.css 90 B 0 B
build/block-library/blocks/code/style.css 90 B 0 B
build/block-library/blocks/columns/editor-rtl.css 190 B 0 B
build/block-library/blocks/columns/editor.css 190 B 0 B
build/block-library/blocks/columns/style-rtl.css 436 B 0 B
build/block-library/blocks/columns/style.css 435 B 0 B
build/block-library/blocks/cover/editor-rtl.css 605 B 0 B
build/block-library/blocks/cover/editor.css 605 B 0 B
build/block-library/blocks/cover/style-rtl.css 1.23 kB 0 B
build/block-library/blocks/cover/style.css 1.23 kB 0 B
build/block-library/blocks/embed/editor-rtl.css 486 B 0 B
build/block-library/blocks/embed/editor.css 486 B 0 B
build/block-library/blocks/embed/style-rtl.css 401 B 0 B
build/block-library/blocks/embed/style.css 400 B 0 B
build/block-library/blocks/file/editor-rtl.css 175 B 0 B
build/block-library/blocks/file/editor.css 174 B 0 B
build/block-library/blocks/file/style-rtl.css 248 B 0 B
build/block-library/blocks/file/style.css 248 B 0 B
build/block-library/blocks/freeform/editor-rtl.css 2.44 kB 0 B
build/block-library/blocks/freeform/editor.css 2.44 kB 0 B
build/block-library/blocks/gallery/editor-rtl.css 704 B 0 B
build/block-library/blocks/gallery/editor.css 705 B 0 B
build/block-library/blocks/gallery/style-rtl.css 1.09 kB 0 B
build/block-library/blocks/gallery/style.css 1.09 kB 0 B
build/block-library/blocks/group/editor-rtl.css 160 B 0 B
build/block-library/blocks/group/editor.css 160 B 0 B
build/block-library/blocks/group/style-rtl.css 57 B 0 B
build/block-library/blocks/group/style.css 57 B 0 B
build/block-library/blocks/heading/editor-rtl.css 129 B 0 B
build/block-library/blocks/heading/editor.css 129 B 0 B
build/block-library/blocks/heading/style-rtl.css 76 B 0 B
build/block-library/blocks/heading/style.css 76 B 0 B
build/block-library/blocks/html/editor-rtl.css 281 B 0 B
build/block-library/blocks/html/editor.css 281 B 0 B
build/block-library/blocks/image/editor-rtl.css 717 B 0 B
build/block-library/blocks/image/editor.css 716 B 0 B
build/block-library/blocks/image/style-rtl.css 476 B 0 B
build/block-library/blocks/image/style.css 478 B 0 B
build/block-library/blocks/latest-comments/style-rtl.css 281 B 0 B
build/block-library/blocks/latest-comments/style.css 282 B 0 B
build/block-library/blocks/latest-posts/editor-rtl.css 137 B 0 B
build/block-library/blocks/latest-posts/editor.css 137 B 0 B
build/block-library/blocks/latest-posts/style-rtl.css 523 B 0 B
build/block-library/blocks/latest-posts/style.css 522 B 0 B
build/block-library/blocks/legacy-widget/editor-rtl.css 398 B 0 B
build/block-library/blocks/legacy-widget/editor.css 399 B 0 B
build/block-library/blocks/list/style-rtl.css 63 B 0 B
build/block-library/blocks/list/style.css 63 B 0 B
build/block-library/blocks/media-text/editor-rtl.css 191 B 0 B
build/block-library/blocks/media-text/editor.css 191 B 0 B
build/block-library/blocks/media-text/style-rtl.css 535 B 0 B
build/block-library/blocks/media-text/style.css 532 B 0 B
build/block-library/blocks/more/editor-rtl.css 434 B 0 B
build/block-library/blocks/more/editor.css 434 B 0 B
build/block-library/blocks/navigation-link/editor-rtl.css 597 B 0 B
build/block-library/blocks/navigation-link/editor.css 597 B 0 B
build/block-library/blocks/navigation-link/style-rtl.css 1.07 kB 0 B
build/block-library/blocks/navigation-link/style.css 1.07 kB 0 B
build/block-library/blocks/navigation/editor-rtl.css 1.24 kB 0 B
build/block-library/blocks/navigation/editor.css 1.24 kB 0 B
build/block-library/blocks/navigation/style-rtl.css 272 B 0 B
build/block-library/blocks/navigation/style.css 271 B 0 B
build/block-library/blocks/nextpage/editor-rtl.css 395 B 0 B
build/block-library/blocks/nextpage/editor.css 395 B 0 B
build/block-library/blocks/page-list/editor-rtl.css 239 B 0 B
build/block-library/blocks/page-list/editor.css 240 B 0 B
build/block-library/blocks/page-list/style-rtl.css 167 B 0 B
build/block-library/blocks/page-list/style.css 167 B 0 B
build/block-library/blocks/paragraph/editor-rtl.css 157 B 0 B
build/block-library/blocks/paragraph/editor.css 157 B 0 B
build/block-library/blocks/paragraph/style-rtl.css 247 B 0 B
build/block-library/blocks/paragraph/style.css 248 B 0 B
build/block-library/blocks/post-author/editor-rtl.css 209 B 0 B
build/block-library/blocks/post-author/editor.css 209 B 0 B
build/block-library/blocks/post-author/style-rtl.css 183 B 0 B
build/block-library/blocks/post-author/style.css 184 B 0 B
build/block-library/blocks/post-comments-form/style-rtl.css 250 B 0 B
build/block-library/blocks/post-comments-form/style.css 250 B 0 B
build/block-library/blocks/post-content/editor-rtl.css 139 B 0 B
build/block-library/blocks/post-content/editor.css 139 B 0 B
build/block-library/blocks/post-excerpt/editor-rtl.css 73 B 0 B
build/block-library/blocks/post-excerpt/editor.css 73 B 0 B
build/block-library/blocks/post-excerpt/style-rtl.css 69 B 0 B
build/block-library/blocks/post-excerpt/style.css 69 B 0 B
build/block-library/blocks/post-featured-image/editor-rtl.css 338 B 0 B
build/block-library/blocks/post-featured-image/editor.css 338 B 0 B
build/block-library/blocks/post-featured-image/style-rtl.css 100 B 0 B
build/block-library/blocks/post-featured-image/style.css 100 B 0 B
build/block-library/blocks/post-title/style-rtl.css 60 B 0 B
build/block-library/blocks/post-title/style.css 60 B 0 B
build/block-library/blocks/preformatted/style-rtl.css 103 B 0 B
build/block-library/blocks/preformatted/style.css 103 B 0 B
build/block-library/blocks/pullquote/editor-rtl.css 183 B 0 B
build/block-library/blocks/pullquote/editor.css 183 B 0 B
build/block-library/blocks/pullquote/style-rtl.css 318 B 0 B
build/block-library/blocks/pullquote/style.css 318 B 0 B
build/block-library/blocks/query-loop/editor-rtl.css 83 B 0 B
build/block-library/blocks/query-loop/editor.css 82 B 0 B
build/block-library/blocks/query-loop/style-rtl.css 315 B 0 B
build/block-library/blocks/query-loop/style.css 317 B 0 B
build/block-library/blocks/query-pagination-numbers/editor-rtl.css 122 B 0 B
build/block-library/blocks/query-pagination-numbers/editor.css 121 B 0 B
build/block-library/blocks/query-pagination/editor-rtl.css 270 B 0 B
build/block-library/blocks/query-pagination/editor.css 262 B 0 B
build/block-library/blocks/query-pagination/style-rtl.css 168 B 0 B
build/block-library/blocks/query-pagination/style.css 168 B 0 B
build/block-library/blocks/query-title/editor-rtl.css 86 B 0 B
build/block-library/blocks/query-title/editor.css 86 B 0 B
build/block-library/blocks/query/editor-rtl.css 810 B 0 B
build/block-library/blocks/query/editor.css 809 B 0 B
build/block-library/blocks/quote/style-rtl.css 169 B 0 B
build/block-library/blocks/quote/style.css 169 B 0 B
build/block-library/blocks/rss/editor-rtl.css 201 B 0 B
build/block-library/blocks/rss/editor.css 202 B 0 B
build/block-library/blocks/rss/style-rtl.css 290 B 0 B
build/block-library/blocks/rss/style.css 290 B 0 B
build/block-library/blocks/search/editor-rtl.css 189 B 0 B
build/block-library/blocks/search/editor.css 189 B 0 B
build/block-library/blocks/search/style-rtl.css 359 B 0 B
build/block-library/blocks/search/style.css 362 B 0 B
build/block-library/blocks/separator/editor-rtl.css 99 B 0 B
build/block-library/blocks/separator/editor.css 99 B 0 B
build/block-library/blocks/separator/style-rtl.css 251 B 0 B
build/block-library/blocks/separator/style.css 251 B 0 B
build/block-library/blocks/shortcode/editor-rtl.css 512 B 0 B
build/block-library/blocks/shortcode/editor.css 512 B 0 B
build/block-library/blocks/site-logo/editor-rtl.css 438 B 0 B
build/block-library/blocks/site-logo/editor.css 438 B 0 B
build/block-library/blocks/site-logo/style-rtl.css 150 B 0 B
build/block-library/blocks/site-logo/style.css 150 B 0 B
build/block-library/blocks/social-link/editor-rtl.css 164 B 0 B
build/block-library/blocks/social-link/editor.css 165 B 0 B
build/block-library/blocks/social-links/editor-rtl.css 796 B 0 B
build/block-library/blocks/social-links/editor.css 795 B 0 B
build/block-library/blocks/social-links/style-rtl.css 1.32 kB 0 B
build/block-library/blocks/social-links/style.css 1.33 kB 0 B
build/block-library/blocks/spacer/editor-rtl.css 308 B 0 B
build/block-library/blocks/spacer/editor.css 308 B 0 B
build/block-library/blocks/spacer/style-rtl.css 48 B 0 B
build/block-library/blocks/spacer/style.css 48 B 0 B
build/block-library/blocks/table/editor-rtl.css 478 B 0 B
build/block-library/blocks/table/editor.css 478 B 0 B
build/block-library/blocks/table/style-rtl.css 402 B 0 B
build/block-library/blocks/table/style.css 402 B 0 B
build/block-library/blocks/tag-cloud/editor-rtl.css 118 B 0 B
build/block-library/blocks/tag-cloud/editor.css 118 B 0 B
build/block-library/blocks/tag-cloud/style-rtl.css 94 B 0 B
build/block-library/blocks/tag-cloud/style.css 94 B 0 B
build/block-library/blocks/template-part/editor-rtl.css 552 B 0 B
build/block-library/blocks/template-part/editor.css 551 B 0 B
build/block-library/blocks/term-description/editor-rtl.css 90 B 0 B
build/block-library/blocks/term-description/editor.css 90 B 0 B
build/block-library/blocks/text-columns/editor-rtl.css 95 B 0 B
build/block-library/blocks/text-columns/editor.css 95 B 0 B
build/block-library/blocks/text-columns/style-rtl.css 166 B 0 B
build/block-library/blocks/text-columns/style.css 166 B 0 B
build/block-library/blocks/verse/style-rtl.css 87 B 0 B
build/block-library/blocks/verse/style.css 87 B 0 B
build/block-library/blocks/video/editor-rtl.css 504 B 0 B
build/block-library/blocks/video/editor.css 503 B 0 B
build/block-library/blocks/video/style-rtl.css 173 B 0 B
build/block-library/blocks/video/style.css 173 B 0 B
build/block-library/common-rtl.css 1.31 kB 0 B
build/block-library/common.css 1.31 kB 0 B
build/block-library/editor-rtl.css 9.77 kB 0 B
build/block-library/editor.css 9.76 kB 0 B
build/block-library/index.js 153 kB 0 B
build/block-library/reset-rtl.css 502 B 0 B
build/block-library/reset.css 503 B 0 B
build/block-library/style-rtl.css 9.43 kB 0 B
build/block-library/style.css 9.43 kB 0 B
build/block-library/theme-rtl.css 692 B 0 B
build/block-library/theme.css 693 B 0 B
build/block-serialization-default-parser/index.js 1.87 kB 0 B
build/block-serialization-spec-parser/index.js 3.06 kB 0 B
build/blocks/index.js 48.5 kB 0 B
build/components/index.js 286 kB 0 B
build/components/style-rtl.css 16.3 kB 0 B
build/components/style.css 16.3 kB 0 B
build/compose/index.js 11.2 kB 0 B
build/core-data/index.js 17.1 kB 0 B
build/customize-widgets/index.js 7.08 kB 0 B
build/customize-widgets/style-rtl.css 630 B 0 B
build/customize-widgets/style.css 631 B 0 B
build/data-controls/index.js 835 B 0 B
build/data/index.js 8.88 kB 0 B
build/date/index.js 31.9 kB 0 B
build/deprecated/index.js 787 B 0 B
build/dom-ready/index.js 577 B 0 B
build/dom/index.js 5.1 kB 0 B
build/edit-navigation/index.js 17 kB 0 B
build/edit-navigation/style-rtl.css 2.86 kB 0 B
build/edit-navigation/style.css 2.86 kB 0 B
build/edit-post/classic-rtl.css 454 B 0 B
build/edit-post/classic.css 454 B 0 B
build/edit-post/index.js 338 kB 0 B
build/edit-post/style-rtl.css 6.97 kB 0 B
build/edit-post/style.css 6.96 kB 0 B
build/edit-site/index.js 28.3 kB 0 B
build/edit-site/style-rtl.css 4.9 kB 0 B
build/edit-site/style.css 4.89 kB 0 B
build/edit-widgets/index.js 15.7 kB 0 B
build/edit-widgets/style-rtl.css 2.97 kB 0 B
build/edit-widgets/style.css 2.98 kB 0 B
build/editor/index.js 42.5 kB 0 B
build/editor/style-rtl.css 3.92 kB 0 B
build/editor/style.css 3.92 kB 0 B
build/element/index.js 4.61 kB 0 B
build/escape-html/index.js 735 B 0 B
build/format-library/index.js 6.75 kB 0 B
build/format-library/style-rtl.css 637 B 0 B
build/format-library/style.css 639 B 0 B
build/hooks/index.js 2.28 kB 0 B
build/html-entities/index.js 623 B 0 B
build/i18n/index.js 4.04 kB 0 B
build/is-shallow-equal/index.js 698 B 0 B
build/keyboard-shortcuts/index.js 2.52 kB 0 B
build/keycodes/index.js 1.95 kB 0 B
build/list-reusable-blocks/index.js 3.19 kB 0 B
build/list-reusable-blocks/style-rtl.css 629 B 0 B
build/list-reusable-blocks/style.css 628 B 0 B
build/media-utils/index.js 5.38 kB 0 B
build/notices/index.js 1.85 kB 0 B
build/nux/index.js 3.41 kB 0 B
build/nux/style-rtl.css 731 B 0 B
build/nux/style.css 727 B 0 B
build/plugins/index.js 2.95 kB 0 B
build/primitives/index.js 1.42 kB 0 B
build/priority-queue/index.js 791 B 0 B
build/react-i18n/index.js 1.46 kB 0 B
build/redux-routine/index.js 2.84 kB 0 B
build/reusable-blocks/index.js 3.78 kB 0 B
build/reusable-blocks/style-rtl.css 225 B 0 B
build/reusable-blocks/style.css 225 B 0 B
build/rich-text/index.js 13.5 kB 0 B
build/server-side-render/index.js 2.6 kB 0 B
build/shortcode/index.js 1.7 kB 0 B
build/token-list/index.js 1.27 kB 0 B
build/url/index.js 3.02 kB 0 B
build/viewport/index.js 1.86 kB 0 B
build/warning/index.js 1.14 kB 0 B
build/wordcount/index.js 1.22 kB 0 B

compressed-size-action

Copy link
Contributor

@kjellr kjellr left a comment

Choose a reason for hiding this comment

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

👍

@creativecoder
Copy link
Contributor

Note there's at least 1 change that needs to be made to e2e tests with v0.4.4 of tt1-blocks:

// TODO: Change General to Headers once TT1 blocks categorise the template parts

@ockham
Copy link
Contributor Author

ockham commented Mar 22, 2021

I just noticed that while the version of TT1 Blocks was indeed bumped to 0.4.4, no git tag was added (as e2e tests revealed:

GitError: fatal: couldn't find remote ref [email protected]

So it looks like we'll have to take care of that first 😬

@kjellr
Copy link
Contributor

kjellr commented Mar 22, 2021

Sorry about that! I've published a new release for TT1 Blocks.

@ockham
Copy link
Contributor Author

ockham commented Mar 22, 2021

Sorry about that! I've published a new release for TT1 Blocks.

Thanks a lot @kjellr!

@ockham ockham force-pushed the update/wp-env-tt1-blocks-0-4-4 branch from 185574e to e7eef51 Compare March 22, 2021 17:14
@ockham
Copy link
Contributor Author

ockham commented Mar 22, 2021

Note there's at least 1 change that needs to be made to e2e tests with v0.4.4 of tt1-blocks:

// TODO: Change General to Headers once TT1 blocks categorise the template parts

Thanks @creativecoder! Fixed in e7eef51.

@ockham
Copy link
Contributor Author

ockham commented Mar 23, 2021

e2e tests are currently failing at the following line:

const allBlocks = await getAllBlocks();
await selectBlockByClientId( allBlocks[ 0 ].clientId );

It seems like the getAllBlocks() call now returns undefined 😕 I didn't see at a glance what might've changed in TT1-Blocks v0.4.4.

@ockham ockham requested review from Addison-Stavlo and a team April 1, 2021 13:07
@Addison-Stavlo
Copy link
Contributor

Is it possible that both WP_TEMPLATE_PART_AREA_UNCATEGORIZED and $template->area are undefined here?

I don't think so, just testing it out they are outputting the expected string values when the tests run ('header','uncategorized',etc.) and not undefined. Do php unit tests on CI somehow run off the theme version on trunk and not the PR or something? 🤔 Anyways, I don't mean to stall this PR on it but its something to be aware of in case they start failing after merge or something.

@ockham
Copy link
Contributor Author

ockham commented Apr 2, 2021

Is it possible that both WP_TEMPLATE_PART_AREA_UNCATEGORIZED and $template->area are undefined here?

I don't think so, just testing it out they are outputting the expected string values when the tests run ('header','uncategorized',etc.) and not undefined. Do php unit tests on CI somehow run off the theme version on trunk and not the PR or something? 🤔

Doesn't seem like:

- name: Running single site unit tests
run: npm run test-unit-php
if: ${{ success() || failure() }}
- name: Running multisite unit tests
run: npm run test-unit-php-multisite
if: ${{ success() || failure() }}

Plus I can repro locally.

I checked the locally generated docker-compose.yml, it seems fine -- volumes for TT1 Blocks are mounted for pretty much all relevant services (wordpress, tests-wordpress, phpunit) 🤔

TT1 Blocks seems to set template areas fine: https://github.com/WordPress/theme-experiments/blob/tt1-blocks%400.4.5/tt1-blocks/experimental-theme.json

Anyways, I don't mean to stall this PR on it but its something to be aware of in case they start failing after merge or something.

Yeah, definitely something we should figure out 🤔

Any chance there's actually something wrong with the controller logic edit: gutenberg_get_block_template?

@ockham
Copy link
Contributor Author

ockham commented Apr 2, 2021

Using this to track down the issue:

npm run test-unit-php -- /var/www/html/wp-content/plugins/gutenberg/phpunit/class-block-templates-test.php

@ockham
Copy link
Contributor Author

ockham commented Apr 2, 2021

I believe I've tracked it down to this line returning false:

if ( WP_Theme_JSON_Resolver::theme_has_support() ) {

@ockham
Copy link
Contributor Author

ockham commented Apr 2, 2021

Tracked it down further: WP_Theme_JSON_Resolver::theme_has_support() tries to locate experimental-theme.json in get_stylesheet_directory():

/**
* Builds the path to the given file
* and checks that it is readable.
*
* If it isn't, returns an empty string,
* otherwise returns the whole file path.
*
* @param string $file_name Name of the file.
* @return string The whole file path or empty if the file doesn't exist.
*/
private static function get_file_path_from_theme( $file_name ) {
// This used to be a locate_template call.
// However, that method proved problematic
// due to its use of constants (STYLESHEETPATH)
// that threw errors in some scenarios.
//
// When the theme.json merge algorithm properly supports
// child themes, this should also fallback
// to the template path, as locate_template did.
$located = '';
$candidate = get_stylesheet_directory() . '/' . $file_name;
if ( is_readable( $candidate ) ) {
$located = $candidate;
}
return $located;
}

But when this function is called, get_stylesheet_directory() points to the default theme's directory for me.

So I guess it's another instance of the "calling a theme related function before WP has switched to that theme" 😬

cc/ @nosolosw

@ockham
Copy link
Contributor Author

ockham commented Apr 2, 2021

Tracked it down further: WP_Theme_JSON_Resolver::theme_has_support() tries to locate experimental-theme.json in get_stylesheet_directory():
[...]
But when this function is called, get_stylesheet_directory() points to the default theme's directory for me.

So I guess it's another instance of the "calling a theme related function before WP has switched to that theme" 😬

To be precise, I think that that happens when WP_Theme_JSON_Resolver::theme_has_support() is called for the first time (possibly before this logic is run?) But that sets WP_Theme_JSON_Resolver::$theme_has_support to false, and that cache value is then used as the return value for WP_Theme_JSON_Resolver::theme_has_support() the next time it's called.

@ockham
Copy link
Contributor Author

ockham commented Apr 2, 2021

Tracked it down further: WP_Theme_JSON_Resolver::theme_has_support() tries to locate experimental-theme.json in get_stylesheet_directory():
[...]
But when this function is called, get_stylesheet_directory() points to the default theme's directory for me.
So I guess it's another instance of the "calling a theme related function before WP has switched to that theme" 😬

To be precise, I think that that happens when WP_Theme_JSON_Resolver::theme_has_support() is called for the first time (possibly before this logic is run?) But that sets WP_Theme_JSON_Resolver::$theme_has_support to false, and that cache value is then used as the return value for WP_Theme_JSON_Resolver::theme_has_support() the next time it's called.

Filed an issue: #30478

@ockham ockham force-pushed the update/wp-env-tt1-blocks-0-4-4 branch from 4601f72 to 5eb999b Compare April 2, 2021 19:34
@ockham
Copy link
Contributor Author

ockham commented Apr 2, 2021

I've unreverted the unit tests update, which will cause PHP unit tests to fail on this PR. This will block the PR until #30478 is fixed (hopefully by #30479), which I think is okay.

@ockham ockham added the [Status] Blocked Used to indicate that a current effort isn't able to move forward label Apr 2, 2021
@oandregal
Copy link
Member

👋 Not sure if relevant, but I see this notice message when loading a request:

[05-Apr-2021 10:32:34 UTC] PHP Notice:  Undefined property: WP_Block_Template::$area in /home/andres/src/gutenberg/lib/full-site-editing/class-wp-rest-templates-controller.php on line 413
[05-Apr-2021 10:32:34 UTC] PHP Stack trace:
[05-Apr-2021 10:32:34 UTC] PHP   1. {main}() /home/andres/flywheel-sites/gutenbergdev/app/public/index.php:0
[05-Apr-2021 10:32:34 UTC] PHP   2. require() /home/andres/flywheel-sites/gutenbergdev/app/public/index.php:17
[05-Apr-2021 10:32:34 UTC] PHP   3. wp() /home/andres/flywheel-sites/gutenbergdev/app/public/wp-blog-header.php:16
[05-Apr-2021 10:32:34 UTC] PHP   4. WP->main() /home/andres/flywheel-sites/gutenbergdev/app/public/wp-includes/functions.php:1291
[05-Apr-2021 10:32:34 UTC] PHP   5. WP->parse_request() /home/andres/flywheel-sites/gutenbergdev/app/public/wp-includes/class-wp.php:750
[05-Apr-2021 10:32:34 UTC] PHP   6. do_action_ref_array() /home/andres/flywheel-sites/gutenbergdev/app/public/wp-includes/class-wp.php:388
[05-Apr-2021 10:32:34 UTC] PHP   7. WP_Hook->do_action() /home/andres/flywheel-sites/gutenbergdev/app/public/wp-includes/plugin.php:551
[05-Apr-2021 10:32:34 UTC] PHP   8. WP_Hook->apply_filters() /home/andres/flywheel-sites/gutenbergdev/app/public/wp-includes/class-wp-hook.php:316
[05-Apr-2021 10:32:34 UTC] PHP   9. rest_api_loaded() /home/andres/flywheel-sites/gutenbergdev/app/public/wp-includes/class-wp-hook.php:292
[05-Apr-2021 10:32:34 UTC] PHP  10. WP_REST_Server->serve_request() /home/andres/flywheel-sites/gutenbergdev/app/public/wp-includes/rest-api.php:354
[05-Apr-2021 10:32:34 UTC] PHP  11. WP_REST_Server->dispatch() /home/andres/flywheel-sites/gutenbergdev/app/public/wp-includes/rest-api/class-wp-rest-server.php:412
[05-Apr-2021 10:32:34 UTC] PHP  12. WP_REST_Server->respond_to_request() /home/andres/flywheel-sites/gutenbergdev/app/public/wp-includes/rest-api/class-wp-rest-server.php:985
[05-Apr-2021 10:32:34 UTC] PHP  13. WP_REST_Templates_Controller->get_items() /home/andres/flywheel-sites/gutenbergdev/app/public/wp-includes/rest-api/class-wp-rest-server.php:1139
[05-Apr-2021 10:32:34 UTC] PHP  14. WP_REST_Templates_Controller->prepare_item_for_response() /home/andres/src/gutenberg/lib/full-site-editing/class-wp-rest-templates-controller.php:146

(leaving a comment on the issue about theme.json support #30478, not sure I can repro the failure)

@Addison-Stavlo
Copy link
Contributor

Filed an issue: #30478

Great digging, thanks for figuring out the cause of that! I think what you are proposing on that issue makes sense.

@ockham
Copy link
Contributor Author

ockham commented Apr 14, 2021

The issue should now be fixed by #30830. Going to rebase 🤞

@ockham ockham force-pushed the update/wp-env-tt1-blocks-0-4-4 branch from 5eb999b to d201cf8 Compare April 14, 2021 15:03
@ockham
Copy link
Contributor Author

ockham commented Apr 14, 2021

Pushed one more commit to fix one remaining unit test. Should be ready for another look now 🙂

@ockham ockham removed the [Status] Blocked Used to indicate that a current effort isn't able to move forward label Apr 14, 2021
@ockham ockham merged commit 82ddc9e into trunk Apr 15, 2021
@ockham ockham deleted the update/wp-env-tt1-blocks-0-4-4 branch April 15, 2021 09:26
@github-actions github-actions bot added this to the Gutenberg 10.5 milestone Apr 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Type] Automated Testing Testing infrastructure changes impacting the execution of end-to-end (E2E) and/or unit tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants