fix: Merge conflicts with master

packages/medusa-js/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## 1.3.10
+
+### Patch Changes
+
+- [#3271](https://github.com/medusajs/medusa/pull/3271) [`3a911091f`](https://github.com/medusajs/medusa/commit/3a911091f18c03260d92d81498f63bba31ba61ac) Thanks [@kasperkristensen](https://github.com/kasperkristensen)! - hotfix(medusa-js): Export all resources and make client of medusa-js public
+
+- Updated dependencies [[`9690f07bc`](https://github.com/medusajs/medusa/commit/9690f07bc062c85fcf8b7f0f35a162b930944183), [`5301a1e9d`](https://github.com/medusajs/medusa/commit/5301a1e9d632ddac94e7864fecfdc860a4c2a66d), [`d11ab924b`](https://github.com/medusajs/medusa/commit/d11ab924b88211bc18ed019ca300f6d452972167), [`f88af0c28`](https://github.com/medusajs/medusa/commit/f88af0c28d3fa574cdeea3694607d4df563cb88d)]:
+  - @medusajs/medusa@1.7.8
+
 ## 1.3.9
 
 ### Patch Changes

packages/medusa-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/medusa-js",
-  "version": "1.3.9",
+  "version": "1.3.10",
   "description": "Client for Medusa Commerce Rest API",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -32,7 +32,7 @@
     "uuid": "^9.0.0"
   },
   "peerDependencies": {
-    "@medusajs/medusa": "^1.7.7"
+    "@medusajs/medusa": "^1.7.8"
   },
   "repository": {
     "type": "git",
@@ -43,7 +43,7 @@
     "url": "https://github.com/medusajs/medusa/issues"
   },
   "devDependencies": {
-    "@medusajs/medusa": "^1.7.7",
+    "@medusajs/medusa": "^1.7.8",
     "@types/uuid": "^9.0.0",
     "cross-env": "^7.0.3",
     "jest": "^27.4.7",

packages/medusa-js/src/index.ts

@@ -1,28 +1,30 @@
 import MedusaError from "./error"
 import KeyManager from "./key-manager"
 import Client, { Config } from "./request"
-import Admin from "./resources/admin"
-import AuthResource from "./resources/auth"
-import CartsResource from "./resources/carts"
-import CollectionsResource from "./resources/collections"
-import CustomersResource from "./resources/customers"
-import GiftCardsResource from "./resources/gift-cards"
-import OrderEditsResource from "./resources/order-edits"
-import OrdersResource from "./resources/orders"
-import PaymentCollectionsResource from "./resources/payment-collections"
-import PaymentMethodsResource from "./resources/payment-methods"
-import ProductTagsResource from "./resources/product-tags"
-import ProductTypesResource from "./resources/product-types"
-import ProductsResource from "./resources/products"
-import RegionsResource from "./resources/regions"
-import ReturnReasonsResource from "./resources/return-reasons"
-import ReturnsResource from "./resources/returns"
-import ShippingOptionsResource from "./resources/shipping-options"
-import SwapsResource from "./resources/swaps"
-import ProductCategoriesResource from "./resources/product-categories"
+import {
+  Admin,
+  AuthResource,
+  CartsResource,
+  CollectionsResource,
+  CustomersResource,
+  GiftCardsResource,
+  OrderEditsResource,
+  OrdersResource,
+  PaymentCollectionsResource,
+  PaymentMethodsResource,
+  ProductCategoriesResource,
+  ProductsResource,
+  ProductTagsResource,
+  ProductTypesResource,
+  RegionsResource,
+  ReturnReasonsResource,
+  ReturnsResource,
+  ShippingOptionsResource,
+  SwapsResource,
+} from "./resources"
 
 class Medusa {
-  private client: Client
+  public client: Client
   public admin: Admin
 
   public auth: AuthResource
@@ -83,5 +85,8 @@ class Medusa {
 }
 
 export default Medusa
+export { default as MedusaError } from "./error"
 export { default as KeyManager } from "./key-manager"
+export { Config, default as Client } from "./request"
+export * from "./resources"
 export * from "./typings"

packages/medusa-js/src/resources/admin/index.ts

@@ -1,24 +1,29 @@
 import BaseResource from "../base"
 import AdminAuthResource from "./auth"
 import AdminBatchJobsResource from "./batch-jobs"
-import CollectionsResource from "./collections"
+import AdminCollectionsResource from "./collections"
 import AdminCurrenciesResource from "./currencies"
 import AdminCustomerGroupsResource from "./customer-groups"
 import AdminCustomersResource from "./customers"
 import AdminDiscountsResource from "./discounts"
 import AdminDraftOrdersResource from "./draft-orders"
 import AdminGiftCardsResource from "./gift-cards"
+import AdminInventoryItemsResource from "./inventory-item"
 import AdminInvitesResource from "./invites"
 import AdminNotesResource from "./notes"
 import AdminNotificationsResource from "./notifications"
-import AdminOrdersResource from "./orders"
 import AdminOrderEditsResource from "./order-edits"
+import AdminOrdersResource from "./orders"
+import AdminPaymentCollectionsResource from "./payment-collections"
+import AdminPaymentsResource from "./payments"
 import AdminPriceListResource from "./price-lists"
+import AdminProductCategoriesResource from "./product-categories"
 import AdminProductTagsResource from "./product-tags"
 import AdminProductTypesResource from "./product-types"
 import AdminProductsResource from "./products"
 import AdminPublishableApiKeyResource from "./publishable-api-keys"
 import AdminRegionsResource from "./regions"
+import AdminReservationsResource from "./reservations"
 import AdminReturnReasonsResource from "./return-reasons"
 import AdminReturnsResource from "./returns"
 import AdminSalesChannelsResource from "./sales-channels"
@@ -31,11 +36,6 @@ import AdminTaxRatesResource from "./tax-rates"
 import AdminUploadsResource from "./uploads"
 import AdminUsersResource from "./users"
 import AdminVariantsResource from "./variants"
-import AdminPaymentCollectionsResource from "./payment-collections"
-import AdminPaymentsResource from "./payments"
-import AdminInventoryItemsResource from "./inventory-item"
-import AdminReservationsResource from "./reservations"
-import AdminProductCategoriesResource from "./product-categories"
 
 class Admin extends BaseResource {
   public auth = new AdminAuthResource(this.client)
@@ -44,7 +44,7 @@ class Admin extends BaseResource {
   public customerGroups = new AdminCustomerGroupsResource(this.client)
   public discounts = new AdminDiscountsResource(this.client)
   public currencies = new AdminCurrenciesResource(this.client)
-  public collections = new CollectionsResource(this.client)
+  public collections = new AdminCollectionsResource(this.client)
   public draftOrders = new AdminDraftOrdersResource(this.client)
   public giftCards = new AdminGiftCardsResource(this.client)
   public invites = new AdminInvitesResource(this.client)
@@ -77,4 +77,41 @@ class Admin extends BaseResource {
   public productCategories = new AdminProductCategoriesResource(this.client)
 }
 
-export default Admin
+export {
+  Admin,
+  AdminAuthResource,
+  AdminBatchJobsResource,
+  AdminCollectionsResource,
+  AdminCurrenciesResource,
+  AdminCustomerGroupsResource,
+  AdminCustomersResource,
+  AdminDiscountsResource,
+  AdminDraftOrdersResource,
+  AdminGiftCardsResource,
+  AdminInvitesResource,
+  AdminNotesResource,
+  AdminNotificationsResource,
+  AdminOrdersResource,
+  AdminOrderEditsResource,
+  AdminPriceListResource,
+  AdminProductTagsResource,
+  AdminProductTypesResource,
+  AdminProductsResource,
+  AdminPublishableApiKeyResource,
+  AdminRegionsResource,
+  AdminReturnReasonsResource,
+  AdminReturnsResource,
+  AdminSalesChannelsResource,
+  AdminShippingOptionsResource,
+  AdminShippingProfilesResource,
+  AdminStockLocationsResource,
+  AdminStoresResource,
+  AdminSwapsResource,
+  AdminTaxRatesResource,
+  AdminUploadsResource,
+  AdminUsersResource,
+  AdminVariantsResource,
+  AdminPaymentCollectionsResource,
+  AdminPaymentsResource,
+  AdminProductCategoriesResource,
+}

packages/medusa-js/src/resources/index.ts

@@ -0,0 +1,46 @@
+import AddressesResource from "./addresses"
+import AuthResource from "./auth"
+import BaseResource from "./base"
+import CartsResource from "./carts"
+import CollectionsResource from "./collections"
+import CustomersResource from "./customers"
+import GiftCardsResource from "./gift-cards"
+import LineItemsResource from "./line-items"
+import OrderEditsResource from "./order-edits"
+import OrdersResource from "./orders"
+import PaymentCollectionsResource from "./payment-collections"
+import PaymentMethodsResource from "./payment-methods"
+import ProductCategoriesResource from "./product-categories"
+import ProductTagsResource from "./product-tags"
+import ProductTypesResource from "./product-types"
+import ProductsResource from "./products"
+import RegionsResource from "./regions"
+import ReturnReasonsResource from "./return-reasons"
+import ReturnsResource from "./returns"
+import ShippingOptionsResource from "./shipping-options"
+import SwapsResource from "./swaps"
+
+export * from "./admin"
+export {
+  AddressesResource,
+  AuthResource,
+  BaseResource,
+  CartsResource,
+  CollectionsResource,
+  CustomersResource,
+  GiftCardsResource,
+  LineItemsResource,
+  OrderEditsResource,
+  OrdersResource,
+  PaymentCollectionsResource,
+  PaymentMethodsResource,
+  ProductCategoriesResource,
+  ProductTagsResource,
+  ProductTypesResource,
+  ProductsResource,
+  RegionsResource,
+  ReturnReasonsResource,
+  ReturnsResource,
+  ShippingOptionsResource,
+  SwapsResource,
+}