merge develop

2021-10-15 20:09:31 +02:00
parent 10c87e8d5a
commit 4fd361fddd
207 changed files with 8699 additions and 4124 deletions
--- a/integration-tests/helpers/test-server.js
+++ b/integration-tests/helpers/test-server.js
@@ -6,8 +6,10 @@ const importFrom = require("import-from")
 const initialize = async () => {
  const app = express()

-  const loaders = importFrom(process.cwd(), "@medusajs/medusa/dist/loaders")
-    .default
+  const loaders = importFrom(
+    process.cwd(),
+    "@medusajs/medusa/dist/loaders"
+  ).default

  const { dbConnection } = await loaders({
    directory: path.resolve(process.cwd()),