merge develop

2021-10-15 20:09:31 +02:00
parent 10c87e8d5a
commit 4fd361fddd
207 changed files with 8699 additions and 4124 deletions
--- a/packages/medusa-cli/.eslintrc
+++ b/packages/medusa-cli/.eslintrc
@@ -1,9 +0,0 @@
-{
-  "plugins": ["prettier"],
-  "extends": ["prettier"],
-  "rules": {
-    "prettier/prettier": "error",
-    "semi": "error",
-    "no-unused-expressions": "true"
-  }
-}
--- a/packages/medusa-cli/.prettierrc
+++ b/packages/medusa-cli/.prettierrc
@@ -1,7 +0,0 @@
-{
-  "endOfLine": "lf",
-  "semi": false,
-  "singleQuote": false,
-  "tabWidth": 2,
-  "trailingComma": "es5"
-}