@medusajs/medusa 1.2.2-dev.53 → 1.3.1-next.14

package/dist/loaders/api.js

@@ -40,17 +40,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var body_parser_1 = __importDefault(require("body-parser"));
-var medusa_core_utils_1 = require("medusa-core-utils");
 var api_1 = __importDefault(require("../api"));
 exports.default = (function (_a) {
-    var app = _a.app, rootDirectory = _a.rootDirectory, container = _a.container;
+    var app = _a.app, container = _a.container, configModule = _a.configModule;
     return __awaiter(void 0, void 0, void 0, function () {
-        var configModule, config;
         return __generator(this, function (_b) {
-            configModule = (0, medusa_core_utils_1.getConfigFile)(rootDirectory, "medusa-config").configModule;
-            config = (configModule && configModule.projectConfig) || {};
             app.use(body_parser_1.default.json());
-            app.use("/", (0, api_1.default)(container, config));
+            app.use("/", (0, api_1.default)(container, configModule.projectConfig));
             return [2 /*return*/, app];
         });
     });

package/dist/loaders/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/loaders/api.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAAoC;AACpC,uDAAiD;AACjD,+CAA2B;AAE3B,mBAAe,UAAO,EAAiC;QAA/B,GAAG,SAAA,EAAE,aAAa,mBAAA,EAAE,SAAS,eAAA;;;;YAC3C,YAAY,GAAK,IAAA,iCAAa,EAAC,aAAa,EAAE,eAAe,CAAC,aAAlD,CAAkD;YAChE,MAAM,GAAG,CAAC,YAAY,IAAI,YAAY,CAAC,aAAa,CAAC,IAAI,EAAE,CAAA;YAEjE,GAAG,CAAC,GAAG,CAAC,qBAAU,CAAC,IAAI,EAAE,CAAC,CAAA;YAC1B,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,IAAA,aAAM,EAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAA;YAEvC,sBAAO,GAAG,EAAA;;;CACX,EAAA"}
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/loaders/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,4DAAoC;AACpC,+CAA2B;AAU3B,mBAAe,UAAO,EAAyC;QAAvC,GAAG,SAAA,EAAE,SAAS,eAAA,EAAE,YAAY,kBAAA;;;YAClD,GAAG,CAAC,GAAG,CAAC,qBAAU,CAAC,IAAI,EAAE,CAAC,CAAA;YAC1B,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,IAAA,aAAM,EAAC,SAAS,EAAE,YAAY,CAAC,aAAa,CAAC,CAAC,CAAA;YAE3D,sBAAO,GAAG,EAAA;;;CACX,EAAA"}

package/dist/loaders/config.d.ts

@@ -0,0 +1,3 @@
+import { ConfigModule } from "../types/global";
+declare const _default: (rootDirectory: string) => ConfigModule;
+export default _default;

package/dist/loaders/config.js

@@ -0,0 +1,47 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var dist_1 = require("medusa-core-utils/dist");
+var isProduction = ["production", "prod"].includes(process.env.NODE_ENV || "");
+var errorHandler = isProduction
+    ? function (msg) {
+        throw new Error(msg);
+    }
+    : console.log;
+exports.default = (function (rootDirectory) {
+    var _a, _b, _c, _d, _e, _f, _g;
+    var configModule = (0, dist_1.getConfigFile)(rootDirectory, "medusa-config").configModule;
+    if (!((_a = configModule === null || configModule === void 0 ? void 0 : configModule.projectConfig) === null || _a === void 0 ? void 0 : _a.redis_url)) {
+        console.log("[medusa-config] \u26A0\uFE0F redis_url not found. A fake redis instance will be used.");
+    }
+    var jwt_secret = (_c = (_b = configModule === null || configModule === void 0 ? void 0 : configModule.projectConfig) === null || _b === void 0 ? void 0 : _b.jwt_secret) !== null && _c !== void 0 ? _c : process.env.JWT_SECRET;
+    if (!jwt_secret) {
+        errorHandler("[medusa-config] \u26A0\uFE0F jwt_secret not found.".concat(isProduction
+            ? ""
+            : " fallback to either cookie_secret or default 'supersecret'."));
+    }
+    var cookie_secret = (_e = (_d = configModule === null || configModule === void 0 ? void 0 : configModule.projectConfig) === null || _d === void 0 ? void 0 : _d.cookie_secret) !== null && _e !== void 0 ? _e : process.env.COOKIE_SECRET;
+    if (!cookie_secret) {
+        errorHandler("[medusa-config] \u26A0\uFE0F cookie_secret not found.".concat(isProduction
+            ? ""
+            : " fallback to either cookie_secret or default 'supersecret'."));
+    }
+    if (!((_f = configModule === null || configModule === void 0 ? void 0 : configModule.projectConfig) === null || _f === void 0 ? void 0 : _f.database_type)) {
+        console.log("[medusa-config] \u26A0\uFE0F database_type not found. fallback to default sqlite.");
+    }
+    return {
+        projectConfig: __assign({ jwt_secret: jwt_secret !== null && jwt_secret !== void 0 ? jwt_secret : "supersecret", cookie_secret: cookie_secret !== null && cookie_secret !== void 0 ? cookie_secret : "supersecret" }, configModule === null || configModule === void 0 ? void 0 : configModule.projectConfig),
+        plugins: (_g = configModule === null || configModule === void 0 ? void 0 : configModule.plugins) !== null && _g !== void 0 ? _g : [],
+    };
+});
+//# sourceMappingURL=config.js.map

package/dist/loaders/config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/loaders/config.ts"],"names":[],"mappings":";;;;;;;;;;;;;AACA,+CAAsD;AAEtD,IAAM,YAAY,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAA;AAEhF,IAAM,YAAY,GAAG,YAAY;IAC/B,CAAC,CAAC,UAAC,GAAW;QACV,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;IACtB,CAAC;IACH,CAAC,CAAC,OAAO,CAAC,GAAG,CAAA;AAEf,mBAAe,UAAC,aAAqB;;IAC3B,IAAA,YAAY,GAAK,IAAA,oBAAa,EAAC,aAAa,EAAE,eAAe,CAEpE,aAFmB,CAEnB;IAED,IAAI,CAAC,CAAA,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,aAAa,0CAAE,SAAS,CAAA,EAAE;QAC3C,OAAO,CAAC,GAAG,CACT,uFAA6E,CAC9E,CAAA;KACF;IAED,IAAM,UAAU,GACd,MAAA,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,aAAa,0CAAE,UAAU,mCAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAA;IACnE,IAAI,CAAC,UAAU,EAAE;QACf,YAAY,CACV,4DACE,YAAY;YACV,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,6DAA6D,CACjE,CACH,CAAA;KACF;IAED,IAAM,aAAa,GACjB,MAAA,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,aAAa,0CAAE,aAAa,mCAAI,OAAO,CAAC,GAAG,CAAC,aAAa,CAAA;IACzE,IAAI,CAAC,aAAa,EAAE;QAClB,YAAY,CACV,+DACE,YAAY;YACV,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,6DAA6D,CACjE,CACH,CAAA;KACF;IAED,IAAI,CAAC,CAAA,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,aAAa,0CAAE,aAAa,CAAA,EAAE;QAC/C,OAAO,CAAC,GAAG,CACT,mFAAyE,CAC1E,CAAA;KACF;IAED,OAAO;QACL,aAAa,aACX,UAAU,EAAE,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,aAAa,EACvC,aAAa,EAAE,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,aAAa,IAC1C,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,aAAa,CAC/B;QACD,OAAO,EAAE,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,mCAAI,EAAE;KACrC,CAAA;AACH,CAAC,EAAA"}

package/dist/loaders/database.d.ts

@@ -1,5 +1,9 @@
-declare function _default({ container, configModule }: {
-    container: any;
-    configModule: any;
-}): Promise<import("typeorm").Connection>;
+import { Connection } from "typeorm";
+import { AwilixContainer } from "awilix";
+import { ConfigModule } from "../types/global";
+declare type Options = {
+    configModule: ConfigModule;
+    container: AwilixContainer;
+};
+declare const _default: ({ container, configModule }: Options) => Promise<Connection>;
 export default _default;

package/dist/loaders/database.js.map

@@ -1 +1 @@
-{"version":3,"file":"database.js","sourceRoot":"","sources":["../../src/loaders/database.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAA0C;AAE1C,4DAAkE;AAElE,mBAAe,UAAO,EAA2B;QAAzB,SAAS,eAAA,EAAE,YAAY,kBAAA;;;;;;oBACvC,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;oBAE3C,QAAQ,GAAG,YAAY,CAAC,aAAa,CAAC,aAAa,KAAK,QAAQ,CAAA;oBAEnD,qBAAM,IAAA,0BAAgB,EAAC;4BACxC,IAAI,EAAE,YAAY,CAAC,aAAa,CAAC,aAAa;4BAC9C,GAAG,EAAE,YAAY,CAAC,aAAa,CAAC,YAAY;4BAC5C,QAAQ,EAAE,YAAY,CAAC,aAAa,CAAC,iBAAiB;4BACtD,KAAK,EAAE,YAAY,CAAC,aAAa,CAAC,cAAc,IAAI,EAAE;4BACtD,QAAQ,UAAA;4BACR,cAAc,EAAE,IAAI,yCAAuB,EAAE;4BAC7C,OAAO,EAAE,YAAY,CAAC,aAAa,CAAC,gBAAgB,IAAI,KAAK;yBAC9D,CAAC,EAAA;;oBARI,UAAU,GAAG,SAQjB;yBAEE,QAAQ,EAAR,wBAAQ;oBACV,qBAAM,UAAU,CAAC,KAAK,CAAC,2BAA2B,CAAC,EAAA;;oBAAnD,SAAmD,CAAA;oBACnD,qBAAM,UAAU,CAAC,WAAW,EAAE,EAAA;;oBAA9B,SAA8B,CAAA;oBAC9B,qBAAM,UAAU,CAAC,KAAK,CAAC,0BAA0B,CAAC,EAAA;;oBAAlD,SAAkD,CAAA;;wBAGpD,sBAAO,UAAU,EAAA;;;;CAClB,EAAA"}
+{"version":3,"file":"database.js","sourceRoot":"","sources":["../../src/loaders/database.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAqE;AACrE,4DAAkE;AAUlE,mBAAe,UAAO,EAAoC;QAAlC,SAAS,eAAA,EAAE,YAAY,kBAAA;;;;;;oBACvC,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;oBAE3C,QAAQ,GAAG,YAAY,CAAC,aAAa,CAAC,aAAa,KAAK,QAAQ,CAAA;oBAEnD,qBAAM,IAAA,0BAAgB,EAAC;4BACxC,IAAI,EAAE,YAAY,CAAC,aAAa,CAAC,aAAa;4BAC9C,GAAG,EAAE,YAAY,CAAC,aAAa,CAAC,YAAY;4BAC5C,QAAQ,EAAE,YAAY,CAAC,aAAa,CAAC,iBAAiB;4BACtD,KAAK,EAAE,YAAY,CAAC,aAAa,CAAC,cAAc,IAAI,EAAE;4BACtD,QAAQ,UAAA;4BACR,cAAc,EAAE,IAAI,yCAAuB,EAAE;4BAC7C,OAAO,EAAE,YAAY,CAAC,aAAa,CAAC,gBAAgB,IAAI,KAAK;yBACzC,CAAC,EAAA;;oBARjB,UAAU,GAAG,SAQI;yBAEnB,QAAQ,EAAR,wBAAQ;oBACV,qBAAM,UAAU,CAAC,KAAK,CAAC,2BAA2B,CAAC,EAAA;;oBAAnD,SAAmD,CAAA;oBACnD,qBAAM,UAAU,CAAC,WAAW,EAAE,EAAA;;oBAA9B,SAA8B,CAAA;oBAC9B,qBAAM,UAAU,CAAC,KAAK,CAAC,0BAA0B,CAAC,EAAA;;oBAAlD,SAAkD,CAAA;;wBAGpD,sBAAO,UAAU,EAAA;;;;CAClB,EAAA"}

package/dist/loaders/defaults.d.ts

@@ -1,4 +1,5 @@
-declare function _default({ container }: {
-    container: any;
-}): Promise<void>;
+import { AwilixContainer } from "awilix";
+declare const _default: ({ container }: {
+    container: AwilixContainer;
+}) => Promise<void>;
 export default _default;

package/dist/loaders/defaults.js

@@ -67,8 +67,7 @@ var currencies_1 = require("../utils/currencies");
 var countries_1 = require("../utils/countries");
 var silentResolution = function (container, name, logger) {
     try {
-        var resolved = container.resolve(name);
-        return resolved;
+        return container.resolve(name);
     }
     catch (err) {
         if (err.name !== "AwilixResolutionError") {
@@ -91,6 +90,7 @@ var silentResolution = function (container, name, logger) {
             }
             logger.warn("You don't have any ".concat(identifier, " provider plugins installed. You may want to add one to your project."));
         }
+        return;
     }
 };
 exports.default = (function (_a) {
@@ -109,19 +109,20 @@ exports.default = (function (_a) {
                     return [4 /*yield*/, entityManager.transaction(function (manager) { return __awaiter(void 0, void 0, void 0, function () {
                             var countryRepo, hasCountries, countries_2, countries_2_1, c, query, iso2, iso3, numeric, name, display, e_1_1;
                             var e_1, _a;
-                            return __generator(this, function (_b) {
-                                switch (_b.label) {
+                            var _b;
+                            return __generator(this, function (_c) {
+                                switch (_c.label) {
                                     case 0:
                                         countryRepo = manager.getCustomRepository(countryRepository);
                                         return [4 /*yield*/, countryRepo.findOne()];
                                     case 1:
-                                        hasCountries = _b.sent();
+                                        hasCountries = _c.sent();
                                         if (!!hasCountries) return [3 /*break*/, 9];
-                                        _b.label = 2;
+                                        _c.label = 2;
                                     case 2:
-                                        _b.trys.push([2, 7, 8, 9]);
+                                        _c.trys.push([2, 7, 8, 9]);
                                         countries_2 = __values(countries_1.countries), countries_2_1 = countries_2.next();
-                                        _b.label = 3;
+                                        _c.label = 3;
                                     case 3:
                                         if (!!countries_2_1.done) return [3 /*break*/, 6];
                                         c = countries_2_1.value;
@@ -131,22 +132,22 @@ exports.default = (function (_a) {
                                         numeric = c.numeric;
                                         name = c.name.toUpperCase();
                                         display = c.name;
-                                        return [4 /*yield*/, manager.queryRunner.query(query, [
+                                        return [4 /*yield*/, ((_b = manager.queryRunner) === null || _b === void 0 ? void 0 : _b.query(query, [
                                                 iso2,
                                                 iso3,
                                                 numeric,
                                                 name,
                                                 display,
-                                            ])];
+                                            ]))];
                                     case 4:
-                                        _b.sent();
-                                        _b.label = 5;
+                                        _c.sent();
+                                        _c.label = 5;
                                     case 5:
                                         countries_2_1 = countries_2.next();
                                         return [3 /*break*/, 3];
                                     case 6: return [3 /*break*/, 9];
                                     case 7:
-                                        e_1_1 = _b.sent();
+                                        e_1_1 = _c.sent();
                                         e_1 = { error: e_1_1 };
                                         return [3 /*break*/, 9];
                                     case 8:
@@ -162,39 +163,40 @@ exports.default = (function (_a) {
                 case 1:
                     _b.sent();
                     return [4 /*yield*/, entityManager.transaction(function (manager) { return __awaiter(void 0, void 0, void 0, function () {
-                            var currencyRepo, hasCurrencies, _a, _b, _c, _1, c, query, code, sym, nat, name, e_2_1;
+                            var currencyRepo, hasCurrencies, _a, _b, _c, c, query, code, sym, nat, name, e_2_1;
                             var e_2, _d;
-                            return __generator(this, function (_e) {
-                                switch (_e.label) {
+                            var _e;
+                            return __generator(this, function (_f) {
+                                switch (_f.label) {
                                     case 0:
                                         currencyRepo = manager.getCustomRepository(currencyRepository);
                                         return [4 /*yield*/, currencyRepo.findOne()];
                                     case 1:
-                                        hasCurrencies = _e.sent();
+                                        hasCurrencies = _f.sent();
                                         if (!!hasCurrencies) return [3 /*break*/, 9];
-                                        _e.label = 2;
+                                        _f.label = 2;
                                     case 2:
-                                        _e.trys.push([2, 7, 8, 9]);
+                                        _f.trys.push([2, 7, 8, 9]);
                                         _a = __values(Object.entries(currencies_1.currencies)), _b = _a.next();
-                                        _e.label = 3;
+                                        _f.label = 3;
                                     case 3:
                                         if (!!_b.done) return [3 /*break*/, 6];
-                                        _c = __read(_b.value, 2), _1 = _c[0], c = _c[1];
+                                        _c = __read(_b.value, 2), c = _c[1];
                                         query = "INSERT INTO \"currency\" (\"code\", \"symbol\", \"symbol_native\", \"name\") VALUES ($1, $2, $3, $4)";
                                         code = c.code.toLowerCase();
                                         sym = c.symbol;
                                         nat = c.symbol_native;
                                         name = c.name;
-                                        return [4 /*yield*/, manager.queryRunner.query(query, [code, sym, nat, name])];
+                                        return [4 /*yield*/, ((_e = manager.queryRunner) === null || _e === void 0 ? void 0 : _e.query(query, [code, sym, nat, name]))];
                                     case 4:
-                                        _e.sent();
-                                        _e.label = 5;
+                                        _f.sent();
+                                        _f.label = 5;
                                     case 5:
                                         _b = _a.next();
                                         return [3 /*break*/, 3];
                                     case 6: return [3 /*break*/, 9];
                                     case 7:
-                                        e_2_1 = _e.sent();
+                                        e_2_1 = _f.sent();
                                         e_2 = { error: e_2_1 };
                                         return [3 /*break*/, 9];
                                     case 8:
@@ -210,35 +212,41 @@ exports.default = (function (_a) {
                 case 2:
                     _b.sent();
                     return [4 /*yield*/, entityManager.transaction(function (manager) { return __awaiter(void 0, void 0, void 0, function () {
-                            var payIds, pProviderService, payProviders, notiIds, nProviderService, notiProviders, fulfilIds, fProviderService, fulfilProviders;
+                            var payProviders, payIds, pProviderService, notiProviders, notiIds, nProviderService, fulfilProviders, fulfilIds, fProviderService, taxProviders, taxIds, tProviderService;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0: return [4 /*yield*/, storeService.withTransaction(manager).create()];
                                     case 1:
                                         _a.sent();
-                                        pProviderService = container.resolve("paymentProviderService");
                                         payProviders = silentResolution(container, "paymentProviders", logger) || [];
                                         payIds = payProviders.map(function (p) { return p.getIdentifier(); });
+                                        pProviderService = container.resolve("paymentProviderService");
                                         return [4 /*yield*/, pProviderService.registerInstalledProviders(payIds)];
                                     case 2:
                                         _a.sent();
-                                        nProviderService = container.resolve("notificationService");
                                         notiProviders = silentResolution(container, "notificationProviders", logger) || [];
                                         notiIds = notiProviders.map(function (p) { return p.getIdentifier(); });
+                                        nProviderService = container.resolve("notificationService");
                                         return [4 /*yield*/, nProviderService.registerInstalledProviders(notiIds)];
                                     case 3:
                                         _a.sent();
-                                        fProviderService = container.resolve("fulfillmentProviderService");
                                         fulfilProviders = silentResolution(container, "fulfillmentProviders", logger) || [];
                                         fulfilIds = fulfilProviders.map(function (p) { return p.getIdentifier(); });
+                                        fProviderService = container.resolve("fulfillmentProviderService");
                                         return [4 /*yield*/, fProviderService.registerInstalledProviders(fulfilIds)];
                                     case 4:
                                         _a.sent();
-                                        return [4 /*yield*/, profileService.withTransaction(manager).createDefault()];
+                                        taxProviders = silentResolution(container, "taxProviders", logger) || [];
+                                        taxIds = taxProviders.map(function (p) { return p.getIdentifier(); });
+                                        tProviderService = container.resolve("taxProviderService");
+                                        return [4 /*yield*/, tProviderService.registerInstalledProviders(taxIds)];
                                     case 5:
                                         _a.sent();
-                                        return [4 /*yield*/, profileService.withTransaction(manager).createGiftCardDefault()];
+                                        return [4 /*yield*/, profileService.withTransaction(manager).createDefault()];
                                     case 6:
+                                        _a.sent();
+                                        return [4 /*yield*/, profileService.withTransaction(manager).createGiftCardDefault()];
+                                    case 7:
                                         _a.sent();
                                         return [2 /*return*/];
                                 }

package/dist/loaders/defaults.js.map

@@ -1 +1 @@
-{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../src/loaders/defaults.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAgD;AAChD,gDAA8C;AAE9C,IAAM,gBAAgB,GAAG,UAAC,SAAS,EAAE,IAAI,EAAE,MAAM;IAC/C,IAAI;QACF,IAAM,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACxC,OAAO,QAAQ,CAAA;KAChB;IAAC,OAAO,GAAG,EAAE;QACZ,IAAI,GAAG,CAAC,IAAI,KAAK,uBAAuB,EAAE;YACxC,MAAM,GAAG,CAAA;SACV;aAAM;YACL,IAAI,UAAU,SAAA,CAAA;YACd,QAAQ,IAAI,EAAE;gBACZ,KAAK,kBAAkB;oBACrB,UAAU,GAAG,SAAS,CAAA;oBACtB,MAAK;gBACP,KAAK,uBAAuB;oBAC1B,UAAU,GAAG,cAAc,CAAA;oBAC3B,MAAK;gBACP,KAAK,sBAAsB;oBACzB,UAAU,GAAG,aAAa,CAAA;oBAC1B,MAAK;gBACP;oBACE,UAAU,GAAG,IAAI,CAAA;aACpB;YACD,MAAM,CAAC,IAAI,CACT,6BAAsB,UAAU,0EAAuE,CACxG,CAAA;SACF;KACF;AACH,CAAC,CAAA;AAED,mBAAe,UAAO,EAAa;QAAX,SAAS,eAAA;;;;;;oBACzB,YAAY,GAAG,SAAS,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;oBAChD,kBAAkB,GAAG,SAAS,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAA;oBAC5D,iBAAiB,GAAG,SAAS,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAA;oBAC1D,cAAc,GAAG,SAAS,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAA;oBAC5D,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;oBAEpC,aAAa,GAAG,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;oBAElD,qBAAM,aAAa,CAAC,WAAW,CAAC,UAAM,OAAO;;;;;;wCACrC,WAAW,GAAG,OAAO,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,CAAA;wCAC7C,qBAAM,WAAW,CAAC,OAAO,EAAE,EAAA;;wCAA1C,YAAY,GAAG,SAA2B;6CAC5C,CAAC,YAAY,EAAb,wBAAa;;;;wCACC,cAAA,SAAA,qBAAS,CAAA;;;;wCAAd,CAAC;wCACJ,KAAK,GAAG,sHAA0G,CAAA;wCAElH,IAAI,GAAG,CAAC,CAAC,MAAM,CAAC,WAAW,EAAE,CAAA;wCAC7B,IAAI,GAAG,CAAC,CAAC,MAAM,CAAC,WAAW,EAAE,CAAA;wCAC7B,OAAO,GAAG,CAAC,CAAC,OAAO,CAAA;wCACnB,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAA;wCAC3B,OAAO,GAAG,CAAC,CAAC,IAAI,CAAA;wCAEtB,qBAAM,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE;gDACrC,IAAI;gDACJ,IAAI;gDACJ,OAAO;gDACP,IAAI;gDACJ,OAAO;6CACR,CAAC,EAAA;;wCANF,SAME,CAAA;;;;;;;;;;;;;;;;;;;6BAGP,CAAC,EAAA;;oBAtBF,SAsBE,CAAA;oBAEF,qBAAM,aAAa,CAAC,WAAW,CAAC,UAAM,OAAO;;;;;;wCACrC,YAAY,GAAG,OAAO,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,CAAA;wCAC9C,qBAAM,YAAY,CAAC,OAAO,EAAE,EAAA;;wCAA5C,aAAa,GAAG,SAA4B;6CAC9C,CAAC,aAAa,EAAd,wBAAc;;;;wCACK,KAAA,SAAA,MAAM,CAAC,OAAO,CAAC,uBAAU,CAAC,CAAA;;;;wCAApC,KAAA,mBAAM,EAAL,UAAC,EAAE,CAAC,QAAA;wCACR,KAAK,GAAG,sGAA4F,CAAA;wCAEpG,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAA;wCAC3B,GAAG,GAAG,CAAC,CAAC,MAAM,CAAA;wCACd,GAAG,GAAG,CAAC,CAAC,aAAa,CAAA;wCACrB,IAAI,GAAG,CAAC,CAAC,IAAI,CAAA;wCAEnB,qBAAM,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,EAAA;;wCAA9D,SAA8D,CAAA;;;;;;;;;;;;;;;;;;;6BAGnE,CAAC,EAAA;;oBAfF,SAeE,CAAA;oBAEF,qBAAM,aAAa,CAAC,WAAW,CAAC,UAAM,OAAO;;;;4CAC3C,qBAAM,YAAY,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAA;;wCAApD,SAAoD,CAAA;wCAG9C,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAA;wCAE9D,YAAY,GAChB,gBAAgB,CAAC,SAAS,EAAE,kBAAkB,EAAE,MAAM,CAAC,IAAI,EAAE,CAAA;wCAE/D,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,aAAa,EAAE,EAAjB,CAAiB,CAAC,CAAA;wCACjD,qBAAM,gBAAgB,CAAC,0BAA0B,CAAC,MAAM,CAAC,EAAA;;wCAAzD,SAAyD,CAAA;wCAGnD,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAA;wCAE3D,aAAa,GACjB,gBAAgB,CAAC,SAAS,EAAE,uBAAuB,EAAE,MAAM,CAAC,IAAI,EAAE,CAAA;wCAEpE,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,aAAa,EAAE,EAAjB,CAAiB,CAAC,CAAA;wCACnD,qBAAM,gBAAgB,CAAC,0BAA0B,CAAC,OAAO,CAAC,EAAA;;wCAA1D,SAA0D,CAAA;wCAGpD,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAA;wCAElE,eAAe,GACnB,gBAAgB,CAAC,SAAS,EAAE,sBAAsB,EAAE,MAAM,CAAC,IAAI,EAAE,CAAA;wCAEnE,SAAS,GAAG,eAAe,CAAC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,aAAa,EAAE,EAAjB,CAAiB,CAAC,CAAA;wCACvD,qBAAM,gBAAgB,CAAC,0BAA0B,CAAC,SAAS,CAAC,EAAA;;wCAA5D,SAA4D,CAAA;wCAE5D,qBAAM,cAAc,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAA;;wCAA7D,SAA6D,CAAA;wCAC7D,qBAAM,cAAc,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,qBAAqB,EAAE,EAAA;;wCAArE,SAAqE,CAAA;;;;6BACtE,CAAC,EAAA;;oBAhCF,SAgCE,CAAA;;;;;CACH,EAAA"}
+{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../src/loaders/defaults.ts"],"names":[],"mappings":"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"}

package/dist/loaders/express.d.ts

@@ -1,5 +1,8 @@
-declare function _default({ app, configModule }: {
-    app: any;
-    configModule: any;
-}): Promise<any>;
+import { Express } from 'express';
+import { ConfigModule } from "../types/global";
+declare type Options = {
+    app: Express;
+    configModule: ConfigModule;
+};
+declare const _default: ({ app, configModule }: Options) => Promise<Express>;
 export default _default;

package/dist/loaders/express.js

@@ -44,12 +44,12 @@ var cookie_parser_1 = __importDefault(require("cookie-parser"));
 var morgan_1 = __importDefault(require("morgan"));
 var redis_1 = __importDefault(require("redis"));
 var connect_redis_1 = __importDefault(require("connect-redis"));
-var config_1 = __importDefault(require("../config"));
 exports.default = (function (_a) {
     var app = _a.app, configModule = _a.configModule;
     return __awaiter(void 0, void 0, void 0, function () {
-        var sameSite, secure, sessionOpts, RedisStore, redisClient;
-        return __generator(this, function (_b) {
+        var sameSite, secure, cookie_secret, sessionOpts, RedisStore, redisClient;
+        var _b;
+        return __generator(this, function (_c) {
             sameSite = false;
             secure = false;
             if (process.env.NODE_ENV === "production" ||
@@ -57,19 +57,21 @@ exports.default = (function (_a) {
                 secure = true;
                 sameSite = "none";
             }
+            cookie_secret = configModule.projectConfig.cookie_secret;
             sessionOpts = {
                 resave: true,
                 saveUninitialized: true,
                 cookieName: "session",
                 proxy: true,
-                secret: config_1.default.cookieSecret,
+                secret: cookie_secret,
                 cookie: {
                     sameSite: sameSite,
                     secure: secure,
                     maxAge: 10 * 60 * 60 * 1000,
                 },
+                store: null
             };
-            if (configModule.projectConfig.redis_url) {
+            if ((_b = configModule === null || configModule === void 0 ? void 0 : configModule.projectConfig) === null || _b === void 0 ? void 0 : _b.redis_url) {
                 RedisStore = (0, connect_redis_1.default)(express_session_1.default);
                 redisClient = redis_1.default.createClient(configModule.projectConfig.redis_url);
                 sessionOpts.store = new RedisStore({ client: redisClient });

package/dist/loaders/express.js.map

@@ -1 +1 @@
-{"version":3,"file":"express.js","sourceRoot":"","sources":["../../src/loaders/express.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oEAAqC;AACrC,gEAAwC;AACxC,kDAA2B;AAC3B,gDAAyB;AACzB,gEAAuC;AAEvC,qDAA8B;AAE9B,mBAAe,UAAO,EAAqB;QAAnB,GAAG,SAAA,EAAE,YAAY,kBAAA;;;;YACnC,QAAQ,GAAG,KAAK,CAAA;YAChB,MAAM,GAAG,KAAK,CAAA;YAClB,IACE,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY;gBACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,SAAS,EAClC;gBACA,MAAM,GAAG,IAAI,CAAA;gBACb,QAAQ,GAAG,MAAM,CAAA;aAClB;YAEG,WAAW,GAAG;gBAChB,MAAM,EAAE,IAAI;gBACZ,iBAAiB,EAAE,IAAI;gBACvB,UAAU,EAAE,SAAS;gBACrB,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE,gBAAM,CAAC,YAAY;gBAC3B,MAAM,EAAE;oBACN,QAAQ,UAAA;oBACR,MAAM,QAAA;oBACN,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;iBAC5B;aACF,CAAA;YAED,IAAI,YAAY,CAAC,aAAa,CAAC,SAAS,EAAE;gBAClC,UAAU,GAAG,IAAA,uBAAW,EAAC,yBAAO,CAAC,CAAA;gBACjC,WAAW,GAAG,eAAK,CAAC,YAAY,CAAC,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;gBAC5E,WAAW,CAAC,KAAK,GAAG,IAAI,UAAU,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAA;aAC5D;YAED,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,CAAC,CAAA;YACzB,GAAG,CAAC,GAAG,CACL,IAAA,gBAAM,EAAC,UAAU,EAAE;gBACjB,IAAI,EAAE,cAAM,OAAA,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,EAA/B,CAA+B;aAC5C,CAAC,CACH,CAAA;YACD,GAAG,CAAC,GAAG,CAAC,IAAA,uBAAY,GAAE,CAAC,CAAA;YACvB,GAAG,CAAC,GAAG,CAAC,IAAA,yBAAO,EAAC,WAAW,CAAC,CAAC,CAAA;YAE7B,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,UAAC,GAAG,EAAE,GAAG;gBAC1B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAC5B,CAAC,CAAC,CAAA;YAEF,sBAAO,GAAG,EAAA;;;CACX,EAAA"}
+{"version":3,"file":"express.js","sourceRoot":"","sources":["../../src/loaders/express.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,oEAAqC;AACrC,gEAAwC;AACxC,kDAA2B;AAC3B,gDAA0C;AAC1C,gEAAuC;AAQvC,mBAAe,UAAO,EAA8B;QAA5B,GAAG,SAAA,EAAE,YAAY,kBAAA;;;;;YACnC,QAAQ,GAAqB,KAAK,CAAA;YAClC,MAAM,GAAG,KAAK,CAAA;YAClB,IACE,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY;gBACrC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,SAAS,EAClC;gBACA,MAAM,GAAG,IAAI,CAAA;gBACb,QAAQ,GAAG,MAAM,CAAA;aAClB;YAEO,aAAa,GAAK,YAAY,CAAC,aAAa,cAA/B,CAA+B;YAChD,WAAW,GAAG;gBAChB,MAAM,EAAE,IAAI;gBACZ,iBAAiB,EAAE,IAAI;gBACvB,UAAU,EAAE,SAAS;gBACrB,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE,aAAa;gBACrB,MAAM,EAAE;oBACN,QAAQ,UAAA;oBACR,MAAM,QAAA;oBACN,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;iBAC5B;gBACD,KAAK,EAAE,IAAI;aACZ,CAAA;YAED,IAAI,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,aAAa,0CAAE,SAAS,EAAE;gBACpC,UAAU,GAAG,IAAA,uBAAW,EAAC,yBAAO,CAAC,CAAA;gBACjC,WAAW,GAAG,eAAK,CAAC,YAAY,CAAC,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;gBAC5E,WAAW,CAAC,KAAK,GAAG,IAAI,UAAU,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAA;aAC5D;YAED,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,CAAC,CAAA;YACzB,GAAG,CAAC,GAAG,CACL,IAAA,gBAAM,EAAC,UAAU,EAAE;gBACjB,IAAI,EAAE,cAAM,OAAA,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,EAA/B,CAA+B;aAC5C,CAAC,CACH,CAAA;YACD,GAAG,CAAC,GAAG,CAAC,IAAA,uBAAY,GAAE,CAAC,CAAA;YACvB,GAAG,CAAC,GAAG,CAAC,IAAA,yBAAO,EAAC,WAAW,CAAC,CAAC,CAAA;YAE7B,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,UAAC,GAAG,EAAE,GAAG;gBAC1B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAC5B,CAAC,CAAC,CAAA;YAEF,sBAAO,GAAG,EAAA;;;CACX,EAAA"}

package/dist/loaders/index.d.ts

@@ -1,10 +1,15 @@
-declare function _default({ directory: rootDirectory, expressApp, isTest }: {
-    directory: any;
-    expressApp: any;
-    isTest: any;
-}): Promise<{
-    container: import("awilix").AwilixContainer<any>;
-    dbConnection: import("typeorm").Connection;
-    app: any;
+import "reflect-metadata";
+import { Connection } from "typeorm";
+import { Express } from "express";
+import { MedusaContainer } from "../types/global";
+declare type Options = {
+    directory: string;
+    expressApp: Express;
+    isTest: boolean;
+};
+declare const _default: ({ directory: rootDirectory, expressApp, isTest }: Options) => Promise<{
+    container: MedusaContainer;
+    dbConnection: Connection;
+    app: Express;
 }>;
 export default _default;

package/dist/loaders/index.js

@@ -58,26 +58,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var awilix_1 = require("awilix");
-var medusa_core_utils_1 = require("medusa-core-utils");
-var medusa_telemetry_1 = require("medusa-telemetry");
+var config_1 = __importDefault(require("./config"));
 require("reflect-metadata");
-var request_ip_1 = __importDefault(require("request-ip"));
-var typeorm_1 = require("typeorm");
+var logger_1 = __importDefault(require("./logger"));
 var api_1 = __importDefault(require("./api"));
 var database_1 = __importDefault(require("./database"));
 var defaults_1 = __importDefault(require("./defaults"));
 var express_1 = __importDefault(require("./express"));
-var logger_1 = __importDefault(require("./logger"));
 var models_1 = __importDefault(require("./models"));
 var passport_1 = __importDefault(require("./passport"));
 var plugins_1 = __importStar(require("./plugins"));
 var redis_1 = __importDefault(require("./redis"));
 var repositories_1 = __importDefault(require("./repositories"));
+var request_ip_1 = __importDefault(require("request-ip"));
 var search_index_1 = __importDefault(require("./search-index"));
 var services_1 = __importDefault(require("./services"));
 var strategies_1 = __importDefault(require("./strategies"));
 var subscribers_1 = __importDefault(require("./subscribers"));
+var typeorm_1 = require("typeorm");
+var awilix_1 = require("awilix");
+var medusa_telemetry_1 = require("medusa-telemetry");
 exports.default = (function (_a) {
     var rootDirectory = _a.directory, expressApp = _a.expressApp, isTest = _a.isTest;
     return __awaiter(void 0, void 0, void 0, function () {
@@ -85,8 +85,9 @@ exports.default = (function (_a) {
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    configModule = (0, medusa_core_utils_1.getConfigFile)(rootDirectory, "medusa-config").configModule;
+                    configModule = (0, config_1.default)(rootDirectory);
                     container = (0, awilix_1.createContainer)();
+                    container.register('configModule', (0, awilix_1.asValue)(configModule));
                     container.registerAdd = function (name, registration) {
                         var storeKey = name + "_STORE";
                         if (this.registrations[storeKey] === undefined) {
@@ -102,21 +103,20 @@ exports.default = (function (_a) {
                     // Add additional information to context of request
                     expressApp.use(function (req, res, next) {
                         var ipAddress = request_ip_1.default.getClientIp(req);
-                        var context = {
+                        req.request_context = {
                             ip_address: ipAddress,
                         };
-                        req.request_context = context;
                         next();
                     });
                     container.register({
-                        logger: (0, awilix_1.asValue)(logger_1.default),
+                        logger: (0, awilix_1.asValue)(logger_1.default)
                     });
                     return [4 /*yield*/, (0, redis_1.default)({ container: container, configModule: configModule, logger: logger_1.default })];
                 case 1:
                     _b.sent();
                     modelsActivity = logger_1.default.activity("Initializing models");
                     (0, medusa_telemetry_1.track)("MODELS_INIT_STARTED");
-                    (0, models_1.default)({ container: container, activityId: modelsActivity, isTest: isTest });
+                    (0, models_1.default)({ container: container });
                     mAct = logger_1.default.success(modelsActivity, "Models initialized") || {};
                     (0, medusa_telemetry_1.track)("MODELS_INIT_COMPLETED", { duration: mAct.duration });
                     pmActivity = logger_1.default.activity("Initializing plugin models");
@@ -124,7 +124,7 @@ exports.default = (function (_a) {
                     return [4 /*yield*/, (0, plugins_1.registerPluginModels)({
                             rootDirectory: rootDirectory,
                             container: container,
-                            activityId: pmActivity,
+                            configModule: configModule
                         })];
                 case 2:
                     _b.sent();
@@ -132,63 +132,40 @@ exports.default = (function (_a) {
                     (0, medusa_telemetry_1.track)("PLUGIN_MODELS_INIT_COMPLETED", { duration: pmAct.duration });
                     repoActivity = logger_1.default.activity("Initializing repositories");
                     (0, medusa_telemetry_1.track)("REPOSITORIES_INIT_STARTED");
-                    (0, repositories_1.default)({ container: container, activityId: repoActivity, isTest: isTest }) || {};
+                    (0, repositories_1.default)({ container: container });
                     rAct = logger_1.default.success(repoActivity, "Repositories initialized") || {};
                     (0, medusa_telemetry_1.track)("REPOSITORIES_INIT_COMPLETED", { duration: rAct.duration });
                     dbActivity = logger_1.default.activity("Initializing database");
                     (0, medusa_telemetry_1.track)("DATABASE_INIT_STARTED");
-                    return [4 /*yield*/, (0, database_1.default)({
-                            container: container,
-                            configModule: configModule,
-                            activityId: dbActivity,
-                            isTest: isTest,
-                        })];
+                    return [4 /*yield*/, (0, database_1.default)({ container: container, configModule: configModule })];
                 case 3:
                     dbConnection = _b.sent();
                     dbAct = logger_1.default.success(dbActivity, "Database initialized") || {};
                     (0, medusa_telemetry_1.track)("DATABASE_INIT_COMPLETED", { duration: dbAct.duration });
-                    container.register({
-                        manager: (0, awilix_1.asValue)(dbConnection.manager),
-                    });
+                    container.register({ manager: (0, awilix_1.asValue)(dbConnection.manager), });
                     stratActivity = logger_1.default.activity("Initializing strategies");
                     (0, medusa_telemetry_1.track)("STRATEGIES_INIT_STARTED");
-                    (0, strategies_1.default)({
-                        container: container,
-                        configModule: configModule,
-                        activityId: stratActivity,
-                        isTest: isTest,
-                    });
+                    (0, strategies_1.default)({ container: container, configModule: configModule, isTest: isTest });
                     stratAct = logger_1.default.success(stratActivity, "Strategies initialized") || {};
                     (0, medusa_telemetry_1.track)("STRATEGIES_INIT_COMPLETED", { duration: stratAct.duration });
                     servicesActivity = logger_1.default.activity("Initializing services");
                     (0, medusa_telemetry_1.track)("SERVICES_INIT_STARTED");
-                    (0, services_1.default)({
-                        container: container,
-                        configModule: configModule,
-                        activityId: servicesActivity,
-                        isTest: isTest,
-                    });
+                    (0, services_1.default)({ container: container, configModule: configModule, isTest: isTest });
                     servAct = logger_1.default.success(servicesActivity, "Services initialized") || {};
                     (0, medusa_telemetry_1.track)("SERVICES_INIT_COMPLETED", { duration: servAct.duration });
                     expActivity = logger_1.default.activity("Initializing express");
                     (0, medusa_telemetry_1.track)("EXPRESS_INIT_STARTED");
-                    return [4 /*yield*/, (0, express_1.default)({
-                            app: expressApp,
-                            configModule: configModule,
-                            activityId: expActivity,
-                        })];
+                    return [4 /*yield*/, (0, express_1.default)({ app: expressApp, configModule: configModule })];
                 case 4:
                     _b.sent();
-                    return [4 /*yield*/, (0, passport_1.default)({ app: expressApp, container: container, activityId: expActivity })];
+                    return [4 /*yield*/, (0, passport_1.default)({ app: expressApp, container: container, configModule: configModule })];
                 case 5:
                     _b.sent();
                     exAct = logger_1.default.success(expActivity, "Express intialized") || {};
                     (0, medusa_telemetry_1.track)("EXPRESS_INIT_COMPLETED", { duration: exAct.duration });
                     // Add the registered services to the request scope
                     expressApp.use(function (req, res, next) {
-                        container.register({
-                            manager: (0, awilix_1.asValue)((0, typeorm_1.getManager)()),
-                        });
+                        container.register({ manager: (0, awilix_1.asValue)((0, typeorm_1.getManager)()) });
                         req.scope = container.createScope();
                         next();
                     });
@@ -197,6 +174,7 @@ exports.default = (function (_a) {
                     return [4 /*yield*/, (0, plugins_1.default)({
                             container: container,
                             rootDirectory: rootDirectory,
+                            configModule: configModule,
                             app: expressApp,
                             activityId: pluginsActivity,
                         })];
@@ -206,31 +184,28 @@ exports.default = (function (_a) {
                     (0, medusa_telemetry_1.track)("PLUGINS_INIT_COMPLETED", { duration: pAct.duration });
                     subActivity = logger_1.default.activity("Initializing subscribers");
                     (0, medusa_telemetry_1.track)("SUBSCRIBERS_INIT_STARTED");
-                    (0, subscribers_1.default)({ container: container, activityId: subActivity });
+                    (0, subscribers_1.default)({ container: container });
                     subAct = logger_1.default.success(subActivity, "Subscribers initialized") || {};
                     (0, medusa_telemetry_1.track)("SUBSCRIBERS_INIT_COMPLETED", { duration: subAct.duration });
                     apiActivity = logger_1.default.activity("Initializing API");
                     (0, medusa_telemetry_1.track)("API_INIT_STARTED");
-                    return [4 /*yield*/, (0, api_1.default)({
-                            container: container,
-                            rootDirectory: rootDirectory,
-                            app: expressApp,
-                            activityId: apiActivity,
-                        })];
+                    return [4 /*yield*/, (0, api_1.default)({ container: container, app: expressApp, configModule: configModule })];
                 case 7:
                     _b.sent();
                     apiAct = logger_1.default.success(apiActivity, "API initialized") || {};
                     (0, medusa_telemetry_1.track)("API_INIT_COMPLETED", { duration: apiAct.duration });
                     defaultsActivity = logger_1.default.activity("Initializing defaults");
                     (0, medusa_telemetry_1.track)("DEFAULTS_INIT_STARTED");
-                    return [4 /*yield*/, (0, defaults_1.default)({ container: container, activityId: defaultsActivity })];
+                    return [4 /*yield*/, (0, defaults_1.default)({ container: container })];
                 case 8:
                     _b.sent();
                     dAct = logger_1.default.success(defaultsActivity, "Defaults initialized") || {};
                     (0, medusa_telemetry_1.track)("DEFAULTS_INIT_COMPLETED", { duration: dAct.duration });
                     searchActivity = logger_1.default.activity("Initializing search engine indexing");
                     (0, medusa_telemetry_1.track)("SEARCH_ENGINE_INDEXING_STARTED");
-                    (0, search_index_1.default)({ container: container, activityId: searchActivity });
+                    return [4 /*yield*/, (0, search_index_1.default)({ container: container })];
+                case 9:
+                    _b.sent();
                     searchAct = logger_1.default.success(searchActivity, "Indexing completed") || {};
                     (0, medusa_telemetry_1.track)("SEARCH_ENGINE_INDEXING_COMPLETED", { duration: searchAct.duration });
                     return [2 /*return*/, { container: container, dbConnection: dbConnection, app: expressApp }];
@@ -240,8 +215,8 @@ exports.default = (function (_a) {
 });
 function asArray(resolvers) {
     return {
-        resolve: function (container, opts) {
-            return resolvers.map(function (r) { return container.build(r, opts); });
+        resolve: function (container) {
+            return resolvers.map(function (resolver) { return container.build(resolver); });
         },
     };
 }