From 8f9bbe19cae4af57815850c46fd450941c9667fa Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Mon, 11 Jan 2021 13:55:45 -0300 Subject: [PATCH] index.ts broke my tree shaking --- components/auth/LoginView.tsx | 2 +- components/auth/SignUpView.tsx | 2 +- components/common/UserNav/DropdownMenu.tsx | 2 +- .../product/ProductCard/ProductCard.tsx | 4 ++-- .../product/ProductView/ProductView.tsx | 2 +- .../WishlistButton/WishlistButton.tsx | 6 ++++-- .../api/operations/get-all-products.ts | 2 +- .../bigcommerce/api/operations/get-product.ts | 2 +- framework/bigcommerce/lib/normalize.ts | 21 +++++++++---------- next.config.js | 8 ++----- package.json | 3 +++ tsconfig.json | 8 +------ 12 files changed, 28 insertions(+), 34 deletions(-) diff --git a/components/auth/LoginView.tsx b/components/auth/LoginView.tsx index 7b402e6d7..89d5bf893 100644 --- a/components/auth/LoginView.tsx +++ b/components/auth/LoginView.tsx @@ -1,6 +1,6 @@ import { FC, useEffect, useState, useCallback } from 'react' import { Logo, Button, Input } from '@components/ui' -import { useLogin } from '@framework/auth' +import useLogin from '@framework/auth/use-login' import { useUI } from '@components/ui/context' import { validate } from 'email-validator' diff --git a/components/auth/SignUpView.tsx b/components/auth/SignUpView.tsx index 49351bfe9..1b619828b 100644 --- a/components/auth/SignUpView.tsx +++ b/components/auth/SignUpView.tsx @@ -3,7 +3,7 @@ import { validate } from 'email-validator' import { Info } from '@components/icons' import { useUI } from '@components/ui/context' import { Logo, Button, Input } from '@components/ui' -import { useSignup } from '@framework/auth' +import useSignup from '@framework/auth/use-signup' interface Props {} diff --git a/components/common/UserNav/DropdownMenu.tsx b/components/common/UserNav/DropdownMenu.tsx index f8cedc332..43f842009 100644 --- a/components/common/UserNav/DropdownMenu.tsx +++ b/components/common/UserNav/DropdownMenu.tsx @@ -8,7 +8,7 @@ import { Avatar } from '@components/common' import { Moon, Sun } from '@components/icons' import { useUI } from '@components/ui/context' import ClickOutside from '@lib/click-outside' -import { useLogout } from '@framework/auth' +import useLogout from '@framework/auth/use-logout' import { disableBodyScroll, diff --git a/components/product/ProductCard/ProductCard.tsx b/components/product/ProductCard/ProductCard.tsx index 863a3b2b8..b3c061a5c 100644 --- a/components/product/ProductCard/ProductCard.tsx +++ b/components/product/ProductCard/ProductCard.tsx @@ -57,11 +57,11 @@ const ProductCard: FC = ({ {product.price.currencyCode} - + /> */}
{product?.images && ( diff --git a/components/product/ProductView/ProductView.tsx b/components/product/ProductView/ProductView.tsx index 34bae1f69..b5aafd0b1 100644 --- a/components/product/ProductView/ProductView.tsx +++ b/components/product/ProductView/ProductView.tsx @@ -8,7 +8,7 @@ import { useUI } from '@components/ui' import { Swatch, ProductSlider } from '@components/product' import { Button, Container, Text } from '@components/ui' -import { usePrice } from '@framework/product' +import usePrice from '@framework/product/use-price' import { useAddItem } from '@framework/cart' import { diff --git a/components/wishlist/WishlistButton/WishlistButton.tsx b/components/wishlist/WishlistButton/WishlistButton.tsx index aca0ad148..dced18a89 100644 --- a/components/wishlist/WishlistButton/WishlistButton.tsx +++ b/components/wishlist/WishlistButton/WishlistButton.tsx @@ -3,8 +3,10 @@ import cn from 'classnames' import { Heart } from '@components/icons' import { useUI } from '@components/ui' -import { useCustomer } from '@framework/customer' -import { useAddItem, useWishlist, useRemoveItem } from '@framework/wishlist' +import useCustomer from '@framework/customer/use-customer' +import useAddItem from '@framework/wishlist/use-add-item' +import useRemoveItem from '@framework/wishlist/use-remove-item' +import useWishlist from '@framework/wishlist/use-add-item' type Props = { productId: Product['id'] diff --git a/framework/bigcommerce/api/operations/get-all-products.ts b/framework/bigcommerce/api/operations/get-all-products.ts index 534c20bfb..60aa197cc 100644 --- a/framework/bigcommerce/api/operations/get-all-products.ts +++ b/framework/bigcommerce/api/operations/get-all-products.ts @@ -127,7 +127,7 @@ async function getAllProducts({ }) } - return { products } + return { products: products.map(({ node }) => normalizeProduct(node)) } } export default getAllProducts diff --git a/framework/bigcommerce/api/operations/get-product.ts b/framework/bigcommerce/api/operations/get-product.ts index 403208264..aa480ac5e 100644 --- a/framework/bigcommerce/api/operations/get-product.ts +++ b/framework/bigcommerce/api/operations/get-product.ts @@ -111,7 +111,7 @@ async function getProduct({ setProductLocaleMeta(product) } - return { product } + return { product: normalizeProduct(product) } } return {} diff --git a/framework/bigcommerce/lib/normalize.ts b/framework/bigcommerce/lib/normalize.ts index 51b508edd..0e3dbc128 100644 --- a/framework/bigcommerce/lib/normalize.ts +++ b/framework/bigcommerce/lib/normalize.ts @@ -1,15 +1,14 @@ -export function normalizeProduct(productNode: any): Product { - // console.log(productNode) +import { Product as BCProduct } from '@framework/schema' + +export function normalizeProduct(productNode: BCProduct): Product { const { - node: { - entityId: id, - images, - variants, - productOptions, - prices, - path, - ...rest - }, + entityId: id, + images, + variants, + productOptions, + prices, + path, + ...rest } = productNode return { diff --git a/next.config.js b/next.config.js index ee2db68bc..e732ef78a 100644 --- a/next.config.js +++ b/next.config.js @@ -1,8 +1,4 @@ -const bundleAnalyzer = require('@next/bundle-analyzer')({ - enabled: !!process.env.BUNDLE_ANALYZE, -}) - -module.exports = bundleAnalyzer({ +module.exports = { images: { domains: ['cdn11.bigcommerce.com'], }, @@ -38,4 +34,4 @@ module.exports = bundleAnalyzer({ }, ] }, -}) +} diff --git a/package.json b/package.json index d1f669a36..a30af5b97 100644 --- a/package.json +++ b/package.json @@ -99,5 +99,8 @@ "resolutions": { "webpack": "5.11.1" }, + "node": { + "net": "empty" + }, "license": "MIT" } diff --git a/tsconfig.json b/tsconfig.json index 480cc2cb4..98639f61e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -26,12 +26,6 @@ "@framework": ["framework/bigcommerce"] } }, - "include": [ - "next-env.d.ts", - "framework/*.d.ts", - "**/*.ts", - "**/*.tsx", - "**/*.js" - ], + "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "**/*.js"], "exclude": ["node_modules"] }