chore: dependencies reorg (#8744)

This commit is contained in:
Carlos R. L. Rodrigues authored and GitHub committed 2024-08-26 09:37:05 +00:00
1 parent 7c2cfc132a
commit afd25846f0
16 files changed
+72 -40

No files matched your search

-1
View File
@@ -57,7 +57,6 @@
"pg": "^8.11.3", "pg": "^8.11.3",
"pg-god": "^1.0.12", "pg-god": "^1.0.12",
"prompts": "^2.4.2", "prompts": "^2.4.2",
"resolve-cwd": "^3.0.0",
"semver": "^7.3.8", "semver": "^7.3.8",
"stack-trace": "^0.0.10", "stack-trace": "^0.0.10",
"winston": "^3.8.2", "winston": "^3.8.2",
+5 -5
View File
@@ -1,10 +1,10 @@
import { sync as existsSync } from "fs-exists-cached" import { sync as existsSync } from "fs-exists-cached"
import { setTelemetryEnabled } from "medusa-telemetry" import { setTelemetryEnabled } from "medusa-telemetry"
import path from "path" import path from "path"
import resolveCwd from "resolve-cwd"
import { didYouMean } from "./did-you-mean" import { didYouMean } from "./did-you-mean"
import { toCamelCase } from "@medusajs/utils"
import { newStarter } from "./commands/new" import { newStarter } from "./commands/new"
import reporter from "./reporter" import reporter from "./reporter"
@@ -40,10 +40,9 @@ function buildLocalCommands(cli, isLocalProject) {
} }
try { try {
const cmdPath = resolveCwd.silent( const { Commands } = require("@medusajs/medusa")
`@medusajs/medusa/dist/commands/${command}` const cmdName = toCamelCase(command)
)! return Commands[cmdName]
return require(cmdPath).default
} catch (err) { } catch (err) {
if (!process.env.NODE_ENV?.startsWith("prod")) { if (!process.env.NODE_ENV?.startsWith("prod")) {
console.log("--------------- ERROR ---------------------") console.log("--------------- ERROR ---------------------")
@@ -249,6 +248,7 @@ function buildLocalCommands(cli, isLocalProject) {
handler: handlerP( handler: handlerP(
getCommandHandler(`develop`, (args, cmd) => { getCommandHandler(`develop`, (args, cmd) => {
process.env.NODE_ENV = process.env.NODE_ENV || `development` process.env.NODE_ENV = process.env.NODE_ENV || `development`
cmd(args) cmd(args)
// Return an empty promise to prevent handlerP from exiting early. // Return an empty promise to prevent handlerP from exiting early.
// The development server shouldn't ever exit until the user directly // The development server shouldn't ever exit until the user directly
-1
View File
@@ -31,7 +31,6 @@
}, },
"dependencies": { "dependencies": {
"@medusajs/modules-sdk": "^1.12.11", "@medusajs/modules-sdk": "^1.12.11",
"@medusajs/orchestration": "^0.5.7",
"@medusajs/utils": "^1.11.9", "@medusajs/utils": "^1.11.9",
"@medusajs/workflows-sdk": "^0.1.6", "@medusajs/workflows-sdk": "^0.1.6",
"json-2-csv": "^5.5.4" "json-2-csv": "^5.5.4"
+17 -6
View File
@@ -26,25 +26,38 @@
"devDependencies": { "devDependencies": {
"@medusajs/framework": "^0.0.1", "@medusajs/framework": "^0.0.1",
"@medusajs/types": "^1.11.16", "@medusajs/types": "^1.11.16",
"@medusajs/utils": "^1.11.9",
"cross-env": "^5.2.1", "cross-env": "^5.2.1",
"jest": "^29.7.0", "jest": "^29.7.0",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"typescript": "^5.1.6" "typescript": "^5.1.6"
}, },
"peerDependencies": { "peerDependencies": {
"@medusajs/medusa": ">1.19", "@medusajs/medusa": "*",
"@medusajs/modules-sdk": "^1.12.10", "@medusajs/modules-sdk": "*",
"@mikro-orm/core": "5.9.7", "@mikro-orm/core": "*",
"@mikro-orm/migrations": "*",
"@mikro-orm/postgresql": "*",
"axios": "^0.28.0", "axios": "^0.28.0",
"express": "^4.18.3", "express": "^4.18.3",
"get-port": "^5.1.0", "get-port": "^5.1.0",
"pg-god": "^1.0.12" "pg-god": "^1.0.12"
}, },
"peerDependenciesMeta": { "peerDependenciesMeta": {
"@medusajs/core": {
"optional": true
},
"@medusajs/medusa": { "@medusajs/medusa": {
"optional": true "optional": true
}, },
"@medusajs/migrations": {
"optional": true
},
"@medusajs/modules-sdk": {
"optional": true
},
"@medusajs/postgresql": {
"optional": true
},
"axios": { "axios": {
"optional": true "optional": true
}, },
@@ -60,8 +73,6 @@
}, },
"dependencies": { "dependencies": {
"@medusajs/utils": "^1.11.9", "@medusajs/utils": "^1.11.9",
"@mikro-orm/migrations": "5.9.7",
"@mikro-orm/postgresql": "5.9.7",
"randomatic": "^3.1.1" "randomatic": "^3.1.1"
}, },
"gitHead": "81a7ff73d012fda722f6e9ef0bd9ba0232d37808" "gitHead": "81a7ff73d012fda722f6e9ef0bd9ba0232d37808"
+1 -1
View File
@@ -21,7 +21,6 @@
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
"@medusajs/types": "^1.11.16", "@medusajs/types": "^1.11.16",
"@mikro-orm/core": "5.9.7",
"cross-env": "^5.2.1", "cross-env": "^5.2.1",
"jest": "^29.7.0", "jest": "^29.7.0",
"rimraf": "^5.0.1", "rimraf": "^5.0.1",
@@ -36,6 +35,7 @@
"resolve-cwd": "^3.0.0" "resolve-cwd": "^3.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@mikro-orm/core": "*",
"awilix": "*" "awilix": "*"
}, },
"scripts": { "scripts": {
+1
View File
@@ -32,4 +32,5 @@ export function trackInstallation(installation, type) {
} }
} }
export { default as Store } from "./store"
export { default as Telemeter } from "./telemeter" export { default as Telemeter } from "./telemeter"
+4 -1
View File
@@ -1,7 +1,7 @@
import boxen from "boxen" import boxen from "boxen"
import { ChildProcess, execSync, fork } from "child_process" import { ChildProcess, execSync, fork } from "child_process"
import chokidar, { FSWatcher } from "chokidar" import chokidar, { FSWatcher } from "chokidar"
import Store from "medusa-telemetry/dist/store" import { Store } from "medusa-telemetry"
import { EOL } from "os" import { EOL } from "os"
import path from "path" import path from "path"
@@ -15,10 +15,12 @@ const defaultConfig = {
export default async function ({ port, directory }) { export default async function ({ port, directory }) {
const args = process.argv const args = process.argv
const argv = const argv =
process.argv.indexOf("--") !== -1 process.argv.indexOf("--") !== -1
? process.argv.slice(process.argv.indexOf("--") + 1) ? process.argv.slice(process.argv.indexOf("--") + 1)
: [] : []
args.shift() args.shift()
args.shift() 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 * Re-constructing the path to Medusa CLI to execute the
* start command. * start command.
*/ */
const cliPath = path.resolve(MEDUSA_CLI_PATH, "..", "..", "cli.js") const cliPath = path.resolve(MEDUSA_CLI_PATH, "..", "..", "cli.js")
const devServer = { const devServer = {
+8
View File
@@ -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"
+1
View File
@@ -1,3 +1,4 @@
export * as Commands from "./commands"
export * from "./types/common" export * from "./types/common"
export * from "./types/global" export * from "./types/global"
export * from "./types/middlewares" export * from "./types/middlewares"
-1
View File
@@ -35,7 +35,6 @@
}, },
"devDependencies": { "devDependencies": {
"@medusajs/types": "^1.11.16", "@medusajs/types": "^1.11.16",
"@mikro-orm/cli": "5.9.7",
"cross-env": "^5.2.1", "cross-env": "^5.2.1",
"jest": "^29.7.0", "jest": "^29.7.0",
"medusa-test-utils": "^1.1.44", "medusa-test-utils": "^1.1.44",
+1 -1
View File
@@ -44,7 +44,7 @@
"typescript": "^5.1.6" "typescript": "^5.1.6"
}, },
"dependencies": { "dependencies": {
"@medusajs/modules-sdk": "^1.12.9", "@medusajs/modules-sdk": "^1.12.11",
"@medusajs/utils": "^1.11.9", "@medusajs/utils": "^1.11.9",
"jsonwebtoken": "^9.0.2", "jsonwebtoken": "^9.0.2",
"scrypt-kdf": "^2.0.1", "scrypt-kdf": "^2.0.1",
+1 -1
View File
@@ -33,7 +33,7 @@
"test": "jest --passWithNoTests" "test": "jest --passWithNoTests"
}, },
"dependencies": { "dependencies": {
"@medusajs/modules-sdk": "^1.12.3", "@medusajs/modules-sdk": "^1.12.11",
"@medusajs/utils": "^1.11.9" "@medusajs/utils": "^1.11.9"
} }
} }
@@ -33,8 +33,10 @@
"test": "jest --passWithNoTests" "test": "jest --passWithNoTests"
}, },
"dependencies": { "dependencies": {
"@medusajs/modules-sdk": "^1.12.8", "@medusajs/modules-sdk": "^1.12.11",
"@medusajs/utils": "^1.11.9", "@medusajs/utils": "^1.11.9"
"ulid": "^2.3.0" },
"peerDependencies": {
"ulid": "*"
} }
} }
@@ -33,8 +33,10 @@
"dependencies": { "dependencies": {
"@aws-sdk/client-s3": "^3.556.0", "@aws-sdk/client-s3": "^3.556.0",
"@aws-sdk/s3-request-presigner": "^3.556.0", "@aws-sdk/s3-request-presigner": "^3.556.0",
"@medusajs/utils": "^1.11.9", "@medusajs/utils": "^1.11.9"
"ulid": "^2.3.0" },
"peerDependencies": {
"ulid": "*"
}, },
"keywords": [ "keywords": [
"medusa-plugin", "medusa-plugin",
+1 -1
View File
@@ -45,7 +45,7 @@
"typescript": "^5.1.6" "typescript": "^5.1.6"
}, },
"dependencies": { "dependencies": {
"@medusajs/modules-sdk": "^1.12.9", "@medusajs/modules-sdk": "^1.12.11",
"@medusajs/utils": "^1.11.9" "@medusajs/utils": "^1.11.9"
}, },
"peerDependencies": { "peerDependencies": {
+23 -16
View File
@@ -4325,7 +4325,6 @@ __metadata:
dependencies: dependencies:
"@medusajs/types": ^1.11.16 "@medusajs/types": ^1.11.16
"@medusajs/utils": ^1.11.9 "@medusajs/utils": ^1.11.9
"@mikro-orm/cli": 5.9.7
cross-env: ^5.2.1 cross-env: ^5.2.1
jest: ^29.7.0 jest: ^29.7.0
medusa-test-utils: ^1.1.44 medusa-test-utils: ^1.1.44
@@ -4374,7 +4373,7 @@ __metadata:
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@medusajs/auth@workspace:packages/modules/auth" resolution: "@medusajs/auth@workspace:packages/modules/auth"
dependencies: dependencies:
"@medusajs/modules-sdk": ^1.12.9 "@medusajs/modules-sdk": ^1.12.11
"@medusajs/types": ^1.11.14 "@medusajs/types": ^1.11.14
"@medusajs/utils": ^1.11.9 "@medusajs/utils": ^1.11.9
"@mikro-orm/cli": 5.9.7 "@mikro-orm/cli": 5.9.7
@@ -4399,7 +4398,7 @@ __metadata:
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@medusajs/cache-inmemory@workspace:packages/modules/cache-inmemory" resolution: "@medusajs/cache-inmemory@workspace:packages/modules/cache-inmemory"
dependencies: dependencies:
"@medusajs/modules-sdk": ^1.12.3 "@medusajs/modules-sdk": ^1.12.11
"@medusajs/types": ^1.11.9 "@medusajs/types": ^1.11.9
"@medusajs/utils": ^1.11.9 "@medusajs/utils": ^1.11.9
cross-env: ^5.2.1 cross-env: ^5.2.1
@@ -4453,7 +4452,6 @@ __metadata:
resolution: "@medusajs/core-flows@workspace:packages/core/core-flows" resolution: "@medusajs/core-flows@workspace:packages/core/core-flows"
dependencies: dependencies:
"@medusajs/modules-sdk": ^1.12.11 "@medusajs/modules-sdk": ^1.12.11
"@medusajs/orchestration": ^0.5.7
"@medusajs/types": ^1.11.16 "@medusajs/types": ^1.11.16
"@medusajs/utils": ^1.11.9 "@medusajs/utils": ^1.11.9
"@medusajs/workflows-sdk": ^0.1.6 "@medusajs/workflows-sdk": ^0.1.6
@@ -4572,14 +4570,15 @@ __metadata:
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@medusajs/event-bus-local@workspace:packages/modules/event-bus-local" resolution: "@medusajs/event-bus-local@workspace:packages/modules/event-bus-local"
dependencies: dependencies:
"@medusajs/modules-sdk": ^1.12.8 "@medusajs/modules-sdk": ^1.12.11
"@medusajs/types": ^1.11.12 "@medusajs/types": ^1.11.12
"@medusajs/utils": ^1.11.9 "@medusajs/utils": ^1.11.9
cross-env: ^5.2.1 cross-env: ^5.2.1
jest: ^29.7.0 jest: ^29.7.0
rimraf: ^5.0.1 rimraf: ^5.0.1
typescript: ^5.1.6 typescript: ^5.1.6
ulid: ^2.3.0 peerDependencies:
ulid: "*"
languageName: unknown languageName: unknown
linkType: soft linkType: soft
@@ -4626,7 +4625,8 @@ __metadata:
jest: ^29.7.0 jest: ^29.7.0
rimraf: ^5.0.1 rimraf: ^5.0.1
typescript: ^5.3.3 typescript: ^5.3.3
ulid: ^2.3.0 peerDependencies:
ulid: "*"
languageName: unknown languageName: unknown
linkType: soft linkType: soft
@@ -4858,7 +4858,6 @@ __metadata:
pg: ^8.11.3 pg: ^8.11.3
pg-god: ^1.0.12 pg-god: ^1.0.12
prompts: ^2.4.2 prompts: ^2.4.2
resolve-cwd: ^3.0.0
rimraf: ^5.0.1 rimraf: ^5.0.1
semver: ^7.3.8 semver: ^7.3.8
stack-trace: ^0.0.10 stack-trace: ^0.0.10
@@ -4957,7 +4956,7 @@ __metadata:
languageName: unknown languageName: unknown
linkType: soft 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 version: 0.0.0-use.local
resolution: "@medusajs/modules-sdk@workspace:packages/core/modules-sdk" resolution: "@medusajs/modules-sdk@workspace:packages/core/modules-sdk"
dependencies: dependencies:
@@ -4966,7 +4965,6 @@ __metadata:
"@medusajs/orchestration": ^0.5.7 "@medusajs/orchestration": ^0.5.7
"@medusajs/types": ^1.11.16 "@medusajs/types": ^1.11.16
"@medusajs/utils": ^1.11.9 "@medusajs/utils": ^1.11.9
"@mikro-orm/core": 5.9.7
cross-env: ^5.2.1 cross-env: ^5.2.1
graphql: ^16.6.0 graphql: ^16.6.0
jest: ^29.7.0 jest: ^29.7.0
@@ -4974,6 +4972,7 @@ __metadata:
rimraf: ^5.0.1 rimraf: ^5.0.1
typescript: ^5.1.6 typescript: ^5.1.6
peerDependencies: peerDependencies:
"@mikro-orm/core": "*"
awilix: "*" awilix: "*"
languageName: unknown languageName: unknown
linkType: soft linkType: soft
@@ -5281,7 +5280,7 @@ __metadata:
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@medusajs/tax@workspace:packages/modules/tax" resolution: "@medusajs/tax@workspace:packages/modules/tax"
dependencies: dependencies:
"@medusajs/modules-sdk": ^1.12.9 "@medusajs/modules-sdk": ^1.12.11
"@medusajs/types": ^1.11.14 "@medusajs/types": ^1.11.14
"@medusajs/utils": ^1.11.9 "@medusajs/utils": ^1.11.9
"@mikro-orm/cli": 5.9.7 "@mikro-orm/cli": 5.9.7
@@ -22747,24 +22746,32 @@ __metadata:
"@medusajs/framework": ^0.0.1 "@medusajs/framework": ^0.0.1
"@medusajs/types": ^1.11.16 "@medusajs/types": ^1.11.16
"@medusajs/utils": ^1.11.9 "@medusajs/utils": ^1.11.9
"@mikro-orm/migrations": 5.9.7
"@mikro-orm/postgresql": 5.9.7
cross-env: ^5.2.1 cross-env: ^5.2.1
jest: ^29.7.0 jest: ^29.7.0
randomatic: ^3.1.1 randomatic: ^3.1.1
rimraf: ^3.0.2 rimraf: ^3.0.2
typescript: ^5.1.6 typescript: ^5.1.6
peerDependencies: peerDependencies:
"@medusajs/medusa": ">1.19" "@medusajs/medusa": "*"
"@medusajs/modules-sdk": ^1.12.10 "@medusajs/modules-sdk": "*"
"@mikro-orm/core": 5.9.7 "@mikro-orm/core": "*"
"@mikro-orm/migrations": "*"
"@mikro-orm/postgresql": "*"
axios: ^0.28.0 axios: ^0.28.0
express: ^4.18.3 express: ^4.18.3
get-port: ^5.1.0 get-port: ^5.1.0
pg-god: ^1.0.12 pg-god: ^1.0.12
peerDependenciesMeta: peerDependenciesMeta:
"@medusajs/core":
optional: true
"@medusajs/medusa": "@medusajs/medusa":
optional: true optional: true
"@medusajs/migrations":
optional: true
"@medusajs/modules-sdk":
optional: true
"@medusajs/postgresql":
optional: true
axios: axios:
optional: true optional: true
express: express: