diff --git a/integration-tests/modules/src/subscribers/test-event-payload.ts b/integration-tests/modules/src/subscribers/test-event-payload.ts index 7b35d91907284..ee256a1a1aa05 100644 --- a/integration-tests/modules/src/subscribers/test-event-payload.ts +++ b/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() diff --git a/integration-tests/package.json b/integration-tests/package.json index d49376272efb4..ad68c33b607f0 100644 --- a/integration-tests/package.json +++ b/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", diff --git a/package.json b/package.json index f4dfae64a3b88..3202bff857670 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "workspaces": { "packages": [ "packages/medusa", + "packages/medusa-test-utils", "packages/modules/*", "packages/modules/providers/*", "packages/core/*", diff --git a/packages/admin/admin-bundler/package.json b/packages/admin/admin-bundler/package.json index c0fa2b1c46f35..c05f024838d1b 100644 --- a/packages/admin/admin-bundler/package.json +++ b/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": "yarn@3.2.1" diff --git a/packages/cli/medusa-cli/package.json b/packages/cli/medusa-cli/package.json index e2ddd02e14333..6ee62202f178d 100644 --- a/packages/cli/medusa-cli/package.json +++ b/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" } diff --git a/packages/cli/medusa-cli/src/create-cli.ts b/packages/cli/medusa-cli/src/create-cli.ts index c2be63a32f6bf..095558f79ac58 100644 --- a/packages/cli/medusa-cli/src/create-cli.ts +++ b/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) diff --git a/packages/core/core-flows/package.json b/packages/core/core-flows/package.json index 93a73722995d7..9fa8154746666 100644 --- a/packages/core/core-flows/package.json +++ b/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", diff --git a/packages/core/framework/package.json b/packages/core/framework/package.json index d151490c56d25..dbb69ebec5174 100644 --- a/packages/core/framework/package.json +++ b/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 + } } } diff --git a/packages/core/medusa-test-utils/tsconfig.json b/packages/core/medusa-test-utils/tsconfig.json deleted file mode 100644 index f9a18581b3997..0000000000000 --- a/packages/core/medusa-test-utils/tsconfig.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "../../../_tsconfig.base.json" -} diff --git a/packages/core/modules-sdk/package.json b/packages/core/modules-sdk/package.json index db83aa63796e4..136b7cf6be4ca 100644 --- a/packages/core/modules-sdk/package.json +++ b/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" } } diff --git a/packages/core/modules-sdk/src/definitions.ts b/packages/core/modules-sdk/src/definitions.ts index 468d071c9f4ec..cb33ed1a916cb 100644 --- a/packages/core/modules-sdk/src/definitions.ts +++ b/packages/core/modules-sdk/src/definitions.ts @@ -7,31 +7,31 @@ 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/auth", + [Modules.CACHE]: "@medusajs/medusa/cache-inmemory", + [Modules.CART]: "@medusajs/medusa/cart", + [Modules.CUSTOMER]: "@medusajs/medusa/customer", + [Modules.EVENT_BUS]: "@medusajs/medusa/event-bus-local", + [Modules.INVENTORY]: "@medusajs/medusa/inventory-next", // TODO: To be replaced when current `@medusajs/inventory` is deprecated + [Modules.LINK]: "@medusajs/medusa/link-modules", + [Modules.PAYMENT]: "@medusajs/medusa/payment", + [Modules.PRICING]: "@medusajs/medusa/pricing", + [Modules.PRODUCT]: "@medusajs/medusa/product", + [Modules.PROMOTION]: "@medusajs/medusa/promotion", + [Modules.SALES_CHANNEL]: "@medusajs/medusa/sales-channel", + [Modules.FULFILLMENT]: "@medusajs/medusa/fulfillment", + [Modules.STOCK_LOCATION]: "@medusajs/medusa/stock-location-next", // TODO: To be replaced when current `@medusajs/stock-location` is deprecated + [Modules.TAX]: "@medusajs/medusa/tax", + [Modules.USER]: "@medusajs/medusa/user", + [Modules.WORKFLOW_ENGINE]: "@medusajs/medusa/workflow-engine-inmemory", + [Modules.REGION]: "@medusajs/medusa/region", + [Modules.ORDER]: "@medusajs/medusa/order", + [Modules.API_KEY]: "@medusajs/medusa/api-key", + [Modules.STORE]: "@medusajs/medusa/store", + [Modules.CURRENCY]: "@medusajs/medusa/currency", + [Modules.FILE]: "@medusajs/medusa/file", + [Modules.NOTIFICATION]: "@medusajs/medusa/notification", + [Modules.INDEX]: "@medusajs/medusa/index-module", } export const ModulesDefinition: { diff --git a/packages/core/modules-sdk/src/loaders/utils/__tests__/load-internal.spec.ts b/packages/core/modules-sdk/src/loaders/utils/__tests__/load-internal.spec.ts index 4d9dc38ea2503..f2bcfdd5f1f2f 100644 --- a/packages/core/modules-sdk/src/loaders/utils/__tests__/load-internal.spec.ts +++ b/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) diff --git a/packages/core/modules-sdk/src/loaders/utils/load-internal.ts b/packages/core/modules-sdk/src/loaders/utils/load-internal.ts index 0932dc42f8d05..04417a20b4686 100644 --- a/packages/core/modules-sdk/src/loaders/utils/load-internal.ts +++ b/packages/core/modules-sdk/src/loaders/utils/load-internal.ts @@ -22,7 +22,7 @@ import { import { asFunction, asValue } from "awilix" import { statSync } from "fs" import { readdir } from "fs/promises" -import { join, resolve } from "path" +import { dirname, join, resolve } from "path" import { MODULE_RESOURCE_TYPE } from "../../types" type ModuleResource = { @@ -39,35 +39,40 @@ type MigrationFunction = ( moduleDeclaration?: InternalModuleDeclaration ) => Promise -export async function loadInternalModule( - container: MedusaContainer, - resolution: ModuleResolution, - logger: Logger, - migrationOnly?: boolean, - loaderOnly?: boolean -): Promise<{ error?: Error } | void> { - const keyName = !loaderOnly - ? resolution.definition.key - : resolution.definition.key + "__loaderOnly" - - const { resources } = - resolution.moduleDeclaration as InternalModuleDeclaration - - let loadedModule: ModuleExports +export async function resolveModuleExports({ + resolution, +}: { + resolution: ModuleResolution +}): Promise< + | (ModuleExports & { + discoveryPath: string + }) + | { error: any } +> { + let resolvedModuleExports: ModuleExports try { - // When loading manually, we pass the exports to be loaded, meaning that we do not need to import the package to find - // the exports. This is useful when a package export an initialize function which will bootstrap itself and therefore - // does not need to import the package that is currently being loaded as it would create a - // circular reference. - const modulePath = resolution.resolutionPath as string - if (resolution.moduleExports) { // TODO: // If we want to benefit from the auto load mechanism, even if the module exports is provided, we need to ask for the module path - loadedModule = resolution.moduleExports + resolvedModuleExports = resolution.moduleExports + resolvedModuleExports.discoveryPath = resolution.resolutionPath as string } else { - loadedModule = await dynamicImport(modulePath) - loadedModule = (loadedModule as any).default + const module = await dynamicImport(resolution.resolutionPath as string) + + if ("discoveryPath" in module) { + const reExportedLoadedModule = await dynamicImport(module.discoveryPath) + const discoveryPath = module.discoveryPath + resolvedModuleExports = reExportedLoadedModule.default + resolvedModuleExports.discoveryPath = discoveryPath as string + } else { + resolvedModuleExports = (module as { default: ModuleExports }).default + resolvedModuleExports.discoveryPath = + resolution.resolutionPath as string + } + } + + return resolvedModuleExports as ModuleExports & { + discoveryPath: string } } catch (error) { if ( @@ -83,15 +88,37 @@ export async function loadInternalModule( return { error } } +} + +export async function loadInternalModule( + container: MedusaContainer, + resolution: ModuleResolution, + logger: Logger, + migrationOnly?: boolean, + loaderOnly?: boolean +): Promise<{ error?: Error } | void> { + const keyName = !loaderOnly + ? resolution.definition.key + : resolution.definition.key + "__loaderOnly" + + const { resources } = + resolution.moduleDeclaration as InternalModuleDeclaration + + const loadedModule = await resolveModuleExports({ resolution }) + + if ("error" in loadedModule) { + return loadedModule + } let moduleResources = {} as ModuleResource - if (resolution.resolutionPath) { - moduleResources = await loadResources( - resolution, + if (loadedModule.discoveryPath) { + moduleResources = await loadResources({ + moduleResolution: resolution, + discoveryPath: loadedModule.discoveryPath, logger, - loadedModule?.loaders ?? [] - ) + loadedModuleLoaders: loadedModule?.loaders, + }) } if (!loadedModule?.service && !moduleResources.moduleService) { @@ -193,22 +220,25 @@ export async function loadModuleMigrations( revertMigration?: MigrationFunction generateMigration?: MigrationFunction }> { - let loadedModule: ModuleExports - try { - loadedModule = - moduleExports ?? - (await dynamicImport(resolution.resolutionPath as string)) + const loadedModule = await resolveModuleExports({ + resolution: { ...resolution, moduleExports }, + }) + if ("error" in loadedModule) { + throw loadedModule.error + } + + try { let runMigrations = loadedModule.runMigrations let revertMigration = loadedModule.revertMigration let generateMigration = loadedModule.generateMigration if (!runMigrations || !revertMigration) { - const moduleResources = await loadResources( - resolution, - console as unknown as Logger, - loadedModule?.loaders ?? [] - ) + const moduleResources = await loadResources({ + moduleResolution: resolution, + discoveryPath: loadedModule.discoveryPath, + loadedModuleLoaders: loadedModule?.loaders, + }) const migrationScriptOptions = { moduleName: resolution.definition.key, @@ -269,15 +299,22 @@ async function importAllFromDir(path: string) { }) } -export async function loadResources( - moduleResolution: ModuleResolution, - logger: Logger = console as unknown as Logger, +export async function loadResources({ + moduleResolution, + discoveryPath, + logger, + loadedModuleLoaders, +}: { + moduleResolution: ModuleResolution + discoveryPath: string + logger?: Logger loadedModuleLoaders?: ModuleLoaderFunction[] -): Promise { - let modulePath = moduleResolution.resolutionPath as string - let normalizedPath = modulePath - .replace("index.js", "") - .replace("index.ts", "") +}): Promise { + logger ??= console as unknown as Logger + loadedModuleLoaders ??= [] + + const modulePath = discoveryPath + let normalizedPath = dirname(require.resolve(modulePath)) normalizedPath = resolve(normalizedPath) try { diff --git a/packages/core/modules-sdk/src/medusa-app.ts b/packages/core/modules-sdk/src/medusa-app.ts index 0b794ccab7b64..64e26629ca5d3 100644 --- a/packages/core/modules-sdk/src/medusa-app.ts +++ b/packages/core/modules-sdk/src/medusa-app.ts @@ -206,8 +206,16 @@ async function initializeLinks({ moduleExports, }) { try { - const { initialize, getMigrationPlanner } = - moduleExports ?? (await dynamicImport(LinkModulePackage)) + let resources = moduleExports + if (!resources) { + const module = await dynamicImport(LinkModulePackage) + if ("discoveryPath" in module) { + const reExportedLoadedModule = await dynamicImport(module.discoveryPath) + resources = reExportedLoadedModule.default ?? reExportedLoadedModule + } + } + + const { initialize, getMigrationPlanner } = resources const linkResolution = await initialize( config, diff --git a/packages/core/orchestration/package.json b/packages/core/orchestration/package.json index 07fd76d2aceec..b42917483aeec 100644 --- a/packages/core/orchestration/package.json +++ b/packages/core/orchestration/package.json @@ -26,10 +26,15 @@ "author": "Medusa", "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", "awilix": "^8.0.1", "jest": "^29.7.0", + "pg": "^8.13.0", "rimraf": "^5.0.1", "typescript": "^5.6.2" }, @@ -38,7 +43,13 @@ "@medusajs/utils": "^1.11.9" }, "peerDependencies": { - "awilix": "^8.0.1" + "@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", + "express": "^4.21.0", + "pg": "^8.13.0" }, "scripts": { "build": "rimraf dist && tsc --build", diff --git a/packages/core/types/package.json b/packages/core/types/package.json index 13d6efe092557..a74319b964eaa 100644 --- a/packages/core/types/package.json +++ b/packages/core/types/package.json @@ -31,9 +31,11 @@ "watch": "tsc --build --watch", "test": "exit 0" }, + "dependencies": { + "bignumber.js": "^9.1.2" + }, "devDependencies": { "awilix": "^8.0.1", - "bignumber.js": "^9.1.2", "expect-type": "^0.20.0", "ioredis": "^5.4.1", "rimraf": "^5.0.1", @@ -42,11 +44,13 @@ }, "peerDependencies": { "awilix": "^8.0.1", - "bignumber.js": "^9.1.2", "ioredis": "^5.4.1", "vite": "^5.2.11" }, "peerDependenciesMeta": { + "ioredis": { + "optional": true + }, "vite": { "optional": true } diff --git a/packages/core/types/src/modules-sdk/index.ts b/packages/core/types/src/modules-sdk/index.ts index 2b0dc21792e34..b9db5af72cf8e 100644 --- a/packages/core/types/src/modules-sdk/index.ts +++ b/packages/core/types/src/modules-sdk/index.ts @@ -264,6 +264,11 @@ export type ModuleExports> = { options: LoaderOptions, moduleDeclaration?: InternalModuleDeclaration ): Promise + /** + * Explicitly set the the true location of the module resources. + * Can be used to re-export the module from a different location and specify its original location. + */ + discoveryPath?: string } export interface ModuleServiceInitializeOptions { diff --git a/packages/core/utils/package.json b/packages/core/utils/package.json index 3e0d16b0c84a8..f2583d1dbf756 100644 --- a/packages/core/utils/package.json +++ b/packages/core/utils/package.json @@ -34,7 +34,6 @@ "@swc/jest": "^0.2.36", "@types/express": "^4.17.21", "awilix": "^8.0.1", - "bignumber.js": "^9.1.2", "expect-type": "^0.20.0", "express": "^4.21.0", "jest": "^29.7.0", @@ -49,6 +48,7 @@ "@graphql-tools/merge": "^9.0.7", "@graphql-tools/schema": "^10.0.6", "@medusajs/types": "^1.11.16", + "bignumber.js": "^9.1.2", "dotenv": "^16.4.5", "dotenv-expand": "^11.0.6", "graphql": "^16.9.0", @@ -63,7 +63,7 @@ "@mikro-orm/migrations": "5.9.7", "@mikro-orm/postgresql": "5.9.7", "awilix": "^8.0.1", - "bignumber.js": "^9.1.2", + "express": "^4.21.0", "pg": "^8.13.0" }, "scripts": { diff --git a/packages/core/utils/src/common/resolve-exports.ts b/packages/core/utils/src/common/resolve-exports.ts index c0655adef175d..369cd92b34c06 100644 --- a/packages/core/utils/src/common/resolve-exports.ts +++ b/packages/core/utils/src/common/resolve-exports.ts @@ -1,5 +1,9 @@ export function resolveExports(moduleExports) { - if ("default" in moduleExports && "default" in moduleExports.default) { + if ( + "default" in moduleExports && + moduleExports.default && + "default" in moduleExports.default + ) { return resolveExports(moduleExports.default) } return moduleExports diff --git a/packages/core/workflows-sdk/package.json b/packages/core/workflows-sdk/package.json index b6f6ae663e7cf..00be8e5ff1413 100644 --- a/packages/core/workflows-sdk/package.json +++ b/packages/core/workflows-sdk/package.json @@ -27,10 +27,15 @@ "author": "Medusa", "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", "awilix": "^8.0.1", "jest": "^29.7.0", + "pg": "^8.13.0", "rimraf": "^5.0.1", "typescript": "^5.6.2" }, @@ -42,7 +47,13 @@ "ulid": "^2.3.0" }, "peerDependencies": { - "awilix": "^8.0.1" + "@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", + "express": "^4.21.0", + "pg": "^8.13.0" }, "scripts": { "build": "rimraf dist && tsc --build", diff --git a/packages/core/medusa-test-utils/.gitignore b/packages/medusa-test-utils/.gitignore similarity index 100% rename from packages/core/medusa-test-utils/.gitignore rename to packages/medusa-test-utils/.gitignore diff --git a/packages/core/medusa-test-utils/CHANGELOG.md b/packages/medusa-test-utils/CHANGELOG.md similarity index 100% rename from packages/core/medusa-test-utils/CHANGELOG.md rename to packages/medusa-test-utils/CHANGELOG.md diff --git a/packages/core/medusa-test-utils/package.json b/packages/medusa-test-utils/package.json similarity index 94% rename from packages/core/medusa-test-utils/package.json rename to packages/medusa-test-utils/package.json index 07ed0ae9f2201..722726d79ce7e 100644 --- a/packages/core/medusa-test-utils/package.json +++ b/packages/medusa-test-utils/package.json @@ -31,9 +31,6 @@ "@mikro-orm/migrations": "5.9.7", "@mikro-orm/postgresql": "5.9.7", "awilix": "^8.0.1", - "bignumber.js": "^9.1.2", - "express": "^4.18.3", - "ioredis": "^5.4.1", "jest": "^29.7.0", "pg": "^8.13.0", "pg-god": "^1.0.12", @@ -42,6 +39,7 @@ }, "dependencies": { "axios": "^0.21.4", + "express": "^4.21.0", "get-port": "^5.1.0", "randomatic": "^3.1.1" }, diff --git a/packages/core/medusa-test-utils/src/database.ts b/packages/medusa-test-utils/src/database.ts similarity index 100% rename from packages/core/medusa-test-utils/src/database.ts rename to packages/medusa-test-utils/src/database.ts diff --git a/packages/core/medusa-test-utils/src/events.ts b/packages/medusa-test-utils/src/events.ts similarity index 100% rename from packages/core/medusa-test-utils/src/events.ts rename to packages/medusa-test-utils/src/events.ts diff --git a/packages/core/medusa-test-utils/src/id-map.ts b/packages/medusa-test-utils/src/id-map.ts similarity index 100% rename from packages/core/medusa-test-utils/src/id-map.ts rename to packages/medusa-test-utils/src/id-map.ts diff --git a/packages/core/medusa-test-utils/src/index.ts b/packages/medusa-test-utils/src/index.ts similarity index 88% rename from packages/core/medusa-test-utils/src/index.ts rename to packages/medusa-test-utils/src/index.ts index ee45c100166d2..ed027e43c0a2d 100644 --- a/packages/core/medusa-test-utils/src/index.ts +++ b/packages/medusa-test-utils/src/index.ts @@ -4,6 +4,6 @@ export { default as IdMap } from "./id-map" export * from "./init-modules" export * as JestUtils from "./jest" export * from "./medusa-test-runner" -export * from "./medusa-test-runner-utils/" +export * from "./medusa-test-runner-utils" export { default as MockEventBusService } from "./mock-event-bus-service" export * from "./module-test-runner" diff --git a/packages/core/medusa-test-utils/src/init-modules.ts b/packages/medusa-test-utils/src/init-modules.ts similarity index 100% rename from packages/core/medusa-test-utils/src/init-modules.ts rename to packages/medusa-test-utils/src/init-modules.ts diff --git a/packages/core/medusa-test-utils/src/jest.ts b/packages/medusa-test-utils/src/jest.ts similarity index 100% rename from packages/core/medusa-test-utils/src/jest.ts rename to packages/medusa-test-utils/src/jest.ts diff --git a/packages/core/medusa-test-utils/src/medusa-test-runner-utils/bootstrap-app.ts b/packages/medusa-test-utils/src/medusa-test-runner-utils/bootstrap-app.ts similarity index 96% rename from packages/core/medusa-test-utils/src/medusa-test-runner-utils/bootstrap-app.ts rename to packages/medusa-test-utils/src/medusa-test-runner-utils/bootstrap-app.ts index 4f543899de19a..157355a9f5ff3 100644 --- a/packages/core/medusa-test-utils/src/medusa-test-runner-utils/bootstrap-app.ts +++ b/packages/medusa-test-utils/src/medusa-test-runner-utils/bootstrap-app.ts @@ -12,7 +12,7 @@ async function bootstrapApp({ const app = express() applyEnvVarsToProcess(env) - const loaders = require("@medusajs/medusa/dist/loaders").default + const loaders = require("@medusajs/medusa/loaders/index").default const { container, shutdown } = await loaders({ directory: resolve(cwd || process.cwd()), diff --git a/packages/core/medusa-test-utils/src/medusa-test-runner-utils/clear-instances.ts b/packages/medusa-test-utils/src/medusa-test-runner-utils/clear-instances.ts similarity index 100% rename from packages/core/medusa-test-utils/src/medusa-test-runner-utils/clear-instances.ts rename to packages/medusa-test-utils/src/medusa-test-runner-utils/clear-instances.ts diff --git a/packages/core/medusa-test-utils/src/medusa-test-runner-utils/config.ts b/packages/medusa-test-utils/src/medusa-test-runner-utils/config.ts similarity index 100% rename from packages/core/medusa-test-utils/src/medusa-test-runner-utils/config.ts rename to packages/medusa-test-utils/src/medusa-test-runner-utils/config.ts diff --git a/packages/core/medusa-test-utils/src/medusa-test-runner-utils/index.ts b/packages/medusa-test-utils/src/medusa-test-runner-utils/index.ts similarity index 100% rename from packages/core/medusa-test-utils/src/medusa-test-runner-utils/index.ts rename to packages/medusa-test-utils/src/medusa-test-runner-utils/index.ts diff --git a/packages/core/medusa-test-utils/src/medusa-test-runner-utils/use-db.ts b/packages/medusa-test-utils/src/medusa-test-runner-utils/use-db.ts similarity index 93% rename from packages/core/medusa-test-utils/src/medusa-test-runner-utils/use-db.ts rename to packages/medusa-test-utils/src/medusa-test-runner-utils/use-db.ts index 91ba74e19df8c..eafc848cbe9d0 100644 --- a/packages/core/medusa-test-utils/src/medusa-test-runner-utils/use-db.ts +++ b/packages/medusa-test-utils/src/medusa-test-runner-utils/use-db.ts @@ -54,10 +54,9 @@ export async function syncLinks( async function loadCustomLinks(directory: string, container: MedusaContainer) { // TODO: move to framework once settle down - const { getResolvedPlugins } = await import( - // @ts-expect-error - "@medusajs/medusa/dist/loaders/helpers/resolve-plugins" - ) + const { + getResolvedPlugins, + } = require("@medusajs/medusa/loaders/helpers/resolve-plugins") const configModule = container.resolve( ContainerRegistrationKeys.CONFIG_MODULE diff --git a/packages/core/medusa-test-utils/src/medusa-test-runner-utils/utils.ts b/packages/medusa-test-utils/src/medusa-test-runner-utils/utils.ts similarity index 100% rename from packages/core/medusa-test-utils/src/medusa-test-runner-utils/utils.ts rename to packages/medusa-test-utils/src/medusa-test-runner-utils/utils.ts diff --git a/packages/core/medusa-test-utils/src/medusa-test-runner.ts b/packages/medusa-test-utils/src/medusa-test-runner.ts similarity index 100% rename from packages/core/medusa-test-utils/src/medusa-test-runner.ts rename to packages/medusa-test-utils/src/medusa-test-runner.ts diff --git a/packages/core/medusa-test-utils/src/mock-event-bus-service.ts b/packages/medusa-test-utils/src/mock-event-bus-service.ts similarity index 100% rename from packages/core/medusa-test-utils/src/mock-event-bus-service.ts rename to packages/medusa-test-utils/src/mock-event-bus-service.ts diff --git a/packages/core/medusa-test-utils/src/module-test-runner.ts b/packages/medusa-test-utils/src/module-test-runner.ts similarity index 100% rename from packages/core/medusa-test-utils/src/module-test-runner.ts rename to packages/medusa-test-utils/src/module-test-runner.ts diff --git a/packages/medusa-test-utils/tsconfig.json b/packages/medusa-test-utils/tsconfig.json new file mode 100644 index 0000000000000..161c09e5f391e --- /dev/null +++ b/packages/medusa-test-utils/tsconfig.json @@ -0,0 +1,3 @@ +{ + "extends": "../../_tsconfig.base.json" +} diff --git a/packages/medusa/package.json b/packages/medusa/package.json index f92f46fdd6052..4a2a13abfaeed 100644 --- a/packages/medusa/package.json +++ b/packages/medusa/package.json @@ -3,6 +3,16 @@ "version": "1.20.5", "description": "Building blocks for digital commerce", "main": "dist/index.js", + "exports": { + ".": "./dist/index.js", + "./api/*": "./dist/api/*.js", + "./subscribers/*": "./dist/subscribers/*.js", + "./jobs/*": "./dist/jobs/*.js", + "./core-flows": "./dist/core-flows/index.js", + "./loaders/*": "./dist/loaders/*.js", + "./commands/*": "./dist/commands/*.js", + "./*": "./dist/modules/*.js" + }, "repository": { "type": "git", "url": "https://github.com/medusajs/medusa", @@ -51,15 +61,51 @@ "@inquirer/checkbox": "^2.3.11", "@inquirer/input": "^2.2.9", "@medusajs/admin-bundler": "0.0.1", + "@medusajs/api-key": "^0.1.2", + "@medusajs/auth": "^0.0.3", + "@medusajs/auth-emailpass": "^0.0.1", + "@medusajs/auth-github": "^0.0.1", + "@medusajs/auth-google": "^0.0.1", + "@medusajs/cache-inmemory": "^1.8.10", + "@medusajs/cache-redis": "^1.9.1", + "@medusajs/cart": "^0.0.3", "@medusajs/core-flows": "^0.0.9", + "@medusajs/currency": "^0.1.2", + "@medusajs/customer": "^0.0.3", + "@medusajs/event-bus-local": "^1.9.8", + "@medusajs/event-bus-redis": "^1.8.13", + "@medusajs/file": "^0.0.1", + "@medusajs/file-local-next": "^0.0.2", + "@medusajs/file-s3": "^0.0.2", + "@medusajs/fulfillment": "^0.1.2", + "@medusajs/fulfillment-manual": "^0.0.2", + "@medusajs/index": "^0.0.1", + "@medusajs/inventory-next": "^0.0.3", "@medusajs/link-modules": "^0.2.11", + "@medusajs/notification": "^0.1.2", + "@medusajs/notification-local": "^0.0.1", + "@medusajs/notification-sendgrid": "^0.0.1", + "@medusajs/order": "^0.1.2", + "@medusajs/payment": "^0.0.3", + "@medusajs/payment-stripe": "^0.0.2", + "@medusajs/pricing": "^0.1.12", + "@medusajs/product": "^0.3.12", + "@medusajs/promotion": "^0.0.4", + "@medusajs/region": "^0.1.1", + "@medusajs/sales-channel": "^0.1.1", + "@medusajs/stock-location-next": "^0.0.3", + "@medusajs/store": "^0.1.1", + "@medusajs/tax": "^0.1.1", + "@medusajs/user": "^0.0.3", + "@medusajs/workflow-engine-inmemory": "^0.0.4", + "@medusajs/workflow-engine-redis": "^0.0.4", "@swc/core": "1.5.7", "@swc/helpers": "^0.5.11", "boxen": "^5.0.1", "chalk": "^4.0.0", "chokidar": "^3.4.2", "compression": "^1.7.4", - "express": "^4.18.2", + "express": "^4.21.0", "fs-exists-cached": "^1.0.0", "jsonwebtoken": "^9.0.2", "lodash": "^4.17.21", @@ -74,6 +120,10 @@ }, "peerDependencies": { "@medusajs/framework": "^0.0.1", + "@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" }, "gitHead": "cd1f5afa5aa8c0b15ea957008ee19f1d695cbd2e" diff --git a/packages/medusa/src/core-flows/index.ts b/packages/medusa/src/core-flows/index.ts new file mode 100644 index 0000000000000..183e6798b616c --- /dev/null +++ b/packages/medusa/src/core-flows/index.ts @@ -0,0 +1 @@ +export * from "@medusajs/core-flows" diff --git a/packages/medusa/src/modules/api-key.ts b/packages/medusa/src/modules/api-key.ts new file mode 100644 index 0000000000000..6aafb39cbf20c --- /dev/null +++ b/packages/medusa/src/modules/api-key.ts @@ -0,0 +1,5 @@ +import ApiKeyModule from "@medusajs/api-key" + +export * from "@medusajs/api-key" +export default ApiKeyModule +export const discoveryPath = require.resolve("@medusajs/api-key") diff --git a/packages/medusa/src/modules/auth-emailpass.ts b/packages/medusa/src/modules/auth-emailpass.ts new file mode 100644 index 0000000000000..6b125c62f3ed6 --- /dev/null +++ b/packages/medusa/src/modules/auth-emailpass.ts @@ -0,0 +1,6 @@ +import EmailPassAuthProvider from "@medusajs/auth-emailpass" + +export * from "@medusajs/auth-emailpass" + +export default EmailPassAuthProvider +export const discoveryPath = require.resolve("@medusajs/auth-emailpass") diff --git a/packages/medusa/src/modules/auth-github.ts b/packages/medusa/src/modules/auth-github.ts new file mode 100644 index 0000000000000..e374abfe55cd0 --- /dev/null +++ b/packages/medusa/src/modules/auth-github.ts @@ -0,0 +1,6 @@ +import GithubAuthProvider from "@medusajs/auth-github" + +export * from "@medusajs/auth-github" + +export default GithubAuthProvider +export const discoveryPath = require.resolve("@medusajs/auth-github") diff --git a/packages/medusa/src/modules/auth-google.ts b/packages/medusa/src/modules/auth-google.ts new file mode 100644 index 0000000000000..412ea357bd609 --- /dev/null +++ b/packages/medusa/src/modules/auth-google.ts @@ -0,0 +1,6 @@ +import GoogleAuthProvider from "@medusajs/auth-google" + +export * from "@medusajs/auth-google" + +export default GoogleAuthProvider +export const discoveryPath = require.resolve("@medusajs/auth-google") diff --git a/packages/medusa/src/modules/auth.ts b/packages/medusa/src/modules/auth.ts new file mode 100644 index 0000000000000..7d05a3e1ee18e --- /dev/null +++ b/packages/medusa/src/modules/auth.ts @@ -0,0 +1,6 @@ +import AuthModule from "@medusajs/auth" + +export * from "@medusajs/auth" + +export default AuthModule +export const discoveryPath = require.resolve("@medusajs/auth") diff --git a/packages/medusa/src/modules/cache-inmemory.ts b/packages/medusa/src/modules/cache-inmemory.ts new file mode 100644 index 0000000000000..d90b32590f498 --- /dev/null +++ b/packages/medusa/src/modules/cache-inmemory.ts @@ -0,0 +1,6 @@ +import InMemoryCacheModule from "@medusajs/cache-inmemory" + +export * from "@medusajs/cache-inmemory" + +export default InMemoryCacheModule +export const discoveryPath = require.resolve("@medusajs/cache-inmemory") diff --git a/packages/medusa/src/modules/cache-redis.ts b/packages/medusa/src/modules/cache-redis.ts new file mode 100644 index 0000000000000..724b08957f890 --- /dev/null +++ b/packages/medusa/src/modules/cache-redis.ts @@ -0,0 +1,6 @@ +import RedisCacheModule from "@medusajs/cache-redis" + +export * from "@medusajs/cache-redis" + +export default RedisCacheModule +export const discoveryPath = require.resolve("@medusajs/cache-redis") diff --git a/packages/medusa/src/modules/cart.ts b/packages/medusa/src/modules/cart.ts new file mode 100644 index 0000000000000..1908bca8ece13 --- /dev/null +++ b/packages/medusa/src/modules/cart.ts @@ -0,0 +1,6 @@ +import CartModule from "@medusajs/cart" + +export * from "@medusajs/cart" + +export default CartModule +export const discoveryPath = require.resolve("@medusajs/cart") diff --git a/packages/medusa/src/modules/currency.ts b/packages/medusa/src/modules/currency.ts new file mode 100644 index 0000000000000..c0b268486cc06 --- /dev/null +++ b/packages/medusa/src/modules/currency.ts @@ -0,0 +1,6 @@ +import CurrencyModule from "@medusajs/currency" + +export * from "@medusajs/currency" + +export default CurrencyModule +export const discoveryPath = require.resolve("@medusajs/currency") diff --git a/packages/medusa/src/modules/customer.ts b/packages/medusa/src/modules/customer.ts new file mode 100644 index 0000000000000..b69af89091165 --- /dev/null +++ b/packages/medusa/src/modules/customer.ts @@ -0,0 +1,6 @@ +import CustomerModule from "@medusajs/customer" + +export * from "@medusajs/customer" + +export default CustomerModule +export const discoveryPath = require.resolve("@medusajs/customer") diff --git a/packages/medusa/src/modules/event-bus-local.ts b/packages/medusa/src/modules/event-bus-local.ts new file mode 100644 index 0000000000000..b16ec9f509123 --- /dev/null +++ b/packages/medusa/src/modules/event-bus-local.ts @@ -0,0 +1,5 @@ +import LocalEventBusModule from "@medusajs/event-bus-local" + +export * from "@medusajs/event-bus-local" +export default LocalEventBusModule +export const discoveryPath = require.resolve("@medusajs/event-bus-local") diff --git a/packages/medusa/src/modules/event-bus-redis.ts b/packages/medusa/src/modules/event-bus-redis.ts new file mode 100644 index 0000000000000..eab558f745525 --- /dev/null +++ b/packages/medusa/src/modules/event-bus-redis.ts @@ -0,0 +1,6 @@ +import RedisEventBusModule from "@medusajs/event-bus-redis" + +export * from "@medusajs/event-bus-redis" + +export default RedisEventBusModule +export const discoveryPath = require.resolve("@medusajs/event-bus-redis") diff --git a/packages/medusa/src/modules/file-local-next.ts b/packages/medusa/src/modules/file-local-next.ts new file mode 100644 index 0000000000000..92aa117c5dab8 --- /dev/null +++ b/packages/medusa/src/modules/file-local-next.ts @@ -0,0 +1,6 @@ +import LocalFileProvider from "@medusajs/file-local-next" + +export * from "@medusajs/file-local-next" + +export default LocalFileProvider +export const discoveryPath = require.resolve("@medusajs/file-local-next") diff --git a/packages/medusa/src/modules/file-s3.ts b/packages/medusa/src/modules/file-s3.ts new file mode 100644 index 0000000000000..2919b80ad0afb --- /dev/null +++ b/packages/medusa/src/modules/file-s3.ts @@ -0,0 +1,6 @@ +import S3FileProvider from "@medusajs/file-s3" + +export * from "@medusajs/file-s3" + +export default S3FileProvider +export const discoveryPath = require.resolve("@medusajs/file-s3") diff --git a/packages/medusa/src/modules/file.ts b/packages/medusa/src/modules/file.ts new file mode 100644 index 0000000000000..970eafd10b1a6 --- /dev/null +++ b/packages/medusa/src/modules/file.ts @@ -0,0 +1,6 @@ +import FileModule from "@medusajs/file" + +export * from "@medusajs/file" + +export default FileModule +export const discoveryPath = require.resolve("@medusajs/file") diff --git a/packages/medusa/src/modules/fulfillment-manual.ts b/packages/medusa/src/modules/fulfillment-manual.ts new file mode 100644 index 0000000000000..c5f901105fd0a --- /dev/null +++ b/packages/medusa/src/modules/fulfillment-manual.ts @@ -0,0 +1,6 @@ +import ManualFulfillmentModule from "@medusajs/fulfillment-manual" + +export * from "@medusajs/fulfillment-manual" + +export default ManualFulfillmentModule +export const discoveryPath = require.resolve("@medusajs/fulfillment-manual") diff --git a/packages/medusa/src/modules/fulfillment.ts b/packages/medusa/src/modules/fulfillment.ts new file mode 100644 index 0000000000000..69581153d0b5d --- /dev/null +++ b/packages/medusa/src/modules/fulfillment.ts @@ -0,0 +1,6 @@ +import FulfillmentModule from "@medusajs/fulfillment" + +export * from "@medusajs/fulfillment" + +export default FulfillmentModule +export const discoveryPath = require.resolve("@medusajs/fulfillment") diff --git a/packages/medusa/src/modules/index-module.ts b/packages/medusa/src/modules/index-module.ts new file mode 100644 index 0000000000000..66dbceec586d8 --- /dev/null +++ b/packages/medusa/src/modules/index-module.ts @@ -0,0 +1,6 @@ +import IndexModule from "@medusajs/index" + +export * from "@medusajs/index" + +export default IndexModule +export const discoveryPath = require.resolve("@medusajs/index") diff --git a/packages/medusa/src/modules/inventory-next.ts b/packages/medusa/src/modules/inventory-next.ts new file mode 100644 index 0000000000000..88ca37fb3b24e --- /dev/null +++ b/packages/medusa/src/modules/inventory-next.ts @@ -0,0 +1,6 @@ +import InventoryModule from "@medusajs/inventory-next" + +export * from "@medusajs/inventory-next" + +export default InventoryModule +export const discoveryPath = require.resolve("@medusajs/inventory-next") diff --git a/packages/medusa/src/modules/link-modules.ts b/packages/medusa/src/modules/link-modules.ts new file mode 100644 index 0000000000000..346a2c6f7033b --- /dev/null +++ b/packages/medusa/src/modules/link-modules.ts @@ -0,0 +1,6 @@ +import LinkModule from "@medusajs/link-modules" + +export * from "@medusajs/link-modules" + +export default LinkModule +export const discoveryPath = require.resolve("@medusajs/link-modules") diff --git a/packages/medusa/src/modules/notification-local.ts b/packages/medusa/src/modules/notification-local.ts new file mode 100644 index 0000000000000..44d88a57761d4 --- /dev/null +++ b/packages/medusa/src/modules/notification-local.ts @@ -0,0 +1,6 @@ +import LocalNotificationProvider from "@medusajs/notification-local" + +export * from "@medusajs/notification-local" + +export default LocalNotificationProvider +export const discoveryPath = require.resolve("@medusajs/notification-local") diff --git a/packages/medusa/src/modules/notification-sendgrid.ts b/packages/medusa/src/modules/notification-sendgrid.ts new file mode 100644 index 0000000000000..e3429d4b0bef0 --- /dev/null +++ b/packages/medusa/src/modules/notification-sendgrid.ts @@ -0,0 +1,6 @@ +import SendGridNotificationProvider from "@medusajs/notification-sendgrid" + +export * from "@medusajs/notification-sendgrid" + +export default SendGridNotificationProvider +export const discoveryPath = require.resolve("@medusajs/notification-sendgrid") diff --git a/packages/medusa/src/modules/notification.ts b/packages/medusa/src/modules/notification.ts new file mode 100644 index 0000000000000..6f1fbd1640cfc --- /dev/null +++ b/packages/medusa/src/modules/notification.ts @@ -0,0 +1,6 @@ +import NotificationModule from "@medusajs/notification" + +export * from "@medusajs/notification" + +export default NotificationModule +export const discoveryPath = require.resolve("@medusajs/notification") diff --git a/packages/medusa/src/modules/order.ts b/packages/medusa/src/modules/order.ts new file mode 100644 index 0000000000000..55ed7ec654216 --- /dev/null +++ b/packages/medusa/src/modules/order.ts @@ -0,0 +1,6 @@ +import OrderModule from "@medusajs/order" + +export * from "@medusajs/order" + +export default OrderModule +export const discoveryPath = require.resolve("@medusajs/order") diff --git a/packages/medusa/src/modules/payment-stripe.ts b/packages/medusa/src/modules/payment-stripe.ts new file mode 100644 index 0000000000000..65803facd8e98 --- /dev/null +++ b/packages/medusa/src/modules/payment-stripe.ts @@ -0,0 +1,6 @@ +import StripePaymentProvider from "@medusajs/payment-stripe" + +export * from "@medusajs/payment-stripe" + +export default StripePaymentProvider +export const discoveryPath = require.resolve("@medusajs/payment-stripe") diff --git a/packages/medusa/src/modules/payment.ts b/packages/medusa/src/modules/payment.ts new file mode 100644 index 0000000000000..2e0be2308c5bb --- /dev/null +++ b/packages/medusa/src/modules/payment.ts @@ -0,0 +1,6 @@ +import PaymentModule from "@medusajs/payment" + +export * from "@medusajs/payment" + +export default PaymentModule +export const discoveryPath = require.resolve("@medusajs/payment") diff --git a/packages/medusa/src/modules/pricing.ts b/packages/medusa/src/modules/pricing.ts new file mode 100644 index 0000000000000..76c331e734fd0 --- /dev/null +++ b/packages/medusa/src/modules/pricing.ts @@ -0,0 +1,6 @@ +import PricingModule from "@medusajs/pricing" + +export * from "@medusajs/pricing" + +export default PricingModule +export const discoveryPath = require.resolve("@medusajs/pricing") diff --git a/packages/medusa/src/modules/product.ts b/packages/medusa/src/modules/product.ts new file mode 100644 index 0000000000000..28e341aedb4c7 --- /dev/null +++ b/packages/medusa/src/modules/product.ts @@ -0,0 +1,6 @@ +import ProductModule from "@medusajs/product" + +export * from "@medusajs/product" + +export default ProductModule +export const discoveryPath = require.resolve("@medusajs/product") diff --git a/packages/medusa/src/modules/promotion.ts b/packages/medusa/src/modules/promotion.ts new file mode 100644 index 0000000000000..00d3b7cf0121b --- /dev/null +++ b/packages/medusa/src/modules/promotion.ts @@ -0,0 +1,6 @@ +import PromotionModule from "@medusajs/promotion" + +export * from "@medusajs/promotion" + +export default PromotionModule +export const discoveryPath = require.resolve("@medusajs/promotion") diff --git a/packages/medusa/src/modules/region.ts b/packages/medusa/src/modules/region.ts new file mode 100644 index 0000000000000..98f11991f8e9a --- /dev/null +++ b/packages/medusa/src/modules/region.ts @@ -0,0 +1,6 @@ +import RegionModule from "@medusajs/region" + +export * from "@medusajs/region" + +export default RegionModule +export const discoveryPath = require.resolve("@medusajs/region") diff --git a/packages/medusa/src/modules/sales-channel.ts b/packages/medusa/src/modules/sales-channel.ts new file mode 100644 index 0000000000000..6635e203bfede --- /dev/null +++ b/packages/medusa/src/modules/sales-channel.ts @@ -0,0 +1,6 @@ +import SalesChannelModule from "@medusajs/sales-channel" + +export * from "@medusajs/sales-channel" + +export default SalesChannelModule +export const discoveryPath = require.resolve("@medusajs/sales-channel") diff --git a/packages/medusa/src/modules/stock-location-next.ts b/packages/medusa/src/modules/stock-location-next.ts new file mode 100644 index 0000000000000..874c0862f8df8 --- /dev/null +++ b/packages/medusa/src/modules/stock-location-next.ts @@ -0,0 +1,6 @@ +import StockLocationModule from "@medusajs/stock-location-next" + +export * from "@medusajs/stock-location-next" + +export default StockLocationModule +export const discoveryPath = require.resolve("@medusajs/stock-location-next") diff --git a/packages/medusa/src/modules/store.ts b/packages/medusa/src/modules/store.ts new file mode 100644 index 0000000000000..d505d98366472 --- /dev/null +++ b/packages/medusa/src/modules/store.ts @@ -0,0 +1,6 @@ +import StoreModule from "@medusajs/store" + +export * from "@medusajs/store" + +export default StoreModule +export const discoveryPath = require.resolve("@medusajs/store") diff --git a/packages/medusa/src/modules/tax.ts b/packages/medusa/src/modules/tax.ts new file mode 100644 index 0000000000000..b080ae04cd903 --- /dev/null +++ b/packages/medusa/src/modules/tax.ts @@ -0,0 +1,6 @@ +import TaxModule from "@medusajs/tax" + +export * from "@medusajs/tax" + +export default TaxModule +export const discoveryPath = require.resolve("@medusajs/tax") diff --git a/packages/medusa/src/modules/user.ts b/packages/medusa/src/modules/user.ts new file mode 100644 index 0000000000000..998acf505d8bf --- /dev/null +++ b/packages/medusa/src/modules/user.ts @@ -0,0 +1,6 @@ +import UserModule from "@medusajs/user" + +export * from "@medusajs/user" + +export default UserModule +export const discoveryPath = require.resolve("@medusajs/user") diff --git a/packages/medusa/src/modules/workflow-engine-inmemory.ts b/packages/medusa/src/modules/workflow-engine-inmemory.ts new file mode 100644 index 0000000000000..48e71dbdd1cbf --- /dev/null +++ b/packages/medusa/src/modules/workflow-engine-inmemory.ts @@ -0,0 +1,8 @@ +import MemoryWorkflowEngineModule from "@medusajs/workflow-engine-inmemory" + +export * from "@medusajs/workflow-engine-inmemory" + +export default MemoryWorkflowEngineModule +export const discoveryPath = require.resolve( + "@medusajs/workflow-engine-inmemory" +) diff --git a/packages/medusa/src/modules/workflow-engine-redis.ts b/packages/medusa/src/modules/workflow-engine-redis.ts new file mode 100644 index 0000000000000..87d6603a26b1c --- /dev/null +++ b/packages/medusa/src/modules/workflow-engine-redis.ts @@ -0,0 +1,6 @@ +import RedisWorkflowEngineModule from "@medusajs/workflow-engine-redis" + +export * from "@medusajs/workflow-engine-redis" + +export default RedisWorkflowEngineModule +export const discoveryPath = require.resolve("@medusajs/workflow-engine-redis") diff --git a/packages/modules/payment/package.json b/packages/modules/payment/package.json index ac53c320c476e..839afd92cef93 100644 --- a/packages/modules/payment/package.json +++ b/packages/modules/payment/package.json @@ -44,7 +44,6 @@ "@mikro-orm/postgresql": "5.9.7", "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", - "bignumber.js": "^9.1.2", "jest": "^29.7.0", "medusa-test-utils": "^1.1.44", "rimraf": "^3.0.2", diff --git a/packages/modules/workflow-engine-redis/package.json b/packages/modules/workflow-engine-redis/package.json index a94d9d101d9c3..d4f46fd42938f 100644 --- a/packages/modules/workflow-engine-redis/package.json +++ b/packages/modules/workflow-engine-redis/package.json @@ -52,14 +52,14 @@ }, "dependencies": { "bullmq": "5.13.0", - "ioredis": "^5.4.1" + "ioredis": "^5.4.1", + "ulid": "^2.3.0" }, "peerDependencies": { "@medusajs/framework": "^0.0.1", "@mikro-orm/core": "5.9.7", "@mikro-orm/migrations": "5.9.7", "@mikro-orm/postgresql": "5.9.7", - "awilix": "^8.0.1", - "ulid": "^2.3.0" + "awilix": "^8.0.1" } } diff --git a/yarn.lock b/yarn.lock index e5da97d068d08..3467daf771c6c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5002,14 +5002,14 @@ __metadata: autoprefixer: ^10.4.16 compression: ^1.7.4 copyfiles: ^2.4.1 - express: ^4.18.2 + express: ^4.21.0 postcss: ^8.4.32 tailwindcss: ^3.3.6 tsup: ^8.0.1 typescript: ^5.3.3 vite: ^5.2.11 peerDependencies: - express: ^4.18.2 + express: ^4.21.0 react-dom: ^18.0.0 languageName: unknown linkType: soft @@ -5056,7 +5056,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/api-key@workspace:^, @medusajs/api-key@workspace:packages/modules/api-key": +"@medusajs/api-key@^0.1.2, @medusajs/api-key@workspace:^, @medusajs/api-key@workspace:packages/modules/api-key": version: 0.0.0-use.local resolution: "@medusajs/api-key@workspace:packages/modules/api-key" dependencies: @@ -5077,7 +5077,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/auth-emailpass@workspace:packages/modules/providers/auth-emailpass": +"@medusajs/auth-emailpass@^0.0.1, @medusajs/auth-emailpass@workspace:packages/modules/providers/auth-emailpass": version: 0.0.0-use.local resolution: "@medusajs/auth-emailpass@workspace:packages/modules/providers/auth-emailpass" dependencies: @@ -5093,7 +5093,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/auth-github@workspace:packages/modules/providers/auth-github": +"@medusajs/auth-github@^0.0.1, @medusajs/auth-github@workspace:packages/modules/providers/auth-github": version: 0.0.0-use.local resolution: "@medusajs/auth-github@workspace:packages/modules/providers/auth-github" dependencies: @@ -5109,7 +5109,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/auth-google@workspace:packages/modules/providers/auth-google": +"@medusajs/auth-google@^0.0.1, @medusajs/auth-google@workspace:packages/modules/providers/auth-google": version: 0.0.0-use.local resolution: "@medusajs/auth-google@workspace:packages/modules/providers/auth-google" dependencies: @@ -5126,7 +5126,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/auth@workspace:*, @medusajs/auth@workspace:packages/modules/auth": +"@medusajs/auth@^0.0.3, @medusajs/auth@workspace:*, @medusajs/auth@workspace:packages/modules/auth": version: 0.0.0-use.local resolution: "@medusajs/auth@workspace:packages/modules/auth" dependencies: @@ -5151,7 +5151,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/cache-inmemory@workspace:*, @medusajs/cache-inmemory@workspace:packages/modules/cache-inmemory": +"@medusajs/cache-inmemory@^1.8.10, @medusajs/cache-inmemory@workspace:*, @medusajs/cache-inmemory@workspace:packages/modules/cache-inmemory": version: 0.0.0-use.local resolution: "@medusajs/cache-inmemory@workspace:packages/modules/cache-inmemory" dependencies: @@ -5166,7 +5166,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/cache-redis@workspace:packages/modules/cache-redis": +"@medusajs/cache-redis@^1.9.1, @medusajs/cache-redis@workspace:packages/modules/cache-redis": version: 0.0.0-use.local resolution: "@medusajs/cache-redis@workspace:packages/modules/cache-redis" dependencies: @@ -5183,7 +5183,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/cart@workspace:packages/modules/cart": +"@medusajs/cart@^0.0.3, @medusajs/cart@workspace:packages/modules/cart": version: 0.0.0-use.local resolution: "@medusajs/cart@workspace:packages/modules/cart" dependencies: @@ -5219,9 +5219,6 @@ __metadata: "@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 json-2-csv: ^5.5.4 pg: ^8.13.0 @@ -5233,7 +5230,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/currency@workspace:^, @medusajs/currency@workspace:packages/modules/currency": +"@medusajs/currency@^0.1.2, @medusajs/currency@workspace:^, @medusajs/currency@workspace:packages/modules/currency": version: 0.0.0-use.local resolution: "@medusajs/currency@workspace:packages/modules/currency" dependencies: @@ -5258,7 +5255,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/customer@workspace:^, @medusajs/customer@workspace:packages/modules/customer": +"@medusajs/customer@^0.0.3, @medusajs/customer@workspace:^, @medusajs/customer@workspace:packages/modules/customer": version: 0.0.0-use.local resolution: "@medusajs/customer@workspace:packages/modules/customer" dependencies: @@ -5337,7 +5334,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/event-bus-local@workspace:*, @medusajs/event-bus-local@workspace:packages/modules/event-bus-local": +"@medusajs/event-bus-local@^1.9.8, @medusajs/event-bus-local@workspace:*, @medusajs/event-bus-local@workspace:packages/modules/event-bus-local": version: 0.0.0-use.local resolution: "@medusajs/event-bus-local@workspace:packages/modules/event-bus-local" dependencies: @@ -5353,7 +5350,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/event-bus-redis@workspace:packages/modules/event-bus-redis": +"@medusajs/event-bus-redis@^1.8.13, @medusajs/event-bus-redis@workspace:packages/modules/event-bus-redis": version: 0.0.0-use.local resolution: "@medusajs/event-bus-redis@workspace:packages/modules/event-bus-redis" dependencies: @@ -5371,7 +5368,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/file-local-next@workspace:packages/modules/providers/file-local": +"@medusajs/file-local-next@^0.0.2, @medusajs/file-local-next@workspace:packages/modules/providers/file-local": version: 0.0.0-use.local resolution: "@medusajs/file-local-next@workspace:packages/modules/providers/file-local" dependencies: @@ -5386,7 +5383,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/file-s3@workspace:packages/modules/providers/file-s3": +"@medusajs/file-s3@^0.0.2, @medusajs/file-s3@workspace:packages/modules/providers/file-s3": version: 0.0.0-use.local resolution: "@medusajs/file-s3@workspace:packages/modules/providers/file-s3" dependencies: @@ -5405,7 +5402,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/file@workspace:packages/modules/file": +"@medusajs/file@^0.0.1, @medusajs/file@workspace:packages/modules/file": version: 0.0.0-use.local resolution: "@medusajs/file@workspace:packages/modules/file" dependencies: @@ -5447,11 +5444,10 @@ __metadata: "@types/express": ^4.17.17 "@types/jsonwebtoken": ^8.5.9 awilix: ^8.0.1 - bignumber.js: ^9.1.2 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 jest: ^29.7.0 @@ -5465,19 +5461,24 @@ __metadata: vite: ^5.2.11 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 languageName: unknown linkType: soft -"@medusajs/fulfillment-manual@workspace:^, @medusajs/fulfillment-manual@workspace:packages/modules/providers/fulfillment-manual": +"@medusajs/fulfillment-manual@^0.0.2, @medusajs/fulfillment-manual@workspace:^, @medusajs/fulfillment-manual@workspace:packages/modules/providers/fulfillment-manual": version: 0.0.0-use.local resolution: "@medusajs/fulfillment-manual@workspace:packages/modules/providers/fulfillment-manual" dependencies: @@ -5492,7 +5493,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/fulfillment@workspace:^, @medusajs/fulfillment@workspace:packages/modules/fulfillment": +"@medusajs/fulfillment@^0.1.2, @medusajs/fulfillment@workspace:^, @medusajs/fulfillment@workspace:packages/modules/fulfillment": version: 0.0.0-use.local resolution: "@medusajs/fulfillment@workspace:packages/modules/fulfillment" dependencies: @@ -5551,7 +5552,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/index@workspace:packages/modules/index": +"@medusajs/index@^0.0.1, @medusajs/index@workspace:packages/modules/index": version: 0.0.0-use.local resolution: "@medusajs/index@workspace:packages/modules/index" dependencies: @@ -5578,7 +5579,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/inventory-next@workspace:^, @medusajs/inventory-next@workspace:packages/modules/inventory-next": +"@medusajs/inventory-next@^0.0.3, @medusajs/inventory-next@workspace:^, @medusajs/inventory-next@workspace:packages/modules/inventory-next": version: 0.0.0-use.local resolution: "@medusajs/inventory-next@workspace:packages/modules/inventory-next" dependencies: @@ -5647,13 +5648,19 @@ __metadata: resolution: "@medusajs/medusa-cli@workspace:packages/cli/medusa-cli" dependencies: "@medusajs/utils": 1.11.9 + "@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 chalk: ^4.0.0 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 @@ -5664,7 +5671,7 @@ __metadata: meant: ^1.0.3 medusa-telemetry: ^0.0.17 ora: ^5.4.1 - pg: ^8.11.3 + pg: ^8.13.0 pg-god: ^1.0.12 prompts: ^2.4.2 resolve-cwd: ^3.0.0 @@ -5674,6 +5681,13 @@ __metadata: ulid: ^2.3.0 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 bin: medusa: cli.js languageName: unknown @@ -5715,9 +5729,45 @@ __metadata: "@inquirer/checkbox": ^2.3.11 "@inquirer/input": ^2.2.9 "@medusajs/admin-bundler": 0.0.1 + "@medusajs/api-key": ^0.1.2 + "@medusajs/auth": ^0.0.3 + "@medusajs/auth-emailpass": ^0.0.1 + "@medusajs/auth-github": ^0.0.1 + "@medusajs/auth-google": ^0.0.1 + "@medusajs/cache-inmemory": ^1.8.10 + "@medusajs/cache-redis": ^1.9.1 + "@medusajs/cart": ^0.0.3 "@medusajs/core-flows": ^0.0.9 + "@medusajs/currency": ^0.1.2 + "@medusajs/customer": ^0.0.3 + "@medusajs/event-bus-local": ^1.9.8 + "@medusajs/event-bus-redis": ^1.8.13 + "@medusajs/file": ^0.0.1 + "@medusajs/file-local-next": ^0.0.2 + "@medusajs/file-s3": ^0.0.2 "@medusajs/framework": ^0.0.1 + "@medusajs/fulfillment": ^0.1.2 + "@medusajs/fulfillment-manual": ^0.0.2 + "@medusajs/index": ^0.0.1 + "@medusajs/inventory-next": ^0.0.3 "@medusajs/link-modules": ^0.2.11 + "@medusajs/notification": ^0.1.2 + "@medusajs/notification-local": ^0.0.1 + "@medusajs/notification-sendgrid": ^0.0.1 + "@medusajs/order": ^0.1.2 + "@medusajs/payment": ^0.0.3 + "@medusajs/payment-stripe": ^0.0.2 + "@medusajs/pricing": ^0.1.12 + "@medusajs/product": ^0.3.12 + "@medusajs/promotion": ^0.0.4 + "@medusajs/region": ^0.1.1 + "@medusajs/sales-channel": ^0.1.1 + "@medusajs/stock-location-next": ^0.0.3 + "@medusajs/store": ^0.1.1 + "@medusajs/tax": ^0.1.1 + "@medusajs/user": ^0.0.3 + "@medusajs/workflow-engine-inmemory": ^0.0.4 + "@medusajs/workflow-engine-redis": ^0.0.4 "@opentelemetry/api": ^1.9.0 "@opentelemetry/instrumentation": ^0.53.0 "@opentelemetry/instrumentation-pg": ^0.44.0 @@ -5735,7 +5785,7 @@ __metadata: chalk: ^4.0.0 chokidar: ^3.4.2 compression: ^1.7.4 - express: ^4.18.2 + express: ^4.21.0 fs-exists-cached: ^1.0.0 jest: ^29.7.0 jsonwebtoken: ^9.0.2 @@ -5752,6 +5802,10 @@ __metadata: zod: 3.22.4 peerDependencies: "@medusajs/framework": ^0.0.1 + "@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 languageName: unknown linkType: soft @@ -5765,22 +5819,29 @@ __metadata: "@medusajs/utils": ^1.11.9 "@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 resolve-cwd: ^3.0.0 rimraf: ^5.0.1 typescript: ^5.6.2 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 + express: ^4.21.0 + pg: ^8.13.0 languageName: unknown linkType: soft -"@medusajs/notification-local@workspace:packages/modules/providers/notification-local": +"@medusajs/notification-local@^0.0.1, @medusajs/notification-local@workspace:packages/modules/providers/notification-local": version: 0.0.0-use.local resolution: "@medusajs/notification-local@workspace:packages/modules/providers/notification-local" dependencies: @@ -5795,7 +5856,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/notification-sendgrid@workspace:packages/modules/providers/notification-sendgrid": +"@medusajs/notification-sendgrid@^0.0.1, @medusajs/notification-sendgrid@workspace:packages/modules/providers/notification-sendgrid": version: 0.0.0-use.local resolution: "@medusajs/notification-sendgrid@workspace:packages/modules/providers/notification-sendgrid" dependencies: @@ -5811,7 +5872,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/notification@workspace:packages/modules/notification": +"@medusajs/notification@^0.1.2, @medusajs/notification@workspace:packages/modules/notification": version: 0.0.0-use.local resolution: "@medusajs/notification@workspace:packages/modules/notification" dependencies: @@ -5851,18 +5912,29 @@ __metadata: dependencies: "@medusajs/types": ^1.11.16 "@medusajs/utils": ^1.11.9 + "@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 jest: ^29.7.0 + pg: ^8.13.0 rimraf: ^5.0.1 typescript: ^5.6.2 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 + express: ^4.21.0 + pg: ^8.13.0 languageName: unknown linkType: soft -"@medusajs/order@workspace:packages/modules/order": +"@medusajs/order@^0.1.2, @medusajs/order@workspace:packages/modules/order": version: 0.0.0-use.local resolution: "@medusajs/order@workspace:packages/modules/order" dependencies: @@ -5887,7 +5959,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/payment-stripe@workspace:packages/modules/providers/payment-stripe": +"@medusajs/payment-stripe@^0.0.2, @medusajs/payment-stripe@workspace:packages/modules/providers/payment-stripe": version: 0.0.0-use.local resolution: "@medusajs/payment-stripe@workspace:packages/modules/providers/payment-stripe" dependencies: @@ -5904,7 +5976,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/payment@workspace:^, @medusajs/payment@workspace:packages/modules/payment": +"@medusajs/payment@^0.0.3, @medusajs/payment@workspace:^, @medusajs/payment@workspace:packages/modules/payment": version: 0.0.0-use.local resolution: "@medusajs/payment@workspace:packages/modules/payment" dependencies: @@ -5915,7 +5987,6 @@ __metadata: "@mikro-orm/postgresql": 5.9.7 "@swc/core": ^1.7.28 "@swc/jest": ^0.2.36 - bignumber.js: ^9.1.2 jest: ^29.7.0 medusa-test-utils: ^1.1.44 rimraf: ^3.0.2 @@ -5930,7 +6001,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/pricing@workspace:^, @medusajs/pricing@workspace:packages/modules/pricing": +"@medusajs/pricing@^0.1.12, @medusajs/pricing@workspace:^, @medusajs/pricing@workspace:packages/modules/pricing": version: 0.0.0-use.local resolution: "@medusajs/pricing@workspace:packages/modules/pricing" dependencies: @@ -5955,7 +6026,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/product@workspace:^, @medusajs/product@workspace:packages/modules/product": +"@medusajs/product@^0.3.12, @medusajs/product@workspace:^, @medusajs/product@workspace:packages/modules/product": version: 0.0.0-use.local resolution: "@medusajs/product@workspace:packages/modules/product" dependencies: @@ -5981,7 +6052,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/promotion@workspace:^, @medusajs/promotion@workspace:packages/modules/promotion": +"@medusajs/promotion@^0.0.4, @medusajs/promotion@workspace:^, @medusajs/promotion@workspace:packages/modules/promotion": version: 0.0.0-use.local resolution: "@medusajs/promotion@workspace:packages/modules/promotion" dependencies: @@ -6006,7 +6077,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/region@workspace:^, @medusajs/region@workspace:packages/modules/region": +"@medusajs/region@^0.1.1, @medusajs/region@workspace:^, @medusajs/region@workspace:packages/modules/region": version: 0.0.0-use.local resolution: "@medusajs/region@workspace:packages/modules/region" dependencies: @@ -6031,7 +6102,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/sales-channel@workspace:packages/modules/sales-channel": +"@medusajs/sales-channel@^0.1.1, @medusajs/sales-channel@workspace:packages/modules/sales-channel": version: 0.0.0-use.local resolution: "@medusajs/sales-channel@workspace:packages/modules/sales-channel" dependencies: @@ -6056,7 +6127,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/stock-location-next@workspace:^, @medusajs/stock-location-next@workspace:packages/modules/stock-location-next": +"@medusajs/stock-location-next@^0.0.3, @medusajs/stock-location-next@workspace:^, @medusajs/stock-location-next@workspace:packages/modules/stock-location-next": version: 0.0.0-use.local resolution: "@medusajs/stock-location-next@workspace:packages/modules/stock-location-next" dependencies: @@ -6081,7 +6152,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/store@workspace:^, @medusajs/store@workspace:packages/modules/store": +"@medusajs/store@^0.1.1, @medusajs/store@workspace:^, @medusajs/store@workspace:packages/modules/store": version: 0.0.0-use.local resolution: "@medusajs/store@workspace:packages/modules/store" dependencies: @@ -6106,7 +6177,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/tax@workspace:^, @medusajs/tax@workspace:packages/modules/tax": +"@medusajs/tax@^0.1.1, @medusajs/tax@workspace:^, @medusajs/tax@workspace:packages/modules/tax": version: 0.0.0-use.local resolution: "@medusajs/tax@workspace:packages/modules/tax" dependencies: @@ -6170,10 +6241,11 @@ __metadata: vite: ^5.2.11 peerDependencies: awilix: ^8.0.1 - bignumber.js: ^9.1.2 ioredis: ^5.4.1 vite: ^5.2.11 peerDependenciesMeta: + ioredis: + optional: true vite: optional: true languageName: unknown @@ -6267,7 +6339,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/user@workspace:^, @medusajs/user@workspace:packages/modules/user": +"@medusajs/user@^0.0.3, @medusajs/user@workspace:^, @medusajs/user@workspace:packages/modules/user": version: 0.0.0-use.local resolution: "@medusajs/user@workspace:packages/modules/user" dependencies: @@ -6331,12 +6403,12 @@ __metadata: "@mikro-orm/migrations": 5.9.7 "@mikro-orm/postgresql": 5.9.7 awilix: ^8.0.1 - bignumber.js: ^9.1.2 + express: ^4.21.0 pg: ^8.13.0 languageName: unknown linkType: soft -"@medusajs/workflow-engine-inmemory@workspace:*, @medusajs/workflow-engine-inmemory@workspace:packages/modules/workflow-engine-inmemory": +"@medusajs/workflow-engine-inmemory@^0.0.4, @medusajs/workflow-engine-inmemory@workspace:*, @medusajs/workflow-engine-inmemory@workspace:packages/modules/workflow-engine-inmemory": version: 0.0.0-use.local resolution: "@medusajs/workflow-engine-inmemory@workspace:packages/modules/workflow-engine-inmemory" dependencies: @@ -6363,7 +6435,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/workflow-engine-redis@workspace:packages/modules/workflow-engine-redis": +"@medusajs/workflow-engine-redis@^0.0.4, @medusajs/workflow-engine-redis@workspace:packages/modules/workflow-engine-redis": version: 0.0.0-use.local resolution: "@medusajs/workflow-engine-redis@workspace:packages/modules/workflow-engine-redis" dependencies: @@ -6381,13 +6453,13 @@ __metadata: rimraf: ^3.0.2 tsc-alias: ^1.8.6 typescript: ^5.6.2 + ulid: ^2.3.0 peerDependencies: "@medusajs/framework": ^0.0.1 "@mikro-orm/core": 5.9.7 "@mikro-orm/migrations": 5.9.7 "@mikro-orm/postgresql": 5.9.7 awilix: ^8.0.1 - ulid: ^2.3.0 languageName: unknown linkType: soft @@ -6399,15 +6471,26 @@ __metadata: "@medusajs/orchestration": ^0.5.7 "@medusajs/types": ^1.11.16 "@medusajs/utils": ^1.11.9 + "@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 jest: ^29.7.0 + pg: ^8.13.0 rimraf: ^5.0.1 typescript: ^5.6.2 ulid: ^2.3.0 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 + express: ^4.21.0 + pg: ^8.13.0 languageName: unknown linkType: soft @@ -19364,7 +19447,7 @@ __metadata: languageName: node linkType: hard -"express@npm:^4.17.1, express@npm:^4.17.3, express@npm:^4.18.2": +"express@npm:^4.17.1, express@npm:^4.17.3": version: 4.19.2 resolution: "express@npm:4.19.2" dependencies: @@ -19403,45 +19486,6 @@ __metadata: languageName: node linkType: hard -"express@npm:^4.18.3": - version: 4.20.0 - resolution: "express@npm:4.20.0" - dependencies: - accepts: ~1.3.8 - array-flatten: 1.1.1 - body-parser: 1.20.3 - content-disposition: 0.5.4 - content-type: ~1.0.4 - cookie: 0.6.0 - cookie-signature: 1.0.6 - debug: 2.6.9 - depd: 2.0.0 - encodeurl: ~2.0.0 - escape-html: ~1.0.3 - etag: ~1.8.1 - finalhandler: 1.2.0 - fresh: 0.5.2 - http-errors: 2.0.0 - merge-descriptors: 1.0.3 - methods: ~1.1.2 - on-finished: 2.4.1 - parseurl: ~1.3.3 - path-to-regexp: 0.1.10 - proxy-addr: ~2.0.7 - qs: 6.11.0 - range-parser: ~1.2.1 - safe-buffer: 5.2.1 - send: 0.19.0 - serve-static: 1.16.0 - setprototypeof: 1.2.0 - statuses: 2.0.1 - type-is: ~1.6.18 - utils-merge: 1.0.1 - vary: ~1.1.2 - checksum: 626e440e9feffa3f82ebce5e7dc0ad7a74fa96079994f30048cce450f4855a258abbcabf021f691aeb72154867f0d28440a8498c62888805faf667a829fb65aa - languageName: node - linkType: hard - "express@npm:^4.21.0": version: 4.21.0 resolution: "express@npm:4.21.0" @@ -24267,9 +24311,9 @@ __metadata: languageName: unknown linkType: soft -"medusa-test-utils@^1.1.42, medusa-test-utils@^1.1.43, medusa-test-utils@^1.1.44, medusa-test-utils@workspace:*, medusa-test-utils@workspace:packages/core/medusa-test-utils": +"medusa-test-utils@^1.1.42, medusa-test-utils@^1.1.43, medusa-test-utils@^1.1.44, medusa-test-utils@workspace:*, medusa-test-utils@workspace:packages/medusa-test-utils": version: 0.0.0-use.local - resolution: "medusa-test-utils@workspace:packages/core/medusa-test-utils" + resolution: "medusa-test-utils@workspace:packages/medusa-test-utils" dependencies: "@medusajs/framework": ^0.0.1 "@mikro-orm/core": 5.9.7 @@ -24278,10 +24322,8 @@ __metadata: "@mikro-orm/postgresql": 5.9.7 awilix: ^8.0.1 axios: ^0.21.4 - bignumber.js: ^9.1.2 - express: ^4.18.3 + express: ^4.21.0 get-port: ^5.1.0 - ioredis: ^5.4.1 jest: ^29.7.0 pg: ^8.13.0 pg-god: ^1.0.12 @@ -29355,18 +29397,6 @@ __metadata: languageName: node linkType: hard -"serve-static@npm:1.16.0": - version: 1.16.0 - resolution: "serve-static@npm:1.16.0" - dependencies: - encodeurl: ~1.0.2 - escape-html: ~1.0.3 - parseurl: ~1.3.3 - send: 0.18.0 - checksum: d7a5beca08cc55f92998d8b87c111dd842d642404231c90c11f504f9650935da4599c13256747b0a988442a59851343271fe8e1946e03e92cd79c447b5f3ae01 - languageName: node - linkType: hard - "serve-static@npm:1.16.2": version: 1.16.2 resolution: "serve-static@npm:1.16.2"