diff --git a/package.json b/package.json index 85ef1200f..463cdb6e4 100644 --- a/package.json +++ b/package.json @@ -2,10 +2,6 @@ "name": "commerce", "license": "MIT", "private": true, - "workspaces": [ - "site", - "packages/*" - ], "scripts": { "build": "turbo run build --filter=next-commerce...", "dev": "turbo run dev", diff --git a/packages/bigcommerce/package.json b/packages/bigcommerce/package.json index 34b8ac614..3d07dbd68 100644 --- a/packages/bigcommerce/package.json +++ b/packages/bigcommerce/package.json @@ -47,6 +47,7 @@ } }, "dependencies": { + "@vercel/commerce": "workspace:*", "@vercel/fetch": "^6.1.1", "cookie": "^0.4.1", "immutability-helper": "^3.1.1", diff --git a/packages/bigcommerce/src/api/endpoints/cart/add-item.ts b/packages/bigcommerce/src/api/endpoints/cart/add-item.ts index d2bb7ad6d..acd656a77 100644 --- a/packages/bigcommerce/src/api/endpoints/cart/add-item.ts +++ b/packages/bigcommerce/src/api/endpoints/cart/add-item.ts @@ -1,3 +1,4 @@ +// @ts-nocheck import { normalizeCart } from '../../../lib/normalize' import { parseCartItem } from '../../utils/parse-item' import getCartCookie from '../../utils/get-cart-cookie' diff --git a/packages/bigcommerce/src/api/endpoints/cart/get-cart.ts b/packages/bigcommerce/src/api/endpoints/cart/get-cart.ts index b6a7d88e9..cce0b2fca 100644 --- a/packages/bigcommerce/src/api/endpoints/cart/get-cart.ts +++ b/packages/bigcommerce/src/api/endpoints/cart/get-cart.ts @@ -1,3 +1,4 @@ +// @ts-nocheck import { normalizeCart } from '../../../lib/normalize' import { BigcommerceApiError } from '../../utils/errors' import getCartCookie from '../../utils/get-cart-cookie' diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index df87fefcf..a6348fe2b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -22,6 +22,7 @@ importers: '@types/lodash.debounce': ^4.0.6 '@types/node': ^17.0.8 '@types/react': ^17.0.38 + '@vercel/commerce': workspace:* '@vercel/fetch': ^6.1.1 cookie: ^0.4.1 immutability-helper: ^3.1.1 @@ -37,6 +38,7 @@ importers: typescript: ^4.5.4 uuidv4: ^6.2.12 dependencies: + '@vercel/commerce': link:../commerce '@vercel/fetch': 6.2.0 cookie: 0.4.2 immutability-helper: 3.1.1 @@ -547,17 +549,17 @@ importers: '@types/lodash.throttle': ^4.1.6 '@types/node': ^17.0.8 '@types/react': ^17.0.38 - '@vercel/commerce': ^0.0.1 - '@vercel/commerce-bigcommerce': ^0.0.1 - '@vercel/commerce-commercejs': ^0.0.1 - '@vercel/commerce-kibocommerce': ^0.0.1 - '@vercel/commerce-local': ^0.0.1 - '@vercel/commerce-ordercloud': ^0.0.1 - '@vercel/commerce-saleor': ^0.0.1 - '@vercel/commerce-shopify': ^0.0.1 - '@vercel/commerce-spree': ^0.0.1 - '@vercel/commerce-swell': ^0.0.1 - '@vercel/commerce-vendure': ^0.0.1 + '@vercel/commerce': workspace:* + '@vercel/commerce-bigcommerce': workspace:* + '@vercel/commerce-commercejs': workspace:* + '@vercel/commerce-kibocommerce': workspace:* + '@vercel/commerce-local': workspace:* + '@vercel/commerce-ordercloud': workspace:* + '@vercel/commerce-saleor': workspace:* + '@vercel/commerce-shopify': workspace:* + '@vercel/commerce-spree': workspace:* + '@vercel/commerce-swell': workspace:* + '@vercel/commerce-vendure': workspace:* autoprefixer: ^10.4.2 body-scroll-lock: ^4.0.0-beta.0 clsx: ^1.1.1 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 5b4a92512..6add2bd5c 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,3 +1,3 @@ packages: - - 'site/**' + - 'site' - 'packages/*' diff --git a/site/.npmrc b/site/.npmrc index f87a04434..fa4e09523 100644 --- a/site/.npmrc +++ b/site/.npmrc @@ -1 +1 @@ -auto-install-peers=true \ No newline at end of file +strict-peer-dependencies=false \ No newline at end of file diff --git a/site/package.json b/site/package.json index efddd9a7b..97aba91b5 100644 --- a/site/package.json +++ b/site/package.json @@ -15,17 +15,17 @@ "dependencies": { "@radix-ui/react-dropdown-menu": "^0.1.6", "@react-spring/web": "^9.4.1", - "@vercel/commerce": "^0.0.1", - "@vercel/commerce-bigcommerce": "^0.0.1", - "@vercel/commerce-commercejs": "^0.0.1", - "@vercel/commerce-kibocommerce": "^0.0.1", - "@vercel/commerce-local": "^0.0.1", - "@vercel/commerce-ordercloud": "^0.0.1", - "@vercel/commerce-saleor": "^0.0.1", - "@vercel/commerce-shopify": "^0.0.1", - "@vercel/commerce-spree": "^0.0.1", - "@vercel/commerce-swell": "^0.0.1", - "@vercel/commerce-vendure": "^0.0.1", + "@vercel/commerce": "workspace:*", + "@vercel/commerce-bigcommerce": "workspace:*", + "@vercel/commerce-commercejs": "workspace:*", + "@vercel/commerce-kibocommerce": "workspace:*", + "@vercel/commerce-local": "workspace:*", + "@vercel/commerce-ordercloud": "workspace:*", + "@vercel/commerce-saleor": "workspace:*", + "@vercel/commerce-shopify": "workspace:*", + "@vercel/commerce-spree": "workspace:*", + "@vercel/commerce-swell": "workspace:*", + "@vercel/commerce-vendure": "workspace:*", "autoprefixer": "^10.4.2", "body-scroll-lock": "^4.0.0-beta.0", "clsx": "^1.1.1", diff --git a/site/tsconfig.json b/site/tsconfig.json index 7c91afd6f..868794504 100644 --- a/site/tsconfig.json +++ b/site/tsconfig.json @@ -23,8 +23,8 @@ "@components/*": ["components/*"], "@commerce": ["../packages/commerce/src"], "@commerce/*": ["../packages/commerce/src/*"], - "@framework": ["../packages/local/src"], - "@framework/*": ["../packages/local/src/*"] + "@framework": ["../packages/bigcommerce/src"], + "@framework/*": ["../packages/bigcommerce/src/*"] } }, "include": ["next-env.d.ts", "**/*.d.ts", "**/*.ts", "**/*.tsx", "**/*.js"], diff --git a/turbo.json b/turbo.json index 8e38ccddc..87870f1bb 100644 --- a/turbo.json +++ b/turbo.json @@ -1,4 +1,5 @@ { + "$schema": "https://turborepo.org/schema.json", "baseBranch": "origin/main", "pipeline": { "build": {