From 2982a8e682e90beb4549d969d9d3b04d78a46a2d Mon Sep 17 00:00:00 2001 From: Sebastian Rindom Date: Tue, 13 Apr 2021 12:16:40 +0200 Subject: [PATCH] fix: merge develop --- packages/medusa-file-spaces/package.json | 4 ---- packages/medusa-fulfillment-webshipper/CHANGELOG.md | 6 ------ packages/medusa-payment-adyen/CHANGELOG.md | 4 ---- packages/medusa-payment-klarna/CHANGELOG.md | 4 ---- packages/medusa-payment-klarna/package.json | 4 ---- packages/medusa-plugin-add-ons/CHANGELOG.md | 4 ---- packages/medusa-plugin-brightpearl/CHANGELOG.md | 6 ------ packages/medusa-plugin-contentful/CHANGELOG.md | 4 ---- packages/medusa-plugin-contentful/package.json | 4 ---- packages/medusa-plugin-economic/CHANGELOG.md | 4 ---- packages/medusa-plugin-economic/package.json | 4 ---- packages/medusa-plugin-mailchimp/CHANGELOG.md | 4 ---- packages/medusa-plugin-mailchimp/package.json | 4 ---- packages/medusa-plugin-permissions/CHANGELOG.md | 4 ---- packages/medusa-plugin-permissions/package.json | 4 ---- packages/medusa-plugin-twilio-sms/CHANGELOG.md | 4 ---- packages/medusa-plugin-twilio-sms/package.json | 4 ---- packages/medusa-plugin-wishlist/CHANGELOG.md | 4 ---- packages/medusa-plugin-wishlist/package.json | 4 ---- 19 files changed, 80 deletions(-) diff --git a/packages/medusa-file-spaces/package.json b/packages/medusa-file-spaces/package.json index 92d4ccf257..df702ccf24 100644 --- a/packages/medusa-file-spaces/package.json +++ b/packages/medusa-file-spaces/package.json @@ -40,11 +40,7 @@ "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" }, diff --git a/packages/medusa-fulfillment-webshipper/CHANGELOG.md b/packages/medusa-fulfillment-webshipper/CHANGELOG.md index 8c20b49d8d..b9a890d642 100644 --- a/packages/medusa-fulfillment-webshipper/CHANGELOG.md +++ b/packages/medusa-fulfillment-webshipper/CHANGELOG.md @@ -3,7 +3,6 @@ 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) @@ -15,11 +14,6 @@ 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 diff --git a/packages/medusa-payment-adyen/CHANGELOG.md b/packages/medusa-payment-adyen/CHANGELOG.md index ecdb29651c..9201e93e17 100644 --- a/packages/medusa-payment-adyen/CHANGELOG.md +++ b/packages/medusa-payment-adyen/CHANGELOG.md @@ -3,11 +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-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 diff --git a/packages/medusa-payment-klarna/CHANGELOG.md b/packages/medusa-payment-klarna/CHANGELOG.md index 52a7900dd6..b2108f3cbd 100644 --- a/packages/medusa-payment-klarna/CHANGELOG.md +++ b/packages/medusa-payment-klarna/CHANGELOG.md @@ -3,11 +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.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 diff --git a/packages/medusa-payment-klarna/package.json b/packages/medusa-payment-klarna/package.json index f562ef5d51..550588f05c 100644 --- a/packages/medusa-payment-klarna/package.json +++ b/packages/medusa-payment-klarna/package.json @@ -40,11 +40,7 @@ "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" diff --git a/packages/medusa-plugin-add-ons/CHANGELOG.md b/packages/medusa-plugin-add-ons/CHANGELOG.md index bced82ef1f..dfcb18bd61 100644 --- a/packages/medusa-plugin-add-ons/CHANGELOG.md +++ b/packages/medusa-plugin-add-ons/CHANGELOG.md @@ -3,11 +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-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 diff --git a/packages/medusa-plugin-brightpearl/CHANGELOG.md b/packages/medusa-plugin-brightpearl/CHANGELOG.md index 3068ed44b6..23f61b66fa 100644 --- a/packages/medusa-plugin-brightpearl/CHANGELOG.md +++ b/packages/medusa-plugin-brightpearl/CHANGELOG.md @@ -3,7 +3,6 @@ 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) @@ -11,11 +10,6 @@ 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 diff --git a/packages/medusa-plugin-contentful/CHANGELOG.md b/packages/medusa-plugin-contentful/CHANGELOG.md index 1e63d4f313..75af02fe85 100644 --- a/packages/medusa-plugin-contentful/CHANGELOG.md +++ b/packages/medusa-plugin-contentful/CHANGELOG.md @@ -3,11 +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.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 diff --git a/packages/medusa-plugin-contentful/package.json b/packages/medusa-plugin-contentful/package.json index 32b933e1b1..aa41990466 100644 --- a/packages/medusa-plugin-contentful/package.json +++ b/packages/medusa-plugin-contentful/package.json @@ -39,11 +39,7 @@ "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" }, diff --git a/packages/medusa-plugin-economic/CHANGELOG.md b/packages/medusa-plugin-economic/CHANGELOG.md index 9419f8461c..064422739a 100644 --- a/packages/medusa-plugin-economic/CHANGELOG.md +++ b/packages/medusa-plugin-economic/CHANGELOG.md @@ -3,11 +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-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 diff --git a/packages/medusa-plugin-economic/package.json b/packages/medusa-plugin-economic/package.json index 248dba6dac..6b8387d274 100644 --- a/packages/medusa-plugin-economic/package.json +++ b/packages/medusa-plugin-economic/package.json @@ -39,11 +39,7 @@ "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" }, diff --git a/packages/medusa-plugin-mailchimp/CHANGELOG.md b/packages/medusa-plugin-mailchimp/CHANGELOG.md index 46da8f468b..0653dce99c 100644 --- a/packages/medusa-plugin-mailchimp/CHANGELOG.md +++ b/packages/medusa-plugin-mailchimp/CHANGELOG.md @@ -3,11 +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-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 diff --git a/packages/medusa-plugin-mailchimp/package.json b/packages/medusa-plugin-mailchimp/package.json index 1b5ec03922..a65d24cf4b 100644 --- a/packages/medusa-plugin-mailchimp/package.json +++ b/packages/medusa-plugin-mailchimp/package.json @@ -40,11 +40,7 @@ "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" diff --git a/packages/medusa-plugin-permissions/CHANGELOG.md b/packages/medusa-plugin-permissions/CHANGELOG.md index dd278c481f..b963ca7571 100644 --- a/packages/medusa-plugin-permissions/CHANGELOG.md +++ b/packages/medusa-plugin-permissions/CHANGELOG.md @@ -3,11 +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-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 diff --git a/packages/medusa-plugin-permissions/package.json b/packages/medusa-plugin-permissions/package.json index be8c94df44..16d27de37b 100644 --- a/packages/medusa-plugin-permissions/package.json +++ b/packages/medusa-plugin-permissions/package.json @@ -32,11 +32,7 @@ "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" }, diff --git a/packages/medusa-plugin-twilio-sms/CHANGELOG.md b/packages/medusa-plugin-twilio-sms/CHANGELOG.md index e7c431ca44..cc75affd55 100644 --- a/packages/medusa-plugin-twilio-sms/CHANGELOG.md +++ b/packages/medusa-plugin-twilio-sms/CHANGELOG.md @@ -3,11 +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-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 diff --git a/packages/medusa-plugin-twilio-sms/package.json b/packages/medusa-plugin-twilio-sms/package.json index 21185302fd..d32a43f957 100644 --- a/packages/medusa-plugin-twilio-sms/package.json +++ b/packages/medusa-plugin-twilio-sms/package.json @@ -35,11 +35,7 @@ "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" }, diff --git a/packages/medusa-plugin-wishlist/CHANGELOG.md b/packages/medusa-plugin-wishlist/CHANGELOG.md index 844530a0c2..b11205a80e 100644 --- a/packages/medusa-plugin-wishlist/CHANGELOG.md +++ b/packages/medusa-plugin-wishlist/CHANGELOG.md @@ -3,11 +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-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 diff --git a/packages/medusa-plugin-wishlist/package.json b/packages/medusa-plugin-wishlist/package.json index 853dd8e94d..a94755659d 100644 --- a/packages/medusa-plugin-wishlist/package.json +++ b/packages/medusa-plugin-wishlist/package.json @@ -37,11 +37,7 @@ "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"