Commit 40838f2ca69 for woocommerce

commit 40838f2ca69f4fc25a40097b3844dd1dd501a5cf
Author: woocommercebot <30233865+woocommercebot@users.noreply.github.com>
Date:   Mon May 18 14:51:53 2026 +0800

    Prepare Packages for Release (#65046)

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

    * Fix email editor release changelog formatting

    Restore malformed breaking-change changelog entries and remove trailing whitespace so release validation can pass.

    ---------

    Co-authored-by: woocommercebot <woocommercebot@users.noreply.github.com>
    Co-authored-by: Pavel Dohnal <pavel.dohnal@automattic.com>

diff --git a/packages/js/email-editor/CHANGELOG.md b/packages/js/email-editor/CHANGELOG.md
index a123e93a882..1e2e14b1a55 100644
--- a/packages/js/email-editor/CHANGELOG.md
+++ b/packages/js/email-editor/CHANGELOG.md
@@ -1,42 +1,46 @@
-# Changelog
+# Changelog

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

-## [2.0.0](https://www.npmjs.com/package/@woocommerce/email-editor/v/2.0.0) - 2026-04-29
+## [2.1.0](https://www.npmjs.com/package/@woocommerce/email-editor/v/2.1.0) - 2026-05-15
+
+-   Minor - Add a canvas affordance for editing the email template from email content mode. [#64703]
+
+## [2.0.0](https://www.npmjs.com/package/@woocommerce/email-editor/v/2.0.0) - 2026-04-29

 -   Minor - Add full-width alignment support for product image block [#63839]
--   Major [ **BREAKING CHANGE** ] - Remove block-editor, editor, and core-data augmentation blocks from wordpress-modules.ts (now covered by native types). Remove unused @ts-expect-error directives for newly exported symbols. [#64114]
--   Major [ **BREAKING CHANGE** ] - Update @wordpress/* dependencies to wp-6.8 minimum. Remove @types/wordpress__editor and @types/wordpress__media-utils (native types at wp-6.8). [#64114]
 -   Minor - Improve build time for email-editor by using webpack filesystem cache. [#64082]
 -   Minor - Let consumers replace the `__i18n_text_domain__` identifier at bundle time (e.g. via `webpack.DefinePlugin`) so translation strings extract and translate under the consumer's own text domain. Falls back to `'woocommerce'` at runtime when the identifier isn't substituted, preserving the package's pre-1.11 behaviour. [#64356]
+-   Major [ **BREAKING CHANGE** ] - Remove block-editor, editor, and core-data augmentation blocks from wordpress-modules.ts (now covered by native types). Remove unused @ts-expect-error directives for newly exported symbols. [#64114]
+-   Major [ **BREAKING CHANGE** ] - Update `@wordpress/*` dependencies to wp-6.8 minimum. Remove `@types/wordpress__editor` and `@types/wordpress__media-utils` (native types at wp-6.8). [#64114]
 -   Patch - Monorepo: refresh DependencyExtractionWebpackPlugin for compatibility with filesystem cache, admin build cleanup. [#64111]

-## [1.10.1](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.10.1) - 2026-04-06
+## [1.10.1](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.10.1) - 2026-04-06

 -   Patch - Disable Real-time Collaboration in the email editor [#63770]
 -   Patch - Fix template-select modal not appearing on WordPress 7.0 due to hasEdits() returning true on fresh posts [#64026]
 -   Patch - Fix useSelect instability warning for notices in the email editor [#63943]
 -   Patch - Replaced patched `@wordpress/data` types with opt-in internal package types. [#63483]

-## [1.10.0](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.10.0) - 2026-03-18
+## [1.10.0](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.10.0) - 2026-03-18

 -   Minor - Add `woocommerce_email_editor_send_button_disabled` filter to allow overriding the send button disabled state [#63722]

-## [1.9.0](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.9.0) - 2026-03-12
+## [1.9.0](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.9.0) - 2026-03-12

 -   Minor - Add emailBlocks getter to pattern enhancement for inserting dynamic email content blocks [#63612]
 -   Minor - Export registerEntityAction, unregisterEntityAction and PostWithPermissions from the email editor package public API. [#63558]

-## [1.8.0](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.8.0) - 2026-03-02
+## [1.8.0](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.8.0) - 2026-03-02

 -   Minor - Removed custom RichText package, which was needed for WordPress < 6.8 [#63289]
 -   Minor - Rework snackbar notices by using the `EditorSnackbars` component from `@wordpress/editor` to render notices, removing the `email-editor` context snackbar notices renderer, and adding a `disableSnackbarNotices` setting to the email editor component [#63451]

-## [1.7.1](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.7.1) - 2026-02-20
+## [1.7.1](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.7.1) - 2026-02-20

 -   Patch - Export EditTemplateModal and SelectTemplateModal from the email editor package for extensibility. [#63374]

-## [1.7.0](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.7.0) - 2026-02-17
+## [1.7.0](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.7.0) - 2026-02-17

 -   Patch - Add memoization for the getEmailTemplates selector [#63200]
 -   Patch - Fix blank modal when using swap template action in email editor [#63229]
@@ -44,71 +48,71 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 -   Minor - Add EmailActionsFill allowing extenders to add custom email actions to the sidebar [#63269]
 -   Minor - Move TemplateSelection to EmailActionsFill slot and export TemplateSelection component for extensibility [#63277]

-## [1.6.0](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.6.0) - 2026-02-04
+## [1.6.0](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.6.0) - 2026-02-04

 -   Minor - Ensure reset template action for email templates [#62984]
 -   Minor - Add post_id context support and cache invalidation for personalization tags [#63103]

-## [1.5.2](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.5.2) - 2026-01-29
+## [1.5.2](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.5.2) - 2026-01-29

 -   Patch - Fix infinite loop when selecting a template in the email design selector modal [#63000]

-## [1.5.1](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.5.1) - 2026-01-16
+## [1.5.1](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.5.1) - 2026-01-16

 -   Patch - Fix buttons block layout controls initialization [#62708]
 -   Patch - Unify loading indicator with the site editor [#62729]

-## [1.5.0](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.5.0) - 2025-12-15
+## [1.5.0](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.5.0) - 2025-12-15

 -   Patch - Handle missing layout settings in the editor settings [#61471]
 -   Patch - Add optional createCoupon URL to EmailEditorUrls type for coupon creation integration
 -   Patch - Improve UX for tax-inclusive pricing configuration by adding validation notice and clearer setting description when base tax rate is not configured. [#61471]
 -   Minor - Add category tabs navigation to email template selection modal. The TemplateCategory type is now a string to support dynamic categories loaded from block patterns. [#62441]

-## [1.4.3](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.4.3) - 2025-12-11
+## [1.4.3](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.4.3) - 2025-12-11

 -   Patch - Compatibility update for Gutenberg 22.0. useEmailCss now returns styles correctly with Gutenberg 22.0+. [#61964]

-## [1.4.2](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.4.2) - 2025-12-04
+## [1.4.2](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.4.2) - 2025-12-04

 -   Patch - Handle missing layout settings in the editor settings [#62237]

-## [1.4.1](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.4.1) - 2025-11-25
+## [1.4.1](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.4.1) - 2025-11-25

 -   Patch - Remove unnecessary hook for media library [#62127]

-## [1.4.0](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.4.0) - 2025-11-12
+## [1.4.0](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.4.0) - 2025-11-12

 -   Patch - Prevent crashes with Gutenberg 22.0 [#61925]

-## [1.3.0](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.3.0) - 2025-11-05
+## [1.3.0](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.3.0) - 2025-11-05

 -   Minor - Add setEmailPostType action and export email editor hooks and utilities for template previews and styling [#61804]

-## [1.2.1](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.2.1) - 2025-11-04
+## [1.2.1](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.2.1) - 2025-11-04

 -   Patch - Export the personalization tags RichTextWithButton component and other email editor methods. [#61748]

-## [1.2.0](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.2.0) - 2025-10-31
+## [1.2.0](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.2.0) - 2025-10-31

 -   Patch - Ensure the Command palette is functional in WordPress 6.9 beta and above. [#61672]
 -   Minor - Add 'woocommerce-email-editor' plugin area [#61666]

-## [1.1.3](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.1.3) - 2025-10-27
+## [1.1.3](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.1.3) - 2025-10-27

 -   Patch - Fix for email preview to fit into the container in the preview column [#61442]
 -   Patch - Refactor personalization tags fetching to use core entities [#61467]
 -   Patch - Add support for a custom back button component [#61535]

-## [1.1.2](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.1.2) - 2025-10-09
+## [1.1.2](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.1.2) - 2025-10-09

 -   Patch - Export hook isEmailEditor from the package. [#60941]

-## [1.1.1](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.1.1) - 2025-09-26
+## [1.1.1](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.1.1) - 2025-09-26

 -   Patch - Allow passing editor configuration to ExperimentalEmailEditor via props [#60974]

-## [1.1.0](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.1.0) - 2025-09-09
+## [1.1.0](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.1.0) - 2025-09-09

 -   Minor - Export `SendPreviewEmail` component and `createStore` [#60796]
 -   Minor - Bump jest package dependency to 29.5.x [#60324]
@@ -116,21 +120,21 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 -   Minor - Refactor usage of hooks and global Gutenberg functions to support preserving and restoring the original state [#60741]
 -   Patch - Display warning message when user clicks on "Preview in new tab" without saving the edited changes [#60307]

-## [1.0.4](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.0.4) - 2025-08-21
+## [1.0.4](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.0.4) - 2025-08-21

 -   Patch - Filter unnecessary stylesheets from Editor iframe [#60354]
 -   Patch - Fix site logo not rendered properly. In the email editor if the site logo was in a group block the right alignment didn't work. [#60290]
 -   Patch - Ensure the email editor obtains and utilizes the site theme styles as part of its default values. [#60465]

-## [1.0.3](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.0.3) - 2025-08-11
+## [1.0.3](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.0.3) - 2025-08-11

 -   Patch - Fixed a possible infinite loading of templates when editing emails. [#60196]

-## [1.0.2](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.0.2) - 2025-08-01
+## [1.0.2](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.0.2) - 2025-08-01

 -   Patch - Fix backward compatibility when personalization tag post types are not set. [#60134]

-## [1.0.1](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.0.1) - 2025-07-31
+## [1.0.1](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.0.1) - 2025-07-31

 -   Patch - Email Editor: show “Send” button when editing a new (unsaved) email draft. [#59931]
 -   Patch - Email Editor: validation now correctly runs when both the email body and its template are modified, preventing silent skips of template-only edits. [#59903]
@@ -142,7 +146,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 -   Patch - Add filtering personalization tags by the email post type. [#60072]
 -   Patch - Use ToolsPanel component instead of PanelBody component [#59632]

-## [1.0.0](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.0.0) - 2025-07-09
+## [1.0.0](https://www.npmjs.com/package/@woocommerce/email-editor/v/1.0.0) - 2025-07-09

 -   Patch - Add fallback for Navigator component to the email editor [#58083]
 -   Patch - Fix an error with the Email Editor not loading Global Styles for non-admin WordPress users and ensure permissions are correctly checked when required. [#56261]
diff --git a/packages/js/email-editor/changelog/add-template-canvas-affordance b/packages/js/email-editor/changelog/add-template-canvas-affordance
deleted file mode 100644
index 79f4827cafb..00000000000
--- a/packages/js/email-editor/changelog/add-template-canvas-affordance
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: add
-
-Add a canvas affordance for editing the email template from email content mode.
diff --git a/packages/js/email-editor/package.json b/packages/js/email-editor/package.json
index 760781856ba..bb1c83c4aaa 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.0.0",
+	"version": "2.1.0",
 	"description": "Gutenberg based email editor that is used in WooCommerce emails.",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",