diff --git a/plugins/woocommerce-blocks/assets/js/atomic/blocks/product-elements/add-to-cart/shared/add-to-cart-button.js b/plugins/woocommerce-blocks/assets/js/atomic/blocks/product-elements/add-to-cart/shared/add-to-cart-button.js index 322edc4317e..16194037379 100644 --- a/plugins/woocommerce-blocks/assets/js/atomic/blocks/product-elements/add-to-cart/shared/add-to-cart-button.js +++ b/plugins/woocommerce-blocks/assets/js/atomic/blocks/product-elements/add-to-cart/shared/add-to-cart-button.js @@ -2,7 +2,7 @@ * External dependencies */ import { __, _n, sprintf } from '@wordpress/i18n'; -import { Button } from '@woocommerce/blocks-checkout'; +import Button from '@woocommerce/base-components/button'; import { Icon, done as doneIcon } from '@woocommerce/icons'; import { useState, useEffect } from '@wordpress/element'; import { useAddToCartFormContext } from '@woocommerce/base-context'; diff --git a/plugins/woocommerce-blocks/assets/js/atomic/blocks/product-elements/sale-badge/block.js b/plugins/woocommerce-blocks/assets/js/atomic/blocks/product-elements/sale-badge/block.js index 6904d2eb3a2..d9e9041ee37 100644 --- a/plugins/woocommerce-blocks/assets/js/atomic/blocks/product-elements/sale-badge/block.js +++ b/plugins/woocommerce-blocks/assets/js/atomic/blocks/product-elements/sale-badge/block.js @@ -4,7 +4,7 @@ import PropTypes from 'prop-types'; import { __ } from '@wordpress/i18n'; import classnames from 'classnames'; -import { Label } from '@woocommerce/blocks-checkout'; +import Label from '@woocommerce/base-components/label'; import { useInnerBlockLayoutContext, useProductDataContext, diff --git a/plugins/woocommerce-blocks/packages/checkout/button/index.tsx b/plugins/woocommerce-blocks/assets/js/base/components/button/index.tsx similarity index 100% rename from plugins/woocommerce-blocks/packages/checkout/button/index.tsx rename to plugins/woocommerce-blocks/assets/js/base/components/button/index.tsx diff --git a/plugins/woocommerce-blocks/packages/checkout/button/stories/index.js b/plugins/woocommerce-blocks/assets/js/base/components/button/stories/index.js similarity index 100% rename from plugins/woocommerce-blocks/packages/checkout/button/stories/index.js rename to plugins/woocommerce-blocks/assets/js/base/components/button/stories/index.js diff --git a/plugins/woocommerce-blocks/packages/checkout/button/style.scss b/plugins/woocommerce-blocks/assets/js/base/components/button/style.scss similarity index 100% rename from plugins/woocommerce-blocks/packages/checkout/button/style.scss rename to plugins/woocommerce-blocks/assets/js/base/components/button/style.scss diff --git a/plugins/woocommerce-blocks/assets/js/base/components/cart-checkout/order-summary/order-summary-item.js b/plugins/woocommerce-blocks/assets/js/base/components/cart-checkout/order-summary/order-summary-item.js index 5f48dbe3926..d245a08e07c 100644 --- a/plugins/woocommerce-blocks/assets/js/base/components/cart-checkout/order-summary/order-summary-item.js +++ b/plugins/woocommerce-blocks/assets/js/base/components/cart-checkout/order-summary/order-summary-item.js @@ -2,13 +2,13 @@ * External dependencies */ import { __, sprintf } from '@wordpress/i18n'; +import Label from '@woocommerce/base-components/label'; import ProductPrice from '@woocommerce/base-components/product-price'; import ProductName from '@woocommerce/base-components/product-name'; import { getCurrencyFromPriceResponse } from '@woocommerce/price-format'; import { __experimentalApplyCheckoutFilter, mustContain, - Label, } from '@woocommerce/blocks-checkout'; import PropTypes from 'prop-types'; import Dinero from 'dinero.js'; diff --git a/plugins/woocommerce-blocks/assets/js/base/components/cart-checkout/place-order-button/index.js b/plugins/woocommerce-blocks/assets/js/base/components/cart-checkout/place-order-button/index.js index 101285c492b..568867447d9 100644 --- a/plugins/woocommerce-blocks/assets/js/base/components/cart-checkout/place-order-button/index.js +++ b/plugins/woocommerce-blocks/assets/js/base/components/cart-checkout/place-order-button/index.js @@ -4,7 +4,7 @@ import { __ } from '@wordpress/i18n'; import { useCheckoutSubmit } from '@woocommerce/base-context/hooks'; import { Icon, done } from '@woocommerce/icons'; -import { Button } from '@woocommerce/blocks-checkout'; +import Button from '@woocommerce/base-components/button'; const PlaceOrderButton = () => { const { diff --git a/plugins/woocommerce-blocks/assets/js/base/components/cart-checkout/shipping-calculator/address.tsx b/plugins/woocommerce-blocks/assets/js/base/components/cart-checkout/shipping-calculator/address.tsx index 50274d53c8e..4187960c48f 100644 --- a/plugins/woocommerce-blocks/assets/js/base/components/cart-checkout/shipping-calculator/address.tsx +++ b/plugins/woocommerce-blocks/assets/js/base/components/cart-checkout/shipping-calculator/address.tsx @@ -2,7 +2,7 @@ * External dependencies */ import { __ } from '@wordpress/i18n'; -import { Button } from '@woocommerce/blocks-checkout'; +import Button from '@woocommerce/base-components/button'; import { useState } from '@wordpress/element'; import isShallowEqual from '@wordpress/is-shallow-equal'; import { useValidationContext } from '@woocommerce/base-context'; diff --git a/plugins/woocommerce-blocks/assets/js/base/components/cart-checkout/shipping-rates-control-package/index.tsx b/plugins/woocommerce-blocks/assets/js/base/components/cart-checkout/shipping-rates-control-package/index.tsx index 87a2b5fbf82..9debb174fa5 100644 --- a/plugins/woocommerce-blocks/assets/js/base/components/cart-checkout/shipping-rates-control-package/index.tsx +++ b/plugins/woocommerce-blocks/assets/js/base/components/cart-checkout/shipping-rates-control-package/index.tsx @@ -6,7 +6,8 @@ import { _n, sprintf } from '@wordpress/i18n'; import { decodeEntities } from '@wordpress/html-entities'; import type { ReactElement } from 'react'; import type { PackageRateOption } from '@woocommerce/type-defs/shipping'; -import { Panel, Label } from '@woocommerce/blocks-checkout'; +import { Panel } from '@woocommerce/blocks-checkout'; +import Label from '@woocommerce/base-components/label'; import { useSelectShippingRate } from '@woocommerce/base-context/hooks'; import type { CartShippingPackageShippingRate } from '@woocommerce/type-defs/cart'; diff --git a/plugins/woocommerce-blocks/assets/js/base/components/cart-checkout/totals/coupon/index.js b/plugins/woocommerce-blocks/assets/js/base/components/cart-checkout/totals/coupon/index.js index 5f96433deb9..8a720b94fee 100644 --- a/plugins/woocommerce-blocks/assets/js/base/components/cart-checkout/totals/coupon/index.js +++ b/plugins/woocommerce-blocks/assets/js/base/components/cart-checkout/totals/coupon/index.js @@ -3,8 +3,9 @@ */ import { __ } from '@wordpress/i18n'; import { useState, useEffect, useRef } from '@wordpress/element'; -import { Button, Panel, Label } from '@woocommerce/blocks-checkout'; +import Button from '@woocommerce/base-components/button'; import { ValidatedTextInput } from '@woocommerce/base-components/text-input'; +import Label from '@woocommerce/base-components/label'; import LoadingMask from '@woocommerce/base-components/loading-mask'; import PropTypes from 'prop-types'; import { withInstanceId } from '@woocommerce/base-hocs/with-instance-id'; @@ -12,6 +13,7 @@ import { ValidationInputError, useValidationContext, } from '@woocommerce/base-context'; +import { Panel } from '@woocommerce/blocks-checkout'; /** * Internal dependencies diff --git a/plugins/woocommerce-blocks/assets/js/base/components/filter-submit-button/index.js b/plugins/woocommerce-blocks/assets/js/base/components/filter-submit-button/index.js index 6cea3b69c67..68ec5217265 100644 --- a/plugins/woocommerce-blocks/assets/js/base/components/filter-submit-button/index.js +++ b/plugins/woocommerce-blocks/assets/js/base/components/filter-submit-button/index.js @@ -4,7 +4,7 @@ import { __ } from '@wordpress/i18n'; import PropTypes from 'prop-types'; import classNames from 'classnames'; -import { Label } from '@woocommerce/blocks-checkout'; +import Label from '@woocommerce/base-components/label'; /** * Internal dependencies diff --git a/plugins/woocommerce-blocks/packages/checkout/label/index.tsx b/plugins/woocommerce-blocks/assets/js/base/components/label/index.tsx similarity index 100% rename from plugins/woocommerce-blocks/packages/checkout/label/index.tsx rename to plugins/woocommerce-blocks/assets/js/base/components/label/index.tsx diff --git a/plugins/woocommerce-blocks/packages/checkout/label/test/__snapshots__/index.js.snap b/plugins/woocommerce-blocks/assets/js/base/components/label/test/__snapshots__/index.js.snap similarity index 100% rename from plugins/woocommerce-blocks/packages/checkout/label/test/__snapshots__/index.js.snap rename to plugins/woocommerce-blocks/assets/js/base/components/label/test/__snapshots__/index.js.snap diff --git a/plugins/woocommerce-blocks/packages/checkout/label/test/index.js b/plugins/woocommerce-blocks/assets/js/base/components/label/test/index.js similarity index 100% rename from plugins/woocommerce-blocks/packages/checkout/label/test/index.js rename to plugins/woocommerce-blocks/assets/js/base/components/label/test/index.js diff --git a/plugins/woocommerce-blocks/assets/js/base/components/load-more-button/index.js b/plugins/woocommerce-blocks/assets/js/base/components/load-more-button/index.js index a1da33a0932..2d7ff1e09a9 100644 --- a/plugins/woocommerce-blocks/assets/js/base/components/load-more-button/index.js +++ b/plugins/woocommerce-blocks/assets/js/base/components/load-more-button/index.js @@ -3,7 +3,7 @@ */ import { __ } from '@wordpress/i18n'; import PropTypes from 'prop-types'; -import { Label } from '@woocommerce/blocks-checkout'; +import Label from '@woocommerce/base-components/label'; /** * Internal dependencies diff --git a/plugins/woocommerce-blocks/assets/js/base/components/pagination/index.js b/plugins/woocommerce-blocks/assets/js/base/components/pagination/index.js index bf931394e92..c6a535ef1ec 100644 --- a/plugins/woocommerce-blocks/assets/js/base/components/pagination/index.js +++ b/plugins/woocommerce-blocks/assets/js/base/components/pagination/index.js @@ -4,7 +4,7 @@ import { __, sprintf } from '@wordpress/i18n'; import PropTypes from 'prop-types'; import classNames from 'classnames'; -import { Label } from '@woocommerce/blocks-checkout'; +import Label from '@woocommerce/base-components/label'; /** * Internal dependencies diff --git a/plugins/woocommerce-blocks/assets/js/base/components/sort-select/index.js b/plugins/woocommerce-blocks/assets/js/base/components/sort-select/index.js index f2d17967eaf..8c1f8cf74a7 100644 --- a/plugins/woocommerce-blocks/assets/js/base/components/sort-select/index.js +++ b/plugins/woocommerce-blocks/assets/js/base/components/sort-select/index.js @@ -3,7 +3,7 @@ */ import PropTypes from 'prop-types'; import classNames from 'classnames'; -import { Label } from '@woocommerce/blocks-checkout'; +import Label from '@woocommerce/base-components/label'; import { withInstanceId } from '@woocommerce/base-hocs/with-instance-id'; /** diff --git a/plugins/woocommerce-blocks/assets/js/base/components/text-input/text-input.tsx b/plugins/woocommerce-blocks/assets/js/base/components/text-input/text-input.tsx index d1a698be38e..eecf1ccc4da 100644 --- a/plugins/woocommerce-blocks/assets/js/base/components/text-input/text-input.tsx +++ b/plugins/woocommerce-blocks/assets/js/base/components/text-input/text-input.tsx @@ -4,11 +4,11 @@ import { forwardRef, InputHTMLAttributes } from 'react'; import classnames from 'classnames'; import { useState } from '@wordpress/element'; -import { Label } from '@woocommerce/blocks-checkout'; /** * Internal dependencies */ +import Label from '../label'; import './style.scss'; interface TextInputProps diff --git a/plugins/woocommerce-blocks/assets/js/blocks/active-filters/block.js b/plugins/woocommerce-blocks/assets/js/blocks/active-filters/block.js index 9872ce458aa..30f6ec761c5 100644 --- a/plugins/woocommerce-blocks/assets/js/blocks/active-filters/block.js +++ b/plugins/woocommerce-blocks/assets/js/blocks/active-filters/block.js @@ -6,7 +6,7 @@ import { useQueryStateByKey } from '@woocommerce/base-context/hooks'; import { useMemo } from '@wordpress/element'; import classnames from 'classnames'; import PropTypes from 'prop-types'; -import { Label } from '@woocommerce/blocks-checkout'; +import Label from '@woocommerce/base-components/label'; /** * Internal dependencies diff --git a/plugins/woocommerce-blocks/assets/js/blocks/active-filters/utils.js b/plugins/woocommerce-blocks/assets/js/blocks/active-filters/utils.js index 85ad2082c62..8d364c9f1c2 100644 --- a/plugins/woocommerce-blocks/assets/js/blocks/active-filters/utils.js +++ b/plugins/woocommerce-blocks/assets/js/blocks/active-filters/utils.js @@ -4,7 +4,7 @@ import { __, sprintf } from '@wordpress/i18n'; import { formatPrice } from '@woocommerce/price-format'; import { RemovableChip } from '@woocommerce/base-components/chip'; -import { Label } from '@woocommerce/blocks-checkout'; +import Label from '@woocommerce/base-components/label'; /** * Format a min/max price range to display. diff --git a/plugins/woocommerce-blocks/assets/js/blocks/attribute-filter/label.js b/plugins/woocommerce-blocks/assets/js/blocks/attribute-filter/label.js index 0ccb3347f67..cfd3aee6e21 100644 --- a/plugins/woocommerce-blocks/assets/js/blocks/attribute-filter/label.js +++ b/plugins/woocommerce-blocks/assets/js/blocks/attribute-filter/label.js @@ -2,7 +2,7 @@ * External dependencies */ import { _n, sprintf } from '@wordpress/i18n'; -import { Label } from '@woocommerce/blocks-checkout'; +import Label from '@woocommerce/base-components/label'; /** * The label for an attribute term filter. diff --git a/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/cart/checkout-button/index.js b/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/cart/checkout-button/index.js index 33cda25dffd..3f96b5b7ae4 100644 --- a/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/cart/checkout-button/index.js +++ b/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/cart/checkout-button/index.js @@ -4,7 +4,7 @@ import { __ } from '@wordpress/i18n'; import { useState, useEffect } from '@wordpress/element'; import { PaymentMethodIcons } from '@woocommerce/base-components/cart-checkout'; -import { Button } from '@woocommerce/blocks-checkout'; +import Button from '@woocommerce/base-components/button'; import { CHECKOUT_URL } from '@woocommerce/block-settings'; import { useCheckoutContext } from '@woocommerce/base-context'; import { usePaymentMethods } from '@woocommerce/base-context/hooks'; diff --git a/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/payment-methods/payment-methods.js b/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/payment-methods/payment-methods.js index 3c5dbba8347..24b275040e3 100644 --- a/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/payment-methods/payment-methods.js +++ b/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/payment-methods/payment-methods.js @@ -3,7 +3,7 @@ */ import { usePaymentMethods } from '@woocommerce/base-context/hooks'; import { __ } from '@wordpress/i18n'; -import { Label } from '@woocommerce/blocks-checkout'; +import Label from '@woocommerce/base-components/label'; import { usePaymentMethodDataContext } from '@woocommerce/base-context'; /** diff --git a/plugins/woocommerce-blocks/packages/checkout/button/index.ts b/plugins/woocommerce-blocks/packages/checkout/button/index.ts new file mode 100644 index 00000000000..fe45b9fe8d8 --- /dev/null +++ b/plugins/woocommerce-blocks/packages/checkout/button/index.ts @@ -0,0 +1,6 @@ +/** + * External dependencies + */ +import Button from '@woocommerce/base-components/button'; + +export default Button; diff --git a/plugins/woocommerce-blocks/packages/checkout/label/index.ts b/plugins/woocommerce-blocks/packages/checkout/label/index.ts new file mode 100644 index 00000000000..d6294e80c0f --- /dev/null +++ b/plugins/woocommerce-blocks/packages/checkout/label/index.ts @@ -0,0 +1,6 @@ +/** + * External dependencies + */ +import Label from '@woocommerce/base-components/label'; + +export default Label;