diff --git a/assets/js/base/components/cart-checkout/shipping-calculator/index.tsx b/assets/js/base/components/cart-checkout/shipping-calculator/index.tsx index 108fb33f25a..b1a346e6a37 100644 --- a/assets/js/base/components/cart-checkout/shipping-calculator/index.tsx +++ b/assets/js/base/components/cart-checkout/shipping-calculator/index.tsx @@ -5,7 +5,7 @@ import type { ShippingAddress } from '@woocommerce/settings'; import { useCustomerData } from '@woocommerce/base-context/hooks'; import { dispatch } from '@wordpress/data'; import { CART_STORE_KEY, processErrorResponse } from '@woocommerce/block-data'; -import { StoreNoticesContainer } from '@woocommerce/blocks-checkout'; +import { StoreNoticesContainer } from '@woocommerce/blocks-components'; import { removeNoticesWithContext } from '@woocommerce/base-utils'; /** diff --git a/assets/js/blocks/cart-checkout-shared/payment-methods/express-payment/cart-express-payment.js b/assets/js/blocks/cart-checkout-shared/payment-methods/express-payment/cart-express-payment.js index 19bd9b914ed..59e2f92b4ba 100644 --- a/assets/js/blocks/cart-checkout-shared/payment-methods/express-payment/cart-express-payment.js +++ b/assets/js/blocks/cart-checkout-shared/payment-methods/express-payment/cart-express-payment.js @@ -4,7 +4,7 @@ import { __ } from '@wordpress/i18n'; import { useExpressPaymentMethods } from '@woocommerce/base-context/hooks'; import { noticeContexts } from '@woocommerce/base-context'; -import { StoreNoticesContainer } from '@woocommerce/blocks-checkout'; +import { StoreNoticesContainer } from '@woocommerce/blocks-components'; import LoadingMask from '@woocommerce/base-components/loading-mask'; import { useSelect } from '@wordpress/data'; import { CHECKOUT_STORE_KEY, PAYMENT_STORE_KEY } from '@woocommerce/block-data'; diff --git a/assets/js/blocks/cart-checkout-shared/payment-methods/express-payment/checkout-express-payment.js b/assets/js/blocks/cart-checkout-shared/payment-methods/express-payment/checkout-express-payment.js index dc715fca37c..810320c2a69 100644 --- a/assets/js/blocks/cart-checkout-shared/payment-methods/express-payment/checkout-express-payment.js +++ b/assets/js/blocks/cart-checkout-shared/payment-methods/express-payment/checkout-express-payment.js @@ -3,8 +3,7 @@ */ import { __ } from '@wordpress/i18n'; import { useEditorContext, noticeContexts } from '@woocommerce/base-context'; -import { StoreNoticesContainer } from '@woocommerce/blocks-checkout'; -import { Title } from '@woocommerce/blocks-components'; +import { Title, StoreNoticesContainer } from '@woocommerce/blocks-components'; import LoadingMask from '@woocommerce/base-components/loading-mask'; import { CURRENT_USER_IS_ADMIN } from '@woocommerce/settings'; import { CHECKOUT_STORE_KEY, PAYMENT_STORE_KEY } from '@woocommerce/block-data'; diff --git a/assets/js/blocks/cart-checkout-shared/payment-methods/payment-method-error-boundary.tsx b/assets/js/blocks/cart-checkout-shared/payment-methods/payment-method-error-boundary.tsx index 4c997d08902..6f43e7de18a 100644 --- a/assets/js/blocks/cart-checkout-shared/payment-methods/payment-method-error-boundary.tsx +++ b/assets/js/blocks/cart-checkout-shared/payment-methods/payment-method-error-boundary.tsx @@ -4,7 +4,7 @@ import { __ } from '@wordpress/i18n'; import { useState } from '@wordpress/element'; import { CURRENT_USER_IS_ADMIN } from '@woocommerce/settings'; -import { StoreNoticesContainer } from '@woocommerce/blocks-checkout'; +import { StoreNoticesContainer } from '@woocommerce/blocks-components'; import { noticeContexts } from '@woocommerce/base-context'; import { NoticeType } from '@woocommerce/types'; interface PaymentMethodErrorBoundaryProps { diff --git a/assets/js/blocks/cart/block.js b/assets/js/blocks/cart/block.js index d3afcc43057..811c034178c 100644 --- a/assets/js/blocks/cart/block.js +++ b/assets/js/blocks/cart/block.js @@ -14,10 +14,8 @@ import { CartProvider, noticeContexts, } from '@woocommerce/base-context'; -import { - SlotFillProvider, - StoreNoticesContainer, -} from '@woocommerce/blocks-checkout'; +import { SlotFillProvider } from '@woocommerce/blocks-checkout'; +import { StoreNoticesContainer } from '@woocommerce/blocks-components'; /** * Internal dependencies diff --git a/assets/js/blocks/checkout/block.tsx b/assets/js/blocks/checkout/block.tsx index 6374e9527e6..b787c78cc43 100644 --- a/assets/js/blocks/checkout/block.tsx +++ b/assets/js/blocks/checkout/block.tsx @@ -12,10 +12,8 @@ import { CheckoutProvider, noticeContexts } from '@woocommerce/base-context'; import BlockErrorBoundary from '@woocommerce/base-components/block-error-boundary'; import { SidebarLayout } from '@woocommerce/base-components/sidebar-layout'; import { CURRENT_USER_IS_ADMIN, getSetting } from '@woocommerce/settings'; -import { - SlotFillProvider, - StoreNoticesContainer, -} from '@woocommerce/blocks-checkout'; +import { StoreNoticesContainer } from '@woocommerce/blocks-components'; +import { SlotFillProvider } from '@woocommerce/blocks-checkout'; import withScrollToTop from '@woocommerce/base-hocs/with-scroll-to-top'; import { useDispatch, useSelect } from '@wordpress/data'; import { diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-actions-block/block.tsx b/assets/js/blocks/checkout/inner-blocks/checkout-actions-block/block.tsx index 5896878c053..da01127aee5 100644 --- a/assets/js/blocks/checkout/inner-blocks/checkout-actions-block/block.tsx +++ b/assets/js/blocks/checkout/inner-blocks/checkout-actions-block/block.tsx @@ -9,10 +9,8 @@ import { } from '@woocommerce/base-components/cart-checkout'; import { useCheckoutSubmit } from '@woocommerce/base-context/hooks'; import { noticeContexts } from '@woocommerce/base-context'; -import { - StoreNoticesContainer, - applyCheckoutFilter, -} from '@woocommerce/blocks-checkout'; +import { StoreNoticesContainer } from '@woocommerce/blocks-components'; +import { applyCheckoutFilter } from '@woocommerce/blocks-checkout'; /** * Internal dependencies diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-billing-address-block/block.tsx b/assets/js/blocks/checkout/inner-blocks/checkout-billing-address-block/block.tsx index 1b10bc7c966..752138937a3 100644 --- a/assets/js/blocks/checkout/inner-blocks/checkout-billing-address-block/block.tsx +++ b/assets/js/blocks/checkout/inner-blocks/checkout-billing-address-block/block.tsx @@ -14,7 +14,7 @@ import type { AddressField, AddressFields, } from '@woocommerce/settings'; -import { StoreNoticesContainer } from '@woocommerce/blocks-checkout'; +import { StoreNoticesContainer } from '@woocommerce/blocks-components'; import { useSelect } from '@wordpress/data'; import { CART_STORE_KEY } from '@woocommerce/block-data'; diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-contact-information-block/block.tsx b/assets/js/blocks/checkout/inner-blocks/checkout-contact-information-block/block.tsx index db8e9d315b4..68a0e3fa803 100644 --- a/assets/js/blocks/checkout/inner-blocks/checkout-contact-information-block/block.tsx +++ b/assets/js/blocks/checkout/inner-blocks/checkout-contact-information-block/block.tsx @@ -8,11 +8,11 @@ import { noticeContexts, } from '@woocommerce/base-context'; import { getSetting } from '@woocommerce/settings'; +import { CheckboxControl } from '@woocommerce/blocks-checkout'; import { - CheckboxControl, StoreNoticesContainer, -} from '@woocommerce/blocks-checkout'; -import { ValidatedTextInput } from '@woocommerce/blocks-components'; + ValidatedTextInput, +} from '@woocommerce/blocks-components'; import { useDispatch, useSelect } from '@wordpress/data'; import { CHECKOUT_STORE_KEY } from '@woocommerce/block-data'; import { isEmail } from '@wordpress/url'; diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-payment-block/frontend.tsx b/assets/js/blocks/checkout/inner-blocks/checkout-payment-block/frontend.tsx index c590e7bac1e..3b018824274 100644 --- a/assets/js/blocks/checkout/inner-blocks/checkout-payment-block/frontend.tsx +++ b/assets/js/blocks/checkout/inner-blocks/checkout-payment-block/frontend.tsx @@ -4,10 +4,12 @@ import classnames from 'classnames'; import { useStoreCart } from '@woocommerce/base-context/hooks'; import { withFilteredAttributes } from '@woocommerce/shared-hocs'; -import { FormStep } from '@woocommerce/blocks-components'; +import { + FormStep, + StoreNoticesContainer, +} from '@woocommerce/blocks-components'; import { useSelect } from '@wordpress/data'; import { CHECKOUT_STORE_KEY } from '@woocommerce/block-data'; -import { StoreNoticesContainer } from '@woocommerce/blocks-checkout'; import { noticeContexts } from '@woocommerce/base-context'; /** diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-shipping-address-block/block.tsx b/assets/js/blocks/checkout/inner-blocks/checkout-shipping-address-block/block.tsx index 1ee5785fba5..4ce88377c4a 100644 --- a/assets/js/blocks/checkout/inner-blocks/checkout-shipping-address-block/block.tsx +++ b/assets/js/blocks/checkout/inner-blocks/checkout-shipping-address-block/block.tsx @@ -9,10 +9,8 @@ import { useEditorContext, noticeContexts, } from '@woocommerce/base-context'; -import { - CheckboxControl, - StoreNoticesContainer, -} from '@woocommerce/blocks-checkout'; +import { CheckboxControl } from '@woocommerce/blocks-checkout'; +import { StoreNoticesContainer } from '@woocommerce/blocks-components'; import Noninteractive from '@woocommerce/base-components/noninteractive'; import type { BillingAddress, diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-shipping-methods-block/block.tsx b/assets/js/blocks/checkout/inner-blocks/checkout-shipping-methods-block/block.tsx index 34e52ba81de..902020cb3e7 100644 --- a/assets/js/blocks/checkout/inner-blocks/checkout-shipping-methods-block/block.tsx +++ b/assets/js/blocks/checkout/inner-blocks/checkout-shipping-methods-block/block.tsx @@ -13,9 +13,11 @@ import { isAddressComplete, } from '@woocommerce/base-utils'; import { getCurrencyFromPriceResponse } from '@woocommerce/price-format'; -import { FormattedMonetaryAmount } from '@woocommerce/blocks-components'; +import { + FormattedMonetaryAmount, + StoreNoticesContainer, +} from '@woocommerce/blocks-components'; import { useEditorContext, noticeContexts } from '@woocommerce/base-context'; -import { StoreNoticesContainer } from '@woocommerce/blocks-checkout'; import { decodeEntities } from '@wordpress/html-entities'; import { getSetting } from '@woocommerce/settings'; import type { diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-totals-block/frontend.tsx b/assets/js/blocks/checkout/inner-blocks/checkout-totals-block/frontend.tsx index 43f65fab2ac..726204c6cb7 100644 --- a/assets/js/blocks/checkout/inner-blocks/checkout-totals-block/frontend.tsx +++ b/assets/js/blocks/checkout/inner-blocks/checkout-totals-block/frontend.tsx @@ -3,7 +3,7 @@ */ import classnames from 'classnames'; import { Sidebar } from '@woocommerce/base-components/sidebar-layout'; -import { StoreNoticesContainer } from '@woocommerce/blocks-checkout'; +import { StoreNoticesContainer } from '@woocommerce/blocks-components'; const FrontendBlock = ( { children, diff --git a/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/filled-mini-cart-contents-block/frontend.tsx b/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/filled-mini-cart-contents-block/frontend.tsx index 9fb3904893d..3662e9b354f 100644 --- a/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/filled-mini-cart-contents-block/frontend.tsx +++ b/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/filled-mini-cart-contents-block/frontend.tsx @@ -1,7 +1,7 @@ /** * External dependencies */ -import { StoreNoticesContainer } from '@woocommerce/blocks-checkout'; +import { StoreNoticesContainer } from '@woocommerce/blocks-components'; import { useStoreCart } from '@woocommerce/base-context/hooks'; type FilledMiniCartContentsBlockProps = { diff --git a/assets/js/blocks/products/all-products/block.tsx b/assets/js/blocks/products/all-products/block.tsx index 03c52863b88..8d606d1e2bd 100644 --- a/assets/js/blocks/products/all-products/block.tsx +++ b/assets/js/blocks/products/all-products/block.tsx @@ -5,7 +5,7 @@ import { Component } from '@wordpress/element'; import { ProductListContainer } from '@woocommerce/base-components/product-list'; import { InnerBlockLayoutContextProvider } from '@woocommerce/shared-context'; import { gridBlockPreview } from '@woocommerce/resource-previews'; -import { StoreNoticesContainer } from '@woocommerce/blocks-checkout'; +import { StoreNoticesContainer } from '@woocommerce/blocks-components'; import { Attributes as ProductListAttributes } from 'assets/js/base/components/product-list/types'; interface BlockProps { diff --git a/packages/checkout/components/README.md b/packages/checkout/components/README.md index 305ebeb1946..9f7bf428f78 100644 --- a/packages/checkout/components/README.md +++ b/packages/checkout/components/README.md @@ -8,7 +8,7 @@ When WooCommerce Blocks is installed and activated, these components can be acce ```ts // Aliased import -import { Button } from '@woocommerce/blocks-checkout'; +import { Button } from '@woocommerce/blocks-components'; // Global import // const { Button } = wc.blocksCheckout; @@ -29,4 +29,3 @@ These components are here so they can be consumed by extensions. 🐞 Found a mistake, or have a suggestion? [Leave feedback about this document here.](https://github.com/woocommerce/woocommerce-blocks/issues/new?assignees=&labels=type%3A+documentation&template=--doc-feedback.md&title=Feedback%20on%20./packages/checkout/components/README.md) - diff --git a/packages/checkout/components/index.ts b/packages/checkout/components/index.ts index f03df4a1f94..00f03de34b1 100644 --- a/packages/checkout/components/index.ts +++ b/packages/checkout/components/index.ts @@ -5,10 +5,10 @@ export { default as ExperimentalDiscountsMeta } from './discounts-meta'; export { default as ExperimentalOrderShippingPackages } from './order-shipping-packages'; export { default as ExperimentalOrderLocalPickupPackages } from './order-local-pickup-packages'; export { default as Panel } from '../../components/panel'; -export { default as Button } from './button'; +export { default as Button } from '../../components/button'; export { default as Label } from './label'; -export { default as StoreNoticesContainer } from './store-notices-container'; +export { default as StoreNoticesContainer } from '../../components/store-notices-container'; export { default as CheckboxControl } from './checkbox-control'; export { ValidationInputError } from './validation-input-error'; export { ValidatedTextInput, TextInput } from './text-input'; -export { default as StoreNotice } from './store-notice'; +export { default as StoreNotice } from '../../components/store-notice'; diff --git a/packages/checkout/components/button/index.ts b/packages/components/button/index.ts similarity index 100% rename from packages/checkout/components/button/index.ts rename to packages/components/button/index.ts diff --git a/packages/components/checkbox-list/stories/index.tsx b/packages/components/checkbox-list/stories/index.stories.tsx similarity index 100% rename from packages/components/checkbox-list/stories/index.tsx rename to packages/components/checkbox-list/stories/index.stories.tsx diff --git a/packages/components/index.ts b/packages/components/index.ts index 3ae0f2335f8..aa7ea170679 100644 --- a/packages/components/index.ts +++ b/packages/components/index.ts @@ -1,3 +1,4 @@ +export { default as Button } from './button'; export { default as CheckboxList } from './checkbox-list'; export { Chip, RemovableChip } from './chip'; export { default as FormStep } from './form-step'; @@ -13,6 +14,8 @@ export type { RadioControlOption as RadioControlOptionType } from './radio-contr export { default as RadioControlAccordion } from './radio-control-accordion'; export { default as SortSelect } from './sort-select'; export { default as Spinner } from './spinner'; +export { default as StoreNotice } from './store-notice'; +export { default as StoreNoticesContainer } from './store-notices-container'; export { default as Textarea } from './textarea'; export { default as ValidatedTextInput, diff --git a/packages/checkout/components/store-notice/index.tsx b/packages/components/store-notice/index.tsx similarity index 100% rename from packages/checkout/components/store-notice/index.tsx rename to packages/components/store-notice/index.tsx diff --git a/packages/checkout/components/store-notices-container/index.tsx b/packages/components/store-notices-container/index.tsx similarity index 100% rename from packages/checkout/components/store-notices-container/index.tsx rename to packages/components/store-notices-container/index.tsx diff --git a/packages/checkout/components/store-notices-container/snackbar-notices.tsx b/packages/components/store-notices-container/snackbar-notices.tsx similarity index 100% rename from packages/checkout/components/store-notices-container/snackbar-notices.tsx rename to packages/components/store-notices-container/snackbar-notices.tsx diff --git a/packages/checkout/components/store-notices-container/store-notices.tsx b/packages/components/store-notices-container/store-notices.tsx similarity index 100% rename from packages/checkout/components/store-notices-container/store-notices.tsx rename to packages/components/store-notices-container/store-notices.tsx diff --git a/packages/checkout/components/store-notices-container/style.scss b/packages/components/store-notices-container/style.scss similarity index 100% rename from packages/checkout/components/store-notices-container/style.scss rename to packages/components/store-notices-container/style.scss diff --git a/packages/checkout/components/store-notices-container/test/index.tsx b/packages/components/store-notices-container/test/index.tsx similarity index 100% rename from packages/checkout/components/store-notices-container/test/index.tsx rename to packages/components/store-notices-container/test/index.tsx diff --git a/packages/checkout/components/store-notices-container/types.ts b/packages/components/store-notices-container/types.ts similarity index 100% rename from packages/checkout/components/store-notices-container/types.ts rename to packages/components/store-notices-container/types.ts