+
- {!hasItems && t('cart.empty')}
- {hasItems &&
- items.map((item, key) => (
-
{hasItemsWithQuantity && (
diff --git a/packages/contact-block/package-lock.json b/packages/contact-block/package-lock.json
deleted file mode 100644
index 985cb28a..00000000
--- a/packages/contact-block/package-lock.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
- "name": "@thoughtindustries/contact-block",
- "version": "1.0.3",
- "lockfileVersion": 2,
- "requires": true,
- "packages": {
- "": {
- "name": "@thoughtindustries/contact-block",
- "version": "1.0.0",
- "license": "MIT",
- "dependencies": {
- "react": "^17.0.2"
- }
- },
- "node_modules/js-tokens": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
- "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
- },
- "node_modules/loose-envify": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
- "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
- "dependencies": {
- "js-tokens": "^3.0.0 || ^4.0.0"
- },
- "bin": {
- "loose-envify": "cli.js"
- }
- },
- "node_modules/object-assign": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
- "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
- "engines": {
- "node": ">=0.10.0"
- }
- },
- "node_modules/react": {
- "version": "17.0.2",
- "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
- "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
- "dependencies": {
- "loose-envify": "^1.1.0",
- "object-assign": "^4.1.1"
- },
- "engines": {
- "node": ">=0.10.0"
- }
- }
- },
- "dependencies": {
- "js-tokens": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
- "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
- },
- "loose-envify": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
- "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
- "requires": {
- "js-tokens": "^3.0.0 || ^4.0.0"
- }
- },
- "object-assign": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
- "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
- },
- "react": {
- "version": "17.0.2",
- "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
- "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
- "requires": {
- "loose-envify": "^1.1.0",
- "object-assign": "^4.1.1"
- }
- }
- }
-}
diff --git a/packages/contact-block/package.json b/packages/contact-block/package.json
index 55bfa57c..324d8b8c 100644
--- a/packages/contact-block/package.json
+++ b/packages/contact-block/package.json
@@ -23,6 +23,11 @@
"url": "https://github.com/thoughtindustries/helium/issues"
},
"dependencies": {
- "react": "^17.0.2"
+ "react": "^18.2.0",
+ "react-dom": "^18.2.0"
+ },
+ "peerDependencies": {
+ "react": "^17 || ^18",
+ "react-dom": "^17 || ^18"
}
}
diff --git a/packages/content/package.json b/packages/content/package.json
index 46338e35..6b72bc50 100644
--- a/packages/content/package.json
+++ b/packages/content/package.json
@@ -23,9 +23,9 @@
"url": "https://github.com/thoughtindustries/helium/issues"
},
"dependencies": {
- "@apollo/client": "^3.5.4",
+ "@apollo/client": "^3.7.0",
"dayjs": "^1.10.8",
- "graphql": "^16.3.0",
- "i18next": "^21.5.2"
+ "graphql": "^16.6.0",
+ "i18next": "^21.10.0"
}
}
diff --git a/packages/dashboard-stats/__tests__/dashboard-stats.test.tsx b/packages/dashboard-stats/__tests__/dashboard-stats.test.tsx
index 05e6aced..a1152435 100644
--- a/packages/dashboard-stats/__tests__/dashboard-stats.test.tsx
+++ b/packages/dashboard-stats/__tests__/dashboard-stats.test.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { render, waitFor } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
import { DashboardStats } from '../src';
import { MockedProvider } from '@apollo/client/testing';
import { UserStatsDocument } from '@thoughtindustries/dashboard-stats';
@@ -49,7 +49,8 @@ describe('@thoughtindustries/dashboard-stats', () => {
-
+ `);
});
});
});
diff --git a/packages/cart/package.json b/packages/cart/package.json
index 6f777815..0436d659 100644
--- a/packages/cart/package.json
+++ b/packages/cart/package.json
@@ -27,12 +27,14 @@
"@thoughtindustries/content": "^1.1.0-alpha.5",
"clsx": "^1.1.1",
"couponable": "^7.0.0",
- "i18next": "^21.8.1",
- "react": "^17.0.2",
- "react-i18next": "^11.16.9",
+ "i18next": "^21.10.0",
+ "react": "^18.2.0",
+ "react-dom": "^18.2.0",
+ "react-i18next": "^11.18.6",
"universal-cookie": "^4.0.4"
},
"peerDependencies": {
- "react-dom": "^17.0.2"
+ "react": "^17 || ^18",
+ "react-dom": "^17 || ^18"
}
}
diff --git a/packages/cart/src/cart-modal.tsx b/packages/cart/src/cart-modal.tsx
index 4dbb1d2b..6450b7a7 100644
--- a/packages/cart/src/cart-modal.tsx
+++ b/packages/cart/src/cart-modal.tsx
@@ -289,17 +289,17 @@ const CartModal = ({
-
+
-
+ - cart.header -
-
+ 
+
-
-
+
-
-
+ Test Product
+
+ - Test Product -
-- - quantity - - 5 - -
-+ + quantity + + 5 + +
-
+
- $50.00
-
-
+
+
-
-
+
-
-
+ Test bundle
+
+ - Test bundle -
-- - quantity - - 1 - -
-+ + quantity + + 1 + +
-
+
- $1.00
- /
- month
-
-
+
+
-
-
+
-
-
+ Test learning path
+
+ - Test learning path -
-- - quantity - - 10 - -
-+ + quantity + + 10 + +
-
+
- $200.00
-
-
+
-
-
-
-
-
- - Test course -
-- - quantity - - 1 - -
-
-
+
+
+ quantity
+
+ 1
+
+
-
- $2.00
-
-
-
-
-
-
-
-
-
-
-
-
-
+ $2.00
- cart.instructor-access-headline -
-- cart.instructor-access-body -
-
-
- $3.00
-
-
- total-due-now
-
-
- $253.00
-
-
-
-
-
-
-
- relatedProducts.checkout
-
-
-
-
-
+ +++ + + + + ++--
- Test product 2 + cart.instructor-access-headline +
++ cart.instructor-access-body
+++ + $3.00 + +++ + total-due-now + + + $253.00 +++ + +++ + relatedProducts.checkout + ++-
+
-
+ ++++
+
+ Test product 2 +
++- - -++ + $25.00 + + - product.add-to-cart - + $20.00 ++
+ -
+
diff --git a/packages/cart/src/core/components/cart-provider/types.ts b/packages/cart/src/core/components/cart-provider/types.ts
index fa6888c6..919223ee 100644
--- a/packages/cart/src/core/components/cart-provider/types.ts
+++ b/packages/cart/src/core/components/cart-provider/types.ts
@@ -1,3 +1,4 @@
+import { ReactNode } from 'react';
import { GlobalTypes } from '../../graphql';
export enum EcommItemType {
@@ -124,4 +125,6 @@ export type CartAction =
export interface CartProviderProps {
/** url for checkout link */
checkoutUrl: string;
+ /** children */
+ children?: ReactNode;
}
diff --git a/packages/catalog/__tests__/catalog.test.tsx b/packages/catalog/__tests__/catalog.test.tsx
index c8a4849e..c7739ebd 100644
--- a/packages/catalog/__tests__/catalog.test.tsx
+++ b/packages/catalog/__tests__/catalog.test.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { render, waitFor } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
import { MockedProvider } from '@apollo/client/testing';
import { CatalogProvider, Catalog } from '../src';
import {
@@ -196,9 +196,9 @@ const mockedApolloProviderOptions = {
const resolveQueriesAsync = async () => {
// wait till catalog content query resolves
- await waitFor(() => new Promise(res => setTimeout(res, 0)));
+ expect(await screen.findByText(mockContentItem.title)).toBeInTheDocument();
// wait till languages query resolves
- await waitFor(() => new Promise(res => setTimeout(res, 0)));
+ expect(await screen.findByText(mockLanguages[0].label)).toBeInTheDocument();
};
describe('@thoughtindustries/catalog', () => {
@@ -211,9 +211,7 @@ describe('@thoughtindustries/catalog', () => {
it('should error when rendered without a parent children )
- ).toThrowError();
+ expect(() => render( = ({ children }) => (
{children}
);
diff --git a/packages/contact-block/__tests__/contact-block.test.tsx b/packages/contact-block/__tests__/contact-block.test.tsx
index b6896f42..a30af0d3 100644
--- a/packages/contact-block/__tests__/contact-block.test.tsx
+++ b/packages/contact-block/__tests__/contact-block.test.tsx
@@ -106,7 +106,6 @@ describe('@thoughtindustries/contact-block', () => {
-