chore(): Move peer deps into a single package and re export from framework (#13439)
* chore(): Move peer deps into a single package and re export from framework * WIP * update core packages * update cli and deps * update medusa * update exports path * remove analyze * update modules deps * finalise changes * fix yarn * fix import * Refactor peer dependencies into a single package Consolidate peer dependencies into one package and re-export from the framework. * update changeset * Update .changeset/brown-cows-sleep.md Co-authored-by: Oli Juhl <59018053+olivermrbl@users.noreply.github.com> * rm deps * fix deps * increase timeout * upgrade version * update versions * update versions * fixes * update lock * fix missing import * fix missing import --------- Co-authored-by: Oli Juhl <59018053+olivermrbl@users.noreply.github.com>
This commit is contained in:
co-authored by
Oli Juhl
parent
55f89b2151
commit
12a96a7c70
@@ -32,7 +32,14 @@
|
||||
"./workflows-sdk": "./dist/workflows-sdk/index.js",
|
||||
"./workflows-sdk/composer": "./dist/workflows-sdk/composer.js",
|
||||
"./modules-sdk": "./dist/modules-sdk/index.js",
|
||||
"./migrations": "./dist/migrations/index.js"
|
||||
"./migrations": "./dist/migrations/index.js",
|
||||
"./mikro-orm/cli": "./dist/deps/mikro-orm-cli.js",
|
||||
"./mikro-orm/core": "./dist/deps/mikro-orm-core.js",
|
||||
"./mikro-orm/knex": "./dist/deps/mikro-orm-knex.js",
|
||||
"./mikro-orm/migrations": "./dist/deps/mikro-orm-migrations.js",
|
||||
"./mikro-orm/postgresql": "./dist/deps/mikro-orm-postgresql.js",
|
||||
"./awilix": "./dist/deps/awilix.js",
|
||||
"./pg": "./dist/deps/pg.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=20"
|
||||
@@ -56,19 +63,13 @@
|
||||
"devDependencies": {
|
||||
"@aws-sdk/client-dynamodb": "^3.218.0",
|
||||
"@medusajs/cli": "2.10.3",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/knex": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"@swc/core": "^1.7.28",
|
||||
"@swc/jest": "^0.2.36",
|
||||
"@types/cors": "^2.8.17",
|
||||
"@types/jsonwebtoken": "^8.5.9",
|
||||
"awilix": "^8.0.1",
|
||||
"connect-dynamodb": "^3.0.5",
|
||||
"ioredis": "^5.4.1",
|
||||
"jest": "^29.7.0",
|
||||
"pg": "^8.16.3",
|
||||
"rimraf": "^3.0.2",
|
||||
"supertest": "^4.0.2",
|
||||
"typescript": "^5.6.2",
|
||||
@@ -76,6 +77,7 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@jercle/yargonaut": "^1.1.5",
|
||||
"@medusajs/deps": "2.10.3",
|
||||
"@medusajs/modules-sdk": "2.10.3",
|
||||
"@medusajs/orchestration": "2.10.3",
|
||||
"@medusajs/telemetry": "2.10.3",
|
||||
@@ -103,24 +105,14 @@
|
||||
"peerDependencies": {
|
||||
"@aws-sdk/client-dynamodb": "^3.218.0",
|
||||
"@medusajs/cli": "2.10.3",
|
||||
"@mikro-orm/cli": "6.5.4",
|
||||
"@mikro-orm/core": "6.5.4",
|
||||
"@mikro-orm/knex": "6.5.4",
|
||||
"@mikro-orm/migrations": "6.5.4",
|
||||
"@mikro-orm/postgresql": "6.5.4",
|
||||
"awilix": "^8.0.1",
|
||||
"connect-dynamodb": "^3.0.5",
|
||||
"ioredis": "^5.4.1",
|
||||
"pg": "^8.16.3",
|
||||
"vite": "^5.4.14"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"@aws-sdk/client-dynamodb": {
|
||||
"optional": true
|
||||
},
|
||||
"@mikro-orm/cli": {
|
||||
"optional": true
|
||||
},
|
||||
"connect-dynamodb": {
|
||||
"optional": true
|
||||
},
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { ContainerRegistrationKeys, getConfigFile } from "@medusajs/utils"
|
||||
import { asFunction } from "awilix"
|
||||
import { asFunction } from "../deps/awilix"
|
||||
import { container } from "../container"
|
||||
import { logger as defaultLogger } from "../logger"
|
||||
import { ConfigManager } from "./config"
|
||||
|
||||
@@ -4,7 +4,7 @@ import {
|
||||
retryExecution,
|
||||
stringifyCircular,
|
||||
} from "@medusajs/utils"
|
||||
import { asValue } from "awilix"
|
||||
import { asValue } from "../deps/awilix"
|
||||
import { configManager } from "../config"
|
||||
import { container } from "../container"
|
||||
import { logger } from "../logger"
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
export * from "@medusajs/deps/awilix"
|
||||
@@ -0,0 +1 @@
|
||||
export * from "@medusajs/deps/mikro-orm/cli"
|
||||
@@ -0,0 +1 @@
|
||||
export * from "@medusajs/deps/mikro-orm/core"
|
||||
@@ -0,0 +1 @@
|
||||
export * from "@medusajs/deps/mikro-orm/knex"
|
||||
@@ -0,0 +1 @@
|
||||
export * from "@medusajs/deps/mikro-orm/migrations"
|
||||
@@ -0,0 +1 @@
|
||||
export * from "@medusajs/deps/mikro-orm/postgresql"
|
||||
@@ -0,0 +1 @@
|
||||
export * from "@medusajs/deps/pg"
|
||||
@@ -5,7 +5,7 @@ import {
|
||||
FeatureFlag,
|
||||
FlagRouter,
|
||||
} from "@medusajs/utils"
|
||||
import { asFunction } from "awilix"
|
||||
import { asFunction } from "../deps/awilix"
|
||||
import { normalize } from "path"
|
||||
import { configManager } from "../config"
|
||||
import { container } from "../container"
|
||||
|
||||
@@ -5,7 +5,7 @@ import {
|
||||
} from "@medusajs/modules-sdk"
|
||||
import { MedusaContainer } from "@medusajs/types"
|
||||
import { ContainerRegistrationKeys, generateJwtToken } from "@medusajs/utils"
|
||||
import { asValue } from "awilix"
|
||||
import { asValue } from "../../../deps/awilix"
|
||||
import express from "express"
|
||||
import querystring from "querystring"
|
||||
import supertest from "supertest"
|
||||
|
||||
@@ -2,7 +2,7 @@ import {
|
||||
ContainerRegistrationKeys,
|
||||
createMedusaContainer,
|
||||
} from "@medusajs/utils"
|
||||
import { asValue } from "awilix"
|
||||
import { asValue } from "../../deps/awilix"
|
||||
import express from "express"
|
||||
import { resolve } from "path"
|
||||
import { logger as defaultLogger } from "../../logger"
|
||||
|
||||
@@ -3,7 +3,7 @@ import {
|
||||
ContainerRegistrationKeys,
|
||||
createMedusaContainer,
|
||||
} from "@medusajs/utils"
|
||||
import { asValue } from "awilix"
|
||||
import { asValue } from "../../deps/awilix"
|
||||
import { join } from "path"
|
||||
import { logger } from "../../logger"
|
||||
import { MockSchedulerStorage } from "../__fixtures__/mock-scheduler-storage"
|
||||
|
||||
@@ -25,8 +25,8 @@ import {
|
||||
upperCaseFirst,
|
||||
} from "@medusajs/utils"
|
||||
|
||||
import type { Knex } from "@mikro-orm/knex"
|
||||
import { aliasTo, asValue } from "awilix"
|
||||
import type { Knex } from "@medusajs/framework/mikro-orm/knex"
|
||||
import { aliasTo, asValue } from "./deps/awilix"
|
||||
import { configManager } from "./config"
|
||||
import {
|
||||
container,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { MedusaContainer } from "@medusajs/types"
|
||||
import { Knex } from "@mikro-orm/knex"
|
||||
import { Knex } from "../deps/mikro-orm-knex"
|
||||
import { glob } from "glob"
|
||||
import { join } from "path"
|
||||
import { logger } from "../logger"
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
* small, we should be okay with managing this wrapper.
|
||||
*/
|
||||
|
||||
import { CLIConfigurator, CLIHelper } from "@mikro-orm/cli"
|
||||
import { ConfigurationLoader } from "@mikro-orm/core"
|
||||
import { CLIConfigurator, CLIHelper } from "../deps/mikro-orm-cli"
|
||||
import { ConfigurationLoader } from "../deps/mikro-orm-core"
|
||||
import { isAbsolute, join } from "path"
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { ContainerRegistrationKeys, Modules } from "@medusajs/utils"
|
||||
import { asValue } from "awilix"
|
||||
import { asValue } from "../../deps/awilix"
|
||||
import { join } from "path"
|
||||
import { container } from "../../container"
|
||||
import { logger } from "../../logger"
|
||||
|
||||
@@ -32,8 +32,8 @@ import {
|
||||
RemoteQueryFunction,
|
||||
} from "@medusajs/types"
|
||||
import { ContainerRegistrationKeys, Modules } from "@medusajs/utils"
|
||||
import { Knex } from "@mikro-orm/knex"
|
||||
import { AwilixContainer, ResolveOptions } from "awilix"
|
||||
import { Knex } from "../deps/mikro-orm-knex"
|
||||
import { AwilixContainer, ResolveOptions } from "../deps/awilix"
|
||||
|
||||
declare module "@medusajs/types" {
|
||||
export interface ModuleImplementations {
|
||||
|
||||
@@ -3,7 +3,7 @@ import {
|
||||
ContainerRegistrationKeys,
|
||||
createMedusaContainer,
|
||||
} from "@medusajs/utils"
|
||||
import { asValue } from "awilix"
|
||||
import { asValue } from "../../deps/awilix"
|
||||
import { join } from "path"
|
||||
import { logger } from "../../logger"
|
||||
import { productWorkflowId } from "../__fixtures__/workflows/deep-workflows/product-updater"
|
||||
|
||||
Reference in New Issue
Block a user