move shipping-rates-control and shipping totals back into base/components/cart-checkout

nerrad · mikejolley · commit a089b056c513 · 2021-02-03T11:06:45.000Z
diff --git a/assets/js/base/components/cart-checkout/index.js b/assets/js/base/components/cart-checkout/index.js
@@ -13,6 +13,7 @@ export { default as ProductSaleBadge } from './product-sale-badge';
 export { default as ReturnToCartButton } from './return-to-cart-button';
 export { default as ShippingCalculator } from './shipping-calculator';
 export { default as ShippingLocation } from './shipping-location';
+export { default as ShippingRatesControl } from './shipping-rates-control';
 export { default as PaymentMethodIcons } from './payment-method-icons';
 export { default as PaymentMethodLabel } from './payment-method-label';
 export * from './totals';
diff --git a/assets/js/base/components/cart-checkout/shipping-rates-control/index.js b/assets/js/base/components/cart-checkout/shipping-rates-control/index.js
@@ -6,28 +6,22 @@ import { useEffect } from '@wordpress/element';
 import PropTypes from 'prop-types';
 import { speak } from '@wordpress/a11y';
 import LoadingMask from '@woocommerce/base-components/loading-mask';
+import {
+	ShippingRatesControlPackage,
+	ExperimentalOrderShippingPackages,
+} from '@woocommerce/blocks-checkout';
 import {
 	getShippingRatesPackageCount,
 	getShippingRatesRateCount,
 } from '@woocommerce/base-utils';
 
-/**
- * Internal dependencies
- */
-import Package from './package';
-import ExperimentalOrderShippingPackages from '../../order-shipping-packages';
-import './style.scss';
-
 /**
  * @typedef {import('react')} React
  */
 
 /**
  * Renders the shipping rates control element.
  *
- * @todo Move ShippingRatesControl, TotalsShipping, and ShippingRateSelector to our base components folder.
- * they're too coupled with our base implementation to be exported and we should only export Package.
- *
  * @param {Object} props Incoming props.
  * @param {Array} props.shippingRates Array of packages containing shipping rates.
  * @param {boolean} props.shippingRatesLoading True when rates are being loaded.
@@ -147,7 +141,7 @@ const Packages = ( {
 	}
 
 	return packages.map( ( { package_id: packageId, ...packageData } ) => (
-		<Package
+		<ShippingRatesControlPackage
 			key={ packageId }
 			packageId={ packageId }
 			packageData={ packageData }
diff --git a/assets/js/base/components/cart-checkout/totals/index.js b/assets/js/base/components/cart-checkout/totals/index.js
@@ -1,3 +1,4 @@
 export { default as TotalsCoupon } from './coupon';
 export { default as TotalsDiscount } from './discount';
 export { default as TotalsFooterItem } from './footer-item';
+export { default as TotalsShipping } from './shipping';
diff --git a/assets/js/base/components/cart-checkout/totals/shipping/has-shipping-rate.js b/assets/js/base/components/cart-checkout/totals/shipping/has-shipping-rate.js
diff --git a/assets/js/base/components/cart-checkout/totals/shipping/index.js b/assets/js/base/components/cart-checkout/totals/shipping/index.js
@@ -11,11 +11,11 @@ import {
 	ShippingCalculator,
 	ShippingLocation,
 } from '@woocommerce/base-components/cart-checkout';
+import { TotalsItem } from '@woocommerce/blocks-checkout';
 
 /**
  * Internal dependencies
  */
-import TotalsItem from '../item';
 import ShippingRateSelector from './shipping-rate-selector';
 import hasShippingRate from './has-shipping-rate';
 import './style.scss';
diff --git a/assets/js/base/components/cart-checkout/totals/shipping/shipping-rate-selector.js b/assets/js/base/components/cart-checkout/totals/shipping/shipping-rate-selector.js
@@ -8,7 +8,7 @@ import classnames from 'classnames';
 /**
  * Internal dependencies
  */
-import { ShippingRatesControl } from '../../shipping';
+import ShippingRatesControl from '../../shipping-rates-control';
 
 const ShippingRateSelector = ( {
 	hasRates,
diff --git a/assets/js/base/components/cart-checkout/totals/shipping/stories/index.js b/assets/js/base/components/cart-checkout/totals/shipping/stories/index.js
diff --git a/assets/js/base/components/cart-checkout/totals/shipping/style.scss b/assets/js/base/components/cart-checkout/totals/shipping/style.scss
diff --git a/assets/js/blocks/cart-checkout/cart/full-cart/index.js b/assets/js/blocks/cart-checkout/cart/full-cart/index.js
@@ -8,12 +8,12 @@ import {
 	TotalsCoupon,
 	TotalsDiscount,
 	TotalsFooterItem,
+	TotalsShipping,
 } from '@woocommerce/base-components/cart-checkout';
 import {
 	Subtotal,
 	TotalsFees,
 	TotalsTaxes,
-	TotalsShipping,
 	ExperimentalOrderMeta,
 	getCurrencyFromPriceResponse,
 } from '@woocommerce/blocks-checkout';
diff --git a/assets/js/blocks/cart-checkout/checkout/form/shipping-options-step.js b/assets/js/blocks/cart-checkout/checkout/form/shipping-options-step.js
@@ -2,15 +2,15 @@
  * External dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { FormStep } from '@woocommerce/base-components/cart-checkout';
+import {
+	FormStep,
+	ShippingRatesControl,
+} from '@woocommerce/base-components/cart-checkout';
 import {
 	getShippingRatesPackageCount,
 	getShippingRatesRateCount,
 } from '@woocommerce/base-utils';
-import {
-	getCurrencyFromPriceResponse,
-	ShippingRatesControl,
-} from '@woocommerce/blocks-checkout';
+import { getCurrencyFromPriceResponse } from '@woocommerce/blocks-checkout';
 import FormattedMonetaryAmount from '@woocommerce/base-components/formatted-monetary-amount';
 import {
 	useCheckoutContext,
diff --git a/assets/js/blocks/cart-checkout/checkout/sidebar/index.js b/assets/js/blocks/cart-checkout/checkout/sidebar/index.js
@@ -6,12 +6,12 @@ import {
 	TotalsCoupon,
 	TotalsDiscount,
 	TotalsFooterItem,
+	TotalsShipping,
 } from '@woocommerce/base-components/cart-checkout';
 import {
 	Subtotal,
 	TotalsFees,
 	TotalsTaxes,
-	TotalsShipping,
 	ExperimentalOrderMeta,
 	getCurrencyFromPriceResponse,
 } from '@woocommerce/blocks-checkout';
diff --git a/packages/checkout/shipping/shipping-rates-control/index.js b/packages/checkout/shipping/shipping-rates-control/index.js
@@ -1,2 +1 @@
-export { default as ShippingRatesControl } from './shipping-rates-control';
 export { default as ShippingRatesControlPackage } from './package';
diff --git a/packages/checkout/totals/index.js b/packages/checkout/totals/index.js
@@ -1,5 +1,4 @@
 export { default as TotalsItem } from './item';
 export { default as Subtotal } from './subtotal';
 export { default as TotalsTaxes } from './taxes';
-export { default as TotalsShipping } from './shipping';
 export { default as TotalsFees } from './fees';
