Splits types into their own imports / exports (#41285)

Also prevents JS file from attempting to export TS types.
Automattic · Apr 21, 2020 · 837374d · 837374d
1 parent 98449b6
commit 837374d
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 30 deletions.
diff --git a/client/my-sites/checkout/composite-checkout/wpcom/index.js b/client/my-sites/checkout/composite-checkout/wpcom/index.js
@@ -9,8 +9,6 @@ import FormFieldAnnotation from './components/form-field-annotation';
 import { getNonProductWPCOMCartItemTypes } from './lib/translate-cart';
 import { areDomainsInLineItems } from './hooks/has-domains';
 import {
-	WPCOMCartItem,
-	CheckoutCartItem,
 	prepareDomainContactDetails,
 	translateCheckoutPaymentMethodToWpcomPaymentMethod,
 	emptyManagedContactDetails,
@@ -30,8 +28,6 @@ export {
 	useShoppingCart,
 	useWpcomStore,
 	FormFieldAnnotation,
-	WPCOMCartItem,
-	CheckoutCartItem,
 	prepareDomainContactDetails,
 	getNonProductWPCOMCartItemTypes,
 	translateCheckoutPaymentMethodToWpcomPaymentMethod,

diff --git a/client/my-sites/checkout/composite-checkout/wpcom/types.ts b/client/my-sites/checkout/composite-checkout/wpcom/types.ts
@@ -1,18 +1,25 @@
+// Disabling duplicate imports while bugs in eslint-plugin-import TS 3.8 support remain.
+// See https://github.com/benmosher/eslint-plugin-import/issues/1667
+/* eslint-disable no-duplicate-imports */
+
 /**
  * Internal dependencies
  */
-import { CheckoutPaymentMethodSlug } from './types/checkout-payment-method-slug';
+import type { CheckoutPaymentMethodSlug } from './types/checkout-payment-method-slug';
+import type { WPCOMPaymentMethodClass } from './types/backend/payment-method';
 import {
-	WPCOMPaymentMethodClass,
 	readWPCOMPaymentMethodClass,
 	translateWpcomPaymentMethodToCheckoutPaymentMethod,
 	translateCheckoutPaymentMethodToWpcomPaymentMethod,
 } from './types/backend/payment-method';
-import {
+import type {
 	RequestCart,
 	RequestCartProduct,
 	ResponseCart,
 	ResponseCartProduct,
+	CartLocation,
+} from './types/backend/shopping-cart-endpoint';
+import {
 	emptyResponseCart,
 	prepareRequestCart,
 	removeItemFromResponseCart,
@@ -22,33 +29,34 @@ import {
 	removeCouponFromResponseCart,
 	addLocationToResponseCart,
 	doesCartLocationDifferFromResponseCartLocation,
-	CartLocation,
 	processRawResponse,
 } from './types/backend/shopping-cart-endpoint';
-import {
+import type {
 	DomainContactDetails,
 	PossiblyCompleteDomainContactDetails,
 	DomainContactDetailsErrors,
 } from './types/backend/domain-contact-details-components';
-import {
+import type {
 	WPCOMCart,
 	WPCOMCartItem,
 	WPCOMCartCouponItem,
-	emptyWPCOMCart,
 	CheckoutCartItem,
 	CheckoutCartItemAmount,
 } from './types/checkout-cart';
-import {
+import { emptyWPCOMCart } from './types/checkout-cart';
+import type {
 	WpcomStoreState,
-	getInitialWpcomStoreState,
 	ManagedContactDetails,
+	ManagedContactDetailsErrors,
+} from './types/wpcom-store-state';
+import {
+	getInitialWpcomStoreState,
 	emptyManagedContactDetails,
 	applyContactDetailsRequiredMask,
 	domainRequiredContactDetails,
 	taxRequiredContactDetails,
 	isCompleteAndValid,
 	isTouched,
-	ManagedContactDetailsErrors,
 	managedContactDetailsUpdaters,
 	prepareDomainContactDetails,
 	prepareDomainContactDetailsErrors,
@@ -58,16 +66,31 @@ import {
 	areRequiredFieldsNotEmpty,
 } from './types/wpcom-store-state';
 
-export {
+export type {
 	CheckoutPaymentMethodSlug,
 	WPCOMPaymentMethodClass,
-	readWPCOMPaymentMethodClass,
-	translateWpcomPaymentMethodToCheckoutPaymentMethod,
-	translateCheckoutPaymentMethodToWpcomPaymentMethod,
 	RequestCart,
 	RequestCartProduct,
 	ResponseCart,
 	ResponseCartProduct,
+	CartLocation,
+	WPCOMCart,
+	WPCOMCartItem,
+	WPCOMCartCouponItem,
+	CheckoutCartItem,
+	CheckoutCartItemAmount,
+	WpcomStoreState,
+	ManagedContactDetails,
+	ManagedContactDetailsErrors,
+	DomainContactDetails,
+	PossiblyCompleteDomainContactDetails,
+	DomainContactDetailsErrors,
+};
+
+export {
+	readWPCOMPaymentMethodClass,
+	translateWpcomPaymentMethodToCheckoutPaymentMethod,
+	translateCheckoutPaymentMethodToWpcomPaymentMethod,
 	emptyResponseCart,
 	prepareRequestCart,
 	removeItemFromResponseCart,
@@ -77,32 +100,22 @@ export {
 	removeCouponFromResponseCart,
 	addLocationToResponseCart,
 	doesCartLocationDifferFromResponseCartLocation,
-	CartLocation,
 	processRawResponse,
-	WPCOMCart,
-	WPCOMCartItem,
-	WPCOMCartCouponItem,
 	emptyWPCOMCart,
-	CheckoutCartItem,
-	CheckoutCartItemAmount,
-	WpcomStoreState,
 	getInitialWpcomStoreState,
-	ManagedContactDetails,
 	emptyManagedContactDetails,
 	applyContactDetailsRequiredMask,
 	domainRequiredContactDetails,
 	taxRequiredContactDetails,
 	isCompleteAndValid,
 	isTouched,
-	ManagedContactDetailsErrors,
 	managedContactDetailsUpdaters,
-	DomainContactDetails,
-	PossiblyCompleteDomainContactDetails,
-	DomainContactDetailsErrors,
 	prepareDomainContactDetails,
 	prepareDomainContactDetailsErrors,
 	prepareDomainContactValidationRequest,
 	formatDomainContactValidationResponse,
 	isValid,
 	areRequiredFieldsNotEmpty,
 };
+
+/* eslint-enable no-duplicate-imports */