diff --git a/packages/framework/framework/package.json b/packages/framework/framework/package.json index f6617fe747..f0d094cfbd 100644 --- a/packages/framework/framework/package.json +++ b/packages/framework/framework/package.json @@ -50,7 +50,7 @@ "test:integration": "jest --forceExit -- integration-tests/**/__tests__/**/*.ts" }, "devDependencies": { - "@medusajs/types": "workspace:^", + "@medusajs/types": "^1.11.17-preview-20240510084332", "cross-env": "^7.0.3", "ioredis": "^5.2.5", "rimraf": "^3.0.2", @@ -59,8 +59,8 @@ "vite": "^5.2.11" }, "dependencies": { - "@medusajs/medusa-cli": "workspace:^", - "@medusajs/utils": "workspace:^", + "@medusajs/medusa-cli": "^1.3.23", + "@medusajs/utils": "^1.12.0-preview-20240724081425", "awilix": "^8.0.0" } } diff --git a/packages/framework/framework/src/config/config.ts b/packages/framework/framework/src/config/config.ts index 117341a41f..47474bb1a3 100644 --- a/packages/framework/framework/src/config/config.ts +++ b/packages/framework/framework/src/config/config.ts @@ -108,7 +108,9 @@ export class ConfigManager { protected normalizeProjectConfig( projectConfig: Partial ): ConfigModule["projectConfig"] { - const outputConfig: ConfigModule["projectConfig"] = deepCopy(projectConfig) + const outputConfig = deepCopy( + projectConfig + ) as ConfigModule["projectConfig"] if (!outputConfig?.redisUrl) { console.log(`redisUrl not found. A fake redis instance will be used.`) diff --git a/packages/medusa/package.json b/packages/medusa/package.json index 073e020b4d..7f47a061af 100644 --- a/packages/medusa/package.json +++ b/packages/medusa/package.json @@ -45,7 +45,7 @@ "@inquirer/checkbox": "^2.3.11", "@medusajs/admin-sdk": "0.0.1", "@medusajs/core-flows": "^0.0.9", - "@medusajs/framework": "workspace:^", + "@medusajs/framework": "^0.0.1-preview-20240724081425", "@medusajs/link-modules": "^0.2.11", "@medusajs/medusa-cli": "^1.3.22", "@medusajs/modules-sdk": "^1.12.11", diff --git a/packages/medusa/src/loaders/pg-connection.ts b/packages/medusa/src/loaders/pg-connection.ts index 6e112bd004..4654032b52 100644 --- a/packages/medusa/src/loaders/pg-connection.ts +++ b/packages/medusa/src/loaders/pg-connection.ts @@ -1,4 +1,4 @@ -import { ConfigModule } from "@medusajs/types" +import { ConfigModule } from "@medusajs/framework" import { ContainerRegistrationKeys, ModulesSdkUtils } from "@medusajs/utils" import { asValue, AwilixContainer } from "awilix" diff --git a/yarn.lock b/yarn.lock index 0fe78584a8..f690edb4ff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4604,13 +4604,24 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/framework@workspace:^, @medusajs/framework@workspace:packages/framework/framework": +"@medusajs/framework@npm:^0.0.1-preview-20240724081425": + version: 0.0.1-preview-20240724081425 + resolution: "@medusajs/framework@npm:0.0.1-preview-20240724081425" + dependencies: + "@medusajs/medusa-cli": "workspace:^" + "@medusajs/utils": "workspace:^" + awilix: ^8.0.0 + checksum: 46485cc3de7d56ddf18cb6a596cccacdb0fb17908db2ded60e3653e8f809b0e8c30c525c1c2eef5317347530d757d7f8b9b2ff052a254073ffa36772e6e3dddd + languageName: node + linkType: hard + +"@medusajs/framework@workspace:packages/framework/framework": version: 0.0.0-use.local resolution: "@medusajs/framework@workspace:packages/framework/framework" dependencies: - "@medusajs/medusa-cli": "workspace:^" - "@medusajs/types": "workspace:^" - "@medusajs/utils": "workspace:^" + "@medusajs/medusa-cli": ^1.3.23 + "@medusajs/types": ^1.11.17-preview-20240510084332 + "@medusajs/utils": ^1.12.0-preview-20240724081425 awilix: ^8.0.0 cross-env: ^7.0.3 ioredis: ^5.2.5 @@ -4803,6 +4814,44 @@ __metadata: languageName: unknown linkType: soft +"@medusajs/medusa-cli@npm:^1.3.23": + version: 1.3.23 + resolution: "@medusajs/medusa-cli@npm:1.3.23" + dependencies: + "@medusajs/utils": ^1.11.10 + axios: ^0.21.4 + chalk: ^4.0.0 + configstore: 5.0.1 + core-js: ^3.6.5 + dotenv: ^16.4.5 + execa: ^5.1.1 + fs-exists-cached: ^1.0.0 + fs-extra: ^10.0.0 + glob: ^7.1.6 + hosted-git-info: ^4.0.2 + inquirer: ^8.0.0 + is-valid-path: ^0.1.1 + meant: ^1.0.3 + medusa-core-utils: ^1.2.3 + medusa-telemetry: ^0.0.18 + open: ^8.0.6 + ora: ^5.4.1 + pg: ^8.11.0 + pg-god: ^1.0.12 + prompts: ^2.4.2 + regenerator-runtime: ^0.13.11 + resolve-cwd: ^3.0.0 + semver: ^7.3.8 + stack-trace: ^0.0.10 + ulid: ^2.3.0 + winston: ^3.8.2 + yargs: ^15.3.1 + bin: + medusa: cli.js + checksum: c6d276d5a1bae3313342196f8387c2588dd68c2fe8b230a7018fb0a17170c02ccb28d407780bf2a1081cc5925c79d27a144a2f3794779c781fa06d2bd4d7d891 + languageName: node + linkType: hard + "@medusajs/medusa-oas-cli@0.3.2, @medusajs/medusa-oas-cli@workspace:packages/cli/oas/medusa-oas-cli": version: 0.0.0-use.local resolution: "@medusajs/medusa-oas-cli@workspace:packages/cli/oas/medusa-oas-cli" @@ -4839,7 +4888,7 @@ __metadata: "@inquirer/checkbox": ^2.3.11 "@medusajs/admin-sdk": 0.0.1 "@medusajs/core-flows": ^0.0.9 - "@medusajs/framework": "workspace:^" + "@medusajs/framework": ^0.0.1-preview-20240724081425 "@medusajs/link-modules": ^0.2.11 "@medusajs/medusa-cli": ^1.3.22 "@medusajs/modules-sdk": ^1.12.11 @@ -5278,6 +5327,20 @@ __metadata: languageName: unknown linkType: soft +"@medusajs/types@npm:1.12.0-snapshot-20240723115023": + version: 1.12.0-snapshot-20240723115023 + resolution: "@medusajs/types@npm:1.12.0-snapshot-20240723115023" + checksum: 676a9f359000fc688346b3e0a1bc4d9c13bba35e613e98fed8e47a8f6b50177ab4295c3cb2d404795c5ad7cd2b8c131e1bddd4a6e139bd82347a6388b688ac2f + languageName: node + linkType: hard + +"@medusajs/types@npm:^1.11.17, @medusajs/types@npm:^1.11.17-preview-20240510084332": + version: 1.11.17 + resolution: "@medusajs/types@npm:1.11.17" + checksum: 544099b215cd4de87682c2154696ff4849704f74290f15e3e383e6cf503a335767b399b9fe2a381ffa4405fa2ec7ed911a8a5eecff6c7f10d5ef95af802064b6 + languageName: node + linkType: hard + "@medusajs/ui-preset@1.1.3, @medusajs/ui-preset@^1.1.3, @medusajs/ui-preset@workspace:packages/design-system/ui-preset": version: 0.0.0-use.local resolution: "@medusajs/ui-preset@workspace:packages/design-system/ui-preset" @@ -5419,6 +5482,42 @@ __metadata: languageName: unknown linkType: soft +"@medusajs/utils@npm:^1.11.10": + version: 1.11.10 + resolution: "@medusajs/utils@npm:1.11.10" + dependencies: + "@medusajs/types": ^1.11.17 + "@mikro-orm/core": 5.9.7 + "@mikro-orm/migrations": 5.9.7 + "@mikro-orm/postgresql": 5.9.7 + awilix: ^8.0.1 + bignumber.js: ^9.1.2 + knex: 2.4.2 + ulid: ^2.3.0 + checksum: 5f9c1e021a029c1176e8fb8e71257a2503e38aa033fb133cad5aa6ac0a73e46b715a2622269b44f6b65a7477e90c288b7b762ae012c65f143c3b6aa460ef3101 + languageName: node + linkType: hard + +"@medusajs/utils@npm:^1.12.0-preview-20240724081425": + version: 1.12.0-snapshot-20240723115023 + resolution: "@medusajs/utils@npm:1.12.0-snapshot-20240723115023" + dependencies: + "@medusajs/types": 1.12.0-snapshot-20240723115023 + "@mikro-orm/core": 5.9.7 + "@mikro-orm/migrations": 5.9.7 + "@mikro-orm/postgresql": 5.9.7 + awilix: ^8.0.1 + bignumber.js: ^9.1.2 + dotenv: ^16.4.5 + json-2-csv: ^5.5.4 + jsonwebtoken: ^9.0.2 + knex: 2.4.2 + pluralize: ^8.0.0 + ulid: ^2.3.0 + checksum: ae0d42e4a937c5941c4365de6be3908a5d75b121b50d0ba9d93ce948babea43b8c3d9eaedc1cd22fd7455b984e3ba209feb9217b311c28d679a92e9715376542 + languageName: node + linkType: hard + "@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" @@ -22649,6 +22748,15 @@ __metadata: languageName: node linkType: hard +"medusa-core-utils@npm:^1.2.3": + version: 1.2.3 + resolution: "medusa-core-utils@npm:1.2.3" + dependencies: + awilix: ^8.0.0 + checksum: 8547b2bd6cf51e155885bdbb622b2897035b1369a7b758158a2c71df0b349f5dc23d664a23db1a8654306bf08226d483efd75829cbc232980574af8097147e02 + languageName: node + linkType: hard + "medusa-dev-cli@workspace:packages/cli/medusa-dev-cli": version: 0.0.0-use.local resolution: "medusa-dev-cli@workspace:packages/cli/medusa-dev-cli" @@ -22698,6 +22806,24 @@ __metadata: languageName: unknown linkType: soft +"medusa-telemetry@npm:^0.0.18": + version: 0.0.18 + resolution: "medusa-telemetry@npm:0.0.18" + dependencies: + "@babel/runtime": ^7.22.10 + axios: ^0.21.4 + axios-retry: ^3.1.9 + boxen: ^5.0.1 + ci-info: ^3.2.0 + configstore: 5.0.1 + global: ^4.4.0 + is-docker: ^2.2.1 + remove-trailing-slash: ^0.1.1 + uuid: ^8.3.2 + checksum: 3571c3f578582667b3a48f2f3d9d27299a954fcc1e9165c2fdc441219d6faa0cd0f6be453f0edec783acea83500586c199a21d8b052e6ed3c815da85850fef7f + languageName: node + linkType: hard + "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:^, medusa-test-utils@workspace:packages/core/medusa-test-utils": version: 0.0.0-use.local resolution: "medusa-test-utils@workspace:packages/core/medusa-test-utils"