Experiment- external block context

assets/js/atomic/blocks/product-elements/add-to-cart/shared/add-to-cart-button.js

@@ -5,11 +5,11 @@ import { __, _n, sprintf } from '@wordpress/i18n';
 import Button from '@woocommerce/base-components/button';
 import { Icon, check } from '@wordpress/icons';
 import { useState, useEffect } from '@wordpress/element';
-import { useAddToCartFormContext } from '@woocommerce/base-context';
 import {
 	useStoreEvents,
 	useStoreAddToCart,
-} from '@woocommerce/base-context/hooks';
+	useAddToCartFormContext,
+} from '@woocommerce/base-context';
 import { useInnerBlockLayoutContext } from '@woocommerce/shared-context';
 
 /**

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

@@ -4,10 +4,7 @@
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { __, _n, sprintf } from '@wordpress/i18n';
-import {
-	useStoreEvents,
-	useStoreAddToCart,
-} from '@woocommerce/base-context/hooks';
+import { useStoreEvents, useStoreAddToCart } from '@woocommerce/base-context';
 import { decodeEntities } from '@wordpress/html-entities';
 import { CART_URL } from '@woocommerce/block-settings';
 import { getSetting } from '@woocommerce/settings';

assets/js/atomic/blocks/product-elements/image/block.js

@@ -11,7 +11,7 @@ import {
 	useProductDataContext,
 } from '@woocommerce/shared-context';
 import { withProductDataContext } from '@woocommerce/shared-hocs';
-import { useStoreEvents } from '@woocommerce/base-context/hooks';
+import { useStoreEvents } from '@woocommerce/base-context';
 
 /**
  * Internal dependencies

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

@@ -10,7 +10,7 @@ import {
 import { isFeaturePluginBuild } from '@woocommerce/block-settings';
 import { withProductDataContext } from '@woocommerce/shared-hocs';
 import ProductName from '@woocommerce/base-components/product-name';
-import { useStoreEvents } from '@woocommerce/base-context/hooks';
+import { useStoreEvents } from '@woocommerce/base-context';
 
 /**
  * Internal dependencies

assets/js/base/components/cart-checkout/address-form/test/index.js

@@ -3,8 +3,10 @@
  */
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { CheckoutProvider } from '@woocommerce/base-context';
-import { useCheckoutAddress } from '@woocommerce/base-context/hooks';
+import {
+	CheckoutProvider,
+	useCheckoutAddress,
+} from '@woocommerce/base-context';
 
 /**
  * Internal dependencies

assets/js/base/components/cart-checkout/order-summary/order-summary-item.tsx

@@ -17,7 +17,7 @@ import {
 import Dinero from 'dinero.js';
 import { getSetting } from '@woocommerce/settings';
 import { useMemo } from '@wordpress/element';
-import { useStoreCart } from '@woocommerce/base-context/hooks';
+import { useStoreCart } from '@woocommerce/base-context';
 import { CartItem, isString } from '@woocommerce/types';
 
 /**

assets/js/base/components/cart-checkout/place-order-button/index.tsx

@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { useCheckoutSubmit } from '@woocommerce/base-context/hooks';
+import { useCheckoutSubmit } from '@woocommerce/base-context';
 import { Icon, check } from '@wordpress/icons';
 import Button from '@woocommerce/base-components/button';
 

assets/js/base/components/cart-checkout/shipping-calculator/index.tsx

@@ -2,7 +2,7 @@
  * External dependencies
  */
 import type { EnteredAddress } from '@woocommerce/settings';
-import { useCustomerData } from '@woocommerce/base-context/hooks';
+import { useCustomerData } from '@woocommerce/base-context';
 
 /**
  * Internal dependencies

assets/js/base/components/cart-checkout/shipping-rates-control-package/index.tsx

@@ -8,7 +8,7 @@ import type { ReactElement } from 'react';
 import type { PackageRateOption } from '@woocommerce/type-defs/shipping';
 import { Panel } from '@woocommerce/blocks-checkout';
 import Label from '@woocommerce/base-components/label';
-import { useSelectShippingRate } from '@woocommerce/base-context/hooks';
+import { useSelectShippingRate } from '@woocommerce/base-context';
 import type { CartShippingPackageShippingRate } from '@woocommerce/type-defs/cart';
 
 /**

assets/js/base/components/cart-checkout/totals/footer-item/index.tsx

@@ -9,7 +9,7 @@ import {
 	__experimentalApplyCheckoutFilter,
 	TotalsItem,
 } from '@woocommerce/blocks-checkout';
-import { useStoreCart } from '@woocommerce/base-context/hooks';
+import { useStoreCart } from '@woocommerce/base-context';
 import { getSetting } from '@woocommerce/settings';
 import { CartResponseTotals, Currency } from '@woocommerce/types';
 import { LooselyMustHave } from '@woocommerce/type-defs/utils';

assets/js/base/components/cart-checkout/totals/shipping/index.tsx

@@ -4,7 +4,7 @@
 import classnames from 'classnames';
 import { __ } from '@wordpress/i18n';
 import { useState } from '@wordpress/element';
-import { useStoreCart } from '@woocommerce/base-context/hooks';
+import { useStoreCart } from '@woocommerce/base-context';
 import { TotalsItem } from '@woocommerce/blocks-checkout';
 import type { Currency } from '@woocommerce/price-format';
 import type { ReactElement } from 'react';

assets/js/base/components/product-list/product-list.tsx

@@ -12,7 +12,7 @@ import {
 	useStoreProducts,
 	useSynchronizedQueryState,
 	useQueryStateByKey,
-} from '@woocommerce/base-context/hooks';
+} from '@woocommerce/base-context';
 import withScrollToTop from '@woocommerce/base-hocs/with-scroll-to-top';
 import { useInnerBlockLayoutContext } from '@woocommerce/shared-context';
 import { speak } from '@wordpress/a11y';

assets/js/base/context/hooks/test/use-store-notices.js

@@ -2,12 +2,12 @@
  * External dependencies
  */
 import { render, act } from '@testing-library/react';
-import { StoreNoticesProvider } from '@woocommerce/base-context';
 
 /**
  * Internal dependencies
  */
 import { useStoreNotices } from '../use-store-notices';
+import { StoreNoticesProvider } from '../../providers/store-notices';
 
 describe( 'useStoreNotices', () => {
 	function setup() {

assets/js/base/context/hooks/test/use-store-snackbar-notices.js

@@ -2,12 +2,12 @@
  * External dependencies
  */
 import { render, act } from '@testing-library/react';
-import { StoreSnackbarNoticesProvider } from '@woocommerce/base-context/providers';
 
 /**
  * Internal dependencies
  */
 import { useStoreSnackbarNotices } from '../use-store-snackbar-notices';
+import { StoreSnackbarNoticesProvider } from '../../providers/store-snackbar-notices';
 
 describe( 'useStoreNoticesWithSnackbar', () => {
 	function setup() {

assets/js/base/context/hooks/use-store-snackbar-notices.js

@@ -2,7 +2,11 @@
  * External dependencies
  */
 import { useMemo, useRef, useEffect } from '@wordpress/element';
-import { useStoreSnackbarNoticesContext } from '@woocommerce/base-context/providers';
+
+/**
+ * Internal dependencies
+ */
+import { useStoreSnackbarNoticesContext } from '../providers/store-snackbar-notices';
 
 export const useStoreSnackbarNotices = () => {
 	const {

assets/js/base/context/providers/store-snackbar-notices/context.js

@@ -9,13 +9,13 @@ import {
 	useState,
 } from '@wordpress/element';
 import { useSelect, useDispatch } from '@wordpress/data';
-import SnackbarNoticesContainer from '@woocommerce/base-context/providers/store-snackbar-notices/components/snackbar-notices-container';
 
 /**
  * Internal dependencies
  */
 import { useStoreEvents } from '../../hooks/use-store-events';
 import { useEditorContext } from '../editor-context';
+import SnackbarNoticesContainer from './components/snackbar-notices-container';
 
 /**
  * @typedef {import('@woocommerce/type-defs/contexts').NoticeContext} NoticeContext

assets/js/base/context/providers/store-snackbar-notices/index.ts

@@ -1 +1,2 @@
+export * from './components/snackbar-notices-container';
 export * from './context';

assets/js/blocks/active-filters/active-attribute-filters.js

@@ -1,10 +1,7 @@
 /**
  * External dependencies
  */
-import {
-	useCollection,
-	useQueryStateByKey,
-} from '@woocommerce/base-context/hooks';
+import { useCollection, useQueryStateByKey } from '@woocommerce/base-context';
 import { decodeEntities } from '@wordpress/html-entities';
 import { __ } from '@wordpress/i18n';
 

assets/js/blocks/active-filters/block.js

@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { useQueryStateByKey } from '@woocommerce/base-context/hooks';
+import { useQueryStateByKey } from '@woocommerce/base-context';
 import { getSetting } from '@woocommerce/settings';
 import { useMemo } from '@wordpress/element';
 import classnames from 'classnames';

assets/js/blocks/attribute-filter/block.js

@@ -9,7 +9,7 @@ import {
 	useQueryStateByKey,
 	useQueryStateByContext,
 	useCollectionData,
-} from '@woocommerce/base-context/hooks';
+} from '@woocommerce/base-context';
 import { useCallback, useEffect, useState, useMemo } from '@wordpress/element';
 import CheckboxList from '@woocommerce/base-components/checkbox-list';
 import DropdownSelector from '@woocommerce/base-components/dropdown-selector';

assets/js/blocks/cart-checkout/inner-blocks/order-summary-cart-items/block.tsx

@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { OrderSummary } from '@woocommerce/base-components/cart-checkout';
-import { useStoreCart } from '@woocommerce/base-context/hooks';
+import { useStoreCart } from '@woocommerce/base-context';
 
 const Block = ( { className }: { className: string } ): JSX.Element => {
 	const { cartItems } = useStoreCart();

assets/js/blocks/cart-checkout/inner-blocks/order-summary-coupon-form/block.tsx

@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { TotalsCoupon } from '@woocommerce/base-components/cart-checkout';
-import { useStoreCartCoupons } from '@woocommerce/base-context/hooks';
+import { useStoreCartCoupons } from '@woocommerce/base-context';
 import { getSetting } from '@woocommerce/settings';
 
 const Block = ( { className }: { className: string } ): JSX.Element | null => {

assets/js/blocks/cart-checkout/inner-blocks/order-summary-discount/block.tsx

@@ -6,9 +6,9 @@ import { getCurrencyFromPriceResponse } from '@woocommerce/price-format';
 import {
 	useStoreCartCoupons,
 	useStoreCart,
-} from '@woocommerce/base-context/hooks';
+	useCheckoutContext,
+} from '@woocommerce/base-context';
 import { ExperimentalDiscountsMeta } from '@woocommerce/blocks-checkout';
-import { useCheckoutContext } from '@woocommerce/base-context';
 
 const DiscountSlotFill = (): JSX.Element => {
 	const { isCart } = useCheckoutContext();

assets/js/blocks/cart-checkout/inner-blocks/order-summary-fee/block.tsx

@@ -3,7 +3,7 @@
  */
 import { TotalsFees } from '@woocommerce/blocks-checkout';
 import { getCurrencyFromPriceResponse } from '@woocommerce/price-format';
-import { useStoreCart } from '@woocommerce/base-context/hooks';
+import { useStoreCart } from '@woocommerce/base-context';
 
 const Block = ( { className }: { className: string } ): JSX.Element => {
 	const { cartFees, cartTotals } = useStoreCart();

assets/js/blocks/cart-checkout/inner-blocks/order-summary-shipping/block.tsx

@@ -3,8 +3,7 @@
  */
 import { TotalsShipping } from '@woocommerce/base-components/cart-checkout';
 import { getCurrencyFromPriceResponse } from '@woocommerce/price-format';
-import { useStoreCart } from '@woocommerce/base-context/hooks';
-import { useCheckoutContext } from '@woocommerce/base-context';
+import { useStoreCart, useCheckoutContext } from '@woocommerce/base-context';
 
 const Block = ( {
 	className,

assets/js/blocks/cart-checkout/inner-blocks/order-summary-subtotal/block.tsx

@@ -3,7 +3,7 @@
  */
 import { Subtotal } from '@woocommerce/blocks-checkout';
 import { getCurrencyFromPriceResponse } from '@woocommerce/price-format';
-import { useStoreCart } from '@woocommerce/base-context/hooks';
+import { useStoreCart } from '@woocommerce/base-context';
 
 const Block = ( { className }: { className: string } ): JSX.Element => {
 	const { cartTotals } = useStoreCart();

assets/js/blocks/cart-checkout/inner-blocks/order-summary-taxes/block.tsx

@@ -3,7 +3,7 @@
  */
 import { TotalsTaxes } from '@woocommerce/blocks-checkout';
 import { getCurrencyFromPriceResponse } from '@woocommerce/price-format';
-import { useStoreCart } from '@woocommerce/base-context/hooks';
+import { useStoreCart } from '@woocommerce/base-context';
 import { getSetting } from '@woocommerce/settings';
 
 const Block = ( {

assets/js/blocks/cart-checkout/mini-cart-contents/inner-blocks/empty-mini-cart-contents-block/frontend.tsx

@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { useStoreCart } from '@woocommerce/base-context/hooks';
+import { useStoreCart } from '@woocommerce/base-context';
 import { useEffect, useRef } from 'react';
 
 /**

assets/js/blocks/cart-checkout/mini-cart-contents/inner-blocks/filled-mini-cart-contents-block/frontend.tsx

@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { useStoreCart } from '@woocommerce/base-context/hooks';
+import { useStoreCart } from '@woocommerce/base-context';
 
 type FilledMiniCartContentsBlockProps = {
 	children: JSX.Element;

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

@@ -7,13 +7,13 @@ import { getCurrencyFromPriceResponse } from '@woocommerce/price-format';
 import {
 	usePaymentMethods,
 	useStoreCart,
-} from '@woocommerce/base-context/hooks';
+	PaymentMethodDataProvider,
+} from '@woocommerce/base-context';
 import PaymentMethodIcons from '@woocommerce/base-components/cart-checkout/payment-method-icons';
 import { getIconsFromPaymentMethods } from '@woocommerce/base-utils';
 import { getSetting } from '@woocommerce/settings';
 import { CART_URL, CHECKOUT_URL } from '@woocommerce/block-settings';
 import Button from '@woocommerce/base-components/button';
-import { PaymentMethodDataProvider } from '@woocommerce/base-context';
 import classNames from 'classnames';
 
 const PaymentMethodIconsElement = (): JSX.Element => {

assets/js/blocks/cart-checkout/mini-cart-contents/inner-blocks/mini-cart-products-table-block/block.tsx

@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { useStoreCart } from '@woocommerce/base-context/hooks';
+import { useStoreCart } from '@woocommerce/base-context';
 import classNames from 'classnames';
 
 /**

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

@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { sprintf, _n, __ } from '@wordpress/i18n';
-import { useStoreCart } from '@woocommerce/base-context/hooks';
+import { useStoreCart } from '@woocommerce/base-context';
 import classNames from 'classnames';
 
 /**

assets/js/blocks/cart-checkout/mini-cart/block.tsx

@@ -3,7 +3,7 @@
  */
 import { renderParentBlock } from '@woocommerce/atomic-utils';
 import Drawer from '@woocommerce/base-components/drawer';
-import { useStoreCart } from '@woocommerce/base-context/hooks';
+import { useStoreCart } from '@woocommerce/base-context';
 import { translateJQueryEventToNative } from '@woocommerce/base-utils';
 import { getRegisteredBlockComponents } from '@woocommerce/blocks-registry';
 import {

assets/js/blocks/cart-checkout/payment-methods/express-payment-methods.js

@@ -5,7 +5,7 @@ import { __ } from '@wordpress/i18n';
 import {
 	useExpressPaymentMethods,
 	usePaymentMethodInterface,
-} from '@woocommerce/base-context/hooks';
+} from '@woocommerce/base-context';
 import {
 	cloneElement,
 	isValidElement,

assets/js/blocks/cart-checkout/payment-methods/express-payment/cart-express-payment.js

@@ -5,8 +5,6 @@ import { __ } from '@wordpress/i18n';
 import {
 	useEmitResponse,
 	useExpressPaymentMethods,
-} from '@woocommerce/base-context/hooks';
-import {
 	StoreNoticesProvider,
 	useCheckoutContext,
 	usePaymentMethodDataContext,

assets/js/blocks/cart-checkout/payment-methods/express-payment/checkout-express-payment.js

@@ -5,8 +5,6 @@ import { __ } from '@wordpress/i18n';
 import {
 	useEmitResponse,
 	useExpressPaymentMethods,
-} from '@woocommerce/base-context/hooks';
-import {
 	StoreNoticesProvider,
 	useCheckoutContext,
 	usePaymentMethodDataContext,

assets/js/blocks/cart-checkout/payment-methods/payment-method-options.js

@@ -7,12 +7,10 @@ import {
 	useEmitResponse,
 	useStoreNotices,
 	useStoreEvents,
-} from '@woocommerce/base-context/hooks';
-import { cloneElement, useCallback } from '@wordpress/element';
-import {
 	useEditorContext,
 	usePaymentMethodDataContext,
 } from '@woocommerce/base-context';
+import { cloneElement, useCallback } from '@wordpress/element';
 import classNames from 'classnames';
 import RadioControlAccordion from '@woocommerce/base-components/radio-control-accordion';
 

assets/js/blocks/cart-checkout/payment-methods/payment-methods.js

@@ -1,10 +1,12 @@
 /**
  * External dependencies
  */
-import { usePaymentMethods } from '@woocommerce/base-context/hooks';
+import {
+	usePaymentMethods,
+	usePaymentMethodDataContext,
+} from '@woocommerce/base-context';
 import { __ } from '@wordpress/i18n';
 import Label from '@woocommerce/base-components/label';
-import { usePaymentMethodDataContext } from '@woocommerce/base-context';
 
 /**
  * Internal dependencies