Merge 2.x into develop

.github/actions/setup/action.yml

@@ -6,7 +6,7 @@ runs:
     - name: Setup Node
       uses: actions/setup-node@v6
       with:
-        node-version: 20
+        node-version-file: .nvmrc
 
     - name: Install dependencies
       run: npm ci

.gitignore

@@ -91,3 +91,6 @@ ai-prompt.md
 chat-history.md
 scratchpad.md
 .ai-history/
+
+# Hummingbird QA seed: per-shop record of what --undo must restore
+docs/qa/.seed-state.json

.nvmrc

@@ -1 +1 @@
-v20.19.4
+v24.21.0

CONTEXT.md

@@ -177,3 +177,9 @@ When asked to write or modify code, you MUST follow these rules:
 9. **Keep it modular (SRP):** Separate logic into cohesive components.
 10. **Smarty variables:** Ensure proper escaping for Smarty variables
     (e.g., `{$variable|escape:'html':'UTF-8'}`).
+11. **QA checklist sync:** `docs/qa/testing-checklist.md` lists what to test in
+    the theme, and every list in it is derived from a file in the repository.
+    When you change hook assignments in `config/theme.yml`, add or remove a
+    module override under `modules/`, add a page or partial under `templates/`,
+    or change the breakpoints, you MUST update that file in the same change. Its
+    section 9 maps each list back to its source.

CONTRIBUTING.md

@@ -21,7 +21,7 @@ Follow the [README.md](README.md) for detailed setup and build instructions.
    [Set up your Git for contributing](https://build.prestashop-project.org/howtos/misc/set-up-your-git-for-contributing/)
 2. Use an editor that supports .editorconfig.<br>
    [Download an EditorConfig plugin](http://editorconfig.org/#download).
-3. Make sure you have [Node.js v20](https://nodejs.org/en/download/) installed.
+3. Make sure you have [Node.js v24](https://nodejs.org/en/download/) installed.
 4. If using AI tools to write code, make sure your agent has read the
    [`CONTEXT.md`](README.md#🤖-ai-assisted-development) file.
 

README.md

@@ -2,7 +2,7 @@
 
 ![CI](https://github.com/PrestaShop/hummingbird/actions/workflows/lint.yml/badge.svg)
 ![Docker Ready](https://img.shields.io/badge/docker-ready-blue.svg)
-![Node.js v20](https://img.shields.io/badge/node.js-20.x-blue.svg)
+![Node.js v24](https://img.shields.io/badge/node.js-24.x-blue.svg)
 ![License](https://img.shields.io/badge/license-AFL%203.0-lightgray.svg)
 
 Hummingbird is a modern theme for PrestaShop. See the
@@ -15,7 +15,7 @@ supported by each branch.
 | ----------- | ---------- | ------ |
 | `develop`   | `~10.0.0`  | Next major |
 | `2.x`       | `~9.2.0`   | Maintained |
-| `2.1.0`     | `~9.2.0`   | Released |
+| `2.1.x`     | `~9.2.0`   | Released |
 | `2.0.0`     | `~9.1.0`   | Released |
 
 > [!NOTE]
@@ -33,8 +33,8 @@ supported by each branch.
 
 To work on Hummingbird, you'll need:
 
-- Node.js **v20.x**.
-- npm **v8**.
+- Node.js **v24.x**.
+- npm **v11**.
 
 ## 📑 Table of Contents
 

config/theme.yml

@@ -1,6 +1,6 @@
 name: hummingbird
 display_name: Hummingbird
-version: 2.1.0
+version: 2.1.2
 author:
   name: "PrestaShop Team and Contributors"
   email: "pub@prestashop.com"
@@ -219,6 +219,11 @@ global_settings:
       width: 2000
       height: 400
       scope: [categories]
+    manufacturer_product_page:
+      width: 98
+      height: 98
+      scope: [manufacturers]
+      image_fitment: bound
 
 theme_settings:
   rtl_generation: false

modules/blockreassurance/views/templates/hook/displayBlock.tpl

@@ -14,9 +14,9 @@
 
           <span class="reassurance__image">
             {if $block['custom_icon']}
-              <img {if $block['is_svg']}class="svg img-fluid invisible" {/if}src="{$block['custom_icon']}">
+              <img class="{if $block['is_svg']}svg invisible{/if} img-fluid" src="{$block['custom_icon']}" alt="">
             {elseif $block['icon']}
-              <img class="svg img-fluid invisible" src="{$block['icon']}">
+              <img class="svg img-fluid invisible" src="{$block['icon']}" alt="">
             {/if}
           </span>
 

modules/blockreassurance/views/templates/hook/displayBlockProduct.tpl

@@ -13,9 +13,9 @@
 
         <span class="reassurance__image">
           {if $block['custom_icon']}
-            <img {if $block['is_svg']}class="svg img-fluid invisible" {/if}src="{$block['custom_icon']}">
+            <img class="{if $block['is_svg']}svg invisible{/if} img-fluid" src="{$block['custom_icon']}" alt="">
           {elseif $block['icon']}
-            <img class="svg img-fluid invisible" src="{$block['icon']}">
+            <img class="svg img-fluid invisible" src="{$block['icon']}" alt="">
           {/if}
         </span>
 

modules/blockreassurance/views/templates/hook/displayBlockWhite.tpl

@@ -14,9 +14,9 @@
 
           <span class="reassurance__image">
             {if $block['custom_icon']}
-              <img {if $block['is_svg']}class="svg img-fluid invisible" {/if}src="{$block['custom_icon']}">
+              <img class="{if $block['is_svg']}svg invisible{/if} img-fluid" src="{$block['custom_icon']}" alt="">
             {elseif $block['icon']}
-              <img class="svg img-fluid invisible" src="{$block['icon']}">
+              <img class="svg img-fluid invisible" src="{$block['icon']}" alt="">
             {/if}
           </span>
 

package.json

@@ -1,9 +1,9 @@
 {
   "name": "hummingbird",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "Hummingbird development theme for PrestaShop",
   "engines": {
-    "node": ">= 20"
+    "node": ">= 24"
   },
   "main": "index.js",
   "scripts": {

src/js/form-validation.test.ts

@@ -0,0 +1,55 @@
+/**
+ * For the full copyright and license information, please view the
+ * LICENSE.md file that was distributed with this source code.
+ */
+import selectorsMap from '@constants/selectors-map';
+import initFormValidation from './form-validation';
+
+const setUp = (markup: string) => {
+  document.body.innerHTML = markup;
+
+  window.Theme = {
+    ...window.Theme,
+    selectors: selectorsMap,
+  };
+
+  initFormValidation();
+};
+
+describe('Form validation', () => {
+  it('binds the submit button nested inside the form', () => {
+    setUp(`
+      <form id="f" data-ps-action="form-validation">
+        <input name="a" required>
+        <button type="submit" data-ps-action="form-validation-submit">Send</button>
+      </form>
+    `);
+
+    const form = document.querySelector('#f') as HTMLFormElement;
+    const button = document.querySelector('button') as HTMLButtonElement;
+    button.click();
+
+    expect(form.classList.contains('was-validated')).toBe(true);
+  });
+
+  it('binds a link marked as the submit control', () => {
+    // WHY: CONTEXT.md documents data-ps-action="form-validation-submit" for buttons and links,
+    // and a link is not a listed form control, so this is what form.elements would miss.
+    setUp(`
+      <form id="f" data-ps-action="form-validation">
+        <input name="a" required>
+        <a href="#" data-ps-action="form-validation-submit">Send</a>
+      </form>
+    `);
+
+    const form = document.querySelector('#f') as HTMLFormElement;
+    const link = document.querySelector('a') as HTMLAnchorElement;
+    link.click();
+
+    expect(form.classList.contains('was-validated')).toBe(true);
+  });
+
+  it('does not throw when the form has no submit button', () => {
+    expect(() => setUp('<form id="f" data-ps-action="form-validation"></form>')).not.toThrow();
+  });
+});