Merge branch 'master' into develop

This commit is contained in:
olivermrbl
2021-07-02 16:24:56 +02:00
61 changed files with 372 additions and 92 deletions
@@ -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.10](https://github.com/medusajs/medusa/compare/babel-preset-medusa-package@1.1.9...babel-preset-medusa-package@1.1.10) (2021-07-02)
**Note:** Version bump only for package babel-preset-medusa-package
## [1.1.9](https://github.com/medusajs/medusa/compare/babel-preset-medusa-package@1.1.8...babel-preset-medusa-package@1.1.9) (2021-06-22)
@@ -1,6 +1,6 @@
{
"name": "babel-preset-medusa-package",
"version": "1.1.9",
"version": "1.1.10",
"author": "Sebastian Rindom <sebastian@mrbltech.com>",
"repository": {
"type": "git",
+8
View File
@@ -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.11](https://github.com/medusajs/medusa/compare/@medusajs/medusa-cli@1.1.10...@medusajs/medusa-cli@1.1.11) (2021-07-02)
**Note:** Version bump only for package @medusajs/medusa-cli
## [1.1.10](https://github.com/medusajs/medusa/compare/@medusajs/medusa-cli@1.1.9...@medusajs/medusa-cli@1.1.10) (2021-06-22)
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@medusajs/medusa-cli",
"version": "1.1.10",
"version": "1.1.11",
"description": "Command Line interface for Medusa Commerce",
"main": "dist/index.js",
"bin": {
+8
View File
@@ -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.16](https://github.com/medusajs/medusa/compare/medusa-core-utils@1.1.15...medusa-core-utils@1.1.16) (2021-07-02)
**Note:** Version bump only for package medusa-core-utils
## [1.1.15](https://github.com/medusajs/medusa/compare/medusa-core-utils@1.1.14...medusa-core-utils@1.1.15) (2021-06-22)
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "medusa-core-utils",
"version": "1.1.15",
"version": "1.1.16",
"description": "Core utils for Medusa",
"main": "dist/index.js",
"repository": {
+8
View File
@@ -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.0.15](https://github.com/medusajs/medusa/compare/medusa-dev-cli@0.0.14...medusa-dev-cli@0.0.15) (2021-07-02)
**Note:** Version bump only for package medusa-dev-cli
## [0.0.14](https://github.com/medusajs/medusa/compare/medusa-dev-cli@0.0.13...medusa-dev-cli@0.0.14) (2021-06-22)
+2 -2
View File
@@ -1,7 +1,7 @@
{
"name": "medusa-dev-cli",
"description": "CLI helpers for contributors working on Medusa",
"version": "0.0.14",
"version": "0.0.15",
"author": "Sebastian Rindom <skrindom@gmail.com>",
"bin": {
"medusa-dev": "./dist/index.js"
@@ -24,7 +24,7 @@
"devDependencies": {
"@babel/cli": "^7.12.1",
"@babel/core": "^7.12.3",
"babel-preset-medusa-package": "^1.1.9",
"babel-preset-medusa-package": "^1.1.10",
"cross-env": "^7.0.3"
},
"homepage": "https://github.com/medusajs/medusa/tree/master/packages/medusa-dev-cli#readme",
+8
View File
@@ -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.19](https://github.com/medusajs/medusa/compare/medusa-file-spaces@1.1.18...medusa-file-spaces@1.1.19) (2021-07-02)
**Note:** Version bump only for package medusa-file-spaces
## [1.1.18](https://github.com/medusajs/medusa/compare/medusa-file-spaces@1.1.17...medusa-file-spaces@1.1.18) (2021-06-22)
+3 -3
View File
@@ -1,6 +1,6 @@
{
"name": "medusa-file-spaces",
"version": "1.1.18",
"version": "1.1.19",
"description": "Digital Ocean Spaces file connector for Medusa",
"main": "index.js",
"repository": {
@@ -40,8 +40,8 @@
"aws-sdk": "^2.710.0",
"body-parser": "^1.19.0",
"express": "^4.17.1",
"medusa-core-utils": "^1.1.15",
"medusa-test-utils": "^1.1.18",
"medusa-core-utils": "^1.1.16",
"medusa-test-utils": "^1.1.19",
"stripe": "^8.50.0"
},
"gitHead": "db9d6c0cf55ff60a90415b16bc7582cc4795768f"
@@ -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.16](https://github.com/medusajs/medusa/compare/medusa-fulfillment-manual@1.1.15...medusa-fulfillment-manual@1.1.16) (2021-07-02)
**Note:** Version bump only for package medusa-fulfillment-manual
## [1.1.15](https://github.com/medusajs/medusa/compare/medusa-fulfillment-manual@1.1.14...medusa-fulfillment-manual@1.1.15) (2021-06-22)
@@ -1,6 +1,6 @@
{
"name": "medusa-fulfillment-manual",
"version": "1.1.15",
"version": "1.1.16",
"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.15"
"medusa-core-utils": "^1.1.16"
},
"gitHead": "db9d6c0cf55ff60a90415b16bc7582cc4795768f"
}
@@ -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.20](https://github.com/medusajs/medusa/compare/medusa-fulfillment-webshipper@1.1.19...medusa-fulfillment-webshipper@1.1.20) (2021-07-02)
**Note:** Version bump only for package medusa-fulfillment-webshipper
## [1.1.19](https://github.com/medusajs/medusa/compare/medusa-fulfillment-webshipper@1.1.18...medusa-fulfillment-webshipper@1.1.19) (2021-06-22)
@@ -1,6 +1,6 @@
{
"name": "medusa-fulfillment-webshipper",
"version": "1.1.19",
"version": "1.1.20",
"description": "Webshipper Fulfillment provider for Medusa",
"main": "index.js",
"repository": {
@@ -37,7 +37,7 @@
"body-parser": "^1.19.0",
"cors": "^2.8.5",
"express": "^4.17.1",
"medusa-core-utils": "^1.1.15"
"medusa-core-utils": "^1.1.16"
},
"gitHead": "db9d6c0cf55ff60a90415b16bc7582cc4795768f"
}
+8
View File
@@ -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.17](https://github.com/medusajs/medusa/compare/medusa-interfaces@1.1.16...medusa-interfaces@1.1.17) (2021-07-02)
**Note:** Version bump only for package medusa-interfaces
## [1.1.16](https://github.com/medusajs/medusa/compare/medusa-interfaces@1.1.15...medusa-interfaces@1.1.16) (2021-06-22)
+2 -2
View File
@@ -1,6 +1,6 @@
{
"name": "medusa-interfaces",
"version": "1.1.16",
"version": "1.1.17",
"description": "Core interfaces for Medusa",
"main": "dist/index.js",
"repository": {
@@ -35,7 +35,7 @@
"typeorm": "0.x"
},
"dependencies": {
"medusa-core-utils": "^1.1.15"
"medusa-core-utils": "^1.1.16"
},
"gitHead": "db9d6c0cf55ff60a90415b16bc7582cc4795768f"
}
@@ -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.21](https://github.com/medusajs/medusa/compare/medusa-payment-adyen@1.1.20...medusa-payment-adyen@1.1.21) (2021-07-02)
**Note:** Version bump only for package medusa-payment-adyen
## [1.1.20](https://github.com/medusajs/medusa/compare/medusa-payment-adyen@1.1.19...medusa-payment-adyen@1.1.20) (2021-06-23)
**Note:** Version bump only for package medusa-payment-adyen
+3 -3
View File
@@ -1,6 +1,6 @@
{
"name": "medusa-payment-adyen",
"version": "1.1.20",
"version": "1.1.21",
"description": "Adyen Payment provider for Medusa Commerce",
"main": "index.js",
"repository": {
@@ -24,7 +24,7 @@
"cross-env": "^7.0.2",
"eslint": "^6.8.0",
"jest": "^25.5.2",
"medusa-test-utils": "^1.1.18"
"medusa-test-utils": "^1.1.19"
},
"scripts": {
"build": "babel src -d .",
@@ -42,7 +42,7 @@
"body-parser": "^1.19.0",
"cors": "^2.8.5",
"express": "^4.17.1",
"medusa-core-utils": "^1.1.15"
"medusa-core-utils": "^1.1.16"
},
"gitHead": "db9d6c0cf55ff60a90415b16bc7582cc4795768f"
}
@@ -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.21](https://github.com/medusajs/medusa/compare/medusa-payment-klarna@1.1.20...medusa-payment-klarna@1.1.21) (2021-07-02)
**Note:** Version bump only for package medusa-payment-klarna
## [1.1.20](https://github.com/medusajs/medusa/compare/medusa-payment-klarna@1.1.18...medusa-payment-klarna@1.1.20) (2021-06-22)
+3 -3
View File
@@ -1,6 +1,6 @@
{
"name": "medusa-payment-klarna",
"version": "1.1.20",
"version": "1.1.21",
"description": "Klarna Payment provider for Medusa Commerce",
"main": "index.js",
"repository": {
@@ -40,8 +40,8 @@
"axios": "^0.21.0",
"body-parser": "^1.19.0",
"express": "^4.17.1",
"medusa-core-utils": "^1.1.15",
"medusa-test-utils": "^1.1.18"
"medusa-core-utils": "^1.1.16",
"medusa-test-utils": "^1.1.19"
},
"gitHead": "db9d6c0cf55ff60a90415b16bc7582cc4795768f"
}
@@ -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.0.20](https://github.com/medusajs/medusa/compare/medusa-payment-paypal@1.0.19...medusa-payment-paypal@1.0.20) (2021-07-02)
**Note:** Version bump only for package medusa-payment-paypal
## [1.0.19](https://github.com/medusajs/medusa/compare/medusa-payment-paypal@1.0.18...medusa-payment-paypal@1.0.19) (2021-06-22)
+4 -4
View File
@@ -1,6 +1,6 @@
{
"name": "medusa-payment-paypal",
"version": "1.0.19",
"version": "1.0.20",
"description": "Paypal Payment provider for Meduas Commerce",
"main": "index.js",
"repository": {
@@ -26,8 +26,8 @@
"cross-env": "^5.2.1",
"eslint": "^6.8.0",
"jest": "^25.5.2",
"medusa-interfaces": "^1.1.16",
"medusa-test-utils": "^1.1.18"
"medusa-interfaces": "^1.1.17",
"medusa-test-utils": "^1.1.19"
},
"scripts": {
"build": "babel src -d . --ignore **/__tests__,**/__mocks__",
@@ -42,7 +42,7 @@
"@paypal/checkout-server-sdk": "^1.0.2",
"body-parser": "^1.19.0",
"express": "^4.17.1",
"medusa-core-utils": "^1.1.15"
"medusa-core-utils": "^1.1.16"
},
"gitHead": "db9d6c0cf55ff60a90415b16bc7582cc4795768f"
}
@@ -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.19](https://github.com/medusajs/medusa/compare/medusa-payment-stripe@1.1.18...medusa-payment-stripe@1.1.19) (2021-07-02)
**Note:** Version bump only for package medusa-payment-stripe
## [1.1.18](https://github.com/medusajs/medusa/compare/medusa-payment-stripe@1.1.17...medusa-payment-stripe@1.1.18) (2021-06-22)
+3 -3
View File
@@ -1,6 +1,6 @@
{
"name": "medusa-payment-stripe",
"version": "1.1.18",
"version": "1.1.19",
"description": "Stripe 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-test-utils": "^1.1.18"
"medusa-test-utils": "^1.1.19"
},
"scripts": {
"build": "babel src -d . --ignore **/__tests__",
@@ -40,7 +40,7 @@
"dependencies": {
"body-parser": "^1.19.0",
"express": "^4.17.1",
"medusa-core-utils": "^1.1.15",
"medusa-core-utils": "^1.1.16",
"stripe": "^8.50.0"
},
"gitHead": "db9d6c0cf55ff60a90415b16bc7582cc4795768f"
@@ -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.19](https://github.com/medusajs/medusa/compare/medusa-plugin-add-ons@1.1.18...medusa-plugin-add-ons@1.1.19) (2021-07-02)
**Note:** Version bump only for package medusa-plugin-add-ons
## [1.1.18](https://github.com/medusajs/medusa/compare/medusa-plugin-add-ons@1.1.17...medusa-plugin-add-ons@1.1.18) (2021-06-22)
+3 -3
View File
@@ -1,6 +1,6 @@
{
"name": "medusa-plugin-add-ons",
"version": "1.1.18",
"version": "1.1.19",
"description": "Add-on plugin for Medusa Commerce",
"main": "index.js",
"repository": {
@@ -25,7 +25,7 @@
"cross-env": "^7.0.2",
"eslint": "^6.8.0",
"jest": "^25.5.2",
"medusa-test-utils": "^1.1.18"
"medusa-test-utils": "^1.1.19"
},
"scripts": {
"build": "babel src -d . --ignore **/__tests__",
@@ -37,7 +37,7 @@
"body-parser": "^1.19.0",
"cors": "^2.8.5",
"express": "^4.17.1",
"medusa-core-utils": "^1.1.15",
"medusa-core-utils": "^1.1.16",
"redis": "^3.0.2"
},
"gitHead": "db9d6c0cf55ff60a90415b16bc7582cc4795768f"
@@ -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.24](https://github.com/medusajs/medusa/compare/medusa-plugin-brightpearl@1.1.23...medusa-plugin-brightpearl@1.1.24) (2021-07-02)
**Note:** Version bump only for package medusa-plugin-brightpearl
## [1.1.23](https://github.com/medusajs/medusa/compare/medusa-plugin-brightpearl@1.1.22...medusa-plugin-brightpearl@1.1.23) (2021-06-24)
**Note:** Version bump only for package medusa-plugin-brightpearl
@@ -1,6 +1,6 @@
{
"name": "medusa-plugin-brightpearl",
"version": "1.1.23",
"version": "1.1.24",
"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-test-utils": "^1.1.18",
"medusa-test-utils": "^1.1.19",
"prettier": "^2.0.5"
},
"scripts": {
@@ -43,7 +43,7 @@
"axios": "^0.19.2",
"axios-rate-limit": "^1.2.1",
"express": "^4.17.1",
"medusa-core-utils": "^1.1.15",
"medusa-core-utils": "^1.1.16",
"randomatic": "^3.1.1"
},
"gitHead": "db9d6c0cf55ff60a90415b16bc7582cc4795768f"
@@ -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.21](https://github.com/medusajs/medusa/compare/medusa-plugin-contentful@1.1.20...medusa-plugin-contentful@1.1.21) (2021-07-02)
**Note:** Version bump only for package medusa-plugin-contentful
## [1.1.20](https://github.com/medusajs/medusa/compare/medusa-plugin-contentful@1.1.19...medusa-plugin-contentful@1.1.20) (2021-06-24)
**Note:** Version bump only for package medusa-plugin-contentful
@@ -1,6 +1,6 @@
{
"name": "medusa-plugin-contentful",
"version": "1.1.20",
"version": "1.1.21",
"description": "Contentful plugin for Medusa Commerce",
"main": "index.js",
"repository": {
@@ -39,8 +39,8 @@
"body-parser": "^1.19.0",
"contentful-management": "^5.27.1",
"express": "^4.17.1",
"medusa-core-utils": "^1.1.15",
"medusa-test-utils": "^1.1.18",
"medusa-core-utils": "^1.1.16",
"medusa-test-utils": "^1.1.19",
"redis": "^3.0.2"
},
"gitHead": "db9d6c0cf55ff60a90415b16bc7582cc4795768f"
@@ -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.10](https://github.com/medusajs/medusa/compare/medusa-plugin-discount-generator@1.1.9...medusa-plugin-discount-generator@1.1.10) (2021-07-02)
**Note:** Version bump only for package medusa-plugin-discount-generator
## [1.1.9](https://github.com/medusajs/medusa/compare/medusa-plugin-discount-generator@1.1.8...medusa-plugin-discount-generator@1.1.9) (2021-06-22)
@@ -1,6 +1,6 @@
{
"name": "medusa-plugin-discount-generator",
"version": "1.1.9",
"version": "1.1.10",
"main": "index.js",
"license": "MIT",
"author": "Sebastian Rindom",
@@ -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.19](https://github.com/medusajs/medusa/compare/medusa-plugin-economic@1.1.18...medusa-plugin-economic@1.1.19) (2021-07-02)
**Note:** Version bump only for package medusa-plugin-economic
## [1.1.18](https://github.com/medusajs/medusa/compare/medusa-plugin-economic@1.1.17...medusa-plugin-economic@1.1.18) (2021-06-22)
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "medusa-plugin-economic",
"version": "1.1.18",
"version": "1.1.19",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
+3 -3
View File
@@ -1,6 +1,6 @@
{
"name": "medusa-plugin-economic",
"version": "1.1.18",
"version": "1.1.19",
"description": "E-conomic financial reporting",
"main": "index.js",
"repository": {
@@ -39,8 +39,8 @@
"axios": "^0.19.2",
"body-parser": "^1.19.0",
"express": "^4.17.1",
"medusa-core-utils": "^1.1.15",
"medusa-test-utils": "^1.1.18",
"medusa-core-utils": "^1.1.16",
"medusa-test-utils": "^1.1.19",
"moment": "^2.27.0"
},
"gitHead": "db9d6c0cf55ff60a90415b16bc7582cc4795768f"
@@ -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.10](https://github.com/medusajs/medusa/compare/medusa-plugin-ip-lookup@1.1.9...medusa-plugin-ip-lookup@1.1.10) (2021-07-02)
**Note:** Version bump only for package medusa-plugin-ip-lookup
## [1.1.9](https://github.com/medusajs/medusa/compare/medusa-plugin-ip-lookup@1.1.8...medusa-plugin-ip-lookup@1.1.9) (2021-06-22)
@@ -1,6 +1,6 @@
{
"name": "medusa-plugin-ip-lookup",
"version": "1.1.9",
"version": "1.1.10",
"description": "IP lookup middleware for Medusa core",
"main": "dist/index.js",
"repository": {
@@ -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.19](https://github.com/medusajs/medusa/compare/medusa-plugin-mailchimp@1.1.18...medusa-plugin-mailchimp@1.1.19) (2021-07-02)
**Note:** Version bump only for package medusa-plugin-mailchimp
## [1.1.18](https://github.com/medusajs/medusa/compare/medusa-plugin-mailchimp@1.1.17...medusa-plugin-mailchimp@1.1.18) (2021-06-22)
@@ -1,6 +1,6 @@
{
"name": "medusa-plugin-mailchimp",
"version": "1.1.18",
"version": "1.1.19",
"description": "Mailchimp newsletter subscriptions",
"main": "index.js",
"repository": {
@@ -40,8 +40,8 @@
"cors": "^2.8.5",
"express": "^4.17.1",
"mailchimp-api-v3": "^1.14.0",
"medusa-core-utils": "^1.1.15",
"medusa-test-utils": "^1.1.18"
"medusa-core-utils": "^1.1.16",
"medusa-test-utils": "^1.1.19"
},
"gitHead": "db9d6c0cf55ff60a90415b16bc7582cc4795768f"
}
@@ -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.19](https://github.com/medusajs/medusa/compare/medusa-plugin-permissions@1.1.18...medusa-plugin-permissions@1.1.19) (2021-07-02)
**Note:** Version bump only for package medusa-plugin-permissions
## [1.1.18](https://github.com/medusajs/medusa/compare/medusa-plugin-permissions@1.1.17...medusa-plugin-permissions@1.1.18) (2021-06-22)
@@ -1,6 +1,6 @@
{
"name": "medusa-plugin-permissions",
"version": "1.1.18",
"version": "1.1.19",
"description": "Role permission for Medusa core",
"main": "dist/index.js",
"repository": {
@@ -32,8 +32,8 @@
"medusa-interfaces": "1.x"
},
"dependencies": {
"medusa-core-utils": "^1.1.15",
"medusa-test-utils": "^1.1.18",
"medusa-core-utils": "^1.1.16",
"medusa-test-utils": "^1.1.19",
"mongoose": "^5.8.0"
},
"gitHead": "db9d6c0cf55ff60a90415b16bc7582cc4795768f"
@@ -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.0.12](https://github.com/medusajs/medusa/compare/medusa-plugin-restock-notification@0.0.11...medusa-plugin-restock-notification@0.0.12) (2021-07-02)
**Note:** Version bump only for package medusa-plugin-restock-notification
## [0.0.11](https://github.com/medusajs/medusa/compare/medusa-plugin-restock-notification@0.0.10...medusa-plugin-restock-notification@0.0.11) (2021-06-24)
**Note:** Version bump only for package medusa-plugin-restock-notification
@@ -1,6 +1,6 @@
{
"name": "medusa-plugin-restock-notification",
"version": "0.0.11",
"version": "0.0.12",
"main": "index.js",
"repository": {
"type": "git",
@@ -14,11 +14,11 @@
"@babel/core": "^7.7.5",
"@babel/plugin-transform-typescript": "^7.13.0",
"@babel/preset-typescript": "^7.12.7",
"babel-preset-medusa-package": "^1.1.9",
"babel-preset-medusa-package": "^1.1.10",
"cross-env": "^5.2.1",
"eslint": "^6.8.0",
"jest": "^25.5.2",
"medusa-test-utils": "^1.1.18",
"medusa-test-utils": "^1.1.19",
"pg": "^8.5.1",
"ulid": "^2.3.0"
},
@@ -36,7 +36,7 @@
"body-parser": "^1.19.0",
"cors": "^2.8.5",
"express": "^4.17.1",
"medusa-core-utils": "^1.1.15"
"medusa-core-utils": "^1.1.16"
},
"gitHead": "db9d6c0cf55ff60a90415b16bc7582cc4795768f"
}
@@ -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.22](https://github.com/medusajs/medusa/compare/medusa-plugin-segment@1.1.21...medusa-plugin-segment@1.1.22) (2021-07-02)
**Note:** Version bump only for package medusa-plugin-segment
## [1.1.21](https://github.com/medusajs/medusa/compare/medusa-plugin-segment@1.1.20...medusa-plugin-segment@1.1.21) (2021-06-22)
+3 -3
View File
@@ -1,6 +1,6 @@
{
"name": "medusa-plugin-segment",
"version": "1.1.21",
"version": "1.1.22",
"description": "Segment Analytics",
"main": "index.js",
"repository": {
@@ -39,8 +39,8 @@
"axios": "^0.19.2",
"body-parser": "^1.19.0",
"express": "^4.17.1",
"medusa-core-utils": "^1.1.15",
"medusa-test-utils": "^1.1.18"
"medusa-core-utils": "^1.1.16",
"medusa-test-utils": "^1.1.19"
},
"gitHead": "db9d6c0cf55ff60a90415b16bc7582cc4795768f"
}
@@ -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.20](https://github.com/medusajs/medusa/compare/medusa-plugin-sendgrid@1.1.19...medusa-plugin-sendgrid@1.1.20) (2021-07-02)
**Note:** Version bump only for package medusa-plugin-sendgrid
## [1.1.19](https://github.com/medusajs/medusa/compare/medusa-plugin-sendgrid@1.1.18...medusa-plugin-sendgrid@1.1.19) (2021-06-22)
+3 -3
View File
@@ -1,6 +1,6 @@
{
"name": "medusa-plugin-sendgrid",
"version": "1.1.19",
"version": "1.1.20",
"description": "SendGrid transactional emails",
"main": "index.js",
"repository": {
@@ -39,8 +39,8 @@
"@sendgrid/mail": "^7.1.1",
"body-parser": "^1.19.0",
"express": "^4.17.1",
"medusa-core-utils": "^1.1.15",
"medusa-test-utils": "^1.1.18"
"medusa-core-utils": "^1.1.16",
"medusa-test-utils": "^1.1.19"
},
"gitHead": "db9d6c0cf55ff60a90415b16bc7582cc4795768f"
}
@@ -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.19](https://github.com/medusajs/medusa/compare/medusa-plugin-slack-notification@1.1.18...medusa-plugin-slack-notification@1.1.19) (2021-07-02)
**Note:** Version bump only for package medusa-plugin-slack-notification
## [1.1.18](https://github.com/medusajs/medusa/compare/medusa-plugin-slack-notification@1.1.17...medusa-plugin-slack-notification@1.1.18) (2021-06-22)
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "medusa-plugin-economic",
"version": "1.1.18",
"version": "1.1.19",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -1,6 +1,6 @@
{
"name": "medusa-plugin-slack-notification",
"version": "1.1.18",
"version": "1.1.19",
"description": "Slack notifications",
"main": "index.js",
"repository": {
@@ -39,8 +39,8 @@
"axios": "^0.19.2",
"body-parser": "^1.19.0",
"express": "^4.17.1",
"medusa-core-utils": "^1.1.15",
"medusa-test-utils": "^1.1.18",
"medusa-core-utils": "^1.1.16",
"medusa-test-utils": "^1.1.19",
"moment": "^2.27.0"
},
"gitHead": "db9d6c0cf55ff60a90415b16bc7582cc4795768f"
@@ -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.19](https://github.com/medusajs/medusa/compare/medusa-plugin-twilio-sms@1.1.18...medusa-plugin-twilio-sms@1.1.19) (2021-07-02)
**Note:** Version bump only for package medusa-plugin-twilio-sms
## [1.1.18](https://github.com/medusajs/medusa/compare/medusa-plugin-twilio-sms@1.1.17...medusa-plugin-twilio-sms@1.1.18) (2021-06-22)
@@ -1,6 +1,6 @@
{
"name": "medusa-plugin-twilio-sms",
"version": "1.1.18",
"version": "1.1.19",
"main": "index.js",
"repository": {
"type": "git",
@@ -35,8 +35,8 @@
"dependencies": {
"@babel/plugin-transform-classes": "^7.9.5",
"body-parser": "^1.19.0",
"medusa-core-utils": "^1.1.15",
"medusa-test-utils": "^1.1.18",
"medusa-core-utils": "^1.1.16",
"medusa-test-utils": "^1.1.19",
"twilio": "^3.49.1"
},
"gitHead": "db9d6c0cf55ff60a90415b16bc7582cc4795768f"
@@ -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.19](https://github.com/medusajs/medusa/compare/medusa-plugin-wishlist@1.1.18...medusa-plugin-wishlist@1.1.19) (2021-07-02)
**Note:** Version bump only for package medusa-plugin-wishlist
## [1.1.18](https://github.com/medusajs/medusa/compare/medusa-plugin-wishlist@1.1.17...medusa-plugin-wishlist@1.1.18) (2021-06-22)
+3 -3
View File
@@ -1,6 +1,6 @@
{
"name": "medusa-plugin-wishlist",
"version": "1.1.18",
"version": "1.1.19",
"description": "Provides /customers/:id/wishlist to add items to a customr's wishlist",
"main": "index.js",
"repository": {
@@ -37,8 +37,8 @@
"dependencies": {
"body-parser": "^1.19.0",
"express": "^4.17.1",
"medusa-core-utils": "^1.1.15",
"medusa-test-utils": "^1.1.18"
"medusa-core-utils": "^1.1.16",
"medusa-test-utils": "^1.1.19"
},
"gitHead": "db9d6c0cf55ff60a90415b16bc7582cc4795768f"
}
+8
View File
@@ -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.19](https://github.com/medusajs/medusa/compare/medusa-test-utils@1.1.18...medusa-test-utils@1.1.19) (2021-07-02)
**Note:** Version bump only for package medusa-test-utils
## [1.1.18](https://github.com/medusajs/medusa/compare/medusa-test-utils@1.1.17...medusa-test-utils@1.1.18) (2021-06-22)
+2 -2
View File
@@ -1,6 +1,6 @@
{
"name": "medusa-test-utils",
"version": "1.1.18",
"version": "1.1.19",
"description": "Test utils for Medusa",
"main": "dist/index.js",
"repository": {
@@ -29,7 +29,7 @@
},
"dependencies": {
"@babel/plugin-transform-classes": "^7.9.5",
"medusa-core-utils": "^1.1.15",
"medusa-core-utils": "^1.1.16",
"randomatic": "^3.1.1"
},
"gitHead": "db9d6c0cf55ff60a90415b16bc7582cc4795768f"
+8
View File
@@ -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.29](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.28...@medusajs/medusa@1.1.29) (2021-07-02)
**Note:** Version bump only for package @medusajs/medusa
## [1.1.28](https://github.com/medusajs/medusa/compare/@medusajs/medusa@1.1.27...@medusajs/medusa@1.1.28) (2021-06-24)
**Note:** Version bump only for package @medusajs/medusa
+5 -5
View File
@@ -1,6 +1,6 @@
{
"name": "@medusajs/medusa",
"version": "1.1.28",
"version": "1.1.29",
"description": "E-commerce for JAMstack",
"main": "dist/index.js",
"repository": {
@@ -17,11 +17,11 @@
"@babel/cli": "^7.14.3",
"@babel/core": "^7.14.3",
"@babel/preset-typescript": "^7.13.0",
"babel-preset-medusa-package": "^1.1.9",
"babel-preset-medusa-package": "^1.1.10",
"cross-env": "^5.2.1",
"eslint": "^6.8.0",
"jest": "^25.5.2",
"medusa-interfaces": "^1.1.16",
"medusa-interfaces": "^1.1.17",
"nodemon": "^2.0.1",
"prettier": "^1.19.1",
"supertest": "^4.0.2"
@@ -59,8 +59,8 @@
"joi": "^17.3.0",
"joi-objectid": "^3.0.1",
"jsonwebtoken": "^8.5.1",
"medusa-core-utils": "^1.1.15",
"medusa-test-utils": "^1.1.18",
"medusa-core-utils": "^1.1.16",
"medusa-test-utils": "^1.1.19",
"morgan": "^1.9.1",
"multer": "^1.4.2",
"passport": "^0.4.0",
+49 -1
View File
@@ -1,5 +1,53 @@
import { EntityRepository, Repository } from "typeorm"
import { Swap } from "../models/swap"
import { flatten, groupBy, map, merge } from "lodash"
@EntityRepository(Swap)
export class SwapRepository extends Repository<Swap> {}
export class SwapRepository extends Repository<Swap> {
public async findWithRelations(
relations: Array<keyof Swap> = [],
optionsWithoutRelations: Omit<FindManyOptions<Swap>, "relations"> = {}
): Promise<Swap[]> {
const entities = await this.find(optionsWithoutRelations)
const entitiesIds = entities.map(({ id }) => id)
const groupedRelations = {}
for (const rel of relations) {
const [topLevel] = rel.split(".")
if (groupedRelations[topLevel]) {
groupedRelations[topLevel].push(rel)
} else {
groupedRelations[topLevel] = [rel]
}
}
const entitiesIdsWithRelations = await Promise.all(
Object.entries(groupedRelations).map(([_, rels]) => {
return this.findByIds(entitiesIds, {
select: ["id"],
relations: rels as string[],
})
})
).then(flatten)
const entitiesAndRelations = entitiesIdsWithRelations.concat(entities)
const entitiesAndRelationsById = groupBy(entitiesAndRelations, "id")
return map(entities, e => merge({}, ...entitiesAndRelationsById[e.id]))
}
public async findOneWithRelations(
relations: Array<keyof Swap> = [],
optionsWithoutRelations: Omit<FindManyOptions<Swap>, "relations"> = {}
): Promise<Swap> {
// Limit 1
optionsWithoutRelations.take = 1
const result = await this.findWithRelations(
relations,
optionsWithoutRelations
)
return result[0]
}
}
+16 -14
View File
@@ -164,7 +164,7 @@ describe("SwapService", () => {
}
const swapRepo = MockRepository({
findOne: () => Promise.resolve(existing),
findOneWithRelations: () => Promise.resolve(existing),
})
const lineItemService = {
@@ -186,10 +186,9 @@ describe("SwapService", () => {
it("finds swap and calls return create cart", async () => {
await swapService.createCart(IdMap.getId("swap-1"))
expect(swapRepo.findOne).toHaveBeenCalledTimes(1)
expect(swapRepo.findOne).toHaveBeenCalledWith({
where: { id: IdMap.getId("swap-1") },
relations: [
expect(swapRepo.findOneWithRelations).toHaveBeenCalledTimes(1)
expect(swapRepo.findOneWithRelations).toHaveBeenCalledWith(
[
"order",
"order.items",
"order.swaps",
@@ -200,7 +199,10 @@ describe("SwapService", () => {
"return_order.items",
"return_order.shipping_method",
],
})
{
where: { id: IdMap.getId("swap-1") },
}
)
expect(cartService.create).toHaveBeenCalledTimes(1)
expect(cartService.create).toHaveBeenCalledWith({
@@ -239,7 +241,7 @@ describe("SwapService", () => {
it("fails if cart already created", async () => {
const swapRepo = MockRepository({
findOne: () =>
findOneWithRelations: () =>
Promise.resolve({
...existing,
order_id: IdMap.getId("test"),
@@ -368,7 +370,7 @@ describe("SwapService", () => {
}
const swapRepo = MockRepository({
findOne: () => Promise.resolve(existing),
findOneWithRelations: () => Promise.resolve(existing),
})
const swapService = new SwapService({
manager: MockManager,
@@ -411,7 +413,7 @@ describe("SwapService", () => {
}
const swapRepo = MockRepository({
findOne: q =>
findOneWithRelations: (rels, q) =>
Promise.resolve(q.where.id === IdMap.getId("empty") ? {} : existing),
})
const swapService = new SwapService({
@@ -487,7 +489,7 @@ describe("SwapService", () => {
}
const swapRepo = MockRepository({
findOne: () => Promise.resolve({ ...existing }),
findOneWithRelations: () => Promise.resolve({ ...existing }),
})
const swapService = new SwapService({
manager: MockManager,
@@ -607,7 +609,7 @@ describe("SwapService", () => {
}
const swapRepo = MockRepository({
findOne: () => Promise.resolve(existing),
findOneWithRelations: () => Promise.resolve(existing),
})
const swapService = new SwapService({
@@ -704,7 +706,7 @@ describe("SwapService", () => {
}
const swapRepo = MockRepository({
findOne: () => Promise.resolve(existing),
findOneWithRelations: () => Promise.resolve(existing),
})
const swapService = new SwapService({
@@ -769,7 +771,7 @@ describe("SwapService", () => {
})
const swapRepo = MockRepository({
findOne: q => {
findOneWithRelations: (rels, q) => {
switch (q.where.id) {
case "refund":
return Promise.resolve(existing(-1, false))
@@ -880,7 +882,7 @@ describe("SwapService", () => {
}
const swapRepo = MockRepository({
findOne: q => {
findOneWithRelations: (rels, q) => {
switch (q.where.id) {
case "requested":
return Promise.resolve({
+8 -2
View File
@@ -103,7 +103,10 @@ class SwapService extends BaseService {
const query = this.buildQuery_({ id: validatedId }, config)
const swap = await swapRepo.findOne(query)
const rels = query.relations
delete query.relations
const swap = await swapRepo.findOneWithRelations(rels, query)
if (!swap) {
throw new MedusaError(MedusaError.Types.NOT_FOUND, "Swap was not found")
}
@@ -143,7 +146,10 @@ class SwapService extends BaseService {
) {
const swapRepo = this.manager_.getCustomRepository(this.swapRepository_)
const query = this.buildQuery_(selector, config)
return swapRepo.find(query)
let rels = query.relations
delete query.relations
return swapRepo.findWithRelations(rels, query)
}
/**