Skip to content

Commit 7e62599

Browse files
triple0ttriple0t
authored
Switch to prefixed version of the CssInliner package (#61191)
* Remove pelago/emogrifier dependency from email-editor and WooCommerce composer files, updating composer.lock accordingly. We need to remove the pelago/emogrifier package, e.g, (composer remove pelago/emogrifier) from both the WooCommerce plugin and the Email Editor because removing it from only the plugin will still let it be included via the email editor package. Since both the email editor package and the plugin rely on the same package, we need to update both simultaneously. * Add Mozart config for the emogrifier package. The `thecodingmachine/safe` config is required for `pelago/emogrifier` 8.1.0. This is required package install or update will throw an error without it. * Add pelago/emogrifier to the Woo plugin and prefix the classes * Use Prefixed package versions in the Woo core plugin and the email editor * Add changelog files * Patch phpstan errors * Fix lint errors The proper type will be added in another PR. * Skip email editor tests pending when the final PR is completed. * Skip markdownlint for generated files
1 parent 5cdefcf commit 7e62599

File tree

137 files changed

+14782
-620
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+14782
-620
lines changed

‎.markdownlintignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
plugins/woocommerce-docs/tests/src/Blocks/fixtures/*
1+
plugins/woocommerce-docs/tests/src/Blocks/fixtures/*
2+
plugins/woocommerce/lib/classes/*
3+
plugins/woocommerce/lib/packages/*
4+
packages/php/email-editor/vendor-prefixed/*

‎packages/php/email-editor/changelog/fix-package-conflict-part-two‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Significance: patch
2+
Type: tweak
3+
4+
Temporarily remove the CSSInliner package and verify that the WooCommerce integration of the email editor continues to function properly.

‎packages/php/email-editor/composer.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
]
1818
},
1919
"require": {
20-
"php": ">=7.4",
21-
"pelago/emogrifier": "7.3.0"
20+
"php": ">=7.4"
2221
},
2322
"require-dev": {
2423
"automattic/jetpack-changelogger": "3.3.0",

0 commit comments

Comments
 (0)