feature: bundle all modules

integration-tests/modules/src/subscribers/test-event-payload.ts

@@ -1,4 +1,4 @@
-import { SubscriberConfig } from "@medusajs/medusa/src"
+import { SubscriberConfig } from "@medusajs/medusa"
 
 const testEventPayloadHandlerMock = jest.fn()
 

integration-tests/package.json

@@ -26,7 +26,6 @@
  "@mikro-orm/migrations": "5.9.7",
  "@mikro-orm/postgresql": "5.9.7",
  "awilix": "^8.0.1",
- "bignumber.js": "^9.1.2",
  "ioredis": "^5.4.1",
  "pg": "^8.13.0",
  "pg-god": "^1.0.12",

package.json

@@ -4,6 +4,7 @@
  "workspaces": {
  "packages": [
  "packages/medusa",
+ "packages/medusa-test-utils",
  "packages/modules/*",
  "packages/modules/providers/*",
  "packages/core/*",

packages/admin/admin-bundler/package.json

@@ -21,7 +21,7 @@
  "@medusajs/types": "^1.11.16",
  "@types/compression": "^1.7.5",
  "copyfiles": "^2.4.1",
- "express": "^4.18.2",
+ "express": "^4.21.0",
  "tsup": "^8.0.1",
  "typescript": "^5.3.3"
  },
@@ -37,7 +37,7 @@
  "vite": "^5.2.11"
  },
  "peerDependencies": {
- "express": "^4.18.2",
+ "express": "^4.21.0",
  "react-dom": "^18.0.0"
  },
  "packageManager": "[email protected]"

packages/cli/medusa-cli/package.json

@@ -32,10 +32,16 @@
  "author": "Sebastian Rindom",
  "license": "MIT",
  "devDependencies": {
+ "@mikro-orm/core": "5.9.7",
+ "@mikro-orm/knex": "5.9.7",
+ "@mikro-orm/migrations": "5.9.7",
+ "@mikro-orm/postgresql": "5.9.7",
  "@swc/core": "^1.7.28",
  "@swc/jest": "^0.2.36",
  "@types/yargs": "^15.0.15",
+ "awilix": "^8.0.1",
  "jest": "^29.7.0",
+ "pg": "^8.13.0",
  "rimraf": "^5.0.1",
  "typescript": "^5.6.2"
  },
@@ -45,6 +51,7 @@
  "configstore": "5.0.1",
  "dotenv": "^16.4.5",
  "execa": "^5.1.1",
+ "express": "^4.21.0",
  "fs-exists-cached": "^1.0.0",
  "fs-extra": "^10.0.0",
  "glob": "^7.1.6",
@@ -63,5 +70,13 @@
  "winston": "^3.8.2",
  "yargs": "^15.3.1"
  },
+ "peerDependencies": {
+ "@mikro-orm/core": "5.9.7",
+ "@mikro-orm/knex": "5.9.7",
+ "@mikro-orm/migrations": "5.9.7",
+ "@mikro-orm/postgresql": "5.9.7",
+ "awilix": "^8.0.1",
+ "pg": "^8.13.0"
+ },
  "gitHead": "81a7ff73d012fda722f6e9ef0bd9ba0232d37808"
 }

packages/cli/medusa-cli/src/create-cli.ts

@@ -39,9 +39,7 @@ function buildLocalCommands(cli, isLocalProject) {
  }
 
  try {
- const cmdPath = resolveCwd.silent(
- `@medusajs/medusa/dist/commands/${command}`
- )!
+ const cmdPath = resolveCwd.silent(`@medusajs/medusa/commands/${command}`)!
  return require(cmdPath).default
  } catch (err) {
  console.error(err)

packages/core/core-flows/package.json

@@ -34,9 +34,6 @@
  "@swc/core": "^1.7.28",
  "@swc/jest": "^0.2.36",
  "awilix": "^8.0.1",
- "bignumber.js": "^9.1.2",
- "cross-env": "^5.2.1",
- "ioredis": "^5.4.1",
  "jest": "^29.7.0",
  "pg": "^8.13.0",
  "rimraf": "^5.0.1",

packages/core/framework/package.json

@@ -49,6 +49,7 @@
  "test": "jest --runInBand --bail --passWithNoTests --forceExit"
  },
  "devDependencies": {
+ "@medusajs/medusa-cli": "^1.3.22",
  "@mikro-orm/core": "5.9.7",
  "@mikro-orm/knex": "5.9.7",
  "@mikro-orm/migrations": "5.9.7",
@@ -58,7 +59,6 @@
  "@types/express": "^4.17.17",
  "@types/jsonwebtoken": "^8.5.9",
  "awilix": "^8.0.1",
- "bignumber.js": "^9.1.2",
  "ioredis": "^5.4.1",
  "jest": "^29.7.0",
  "pg": "^8.13.0",
@@ -68,7 +68,6 @@
  "vite": "^5.2.11"
  },
  "dependencies": {
- "@medusajs/medusa-cli": "^1.3.22",
  "@medusajs/modules-sdk": "^1.12.11",
  "@medusajs/orchestration": "^0.5.7",
  "@medusajs/types": "^1.11.16",
@@ -78,23 +77,30 @@
  "connect-redis": "5.2.0",
  "cookie-parser": "^1.4.6",
  "cors": "^2.8.5",
- "express": "^4.18.2",
+ "express": "^4.21.0",
  "express-session": "^1.17.3",
- "ioredis": "^5.4.1",
  "jsonwebtoken": "^9.0.2",
  "medusa-telemetry": "^0.0.17",
  "morgan": "^1.9.1",
  "zod": "3.22.4"
  },
  "peerDependencies": {
+ "@medusajs/medusa-cli": "^1.3.22",
  "@mikro-orm/core": "5.9.7",
  "@mikro-orm/knex": "5.9.7",
  "@mikro-orm/migrations": "5.9.7",
  "@mikro-orm/postgresql": "5.9.7",
  "awilix": "^8.0.1",
- "bignumber.js": "^9.1.2",
  "ioredis": "^5.4.1",
  "pg": "^8.13.0",
  "vite": "^5.2.11"
+ },
+ "peerDependenciesMeta": {
+ "ioredis": {
+ "optional": true
+ },
+ "vite": {
+ "optional": true
+ }
  }
 }

packages/core/modules-sdk/package.json

@@ -33,11 +33,14 @@
  "devDependencies": {
  "@mikro-orm/core": "5.9.7",
  "@mikro-orm/knex": "5.9.7",
+ "@mikro-orm/migrations": "5.9.7",
+ "@mikro-orm/postgresql": "5.9.7",
  "@swc/core": "^1.7.28",
  "@swc/jest": "^0.2.36",
  "awilix": "^8.0.1",
  "cross-env": "^5.2.1",
  "jest": "^29.7.0",
+ "pg": "^8.13.0",
  "rimraf": "^5.0.1",
  "typescript": "^5.6.2"
  },
@@ -50,6 +53,10 @@
  "peerDependencies": {
  "@mikro-orm/core": "5.9.7",
  "@mikro-orm/knex": "5.9.7",
- "awilix": "^8.0.1"
+ "@mikro-orm/migrations": "5.9.7",
+ "@mikro-orm/postgresql": "5.9.7",
+ "awilix": "^8.0.1",
+ "express": "^4.21.0",
+ "pg": "^8.13.0"
  }
 }

packages/core/modules-sdk/src/definitions.ts

@@ -7,31 +7,32 @@ import {
 import { MODULE_RESOURCE_TYPE, MODULE_SCOPE } from "./types"
 
 export const MODULE_PACKAGE_NAMES = {
- [Modules.AUTH]: "@medusajs/auth",
- [Modules.CACHE]: "@medusajs/cache-inmemory",
- [Modules.CART]: "@medusajs/cart",
- [Modules.CUSTOMER]: "@medusajs/customer",
- [Modules.EVENT_BUS]: "@medusajs/event-bus-local",
- [Modules.INVENTORY]: "@medusajs/inventory-next", // TODO: To be replaced when current `@medusajs/inventory` is deprecated
- [Modules.LINK]: "@medusajs/link-modules",
- [Modules.PAYMENT]: "@medusajs/payment",
- [Modules.PRICING]: "@medusajs/pricing",
- [Modules.PRODUCT]: "@medusajs/product",
- [Modules.PROMOTION]: "@medusajs/promotion",
- [Modules.SALES_CHANNEL]: "@medusajs/sales-channel",
- [Modules.FULFILLMENT]: "@medusajs/fulfillment",
- [Modules.STOCK_LOCATION]: "@medusajs/stock-location-next", // TODO: To be replaced when current `@medusajs/stock-location` is deprecated
- [Modules.TAX]: "@medusajs/tax",
- [Modules.USER]: "@medusajs/user",
- [Modules.WORKFLOW_ENGINE]: "@medusajs/workflow-engine-inmemory",
- [Modules.REGION]: "@medusajs/region",
- [Modules.ORDER]: "@medusajs/order",
- [Modules.API_KEY]: "@medusajs/api-key",
- [Modules.STORE]: "@medusajs/store",
- [Modules.CURRENCY]: "@medusajs/currency",
- [Modules.FILE]: "@medusajs/file",
- [Modules.NOTIFICATION]: "@medusajs/notification",
- [Modules.INDEX]: "@medusajs/index",
+ [Modules.AUTH]: "@medusajs/medusa/modules/auth",
+ [Modules.CACHE]: "@medusajs/medusa/modules/cache-inmemory",
+ [Modules.CART]: "@medusajs/medusa/modules/cart",
+ [Modules.CUSTOMER]: "@medusajs/medusa/modules/customer",
+ [Modules.EVENT_BUS]: "@medusajs/medusa/modules/event-bus-local",
+ [Modules.INVENTORY]: "@medusajs/medusa/modules/inventory-next", // TODO: To be replaced when current `@medusajs/inventory` is deprecated
+ [Modules.LINK]: "@medusajs/medusa/modules/link-modules",
+ [Modules.PAYMENT]: "@medusajs/medusa/modules/payment",
+ [Modules.PRICING]: "@medusajs/medusa/modules/pricing",
+ [Modules.PRODUCT]: "@medusajs/medusa/modules/product",
+ [Modules.PROMOTION]: "@medusajs/medusa/modules/promotion",
+ [Modules.SALES_CHANNEL]: "@medusajs/medusa/modules/sales-channel",
+ [Modules.FULFILLMENT]: "@medusajs/medusa/modules/fulfillment",
+ [Modules.STOCK_LOCATION]: "@medusajs/medusa/modules/stock-location-next", // TODO: To be replaced when current `@medusajs/stock-location` is deprecated
+ [Modules.TAX]: "@medusajs/medusa/modules/tax",
+ [Modules.USER]: "@medusajs/medusa/modules/user",
+ [Modules.WORKFLOW_ENGINE]:
+ "@medusajs/medusa/modules/workflow-engine-inmemory",
+ [Modules.REGION]: "@medusajs/medusa/modules/region",
+ [Modules.ORDER]: "@medusajs/medusa/modules/order",
+ [Modules.API_KEY]: "@medusajs/medusa/modules/api-key",
+ [Modules.STORE]: "@medusajs/medusa/modules/store",
+ [Modules.CURRENCY]: "@medusajs/medusa/modules/currency",
+ [Modules.FILE]: "@medusajs/medusa/modules/file",
+ [Modules.NOTIFICATION]: "@medusajs/medusa/modules/notification",
+ [Modules.INDEX]: "@medusajs/medusa/modules/index-module",
 }
 
 export const ModulesDefinition: {

packages/core/modules-sdk/src/loaders/utils/__tests__/load-internal.spec.ts

@@ -35,7 +35,10 @@ describe("load internal - load resources", () => {
  (ModuleService.prototype as IModuleService).__joinerConfig
  ).toBeUndefined()
 
- const resources = await loadResources(moduleResolution)
+ const resources = await loadResources({
+ moduleResolution,
+ discoveryPath: moduleResolution.resolutionPath as string,
+ })
 
  expect(resources).toBeDefined()
  expect(resources.services).toHaveLength(1)
@@ -115,7 +118,10 @@ describe("load internal - load resources", () => {
  (ModuleService.prototype as IModuleService).__joinerConfig
  ).toBeUndefined()
 
- const resources = await loadResources(moduleResolution)
+ const resources = await loadResources({
+ moduleResolution,
+ discoveryPath: moduleResolution.resolutionPath as string,
+ })
 
  expect(resources).toBeDefined()
  expect(resources.services).toHaveLength(1)
@@ -195,7 +201,10 @@ describe("load internal - load resources", () => {
  (ModuleService.prototype as IModuleService).__joinerConfig
  ).toBeUndefined()
 
- const resources = await loadResources(moduleResolution)
+ const resources = await loadResources({
+ moduleResolution,
+ discoveryPath: moduleResolution.resolutionPath as string,
+ })
 
  expect(resources).toBeDefined()
  expect(resources.services).toHaveLength(1)
@@ -274,7 +283,10 @@ describe("load internal - load resources", () => {
  (ModuleService.prototype as IModuleService).__joinerConfig
  ).toBeDefined()
 
- const resources = await loadResources(moduleResolution)
+ const resources = await loadResources({
+ moduleResolution,
+ discoveryPath: moduleResolution.resolutionPath as string,
+ })
 
  expect(resources).toBeDefined()
  expect(resources.services).toHaveLength(1)