fix: merge develop

2021-04-13 12:13:32 +02:00
parent 0e51dbdfed e9ff9f47ae
commit a468c451e8
37 changed files with 121 additions and 17 deletions
--- a/packages/medusa-core-utils/CHANGELOG.md
+++ b/packages/medusa-core-utils/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.5](https://github.com/medusajs/medusa/compare/medusa-core-utils@1.1.4...medusa-core-utils@1.1.5) (2021-04-09)
+
+**Note:** Version bump only for package medusa-core-utils
+
+
+
+
+
 ## [1.1.4](https://github.com/medusajs/medusa/compare/medusa-core-utils@1.1.3...medusa-core-utils@1.1.4) (2021-03-30)


--- a/packages/medusa-core-utils/package.json
+++ b/packages/medusa-core-utils/package.json
@@ -1,6 +1,6 @@
 {
  "name": "medusa-core-utils",
-  "version": "1.1.4",
+  "version": "1.1.5",
  "description": "Core utils for Medusa",
  "main": "dist/index.js",
  "repository": {
--- a/packages/medusa-file-spaces/package.json
+++ b/packages/medusa-file-spaces/package.json
@@ -40,7 +40,11 @@
    "aws-sdk": "^2.710.0",
    "body-parser": "^1.19.0",
    "express": "^4.17.1",
+<<<<<<< HEAD
    "medusa-core-utils": "^1.1.4",
+=======
+    "medusa-core-utils": "^1.1.5",
+>>>>>>> origin/develop
    "medusa-test-utils": "^1.1.8",
    "stripe": "^8.50.0"
  },
--- a/packages/medusa-fulfillment-manual/CHANGELOG.md
+++ b/packages/medusa-fulfillment-manual/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.5](https://github.com/medusajs/medusa/compare/medusa-fulfillment-manual@1.1.4...medusa-fulfillment-manual@1.1.5) (2021-04-09)
+
+**Note:** Version bump only for package medusa-fulfillment-manual
+
+
+
+
+
 ## [1.1.4](https://github.com/medusajs/medusa/compare/medusa-fulfillment-manual@1.1.3...medusa-fulfillment-manual@1.1.4) (2021-03-30)

 **Note:** Version bump only for package medusa-fulfillment-manual
--- a/packages/medusa-fulfillment-manual/package.json
+++ b/packages/medusa-fulfillment-manual/package.json
@@ -1,6 +1,6 @@
 {
  "name": "medusa-fulfillment-manual",
-  "version": "1.1.4",
+  "version": "1.1.5",
  "description": "A manual fulfillment provider for Medusa",
  "main": "index.js",
  "repository": {
@@ -36,7 +36,7 @@
    "@babel/plugin-transform-instanceof": "^7.8.3",
    "@babel/runtime": "^7.7.6",
    "express": "^4.17.1",
-    "medusa-core-utils": "^1.1.4"
+    "medusa-core-utils": "^1.1.5"
  },
  "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"
 }
--- a/packages/medusa-fulfillment-webshipper/CHANGELOG.md
+++ b/packages/medusa-fulfillment-webshipper/CHANGELOG.md
@@ -3,6 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+<<<<<<< HEAD
 ## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-fulfillment-webshipper@1.1.7...medusa-fulfillment-webshipper@1.1.8) (2021-04-13)


@@ -14,6 +15,11 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 ### Features

 * adds support for certificate of origin ([f21dae8](https://github.com/medusajs/medusa/commit/f21dae827ad64522fd1f4d6317740c6b0ded0536))
+=======
+## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-fulfillment-webshipper@1.1.7...medusa-fulfillment-webshipper@1.1.8) (2021-04-09)
+
+**Note:** Version bump only for package medusa-fulfillment-webshipper
+>>>>>>> origin/develop



--- a/packages/medusa-fulfillment-webshipper/package.json
+++ b/packages/medusa-fulfillment-webshipper/package.json
@@ -37,7 +37,7 @@
    "body-parser": "^1.19.0",
    "cors": "^2.8.5",
    "express": "^4.17.1",
-    "medusa-core-utils": "^1.1.4"
+    "medusa-core-utils": "^1.1.5"
  },
  "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"
 }
--- a/packages/medusa-interfaces/CHANGELOG.md
+++ b/packages/medusa-interfaces/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.6](https://github.com/medusajs/medusa/compare/medusa-interfaces@1.1.5...medusa-interfaces@1.1.6) (2021-04-09)
+
+**Note:** Version bump only for package medusa-interfaces
+
+
+
+
+
 ## [1.1.5](https://github.com/medusajs/medusa/compare/medusa-interfaces@1.1.4...medusa-interfaces@1.1.5) (2021-03-30)

 **Note:** Version bump only for package medusa-interfaces
--- a/packages/medusa-interfaces/package.json
+++ b/packages/medusa-interfaces/package.json
@@ -1,6 +1,6 @@
 {
  "name": "medusa-interfaces",
-  "version": "1.1.5",
+  "version": "1.1.6",
  "description": "Core interfaces for Medusa",
  "main": "dist/index.js",
  "repository": {
@@ -35,7 +35,7 @@
    "typeorm": "0.x"
  },
  "dependencies": {
-    "medusa-core-utils": "^1.1.4"
+    "medusa-core-utils": "^1.1.5"
  },
  "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"
 }
--- a/packages/medusa-payment-adyen/CHANGELOG.md
+++ b/packages/medusa-payment-adyen/CHANGELOG.md
@@ -3,7 +3,11 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+<<<<<<< HEAD
 ## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-payment-adyen@1.1.7...medusa-payment-adyen@1.1.8) (2021-04-13)
+=======
+## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-payment-adyen@1.1.7...medusa-payment-adyen@1.1.8) (2021-04-09)
+>>>>>>> origin/develop

 **Note:** Version bump only for package medusa-payment-adyen

--- a/packages/medusa-payment-adyen/package.json
+++ b/packages/medusa-payment-adyen/package.json
@@ -42,7 +42,7 @@
    "body-parser": "^1.19.0",
    "cors": "^2.8.5",
    "express": "^4.17.1",
-    "medusa-core-utils": "^1.1.4"
+    "medusa-core-utils": "^1.1.5"
  },
  "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"
 }
--- a/packages/medusa-payment-klarna/CHANGELOG.md
+++ b/packages/medusa-payment-klarna/CHANGELOG.md
@@ -3,7 +3,11 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+<<<<<<< HEAD
 ## [1.1.9](https://github.com/medusajs/medusa/compare/medusa-payment-klarna@1.1.8...medusa-payment-klarna@1.1.9) (2021-04-13)
+=======
+## [1.1.9](https://github.com/medusajs/medusa/compare/medusa-payment-klarna@1.1.8...medusa-payment-klarna@1.1.9) (2021-04-09)
+>>>>>>> origin/develop


 ### Bug Fixes
--- a/packages/medusa-payment-klarna/package.json
+++ b/packages/medusa-payment-klarna/package.json
@@ -40,7 +40,11 @@
    "axios": "^0.21.0",
    "body-parser": "^1.19.0",
    "express": "^4.17.1",
+<<<<<<< HEAD
    "medusa-core-utils": "^1.1.4",
+=======
+    "medusa-core-utils": "^1.1.5",
+>>>>>>> origin/develop
    "medusa-test-utils": "^1.1.8"
  },
  "gitHead": "d78a7ce85876e0bfd9a4bfebe4f5743921961e9c"
--- a/packages/medusa-payment-paypal/package.json
+++ b/packages/medusa-payment-paypal/package.json
@@ -41,7 +41,7 @@
    "@paypal/checkout-server-sdk": "^1.0.2",
    "body-parser": "^1.19.0",
    "express": "^4.17.1",
-    "medusa-core-utils": "^1.1.4"
+    "medusa-core-utils": "^1.1.5"
  },
  "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"
 }
--- a/packages/medusa-payment-stripe/package.json
+++ b/packages/medusa-payment-stripe/package.json
@@ -40,7 +40,7 @@
  "dependencies": {
    "body-parser": "^1.19.0",
    "express": "^4.17.1",
-    "medusa-core-utils": "^1.1.4",
+    "medusa-core-utils": "^1.1.5",
    "stripe": "^8.50.0"
  },
  "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"
--- a/packages/medusa-plugin-add-ons/CHANGELOG.md
+++ b/packages/medusa-plugin-add-ons/CHANGELOG.md
@@ -3,7 +3,11 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+<<<<<<< HEAD
 ## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-add-ons@1.1.7...medusa-plugin-add-ons@1.1.8) (2021-04-13)
+=======
+## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-add-ons@1.1.7...medusa-plugin-add-ons@1.1.8) (2021-04-09)
+>>>>>>> origin/develop

 **Note:** Version bump only for package medusa-plugin-add-ons

--- a/packages/medusa-plugin-add-ons/package.json
+++ b/packages/medusa-plugin-add-ons/package.json
@@ -37,7 +37,7 @@
    "body-parser": "^1.19.0",
    "cors": "^2.8.5",
    "express": "^4.17.1",
-    "medusa-core-utils": "^1.1.4",
+    "medusa-core-utils": "^1.1.5",
    "redis": "^3.0.2"
  },
  "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"
--- a/packages/medusa-plugin-brightpearl/CHANGELOG.md
+++ b/packages/medusa-plugin-brightpearl/CHANGELOG.md
@@ -3,6 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+<<<<<<< HEAD
 ## [1.1.11](https://github.com/medusajs/medusa/compare/medusa-plugin-brightpearl@1.1.10...medusa-plugin-brightpearl@1.1.11) (2021-04-13)


@@ -10,6 +11,11 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline

 * bp swaps ([e105d4e](https://github.com/medusajs/medusa/commit/e105d4edde5793f40e867291606b3db5e44dc24f))
 * typo ([37ab52b](https://github.com/medusajs/medusa/commit/37ab52b19514fb1dfd864f0c218efd7ad205ff30))
+=======
+## [1.1.11](https://github.com/medusajs/medusa/compare/medusa-plugin-brightpearl@1.1.10...medusa-plugin-brightpearl@1.1.11) (2021-04-09)
+
+**Note:** Version bump only for package medusa-plugin-brightpearl
+>>>>>>> origin/develop



--- a/packages/medusa-plugin-brightpearl/package.json
+++ b/packages/medusa-plugin-brightpearl/package.json
@@ -43,7 +43,7 @@
    "axios": "^0.19.2",
    "axios-rate-limit": "^1.2.1",
    "express": "^4.17.1",
-    "medusa-core-utils": "^1.1.4",
+    "medusa-core-utils": "^1.1.5",
    "randomatic": "^3.1.1"
  },
  "gitHead": "d78a7ce85876e0bfd9a4bfebe4f5743921961e9c"
--- a/packages/medusa-plugin-contentful/CHANGELOG.md
+++ b/packages/medusa-plugin-contentful/CHANGELOG.md
@@ -3,7 +3,11 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+<<<<<<< HEAD
 ## [1.1.9](https://github.com/medusajs/medusa/compare/medusa-plugin-contentful@1.1.8...medusa-plugin-contentful@1.1.9) (2021-04-13)
+=======
+## [1.1.9](https://github.com/medusajs/medusa/compare/medusa-plugin-contentful@1.1.8...medusa-plugin-contentful@1.1.9) (2021-04-09)
+>>>>>>> origin/develop


 ### Bug Fixes
--- a/packages/medusa-plugin-contentful/package.json
+++ b/packages/medusa-plugin-contentful/package.json
@@ -39,7 +39,11 @@
    "body-parser": "^1.19.0",
    "contentful-management": "^5.27.1",
    "express": "^4.17.1",
+<<<<<<< HEAD
    "medusa-core-utils": "^1.1.4",
+=======
+    "medusa-core-utils": "^1.1.5",
+>>>>>>> origin/develop
    "medusa-test-utils": "^1.1.8",
    "redis": "^3.0.2"
  },
--- a/packages/medusa-plugin-economic/CHANGELOG.md
+++ b/packages/medusa-plugin-economic/CHANGELOG.md
@@ -3,7 +3,11 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+<<<<<<< HEAD
 ## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-economic@1.1.7...medusa-plugin-economic@1.1.8) (2021-04-13)
+=======
+## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-economic@1.1.7...medusa-plugin-economic@1.1.8) (2021-04-09)
+>>>>>>> origin/develop

 **Note:** Version bump only for package medusa-plugin-economic

--- a/packages/medusa-plugin-economic/package.json
+++ b/packages/medusa-plugin-economic/package.json
@@ -39,7 +39,11 @@
    "axios": "^0.19.2",
    "body-parser": "^1.19.0",
    "express": "^4.17.1",
+<<<<<<< HEAD
    "medusa-core-utils": "^1.1.4",
+=======
+    "medusa-core-utils": "^1.1.5",
+>>>>>>> origin/develop
    "medusa-test-utils": "^1.1.8",
    "moment": "^2.27.0"
  },
--- a/packages/medusa-plugin-mailchimp/CHANGELOG.md
+++ b/packages/medusa-plugin-mailchimp/CHANGELOG.md
@@ -3,7 +3,11 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+<<<<<<< HEAD
 ## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-mailchimp@1.1.7...medusa-plugin-mailchimp@1.1.8) (2021-04-13)
+=======
+## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-mailchimp@1.1.7...medusa-plugin-mailchimp@1.1.8) (2021-04-09)
+>>>>>>> origin/develop

 **Note:** Version bump only for package medusa-plugin-mailchimp

--- a/packages/medusa-plugin-mailchimp/package.json
+++ b/packages/medusa-plugin-mailchimp/package.json
@@ -40,7 +40,11 @@
    "cors": "^2.8.5",
    "express": "^4.17.1",
    "mailchimp-api-v3": "^1.14.0",
+<<<<<<< HEAD
    "medusa-core-utils": "^1.1.4",
+=======
+    "medusa-core-utils": "^1.1.5",
+>>>>>>> origin/develop
    "medusa-test-utils": "^1.1.8"
  },
  "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"
--- a/packages/medusa-plugin-permissions/CHANGELOG.md
+++ b/packages/medusa-plugin-permissions/CHANGELOG.md
@@ -3,7 +3,11 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+<<<<<<< HEAD
 ## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-permissions@1.1.7...medusa-plugin-permissions@1.1.8) (2021-04-13)
+=======
+## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-permissions@1.1.7...medusa-plugin-permissions@1.1.8) (2021-04-09)
+>>>>>>> origin/develop

 **Note:** Version bump only for package medusa-plugin-permissions

--- a/packages/medusa-plugin-permissions/package.json
+++ b/packages/medusa-plugin-permissions/package.json
@@ -32,7 +32,11 @@
    "medusa-interfaces": "1.x"
  },
  "dependencies": {
+<<<<<<< HEAD
    "medusa-core-utils": "^1.1.4",
+=======
+    "medusa-core-utils": "^1.1.5",
+>>>>>>> origin/develop
    "medusa-test-utils": "^1.1.8",
    "mongoose": "^5.8.0"
  },
--- a/packages/medusa-plugin-segment/package.json
+++ b/packages/medusa-plugin-segment/package.json
@@ -39,7 +39,7 @@
    "axios": "^0.19.2",
    "body-parser": "^1.19.0",
    "express": "^4.17.1",
-    "medusa-core-utils": "^1.1.4",
+    "medusa-core-utils": "^1.1.5",
    "medusa-test-utils": "^1.1.8"
  },
  "gitHead": "0c294b7b3acbc1b873aab7e90a8e596bdac48899"
--- a/packages/medusa-plugin-sendgrid/package.json
+++ b/packages/medusa-plugin-sendgrid/package.json
@@ -39,7 +39,7 @@
    "@sendgrid/mail": "^7.1.1",
    "body-parser": "^1.19.0",
    "express": "^4.17.1",
-    "medusa-core-utils": "^1.1.4",
+    "medusa-core-utils": "^1.1.5",
    "medusa-test-utils": "^1.1.8"
  },
  "gitHead": "d78a7ce85876e0bfd9a4bfebe4f5743921961e9c"
--- a/packages/medusa-plugin-slack-notification/package.json
+++ b/packages/medusa-plugin-slack-notification/package.json
@@ -39,7 +39,7 @@
    "axios": "^0.19.2",
    "body-parser": "^1.19.0",
    "express": "^4.17.1",
-    "medusa-core-utils": "^1.1.4",
+    "medusa-core-utils": "^1.1.5",
    "medusa-test-utils": "^1.1.8",
    "moment": "^2.27.0"
  },
--- a/packages/medusa-plugin-twilio-sms/CHANGELOG.md
+++ b/packages/medusa-plugin-twilio-sms/CHANGELOG.md
@@ -3,7 +3,11 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+<<<<<<< HEAD
 ## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-twilio-sms@1.1.7...medusa-plugin-twilio-sms@1.1.8) (2021-04-13)
+=======
+## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-twilio-sms@1.1.7...medusa-plugin-twilio-sms@1.1.8) (2021-04-09)
+>>>>>>> origin/develop

 **Note:** Version bump only for package medusa-plugin-twilio-sms

--- a/packages/medusa-plugin-twilio-sms/package.json
+++ b/packages/medusa-plugin-twilio-sms/package.json
@@ -35,7 +35,11 @@
  "dependencies": {
    "@babel/plugin-transform-classes": "^7.9.5",
    "body-parser": "^1.19.0",
+<<<<<<< HEAD
    "medusa-core-utils": "^1.1.4",
+=======
+    "medusa-core-utils": "^1.1.5",
+>>>>>>> origin/develop
    "medusa-test-utils": "^1.1.8",
    "twilio": "^3.49.1"
  },
--- a/packages/medusa-plugin-wishlist/CHANGELOG.md
+++ b/packages/medusa-plugin-wishlist/CHANGELOG.md
@@ -3,7 +3,11 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+<<<<<<< HEAD
 ## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-wishlist@1.1.7...medusa-plugin-wishlist@1.1.8) (2021-04-13)
+=======
+## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-wishlist@1.1.7...medusa-plugin-wishlist@1.1.8) (2021-04-09)
+>>>>>>> origin/develop

 **Note:** Version bump only for package medusa-plugin-wishlist

--- a/packages/medusa-plugin-wishlist/package.json
+++ b/packages/medusa-plugin-wishlist/package.json
@@ -37,7 +37,11 @@
  "dependencies": {
    "body-parser": "^1.19.0",
    "express": "^4.17.1",
+<<<<<<< HEAD
    "medusa-core-utils": "^1.1.4",
+=======
+    "medusa-core-utils": "^1.1.5",
+>>>>>>> origin/develop
    "medusa-test-utils": "^1.1.8"
  },
  "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"
--- a/packages/medusa-test-utils/package.json
+++ b/packages/medusa-test-utils/package.json
@@ -29,7 +29,7 @@
  },
  "dependencies": {
    "@babel/plugin-transform-classes": "^7.9.5",
-    "medusa-core-utils": "^1.1.4",
+    "medusa-core-utils": "^1.1.5",
    "randomatic": "^3.1.1"
  },
  "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"
--- a/packages/medusa/CHANGELOG.md
+++ b/packages/medusa/CHANGELOG.md
@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

-## [1.1.18](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.17...@medusajs/medusa@1.1.18) (2021-04-13)
+## [1.1.18](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.17...@medusajs/medusa@1.1.18) (2021-04-09)


 ### Bug Fixes
--- a/packages/medusa/package.json
+++ b/packages/medusa/package.json
@@ -67,7 +67,7 @@
    "joi": "^17.3.0",
    "joi-objectid": "^3.0.1",
    "jsonwebtoken": "^8.5.1",
-    "medusa-core-utils": "^1.1.4",
+    "medusa-core-utils": "^1.1.5",
    "medusa-test-utils": "^1.1.8",
    "morgan": "^1.9.1",
    "multer": "^1.4.2",