Fix merge conflicts

.changeset/config.json

@@ -7,7 +7,7 @@
   "access": "public",
   "baseBranch": "master",
   "updateInternalDependencies": "patch",
-  "ignore": [],
+  "ignore": ["integration-tests-api", "integration-tests-plugins"],
   "snapshot": {
     "useCalculatedVersion": true
   }

.changeset/honest-guests-wash.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+feat(nested-categories): Introduces a model and migration to create category table that can be nested

.changeset/light-cars-smile.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+Make orders queryable by customer fields

.changeset/mighty-cups-cheer.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+chore: refactor payment collection setPaymentSession

.changeset/pretty-flies-juggle.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+Include optional `external_id` property for CreateProductInput type

.changeset/quiet-lobsters-search.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+fix(medusa): Add tax inclusive flag to return lines from line item

.changeset/real-ways-jog.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+OAS update

.changeset/twelve-bears-try.md

@@ -0,0 +1,7 @@
+---
+"@medusajs/medusa": patch
+"@medusajs/medusa-js": patch
+"@medusajs/stock-location": major
+---
+
+Stock locations module added

.changeset/wise-mangos-design.md

@@ -0,0 +1,8 @@
+---
+"@medusajs/medusa": patch
+---
+
+Add services: 
+- `sales-channel-inventory`
+- `sales-channel-location`
+- `product-variant-inventory`

.eslintignore

@@ -8,8 +8,6 @@ packages/*
 # List of packages to Lint
 !packages/medusa
 
-integration-tests/*
-#!integration-tests/api
 
 
 **/models/*
@@ -18,6 +16,5 @@ integration-tests/*
 **/node_modules/*
 **/migrations/*
 **/__mocks__/*
-**/__tests__/*
 
 .eslintrc.js

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,11 @@
 blank_issues_enabled: false
 contact_links:
+  - name: Feature Request
+    url: https://github.com/medusajs/medusa/discussions/categories/feature-requests
+    about: Use GitHub Discussions to open a feature request.
   - name: Ask a question
     url: https://discord.gg/medusajs
     about: Join our community to ask questions and participate in discussions
   - name: Want to work with us?
     url: mailto:hello@medusajs.com?subject=[GitHub]%20Working%20with%20Medusa
-    about: Interested in working with Medusa? Get in touch!
+    about: Interested in working with Medusa? Get in touch!

.github/workflows/action.yml

@@ -123,28 +123,8 @@ jobs:
       - name: Build Packages
         run: yarn build
 
-      - name: Install dev cli
-        run: sudo npm i -g medusa-dev-cli@latest
-
-      - name: Set path to medusa repo
-        run: medusa-dev --set-path-to-repo `pwd`
-
-      - name: Set npm registry
-        run: |
-          yarn config set npmRegistryServer http://localhost:4873
-          echo -e 'unsafeHttpWhitelist:\n - "localhost"' >> .yarnrc.yml
-
-      - name: Force install
-        run: medusa-dev --force-install --external-registry
-        working-directory: integration-tests/api
-
-      - name: Build integration tests
-        run: yarn build
-        working-directory: integration-tests/api
-
       - name: Run integration tests
-        run: yarn test
-        working-directory: integration-tests/api
+        run: yarn test:integration:api
         env:
           DB_PASSWORD: postgres
           SPLIT: ${{ steps['split-tests'].outputs['split'] }}
@@ -195,26 +175,7 @@ jobs:
       - name: Build Packages
         run: yarn build
 
-      - name: Install dev cli
-        run: sudo npm i -g medusa-dev-cli
-
-      - name: Set path to medusa repo
-        run: medusa-dev --set-path-to-repo `pwd`
-
-      - name: Set npm registry
-        run: |
-          yarn config set npmRegistryServer http://localhost:4873
-          echo -e 'unsafeHttpWhitelist:\n - "localhost"' >> .yarnrc.yml
-
-      - name: Force install
-        run: medusa-dev --force-install --external-registry
-        working-directory: integration-tests/plugins
-
-      - name: Build plugin integration tests
-        run: yarn build
-        working-directory: integration-tests/plugins
-
       - name: Run plugin integration tests
-        run: yarn test:integration:plugins --silent=false
+        run: yarn test:integration:plugins
         env:
           DB_PASSWORD: postgres

.github/workflows/docs-test.yml

@@ -63,4 +63,25 @@ jobs:
           fail_on_error: true
           vale_flags: '--minAlertLevel=error'
         env:
-          GITHUB_TOKEN: ${{ github.token }}
+          GITHUB_TOKEN: ${{ github.token }}
+
+  eslint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.9.1
+        with:
+          access_token: ${{ github.token }}
+
+      - name: Checkout
+        uses: actions/checkout@v2.3.5
+        with:
+          fetch-depth: 0
+
+      - name: Install dependencies
+        uses: ./.github/actions/cache-deps
+        with:
+          extension: eslint-docs
+
+      - name: Run Eslint
+        run: yarn lint:docs

.github/workflows/generate-api-reference.yml

@@ -1,5 +1,12 @@
 name: Generate API Reference
 on: 
+  push:
+    branches:
+      - "master"
+    paths:
+      - packages/medusa/src/api/routes/**
+      - '!packages/medusa/src/api/routes/**/index.ts'
+      - '!packages/medusa/src/api/routes/**/index.js'
   pull_request:
     types:
       - closed

.github/workflows/staging-release.yml

@@ -42,13 +42,13 @@ jobs:
       - name: Build all packages
         run: yarn build
 
-      - name: Version staging packages
-        run: yarn version:staging
+      - name: Version packages
+        run: yarn version:next
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install Dependencies
         run: yarn install --no-immutable
 
-      - name: Publish staging packages
-        run: yarn release:staging
+      - name: Publish packages under next tag
+        run: yarn release:next

.github/workflows/trigger-staging-release.yml

@@ -15,4 +15,4 @@ jobs:
           -H "Authorization: Bearer ${{secrets.STAGING_ACCESS_TOKEN}}" \
           -H "Accept: application/vnd.github.v3+json" \
           https://api.github.com/repos/@medusajs/medusa-staging/actions/workflows/deploy.yml/dispatches \
-          -d '{"ref":"main"}'
+          -d '{"ref":"main"}'

README.md

@@ -55,24 +55,7 @@ You can learn about all of the ecommerce features that Medusa provides [in our d
 
 ## Roadmap
 
-Write-ups for all features will be made available in [Github discussions](https://github.com/medusajs/medusa/discussions) before starting the implementation process.
-
-### **2022**
-
-- [x]  Admin revamp
-- [x]  Tax API
-- [x]  Tax Calculation Strategy
-- [x]  Cart Calculation Strategy
-- [x]  Customer Groups API
-- [x]  Promotions API
-- [x]  Price Lists API
-- [x]  Price Selection Strategy
-- [x]  Import / Export API
-- [x]  Sales Channel API
-- [ ]  Extended Order API (managing placed orders)
-- [ ]  PaymentCollection API (collecting payments separate from carts and draft orders)
-- [ ]  Multi-warehouse API
-- [ ]  Extended Product API (custom fields, publishing control, and more)
+You can view our roadmap with features that are planned, started, and completed on the [Roadmap discussion](https://github.com/medusajs/medusa/discussions/categories/roadmap) category.
 
 ## Plugins