Merge pull request #2261 from boltdesignsystem/feature/DS-489-twig-de…

…precations DS-489 twig deprecations
boltdesignsystem · Jul 15, 2021 · 1440ccd · 1440ccd
2 parents c9426c0 + 299a8d3
commit 1440ccd
Show file tree

Hide file tree

Showing 53 changed files with 95 additions and 93 deletions.
diff --git a/docs-site/src/components/pattern-lab-utils/_schema-docs-macros.twig b/docs-site/src/components/pattern-lab-utils/_schema-docs-macros.twig
@@ -164,9 +164,9 @@
       <!-- default value -->
       <td class="c-bds-docs-table__col">
 
-        {% if prop.default is sameas(false) %}
+        {% if prop.default is same as(false) %}
           <code>false</code>
-        {% elseif prop.default is sameas(true) %}
+        {% elseif prop.default is same as(true) %}
           <code>true</code>
         {% elseif prop.default is empty %}
           —
@@ -273,9 +273,9 @@
                     <!-- default value -->
                     <td class="c-bds-docs-table__col">
 
-                      {% if prop.default is sameas(false) %}
+                      {% if prop.default is same as(false) %}
                         <code>false</code>
-                      {% elseif prop.default is sameas(true) %}
+                      {% elseif prop.default is same as(true) %}
                         <code>true</code>
                       {% elseif prop.default is empty %}
                         —
@@ -338,9 +338,9 @@
                         <!-- default value -->
                         <td class="c-bds-docs-table__col">
 
-                          {% if prop.default is sameas(false) %}
+                          {% if prop.default is same as(false) %}
                             <code>false</code>
-                          {% elseif prop.default is sameas(true) %}
+                          {% elseif prop.default is same as(true) %}
                             <code>true</code>
                           {% elseif prop.default is empty %}
                             —
@@ -413,5 +413,5 @@
         </bolt-schema-table>
       </div>
     </details>
-  {% endif %}  
+  {% endif %}
 {% endmacro %}
diff --git a/...ern-lab/_patterns/40-components/action-blocks/15-action-blocks-borderless-variations.twig b/...ern-lab/_patterns/40-components/action-blocks/15-action-blocks-borderless-variations.twig
@@ -21,7 +21,7 @@
 
 {% for borderless in [true, false] %}
   <h3>
-    Borderless: {% if borderless is sameas(true) %}true{% elseif borderless is sameas(false) %}false{% endif %}
+    Borderless: {% if borderless is same as(true) %}true{% elseif borderless is same as(false) %}false{% endif %}
   </h3>
   <div class="u-bolt-margin-bottom-medium">
     {% include "@bolt-components-action-blocks/action-blocks.twig" with {

diff --git a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/05-text.twig b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/05-text.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% set text_demo %}
 <bolt-text>
@@ -15,6 +16,3 @@
   </bolt-text>
   {% include text_code.code_example(text_demo, true) %}
 {% endblock %}
-
-
-
diff --git a/...-site/src/pages/pattern-lab/_patterns/40-components/text/10-text-typographic-recipes.twig b/...-site/src/pages/pattern-lab/_patterns/40-components/text/10-text-typographic-recipes.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% block content %}
   <bolt-text headline>

diff --git a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/15-text-tag-variations.twig b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/15-text-tag-variations.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% block content %}
   <bolt-text headline>

diff --git a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/20-text-display-variations.twig b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/20-text-display-variations.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% set text_demo %}
 <bolt-text display="block">

diff --git a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/25-text-color-variations.twig b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/25-text-color-variations.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% block content %}
   <bolt-text headline>

diff --git a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/30-text-align-variations.twig b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/30-text-align-variations.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% block content %}
   <bolt-text headline>

diff --git a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/35-text-opacity-variations.twig b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/35-text-opacity-variations.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% block content %}
   <bolt-text headline>

diff --git a/docs-site/src/pages/pattern-lab/_patterns/40-components/text/40-text-quoted.twig b/docs-site/src/pages/pattern-lab/_patterns/40-components/text/40-text-quoted.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% block content %}
   <bolt-text headline>

diff --git a/...te/src/pages/pattern-lab/_patterns/40-components/text/45-text-line-height-variations.twig b/...te/src/pages/pattern-lab/_patterns/40-components/text/45-text-line-height-variations.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% block content %}
   <bolt-text headline>

diff --git a/...src/pages/pattern-lab/_patterns/40-components/text/50-text-letter-spacing-variations.twig b/...src/pages/pattern-lab/_patterns/40-components/text/50-text-letter-spacing-variations.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% block content %}
   <bolt-text headline>

diff --git a/...site/src/pages/pattern-lab/_patterns/40-components/text/55-text-transform-variations.twig b/...site/src/pages/pattern-lab/_patterns/40-components/text/55-text-transform-variations.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% block content %}
   <bolt-text headline>

diff --git a/...te/src/pages/pattern-lab/_patterns/40-components/text/60-text-font-family-variations.twig b/...te/src/pages/pattern-lab/_patterns/40-components/text/60-text-font-family-variations.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% block content %}
   <bolt-text headline>

diff --git a/...site/src/pages/pattern-lab/_patterns/40-components/text/65-text-font-size-variations.twig b/...site/src/pages/pattern-lab/_patterns/40-components/text/65-text-font-size-variations.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% block content %}
   <bolt-text headline>

diff --git a/...ite/src/pages/pattern-lab/_patterns/40-components/text/70-text-font-style-variations.twig b/...ite/src/pages/pattern-lab/_patterns/40-components/text/70-text-font-style-variations.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% block content %}
   <bolt-text headline>

diff --git a/...te/src/pages/pattern-lab/_patterns/40-components/text/75-text-font-weight-variations.twig b/...te/src/pages/pattern-lab/_patterns/40-components/text/75-text-font-weight-variations.twig
@@ -1,4 +1,5 @@
 {% extends "@pl/_text-doc-template.twig" %}
+{% import "@pl/_text-doc-template.twig" as text_code %}
 
 {% block content %}
   <bolt-text headline>

diff --git a/...pattern-lab/_patterns/50-pages/60-academy/04-templates/_academy-detail-page-template.twig b/...pattern-lab/_patterns/50-pages/60-academy/04-templates/_academy-detail-page-template.twig
@@ -2,8 +2,8 @@
   document.getElementsByTagName("body")[0].setAttribute("class", "e-bolt-printable");
 </script>
 
-{% set pageControls = block("page_controls") %}
-{% set sideNav = block("side_nav") %}
+{% set pageControls = block("page_controls") is defined ? block("page_controls") : '' %}
+{% set sideNav = block("side_nav") is defined ? block("side_nav") : '' %}
 {% set breadcrumbs = [
   {
     "text": "Home",

diff --git a/...attern-lab/_patterns/50-pages/60-academy/04-templates/_academy-landing-page-template.twig b/...attern-lab/_patterns/50-pages/60-academy/04-templates/_academy-landing-page-template.twig
@@ -1,4 +1,4 @@
-{% if block("page_content") %}
+{% if block("page_content") is defined %}
   {% set mainContentBlock %}
     {{ block("page_content") }}
   {% endset %}

diff --git a/packages/components/bolt-accordion/src/AccordionItem/accordion-item.twig b/packages/components/bolt-accordion/src/AccordionItem/accordion-item.twig
@@ -60,7 +60,7 @@
 {% set outer_classes = [] %}
 {% set inner_classes = classes %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with "is-" or class starts with "has-" %}
     {% set inner_classes = inner_classes|merge([class]) %}
   {% elseif class starts with "c-bolt-" == false %}

diff --git a/packages/components/bolt-accordion/src/accordion.twig b/packages/components/bolt-accordion/src/accordion.twig
@@ -23,7 +23,7 @@
 {% set outer_classes = [] %}
 {% set inner_classes = classes %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with "is-" or class starts with "has-" %}
     {% set inner_classes = inner_classes|merge([class]) %}
   {% elseif class starts with "c-bolt-" == false %}

diff --git a/packages/components/bolt-action-blocks/src/action-blocks.twig b/packages/components/bolt-action-blocks/src/action-blocks.twig
@@ -19,9 +19,9 @@
 {% endif %}
 
 {# DEPRECATED: use borderless instead #}
-{% if border is sameas(true) %}
+{% if border is same as(true) %}
   {% set borderless = false %}
-{% elseif border is sameas(false) %}
+{% elseif border is same as(false) %}
   {% set borderless = true %}
 {% endif %}
 
@@ -56,7 +56,7 @@
 {% set outer_classes = [] %}
 {% set inner_classes = classes %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with "is-" or class starts with "has-" %}
     {% set inner_classes = inner_classes|merge([class]) %}
   {% elseif class starts with "c-bolt-" == false %}

diff --git a/packages/components/bolt-band/src/band.twig b/packages/components/bolt-band/src/band.twig
@@ -5,7 +5,7 @@
 {% endif %}
 
 {# Deprecated #}
-{% if fullBleed is sameas(true) or fullBleed is sameas(false) %}
+{% if fullBleed is same as(true) or fullBleed is same as(false) %}
   {% set full_bleed = fullBleed %}
 {% endif %}
 {# row_gutter, content_row_start, items are also deprecated but this twig still supports them, see more comments below where items are being rendered #}

diff --git a/packages/components/bolt-banner/src/banner.twig b/packages/components/bolt-banner/src/banner.twig
@@ -23,7 +23,7 @@
 {% set outer_classes = [] %}
 {% set inner_classes = classes %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with 'is-' or class starts with 'has-' %}
     {% set inner_classes = inner_classes|merge([class]) %}
   {% elseif class starts with 'c-bolt-' == false %}

diff --git a/packages/components/bolt-blockquote/src/blockquote.twig b/packages/components/bolt-blockquote/src/blockquote.twig
@@ -43,7 +43,7 @@
 {% set outer_classes = [] %}
 {% set inner_classes = classes %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with "is-" or class starts with "has-" %}
     {% set inner_classes = inner_classes|merge([class]) %}
   {% elseif class starts with "c-bolt-" == false %}

diff --git a/packages/components/bolt-button/src/button.twig b/packages/components/bolt-button/src/button.twig
@@ -100,7 +100,7 @@ Sort classes passed in via attributes into two groups:
 {% set outer_classes = [] %}
 {% set inner_classes = classes %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with 'is-' == true %}
     {% set inner_classes = inner_classes|merge([class]) %}
   {% elseif class starts with 'has-' == true %}

diff --git a/.../components/bolt-card-replacement/src/card-replacement-media/_card-replacement-media.twig b/.../components/bolt-card-replacement/src/card-replacement-media/_card-replacement-media.twig
@@ -14,12 +14,12 @@
 {% if _card_replacement_media_content %}
   {{ _card_replacement_media_content }}
 {% else %}
-  {% if _card_replacement_image or block('media') %}
+  {% if _card_replacement_image or block('media') is defined %}
     <bolt-card-replacement-media {{ attributes }}>
       <ssr-keep for="bolt-card-replacement-media" class="c-bolt-card_replacement__media">
         {% if _card_replacement_image %}
           {% include '@bolt-components-image/image.twig' with _card_replacement_image only %}
-        {% elseif block('media') %}
+        {% elseif block('media') is defined %}
           {{ block('media') }}
         {% endif %}
       </ssr-keep>

diff --git a/packages/components/bolt-card-replacement/src/card-replacement/card-replacement.twig b/packages/components/bolt-card-replacement/src/card-replacement/card-replacement.twig
@@ -15,19 +15,19 @@
   {% set _link_attributes = create_attribute(link.attributes|default({})) %}
 {% endif %}
 
-{% if block('background') %}
+{% if block('background') is defined %}
   {% set _background_block %}
     {{ block('background') }}
   {% endset %}
 {% endif %}
 
-{% if block('media') %}
+{% if block('media') is defined %}
   {% set _media_block %}
     {{ block('media') }}
   {% endset %}
 {% endif %}
 
-{% if block('body') %}
+{% if block('body') is defined %}
   {% set _body_block %}
     {{ block('body') }}
   {% endset %}

diff --git a/packages/components/bolt-chip/src/chip.twig b/packages/components/bolt-chip/src/chip.twig
@@ -48,7 +48,7 @@
 {% set outer_classes = [] %}
 {% set inner_classes = classes %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with 'is-' or class starts with 'has-' %}
     {% set inner_classes = inner_classes|merge([class]) %}
   {% elseif class starts with 'c-bolt-' == false %}

diff --git a/packages/components/bolt-headline/src/_typography.twig b/packages/components/bolt-headline/src/_typography.twig
@@ -26,7 +26,7 @@
 {% set autoshrink = autoshrink is defined ? autoshrink : schema.properties.autoshrink.default %}
 
 {# For backwards compatibility only, setting icon to exactly 'false' is the same as specifying 'none'.  Deprecated. #}
-{% if icon is sameas(false) %}
+{% if icon is same as(false) %}
   {% set icon = "none" %}
 {% endif %}
 

diff --git a/packages/components/bolt-image/src/image.twig b/packages/components/bolt-image/src/image.twig
@@ -5,7 +5,7 @@
 {% endif %}
 
 {# DEPRECATED. 'ratio' should be a string, but boolean was previously supported. Boolean is now DEPRECATED. #}
-{% if ratio is sameas(false) or ratio is sameas(true) %}
+{% if ratio is same as(false) or ratio is same as(true) %}
   {% set _ratio_bool = ratio %}
 {% else %}
   {% set _ratio_string = ratio %}
@@ -37,7 +37,7 @@
 {% set _ph_image = placeholder_image|default(_image_data_bolt.base64|default(schema.properties.placeholder_image.default)) %}
 
 {% set _use_ratio = useAspectRatio or _ratio_bool ?? true %}
-{% set _can_use_ratio = _use_ratio is sameas(true) and _ratio_string != 'none' and width > 0 and height > 0 and not cover %}
+{% set _can_use_ratio = _use_ratio is same as(true) and _ratio_string != 'none' and width > 0 and height > 0 and not cover %}
 {# Only JPGs allowed, PNGs can have transparency and may not look right layered over placeholder #}
 {% set _can_use_placeholder = _can_use_ratio or cover %}
 

diff --git a/packages/components/bolt-link/src/link.twig b/packages/components/bolt-link/src/link.twig
@@ -69,7 +69,7 @@ Sort classes passed in via attributes into two groups:
 {% set outer_classes = [] %}
 {% set inner_classes = classes %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with 'is-' or class starts with 'has-' %}
     {% set inner_classes = inner_classes|merge([class]) %}
   {% elseif class starts with 'c-bolt-' == false %}

diff --git a/packages/components/bolt-list/src/list.twig b/packages/components/bolt-list/src/list.twig
@@ -24,8 +24,8 @@
 {% set separator = separator in separator_options ? separator : schema.properties.separator.default %}
 {% set align = align in align_options ? align : schema.properties.align.default %}
 {% set valign = valign in valign_options ? valign : schema.properties.valign.default %}
-{% set inset = inset is sameas(true) or inset is sameas(false) ? inset : schema.properties.inset.default %}
-{% set nowrap = nowrap is sameas(true) or nowrap is sameas(false) ? nowrap : schema.properties.nowrap.default %}
+{% set inset = inset is same as(true) or inset is same as(false) ? inset : schema.properties.inset.default %}
+{% set nowrap = nowrap is same as(true) or nowrap is same as(false) ? nowrap : schema.properties.nowrap.default %}
 
 {# Conditions for the semantic tag usage #}
 {% if tag == "ol" or tag == "ul" %}

diff --git a/packages/components/bolt-menu/src/menu.twig b/packages/components/bolt-menu/src/menu.twig
@@ -22,7 +22,7 @@
 {% set outer_classes = [] %}
 {% set inner_classes = classes %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with 'is-' or class starts with 'has-' %}
     {% set inner_classes = inner_classes|merge([class]) %}
   {% elseif class starts with 'c-bolt-' == false %}

diff --git a/packages/components/bolt-modal/src/modal.twig b/packages/components/bolt-modal/src/modal.twig
@@ -9,7 +9,7 @@
 {% set uuid = this.data.uuid|default(bolt.data.config.env == "test" ? "12345" : random()) %}
 {% set outer_classes = [] %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with "c-bolt-" == false %}
     {% set outer_classes = outer_classes|merge([class]) %}
   {% endif %}

diff --git a/packages/components/bolt-navbar/src/navbar-li.twig b/packages/components/bolt-navbar/src/navbar-li.twig
@@ -14,7 +14,7 @@
   'js-bolt-navbar-item'
 ] %}
 
-{% if this.data.current.value is sameas(true) %}
+{% if this.data.current.value is same as(true) %}
   {% set attributes = attributes.setAttribute('data-bolt-current') %}
 {% endif %}
 

diff --git a/packages/components/bolt-navbar/src/navbar.twig b/packages/components/bolt-navbar/src/navbar.twig
@@ -19,7 +19,7 @@
   content ? 'c-bolt-navbar--custom' : ''
 ] %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% set classes = classes|merge([class]) %}
 {% endfor %}
 

diff --git a/packages/components/bolt-page-header/src/page-header.twig b/packages/components/bolt-page-header/src/page-header.twig
@@ -20,7 +20,7 @@
 {% set attributes = attributes.setAttribute('data-bolt-page-header-desktop-bp', bolt.data.breakpoints.large) %}
 
 {# Set data-attribute used by Navbar for calculating offset. #}
-{% if this.data.static.value is sameas(false) %}
+{% if this.data.static.value is same as(false) %}
   {% set attributes = attributes.setAttribute('data-bolt-sticky-header', '') %}
 {% endif %}
 

diff --git a/packages/components/bolt-popover/src/popover.twig b/packages/components/bolt-popover/src/popover.twig
@@ -20,7 +20,7 @@
 {% set outer_classes = [] %}
 {% set inner_classes = classes %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with "is-" or class starts with "has-" %}
     {% set inner_classes = inner_classes|merge([class]) %}
   {% elseif class starts with "c-bolt-" == false %}

diff --git a/packages/components/bolt-stack/src/stack.twig b/packages/components/bolt-stack/src/stack.twig
@@ -15,7 +15,7 @@
 #}
 {% set outer_classes = [] %}
 
-{% for class in this.props.class %}
+{% for class in this.props['class'] %}
   {% if class starts with 'c-bolt-' == false %}
     {% set outer_classes = outer_classes|merge([class]) %}
   {% endif %}