Skip to content
This repository has been archived by the owner on Feb 23, 2024. It is now read-only.

Fix Mini-Cart block conflict with Page Optimize and Product Bundles (II) #9586

Merged
merged 1 commit into from
May 24, 2023

Conversation

Aljullu
Copy link
Contributor

@Aljullu Aljullu commented May 24, 2023

Fixes #9584.

Supersets #9585.

This PR ports the change introduced in #8979 to WC Blocks 10.0.x. It also modifies the status we compare against (enqueued instead of done), so we match any enqueued script, even if it hasn't been printed yet.

Testing

User Facing Testing

  1. Make sure you have WC core 7.7.
  2. Search & replace all instances of 10.0.4 with 10.0.5 in the codebase and run composer i. Otherwise, WC core wouldn't load WC Blocks from the feature plugin.
  3. Enable a block theme.
  4. Add the Mini-Cart block to the header of your store.
  5. Install the Page Optimize and Product Bundles plugins (no need to change anything in their configuration).
  6. Go to a page in the frontend that doesn't have any blocks besides the Mini-Cart you added to the header.
  7. Open the Mini-Cart and verify there is no JS error:
Before After
imatge imatge
  • Do not include in the Testing Notes

WooCommerce Visibility

  • WooCommerce Core
  • Feature plugin
  • Experimental

Changelog

Fix a conflict between the Mini-Cart block and the Page Optimize and Product Bundles extensions.

@woocommercebot woocommercebot requested review from a team and roykho and removed request for a team May 24, 2023 13:12
@Aljullu Aljullu self-assigned this May 24, 2023
@Aljullu Aljullu added status: needs review type: bug The issue/PR concerns a confirmed bug. block: mini-cart Issues related to the Mini-Cart block. labels May 24, 2023
@Aljullu Aljullu added this to the 10.0.5 milestone May 24, 2023
@github-actions
Copy link
Contributor

github-actions bot commented May 24, 2023

The release ZIP for this PR is accessible via:

https://wcblocks.wpcomstaging.com/wp-content/uploads/woocommerce-gutenberg-products-block-9586.zip

TypeScript Errors Report

  • Files with errors: 450
  • Total errors: 2206

⚠️ ⚠️ This PR introduces new TS errors on 12 files:

assets/js/atomic/blocks/product-elements/button/block.tsx

assets/js/atomic/blocks/product-elements/button/supports.ts

assets/js/base/components/drawer/index.tsx

assets/js/base/hooks/use-border-props.ts

assets/js/base/hooks/use-color-props.ts

assets/js/base/hooks/use-spacing-props.ts

assets/js/blocks/mini-cart/edit.tsx

assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-footer-block/block.tsx

assets/js/blocks/product-search/block.js

assets/js/blocks/product-search/edit.js

assets/js/data/utils/has-in-state.js

assets/js/data/utils/update-state.js

Script Dependencies Report

The compare-assets action has detected some changed script dependencies between this branch and trunk. Please review and confirm the following are correct before merging.

Script Handle Added Removed
wc-blocks.js wp-block-editor, wp-components, wp-core-data, wp-data, wp-edit-site, wp-plugins 🎉
active-filters.js lodash ⚠️
all-products.js wp-style-engine 🎉
all-reviews.js lodash ⚠️
cart.js wp-style-engine 🎉
featured-category.js lodash wp-style-engine
featured-product.js lodash wp-style-engine
handpicked-products.js lodash ⚠️
legacy-template.js wp-core-data, wp-notices 🎉
mini-cart-contents.js wp-components 🎉
price-filter.js lodash ⚠️
product-best-sellers.js lodash ⚠️
product-category.js lodash ⚠️
product-new.js lodash ⚠️
product-on-sale.js lodash ⚠️
product-query.js lodash ⚠️
product-tag.js lodash ⚠️
product-top-rated.js lodash ⚠️
products-by-attribute.js lodash ⚠️
reviews-by-category.js lodash ⚠️
reviews-by-product.js lodash ⚠️
single-product.js wp-style-engine 🎉

This comment was automatically generated by the ./github/compare-assets action.

comments-aggregator

Copy link
Contributor

@gigitux gigitux left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@github-actions
Copy link
Contributor

Size Change: 0 B

Total Size: 1.1 MB

ℹ️ View Unchanged
Filename Size
build/active-filters-frontend.js 7.98 kB
build/active-filters-wrapper-frontend.js 5.97 kB
build/active-filters.js 7.48 kB
build/all-products-frontend.js 11.8 kB
build/all-products.js 38.3 kB
build/all-reviews.js 7.65 kB
build/attribute-filter-frontend.js 22.5 kB
build/attribute-filter-wrapper-frontend.js 7.1 kB
build/attribute-filter.js 13.2 kB
build/blocks-checkout.js 35.1 kB
build/breadcrumbs.js 2.05 kB
build/cart-blocks/cart-accepted-payment-methods-frontend.js 1.38 kB
build/cart-blocks/cart-cross-sells-frontend.js 253 B
build/cart-blocks/cart-cross-sells-products-frontend.js 9.75 kB
build/cart-blocks/cart-express-payment--checkout-blocks/express-payment-frontend.js 5.16 kB
build/cart-blocks/cart-express-payment-frontend.js 718 B
build/cart-blocks/cart-items-frontend.js 301 B
build/cart-blocks/cart-line-items--mini-cart-contents-block/products-table-frontend.js 5.4 kB
build/cart-blocks/cart-line-items-frontend.js 1.07 kB
build/cart-blocks/cart-order-summary-frontend.js 1.27 kB
build/cart-blocks/cart-totals-frontend.js 308 B
build/cart-blocks/empty-cart-frontend.js 344 B
build/cart-blocks/filled-cart-frontend.js 655 B
build/cart-blocks/order-summary-coupon-form-frontend.js 1.62 kB
build/cart-blocks/order-summary-discount-frontend.js 2.12 kB
build/cart-blocks/order-summary-fee-frontend.js 272 B
build/cart-blocks/order-summary-heading-frontend.js 455 B
build/cart-blocks/order-summary-shipping-frontend.js 11.8 kB
build/cart-blocks/order-summary-subtotal-frontend.js 273 B
build/cart-blocks/order-summary-taxes-frontend.js 431 B
build/cart-blocks/proceed-to-checkout-frontend.js 1.33 kB
build/cart-frontend.js 29.3 kB
build/cart.js 48.6 kB
build/catalog-sorting.js 1.7 kB
build/checkout-blocks/actions-frontend.js 1.85 kB
build/checkout-blocks/billing-address-frontend.js 4.18 kB
build/checkout-blocks/contact-information-frontend.js 2.05 kB
build/checkout-blocks/express-payment-frontend.js 1.14 kB
build/checkout-blocks/fields-frontend.js 331 B
build/checkout-blocks/order-note-frontend.js 1.14 kB
build/checkout-blocks/order-summary-cart-items-frontend.js 3.71 kB
build/checkout-blocks/order-summary-coupon-form-frontend.js 1.78 kB
build/checkout-blocks/order-summary-discount-frontend.js 2.29 kB
build/checkout-blocks/order-summary-fee-frontend.js 275 B
build/checkout-blocks/order-summary-frontend.js 1.27 kB
build/checkout-blocks/order-summary-shipping-frontend.js 11.8 kB
build/checkout-blocks/order-summary-subtotal-frontend.js 273 B
build/checkout-blocks/order-summary-taxes-frontend.js 431 B
build/checkout-blocks/payment-frontend.js 8.27 kB
build/checkout-blocks/pickup-options-frontend.js 4.14 kB
build/checkout-blocks/shipping-address-frontend.js 4.14 kB
build/checkout-blocks/shipping-method-frontend.js 2.64 kB
build/checkout-blocks/shipping-methods-frontend.js 5.84 kB
build/checkout-blocks/terms-frontend.js 1.56 kB
build/checkout-blocks/totals-frontend.js 311 B
build/checkout-frontend.js 30.9 kB
build/checkout.js 46.3 kB
build/customer-account.js 3.17 kB
build/featured-category.js 14.3 kB
build/featured-product.js 14.5 kB
build/filter-wrapper-frontend.js 14 kB
build/filter-wrapper.js 2.4 kB
build/general-style-rtl.css 1.31 kB
build/general-style.css 1.31 kB
build/handpicked-products.js 7.92 kB
build/legacy-template.js 5.56 kB
build/mini-cart-component-frontend.js 28.3 kB
build/mini-cart-contents-block/cart-button-frontend.js 820 B
build/mini-cart-contents-block/checkout-button-frontend.js 821 B
build/mini-cart-contents-block/empty-cart-frontend.js 360 B
build/mini-cart-contents-block/filled-cart-frontend.js 268 B
build/mini-cart-contents-block/footer-frontend.js 3.18 kB
build/mini-cart-contents-block/items-frontend.js 237 B
build/mini-cart-contents-block/products-table-frontend.js 589 B
build/mini-cart-contents-block/shopping-button-frontend.js 705 B
build/mini-cart-contents-block/title-frontend.js 368 B
build/mini-cart-contents.js 17.4 kB
build/mini-cart-frontend.js 2.02 kB
build/mini-cart.js 4.49 kB
build/price-filter-frontend.js 13.9 kB
build/price-filter-wrapper-frontend.js 7.04 kB
build/price-filter.js 8.46 kB
build/price-format.js 1.19 kB
build/product-add-to-cart--product-button--product-image--product-price--product-rating--product-sale-bad--49d3ecb2.js 253 B
build/product-add-to-cart--product-button--product-image--product-rating--product-title.js 151 B
build/product-add-to-cart-frontend.js 6.43 kB
build/product-add-to-cart.js 8.8 kB
build/product-best-sellers.js 8.26 kB
build/product-button--product-image--product-price--product-rating--product-sale-badge--product-sku--prod--5bce0384.js 464 B
build/product-button--product-image--product-price--product-rating--product-sale-badge--product-sku--product-title.js 262 B
build/product-button-frontend.js 1.92 kB
build/product-button.js 4.17 kB
build/product-categories.js 2.36 kB
build/product-category.js 9.25 kB
build/product-image-frontend.js 1.77 kB
build/product-image.js 4.28 kB
build/product-new.js 8.26 kB
build/product-on-sale.js 8.59 kB
build/product-price-frontend.js 2.11 kB
build/product-price.js 1.67 kB
build/product-query.js 11.2 kB
build/product-rating-frontend.js 1.33 kB
build/product-rating.js 921 B
build/product-results-count.js 1.66 kB
build/product-sale-badge-frontend.js 975 B
build/product-sale-badge.js 800 B
build/product-search.js 2.63 kB
build/product-sku-frontend.js 999 B
build/product-sku.js 577 B
build/product-stock-indicator-frontend.js 1.01 kB
build/product-stock-indicator.js 646 B
build/product-summary-frontend.js 1.29 kB
build/product-summary.js 919 B
build/product-tag.js 8.75 kB
build/product-title-frontend.js 1.37 kB
build/product-title.js 3.73 kB
build/product-top-rated.js 8.49 kB
build/products-by-attribute.js 9.59 kB
build/rating-filter-frontend.js 20.8 kB
build/rating-filter-wrapper-frontend.js 5.58 kB
build/rating-filter.js 6.99 kB
build/reviews-by-category.js 11.9 kB
build/reviews-by-product.js 13 kB
build/reviews-frontend.js 7.1 kB
build/single-product.js 10.9 kB
build/stock-filter-frontend.js 21.1 kB
build/stock-filter-wrapper-frontend.js 5.83 kB
build/stock-filter.js 7.7 kB
build/store-notices.js 1.69 kB
build/vendors--attribute-filter-wrapper--cart-blocks/cart-cross-sells-products--cart-blocks/order-summary--82e4ed06-frontend.js 6.82 kB
build/vendors--attribute-filter-wrapper--rating-filter-wrapper--stock-filter-wrapper-frontend.js 7.7 kB
build/vendors--cart-blocks/cart-cross-sells-products--cart-blocks/cart-line-items--cart-blocks/cart-order--3c5fe802-frontend.js 5.26 kB
build/vendors--cart-blocks/cart-cross-sells-products--cart-blocks/order-summary-shipping--checkout-blocks--18f9376a-frontend.js 19.4 kB
build/vendors--cart-blocks/cart-cross-sells-products--product-add-to-cart-frontend.js 7.25 kB
build/vendors--cart-blocks/cart-line-items--checkout-blocks/order-summary-cart-items--mini-cart-contents---233ab542-frontend.js 3.14 kB
build/vendors--cart-blocks/order-summary-shipping--checkout-blocks/order-summary-shipping--checkout-block--24d3fc0c-frontend.js 8.25 kB
build/vendors--checkout-blocks/billing-address--checkout-blocks/shipping-address-frontend.js 5.44 kB
build/vendors--checkout-blocks/shipping-method-frontend.js 12 kB
build/wc-blocks-data.js 21.8 kB
build/wc-blocks-editor-style-rtl.css 5.83 kB
build/wc-blocks-editor-style.css 5.83 kB
build/wc-blocks-google-analytics.js 1.56 kB
build/wc-blocks-middleware.js 933 B
build/wc-blocks-registry.js 3.15 kB
build/wc-blocks-shared-context.js 1.52 kB
build/wc-blocks-shared-hocs.js 1.73 kB
build/wc-blocks-style-rtl.css 27.6 kB
build/wc-blocks-style.css 27.6 kB
build/wc-blocks-vendors-style-rtl.css 1.96 kB
build/wc-blocks-vendors-style.css 1.96 kB
build/wc-blocks-vendors.js 63.8 kB
build/wc-blocks.js 2.63 kB
build/wc-payment-method-bacs.js 816 B
build/wc-payment-method-cheque.js 811 B
build/wc-payment-method-cod.js 909 B
build/wc-payment-method-paypal.js 837 B
build/wc-settings.js 2.6 kB
build/wc-shipping-method-pickup-location.js 29.9 kB
build/woo-directives-runtime.js 2.73 kB
build/woo-directives-vendors.js 7.91 kB

compressed-size-action

@roykho
Copy link
Member

roykho commented May 24, 2023

I am not sure if I am missing a step but I am still seeing the error. Ido6nz.png

Note that I replaced the 10.0.4 versions with 10.0.5 in the WC core as it wasn't clear in the testing steps.

@Aljullu
Copy link
Contributor Author

Aljullu commented May 24, 2023

@roykho if you go to /wp-admin/plugins.php, do you see a notice mentioning the version of WC core is loaded over the one from WC Blocks? After changing the versions, you also need to run composer i.

@roykho
Copy link
Member

roykho commented May 24, 2023

@Aljullu yes and yes u0FmIs.png

@Aljullu
Copy link
Contributor Author

Aljullu commented May 24, 2023

@roykho I would say somewhere in the codebase there is still a 10.0.4 reference. Can you make sure the versions in these files are set to 10.0.5 before running composer i: woocommerce-gutenberg-products-block.php, readme.txt, src/Package.php, package.json and package-lock.json?

@gigitux
Copy link
Contributor

gigitux commented May 24, 2023

@roykho I would say somewhere in the codebase there is still a 10.0.4 reference. Can you make sure the versions in these files are set to 10.0.5 before running composer i: woocommerce-gutenberg-products-block.php, readme.txt, src/Package.php, package.json and package-lock.json?

I suggest using: npm run change-versions to update the version in all the places!

@roykho
Copy link
Member

roykho commented May 24, 2023

Ok so in my VS code workspace, I have both repos in there and search and replace all do both. That caused the issue. All good now.

Copy link
Member

@roykho roykho left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

Copy link
Contributor

@thealexandrelara thealexandrelara left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! 🚀

@Aljullu
Copy link
Contributor Author

Aljullu commented May 24, 2023

Thanks for the reviews, folks!

Some automations are failing in this PR, but:

Based on that, I will go ahead and merge and continue with the 10.0.5 release.

@Aljullu Aljullu merged commit 24c0e73 into release/10.0.0 May 24, 2023
@Aljullu Aljullu deleted the fix/9584-mini-cart-conflict-ii branch May 24, 2023 14:38
@Aljullu Aljullu modified the milestones: 10.0.5, 10.2.1 May 25, 2023
Aljullu added a commit that referenced this pull request May 25, 2023
* Empty commit for release pull request

* Add 10.2.1 changelog

* Update versions to 10.2.1

* Fix Mini-Cart block conflict with Page Optimize and Product Bundles (II) (#9586)

* Add 10.2.1 testing steps

---------

Co-authored-by: github-actions <[email protected]>
Co-authored-by: Albert Juhé Lluveras <[email protected]>
Aljullu added a commit that referenced this pull request May 30, 2023
* Empty commit for release pull request

* Fix Mini-Cart block conflict with Page Optimize and Product Bundles (II) (#9586)

* Add 10.0.5 changelog

* Update versiosn to 10.0.5

* Fix 10.0.4 testing notes markdown

* Add 10.0.5 testing notes

---------

Co-authored-by: github-actions <[email protected]>
Co-authored-by: Albert Juhé Lluveras <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
block: mini-cart Issues related to the Mini-Cart block. type: bug The issue/PR concerns a confirmed bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants