diff --git a/packages/cli/medusa-cli/package.json b/packages/cli/medusa-cli/package.json index 5ccd24ac37..81b1bffb07 100644 --- a/packages/cli/medusa-cli/package.json +++ b/packages/cli/medusa-cli/package.json @@ -57,7 +57,6 @@ "pg": "^8.11.3", "pg-god": "^1.0.12", "prompts": "^2.4.2", - "resolve-cwd": "^3.0.0", "semver": "^7.3.8", "stack-trace": "^0.0.10", "winston": "^3.8.2", diff --git a/packages/cli/medusa-cli/src/create-cli.ts b/packages/cli/medusa-cli/src/create-cli.ts index cdaa2fcf73..9ddf8b1013 100644 --- a/packages/cli/medusa-cli/src/create-cli.ts +++ b/packages/cli/medusa-cli/src/create-cli.ts @@ -1,10 +1,10 @@ import { sync as existsSync } from "fs-exists-cached" import { setTelemetryEnabled } from "medusa-telemetry" import path from "path" -import resolveCwd from "resolve-cwd" import { didYouMean } from "./did-you-mean" +import { toCamelCase } from "@medusajs/utils" import { newStarter } from "./commands/new" import reporter from "./reporter" @@ -40,10 +40,9 @@ function buildLocalCommands(cli, isLocalProject) { } try { - const cmdPath = resolveCwd.silent( - `@medusajs/medusa/dist/commands/${command}` - )! - return require(cmdPath).default + const { Commands } = require("@medusajs/medusa") + const cmdName = toCamelCase(command) + return Commands[cmdName] } catch (err) { if (!process.env.NODE_ENV?.startsWith("prod")) { console.log("--------------- ERROR ---------------------") @@ -249,6 +248,7 @@ function buildLocalCommands(cli, isLocalProject) { handler: handlerP( getCommandHandler(`develop`, (args, cmd) => { process.env.NODE_ENV = process.env.NODE_ENV || `development` + cmd(args) // Return an empty promise to prevent handlerP from exiting early. // The development server shouldn't ever exit until the user directly diff --git a/packages/core/core-flows/package.json b/packages/core/core-flows/package.json index 86a706a52d..31ad189926 100644 --- a/packages/core/core-flows/package.json +++ b/packages/core/core-flows/package.json @@ -31,7 +31,6 @@ }, "dependencies": { "@medusajs/modules-sdk": "^1.12.11", - "@medusajs/orchestration": "^0.5.7", "@medusajs/utils": "^1.11.9", "@medusajs/workflows-sdk": "^0.1.6", "json-2-csv": "^5.5.4" diff --git a/packages/core/medusa-test-utils/package.json b/packages/core/medusa-test-utils/package.json index 322deb4690..0831c35522 100644 --- a/packages/core/medusa-test-utils/package.json +++ b/packages/core/medusa-test-utils/package.json @@ -26,25 +26,38 @@ "devDependencies": { "@medusajs/framework": "^0.0.1", "@medusajs/types": "^1.11.16", - "@medusajs/utils": "^1.11.9", "cross-env": "^5.2.1", "jest": "^29.7.0", "rimraf": "^3.0.2", "typescript": "^5.1.6" }, "peerDependencies": { - "@medusajs/medusa": ">1.19", - "@medusajs/modules-sdk": "^1.12.10", - "@mikro-orm/core": "5.9.7", + "@medusajs/medusa": "*", + "@medusajs/modules-sdk": "*", + "@mikro-orm/core": "*", + "@mikro-orm/migrations": "*", + "@mikro-orm/postgresql": "*", "axios": "^0.28.0", "express": "^4.18.3", "get-port": "^5.1.0", "pg-god": "^1.0.12" }, "peerDependenciesMeta": { + "@medusajs/core": { + "optional": true + }, "@medusajs/medusa": { "optional": true }, + "@medusajs/migrations": { + "optional": true + }, + "@medusajs/modules-sdk": { + "optional": true + }, + "@medusajs/postgresql": { + "optional": true + }, "axios": { "optional": true }, @@ -60,8 +73,6 @@ }, "dependencies": { "@medusajs/utils": "^1.11.9", - "@mikro-orm/migrations": "5.9.7", - "@mikro-orm/postgresql": "5.9.7", "randomatic": "^3.1.1" }, "gitHead": "81a7ff73d012fda722f6e9ef0bd9ba0232d37808" diff --git a/packages/core/modules-sdk/package.json b/packages/core/modules-sdk/package.json index 1968783f54..d4ad3e1459 100644 --- a/packages/core/modules-sdk/package.json +++ b/packages/core/modules-sdk/package.json @@ -21,7 +21,6 @@ "license": "MIT", "devDependencies": { "@medusajs/types": "^1.11.16", - "@mikro-orm/core": "5.9.7", "cross-env": "^5.2.1", "jest": "^29.7.0", "rimraf": "^5.0.1", @@ -36,6 +35,7 @@ "resolve-cwd": "^3.0.0" }, "peerDependencies": { + "@mikro-orm/core": "*", "awilix": "*" }, "scripts": { diff --git a/packages/medusa-telemetry/src/index.js b/packages/medusa-telemetry/src/index.js index a7f81f3e92..e4bc9f8282 100644 --- a/packages/medusa-telemetry/src/index.js +++ b/packages/medusa-telemetry/src/index.js @@ -32,4 +32,5 @@ export function trackInstallation(installation, type) { } } +export { default as Store } from "./store" export { default as Telemeter } from "./telemeter" diff --git a/packages/medusa/src/commands/develop.ts b/packages/medusa/src/commands/develop.ts index be2a8e601b..17bfaa3ba8 100644 --- a/packages/medusa/src/commands/develop.ts +++ b/packages/medusa/src/commands/develop.ts @@ -1,7 +1,7 @@ import boxen from "boxen" import { ChildProcess, execSync, fork } from "child_process" import chokidar, { FSWatcher } from "chokidar" -import Store from "medusa-telemetry/dist/store" +import { Store } from "medusa-telemetry" import { EOL } from "os" import path from "path" @@ -15,10 +15,12 @@ const defaultConfig = { export default async function ({ port, directory }) { const args = process.argv + const argv = process.argv.indexOf("--") !== -1 ? process.argv.slice(process.argv.indexOf("--") + 1) : [] + args.shift() args.shift() args.shift() @@ -27,6 +29,7 @@ export default async function ({ port, directory }) { * Re-constructing the path to Medusa CLI to execute the * start command. */ + const cliPath = path.resolve(MEDUSA_CLI_PATH, "..", "..", "cli.js") const devServer = { diff --git a/packages/medusa/src/commands/index.ts b/packages/medusa/src/commands/index.ts new file mode 100644 index 0000000000..4d03f92399 --- /dev/null +++ b/packages/medusa/src/commands/index.ts @@ -0,0 +1,8 @@ +export { default as build } from "./build" +export { default as develop } from "./develop" +export { default as exec } from "./exec" +export { default as links } from "./links" +export { default as migrate } from "./migrate" +export { default as start } from "./start" +export { default as startCluster } from "./start-cluster" +export { default as user } from "./user" diff --git a/packages/medusa/src/index.js b/packages/medusa/src/index.js index 47ea6d70f7..101104da5d 100644 --- a/packages/medusa/src/index.js +++ b/packages/medusa/src/index.js @@ -1,3 +1,4 @@ +export * as Commands from "./commands" export * from "./types/common" export * from "./types/global" export * from "./types/middlewares" diff --git a/packages/modules/api-key/package.json b/packages/modules/api-key/package.json index e6e1c2b449..a4901541bf 100644 --- a/packages/modules/api-key/package.json +++ b/packages/modules/api-key/package.json @@ -35,7 +35,6 @@ }, "devDependencies": { "@medusajs/types": "^1.11.16", - "@mikro-orm/cli": "5.9.7", "cross-env": "^5.2.1", "jest": "^29.7.0", "medusa-test-utils": "^1.1.44", diff --git a/packages/modules/auth/package.json b/packages/modules/auth/package.json index 75b8844075..dbae25fe57 100644 --- a/packages/modules/auth/package.json +++ b/packages/modules/auth/package.json @@ -44,7 +44,7 @@ "typescript": "^5.1.6" }, "dependencies": { - "@medusajs/modules-sdk": "^1.12.9", + "@medusajs/modules-sdk": "^1.12.11", "@medusajs/utils": "^1.11.9", "jsonwebtoken": "^9.0.2", "scrypt-kdf": "^2.0.1", diff --git a/packages/modules/cache-inmemory/package.json b/packages/modules/cache-inmemory/package.json index 03d47f3d2e..fe786e96fb 100644 --- a/packages/modules/cache-inmemory/package.json +++ b/packages/modules/cache-inmemory/package.json @@ -33,7 +33,7 @@ "test": "jest --passWithNoTests" }, "dependencies": { - "@medusajs/modules-sdk": "^1.12.3", + "@medusajs/modules-sdk": "^1.12.11", "@medusajs/utils": "^1.11.9" } } diff --git a/packages/modules/event-bus-local/package.json b/packages/modules/event-bus-local/package.json index 50a2261eeb..ce387c8e8a 100644 --- a/packages/modules/event-bus-local/package.json +++ b/packages/modules/event-bus-local/package.json @@ -33,8 +33,10 @@ "test": "jest --passWithNoTests" }, "dependencies": { - "@medusajs/modules-sdk": "^1.12.8", - "@medusajs/utils": "^1.11.9", - "ulid": "^2.3.0" + "@medusajs/modules-sdk": "^1.12.11", + "@medusajs/utils": "^1.11.9" + }, + "peerDependencies": { + "ulid": "*" } } diff --git a/packages/modules/providers/file-s3/package.json b/packages/modules/providers/file-s3/package.json index 6d3c0e3aaf..9e2ca2d931 100644 --- a/packages/modules/providers/file-s3/package.json +++ b/packages/modules/providers/file-s3/package.json @@ -33,8 +33,10 @@ "dependencies": { "@aws-sdk/client-s3": "^3.556.0", "@aws-sdk/s3-request-presigner": "^3.556.0", - "@medusajs/utils": "^1.11.9", - "ulid": "^2.3.0" + "@medusajs/utils": "^1.11.9" + }, + "peerDependencies": { + "ulid": "*" }, "keywords": [ "medusa-plugin", diff --git a/packages/modules/tax/package.json b/packages/modules/tax/package.json index abc4b62123..c25f6500ec 100644 --- a/packages/modules/tax/package.json +++ b/packages/modules/tax/package.json @@ -45,7 +45,7 @@ "typescript": "^5.1.6" }, "dependencies": { - "@medusajs/modules-sdk": "^1.12.9", + "@medusajs/modules-sdk": "^1.12.11", "@medusajs/utils": "^1.11.9" }, "peerDependencies": { diff --git a/yarn.lock b/yarn.lock index 1806917e1d..b598b07438 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4325,7 +4325,6 @@ __metadata: dependencies: "@medusajs/types": ^1.11.16 "@medusajs/utils": ^1.11.9 - "@mikro-orm/cli": 5.9.7 cross-env: ^5.2.1 jest: ^29.7.0 medusa-test-utils: ^1.1.44 @@ -4374,7 +4373,7 @@ __metadata: version: 0.0.0-use.local resolution: "@medusajs/auth@workspace:packages/modules/auth" dependencies: - "@medusajs/modules-sdk": ^1.12.9 + "@medusajs/modules-sdk": ^1.12.11 "@medusajs/types": ^1.11.14 "@medusajs/utils": ^1.11.9 "@mikro-orm/cli": 5.9.7 @@ -4399,7 +4398,7 @@ __metadata: version: 0.0.0-use.local resolution: "@medusajs/cache-inmemory@workspace:packages/modules/cache-inmemory" dependencies: - "@medusajs/modules-sdk": ^1.12.3 + "@medusajs/modules-sdk": ^1.12.11 "@medusajs/types": ^1.11.9 "@medusajs/utils": ^1.11.9 cross-env: ^5.2.1 @@ -4453,7 +4452,6 @@ __metadata: resolution: "@medusajs/core-flows@workspace:packages/core/core-flows" dependencies: "@medusajs/modules-sdk": ^1.12.11 - "@medusajs/orchestration": ^0.5.7 "@medusajs/types": ^1.11.16 "@medusajs/utils": ^1.11.9 "@medusajs/workflows-sdk": ^0.1.6 @@ -4572,14 +4570,15 @@ __metadata: version: 0.0.0-use.local resolution: "@medusajs/event-bus-local@workspace:packages/modules/event-bus-local" dependencies: - "@medusajs/modules-sdk": ^1.12.8 + "@medusajs/modules-sdk": ^1.12.11 "@medusajs/types": ^1.11.12 "@medusajs/utils": ^1.11.9 cross-env: ^5.2.1 jest: ^29.7.0 rimraf: ^5.0.1 typescript: ^5.1.6 - ulid: ^2.3.0 + peerDependencies: + ulid: "*" languageName: unknown linkType: soft @@ -4626,7 +4625,8 @@ __metadata: jest: ^29.7.0 rimraf: ^5.0.1 typescript: ^5.3.3 - ulid: ^2.3.0 + peerDependencies: + ulid: "*" languageName: unknown linkType: soft @@ -4858,7 +4858,6 @@ __metadata: pg: ^8.11.3 pg-god: ^1.0.12 prompts: ^2.4.2 - resolve-cwd: ^3.0.0 rimraf: ^5.0.1 semver: ^7.3.8 stack-trace: ^0.0.10 @@ -4957,7 +4956,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/modules-sdk@^1.12.11, @medusajs/modules-sdk@^1.12.3, @medusajs/modules-sdk@^1.12.8, @medusajs/modules-sdk@^1.12.9, @medusajs/modules-sdk@workspace:^, @medusajs/modules-sdk@workspace:packages/core/modules-sdk": +"@medusajs/modules-sdk@^1.12.11, @medusajs/modules-sdk@^1.12.8, @medusajs/modules-sdk@workspace:^, @medusajs/modules-sdk@workspace:packages/core/modules-sdk": version: 0.0.0-use.local resolution: "@medusajs/modules-sdk@workspace:packages/core/modules-sdk" dependencies: @@ -4966,7 +4965,6 @@ __metadata: "@medusajs/orchestration": ^0.5.7 "@medusajs/types": ^1.11.16 "@medusajs/utils": ^1.11.9 - "@mikro-orm/core": 5.9.7 cross-env: ^5.2.1 graphql: ^16.6.0 jest: ^29.7.0 @@ -4974,6 +4972,7 @@ __metadata: rimraf: ^5.0.1 typescript: ^5.1.6 peerDependencies: + "@mikro-orm/core": "*" awilix: "*" languageName: unknown linkType: soft @@ -5281,7 +5280,7 @@ __metadata: version: 0.0.0-use.local resolution: "@medusajs/tax@workspace:packages/modules/tax" dependencies: - "@medusajs/modules-sdk": ^1.12.9 + "@medusajs/modules-sdk": ^1.12.11 "@medusajs/types": ^1.11.14 "@medusajs/utils": ^1.11.9 "@mikro-orm/cli": 5.9.7 @@ -22747,24 +22746,32 @@ __metadata: "@medusajs/framework": ^0.0.1 "@medusajs/types": ^1.11.16 "@medusajs/utils": ^1.11.9 - "@mikro-orm/migrations": 5.9.7 - "@mikro-orm/postgresql": 5.9.7 cross-env: ^5.2.1 jest: ^29.7.0 randomatic: ^3.1.1 rimraf: ^3.0.2 typescript: ^5.1.6 peerDependencies: - "@medusajs/medusa": ">1.19" - "@medusajs/modules-sdk": ^1.12.10 - "@mikro-orm/core": 5.9.7 + "@medusajs/medusa": "*" + "@medusajs/modules-sdk": "*" + "@mikro-orm/core": "*" + "@mikro-orm/migrations": "*" + "@mikro-orm/postgresql": "*" axios: ^0.28.0 express: ^4.18.3 get-port: ^5.1.0 pg-god: ^1.0.12 peerDependenciesMeta: + "@medusajs/core": + optional: true "@medusajs/medusa": optional: true + "@medusajs/migrations": + optional: true + "@medusajs/modules-sdk": + optional: true + "@medusajs/postgresql": + optional: true axios: optional: true express: