Move composite-checkout-wpcom into client/lib

Moving this package into calypso so we get hot reloading during development. It may or may not make sense to move some of this out of calypso later, particularly the parts that are tightly bound to the billing backend.
Automattic · Nov 19, 2019 · 09a11d3 · 09a11d3
1 parent d906929
commit 09a11d3
Show file tree

Hide file tree

Showing 31 changed files with 14 additions and 31 deletions.
diff --git a/packages/composite-checkout-wpcom/.gitignore → ...t/lib/composite-checkout-wpcom/.gitignore b/packages/composite-checkout-wpcom/.gitignore → ...t/lib/composite-checkout-wpcom/.gitignore
@@ -1,2 +1,3 @@
+dist/
 /* TypeScript generated files */
 *.d.ts
diff --git a/packages/composite-checkout-wpcom/README.md → ...nt/lib/composite-checkout-wpcom/README.md b/packages/composite-checkout-wpcom/README.md → ...nt/lib/composite-checkout-wpcom/README.md
diff --git a/.../composite-checkout-wpcom/demo/index.html → .../composite-checkout-wpcom/demo/index.html b/.../composite-checkout-wpcom/demo/index.html → .../composite-checkout-wpcom/demo/index.html
diff --git a/...s/composite-checkout-wpcom/demo/index.jsx → ...b/composite-checkout-wpcom/demo/index.jsx b/...s/composite-checkout-wpcom/demo/index.jsx → ...b/composite-checkout-wpcom/demo/index.jsx
diff --git a/...ite-checkout-wpcom/test/enzyme-adapter.js → ...omposite-checkout-wpcom/enzyme-adapter.js b/...ite-checkout-wpcom/test/enzyme-adapter.js → ...omposite-checkout-wpcom/enzyme-adapter.js
diff --git a/...s/composite-checkout-wpcom/jest.config.js → ...b/composite-checkout-wpcom/jest.config.js b/...s/composite-checkout-wpcom/jest.config.js → ...b/composite-checkout-wpcom/jest.config.js
diff --git a/...ges/composite-checkout-wpcom/package.json → ...lib/composite-checkout-wpcom/package.json b/...ges/composite-checkout-wpcom/package.json → ...lib/composite-checkout-wpcom/package.json
diff --git a/...heckout-wpcom/src/components/checkout.jsx → ...heckout-wpcom/src/components/checkout.jsx b/...heckout-wpcom/src/components/checkout.jsx → ...heckout-wpcom/src/components/checkout.jsx
diff --git a/...e-checkout-wpcom/src/components/items.jsx → ...e-checkout-wpcom/src/components/items.jsx b/...e-checkout-wpcom/src/components/items.jsx → ...e-checkout-wpcom/src/components/items.jsx
diff --git a/...out-wpcom/src/components/order-review.jsx → ...out-wpcom/src/components/order-review.jsx b/...out-wpcom/src/components/order-review.jsx → ...out-wpcom/src/components/order-review.jsx
diff --git a/...-checkout-wpcom/src/components/upsell.jsx → ...-checkout-wpcom/src/components/upsell.jsx b/...-checkout-wpcom/src/components/upsell.jsx → ...-checkout-wpcom/src/components/upsell.jsx
diff --git a/...-checkout-wpcom/src/hooks/cart-manager.js → ...-checkout-wpcom/src/hooks/cart-manager.js b/...-checkout-wpcom/src/hooks/cart-manager.js → ...-checkout-wpcom/src/hooks/cart-manager.js
diff --git a/...ges/composite-checkout-wpcom/src/index.js → ...lib/composite-checkout-wpcom/src/index.js b/...ges/composite-checkout-wpcom/src/index.js → ...lib/composite-checkout-wpcom/src/index.js
diff --git a/...osite-checkout-wpcom/src/lib/edit-cart.js → ...osite-checkout-wpcom/src/lib/edit-cart.js b/...osite-checkout-wpcom/src/lib/edit-cart.js → ...osite-checkout-wpcom/src/lib/edit-cart.js
diff --git a/...-checkout-wpcom/src/lib/translate-cart.ts → ...-checkout-wpcom/src/lib/translate-cart.ts b/...-checkout-wpcom/src/lib/translate-cart.ts → ...-checkout-wpcom/src/lib/translate-cart.ts
diff --git a/...-checkout-wpcom/src/mock/cart-endpoint.js → ...-checkout-wpcom/src/mock/cart-endpoint.js b/...-checkout-wpcom/src/mock/cart-endpoint.js → ...-checkout-wpcom/src/mock/cart-endpoint.js
diff --git a/...t-wpcom/src/mock/paypal-payment-method.js → ...t-wpcom/src/mock/paypal-payment-method.js b/...t-wpcom/src/mock/paypal-payment-method.js → ...t-wpcom/src/mock/paypal-payment-method.js
diff --git a/...ges/composite-checkout-wpcom/src/types.ts → ...lib/composite-checkout-wpcom/src/types.ts b/...ges/composite-checkout-wpcom/src/types.ts → ...lib/composite-checkout-wpcom/src/types.ts
diff --git a/...checkout-wpcom/src/types/checkout-cart.ts → ...checkout-wpcom/src/types/checkout-cart.ts b/...checkout-wpcom/src/types/checkout-cart.ts → ...checkout-wpcom/src/types/checkout-cart.ts
diff --git a/...src/types/checkout-payment-method-slug.ts → ...src/types/checkout-payment-method-slug.ts b/...src/types/checkout-payment-method-slug.ts → ...src/types/checkout-payment-method-slug.ts
diff --git a/...e-checkout-wpcom/src/types/server-cart.ts → ...e-checkout-wpcom/src/types/server-cart.ts b/...e-checkout-wpcom/src/types/server-cart.ts → ...e-checkout-wpcom/src/types/server-cart.ts
diff --git a/...m/src/types/wpcom-payment-method-class.ts → ...m/src/types/wpcom-payment-method-class.ts b/...m/src/types/wpcom-payment-method-class.ts → ...m/src/types/wpcom-payment-method-class.ts
diff --git a/...ite-checkout-wpcom/test/translate-cart.js → ...ite-checkout-wpcom/test/translate-cart.js b/...ite-checkout-wpcom/test/translate-cart.js → ...ite-checkout-wpcom/test/translate-cart.js
diff --git a/...ite-checkout-wpcom/test/wpcom-checkout.js → ...ite-checkout-wpcom/test/wpcom-checkout.js b/...ite-checkout-wpcom/test/wpcom-checkout.js → ...ite-checkout-wpcom/test/wpcom-checkout.js
@@ -1,3 +1,10 @@
+/**
+ * Need to force the test environment to be browser-like.
+ *
+ * @see https://github.com/Automattic/wp-calypso/blob/master/docs/testing/unit-tests.md#testing-globals
+ * @jest-environment jsdom
+ */
+
 /**
  * External dependencies
  */

diff --git a/...omposite-checkout-wpcom/tsconfig-cjs.json → ...omposite-checkout-wpcom/tsconfig-cjs.json b/...omposite-checkout-wpcom/tsconfig-cjs.json → ...omposite-checkout-wpcom/tsconfig-cjs.json
diff --git a/...es/composite-checkout-wpcom/tsconfig.json → ...ib/composite-checkout-wpcom/tsconfig.json b/...es/composite-checkout-wpcom/tsconfig.json → ...ib/composite-checkout-wpcom/tsconfig.json
diff --git a/...ite-checkout-wpcom/webpack.config.demo.js → ...ite-checkout-wpcom/webpack.config.demo.js b/...ite-checkout-wpcom/webpack.config.demo.js → ...ite-checkout-wpcom/webpack.config.demo.js
diff --git a/...omposite-checkout-wpcom/webpack.config.js → ...omposite-checkout-wpcom/webpack.config.js b/...omposite-checkout-wpcom/webpack.config.js → ...omposite-checkout-wpcom/webpack.config.js
diff --git a/client/my-sites/checkout/checkout/composite-checkout-container.js b/client/my-sites/checkout/checkout/composite-checkout-container.js
@@ -3,16 +3,16 @@
  */
 import React from 'react';
 import { createRegistry, createPayPalMethod } from '@automattic/composite-checkout';
-import {
-	WPCOMCheckout,
-	makeShoppingCartHook,
-	mockPayPalExpressRequest,
-} from '@automattic/composite-checkout-wpcom';
 
 /**
  * Internal dependencies
  */
 import wp from 'lib/wp';
+import {
+	WPCOMCheckout,
+	makeShoppingCartHook,
+	mockPayPalExpressRequest,
+} from 'lib/composite-checkout-wpcom';
 
 const initialCart = {
 	coupon: '',

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -37,7 +37,6 @@
 		"@automattic/color-studio": "2.2.0",
 		"@automattic/components": "file:./packages/components",
 		"@automattic/composite-checkout": "file:./packages/composite-checkout",
-		"@automattic/composite-checkout-wpcom": "file:./packages/composite-checkout-wpcom",
 		"@automattic/format-currency": "file:./packages/format-currency",
 		"@automattic/load-script": "file:./packages/load-script",
 		"@automattic/material-design-icons": "file:./packages/material-design-icons",
@@ -296,7 +295,7 @@
 		"prewhybundled": "cross-env-shell CALYPSO_ENV=production EMIT_STATS=withreasons NODE_ARGS=--max_old_space_size=8192 npm run -s build-client",
 		"whybundled": "whybundled stats.json",
 		"composite-checkout-demo": "webpack-dev-server --config ./packages/composite-checkout/webpack.config.demo.js --mode development",
-		"composite-checkout-wpcom-demo": "webpack-dev-server --config ./packages/composite-checkout-wpcom/webpack.config.demo.js --mode development"
+		"composite-checkout-wpcom-demo": "webpack-dev-server --config ./client/lib/composite-checkout-wpcom/webpack.config.demo.js --mode development"
 	},
 	"devDependencies": {
 		"@automattic/babel-plugin-i18n-calypso": "file:./packages/babel-plugin-i18n-calypso",