Commit a32c7afb9a7 for woocommerce

commit a32c7afb9a7f7359a28cbf82148050570603bb6a
Author: woocommercebot <30233865+woocommercebot@users.noreply.github.com>
Date:   Wed Nov 11 06:48:36 2026 -0800

    Prepare Packages for Release (#70861)

    * Automated change: Prep @woocommerce/email-editor,@woocommerce/email-editor-config for release.

    * Tidy the email editor 2.6.0 and 2.20.0 changelogs

    The prepare script re-sorted the already released 2.19.0 section of the
    PHP changelog, undoing #69822, which put the translate_slug_to_color()
    entry next to the color fallback entry because they describe one change.
    Restore the released order so the published notes stay as they were.

    Also drop the JS entry about renaming a test title. It is a test-only
    change and tells package integrators nothing.

    ---------

    Co-authored-by: woocommercebot <woocommercebot@users.noreply.github.com>
    Co-authored-by: Rostislav Wolny <rosta.wolny@automattic.com>

diff --git a/packages/js/email-editor/CHANGELOG.md b/packages/js/email-editor/CHANGELOG.md
index 38319c475d0..73db25d712c 100644
--- a/packages/js/email-editor/CHANGELOG.md
+++ b/packages/js/email-editor/CHANGELOG.md
@@ -2,6 +2,15 @@

 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

+## [2.6.0](https://www.npmjs.com/package/@woocommerce/email-editor/v/2.6.0) - 2026-11-11
+
+-   Patch - Keep the cursor after a personalization tag typed by hand in the email editor. [#70784]
+-   Patch - Only offer font weights and styles in the email editor Appearance list that the selected font can show. [#70047]
+-   Minor - Show the email editor's delete action instead of core's "Trash…" on WordPress 7.2 for email post types that opt in. [#70177]
+-   Patch - Support WordPress 7.2: return to the email list after trashing an email and keep editor telemetry working. [#70140]
+-   Minor - Convert personalization tags typed into the Preformatted block in the email editor. [#70784]
+-   Minor - Keep the Separator block styles (Default, Wide Line, Dots) in the email editor. [#70573]
+
 ## [2.5.1](https://www.npmjs.com/package/@woocommerce/email-editor/v/2.5.1) - 2026-10-22

 -   Patch - Insert personalization tags at the cursor instead of the end of the text, and edit the tag you clicked, including in captions and button text. [#69794]
diff --git a/packages/js/email-editor/changelog/add-wooplug-3863-separator-block b/packages/js/email-editor/changelog/add-wooplug-3863-separator-block
deleted file mode 100644
index 26a7e08501f..00000000000
--- a/packages/js/email-editor/changelog/add-wooplug-3863-separator-block
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: add
-
-Keep the Separator block styles (Default, Wide Line, Dots) in the email editor.
diff --git a/packages/js/email-editor/changelog/add-wooplug-3865-preformatted-personalization-tags b/packages/js/email-editor/changelog/add-wooplug-3865-preformatted-personalization-tags
deleted file mode 100644
index 48cd3bf83ce..00000000000
--- a/packages/js/email-editor/changelog/add-wooplug-3865-preformatted-personalization-tags
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: add
-
-Convert personalization tags typed into the Preformatted block in the email editor.
diff --git a/packages/js/email-editor/changelog/fix-email-editor-appearance-font-faces b/packages/js/email-editor/changelog/fix-email-editor-appearance-font-faces
deleted file mode 100644
index 21e0d433f22..00000000000
--- a/packages/js/email-editor/changelog/fix-email-editor-appearance-font-faces
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Only offer font weights and styles in the email editor Appearance list that the selected font can show.
diff --git a/packages/js/email-editor/changelog/fix-personalization-tag-caret b/packages/js/email-editor/changelog/fix-personalization-tag-caret
deleted file mode 100644
index cc9a15678d7..00000000000
--- a/packages/js/email-editor/changelog/fix-personalization-tag-caret
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Keep the cursor after a personalization tag typed by hand in the email editor.
diff --git a/packages/js/email-editor/changelog/fix-wooplug-8066-email-editor-wp-72 b/packages/js/email-editor/changelog/fix-wooplug-8066-email-editor-wp-72
deleted file mode 100644
index 0a906d87ff2..00000000000
--- a/packages/js/email-editor/changelog/fix-wooplug-8066-email-editor-wp-72
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Support WordPress 7.2: return to the email list after trashing an email and keep editor telemetry working.
diff --git a/packages/js/email-editor/changelog/fix-wooplug-8069-email-post-actions-wp-72 b/packages/js/email-editor/changelog/fix-wooplug-8069-email-post-actions-wp-72
deleted file mode 100644
index 8d95c10f0f2..00000000000
--- a/packages/js/email-editor/changelog/fix-wooplug-8069-email-post-actions-wp-72
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: fix
-
-Show the email editor's delete action instead of core's "Trash…" on WordPress 7.2 for email post types that opt in.
diff --git a/packages/js/email-editor/changelog/fix-wooplug-8087-email-editor-circular-deps b/packages/js/email-editor/changelog/fix-wooplug-8087-email-editor-circular-deps
deleted file mode 100644
index 9dae9eb1adb..00000000000
--- a/packages/js/email-editor/changelog/fix-wooplug-8087-email-editor-circular-deps
+++ /dev/null
@@ -1,3 +0,0 @@
-Significance: patch
-Type: dev
-Comment: Remove circular imports in the email editor's tracking code; no production change.
diff --git a/packages/js/email-editor/changelog/shared-tooling-catalog b/packages/js/email-editor/changelog/shared-tooling-catalog
deleted file mode 100644
index 9f893d8e5e9..00000000000
--- a/packages/js/email-editor/changelog/shared-tooling-catalog
+++ /dev/null
@@ -1,3 +0,0 @@
-Significance: patch
-Type: dev
-Comment: Centralize existing build, lint and test tooling versions in pnpm catalogs; no production change.
diff --git a/packages/js/email-editor/changelog/testops-234-test-naming-sweep b/packages/js/email-editor/changelog/testops-234-test-naming-sweep
deleted file mode 100644
index 3fd90ddb40e..00000000000
--- a/packages/js/email-editor/changelog/testops-234-test-naming-sweep
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: dev
-
-Rename a test title to match what the test asserts
diff --git a/packages/js/email-editor/package.json b/packages/js/email-editor/package.json
index 4c2ec2aad24..e9676287761 100644
--- a/packages/js/email-editor/package.json
+++ b/packages/js/email-editor/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@woocommerce/email-editor",
-	"version": "2.5.1",
+	"version": "2.6.0",
 	"description": "Gutenberg based email editor that is used in WooCommerce emails.",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/php/email-editor/changelog.md b/packages/php/email-editor/changelog.md
index 385a8c525d5..9a1b06d5752 100644
--- a/packages/php/email-editor/changelog.md
+++ b/packages/php/email-editor/changelog.md
@@ -2,6 +2,23 @@

 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

+## [2.20.0](https://github.com/woocommerce/email-editor/releases/tag/2.20.0) - 2026-11-11
+
+-   Patch - Apply a caption color chosen in the email design to image, gallery, table and embed captions in the sent email. [#70339]
+-   Patch - Fix link colors set for individual email blocks, including colors selected from the theme palette. [#70571]
+-   Patch - Keep fixed font sizes in emails when the site theme uses fluid typography, which many email clients can’t read. [#70573]
+-   Patch - Keep paragraphs and headings in emails when their only content is a personalization tag. [#70454]
+-   Patch - Prevent block emails with a coupon from failing or showing a wrong code when another plugin changes the coupon code filter value. [#70807]
+-   Patch - Remove web-only image attributes such as lazy loading from emails, so images load in Apple Mail. [#70774]
+-   Patch - Show bold text as bold in the email editor and in sent emails when the email uses a light text weight. [#70784]
+-   Patch - Show serif, monospace and cursive site fonts in emails as Georgia, Courier New and Comic Sans MS instead of Arial, and stop the Tahoma, Verdana and Arvo fonts falling back to the mail app's default font. [#70096]
+-   Minor - Show the email editor's delete action instead of core's "Trash…" on WordPress 7.2 for email post types that opt in with the woocommerce_email_editor_replace_trash_action filter. [#70177]
+-   Patch - Show the right prices in block emails for grouped products, variable products on sale, and unpriced products. [#70807]
+-   Patch - Use a parent Group’s font size for paragraphs in the sent email, as the editor does. [#70573]
+-   Minor - Add the Preformatted block to the email editor, keeping line breaks and indentation in sent emails. [#70784]
+-   Minor - Add the Separator block to the email editor, with its Default, Wide Line and Dots styles and color. [#70573]
+-   Patch - List the font weights each email font can show in the email theme.json, under `settings.custom.fontWeights`. [#70047]
+
 ## [2.19.0](https://github.com/woocommerce/email-editor/releases/tag/2.19.0) - 2026-10-14

 -   Patch - Fall back to the email's theme color when a block's saved color is not in the email's palette, instead of showing no color. Where a theme and WordPress both define a palette color with the same name, the theme's color now applies. [#69617]
diff --git a/packages/php/email-editor/changelog/add-wooplug-3863-separator-block b/packages/php/email-editor/changelog/add-wooplug-3863-separator-block
deleted file mode 100644
index 578432689a4..00000000000
--- a/packages/php/email-editor/changelog/add-wooplug-3863-separator-block
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: add
-
-Add the Separator block to the email editor, with its Default, Wide Line and Dots styles and color.
diff --git a/packages/php/email-editor/changelog/add-wooplug-3865-preformatted-block b/packages/php/email-editor/changelog/add-wooplug-3865-preformatted-block
deleted file mode 100644
index 633609d0d89..00000000000
--- a/packages/php/email-editor/changelog/add-wooplug-3865-preformatted-block
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: add
-
-Add the Preformatted block to the email editor, keeping line breaks and indentation in sent emails.
diff --git a/packages/php/email-editor/changelog/email-editor-test-order-isolation b/packages/php/email-editor/changelog/email-editor-test-order-isolation
deleted file mode 100644
index ea6001e3f95..00000000000
--- a/packages/php/email-editor/changelog/email-editor-test-order-isolation
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: dev
-Comment: Make email editor integration tests pass in any order; no production change.
-
diff --git a/packages/php/email-editor/changelog/fix-70302-block-link-colors b/packages/php/email-editor/changelog/fix-70302-block-link-colors
deleted file mode 100644
index 6e7007da483..00000000000
--- a/packages/php/email-editor/changelog/fix-70302-block-link-colors
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Fix link colors set for individual email blocks, including colors selected from the theme palette.
diff --git a/packages/php/email-editor/changelog/fix-70318-text-block-personalization-tag b/packages/php/email-editor/changelog/fix-70318-text-block-personalization-tag
deleted file mode 100644
index fd04633a8bb..00000000000
--- a/packages/php/email-editor/changelog/fix-70318-text-block-personalization-tag
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Keep paragraphs and headings in emails when their only content is a personalization tag.
diff --git a/packages/php/email-editor/changelog/fix-email-coupon-generator-filter-input b/packages/php/email-editor/changelog/fix-email-coupon-generator-filter-input
deleted file mode 100644
index 04608000565..00000000000
--- a/packages/php/email-editor/changelog/fix-email-coupon-generator-filter-input
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Prevent block emails with a coupon from failing or showing a wrong code when another plugin changes the coupon code filter value.
diff --git a/packages/php/email-editor/changelog/fix-email-editor-appearance-font-faces b/packages/php/email-editor/changelog/fix-email-editor-appearance-font-faces
deleted file mode 100644
index cc4e4c1aa84..00000000000
--- a/packages/php/email-editor/changelog/fix-email-editor-appearance-font-faces
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: add
-
-List the font weights each email font can show in the email theme.json, under `settings.custom.fontWeights`.
diff --git a/packages/php/email-editor/changelog/fix-email-editor-bold-text b/packages/php/email-editor/changelog/fix-email-editor-bold-text
deleted file mode 100644
index a7f5407206e..00000000000
--- a/packages/php/email-editor/changelog/fix-email-editor-bold-text
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Show bold text as bold in the email editor and in sent emails when the email uses a light text weight.
diff --git a/packages/php/email-editor/changelog/fix-email-editor-snapshots-image-decoding b/packages/php/email-editor/changelog/fix-email-editor-snapshots-image-decoding
deleted file mode 100644
index 3213f3c9ee5..00000000000
--- a/packages/php/email-editor/changelog/fix-email-editor-snapshots-image-decoding
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: dev
-Comment: Update the email renderer snapshots after image attributes were removed; no production change.
-
diff --git a/packages/php/email-editor/changelog/fix-email-fluid-font-sizes b/packages/php/email-editor/changelog/fix-email-fluid-font-sizes
deleted file mode 100644
index 067fa724deb..00000000000
--- a/packages/php/email-editor/changelog/fix-email-fluid-font-sizes
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Keep fixed font sizes in emails when the site theme uses fluid typography, which many email clients can’t read.
diff --git a/packages/php/email-editor/changelog/fix-email-safe-font-generic-family b/packages/php/email-editor/changelog/fix-email-safe-font-generic-family
deleted file mode 100644
index 80e953d2d52..00000000000
--- a/packages/php/email-editor/changelog/fix-email-safe-font-generic-family
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Show serif, monospace and cursive site fonts in emails as Georgia, Courier New and Comic Sans MS instead of Arial, and stop the Tahoma, Verdana and Arvo fonts falling back to the mail app's default font.
diff --git a/packages/php/email-editor/changelog/fix-email-text-inherited-font-size b/packages/php/email-editor/changelog/fix-email-text-inherited-font-size
deleted file mode 100644
index 710ae0a1ccb..00000000000
--- a/packages/php/email-editor/changelog/fix-email-text-inherited-font-size
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Use a parent Group’s font size for paragraphs in the sent email, as the editor does.
diff --git a/packages/php/email-editor/changelog/fix-email-variable-product-single-price b/packages/php/email-editor/changelog/fix-email-variable-product-single-price
deleted file mode 100644
index 4696701808f..00000000000
--- a/packages/php/email-editor/changelog/fix-email-variable-product-single-price
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Show the right prices in block emails for grouped products, variable products on sale, and unpriced products.
diff --git a/packages/php/email-editor/changelog/fix-nl-1100-caption-element-styles b/packages/php/email-editor/changelog/fix-nl-1100-caption-element-styles
deleted file mode 100644
index 2e887665878..00000000000
--- a/packages/php/email-editor/changelog/fix-nl-1100-caption-element-styles
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Apply a caption color chosen in the email design to image, gallery, table and embed captions in the sent email.
diff --git a/packages/php/email-editor/changelog/fix-setup-typo b/packages/php/email-editor/changelog/fix-setup-typo
deleted file mode 100644
index 6f0ad296395..00000000000
--- a/packages/php/email-editor/changelog/fix-setup-typo
+++ /dev/null
@@ -1,3 +0,0 @@
-Significance: patch
-Type: dev
-Comment: Fix a wording typo in the email editor security policy; no production change.
diff --git a/packages/php/email-editor/changelog/fix-wooplug-8069-email-post-actions-wp-72 b/packages/php/email-editor/changelog/fix-wooplug-8069-email-post-actions-wp-72
deleted file mode 100644
index a946205e370..00000000000
--- a/packages/php/email-editor/changelog/fix-wooplug-8069-email-post-actions-wp-72
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: fix
-
-Show the email editor's delete action instead of core's "Trash…" on WordPress 7.2 for email post types that opt in with the woocommerce_email_editor_replace_trash_action filter.
diff --git a/packages/php/email-editor/changelog/fix-wooplug-8115-web-only-image-attributes b/packages/php/email-editor/changelog/fix-wooplug-8115-web-only-image-attributes
deleted file mode 100644
index 29cd5eefec8..00000000000
--- a/packages/php/email-editor/changelog/fix-wooplug-8115-web-only-image-attributes
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fix
-
-Remove web-only image attributes such as lazy loading from emails, so images load in Apple Mail.
diff --git a/packages/php/email-editor/changelog/shared-tooling-catalog b/packages/php/email-editor/changelog/shared-tooling-catalog
deleted file mode 100644
index 9f893d8e5e9..00000000000
--- a/packages/php/email-editor/changelog/shared-tooling-catalog
+++ /dev/null
@@ -1,3 +0,0 @@
-Significance: patch
-Type: dev
-Comment: Centralize existing build, lint and test tooling versions in pnpm catalogs; no production change.
diff --git a/packages/php/email-editor/changelog/update-phpstan-2-3-4 b/packages/php/email-editor/changelog/update-phpstan-2-3-4
deleted file mode 100644
index c0d965ec065..00000000000
--- a/packages/php/email-editor/changelog/update-phpstan-2-3-4
+++ /dev/null
@@ -1,3 +0,0 @@
-Significance: patch
-Type: dev
-Comment: Update PHPStan to 2.3.4 for faster static analysis; no production change.
diff --git a/packages/php/email-editor/changelog/wooplug-8213-email-editor-ci-triggers b/packages/php/email-editor/changelog/wooplug-8213-email-editor-ci-triggers
deleted file mode 100644
index 8a0ae683978..00000000000
--- a/packages/php/email-editor/changelog/wooplug-8213-email-editor-ci-triggers
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: dev
-Comment: Run the package PHP tests on PHP 7.4 in CI; no production change.
-
diff --git a/packages/php/email-editor/changelog/wooplug-8213-email-render-snapshots b/packages/php/email-editor/changelog/wooplug-8213-email-render-snapshots
deleted file mode 100644
index 1777597fff8..00000000000
--- a/packages/php/email-editor/changelog/wooplug-8213-email-render-snapshots
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: dev
-Comment: Add full-email snapshot tests for the email renderer; no production change.
-
diff --git a/packages/php/email-editor/composer.json b/packages/php/email-editor/composer.json
index 485a7b94c1b..c5cca543967 100644
--- a/packages/php/email-editor/composer.json
+++ b/packages/php/email-editor/composer.json
@@ -5,7 +5,7 @@
 	"license": "GPL-2.0-or-later",
 	"prefer-stable": true,
 	"minimum-stability": "dev",
-	"version": "2.19.0",
+	"version": "2.20.0",
 	"autoload": {
 		"classmap": [
 			"src/",
diff --git a/plugins/woocommerce/composer.lock b/plugins/woocommerce/composer.lock
index 09910f0854a..4db5757882c 100644
--- a/plugins/woocommerce/composer.lock
+++ b/plugins/woocommerce/composer.lock
@@ -1226,11 +1226,11 @@
         },
         {
             "name": "woocommerce/email-editor",
-            "version": "2.19.0",
+            "version": "2.20.0",
             "dist": {
                 "type": "path",
                 "url": "../../packages/php/email-editor",
-                "reference": "d56c5aa62e559efd687c523e1d665b6c39ba23ea"
+                "reference": "db0bd8a8e184aa4e9e7494887d6a7dc652b3797c"
             },
             "require": {
                 "php": ">=7.4"
@@ -5551,5 +5551,5 @@
     "platform-overrides": {
         "php": "7.4"
     },
-    "plugin-api-version": "2.9.0"
+    "plugin-api-version": "2.11.0"
 }