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

Template Loader: Get rid of _wp_current_template_part_ids globals #22143

Merged
merged 9 commits into from
May 7, 2020

Conversation

ockham
Copy link
Contributor

@ockham ockham commented May 6, 2020

Description

Final piece of a refactor that started with #21959 and #21980.

This PR changes:

  1. The gutenberg_template_loader_filter_block_editor_settings filter to infer the current template ID from the $settings array it is given as an arg, allowing us to drop the $_wp_current_template_id global. Edit: I reverted this commit since it caused issues outside of FSE.
  2. The create_auto_draft_for_template_part_block function to return a list of template part IDs, and the gutenberg_find_template_post function to include that information in its return value, allowing us to drop the $_wp_current_template_part_ids global.

There's one commit for each change which should make reviewing a bit easier.

How has this been tested?

Verify that Full Site Editing still works as before.

Checklist:

  • My code is tested.
  • My code follows the WordPress code style.
  • My code follows the accessibility standards.
  • My code has proper inline documentation.
  • I've included developer documentation if appropriate.
  • I've updated all React Native files affected by any refactorings/renamings in this PR.

@github-actions
Copy link

github-actions bot commented May 6, 2020

Size Change: +2.22 kB (0%)

Total Size: 824 kB

Filename Size Change
build/block-directory/index.js 6.61 kB +7 B (0%)
build/block-editor/index.js 102 kB +638 B (0%)
build/block-editor/style-rtl.css 10.3 kB +130 B (1%)
build/block-editor/style.css 10.3 kB +128 B (1%)
build/block-library/index.js 115 kB -21 B (0%)
build/blocks/index.js 48.1 kB +4 B (0%)
build/components/index.js 180 kB +690 B (0%)
build/components/style-rtl.css 17 kB +42 B (0%)
build/components/style.css 16.9 kB +41 B (0%)
build/core-data/index.js 11.4 kB +14 B (0%)
build/data/index.js 8.44 kB +2 B (0%)
build/edit-navigation/index.js 4.4 kB +328 B (7%) 🔍
build/edit-navigation/style-rtl.css 618 B +133 B (21%) 🚨
build/edit-navigation/style.css 617 B +132 B (21%) 🚨
build/edit-post/index.js 28.1 kB -65 B (0%)
build/edit-post/style-rtl.css 12.2 kB +20 B (0%)
build/edit-post/style.css 12.2 kB +20 B (0%)
build/edit-site/index.js 12.2 kB -33 B (0%)
build/edit-site/style-rtl.css 5.21 kB +12 B (0%)
build/edit-site/style.css 5.21 kB +13 B (0%)
build/edit-widgets/index.js 8.37 kB +1 B
build/edit-widgets/style-rtl.css 4.69 kB +13 B (0%)
build/edit-widgets/style.css 4.69 kB +12 B (0%)
build/editor/editor-styles-rtl.css 425 B -3 B (0%)
build/editor/editor-styles.css 428 B -3 B (0%)
build/editor/index.js 44.3 kB -37 B (0%)
build/element/index.js 4.65 kB +2 B (0%)
build/format-library/index.js 7.63 kB -2 B (0%)
build/hooks/index.js 2.14 kB +7 B (0%)
build/list-reusable-blocks/index.js 3.12 kB -1 B
build/media-utils/index.js 5.29 kB -2 B (0%)
build/redux-routine/index.js 2.85 kB -3 B (0%)
build/rich-text/index.js 14.8 kB -1 B
ℹ️ View Unchanged
Filename Size Change
build/a11y/index.js 1.02 kB 0 B
build/annotations/index.js 3.62 kB 0 B
build/api-fetch/index.js 4.08 kB 0 B
build/autop/index.js 2.82 kB 0 B
build/blob/index.js 620 B 0 B
build/block-directory/style-rtl.css 760 B 0 B
build/block-directory/style.css 761 B 0 B
build/block-library/editor-rtl.css 7.08 kB 0 B
build/block-library/editor.css 7.08 kB 0 B
build/block-library/style-rtl.css 7.28 kB 0 B
build/block-library/style.css 7.29 kB 0 B
build/block-library/theme-rtl.css 683 B 0 B
build/block-library/theme.css 685 B 0 B
build/block-serialization-default-parser/index.js 1.88 kB 0 B
build/block-serialization-spec-parser/index.js 3.1 kB 0 B
build/compose/index.js 6.66 kB 0 B
build/data-controls/index.js 1.29 kB 0 B
build/date/index.js 5.47 kB 0 B
build/deprecated/index.js 772 B 0 B
build/dom-ready/index.js 568 B 0 B
build/dom/index.js 3.1 kB 0 B
build/editor/style-rtl.css 5.07 kB 0 B
build/editor/style.css 5.08 kB 0 B
build/escape-html/index.js 734 B 0 B
build/format-library/style-rtl.css 502 B 0 B
build/format-library/style.css 502 B 0 B
build/html-entities/index.js 622 B 0 B
build/i18n/index.js 3.56 kB 0 B
build/is-shallow-equal/index.js 710 B 0 B
build/keyboard-shortcuts/index.js 2.51 kB 0 B
build/keycodes/index.js 1.94 kB 0 B
build/list-reusable-blocks/style-rtl.css 226 B 0 B
build/list-reusable-blocks/style.css 226 B 0 B
build/notices/index.js 1.79 kB 0 B
build/nux/index.js 3.4 kB 0 B
build/nux/style-rtl.css 616 B 0 B
build/nux/style.css 613 B 0 B
build/plugins/index.js 2.56 kB 0 B
build/primitives/index.js 1.5 kB 0 B
build/priority-queue/index.js 789 B 0 B
build/server-side-render/index.js 2.67 kB 0 B
build/shortcode/index.js 1.7 kB 0 B
build/token-list/index.js 1.28 kB 0 B
build/url/index.js 4.02 kB 0 B
build/viewport/index.js 1.84 kB 0 B
build/warning/index.js 1.14 kB 0 B
build/wordcount/index.js 1.18 kB 0 B

compressed-size-action

@ockham ockham changed the title Template Loader: Get rid of _template_id and _template_part_ids globals Template Loader: Get rid of _wp_current_template_part_ids globals May 6, 2020
Copy link
Contributor

@epiqueras epiqueras left a comment

Choose a reason for hiding this comment

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

Awesome work!

@ockham
Copy link
Contributor Author

ockham commented May 7, 2020

I'll look into failing e2e tests.

@ockham
Copy link
Contributor Author

ockham commented May 7, 2020

Fixed tests, and changed a few variable and function names to represent better what they do. No functional changes -- going to merge 🙂

@ockham ockham merged commit f35f517 into master May 7, 2020
@ockham ockham deleted the update/template-hierarchy-globals branch May 7, 2020 18:52
@github-actions github-actions bot added this to the Gutenberg 8.1 milestone May 7, 2020
@ellatrix ellatrix mentioned this pull request Jun 16, 2020
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants