Skip to content

[Task] Remove deferred blocks and rybakit/twig-deferred-extension #600

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Sep 25, 2024
Merged

[Task] Remove deferred blocks and rybakit/twig-deferred-extension #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
751b3ae
remove twig deferred extension usages
kingjia90 Sep 25, 2024
28689f1
Merge remote-tracking branch 'origin/2024.x' into deferred-remove
kingjia90 Sep 25, 2024
59b65d2
Update services.yaml
kingjia90 Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,11 @@
"pimcore/ecommerce-framework-bundle": "*",
"pimcore/web-to-print-bundle": "*",
"pimcore/newsletter-bundle": "*",
"rybakit/twig-deferred-extension": "^3.0",
"symfony/runtime": "^6.2",
"symfony/intl": "^6.2",
"symfony/dotenv": "^6.2",
"gotenberg/gotenberg-php": "^1.1 || ^2.0"
},
"conflict": {
"twig/twig": "^3.9.0"
},
"suggest": {
"pimcore/elasticsearch-client": "Required for Elastic Search service"
},
Expand Down
5 changes: 0 additions & 5 deletions config/services.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,3 @@ services:
arguments:
- !service { class: PDO, factory: [ '@database_connection', 'getNativeConnection' ] }
- { lock_mode: 0 }

# the deferred extension is needed for placeholder helpers to work
# as otherwise the placeholder block would be rendered before any
# content was added (e.g. headTitle)
Twig\DeferredExtension\DeferredExtension: ~
5 changes: 0 additions & 5 deletions templates/areas/wysiwyg-with-images/view.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@

{% set content = pimcore_wysiwyg('content') %}

{# add autogenerated meta description #}
{% if document.getDescription() is empty %}
{% do pimcore_head_meta().setDescription(content.getData(), 160) %}
{% endif %}

<section class="area-wysiwyg">
<div class="row">
<div class="col-sm-8">
Expand Down
5 changes: 0 additions & 5 deletions templates/areas/wysiwyg/view.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
{% set content = pimcore_wysiwyg('content') %}

{# add autogenerated meta description #}
{% if document.getDescription() is empty %}
{% do pimcore_head_meta().setDescription(content.getData(), 160) %}
{% endif %}

<section class="area-wysiwyg">
{% apply pimcore_glossary %}
{{ content|raw }}
Expand Down
1 change: 0 additions & 1 deletion templates/includes/content-headline.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{% set headline = pimcore_input('headline') %}
{% do pimcore_head_title(headline.getData()) %}

<div class="page-header">
{# we need to pipe the editable through the raw filter here as we saved it to a variable #}
Expand Down
9 changes: 4 additions & 5 deletions templates/layouts/layout.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@
{% set isPortal = ((isPortal is defined) and isPortal) %}
{% endapply %}

{# we're using the deferred extension here to make sure this block is rendered after all helper calls #}
{% block layout_head_meta deferred %}
{% block layout_head_meta %}
{{ pimcore_head_title() }}
{{ pimcore_head_meta() }}

Expand All @@ -65,7 +64,7 @@

{% endblock %}

{% block head_stylesheets deferred %}
{% block head_stylesheets %}
{{ pimcore_head_link() }}
{% endblock %}

Expand Down Expand Up @@ -200,12 +199,12 @@
{{ pimcore_inc(document.getProperty('footer')) }}

{# output scripts added before #}
{% block headscripts deferred %}
{% block headscripts %}
{{ pimcore_head_script() }}
{% endblock %}


{% block inlinescripts deferred %}
{% block inlinescripts %}
{{ pimcore_inline_script() }}
{% endblock %}
</body>
Expand Down
8 changes: 4 additions & 4 deletions templates/layouts/print_catalog.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<html lang="">
<head>

{% block head_stylesheets deferred %}
{% block head_stylesheets %}
{{ pimcore_head_link() }}
{% endblock %}

Expand All @@ -24,11 +24,11 @@



{% block headscripts deferred %}
{% block headscripts %}
{{ pimcore_head_script() }}
{% endblock %}

{% block register_definition deferred %}
{% block register_definition %}
<style type="text/css">
{{ pimcore_placeholder('register-title-definition') }}
</style>
Expand All @@ -43,7 +43,7 @@



{% block inlinescripts deferred %}
{% block inlinescripts %}
{{ pimcore_inline_script() }}
{% endblock %}

Expand Down