chore(deps): Bump y18n from 3.2.1 to 3.2.2

composer.json

@@ -12,8 +12,8 @@
     "require": {
         "cweagans/composer-patches": "^1.6.0",
         "oomphinc/composer-installers-extender": "^1.1 || ^2",
-        "drupal/core": "8.* || 9.*",
-        "drupal/bootstrap": "3.25"
+        "drupal/core": "9.* || 10.*",
+        "drupal/bootstrap": "3.29"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

config/optional/block.block.sidebar.yml

@@ -33,7 +33,7 @@ settings:
   render_parent: false
 visibility:
   node_type:
-    id: node_type
+    id: 'entity_bundle:node'
     bundles:
       page: page
     negate: false

config/optional/block.block.sidebar_fr.yml

@@ -29,7 +29,7 @@ settings:
   suggestion: sidebar_fr
 visibility:
   node_type:
-    id: node_type
+    id: 'entity_bundle:node'
     bundles:
       page: page
     negate: false

css/ckeditor5.css

@@ -0,0 +1,6 @@
+/**
+ * CKEditor5 styles.
+ */
+
+.ck-content {
+	min-height: 250px; }

sass/ckeditor5.scss

@@ -0,0 +1,7 @@
+/**
+ * CKEditor5 styles.
+ */
+
+.ck-content {
+	min-height: 250px;
+}

src/Plugin/Preprocess/Comment.php

@@ -19,6 +19,22 @@ class Comment extends PreprocessBase {
    */
   public function preprocessVariables(Variables $variables) {
     $variables['author'] = \Drupal::service('renderer')->render($elements);
+    $owner = $variables['comment']->getOwner();
+    if (empty($variables['author']) && $owner->id() === 0) {
+      $variables['author'] = $this->t('Anonymous');
+    }
+    if (empty($variables['author']) && $owner->isAuthenticated()) {
+      if ($owner->hasField('field_first_name') && $owner->hasField('field_last_name')) {
+        $first_name = $owner->get('field_first_name')->getString();
+        $last_name = $owner->get('field_last_name')->getString();
+        if (!empty($first_name) && !empty($last_name)) {
+          $variables['author'] = $first_name . ' ' . $last_name;
+        }
+      }
+    }
+    if (empty($variables['author'])) {
+      $variables['author'] = $variables['comment']->getAuthorName();
+    }
 
     // Getting the node creation time stamp from the comment object.
     $date = $variables['comment']->getCreatedTime();

templates/block/block--footer--gcweb--wxt-bootstrap-footer-contextual-fr.html.twig

@@ -40,16 +40,16 @@
   ]
 %}
 <div class="gc-contextual">
-  <div clas="container">
-    <nav{{ attributes.addClass(classes) }}>
-      {{ title_prefix }}
+  <nav{{ attributes.addClass(classes) }}>
+    {{ title_prefix }}
+    {% if label %}
       <h3>{{ label }}</h3>
-      {{ title_suffix }}
-      {% block content %}
-        <ul class="list-unstyled colcount-sm-2 colcount-md-3">
-        {{ content }}
-        </ul>
-      {% endblock %}
-    </nav>
-  </div>
+    {% endif %}
+    {{ title_suffix }}
+    {% block content %}
+      <ul class="list-unstyled colcount-sm-2 colcount-md-3">
+      {{ content }}
+      </ul>
+    {% endblock %}
+  </nav>
 </div>

templates/block/block--footer--gcweb--wxt-bootstrap-footer-contextual.html.twig

@@ -40,16 +40,16 @@
   ]
 %}
 <div class="gc-contextual">
-  <div clas="container">
-    <nav{{ attributes.addClass(classes) }}>
-      {{ title_prefix }}
+  <nav{{ attributes.addClass(classes) }}>
+    {{ title_prefix }}
+    {% if label %}
       <h3>{{ label }}</h3>
-      {{ title_suffix }}
-      {% block content %}
-        <ul class="list-unstyled colcount-sm-2 colcount-md-3">
-        {{ content }}
-        </ul>
-      {% endblock %}
-    </nav>
-  </div>
+    {% endif %}
+    {{ title_suffix }}
+    {% block content %}
+      <ul class="list-unstyled colcount-sm-2 colcount-md-3">
+      {{ content }}
+      </ul>
+    {% endblock %}
+  </nav>
 </div>

templates/block/block--footer--gcweb--wxt-bootstrap-footer-top-fr.html.twig

@@ -40,16 +40,14 @@
   ]
 %}
 <div class="gc-main-footer">
-  <div clas="container">
-    <nav{{ attributes.addClass(classes) }}>
-      {{ title_prefix }}
-      <h3>{{ 'Government of Canada'|t }}</h3>
-      {{ title_suffix }}
-      {% block content %}
-        <ul class="list-unstyled colcount-sm-2 colcount-md-3">
-        {{ content }}
-        </ul>
-      {% endblock %}
-    </nav>
-  </div>
+  <nav{{ attributes.addClass(classes) }}>
+    {{ title_prefix }}
+    <h3>{{ 'Government of Canada'|t }}</h3>
+    {{ title_suffix }}
+    {% block content %}
+      <ul class="list-unstyled colcount-sm-2 colcount-md-3">
+      {{ content }}
+      </ul>
+    {% endblock %}
+  </nav>
 </div>

templates/block/block--footer--gcweb--wxt-bootstrap-footer-top.html.twig

@@ -40,16 +40,14 @@
   ]
 %}
 <div class="gc-main-footer">
-  <div clas="container">
-    <nav{{ attributes.addClass(classes) }}>
-      {{ title_prefix }}
-      <h3>{{ 'Government of Canada'|t }}</h3>
-      {{ title_suffix }}
-      {% block content %}
-        <ul class="list-unstyled colcount-sm-2 colcount-md-3">
-        {{ content }}
-        </ul>
-      {% endblock %}
-    </nav>
-  </div>
+  <nav{{ attributes.addClass(classes) }}>
+    {{ title_prefix }}
+    <h3>{{ 'Government of Canada'|t }}</h3>
+    {{ title_suffix }}
+    {% block content %}
+      <ul class="list-unstyled colcount-sm-2 colcount-md-3">
+      {{ content }}
+      </ul>
+    {% endblock %}
+  </nav>
 </div>

templates/file/file-link.html.twig

@@ -15,7 +15,7 @@
  * @see \Drupal\bootstrap\Plugin\Preprocess\FileLink::preprocessVariables
  */
 #}
-{% spaceless %}
+{% apply spaceless %}
   {%
     set classes = [
       icon_only ? 'icon-only',
@@ -37,4 +37,4 @@
       {% endif %}
     {% endif %}
   </span>
-{% endspaceless %}
+{% endapply %}

templates/input/input--button--split.html.twig

@@ -22,15 +22,15 @@
  * @see template_preprocess_input()
  */
 #}
-{% spaceless %}
-  {%
-    set classes = [
+
+  {% block input %}{% apply spaceless %}
+    {%
+      set classes = [
       'btn',
       type == 'submit' ? 'js-form-submit',
       icon and icon_position and not icon_only ? 'icon-' ~ icon_position,
     ]
-  %}
-  {% block input %}
+    %}
     {% if icon_only %}
       <button{{ attributes.addClass(classes, 'icon-only') }}>
         <span class="sr-only">{{ label }}</span>
@@ -54,5 +54,5 @@
       <span class="sr-only">{{ 'Toggle Dropdown'|t }}</span>
     </button>
     {{ children }}
-  {% endblock %}
-{% endspaceless %}
+  {% endapply %}{% endblock %}
+

templates/input/input--button--submit.html.twig

@@ -22,15 +22,14 @@
  * @see template_preprocess_input()
  */
 #}
-{% spaceless %}
-  {%
-    set classes = [
+  {% block input %}{% apply spaceless %}
+    {%
+      set classes = [
       'btn',
       type == 'submit' ? 'js-form-submit',
       icon and icon_position and not icon_only ? 'icon-' ~ icon_position,
     ]
-  %}
-  {% block input %}
+    %}
     {% if search_submit == 'true' %}
       {% if wxt_theme == 'gcweb' %}
         <button{{ attributes.addClass(classes) }}>{{ icon }}<span class="wb-inv">{{ 'Search'|t }}</span></button>{{ children }}
@@ -52,5 +51,4 @@
       {% endif %}
     {% endif %}
     {{ children }}
-  {% endblock %}
-{% endspaceless %}
+  {% endapply %}{% endblock %}

templates/input/input--button.html.twig

@@ -22,15 +22,14 @@
  * @see template_preprocess_input()
  */
 #}
-{% spaceless %}
-  {%
-    set classes = [
+  {% block input %}{% apply spaceless %}
+    {%
+      set classes = [
       'btn',
       type == 'submit' ? 'js-form-submit',
       icon and icon_position and not icon_only ? 'icon-' ~ icon_position,
     ]
-  %}
-  {% block input %}
+    %}
     {% if icon and icon_only %}
       <button{{ attributes.addClass(classes, 'icon-only') }}>
         <span class="sr-only">{{ label }}</span>
@@ -44,5 +43,4 @@
       {% endif %}
     {% endif %}
     {{ children }}
-  {% endblock %}
-{% endspaceless %}
+  {% endapply %}{% endblock %}

templates/input/input--form-control.html.twig

@@ -20,13 +20,13 @@
  * @see template_preprocess_input()
  */
 #}
-{% spaceless %}
-  {%
-    set classes = [
+
+  {% block input %}{% apply spaceless %}
+    {%
+      set classes = [
       'form-control',
     ]
-  %}
-  {% block input %}
+    %}
     <input{{ attributes.addClass(classes) }} />
-  {% endblock %}
-{% endspaceless %}
+  {% endapply %}{% endblock %}
+

templates/input/input.html.twig

@@ -19,7 +19,7 @@
  * @see template_preprocess_input()
  */
 #}
-{% spaceless %}
+{% apply spaceless %}
   {% if input_group %}
     <div class="input-group">
   {% endif %}
@@ -41,4 +41,4 @@
   {% endif %}
 
   {{ children }}
-{% endspaceless %}
+{% endapply %}

templates/input/select.html.twig

@@ -15,7 +15,7 @@
  * @see template_preprocess_select()
  */
 #}
-{% spaceless %}
+{% apply spaceless %}
   {% if input_group %}
     <div class="input-group">
   {% endif %}
@@ -58,4 +58,4 @@
   {% if input_group %}
     </div>
   {% endif %}
-{% endspaceless %}
+{% endapply %}

wxt_bootstrap.info.yml

@@ -1,11 +1,11 @@
 name: WxT Bootstrap
 description: WxT theme(s) support leveraging Bootstrap.
 type: theme
-core_version_requirement: ^8 || ^9
+core_version_requirement: '^9 || ^10'
 package: 'WxT'
 base theme: bootstrap
-ckeditor_stylesheets:
-  - css/ckeditor.css
+ckeditor5-stylesheets:
+  - css/ckeditor5.css
 
 regions:
   branding: 'Branding'

yarn.lock

@@ -4374,9 +4374,9 @@ xmlhttprequest-ssl@~1.5.4:
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
 y18n@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
-  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696"
+  integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==
 
 yallist@^2.1.2:
   version "2.1.2"