fix: merge conflicts

CODEOWNERS

@@ -1,2 +1,4 @@
 # All files not owned by other teams must be reviewed by the core team
 *                                               @medusajs/core
+/docs/                                          @medusajs/docs
+/www/                                           @medusajs/docs

README.md

@@ -40,7 +40,7 @@ Medusa is an open-source headless commerce engine that enables developers to cre
   </a>
 </p>
 
-## 🚀 Quickstart
+## Quickstart
 
 1. **Install Medusa CLI**
    ```bash
@@ -63,7 +63,25 @@ We have a prebuilt admin dashboard that you can use to configure and manage your
 
 After these four steps and only a couple of minutes, you now have a complete commerce engine running locally. You may now explore [the documentation](https://docs.medusajs.com/api) to learn how to interact with the Medusa API. You may also add [plugins](https://github.com/medusajs/medusa/tree/master/packages) to your Medusa store by specifying them in your `medusa-config.js` file.
 
-## 🛒 Setting up a storefront for your Medusa project
+## Roadmap 2022
+
+Write-ups for all features will be made available in [Github discussions](https://github.com/medusajs/medusa/discussions) prior to starting the implementation process.
+
+### Q1
+- [x] Admin revamp
+- [ ] Tax API
+- [ ] Strategy pattern
+- [ ] Promotions API
+- [ ] Bulk import / export
+
+### Q2
+- [ ] Extended Product API (custom fields, price lists, publishing control, and more)
+- [ ] Extended Order API (managing placed orders, improved inventory control, and more)
+- [ ] Sales Channel API
+- [ ] Multi-warehouse support
+- [ ] GraphQL API
+  
+## Setting up a storefront for your Medusa project
 
 Medusa is a headless commerce engine which means that it can be used for any type of digital commerce experience - you may use it as the backend for an app, a voice application, social commerce experiences or a traditional e-commerce website, you may even want to integrate Medusa into your own software to enable commerce functionality. All of these are use cases that Medusa supports - to learn more read the documentation or reach out.
 
@@ -81,7 +99,7 @@ To provide a quick way to get you started with a storefront install one of our t
 
 With your starter and your Medusa store running you can open http://localhost:8000 (for Gatsby) or http://localhost:3000 (for Nextjs) in your browser and view the products in your store, build a cart, add shipping details and pay and complete an order.
 
-## ⭐️ Features
+## Features
 
 Medusa comes with a set of building blocks that allow you to create amazing digital commerce experiences, below is a list of some of the features that Medusa come with out of the box:
 
@@ -112,7 +130,7 @@ To use Postgres and Redis you should provide a `database_url` and `redis_url` in
 
 ## Contribution
 
-Medusa is all about the community. Therefore, we would love for you to help us build the most robust and powerful commerce engine on the market. Whether its fixing bugs, improving our documentation or simply spreading the word, please feel free to join in. Please check [our contribution guide](https://github.com/medusajs/medusa/blob/master/CONTRIBUTING.md) for further details about how to contribute.
+Medusa is all about the community. Therefore, we would love for you to help us build the most robust and powerful commerce engine on the market. Whether it is fixing bugs, improving our documentation or simply spreading the word, please feel free to join in. Please check [our contribution guide](https://github.com/medusajs/medusa/blob/master/CONTRIBUTING.md) for further details about how to contribute.
 
 ## Repository structure
 

docs/content/add-plugins/sendgrid.md

@@ -1,3 +1,7 @@
 # SendGrid (Documentation coming soon)
 
 [View plugin here](https://github.com/medusajs/medusa/tree/master/packages/medusa-plugin-sendgrid)
+
+
+https://user-images.githubusercontent.com/59018053/154807282-1e72671f-1936-411d-b914-e05c6597693a.mp4
+

docs/content/add-plugins/spaces.md

@@ -2,6 +2,10 @@
 
 In order to work with images in Medusa, you need a file service plugin responsible for hosting. Following this guide will allow you to upload images to DigitalOcean Spaces.
 
+
+https://user-images.githubusercontent.com/59018053/154808767-7c030254-1879-41fd-a71c-b31c5508d8a4.mp4
+
+
 ### Before you start
 
 At this point, you should have an instance of our store engine running. If not, we have a [full guide](https://docs.medusa-commerce.com/tutorial/set-up-your-development-environment) for setting up your local environment.

docs/content/add-plugins/stripe.md

@@ -2,6 +2,10 @@
 
 [View plugin here](https://github.com/medusajs/medusa/tree/master/packages/medusa-payment-stripe)
 
+
+https://user-images.githubusercontent.com/59018053/154807206-6fbda0a6-bf3e-4e39-9fc2-f11710afe0b9.mp4
+
+
 ### Introduction
 
 Handling payments is at the core of every commerce system; it allows us to run our businesses. Consequently, a vast landscape of payment providers has developed, each with varying cost models, implementational specifications, and analytical capabilities.

docs/content/advanced/backend/endpoints/add-storefront.md

@@ -0,0 +1,176 @@
+---
+title: Add Endpoint for Storefront
+---
+
+# Add Endpoint for Storefront
+
+In this document, you’ll learn how to add a custom endpoint in the Backend that you can use from the Storefront.
+
+## Overview
+
+Custom endpoints reside under the `src/api` directory in your Medusa Backend. To define a new endpoint, you can add the file `index.js` under the `src/api` directory. This file should export a function that returns an Express router.
+
+Your endpoint can be under any path you wish. By Medusa’s conventions, all Storefront REST APIs are prefixed by `/store`. For example, the `/store/products` lets you retrieve the products to display them on your storefront.
+
+## Implementation
+
+To create a new endpoint, start by creating a new file in `src/api` called `index.js`. At its basic format, `index.js` should look something like this:
+
+```js
+import { Router } from "express"
+
+export default () => {
+  const router = Router()
+
+  router.get("/store/hello", (req, res) => {
+    res.json({
+      message: "Welcome to My Store!"
+    })
+  })
+
+  return router
+}
+```
+
+This exports a function that returns an Express router. In that function, you can create one or more endpoints. In the example above, you create the endpoint `/store/hello`.
+
+Now, if you run your server and send a request to `/store/hello`, you will receive a JSON response message.
+
+> Custom endpoints are compiled into the `dist` directory of your Backend when you run your server using `medusa develop`, while it’s running, and when you run `npm run build`.
+
+## Multiple Endpoints
+
+### Same File
+
+You can add more than one endpoints in `src/api/index.js`:
+
+```js
+router.get("/store/hello", (req, res) => {
+  res.json({
+    message: "Welcome to My Store!"
+  })
+})
+
+router.get("/store/bye", (req, res) => {
+  res.json({
+    message: "Come back again!"
+  })
+})
+```
+
+### Multiple Files
+
+Alternatively, you can add multiple files for each endpoint or set of endpoints for readability and easy maintenance.
+
+To do that with the previous example, first, create the file `src/api/hello.js` with the following content:
+
+```js
+export default (router) => {
+  router.get("/store/hello", (req, res) => {
+    res.json({
+      message: "Welcome to My Store!"
+    })
+  })
+}
+```
+
+You export a function that receives an Express router as a parameter and adds the endpoint `store/hello` to it.
+
+Next, create the file `src/api/bye.js` with the following content:
+
+```js
+export default (router) => {
+  router.get("/store/bye", (req, res) => {
+    res.json({
+      message: "Come back again!"
+    })
+  })
+}
+```
+
+Again, you export a function that receives an Express router as a parameter and adds the endpoint `store/bye` to it.
+
+Finally, in `src/api/index.js` import the two functions at the beginning of the file:
+
+```js
+import helloRoute from "./hello"
+import byeRoute from "./bye"
+```
+
+and in the exported function, call each of the functions passing them the Express router:
+
+```js
+export default () => {
+  const router = Router()
+
+  helloRoute(router)
+  byeRoute(router)
+
+  return router
+}
+```
+
+## Use Services
+
+Services in Medusa bundle a set of functionalities into one class. Then, you can use that class anywhere in your Backend. For example, you can use the `ProductService` to retrieve products or perform operations like creating or updating a product.
+
+You can retrieve any registered service in your endpoint using `req.scope.resolve` passing it the service’s registration name.
+
+Here’s an example of an endpoint that retrieves the count of products in your store:
+
+```js
+router.get('/store/products/count', (req, res) => {
+    const productService = req.scope.resolve('productService')
+
+    productService
+      .count()
+      .then((count) => {
+        res.json({
+          count
+        })
+      })
+  })
+```
+
+The `productService` has a `count` method that returns a Promise. This Promise resolves to the count of the products. You return a JSON of the product count.
+
+## Protected Routes
+
+Protected routes are routes that should be accessible by logged-in customers only.
+
+To make a route protected, first, import the `authenticate` middleware:
+
+```js
+import authenticate from '@medusajs/medusa/dist/api/middlewares/authenticate'
+```
+
+Then, add the middleware to your route:
+
+```jsx
+router.get('/store/products/count', authenticate(), (req, res) => {
+  //...
+})
+```
+
+Now, only authenticated users can access this endpoint.
+
+### Accessing Current Customer
+
+You can get the logged-in customer’s ID using `req.user`:
+
+```jsx
+const id = req.user.customer_id
+```
+
+To get the customer’s details, you can use the `customerService`:
+
+```jsx
+const id = req.user.customer_id
+const customerService = req.scope.resolve("customerService")
+
+const customer = await customerService.retrieve(id)
+```
+
+## What’s Next :rocket:
+
+- [Check out the API reference for all available endpoints.](https://docs.medusajs.com/api/store)

docs/content/how-to/deploying-on-heroku.md

@@ -6,6 +6,8 @@ title: "Deploying on Heroku"
 
 This is a guide for deploying a Medusa project on Heroku. Heroku is at PaaS that allows you to easily deploy your applications in the cloud.
 
+https://user-images.githubusercontent.com/59018053/154798681-37060f13-5248-47c5-97c5-81c06da301d4.mp4
+
 > We assume, that you are currently running a local instance of Medusa. If not, check out our [Quickstart](https://docs.medusajs.com/quickstart/quick-start) or use `npx create-medusa-app` to set up your application in a matter of minutes. For the latter, see [this guide](https://docs.medusajs.com/how-to/create-medusa-app) for a small walkthrough.
 
 ### 1. Install the Heroku CLI

packages/medusa-cli/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.2.0](https://github.com/medusajs/medusa/compare/@medusajs/medusa-cli@1.1.27...@medusajs/medusa-cli@1.2.0) (2022-02-25)
+
+
+### Features
+
+* new tax api ([#979](https://github.com/medusajs/medusa/issues/979)) ([c56660f](https://github.com/medusajs/medusa/commit/c56660fca9921a3f3637bc137d9794781c5b090f)), closes [#885](https://github.com/medusajs/medusa/issues/885) [#896](https://github.com/medusajs/medusa/issues/896) [#911](https://github.com/medusajs/medusa/issues/911) [#945](https://github.com/medusajs/medusa/issues/945) [#950](https://github.com/medusajs/medusa/issues/950) [#951](https://github.com/medusajs/medusa/issues/951) [#954](https://github.com/medusajs/medusa/issues/954) [#969](https://github.com/medusajs/medusa/issues/969) [#998](https://github.com/medusajs/medusa/issues/998) [#1017](https://github.com/medusajs/medusa/issues/1017) [#1110](https://github.com/medusajs/medusa/issues/1110)
+
+
+
+
+
 ## [1.1.27](https://github.com/medusajs/medusa/compare/@medusajs/medusa-cli@1.1.26...@medusajs/medusa-cli@1.1.27) (2022-01-11)
 
 **Note:** Version bump only for package @medusajs/medusa-cli

packages/medusa-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/medusa-cli",
-  "version": "1.1.27",
+  "version": "1.2.0",
   "description": "Command Line interface for Medusa Commerce",
   "main": "dist/index.js",
   "bin": {

packages/medusa-fulfillment-webshipper/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.2.0](https://github.com/medusajs/medusa/compare/medusa-fulfillment-webshipper@1.1.35...medusa-fulfillment-webshipper@1.2.0) (2022-02-25)
+
+
+### Features
+
+* new tax api ([#979](https://github.com/medusajs/medusa/issues/979)) ([c56660f](https://github.com/medusajs/medusa/commit/c56660fca9921a3f3637bc137d9794781c5b090f)), closes [#885](https://github.com/medusajs/medusa/issues/885) [#896](https://github.com/medusajs/medusa/issues/896) [#911](https://github.com/medusajs/medusa/issues/911) [#945](https://github.com/medusajs/medusa/issues/945) [#950](https://github.com/medusajs/medusa/issues/950) [#951](https://github.com/medusajs/medusa/issues/951) [#954](https://github.com/medusajs/medusa/issues/954) [#969](https://github.com/medusajs/medusa/issues/969) [#998](https://github.com/medusajs/medusa/issues/998) [#1017](https://github.com/medusajs/medusa/issues/1017) [#1110](https://github.com/medusajs/medusa/issues/1110)
+
+
+
+
+
 ## [1.1.35](https://github.com/medusajs/medusa/compare/medusa-fulfillment-webshipper@1.1.34...medusa-fulfillment-webshipper@1.1.35) (2021-12-08)
 
 **Note:** Version bump only for package medusa-fulfillment-webshipper

packages/medusa-fulfillment-webshipper/package.json

@@ -1,6 +1,6 @@
 {
   "name": "medusa-fulfillment-webshipper",
-  "version": "1.1.35",
+  "version": "1.2.0",
   "description": "Webshipper Fulfillment provider for Medusa",
   "main": "index.js",
   "repository": {
@@ -18,7 +18,7 @@
     "@babel/plugin-transform-runtime": "^7.7.6",
     "@babel/preset-env": "^7.7.5",
     "@babel/runtime": "^7.9.6",
-    "@medusajs/medusa": "^1.1.62",
+    "@medusajs/medusa": "^1.2.0",
     "client-sessions": "^0.8.0",
     "cross-env": "^5.2.1",
     "eslint": "^6.8.0",

packages/medusa-interfaces/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.2.0](https://github.com/medusajs/medusa/compare/medusa-interfaces@1.1.34...medusa-interfaces@1.2.0) (2022-02-25)
+
+
+### Bug Fixes
+
+* atomic phase error handler ([#1104](https://github.com/medusajs/medusa/issues/1104)) ([62c263c](https://github.com/medusajs/medusa/commit/62c263c36080541023fda5ae33a458c58cbaeb1e))
+
+
+
+
+
 ## [1.1.34](https://github.com/medusajs/medusa/compare/medusa-interfaces@1.1.33...medusa-interfaces@1.1.34) (2022-02-06)
 
 ### Bug Fixes

packages/medusa-interfaces/package.json

@@ -1,6 +1,6 @@
 {
   "name": "medusa-interfaces",
-  "version": "1.1.34",
+  "version": "1.2.0",
   "description": "Core interfaces for Medusa",
   "main": "dist/index.js",
   "repository": {

packages/medusa-js/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.1.0](https://github.com/medusajs/medusa-js/compare/@medusajs/medusa-js@1.0.12...@medusajs/medusa-js@1.1.0) (2022-02-25)
+
+
+### Bug Fixes
+
+* use /admin/returns/:id/receive for swap returns ([#1041](https://github.com/medusajs/medusa-js/issues/1041)) ([7ae754b](https://github.com/medusajs/medusa-js/commit/7ae754bb6187db17c45b2cfadc625df8f997f5ab))
+
+
+### Features
+
+* new tax api ([#979](https://github.com/medusajs/medusa-js/issues/979)) ([c56660f](https://github.com/medusajs/medusa-js/commit/c56660fca9921a3f3637bc137d9794781c5b090f)), closes [#885](https://github.com/medusajs/medusa-js/issues/885) [#896](https://github.com/medusajs/medusa-js/issues/896) [#911](https://github.com/medusajs/medusa-js/issues/911) [#945](https://github.com/medusajs/medusa-js/issues/945) [#950](https://github.com/medusajs/medusa-js/issues/950) [#951](https://github.com/medusajs/medusa-js/issues/951) [#954](https://github.com/medusajs/medusa-js/issues/954) [#969](https://github.com/medusajs/medusa-js/issues/969) [#998](https://github.com/medusajs/medusa-js/issues/998) [#1017](https://github.com/medusajs/medusa-js/issues/1017) [#1110](https://github.com/medusajs/medusa-js/issues/1110)
+
+
+
+
+
 ## [1.0.12](https://github.com/medusajs/medusa-js/compare/@medusajs/medusa-js@1.0.11...@medusajs/medusa-js@1.0.12) (2022-02-06)
 
 ### Bug Fixes

packages/medusa-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/medusa-js",
-  "version": "1.0.12",
+  "version": "1.1.0",
   "description": "Client for Medusa Commerce Rest API",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -15,7 +15,7 @@
   "author": "Oliver Juhl",
   "license": "MIT",
   "dependencies": {
-    "@medusajs/medusa": "^1.1.64",
+    "@medusajs/medusa": "^1.2.0",
     "axios": "^0.24.0",
     "form-data": "^4.0.0",
     "qs": "^6.10.3",

packages/medusa-payment-klarna/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.2.0](https://github.com/medusajs/medusa/compare/medusa-payment-klarna@1.1.41...medusa-payment-klarna@1.2.0) (2022-02-25)
+
+
+### Features
+
+* new tax api ([#979](https://github.com/medusajs/medusa/issues/979)) ([c56660f](https://github.com/medusajs/medusa/commit/c56660fca9921a3f3637bc137d9794781c5b090f)), closes [#885](https://github.com/medusajs/medusa/issues/885) [#896](https://github.com/medusajs/medusa/issues/896) [#911](https://github.com/medusajs/medusa/issues/911) [#945](https://github.com/medusajs/medusa/issues/945) [#950](https://github.com/medusajs/medusa/issues/950) [#951](https://github.com/medusajs/medusa/issues/951) [#954](https://github.com/medusajs/medusa/issues/954) [#969](https://github.com/medusajs/medusa/issues/969) [#998](https://github.com/medusajs/medusa/issues/998) [#1017](https://github.com/medusajs/medusa/issues/1017) [#1110](https://github.com/medusajs/medusa/issues/1110)
+
+
+
+
+
 ## [1.1.41](https://github.com/medusajs/medusa/compare/medusa-payment-klarna@1.1.40...medusa-payment-klarna@1.1.41) (2022-02-06)
 
 ### Bug Fixes

packages/medusa-payment-klarna/package.json

@@ -1,6 +1,6 @@
 {
   "name": "medusa-payment-klarna",
-  "version": "1.1.41",
+  "version": "1.2.0",
   "description": "Klarna Payment provider for Medusa Commerce",
   "main": "index.js",
   "repository": {

packages/medusa-payment-paypal/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.1.0](https://github.com/medusajs/medusa/compare/medusa-payment-paypal@1.0.40...medusa-payment-paypal@1.1.0) (2022-02-25)
+
+**Note:** Version bump only for package medusa-payment-paypal
+
+
+
+
+
 ## [1.0.40](https://github.com/medusajs/medusa/compare/medusa-payment-paypal@1.0.39...medusa-payment-paypal@1.0.40) (2022-02-06)
 
 ### Bug Fixes

packages/medusa-payment-paypal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "medusa-payment-paypal",
-  "version": "1.0.40",
+  "version": "1.1.0",
   "description": "Paypal Payment provider for Meduas Commerce",
   "main": "index.js",
   "repository": {
@@ -26,7 +26,7 @@
     "cross-env": "^5.2.1",
     "eslint": "^6.8.0",
     "jest": "^25.5.2",
-    "medusa-interfaces": "^1.1.34",
+    "medusa-interfaces": "^1.2.0",
     "medusa-test-utils": "^1.1.37"
   },
   "scripts": {

packages/medusa-plugin-algolia/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.1.0](https://github.com/medusajs/medusa/compare/medusa-plugin-algolia@0.0.8...medusa-plugin-algolia@0.1.0) (2022-02-25)
+
+**Note:** Version bump only for package medusa-plugin-algolia
+
+
+
+
+
 ## [0.0.8](https://github.com/medusajs/medusa/compare/medusa-plugin-algolia@0.0.7...medusa-plugin-algolia@0.0.8) (2022-02-06)
 
 ### Bug Fixes

packages/medusa-plugin-algolia/package.json

@@ -1,6 +1,6 @@
 {
   "name": "medusa-plugin-algolia",
-  "version": "0.0.8",
+  "version": "0.1.0",
   "description": "Search support for algolia",
   "main": "index.js",
   "repository": {
@@ -25,7 +25,7 @@
     "body-parser": "^1.19.0",
     "lodash": "^4.17.21",
     "medusa-core-utils": "^1.1.31",
-    "medusa-interfaces": "^1.1.34"
+    "medusa-interfaces": "^1.2.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.7.5",

packages/medusa-plugin-brightpearl/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.2.0](https://github.com/medusajs/medusa/compare/medusa-plugin-brightpearl@1.1.45...medusa-plugin-brightpearl@1.2.0) (2022-02-25)
+
+
+### Features
+
+* new tax api ([#979](https://github.com/medusajs/medusa/issues/979)) ([c56660f](https://github.com/medusajs/medusa/commit/c56660fca9921a3f3637bc137d9794781c5b090f)), closes [#885](https://github.com/medusajs/medusa/issues/885) [#896](https://github.com/medusajs/medusa/issues/896) [#911](https://github.com/medusajs/medusa/issues/911) [#945](https://github.com/medusajs/medusa/issues/945) [#950](https://github.com/medusajs/medusa/issues/950) [#951](https://github.com/medusajs/medusa/issues/951) [#954](https://github.com/medusajs/medusa/issues/954) [#969](https://github.com/medusajs/medusa/issues/969) [#998](https://github.com/medusajs/medusa/issues/998) [#1017](https://github.com/medusajs/medusa/issues/1017) [#1110](https://github.com/medusajs/medusa/issues/1110)
+
+
+
+
+
 ## [1.1.45](https://github.com/medusajs/medusa/compare/medusa-plugin-brightpearl@1.1.44...medusa-plugin-brightpearl@1.1.45) (2022-02-06)
 
 ### Bug Fixes

packages/medusa-plugin-brightpearl/package.json

@@ -1,6 +1,6 @@
 {
   "name": "medusa-plugin-brightpearl",
-  "version": "1.1.45",
+  "version": "1.2.0",
   "description": "Brightpearl plugin for Medusa Commerce",
   "main": "index.js",
   "repository": {
@@ -27,7 +27,7 @@
     "cross-env": "^7.0.2",
     "eslint": "^6.8.0",
     "jest": "^25.5.2",
-    "medusa-interfaces": "^1.1.34",
+    "medusa-interfaces": "^1.2.0",
     "medusa-test-utils": "^1.1.37",
     "prettier": "^2.0.5"
   },

packages/medusa-plugin-meilisearch/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.1.0](https://github.com/medusajs/medusa/compare/medusa-plugin-meilisearch@0.0.14...medusa-plugin-meilisearch@0.1.0) (2022-02-25)
+
+**Note:** Version bump only for package medusa-plugin-meilisearch
+
+
+
+
+
 ## [0.0.14](https://github.com/medusajs/medusa/compare/medusa-plugin-meilisearch@0.0.13...medusa-plugin-meilisearch@0.0.14) (2022-02-06)
 
 ### Bug Fixes

packages/medusa-plugin-meilisearch/package.json

@@ -1,6 +1,6 @@
 {
   "name": "medusa-plugin-meilisearch",
-  "version": "0.0.14",
+  "version": "0.1.0",
   "description": "A starter for Medusa projects.",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "body-parser": "^1.19.0",
     "lodash": "^4.17.21",
     "medusa-core-utils": "^1.1.31",
-    "medusa-interfaces": "^1.1.34",
+    "medusa-interfaces": "^1.2.0",
     "meilisearch": "^0.24.0"
   },
   "devDependencies": {

packages/medusa-plugin-segment/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.2.0](https://github.com/medusajs/medusa/compare/medusa-plugin-segment@1.1.42...medusa-plugin-segment@1.2.0) (2022-02-25)
+
+
+### Features
+
+* new tax api ([#979](https://github.com/medusajs/medusa/issues/979)) ([c56660f](https://github.com/medusajs/medusa/commit/c56660fca9921a3f3637bc137d9794781c5b090f)), closes [#885](https://github.com/medusajs/medusa/issues/885) [#896](https://github.com/medusajs/medusa/issues/896) [#911](https://github.com/medusajs/medusa/issues/911) [#945](https://github.com/medusajs/medusa/issues/945) [#950](https://github.com/medusajs/medusa/issues/950) [#951](https://github.com/medusajs/medusa/issues/951) [#954](https://github.com/medusajs/medusa/issues/954) [#969](https://github.com/medusajs/medusa/issues/969) [#998](https://github.com/medusajs/medusa/issues/998) [#1017](https://github.com/medusajs/medusa/issues/1017) [#1110](https://github.com/medusajs/medusa/issues/1110)
+
+
+
+
+
 ## [1.1.42](https://github.com/medusajs/medusa/compare/medusa-plugin-segment@1.1.41...medusa-plugin-segment@1.1.42) (2022-02-06)
 
 ### Bug Fixes

packages/medusa-plugin-segment/package.json

@@ -1,6 +1,6 @@
 {
   "name": "medusa-plugin-segment",
-  "version": "1.1.42",
+  "version": "1.2.0",
   "description": "Segment Analytics",
   "main": "index.js",
   "repository": {

packages/medusa-plugin-sendgrid/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.2.0](https://github.com/medusajs/medusa/compare/medusa-plugin-sendgrid@1.1.38...medusa-plugin-sendgrid@1.2.0) (2022-02-25)
+
+
+### Bug Fixes
+
+* reset user password subscription in sendgrid plugin ([#1072](https://github.com/medusajs/medusa/issues/1072)) ([90121dd](https://github.com/medusajs/medusa/commit/90121dd19d5419e239ea5d1b6feda9e7bc754d63))
+
+
+### Features
+
+* new tax api ([#979](https://github.com/medusajs/medusa/issues/979)) ([c56660f](https://github.com/medusajs/medusa/commit/c56660fca9921a3f3637bc137d9794781c5b090f)), closes [#885](https://github.com/medusajs/medusa/issues/885) [#896](https://github.com/medusajs/medusa/issues/896) [#911](https://github.com/medusajs/medusa/issues/911) [#945](https://github.com/medusajs/medusa/issues/945) [#950](https://github.com/medusajs/medusa/issues/950) [#951](https://github.com/medusajs/medusa/issues/951) [#954](https://github.com/medusajs/medusa/issues/954) [#969](https://github.com/medusajs/medusa/issues/969) [#998](https://github.com/medusajs/medusa/issues/998) [#1017](https://github.com/medusajs/medusa/issues/1017) [#1110](https://github.com/medusajs/medusa/issues/1110)
+
+
+
+
+
 ## [1.1.38](https://github.com/medusajs/medusa/compare/medusa-plugin-sendgrid@1.1.37...medusa-plugin-sendgrid@1.1.38) (2022-01-11)
 
 **Note:** Version bump only for package medusa-plugin-sendgrid

packages/medusa-plugin-sendgrid/package.json

@@ -1,6 +1,6 @@
 {
   "name": "medusa-plugin-sendgrid",
-  "version": "1.1.38",
+  "version": "1.2.0",
   "description": "SendGrid transactional emails",
   "main": "index.js",
   "repository": {

packages/medusa-plugin-slack-notification/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.2.0](https://github.com/medusajs/medusa/compare/medusa-plugin-slack-notification@1.1.37...medusa-plugin-slack-notification@1.2.0) (2022-02-25)
+
+
+### Features
+
+* new tax api ([#979](https://github.com/medusajs/medusa/issues/979)) ([c56660f](https://github.com/medusajs/medusa/commit/c56660fca9921a3f3637bc137d9794781c5b090f)), closes [#885](https://github.com/medusajs/medusa/issues/885) [#896](https://github.com/medusajs/medusa/issues/896) [#911](https://github.com/medusajs/medusa/issues/911) [#945](https://github.com/medusajs/medusa/issues/945) [#950](https://github.com/medusajs/medusa/issues/950) [#951](https://github.com/medusajs/medusa/issues/951) [#954](https://github.com/medusajs/medusa/issues/954) [#969](https://github.com/medusajs/medusa/issues/969) [#998](https://github.com/medusajs/medusa/issues/998) [#1017](https://github.com/medusajs/medusa/issues/1017) [#1110](https://github.com/medusajs/medusa/issues/1110)
+
+
+
+
+
 ## [1.1.37](https://github.com/medusajs/medusa/compare/medusa-plugin-slack-notification@1.1.36...medusa-plugin-slack-notification@1.1.37) (2022-01-11)
 
 **Note:** Version bump only for package medusa-plugin-slack-notification

packages/medusa-plugin-slack-notification/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "medusa-plugin-economic",
-  "version": "1.1.37",
+  "version": "1.2.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

packages/medusa-plugin-slack-notification/package.json

@@ -1,6 +1,6 @@
 {
   "name": "medusa-plugin-slack-notification",
-  "version": "1.1.37",
+  "version": "1.2.0",
   "description": "Slack notifications",
   "main": "index.js",
   "repository": {

packages/medusa-react/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.2.0](https://github.com/medusajs/medusa/compare/medusa-react@0.1.5...medusa-react@0.2.0) (2022-02-25)
+
+
+### Bug Fixes
+
+* use /admin/returns/:id/receive for swap returns ([#1041](https://github.com/medusajs/medusa/issues/1041)) ([7ae754b](https://github.com/medusajs/medusa/commit/7ae754bb6187db17c45b2cfadc625df8f997f5ab))
+
+
+### Features
+
+* new tax api ([#979](https://github.com/medusajs/medusa/issues/979)) ([c56660f](https://github.com/medusajs/medusa/commit/c56660fca9921a3f3637bc137d9794781c5b090f)), closes [#885](https://github.com/medusajs/medusa/issues/885) [#896](https://github.com/medusajs/medusa/issues/896) [#911](https://github.com/medusajs/medusa/issues/911) [#945](https://github.com/medusajs/medusa/issues/945) [#950](https://github.com/medusajs/medusa/issues/950) [#951](https://github.com/medusajs/medusa/issues/951) [#954](https://github.com/medusajs/medusa/issues/954) [#969](https://github.com/medusajs/medusa/issues/969) [#998](https://github.com/medusajs/medusa/issues/998) [#1017](https://github.com/medusajs/medusa/issues/1017) [#1110](https://github.com/medusajs/medusa/issues/1110)
+
+
+
+
+
 ## [0.1.5](https://github.com/medusajs/medusa/compare/medusa-react@0.1.4...medusa-react@0.1.5) (2022-02-06)
 
 ### Bug Fixes

packages/medusa-react/README.md

@@ -9,9 +9,9 @@ The library uses [react-query](https://react-query.tanstack.com/overview) as a s
 In order to install the package, run the following
 
 ```bash
-npm install @medusajs/medusa-react react-query
+npm install medusa-react react-query
 # or
-yarn add @medusajs/medusa-react react-query
+yarn add medusa-react react-query
 ```
 
 ## Quick Start
@@ -62,7 +62,7 @@ The hooks exposed by `medusa-react` fall into two main categories: queries and m
 ```jsx
 // ./my-storefront.tsx
 import * as React from "react"
-import { useProducts } from "@medusajs/medusa-react"
+import { useProducts } from "medusa-react"
 
 const MyStorefront = () => {
   const { products, isLoading } = useProducts()
@@ -125,7 +125,7 @@ type QueryReturnType = APIResponse &
 
 ```jsx
 import * as React from "react"
-import { useCreateCart } from "@medusajs/medusa-react"
+import { useCreateCart } from "medusa-react"
 
 const CreateCartButton = () => {
   const createCart = useCreateCart()

packages/medusa-react/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.5",
+  "version": "0.2.0",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -80,8 +80,8 @@
     "typescript": "^4.5.2"
   },
   "dependencies": {
-    "@medusajs/medusa": "^1.1.64",
-    "@medusajs/medusa-js": "^1.0.12",
+    "@medusajs/medusa": "^1.2.0",
+    "@medusajs/medusa-js": "^1.1.0",
     "lodash": "^4.17.21",
     "lodash-es": "^4.17.21",
     "react-query": "^3.31.0"

packages/medusa-source-shopify/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.1.0](https://github.com/medusajs/medusa/compare/medusa-source-shopify@1.0.5...medusa-source-shopify@1.1.0) (2022-02-25)
+
+**Note:** Version bump only for package medusa-source-shopify
+
+
+
+
+
 ## [1.0.5](https://github.com/medusajs/medusa/compare/medusa-source-shopify@1.0.4...medusa-source-shopify@1.0.5) (2022-02-06)
 
 ### Bug Fixes

packages/medusa-source-shopify/package.json

@@ -1,6 +1,6 @@
 {
   "name": "medusa-source-shopify",
-  "version": "1.0.5",
+  "version": "1.1.0",
   "description": "Source plugin that allows users to import products from a Shopify store",
   "main": "index.js",
   "repository": {
@@ -29,7 +29,7 @@
     "ioredis": "^4.27.9",
     "lodash": "^4.17.21",
     "medusa-core-utils": "^1.1.31",
-    "medusa-interfaces": "^1.1.34",
+    "medusa-interfaces": "^1.2.0",
     "medusa-test-utils": "^1.1.37"
   },
   "devDependencies": {

packages/medusa/CHANGELOG.md

@@ -3,6 +3,31 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.2.0](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.64...@medusajs/medusa@1.2.0) (2022-02-25)
+
+
+### Bug Fixes
+
+* allow offset and limit in products free text search ([#1082](https://github.com/medusajs/medusa/issues/1082)) ([c2241d1](https://github.com/medusajs/medusa/commit/c2241d110178d9ed992793d582ef652c4a23b729))
+* export params type ([4ee2af2](https://github.com/medusajs/medusa/commit/4ee2af2582d6c6420e7faf238447b77499e5d32d))
+* export request types from add and remove product endpoints ([#1078](https://github.com/medusajs/medusa/issues/1078)) ([449e666](https://github.com/medusajs/medusa/commit/449e6664283edc2bce42b97b9d52def1841a9a18))
+* unit test case for `CustomerGroupServiceMock.retrieve` ([def8763](https://github.com/medusajs/medusa/commit/def8763ee203c60728815ef3d36e57b5533b97c8))
+* variant price update ([#1093](https://github.com/medusajs/medusa/issues/1093)) ([cb7b211](https://github.com/medusajs/medusa/commit/cb7b211c9bb3188ecf072fa1734055a4ddfe7f86))
+
+
+### Features
+
+* add `extend` param for customer groups ([ecd6ed8](https://github.com/medusajs/medusa/commit/ecd6ed820e77904fe59ff6fcc9195533968dd9f3))
+* add and remove products to/from collection in bulk endpoints ([#1032](https://github.com/medusajs/medusa/issues/1032)) ([6629403](https://github.com/medusajs/medusa/commit/66294038f0ccf0b81bcf099b590379acffb647ba))
+* customer group update ([#1098](https://github.com/medusajs/medusa/issues/1098)) ([694e2df](https://github.com/medusajs/medusa/commit/694e2df20f8c1b125c51f7d24b1e3abdc4b3cff6))
+* GET customer group endpoint ([21d99a4](https://github.com/medusajs/medusa/commit/21d99a44a9fb2bd0f52c8bc8b5c75d200ef6d539))
+* new tax api ([#979](https://github.com/medusajs/medusa/issues/979)) ([c56660f](https://github.com/medusajs/medusa/commit/c56660fca9921a3f3637bc137d9794781c5b090f)), closes [#885](https://github.com/medusajs/medusa/issues/885) [#896](https://github.com/medusajs/medusa/issues/896) [#911](https://github.com/medusajs/medusa/issues/911) [#945](https://github.com/medusajs/medusa/issues/945) [#950](https://github.com/medusajs/medusa/issues/950) [#951](https://github.com/medusajs/medusa/issues/951) [#954](https://github.com/medusajs/medusa/issues/954) [#969](https://github.com/medusajs/medusa/issues/969) [#998](https://github.com/medusajs/medusa/issues/998) [#1017](https://github.com/medusajs/medusa/issues/1017) [#1110](https://github.com/medusajs/medusa/issues/1110)
+* update customer groups ([#1075](https://github.com/medusajs/medusa/issues/1075)) ([75fb2ce](https://github.com/medusajs/medusa/commit/75fb2ce9c3a206a9d43cdbd80a356d9ba4d28f3f))
+
+
+
+
+
 ## [1.1.64](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.63...@medusajs/medusa@1.1.64) (2022-02-06)
 
 ### Bug Fixes

packages/medusa/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/medusa",
-  "version": "1.1.64",
+  "version": "1.2.0",
   "description": "E-commerce for JAMstack",
   "main": "dist/index.js",
   "bin": {
@@ -27,7 +27,7 @@
     "cross-env": "^5.2.1",
     "eslint": "^7.32.0",
     "jest": "^25.5.2",
-    "medusa-interfaces": "^1.1.34",
+    "medusa-interfaces": "^1.2.0",
     "nodemon": "^2.0.1",
     "prettier": "^1.19.1",
     "sqlite3": "^5.0.2",
@@ -49,7 +49,7 @@
   },
   "dependencies": {
     "@hapi/joi": "^16.1.8",
-    "@medusajs/medusa-cli": "^1.1.27",
+    "@medusajs/medusa-cli": "^1.2.0",
     "@types/lodash": "^4.14.168",
     "awilix": "^4.2.3",
     "body-parser": "^1.19.0",

www/docs/sidebars.js

@@ -105,6 +105,18 @@ module.exports = {
           label: "Medusa Server",
           collapsed: true,
           items: [
+            {
+              type: "category",
+              label: 'Endpoints',
+              collapsed: true,
+              items: [
+                {
+                  type: "doc",
+                  id: "advanced/backend/endpoints/add-storefront",
+                  label: "Add Endpoint for Storefront"
+                },
+              ]
+            },
             {
               type: "doc",
               id: "tutorial/adding-custom-functionality",