From a8e19faf8dc0b331ca68135058e30d140c52ee84 Mon Sep 17 00:00:00 2001 From: Adrien de Peretti Date: Thu, 26 Sep 2024 13:08:38 +0200 Subject: [PATCH] chore: use framework sub paths everywhere (#9253) --- integration-tests/api/package.json | 4 +- .../environment-helpers/bootstrap-app.js | 2 +- .../helpers/create-admin-user.ts | 8 +- integration-tests/helpers/fixtures.ts | 2 +- .../helpers/seed-storefront-defaults.ts | 4 +- integration-tests/http/package.json | 5 +- integration-tests/jest.config.js | 12 +- .../__tests__/workflow-engine/tests.ts | 2 +- integration-tests/modules/package.json | 10 +- integration-tests/modules/tsconfig.json | 22 +-- integration-tests/package.json | 20 ++- integration-tests/tsconfig.json | 26 +-- packages/cli/create-medusa-app/package.json | 3 +- packages/cli/create-medusa-app/tsconfig.json | 6 +- packages/cli/medusa-cli/package.json | 15 +- packages/cli/medusa-cli/src/commands/new.ts | 7 +- packages/core/framework/package.json | 3 + packages/core/framework/src/config/types.ts | 2 +- packages/core/medusa-test-utils/package.json | 7 +- .../src/medusa-test-runner-utils/config.ts | 3 +- .../src/medusa-test-runner.ts | 12 +- packages/medusa/package.json | 43 +++-- .../api/admin/api-keys/[id]/revoke/route.ts | 2 +- .../src/api/admin/api-keys/[id]/route.ts | 4 +- .../api-keys/[id]/sales-channels/route.ts | 4 +- .../medusa/src/api/admin/api-keys/helpers.ts | 4 +- .../src/api/admin/api-keys/middlewares.ts | 2 +- .../medusa/src/api/admin/api-keys/route.ts | 4 +- .../src/api/admin/api-keys/validators.ts | 2 +- .../admin/campaigns/[id]/promotions/route.ts | 2 +- .../src/api/admin/campaigns/[id]/route.ts | 4 +- .../medusa/src/api/admin/campaigns/helpers.ts | 4 +- .../src/api/admin/campaigns/middlewares.ts | 2 +- .../medusa/src/api/admin/campaigns/route.ts | 4 +- .../src/api/admin/campaigns/validators.ts | 2 +- .../src/api/admin/claims/[id]/cancel/route.ts | 2 +- .../[id]/claim-items/[action_id]/route.ts | 4 +- .../admin/claims/[id]/claim-items/route.ts | 4 +- .../[id]/inbound/items/[action_id]/route.ts | 4 +- .../admin/claims/[id]/inbound/items/route.ts | 4 +- .../shipping-method/[action_id]/route.ts | 4 +- .../[id]/inbound/shipping-method/route.ts | 4 +- .../[id]/outbound/items/[action_id]/route.ts | 4 +- .../admin/claims/[id]/outbound/items/route.ts | 4 +- .../shipping-method/[action_id]/route.ts | 4 +- .../[id]/outbound/shipping-method/route.ts | 4 +- .../api/admin/claims/[id]/request/route.ts | 4 +- .../medusa/src/api/admin/claims/[id]/route.ts | 4 +- .../src/api/admin/claims/middlewares.ts | 2 +- packages/medusa/src/api/admin/claims/route.ts | 4 +- .../medusa/src/api/admin/claims/validators.ts | 2 +- .../admin/collections/[id]/products/route.ts | 2 +- .../src/api/admin/collections/[id]/route.ts | 4 +- .../src/api/admin/collections/helpers.ts | 4 +- .../src/api/admin/collections/middlewares.ts | 2 +- .../medusa/src/api/admin/collections/route.ts | 4 +- .../src/api/admin/currencies/[code]/route.ts | 4 +- .../src/api/admin/currencies/middlewares.ts | 2 +- .../medusa/src/api/admin/currencies/route.ts | 4 +- .../customer-groups/[id]/customers/route.ts | 2 +- .../api/admin/customer-groups/[id]/route.ts | 4 +- .../src/api/admin/customer-groups/helpers.ts | 4 +- .../api/admin/customer-groups/middlewares.ts | 2 +- .../src/api/admin/customer-groups/route.ts | 4 +- .../[id]/addresses/[address_id]/route.ts | 4 +- .../admin/customers/[id]/addresses/route.ts | 4 +- .../src/api/admin/customers/[id]/route.ts | 4 +- .../medusa/src/api/admin/customers/helpers.ts | 4 +- .../src/api/admin/customers/middlewares.ts | 2 +- .../medusa/src/api/admin/customers/route.ts | 4 +- .../src/api/admin/draft-orders/[id]/route.ts | 4 +- .../src/api/admin/draft-orders/helpers.ts | 4 +- .../src/api/admin/draft-orders/middlewares.ts | 2 +- .../src/api/admin/draft-orders/route.ts | 8 +- .../api/admin/exchanges/[id]/cancel/route.ts | 2 +- .../[id]/inbound/items/[action_id]/route.ts | 4 +- .../exchanges/[id]/inbound/items/route.ts | 4 +- .../shipping-method/[action_id]/route.ts | 4 +- .../[id]/inbound/shipping-method/route.ts | 4 +- .../[id]/outbound/items/[action_id]/route.ts | 4 +- .../exchanges/[id]/outbound/items/route.ts | 4 +- .../shipping-method/[action_id]/route.ts | 4 +- .../[id]/outbound/shipping-method/route.ts | 4 +- .../api/admin/exchanges/[id]/request/route.ts | 4 +- .../src/api/admin/exchanges/[id]/route.ts | 4 +- .../src/api/admin/exchanges/middlewares.ts | 2 +- .../medusa/src/api/admin/exchanges/route.ts | 4 +- .../fulfillment-providers/middlewares.ts | 2 +- .../api/admin/fulfillment-providers/route.ts | 4 +- .../api/admin/fulfillment-sets/[id]/route.ts | 2 +- .../[id]/service-zones/[zone_id]/route.ts | 4 +- .../[id]/service-zones/route.ts | 2 +- .../src/api/admin/fulfillment-sets/helpers.ts | 4 +- .../api/admin/fulfillment-sets/middlewares.ts | 2 +- .../admin/fulfillments/[id]/cancel/route.ts | 2 +- .../admin/fulfillments/[id]/shipment/route.ts | 2 +- .../src/api/admin/fulfillments/helpers.ts | 4 +- .../src/api/admin/fulfillments/middlewares.ts | 2 +- .../src/api/admin/fulfillments/route.ts | 2 +- .../location-levels/[location_id]/route.ts | 4 +- .../[id]/location-levels/batch/route.ts | 2 +- .../[id]/location-levels/route.ts | 4 +- .../api/admin/inventory-items/[id]/route.ts | 4 +- .../src/api/admin/inventory-items/helpers.ts | 4 +- .../api/admin/inventory-items/middlewares.ts | 2 +- .../src/api/admin/inventory-items/route.ts | 4 +- .../api/admin/invites/[id]/resend/route.ts | 2 +- .../src/api/admin/invites/[id]/route.ts | 4 +- .../src/api/admin/invites/accept/route.ts | 4 +- .../medusa/src/api/admin/invites/helpers.ts | 4 +- .../src/api/admin/invites/middlewares.ts | 2 +- .../medusa/src/api/admin/invites/route.ts | 4 +- .../src/api/admin/notifications/[id]/route.ts | 2 +- .../api/admin/notifications/middlewares.ts | 2 +- .../src/api/admin/notifications/route.ts | 2 +- .../admin/order-edits/[id]/confirm/route.ts | 2 +- .../[id]/items/[action_id]/route.ts | 2 +- .../[id]/items/item/[item_id]/route.ts | 2 +- .../api/admin/order-edits/[id]/items/route.ts | 2 +- .../admin/order-edits/[id]/request/route.ts | 2 +- .../src/api/admin/order-edits/[id]/route.ts | 2 +- .../[id]/shipping-method/[action_id]/route.ts | 2 +- .../order-edits/[id]/shipping-method/route.ts | 2 +- .../src/api/admin/order-edits/middlewares.ts | 2 +- .../medusa/src/api/admin/order-edits/route.ts | 2 +- .../api/admin/orders/[id]/archive/route.ts | 4 +- .../src/api/admin/orders/[id]/cancel/route.ts | 4 +- .../api/admin/orders/[id]/changes/route.ts | 4 +- .../api/admin/orders/[id]/complete/route.ts | 4 +- .../[fulfillment_id]/cancel/route.ts | 4 +- .../mark-as-delivered/route.ts | 2 +- .../[fulfillment_id]/shipments/route.ts | 4 +- .../admin/orders/[id]/fulfillments/route.ts | 4 +- .../api/admin/orders/[id]/preview/route.ts | 4 +- .../medusa/src/api/admin/orders/[id]/route.ts | 4 +- .../src/api/admin/orders/middlewares.ts | 2 +- packages/medusa/src/api/admin/orders/route.ts | 2 +- .../[id]/mark-as-paid/route.ts | 2 +- .../admin/payment-collections/[id]/route.ts | 2 +- .../admin/payment-collections/middlewares.ts | 2 +- .../api/admin/payment-collections/route.ts | 2 +- .../api/admin/payments/[id]/capture/route.ts | 2 +- .../api/admin/payments/[id]/refund/route.ts | 2 +- .../src/api/admin/payments/[id]/route.ts | 2 +- .../medusa/src/api/admin/payments/helpers.ts | 4 +- .../src/api/admin/payments/middlewares.ts | 2 +- .../admin/payments/payment-providers/route.ts | 4 +- .../medusa/src/api/admin/payments/route.ts | 4 +- .../price-lists/[id]/prices/batch/route.ts | 4 +- .../admin/price-lists/[id]/products/route.ts | 4 +- .../src/api/admin/price-lists/[id]/route.ts | 2 +- .../src/api/admin/price-lists/helpers.ts | 4 +- .../src/api/admin/price-lists/middlewares.ts | 2 +- .../price-lists/queries/get-price-list.ts | 4 +- .../api/admin/price-lists/queries/index.ts | 2 +- .../price-lists/queries/list-price-lists.ts | 4 +- .../admin/price-lists/queries/list-prices.ts | 4 +- .../medusa/src/api/admin/price-lists/route.ts | 4 +- .../medusa/src/api/admin/price-lists/types.ts | 2 +- .../src/api/admin/price-lists/validators.ts | 2 +- .../api/admin/price-preferences/[id]/route.ts | 2 +- .../admin/price-preferences/middlewares.ts | 2 +- .../src/api/admin/price-preferences/route.ts | 2 +- .../product-categories/[id]/products/route.ts | 2 +- .../admin/product-categories/[id]/route.ts | 7 +- .../admin/product-categories/middlewares.ts | 2 +- .../src/api/admin/product-categories/route.ts | 2 +- .../src/api/admin/product-tags/[id]/route.ts | 4 +- .../src/api/admin/product-tags/middlewares.ts | 2 +- .../src/api/admin/product-tags/route.ts | 2 +- .../src/api/admin/product-types/[id]/route.ts | 4 +- .../src/api/admin/product-types/helpers.ts | 4 +- .../api/admin/product-types/middlewares.ts | 2 +- .../src/api/admin/product-types/route.ts | 4 +- .../api/admin/product-variants/middlewares.ts | 2 +- .../src/api/admin/product-variants/route.ts | 7 +- .../[id]/options/[option_id]/route.ts | 2 +- .../api/admin/products/[id]/options/route.ts | 2 +- .../src/api/admin/products/[id]/route.ts | 4 +- .../[inventory_item_id]/route.ts | 4 +- .../[variant_id]/inventory-items/route.ts | 4 +- .../[id]/variants/[variant_id]/route.ts | 2 +- .../products/[id]/variants/batch/route.ts | 2 +- .../variants/inventory-items/batch/route.ts | 2 +- .../api/admin/products/[id]/variants/route.ts | 2 +- .../src/api/admin/products/batch/route.ts | 2 +- .../src/api/admin/products/export/route.ts | 2 +- .../medusa/src/api/admin/products/helpers.ts | 4 +- .../import/[transaction_id]/confirm/route.ts | 6 +- .../src/api/admin/products/import/route.ts | 4 +- .../src/api/admin/products/middlewares.ts | 2 +- .../medusa/src/api/admin/products/route.ts | 2 +- .../utils/maybe-apply-price-lists-filter.ts | 4 +- .../src/api/admin/products/validators.ts | 4 +- .../promotions/[id]/[rule_type]/route.ts | 4 +- .../promotions/[id]/buy-rules/batch/route.ts | 4 +- .../src/api/admin/promotions/[id]/route.ts | 4 +- .../promotions/[id]/rules/batch/route.ts | 4 +- .../[id]/target-rules/batch/route.ts | 4 +- .../src/api/admin/promotions/helpers.ts | 6 +- .../src/api/admin/promotions/middlewares.ts | 2 +- .../medusa/src/api/admin/promotions/route.ts | 4 +- .../[rule_type]/route.ts | 2 +- .../[rule_type]/[rule_attribute_id]/route.ts | 4 +- .../admin/promotions/utils/operators-map.ts | 2 +- .../promotions/utils/rule-attributes-map.ts | 2 +- .../utils/validate-rule-attribute.ts | 2 +- .../promotions/utils/validate-rule-type.ts | 2 +- .../src/api/admin/promotions/validators.ts | 2 +- .../api/admin/refund-reasons/[id]/route.ts | 2 +- .../api/admin/refund-reasons/middlewares.ts | 2 +- .../src/api/admin/refund-reasons/route.ts | 7 +- .../src/api/admin/regions/[id]/route.ts | 4 +- .../medusa/src/api/admin/regions/helpers.ts | 4 +- .../src/api/admin/regions/middlewares.ts | 2 +- .../medusa/src/api/admin/regions/route.ts | 4 +- .../src/api/admin/reservations/[id]/route.ts | 4 +- .../src/api/admin/reservations/helpers.ts | 4 +- .../src/api/admin/reservations/middlewares.ts | 2 +- .../src/api/admin/reservations/route.ts | 4 +- .../api/admin/return-reasons/[id]/route.ts | 4 +- .../api/admin/return-reasons/middlewares.ts | 2 +- .../src/api/admin/return-reasons/route.ts | 4 +- .../api/admin/returns/[id]/cancel/route.ts | 2 +- .../[id]/dismiss-items/[action_id]/route.ts | 4 +- .../admin/returns/[id]/dismiss-items/route.ts | 4 +- .../[id]/receive-items/[action_id]/route.ts | 4 +- .../admin/returns/[id]/receive-items/route.ts | 4 +- .../returns/[id]/receive/confirm/route.ts | 4 +- .../api/admin/returns/[id]/receive/route.ts | 4 +- .../[id]/request-items/[action_id]/route.ts | 4 +- .../admin/returns/[id]/request-items/route.ts | 4 +- .../api/admin/returns/[id]/request/route.ts | 4 +- .../src/api/admin/returns/[id]/route.ts | 4 +- .../[id]/shipping-method/[action_id]/route.ts | 4 +- .../returns/[id]/shipping-method/route.ts | 4 +- .../src/api/admin/returns/middlewares.ts | 2 +- .../medusa/src/api/admin/returns/route.ts | 4 +- .../sales-channels/[id]/products/route.ts | 2 +- .../api/admin/sales-channels/[id]/route.ts | 4 +- .../src/api/admin/sales-channels/helpers.ts | 4 +- .../api/admin/sales-channels/middlewares.ts | 2 +- .../src/api/admin/sales-channels/route.ts | 4 +- .../api/admin/shipping-options/[id]/route.ts | 2 +- .../[id]/rules/batch/route.ts | 2 +- .../src/api/admin/shipping-options/helpers.ts | 4 +- .../api/admin/shipping-options/middlewares.ts | 2 +- .../src/api/admin/shipping-options/route.ts | 4 +- .../api/admin/shipping-options/validators.ts | 2 +- .../api/admin/shipping-profiles/[id]/route.ts | 4 +- .../api/admin/shipping-profiles/helpers.ts | 4 +- .../admin/shipping-profiles/middlewares.ts | 2 +- .../src/api/admin/shipping-profiles/route.ts | 4 +- .../[id]/fulfillment-providers/route.ts | 4 +- .../[id]/fulfillment-sets/route.ts | 2 +- .../api/admin/stock-locations/[id]/route.ts | 4 +- .../[id]/sales-channels/route.ts | 2 +- .../src/api/admin/stock-locations/helpers.ts | 4 +- .../api/admin/stock-locations/middlewares.ts | 2 +- .../src/api/admin/stock-locations/route.ts | 4 +- .../medusa/src/api/admin/stores/[id]/route.ts | 4 +- .../medusa/src/api/admin/stores/helpers.ts | 4 +- .../src/api/admin/stores/middlewares.ts | 2 +- packages/medusa/src/api/admin/stores/route.ts | 4 +- .../src/api/admin/tax-rates/[id]/route.ts | 4 +- .../tax-rates/[id]/rules/[rule_id]/route.ts | 2 +- .../api/admin/tax-rates/[id]/rules/route.ts | 2 +- .../medusa/src/api/admin/tax-rates/helpers.ts | 4 +- .../src/api/admin/tax-rates/middlewares.ts | 2 +- .../medusa/src/api/admin/tax-rates/route.ts | 4 +- .../src/api/admin/tax-regions/[id]/route.ts | 4 +- .../src/api/admin/tax-regions/helpers.ts | 4 +- .../src/api/admin/tax-regions/middlewares.ts | 2 +- .../medusa/src/api/admin/tax-regions/route.ts | 4 +- .../src/api/admin/uploads/[id]/route.ts | 9 +- .../src/api/admin/uploads/middlewares.ts | 2 +- .../medusa/src/api/admin/uploads/route.ts | 4 +- .../medusa/src/api/admin/users/[id]/route.ts | 4 +- .../medusa/src/api/admin/users/helpers.ts | 4 +- .../medusa/src/api/admin/users/me/route.ts | 4 +- .../medusa/src/api/admin/users/middlewares.ts | 16 +- packages/medusa/src/api/admin/users/route.ts | 4 +- .../admin/workflows-executions/[id]/route.ts | 4 +- .../[step_id]/subscribe/route.ts | 4 +- .../[workflow_id]/[transaction_id]/route.ts | 4 +- .../[workflow_id]/run/route.ts | 4 +- .../[workflow_id]/steps/failure/route.ts | 8 +- .../[workflow_id]/steps/success/route.ts | 8 +- .../[workflow_id]/subscribe/route.ts | 4 +- .../admin/workflows-executions/middlewares.ts | 2 +- .../api/admin/workflows-executions/route.ts | 4 +- .../admin/workflows-executions/validators.ts | 2 +- .../[auth_provider]/callback/route.ts | 4 +- .../[auth_provider]/register/route.ts | 4 +- .../[auth_provider]/reset-password/route.ts | 2 +- .../[actor_type]/[auth_provider]/route.ts | 4 +- .../[auth_provider]/update/route.ts | 6 +- packages/medusa/src/api/auth/middlewares.ts | 3 +- .../src/api/auth/token/refresh/route.ts | 4 +- .../src/api/auth/utils/generate-jwt-token.ts | 4 +- .../validate-scope-provider-association.ts | 9 +- .../src/api/auth/utils/validate-token.ts | 10 +- packages/medusa/src/api/hooks/middlewares.ts | 2 +- .../src/api/hooks/payment/[provider]/route.ts | 4 +- .../api/store/carts/[id]/complete/route.ts | 4 +- .../carts/[id]/line-items/[line_id]/route.ts | 4 +- .../api/store/carts/[id]/line-items/route.ts | 2 +- .../api/store/carts/[id]/promotions/route.ts | 4 +- .../medusa/src/api/store/carts/[id]/route.ts | 6 +- .../carts/[id]/shipping-methods/route.ts | 2 +- .../src/api/store/carts/[id]/taxes/route.ts | 2 +- .../medusa/src/api/store/carts/helpers.ts | 4 +- .../medusa/src/api/store/carts/middlewares.ts | 2 +- packages/medusa/src/api/store/carts/route.ts | 2 +- .../src/api/store/collections/[id]/route.ts | 2 +- .../src/api/store/collections/helpers.ts | 4 +- .../src/api/store/collections/middlewares.ts | 2 +- .../medusa/src/api/store/collections/route.ts | 4 +- .../src/api/store/currencies/[code]/route.ts | 4 +- .../src/api/store/currencies/middlewares.ts | 2 +- .../medusa/src/api/store/currencies/route.ts | 4 +- .../medusa/src/api/store/customers/helpers.ts | 4 +- .../me/addresses/[address_id]/route.ts | 4 +- .../api/store/customers/me/addresses/route.ts | 4 +- .../src/api/store/customers/me/route.ts | 4 +- .../src/api/store/customers/middlewares.ts | 2 +- .../medusa/src/api/store/customers/route.ts | 4 +- packages/medusa/src/api/store/middlewares.ts | 2 +- .../medusa/src/api/store/orders/[id]/route.ts | 2 +- .../medusa/src/api/store/orders/helpers.ts | 2 +- .../src/api/store/orders/middlewares.ts | 2 +- packages/medusa/src/api/store/orders/route.ts | 4 +- .../[id]/payment-sessions/route.ts | 2 +- .../api/store/payment-collections/helpers.ts | 5 +- .../store/payment-collections/middlewares.ts | 2 +- .../api/store/payment-collections/route.ts | 4 +- .../store/payment-providers/middlewares.ts | 2 +- .../src/api/store/payment-providers/route.ts | 4 +- .../store/product-categories/[id]/route.ts | 4 +- .../api/store/product-categories/helpers.ts | 4 +- .../store/product-categories/middlewares.ts | 2 +- .../src/api/store/product-categories/route.ts | 4 +- .../src/api/store/products/[id]/route.ts | 4 +- .../medusa/src/api/store/products/helpers.ts | 4 +- .../src/api/store/products/middlewares.ts | 4 +- .../medusa/src/api/store/products/route.ts | 4 +- .../src/api/store/regions/[id]/route.ts | 4 +- .../src/api/store/regions/middlewares.ts | 2 +- .../medusa/src/api/store/regions/route.ts | 4 +- .../api/store/return-reasons/[id]/route.ts | 4 +- .../api/store/return-reasons/middlewares.ts | 2 +- .../src/api/store/return-reasons/route.ts | 4 +- .../src/api/store/return/middlewares.ts | 2 +- packages/medusa/src/api/store/return/route.ts | 2 +- .../api/store/shipping-options/middlewares.ts | 2 +- .../src/api/store/shipping-options/route.ts | 4 +- .../api/utils/__tests__/validate-body.spec.ts | 2 +- .../utils/__tests__/validate-query.spec.ts | 4 +- .../utils/common-validators/products/index.ts | 4 +- .../src/api/utils/maybe-apply-link-filter.ts | 2 +- .../common/apply-default-filters.ts | 2 +- .../common/maybe-attach-pub-key-scopes.ts | 4 +- .../filter-by-valid-sales-channels.ts | 4 +- .../products/normalize-data-for-context.ts | 2 +- .../products/set-pricing-context.ts | 4 +- .../middlewares/products/set-tax-context.ts | 4 +- .../products/variant-inventory-quantity.ts | 2 +- .../medusa/src/api/utils/refetch-entity.ts | 4 +- packages/medusa/src/api/utils/unless-path.ts | 2 +- .../medusa/src/api/utils/validate-query.ts | 8 +- packages/medusa/src/api/utils/zod-helper.ts | 2 +- packages/medusa/src/commands/build.ts | 4 +- packages/medusa/src/commands/db/create.ts | 6 +- packages/medusa/src/commands/db/generate.ts | 9 +- packages/medusa/src/commands/db/migrate.ts | 6 +- packages/medusa/src/commands/db/rollback.ts | 9 +- packages/medusa/src/commands/db/setup.ts | 2 +- packages/medusa/src/commands/db/sync-links.ts | 8 +- packages/medusa/src/commands/develop.ts | 3 +- packages/medusa/src/commands/exec.ts | 6 +- packages/medusa/src/commands/migrate.ts | 9 +- packages/medusa/src/commands/start-cluster.ts | 4 +- packages/medusa/src/commands/start.ts | 15 +- packages/medusa/src/commands/user.ts | 4 +- packages/medusa/src/commands/utils/index.ts | 6 +- packages/medusa/src/instrumentation/index.ts | 11 +- packages/medusa/src/loaders/admin.ts | 2 +- packages/medusa/src/loaders/api.ts | 4 +- .../src/loaders/feature-flags/analytics.ts | 2 +- .../src/loaders/feature-flags/medusa-v2.ts | 2 +- .../loaders/feature-flags/order-editing.ts | 2 +- .../feature-flags/product-categories.ts | 2 +- .../feature-flags/publishable-api-keys.ts | 2 +- .../loaders/feature-flags/sales-channels.ts | 2 +- .../feature-flags/tax-inclusive-pricing.ts | 2 +- .../src/loaders/feature-flags/workflows.ts | 2 +- .../src/loaders/helpers/resolve-plugins.ts | 4 +- packages/medusa/src/loaders/index.ts | 35 ++-- .../subscribers/configurable-notifications.ts | 8 +- .../medusa/src/subscribers/payment-webhook.ts | 7 +- packages/medusa/src/types/global.ts | 2 +- packages/medusa/src/types/routing.ts | 11 +- packages/medusa/src/types/subscribers.ts | 2 +- .../medusa/src/utils/api/http-compression.ts | 5 +- .../medusa/src/utils/clean-response-data.ts | 2 +- .../medusa/src/utils/define-middlewares.ts | 2 +- .../medusa/src/utils/exception-formatter.ts | 2 +- .../src/utils/format-registration-name.ts | 2 +- packages/medusa/src/utils/get-query-config.ts | 4 +- .../middlewares/authenticate-middleware.ts | 2 +- .../middlewares/ensure-publishable-api-key.ts | 4 +- .../src/utils/middlewares/error-handler.ts | 2 +- packages/medusa/src/utils/omit-deep.ts | 2 +- .../src/utils/remove-undefined-properties.ts | 2 +- packages/medusa/tsconfig.json | 31 +--- packages/medusa/tsconfig.spec.json | 10 -- yarn.lock | 150 ++++-------------- 417 files changed, 870 insertions(+), 934 deletions(-) delete mode 100644 packages/medusa/tsconfig.spec.json diff --git a/integration-tests/api/package.json b/integration-tests/api/package.json index 64b85bbe5a..0eead78193 100644 --- a/integration-tests/api/package.json +++ b/integration-tests/api/package.json @@ -17,6 +17,7 @@ "@medusajs/event-bus-local": "workspace:*", "@medusajs/medusa": "workspace:*", "@medusajs/modules-sdk": "workspace:^", + "@medusajs/payment": "workspace:^", "@medusajs/pricing": "workspace:^", "@medusajs/product": "workspace:^", "@medusajs/promotion": "workspace:^", @@ -26,15 +27,12 @@ "@medusajs/user": "workspace:^", "@medusajs/utils": "workspace:^", "@medusajs/workflow-engine-inmemory": "workspace:*", - "faker": "^5.5.3", "pg": "^8.11.3" }, "devDependencies": { "@swc/core": "^1.4.8", "@swc/jest": "^0.2.36", - "form-data": "^4.0.0", "jest": "^29.7.0", - "jest-environment-node": "^29.7.0", "typescript": "^5.6.2" } } diff --git a/integration-tests/environment-helpers/bootstrap-app.js b/integration-tests/environment-helpers/bootstrap-app.js index 5e7578e78f..cd39256fc8 100644 --- a/integration-tests/environment-helpers/bootstrap-app.js +++ b/integration-tests/environment-helpers/bootstrap-app.js @@ -1,7 +1,7 @@ const path = require("path") const express = require("express") const getPort = require("get-port") -const { isObject } = require("@medusajs/utils") +const { isObject } = require("@medusajs/framework/utils") const { setContainer } = require("./use-container") const { setPort, setExpressServer } = require("./use-api") diff --git a/integration-tests/helpers/create-admin-user.ts b/integration-tests/helpers/create-admin-user.ts index dfb06b482f..76cc0926a0 100644 --- a/integration-tests/helpers/create-admin-user.ts +++ b/integration-tests/helpers/create-admin-user.ts @@ -4,8 +4,12 @@ import { IAuthModuleService, IUserModuleService, MedusaContainer, -} from "@medusajs/types" -import { ApiKeyType, Modules, PUBLISHABLE_KEY_HEADER } from "@medusajs/utils" +} from "@medusajs/framework/types" +import { + ApiKeyType, + Modules, + PUBLISHABLE_KEY_HEADER, +} from "@medusajs/framework/utils" import jwt from "jsonwebtoken" import Scrypt from "scrypt-kdf" import { getContainer } from "../environment-helpers/use-container" diff --git a/integration-tests/helpers/fixtures.ts b/integration-tests/helpers/fixtures.ts index 63a3f7807a..c16f7cea20 100644 --- a/integration-tests/helpers/fixtures.ts +++ b/integration-tests/helpers/fixtures.ts @@ -1,4 +1,4 @@ -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const getProductFixture = ( overrides: Partial diff --git a/integration-tests/helpers/seed-storefront-defaults.ts b/integration-tests/helpers/seed-storefront-defaults.ts index 483a12bbe7..14647df290 100644 --- a/integration-tests/helpers/seed-storefront-defaults.ts +++ b/integration-tests/helpers/seed-storefront-defaults.ts @@ -3,8 +3,8 @@ import { IRegionModuleService, IStoreModuleService, MedusaContainer, -} from "@medusajs/types" -import { Modules } from "@medusajs/utils" +} from "@medusajs/framework/types" +import { Modules } from "@medusajs/framework/utils" export const seedStorefrontDefaults = async ( container: MedusaContainer, diff --git a/integration-tests/http/package.json b/integration-tests/http/package.json index 9a3a704cf1..fd10100935 100644 --- a/integration-tests/http/package.json +++ b/integration-tests/http/package.json @@ -13,6 +13,7 @@ "@medusajs/api-key": "workspace:^", "@medusajs/auth": "workspace:*", "@medusajs/cache-inmemory": "workspace:*", + "@medusajs/core-flows": "workspace:*", "@medusajs/customer": "workspace:^", "@medusajs/event-bus-local": "workspace:*", "@medusajs/fulfillment": "workspace:^", @@ -30,7 +31,8 @@ "@medusajs/user": "workspace:^", "@medusajs/utils": "workspace:^", "@medusajs/workflow-engine-inmemory": "workspace:*", - "faker": "^5.5.3", + "form-data": "^4.0.0", + "jsonwebtoken": "^9.0.2", "medusa-test-utils": "workspace:*", "pg": "^8.11.3" }, @@ -39,7 +41,6 @@ "@swc/core": "^1.4.8", "@swc/jest": "^0.2.36", "jest": "^29.7.0", - "jest-environment-node": "^29.7.0", "typescript": "^5.6.2" } } diff --git a/integration-tests/jest.config.js b/integration-tests/jest.config.js index aa250fd639..696abb3ebe 100644 --- a/integration-tests/jest.config.js +++ b/integration-tests/jest.config.js @@ -31,8 +31,16 @@ module.exports = { "@swc/jest", { jsc: { - parser: { syntax: "typescript", decorators: true }, - transform: { decoratorMetadata: true }, + parser: { + syntax: "typescript", + decorators: true, + }, + transform: { + useDefineForClassFields: false, + legacyDecorator: true, + decoratorMetadata: true, + }, + target: "ES2021", }, }, ], diff --git a/integration-tests/modules/__tests__/workflow-engine/tests.ts b/integration-tests/modules/__tests__/workflow-engine/tests.ts index a5eae8ec4d..8e58f3781d 100644 --- a/integration-tests/modules/__tests__/workflow-engine/tests.ts +++ b/integration-tests/modules/__tests__/workflow-engine/tests.ts @@ -3,7 +3,7 @@ import { createWorkflow, StepResponse, WorkflowData, -} from "@medusajs/workflows-sdk" +} from "@medusajs/framework/workflows-sdk" import { medusaIntegrationTestRunner } from "medusa-test-utils" import { createAdminUser } from "../../../helpers/create-admin-user" diff --git a/integration-tests/modules/package.json b/integration-tests/modules/package.json index 5c6855ebd6..172ff85732 100644 --- a/integration-tests/modules/package.json +++ b/integration-tests/modules/package.json @@ -13,13 +13,18 @@ "@medusajs/api-key": "workspace:^", "@medusajs/auth": "workspace:*", "@medusajs/cache-inmemory": "workspace:*", + "@medusajs/core-flows": "workspace:^", + "@medusajs/currency": "workspace:^", "@medusajs/customer": "workspace:^", "@medusajs/event-bus-local": "workspace:*", + "@medusajs/framework": "workspace:^", "@medusajs/fulfillment": "workspace:^", "@medusajs/fulfillment-manual": "workspace:^", "@medusajs/inventory-next": "workspace:^", + "@medusajs/link-modules": "workspace:^", "@medusajs/medusa": "workspace:*", "@medusajs/modules-sdk": "workspace:^", + "@medusajs/payment": "workspace:^", "@medusajs/pricing": "workspace:^", "@medusajs/product": "workspace:^", "@medusajs/promotion": "workspace:^", @@ -31,15 +36,16 @@ "@medusajs/utils": "workspace:^", "@medusajs/workflow-engine-inmemory": "workspace:*", "faker": "^5.5.3", + "jsonwebtoken": "^9.0.2", "medusa-test-utils": "workspace:*", - "pg": "^8.11.3" + "pg": "^8.11.3", + "scrypt-kdf": "^2.0.1" }, "devDependencies": { "@medusajs/types": "workspace:^", "@swc/core": "^1.4.8", "@swc/jest": "^0.2.36", "jest": "^29.7.0", - "jest-environment-node": "^29.7.0", "typescript": "^5.6.2" } } diff --git a/integration-tests/modules/tsconfig.json b/integration-tests/modules/tsconfig.json index c17aadfdd5..4ed062890e 100644 --- a/integration-tests/modules/tsconfig.json +++ b/integration-tests/modules/tsconfig.json @@ -1,24 +1,5 @@ { - "compilerOptions": { - "lib": ["es5", "es6", "es2019"], - "target": "es2022", - "outDir": "./dist", - "esModuleInterop": true, - "declarationMap": true, - "declaration": true, - "module": "commonjs", - "moduleResolution": "node", - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "sourceMap": true, - "noImplicitReturns": true, - "strictNullChecks": true, - "strictFunctionTypes": true, - "noImplicitThis": true, - "allowJs": true, - "skipLibCheck": true, - "downlevelIteration": true // to use ES5 specific tooling - }, + "extends": "../../_tsconfig.base.json", "include": ["src", "./medusa/**/*"], "exclude": [ "./dist/**/*", @@ -29,3 +10,4 @@ "node_modules" ] } + diff --git a/integration-tests/package.json b/integration-tests/package.json index fec2c881df..d49376272e 100644 --- a/integration-tests/package.json +++ b/integration-tests/package.json @@ -13,7 +13,23 @@ "dotenv": "^10.0.0" }, "dependencies": { - "@faker-js/faker": "^5.5.3", - "testcontainers": "^8.10.1" + "express": "^4.21.0", + "get-port": "^7.1.0", + "@medusajs/medusa": "^1.20.10", + "@medusajs/core-flows": "^0.0.10", + "axios": "^1.7.7", + "scrypt-kdf": "^2.0.1", + "jsonwebtoken": "^9.0.2", + "@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", + "bignumber.js": "^9.1.2", + "ioredis": "^5.4.1", + "pg": "^8.13.0", + "pg-god": "^1.0.12", + "glob": "^11.0.0" } } diff --git a/integration-tests/tsconfig.json b/integration-tests/tsconfig.json index 2847c06dc6..4569ac3529 100644 --- a/integration-tests/tsconfig.json +++ b/integration-tests/tsconfig.json @@ -1,29 +1,11 @@ { - "compilerOptions": { - "lib": ["es5", "es6", "es2019"], - "target": "es2022", - "outDir": "./dist", - "esModuleInterop": true, - "declarationMap": true, - "declaration": true, - "module": "commonjs", - "moduleResolution": "node", - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "sourceMap": true, - "noImplicitReturns": true, - "strictNullChecks": true, - "strictFunctionTypes": true, - "noImplicitThis": true, - "allowJs": true, - "skipLibCheck": true, - "downlevelIteration": true // to use ES5 specific tooling - }, - "include": ["./**/*"], + "extends": "../_tsconfig.base.json", + "include": ["**/*"], "exclude": [ - "./dist/**/*", + "dist", "./**/helpers", "./**/__snapshots__", "node_modules" ] } + diff --git a/packages/cli/create-medusa-app/package.json b/packages/cli/create-medusa-app/package.json index e34db71cb4..b92d4ace64 100644 --- a/packages/cli/create-medusa-app/package.json +++ b/packages/cli/create-medusa-app/package.json @@ -32,7 +32,6 @@ "winston": "^3.9.0" }, "devDependencies": { - "@medusajs/types": "^1.11.16", "@types/chalk": "^2.2.0", "@types/commander": "^2.12.2", "@types/configstore": "^6.0.0", @@ -52,7 +51,7 @@ "eslint-plugin-prettier": "^4.2.1", "prettier": "^2.8.8", "ts-node": "^10.9.1", - "typescript": "^5.0.4" + "typescript": "^5.6.2" }, "engines": { "node": ">=14.16" diff --git a/packages/cli/create-medusa-app/tsconfig.json b/packages/cli/create-medusa-app/tsconfig.json index 5364806350..17926777ae 100644 --- a/packages/cli/create-medusa-app/tsconfig.json +++ b/packages/cli/create-medusa-app/tsconfig.json @@ -1,13 +1,13 @@ { "compilerOptions": { "target": "ESNext", - "module": "Node16", + "module": "Node16", "moduleResolution": "node16", - "outDir": "./dist", + "outDir": "./dist", "esModuleInterop": true, "strict": true, "skipLibCheck": true, - "resolveJsonModule": true, + "resolveJsonModule": true }, "include": ["src"], "ts-node": { diff --git a/packages/cli/medusa-cli/package.json b/packages/cli/medusa-cli/package.json index 5f9ab26b70..e2ddd02e14 100644 --- a/packages/cli/medusa-cli/package.json +++ b/packages/cli/medusa-cli/package.json @@ -15,8 +15,8 @@ "access": "public" }, "files": [ - "dist", "cli.js", + "dist", "!dist/**/__tests__", "!dist/**/__mocks__", "!dist/**/__fixtures__" @@ -26,7 +26,7 @@ }, "scripts": { "test": "jest --passWithNoTests src", - "build": "rimraf dist && tsc", + "build": "rimraf dist && tsc --build", "watch": "tsc --watch" }, "author": "Sebastian Rindom", @@ -36,18 +36,9 @@ "@swc/jest": "^0.2.36", "@types/yargs": "^15.0.15", "jest": "^29.7.0", - "rimraf": "^6.0.1", - "ts-node": "^10.9.2", + "rimraf": "^5.0.1", "typescript": "^5.6.2" }, - "peerDependencies": { - "ts-node": "^10.9.2" - }, - "peerDependenciesMeta": { - "ts-node": { - "optional": true - } - }, "dependencies": { "@medusajs/utils": "1.11.9", "chalk": "^4.0.0", diff --git a/packages/cli/medusa-cli/src/commands/new.ts b/packages/cli/medusa-cli/src/commands/new.ts index 4f0fa1d19d..cc105bd9a1 100644 --- a/packages/cli/medusa-cli/src/commands/new.ts +++ b/packages/cli/medusa-cli/src/commands/new.ts @@ -9,6 +9,7 @@ import fs from "fs-extra" import hostedGitInfo from "hosted-git-info" import isValid from "is-valid-path" import sysPath from "path" +import path from "path" import prompts from "prompts" import { Pool } from "pg" import url from "url" @@ -21,8 +22,10 @@ import reporter from "../reporter" import { getPackageManager, setPackageManager } from "../util/package-manager" import { PanicId } from "../reporter/panic-handler" import { clearProject } from "../util/clear-project" -import path from "path" -import { getNodeVersion, MIN_SUPPORTED_NODE_VERSION } from "@medusajs/utils" +import { + getNodeVersion, + MIN_SUPPORTED_NODE_VERSION, +} from "@medusajs/utils" const removeUndefined = (obj) => { return Object.fromEntries( diff --git a/packages/core/framework/package.json b/packages/core/framework/package.json index 0b54f6c9a0..d151490c56 100644 --- a/packages/core/framework/package.json +++ b/packages/core/framework/package.json @@ -19,6 +19,9 @@ "./workflows": "./dist/workflows/index.js", "./links": "./dist/links/index.js", "./jobs": "./dist/jobs/index.js", + "./http": "./dist/http/index.js", + "./telemetry": "./dist/telemetry/index.js", + "./feature-flags": "./dist/feature-flags/index.js", "./utils": "./dist/utils/index.js", "./types": "./dist/types/index.js", "./orchestration": "./dist/orchestration/index.js", diff --git a/packages/core/framework/src/config/types.ts b/packages/core/framework/src/config/types.ts index 506387db36..5bcec447ff 100644 --- a/packages/core/framework/src/config/types.ts +++ b/packages/core/framework/src/config/types.ts @@ -290,7 +290,7 @@ export type ProjectConfigOptions = { * }) * ``` */ - databaseDriverOptions?: Record & { + databaseDriverOptions?: Record & { connection?: { /** * Configure support for TLS/SSL connection diff --git a/packages/core/medusa-test-utils/package.json b/packages/core/medusa-test-utils/package.json index a05288bf74..07ed0ae9f2 100644 --- a/packages/core/medusa-test-utils/package.json +++ b/packages/core/medusa-test-utils/package.json @@ -9,7 +9,7 @@ "directory": "packages/medusa-test-utils" }, "engines": { - "node": ">=16" + "node": ">=20" }, "scripts": { "build": "rimraf dist && tsc --build", @@ -17,7 +17,10 @@ "test": "jest --passWithNoTests src" }, "files": [ - "dist" + "dist", + "!dist/**/__tests__", + "!dist/**/__mocks__", + "!dist/**/__fixtures__" ], "author": "Medusa", "license": "MIT", diff --git a/packages/core/medusa-test-utils/src/medusa-test-runner-utils/config.ts b/packages/core/medusa-test-utils/src/medusa-test-runner-utils/config.ts index 3af40fd9f4..6af6315b2f 100644 --- a/packages/core/medusa-test-utils/src/medusa-test-runner-utils/config.ts +++ b/packages/core/medusa-test-utils/src/medusa-test-runner-utils/config.ts @@ -4,7 +4,7 @@ export async function configLoaderOverride( entryDirectory: string, override: { clientUrl: string; debug?: boolean } ) { - const { configManager } = await import("@medusajs/framework") + const { configManager } = await import("@medusajs/framework/config") const { configModule, error } = getConfigFile< ReturnType >(entryDirectory, "medusa-config.js") @@ -13,6 +13,7 @@ export async function configLoaderOverride( throw new Error(error.message || "Error during config loading") } + configModule.projectConfig.databaseDriverOptions configModule.projectConfig.databaseUrl = override.clientUrl configModule.projectConfig.databaseLogging = !!override.debug configModule.projectConfig.databaseDriverOptions = diff --git a/packages/core/medusa-test-utils/src/medusa-test-runner.ts b/packages/core/medusa-test-utils/src/medusa-test-runner.ts index e3bd9ababc..013dd7a379 100644 --- a/packages/core/medusa-test-utils/src/medusa-test-runner.ts +++ b/packages/core/medusa-test-utils/src/medusa-test-runner.ts @@ -6,15 +6,15 @@ import { } from "@medusajs/framework/utils" import { asValue } from "awilix" import { dbTestUtilFactory, getDatabaseURL } from "./database" -import { startApp } from "./medusa-test-runner-utils/bootstrap-app" -import { clearInstances } from "./medusa-test-runner-utils/clear-instances" -import { configLoaderOverride } from "./medusa-test-runner-utils/config" import { + applyEnvVarsToProcess, + clearInstances, + configLoaderOverride, initDb, migrateDatabase, + startApp, syncLinks, -} from "./medusa-test-runner-utils/use-db" -import { applyEnvVarsToProcess } from "./medusa-test-runner-utils/utils" +} from "./medusa-test-runner-utils" export interface MedusaSuiteOptions { dbConnection: any // knex instance @@ -161,7 +161,7 @@ export function medusaIntegrationTestRunner({ await syncLinks(appLoader, cwd, containerRes) } - const axios = (await import("axios")).default.default + const { default: axios } = (await import("axios")) as any const cancelTokenSource = axios.CancelToken.source() diff --git a/packages/medusa/package.json b/packages/medusa/package.json index da38110a80..f92f46fdd6 100644 --- a/packages/medusa/package.json +++ b/packages/medusa/package.json @@ -13,15 +13,25 @@ }, "files": [ "dist", - "oas" + "oas", + "!dist/**/__tests__", + "!dist/**/__mocks__", + "!dist/**/__fixtures__" ], "engines": { - "node": ">=16" + "node": ">=20" }, "author": "Sebastian Rindom", "license": "MIT", + "scripts": { + "watch": "tsc --build --watch", + "build": "rimraf dist && tsc --build", + "serve": "node dist/app.js", + "test": "jest --silent --bail --maxWorkers=50% --forceExit" + }, "devDependencies": { - "@medusajs/types": "^1.11.16", + "@medusajs/framework": "^0.0.1", + "@opentelemetry/api": "^1.9.0", "@opentelemetry/instrumentation": "^0.53.0", "@opentelemetry/instrumentation-pg": "^0.44.0", "@opentelemetry/resources": "^1.26.0", @@ -30,47 +40,28 @@ "@swc/core": "^1.7.28", "@swc/jest": "^0.2.36", "@types/express": "^4.17.17", - "@types/ioredis": "^4.28.10", "@types/jsonwebtoken": "^8.5.9", "@types/lodash": "^4.14.191", "@types/multer": "^1.4.7", - "cross-env": "^5.2.1", "jest": "^29.7.0", "rimraf": "^5.0.1", - "supertest": "^4.0.2", - "typescript": "^5.3.3" - }, - "scripts": { - "watch": "tsc --build --watch", - "build": "rimraf dist && tsc --build", - "serve": "node dist/app.js", - "test": "jest --silent --bail --maxWorkers=50% --forceExit" - }, - "peerDependencies": { - "awilix": "^8.0.1" + "typescript": "^5.6.2" }, "dependencies": { "@inquirer/checkbox": "^2.3.11", "@inquirer/input": "^2.2.9", "@medusajs/admin-bundler": "0.0.1", "@medusajs/core-flows": "^0.0.9", - "@medusajs/framework": "^0.0.1", "@medusajs/link-modules": "^0.2.11", - "@medusajs/utils": "^1.11.9", - "@medusajs/workflows-sdk": "^0.1.6", "@swc/core": "1.5.7", "@swc/helpers": "^0.5.11", - "body-parser": "^1.19.0", "boxen": "^5.0.1", "chalk": "^4.0.0", "chokidar": "^3.4.2", "compression": "^1.7.4", - "connect-redis": "^5.0.0", - "cookie-parser": "^1.4.6", - "cors": "^2.8.5", "express": "^4.18.2", "fs-exists-cached": "^1.0.0", - "glob": "^7.1.6", + "jsonwebtoken": "^9.0.2", "lodash": "^4.17.21", "medusa-telemetry": "^0.0.17", "multer": "^1.4.5-lts.1", @@ -81,5 +72,9 @@ "uuid": "^9.0.0", "zod": "3.22.4" }, + "peerDependencies": { + "@medusajs/framework": "^0.0.1", + "awilix": "^8.0.1" + }, "gitHead": "cd1f5afa5aa8c0b15ea957008ee19f1d695cbd2e" } diff --git a/packages/medusa/src/api/admin/api-keys/[id]/revoke/route.ts b/packages/medusa/src/api/admin/api-keys/[id]/revoke/route.ts index c41c4f25f9..eda1c63d1f 100644 --- a/packages/medusa/src/api/admin/api-keys/[id]/revoke/route.ts +++ b/packages/medusa/src/api/admin/api-keys/[id]/revoke/route.ts @@ -5,7 +5,7 @@ import { } from "../../../../../types/routing" import { AdminRevokeApiKeyType } from "../../validators" import { refetchApiKey } from "../../helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/api-keys/[id]/route.ts b/packages/medusa/src/api/admin/api-keys/[id]/route.ts index c2ea60e010..76138060ff 100644 --- a/packages/medusa/src/api/admin/api-keys/[id]/route.ts +++ b/packages/medusa/src/api/admin/api-keys/[id]/route.ts @@ -9,8 +9,8 @@ import { import { refetchApiKey } from "../helpers" import { AdminUpdateApiKeyType } from "../validators" -import { MedusaError } from "@medusajs/utils" -import { HttpTypes } from "@medusajs/types" +import { MedusaError } from "@medusajs/framework/utils" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/api-keys/[id]/sales-channels/route.ts b/packages/medusa/src/api/admin/api-keys/[id]/sales-channels/route.ts index be575bf8ab..e214652acf 100644 --- a/packages/medusa/src/api/admin/api-keys/[id]/sales-channels/route.ts +++ b/packages/medusa/src/api/admin/api-keys/[id]/sales-channels/route.ts @@ -1,6 +1,6 @@ import { linkSalesChannelsToApiKeyWorkflow } from "@medusajs/core-flows" -import { HttpTypes, LinkMethodRequest } from "@medusajs/types" -import { ApiKeyType, MedusaError } from "@medusajs/utils" +import { HttpTypes, LinkMethodRequest } from "@medusajs/framework/types" +import { ApiKeyType, MedusaError } from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/api-keys/helpers.ts b/packages/medusa/src/api/admin/api-keys/helpers.ts index 9352c298a4..98162af5b1 100644 --- a/packages/medusa/src/api/admin/api-keys/helpers.ts +++ b/packages/medusa/src/api/admin/api-keys/helpers.ts @@ -1,8 +1,8 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const refetchApiKey = async ( apiKeyId: string, diff --git a/packages/medusa/src/api/admin/api-keys/middlewares.ts b/packages/medusa/src/api/admin/api-keys/middlewares.ts index 0b57d5af76..21b0937f12 100644 --- a/packages/medusa/src/api/admin/api-keys/middlewares.ts +++ b/packages/medusa/src/api/admin/api-keys/middlewares.ts @@ -1,6 +1,6 @@ import * as QueryConfig from "./query-config" -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformQuery } from "../../utils/validate-query" import { AdminCreateApiKey, diff --git a/packages/medusa/src/api/admin/api-keys/route.ts b/packages/medusa/src/api/admin/api-keys/route.ts index 652fdcf941..3089eb0629 100644 --- a/packages/medusa/src/api/admin/api-keys/route.ts +++ b/packages/medusa/src/api/admin/api-keys/route.ts @@ -2,13 +2,13 @@ import { createApiKeysWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../types/routing" import { AdminCreateApiKeyType } from "./validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/api-keys/validators.ts b/packages/medusa/src/api/admin/api-keys/validators.ts index 8923451331..4b3e142008 100644 --- a/packages/medusa/src/api/admin/api-keys/validators.ts +++ b/packages/medusa/src/api/admin/api-keys/validators.ts @@ -1,4 +1,4 @@ -import { ApiKeyType } from "@medusajs/utils" +import { ApiKeyType } from "@medusajs/framework/utils" import { z } from "zod" import { createFindParams, diff --git a/packages/medusa/src/api/admin/campaigns/[id]/promotions/route.ts b/packages/medusa/src/api/admin/campaigns/[id]/promotions/route.ts index f8d5607625..d3c8b9dfa1 100644 --- a/packages/medusa/src/api/admin/campaigns/[id]/promotions/route.ts +++ b/packages/medusa/src/api/admin/campaigns/[id]/promotions/route.ts @@ -4,7 +4,7 @@ import { } from "../../../../../types/routing" import { addOrRemoveCampaignPromotionsWorkflow } from "@medusajs/core-flows" -import { HttpTypes, LinkMethodRequest } from "@medusajs/types" +import { HttpTypes, LinkMethodRequest } from "@medusajs/framework/types" import { refetchCampaign } from "../../helpers" export const POST = async ( diff --git a/packages/medusa/src/api/admin/campaigns/[id]/route.ts b/packages/medusa/src/api/admin/campaigns/[id]/route.ts index 89a452b787..519a34dd00 100644 --- a/packages/medusa/src/api/admin/campaigns/[id]/route.ts +++ b/packages/medusa/src/api/admin/campaigns/[id]/route.ts @@ -9,8 +9,8 @@ import { import { refetchCampaign } from "../helpers" import { AdminUpdateCampaignType } from "../validators" -import { MedusaError } from "@medusajs/utils" -import { AdditionalData, HttpTypes } from "@medusajs/types" +import { MedusaError } from "@medusajs/framework/utils" +import { AdditionalData, HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/campaigns/helpers.ts b/packages/medusa/src/api/admin/campaigns/helpers.ts index ea772bc235..09c8f4d9d9 100644 --- a/packages/medusa/src/api/admin/campaigns/helpers.ts +++ b/packages/medusa/src/api/admin/campaigns/helpers.ts @@ -1,8 +1,8 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const refetchCampaign = async ( campaignId: string, diff --git a/packages/medusa/src/api/admin/campaigns/middlewares.ts b/packages/medusa/src/api/admin/campaigns/middlewares.ts index 956bcbaf6d..71211167f2 100644 --- a/packages/medusa/src/api/admin/campaigns/middlewares.ts +++ b/packages/medusa/src/api/admin/campaigns/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" import { createLinkBody } from "../../utils/validators" diff --git a/packages/medusa/src/api/admin/campaigns/route.ts b/packages/medusa/src/api/admin/campaigns/route.ts index f71438362f..18601a2383 100644 --- a/packages/medusa/src/api/admin/campaigns/route.ts +++ b/packages/medusa/src/api/admin/campaigns/route.ts @@ -6,10 +6,10 @@ import { createCampaignsWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AdminCreateCampaignType } from "./validators" import { refetchCampaign } from "./helpers" -import { AdditionalData, HttpTypes } from "@medusajs/types" +import { AdditionalData, HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/campaigns/validators.ts b/packages/medusa/src/api/admin/campaigns/validators.ts index 88f99c0546..70f7a59036 100644 --- a/packages/medusa/src/api/admin/campaigns/validators.ts +++ b/packages/medusa/src/api/admin/campaigns/validators.ts @@ -1,4 +1,4 @@ -import { CampaignBudgetType, isPresent } from "@medusajs/utils" +import { CampaignBudgetType, isPresent } from "@medusajs/framework/utils" import { z } from "zod" import { createFindParams, diff --git a/packages/medusa/src/api/admin/claims/[id]/cancel/route.ts b/packages/medusa/src/api/admin/claims/[id]/cancel/route.ts index 96148dd7e6..1af08e2e79 100644 --- a/packages/medusa/src/api/admin/claims/[id]/cancel/route.ts +++ b/packages/medusa/src/api/admin/claims/[id]/cancel/route.ts @@ -1,5 +1,5 @@ import { cancelOrderClaimWorkflow } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/claims/[id]/claim-items/[action_id]/route.ts b/packages/medusa/src/api/admin/claims/[id]/claim-items/[action_id]/route.ts index 31a3a95b1c..a052739267 100644 --- a/packages/medusa/src/api/admin/claims/[id]/claim-items/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/claims/[id]/claim-items/[action_id]/route.ts @@ -5,13 +5,13 @@ import { import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../types/routing" import { AdminPostClaimsItemsActionReqSchemaType } from "../../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/claims/[id]/claim-items/route.ts b/packages/medusa/src/api/admin/claims/[id]/claim-items/route.ts index 4b6f2431f8..2a29b56428 100644 --- a/packages/medusa/src/api/admin/claims/[id]/claim-items/route.ts +++ b/packages/medusa/src/api/admin/claims/[id]/claim-items/route.ts @@ -2,13 +2,13 @@ import { orderClaimItemWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../types/routing" import { AdminPostClaimItemsReqSchemaType } from "../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/claims/[id]/inbound/items/[action_id]/route.ts b/packages/medusa/src/api/admin/claims/[id]/inbound/items/[action_id]/route.ts index 9b5649e05c..a101e244a2 100644 --- a/packages/medusa/src/api/admin/claims/[id]/inbound/items/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/claims/[id]/inbound/items/[action_id]/route.ts @@ -5,7 +5,7 @@ import { import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, @@ -13,7 +13,7 @@ import { import { refetchEntity } from "../../../../../../utils/refetch-entity" import { defaultAdminDetailsReturnFields } from "../../../../../returns/query-config" import { AdminPostReturnsRequestItemsActionReqSchemaType } from "../../../../../returns/validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/claims/[id]/inbound/items/route.ts b/packages/medusa/src/api/admin/claims/[id]/inbound/items/route.ts index 5f8a245ee1..9263fddcad 100644 --- a/packages/medusa/src/api/admin/claims/[id]/inbound/items/route.ts +++ b/packages/medusa/src/api/admin/claims/[id]/inbound/items/route.ts @@ -2,7 +2,7 @@ import { orderClaimRequestItemReturnWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, @@ -10,7 +10,7 @@ import { } from "../../../../../../types/routing" import { defaultAdminDetailsReturnFields } from "../../../../returns/query-config" import { AdminPostReturnsRequestItemsReqSchemaType } from "../../../../returns/validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/claims/[id]/inbound/shipping-method/[action_id]/route.ts b/packages/medusa/src/api/admin/claims/[id]/inbound/shipping-method/[action_id]/route.ts index 0c67b81683..ca102318c6 100644 --- a/packages/medusa/src/api/admin/claims/[id]/inbound/shipping-method/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/claims/[id]/inbound/shipping-method/[action_id]/route.ts @@ -5,14 +5,14 @@ import { import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../../types/routing" import { defaultAdminDetailsReturnFields } from "../../../../../returns/query-config" import { AdminPostClaimsShippingActionReqSchemaType } from "../../../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/claims/[id]/inbound/shipping-method/route.ts b/packages/medusa/src/api/admin/claims/[id]/inbound/shipping-method/route.ts index f4910d460e..00958b901e 100644 --- a/packages/medusa/src/api/admin/claims/[id]/inbound/shipping-method/route.ts +++ b/packages/medusa/src/api/admin/claims/[id]/inbound/shipping-method/route.ts @@ -2,7 +2,7 @@ import { createClaimShippingMethodWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, @@ -10,7 +10,7 @@ import { } from "../../../../../../types/routing" import { defaultAdminDetailsReturnFields } from "../../../../returns/query-config" import { AdminPostReturnsShippingReqSchemaType } from "../../../../returns/validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/claims/[id]/outbound/items/[action_id]/route.ts b/packages/medusa/src/api/admin/claims/[id]/outbound/items/[action_id]/route.ts index fefa484910..e519a89e0e 100644 --- a/packages/medusa/src/api/admin/claims/[id]/outbound/items/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/claims/[id]/outbound/items/[action_id]/route.ts @@ -2,11 +2,11 @@ import { removeAddItemClaimActionWorkflow, updateClaimAddItemWorkflow, } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/claims/[id]/outbound/items/route.ts b/packages/medusa/src/api/admin/claims/[id]/outbound/items/route.ts index 8239258b40..590cc3591c 100644 --- a/packages/medusa/src/api/admin/claims/[id]/outbound/items/route.ts +++ b/packages/medusa/src/api/admin/claims/[id]/outbound/items/route.ts @@ -2,14 +2,14 @@ import { orderClaimAddNewItemWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../types/routing" import { AdminPostClaimsAddItemsReqSchemaType } from "../../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/claims/[id]/outbound/shipping-method/[action_id]/route.ts b/packages/medusa/src/api/admin/claims/[id]/outbound/shipping-method/[action_id]/route.ts index 6d960f625e..25c9a73f46 100644 --- a/packages/medusa/src/api/admin/claims/[id]/outbound/shipping-method/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/claims/[id]/outbound/shipping-method/[action_id]/route.ts @@ -5,13 +5,13 @@ import { import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../../types/routing" import { AdminPostClaimsShippingActionReqSchemaType } from "../../../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/claims/[id]/outbound/shipping-method/route.ts b/packages/medusa/src/api/admin/claims/[id]/outbound/shipping-method/route.ts index a53455d90c..ff8a75c595 100644 --- a/packages/medusa/src/api/admin/claims/[id]/outbound/shipping-method/route.ts +++ b/packages/medusa/src/api/admin/claims/[id]/outbound/shipping-method/route.ts @@ -2,13 +2,13 @@ import { createClaimShippingMethodWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../types/routing" import { AdminPostClaimsShippingReqSchemaType } from "../../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/claims/[id]/request/route.ts b/packages/medusa/src/api/admin/claims/[id]/request/route.ts index 6b8a69bd79..bdad008ef8 100644 --- a/packages/medusa/src/api/admin/claims/[id]/request/route.ts +++ b/packages/medusa/src/api/admin/claims/[id]/request/route.ts @@ -2,11 +2,11 @@ import { cancelBeginOrderClaimWorkflow, confirmClaimRequestWorkflow, } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/claims/[id]/route.ts b/packages/medusa/src/api/admin/claims/[id]/route.ts index bc60b9f9fc..adafdf2977 100644 --- a/packages/medusa/src/api/admin/claims/[id]/route.ts +++ b/packages/medusa/src/api/admin/claims/[id]/route.ts @@ -2,9 +2,9 @@ import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../types/routing" -import { MedusaError } from "@medusajs/utils" +import { MedusaError } from "@medusajs/framework/utils" import { refetchEntity } from "../../../utils/refetch-entity" -import { AdminClaimResponse } from "@medusajs/types" +import { AdminClaimResponse } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/claims/middlewares.ts b/packages/medusa/src/api/admin/claims/middlewares.ts index 5ed1f5e94d..3c733427c2 100644 --- a/packages/medusa/src/api/admin/claims/middlewares.ts +++ b/packages/medusa/src/api/admin/claims/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" import * as QueryConfig from "./query-config" diff --git a/packages/medusa/src/api/admin/claims/route.ts b/packages/medusa/src/api/admin/claims/route.ts index bec876fb72..197f27c9f8 100644 --- a/packages/medusa/src/api/admin/claims/route.ts +++ b/packages/medusa/src/api/admin/claims/route.ts @@ -1,11 +1,11 @@ import { beginClaimOrderWorkflow } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { ContainerRegistrationKeys, Modules, promiseAll, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/claims/validators.ts b/packages/medusa/src/api/admin/claims/validators.ts index e3c836f325..af111778f7 100644 --- a/packages/medusa/src/api/admin/claims/validators.ts +++ b/packages/medusa/src/api/admin/claims/validators.ts @@ -1,4 +1,4 @@ -import { ClaimReason, ClaimType } from "@medusajs/utils" +import { ClaimReason, ClaimType } from "@medusajs/framework/utils" import { z } from "zod" import { createFindParams, diff --git a/packages/medusa/src/api/admin/collections/[id]/products/route.ts b/packages/medusa/src/api/admin/collections/[id]/products/route.ts index d8fc15ea84..283d6a51d1 100644 --- a/packages/medusa/src/api/admin/collections/[id]/products/route.ts +++ b/packages/medusa/src/api/admin/collections/[id]/products/route.ts @@ -1,5 +1,5 @@ import { batchLinkProductsToCollectionWorkflow } from "@medusajs/core-flows" -import { HttpTypes, LinkMethodRequest } from "@medusajs/types" +import { HttpTypes, LinkMethodRequest } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/collections/[id]/route.ts b/packages/medusa/src/api/admin/collections/[id]/route.ts index 20eaf01b70..557f058be0 100644 --- a/packages/medusa/src/api/admin/collections/[id]/route.ts +++ b/packages/medusa/src/api/admin/collections/[id]/route.ts @@ -9,8 +9,8 @@ import { import { AdminUpdateCollectionType } from "../validators" import { refetchCollection } from "../helpers" -import { HttpTypes } from "@medusajs/types" -import { MedusaError } from "@medusajs/utils" +import { HttpTypes } from "@medusajs/framework/types" +import { MedusaError } from "@medusajs/framework/utils" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/collections/helpers.ts b/packages/medusa/src/api/admin/collections/helpers.ts index e142f7f6a5..7f40b9c9bb 100644 --- a/packages/medusa/src/api/admin/collections/helpers.ts +++ b/packages/medusa/src/api/admin/collections/helpers.ts @@ -1,8 +1,8 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const refetchCollection = async ( collectionId: string, diff --git a/packages/medusa/src/api/admin/collections/middlewares.ts b/packages/medusa/src/api/admin/collections/middlewares.ts index 3641a6f215..c0fc58db86 100644 --- a/packages/medusa/src/api/admin/collections/middlewares.ts +++ b/packages/medusa/src/api/admin/collections/middlewares.ts @@ -1,5 +1,5 @@ import * as QueryConfig from "./query-config" -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformQuery } from "../../utils/validate-query" import { AdminCreateCollection, diff --git a/packages/medusa/src/api/admin/collections/route.ts b/packages/medusa/src/api/admin/collections/route.ts index 280a6f1924..876498b9cd 100644 --- a/packages/medusa/src/api/admin/collections/route.ts +++ b/packages/medusa/src/api/admin/collections/route.ts @@ -7,10 +7,10 @@ import { createCollectionsWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AdminCreateCollectionType } from "./validators" import { refetchCollection } from "./helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/currencies/[code]/route.ts b/packages/medusa/src/api/admin/currencies/[code]/route.ts index e7df69df34..4a94170fe8 100644 --- a/packages/medusa/src/api/admin/currencies/[code]/route.ts +++ b/packages/medusa/src/api/admin/currencies/[code]/route.ts @@ -2,9 +2,9 @@ import { ContainerRegistrationKeys, MedusaError, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { MedusaRequest, MedusaResponse } from "../../../../types/routing" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: MedusaRequest, diff --git a/packages/medusa/src/api/admin/currencies/middlewares.ts b/packages/medusa/src/api/admin/currencies/middlewares.ts index 4485669767..a09f2ebd51 100644 --- a/packages/medusa/src/api/admin/currencies/middlewares.ts +++ b/packages/medusa/src/api/admin/currencies/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformQuery } from "../../utils/validate-query" import * as QueryConfig from "./query-config" import { AdminGetCurrencyParams, AdminGetCurrenciesParams } from "./validators" diff --git a/packages/medusa/src/api/admin/currencies/route.ts b/packages/medusa/src/api/admin/currencies/route.ts index 0cf76127c5..12e93b9eb4 100644 --- a/packages/medusa/src/api/admin/currencies/route.ts +++ b/packages/medusa/src/api/admin/currencies/route.ts @@ -1,9 +1,9 @@ import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { MedusaRequest, MedusaResponse } from "../../../types/routing" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: MedusaRequest, diff --git a/packages/medusa/src/api/admin/customer-groups/[id]/customers/route.ts b/packages/medusa/src/api/admin/customer-groups/[id]/customers/route.ts index 17f02e1b31..3daacc2ec7 100644 --- a/packages/medusa/src/api/admin/customer-groups/[id]/customers/route.ts +++ b/packages/medusa/src/api/admin/customer-groups/[id]/customers/route.ts @@ -4,7 +4,7 @@ import { MedusaResponse, } from "../../../../../types/routing" -import { HttpTypes, LinkMethodRequest } from "@medusajs/types" +import { HttpTypes, LinkMethodRequest } from "@medusajs/framework/types" import { refetchCustomerGroup } from "../../helpers" export const POST = async ( diff --git a/packages/medusa/src/api/admin/customer-groups/[id]/route.ts b/packages/medusa/src/api/admin/customer-groups/[id]/route.ts index 663371616b..e1c8b3a91d 100644 --- a/packages/medusa/src/api/admin/customer-groups/[id]/route.ts +++ b/packages/medusa/src/api/admin/customer-groups/[id]/route.ts @@ -7,10 +7,10 @@ import { MedusaResponse, } from "../../../../types/routing" -import { MedusaError } from "@medusajs/utils" +import { MedusaError } from "@medusajs/framework/utils" import { refetchCustomerGroup } from "../helpers" import { AdminUpdateCustomerGroupType } from "../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/customer-groups/helpers.ts b/packages/medusa/src/api/admin/customer-groups/helpers.ts index c54fd1d343..7434b5d270 100644 --- a/packages/medusa/src/api/admin/customer-groups/helpers.ts +++ b/packages/medusa/src/api/admin/customer-groups/helpers.ts @@ -1,8 +1,8 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const refetchCustomerGroup = async ( customerGroupId: string, diff --git a/packages/medusa/src/api/admin/customer-groups/middlewares.ts b/packages/medusa/src/api/admin/customer-groups/middlewares.ts index cdb01a4f48..aa7cd921b1 100644 --- a/packages/medusa/src/api/admin/customer-groups/middlewares.ts +++ b/packages/medusa/src/api/admin/customer-groups/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" import { createLinkBody } from "../../utils/validators" diff --git a/packages/medusa/src/api/admin/customer-groups/route.ts b/packages/medusa/src/api/admin/customer-groups/route.ts index 5bd440e50a..04b7eeeea1 100644 --- a/packages/medusa/src/api/admin/customer-groups/route.ts +++ b/packages/medusa/src/api/admin/customer-groups/route.ts @@ -6,10 +6,10 @@ import { createCustomerGroupsWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AdminCreateCustomerGroupType } from "./validators" import { refetchCustomerGroup } from "./helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/customers/[id]/addresses/[address_id]/route.ts b/packages/medusa/src/api/admin/customers/[id]/addresses/[address_id]/route.ts index 74a69268ce..3ba579af04 100644 --- a/packages/medusa/src/api/admin/customers/[id]/addresses/[address_id]/route.ts +++ b/packages/medusa/src/api/admin/customers/[id]/addresses/[address_id]/route.ts @@ -10,10 +10,10 @@ import { import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AdminCreateCustomerAddressType } from "../../../validators" import { refetchCustomer } from "../../../helpers" -import { AdditionalData, HttpTypes } from "@medusajs/types" +import { AdditionalData, HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/customers/[id]/addresses/route.ts b/packages/medusa/src/api/admin/customers/[id]/addresses/route.ts index dcaeb44819..879b2d4ce5 100644 --- a/packages/medusa/src/api/admin/customers/[id]/addresses/route.ts +++ b/packages/medusa/src/api/admin/customers/[id]/addresses/route.ts @@ -6,10 +6,10 @@ import { import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AdminCreateCustomerAddressType } from "../../validators" import { refetchCustomer } from "../../helpers" -import { AdditionalData, HttpTypes } from "@medusajs/types" +import { AdditionalData, HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/customers/[id]/route.ts b/packages/medusa/src/api/admin/customers/[id]/route.ts index f2c675c843..0830b9e1d3 100644 --- a/packages/medusa/src/api/admin/customers/[id]/route.ts +++ b/packages/medusa/src/api/admin/customers/[id]/route.ts @@ -2,8 +2,8 @@ import { removeCustomerAccountWorkflow, updateCustomersWorkflow, } from "@medusajs/core-flows" -import { AdditionalData, HttpTypes } from "@medusajs/types" -import { MedusaError } from "@medusajs/utils" +import { AdditionalData, HttpTypes } from "@medusajs/framework/types" +import { MedusaError } from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/customers/helpers.ts b/packages/medusa/src/api/admin/customers/helpers.ts index 5aee77c888..8b15d8af57 100644 --- a/packages/medusa/src/api/admin/customers/helpers.ts +++ b/packages/medusa/src/api/admin/customers/helpers.ts @@ -1,8 +1,8 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const refetchCustomer = async ( customerId: string, diff --git a/packages/medusa/src/api/admin/customers/middlewares.ts b/packages/medusa/src/api/admin/customers/middlewares.ts index 279d20461d..a76b195767 100644 --- a/packages/medusa/src/api/admin/customers/middlewares.ts +++ b/packages/medusa/src/api/admin/customers/middlewares.ts @@ -10,7 +10,7 @@ import { AdminUpdateCustomerAddress, } from "./validators" -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" diff --git a/packages/medusa/src/api/admin/customers/route.ts b/packages/medusa/src/api/admin/customers/route.ts index fca8d0e867..bbc131df09 100644 --- a/packages/medusa/src/api/admin/customers/route.ts +++ b/packages/medusa/src/api/admin/customers/route.ts @@ -1,10 +1,10 @@ import { createCustomersWorkflow } from "@medusajs/core-flows" -import { AdditionalData, HttpTypes } from "@medusajs/types" +import { AdditionalData, HttpTypes } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/draft-orders/[id]/route.ts b/packages/medusa/src/api/admin/draft-orders/[id]/route.ts index 50e38204a3..0ba4c9ce1a 100644 --- a/packages/medusa/src/api/admin/draft-orders/[id]/route.ts +++ b/packages/medusa/src/api/admin/draft-orders/[id]/route.ts @@ -1,8 +1,8 @@ -import { MedusaError } from "@medusajs/utils" +import { MedusaError } from "@medusajs/framework/utils" import { MedusaRequest, MedusaResponse } from "../../../../types/routing" import { refetchOrder } from "../helpers" import { defaultAdminOrderFields } from "../query-config" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: MedusaRequest, diff --git a/packages/medusa/src/api/admin/draft-orders/helpers.ts b/packages/medusa/src/api/admin/draft-orders/helpers.ts index 72ae16c2f4..e79239849e 100644 --- a/packages/medusa/src/api/admin/draft-orders/helpers.ts +++ b/packages/medusa/src/api/admin/draft-orders/helpers.ts @@ -1,8 +1,8 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const refetchOrder = async ( orderId: string, diff --git a/packages/medusa/src/api/admin/draft-orders/middlewares.ts b/packages/medusa/src/api/admin/draft-orders/middlewares.ts index 04f11e4f0e..0e99da1faf 100644 --- a/packages/medusa/src/api/admin/draft-orders/middlewares.ts +++ b/packages/medusa/src/api/admin/draft-orders/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" import * as QueryConfig from "./query-config" diff --git a/packages/medusa/src/api/admin/draft-orders/route.ts b/packages/medusa/src/api/admin/draft-orders/route.ts index 4191d73d77..54a890bae4 100644 --- a/packages/medusa/src/api/admin/draft-orders/route.ts +++ b/packages/medusa/src/api/admin/draft-orders/route.ts @@ -3,7 +3,7 @@ import { ContainerRegistrationKeys, OrderStatus, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaRequest, @@ -11,7 +11,11 @@ import { } from "../../../types/routing" import { AdminCreateDraftOrderType } from "./validators" import { refetchOrder } from "./helpers" -import { AdditionalData, CreateOrderDTO, HttpTypes } from "@medusajs/types" +import { + AdditionalData, + CreateOrderDTO, + HttpTypes, +} from "@medusajs/framework/types" export const GET = async ( req: MedusaRequest, diff --git a/packages/medusa/src/api/admin/exchanges/[id]/cancel/route.ts b/packages/medusa/src/api/admin/exchanges/[id]/cancel/route.ts index 14052dadca..359866f3f1 100644 --- a/packages/medusa/src/api/admin/exchanges/[id]/cancel/route.ts +++ b/packages/medusa/src/api/admin/exchanges/[id]/cancel/route.ts @@ -1,5 +1,5 @@ import { cancelOrderExchangeWorkflow } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/exchanges/[id]/inbound/items/[action_id]/route.ts b/packages/medusa/src/api/admin/exchanges/[id]/inbound/items/[action_id]/route.ts index 3aad050126..99faf5f9d0 100644 --- a/packages/medusa/src/api/admin/exchanges/[id]/inbound/items/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/exchanges/[id]/inbound/items/[action_id]/route.ts @@ -2,11 +2,11 @@ import { removeItemReturnActionWorkflow, updateRequestItemReturnWorkflow, } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/exchanges/[id]/inbound/items/route.ts b/packages/medusa/src/api/admin/exchanges/[id]/inbound/items/route.ts index 0271229f5f..75f95d62d9 100644 --- a/packages/medusa/src/api/admin/exchanges/[id]/inbound/items/route.ts +++ b/packages/medusa/src/api/admin/exchanges/[id]/inbound/items/route.ts @@ -2,7 +2,7 @@ import { orderExchangeRequestItemReturnWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, @@ -10,7 +10,7 @@ import { } from "../../../../../../types/routing" import { defaultAdminDetailsReturnFields } from "../../../../returns/query-config" import { AdminPostExchangesReturnRequestItemsReqSchemaType } from "../../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/exchanges/[id]/inbound/shipping-method/[action_id]/route.ts b/packages/medusa/src/api/admin/exchanges/[id]/inbound/shipping-method/[action_id]/route.ts index 983d665fc7..7b76f35a2e 100644 --- a/packages/medusa/src/api/admin/exchanges/[id]/inbound/shipping-method/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/exchanges/[id]/inbound/shipping-method/[action_id]/route.ts @@ -5,14 +5,14 @@ import { import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../../types/routing" import { defaultAdminDetailsReturnFields } from "../../../../../returns/query-config" import { AdminPostExchangesShippingActionReqSchemaType } from "../../../../validators" -import { AdminOrderPreview, HttpTypes } from "@medusajs/types" +import { AdminOrderPreview, HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/exchanges/[id]/inbound/shipping-method/route.ts b/packages/medusa/src/api/admin/exchanges/[id]/inbound/shipping-method/route.ts index bd0c6e93d6..3255e5662c 100644 --- a/packages/medusa/src/api/admin/exchanges/[id]/inbound/shipping-method/route.ts +++ b/packages/medusa/src/api/admin/exchanges/[id]/inbound/shipping-method/route.ts @@ -2,7 +2,7 @@ import { createExchangeShippingMethodWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, @@ -10,7 +10,7 @@ import { } from "../../../../../../types/routing" import { defaultAdminDetailsReturnFields } from "../../../../returns/query-config" import { AdminPostReturnsShippingReqSchemaType } from "../../../../returns/validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/exchanges/[id]/outbound/items/[action_id]/route.ts b/packages/medusa/src/api/admin/exchanges/[id]/outbound/items/[action_id]/route.ts index 8409ea5350..15ed208bf2 100644 --- a/packages/medusa/src/api/admin/exchanges/[id]/outbound/items/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/exchanges/[id]/outbound/items/[action_id]/route.ts @@ -2,11 +2,11 @@ import { removeItemExchangeActionWorkflow, updateExchangeAddItemWorkflow, } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/exchanges/[id]/outbound/items/route.ts b/packages/medusa/src/api/admin/exchanges/[id]/outbound/items/route.ts index 6fde48f8b9..28f6a074b8 100644 --- a/packages/medusa/src/api/admin/exchanges/[id]/outbound/items/route.ts +++ b/packages/medusa/src/api/admin/exchanges/[id]/outbound/items/route.ts @@ -2,14 +2,14 @@ import { orderExchangeAddNewItemWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../types/routing" import { AdminPostExchangesAddItemsReqSchemaType } from "../../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/exchanges/[id]/outbound/shipping-method/[action_id]/route.ts b/packages/medusa/src/api/admin/exchanges/[id]/outbound/shipping-method/[action_id]/route.ts index b4cd2b86ee..d2532b2d9e 100644 --- a/packages/medusa/src/api/admin/exchanges/[id]/outbound/shipping-method/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/exchanges/[id]/outbound/shipping-method/[action_id]/route.ts @@ -5,13 +5,13 @@ import { import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../../types/routing" import { AdminPostExchangesShippingActionReqSchemaType } from "../../../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/exchanges/[id]/outbound/shipping-method/route.ts b/packages/medusa/src/api/admin/exchanges/[id]/outbound/shipping-method/route.ts index 620877dcf8..32d46a907b 100644 --- a/packages/medusa/src/api/admin/exchanges/[id]/outbound/shipping-method/route.ts +++ b/packages/medusa/src/api/admin/exchanges/[id]/outbound/shipping-method/route.ts @@ -2,13 +2,13 @@ import { createExchangeShippingMethodWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../types/routing" import { AdminPostExchangesShippingReqSchemaType } from "../../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/exchanges/[id]/request/route.ts b/packages/medusa/src/api/admin/exchanges/[id]/request/route.ts index 5b826a2750..6ae6bdca9c 100644 --- a/packages/medusa/src/api/admin/exchanges/[id]/request/route.ts +++ b/packages/medusa/src/api/admin/exchanges/[id]/request/route.ts @@ -2,11 +2,11 @@ import { cancelBeginOrderExchangeWorkflow, confirmExchangeRequestWorkflow, } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/exchanges/[id]/route.ts b/packages/medusa/src/api/admin/exchanges/[id]/route.ts index 14b6716b7c..75c55fe9d4 100644 --- a/packages/medusa/src/api/admin/exchanges/[id]/route.ts +++ b/packages/medusa/src/api/admin/exchanges/[id]/route.ts @@ -1,5 +1,5 @@ -import { AdminExchangeResponse } from "@medusajs/types" -import { MedusaError } from "@medusajs/utils" +import { AdminExchangeResponse } from "@medusajs/framework/types" +import { MedusaError } from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/exchanges/middlewares.ts b/packages/medusa/src/api/admin/exchanges/middlewares.ts index eff47d835f..a8169b1b2f 100644 --- a/packages/medusa/src/api/admin/exchanges/middlewares.ts +++ b/packages/medusa/src/api/admin/exchanges/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" import * as QueryConfig from "./query-config" diff --git a/packages/medusa/src/api/admin/exchanges/route.ts b/packages/medusa/src/api/admin/exchanges/route.ts index 00d739913b..1ef91413d7 100644 --- a/packages/medusa/src/api/admin/exchanges/route.ts +++ b/packages/medusa/src/api/admin/exchanges/route.ts @@ -1,11 +1,11 @@ import { beginExchangeOrderWorkflow } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { ContainerRegistrationKeys, Modules, promiseAll, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/fulfillment-providers/middlewares.ts b/packages/medusa/src/api/admin/fulfillment-providers/middlewares.ts index b83cfb2264..d569c425dc 100644 --- a/packages/medusa/src/api/admin/fulfillment-providers/middlewares.ts +++ b/packages/medusa/src/api/admin/fulfillment-providers/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { maybeApplyLinkFilter } from "../../utils/maybe-apply-link-filter" import { validateAndTransformQuery } from "../../utils/validate-query" import * as QueryConfig from "./query-config" diff --git a/packages/medusa/src/api/admin/fulfillment-providers/route.ts b/packages/medusa/src/api/admin/fulfillment-providers/route.ts index aec8bcc402..1d0e0442da 100644 --- a/packages/medusa/src/api/admin/fulfillment-providers/route.ts +++ b/packages/medusa/src/api/admin/fulfillment-providers/route.ts @@ -1,8 +1,8 @@ -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/fulfillment-sets/[id]/route.ts b/packages/medusa/src/api/admin/fulfillment-sets/[id]/route.ts index a85c7c0a59..8c9967b1c0 100644 --- a/packages/medusa/src/api/admin/fulfillment-sets/[id]/route.ts +++ b/packages/medusa/src/api/admin/fulfillment-sets/[id]/route.ts @@ -1,5 +1,5 @@ import { deleteFulfillmentSetsWorkflow } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/[zone_id]/route.ts b/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/[zone_id]/route.ts index f34c6c3e6b..d8ce2eab8a 100644 --- a/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/[zone_id]/route.ts +++ b/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/[zone_id]/route.ts @@ -7,13 +7,13 @@ import { AdminServiceZoneResponse, HttpTypes, IFulfillmentModuleService, -} from "@medusajs/types" +} from "@medusajs/framework/types" import { ContainerRegistrationKeys, MedusaError, Modules, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaRequest, diff --git a/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/route.ts b/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/route.ts index a7bc9facab..ba2b5a03a0 100644 --- a/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/route.ts +++ b/packages/medusa/src/api/admin/fulfillment-sets/[id]/service-zones/route.ts @@ -2,7 +2,7 @@ import { createServiceZonesWorkflow } from "@medusajs/core-flows" import { MedusaRequest, MedusaResponse } from "../../../../../types/routing" import { AdminCreateFulfillmentSetServiceZonesType } from "../../validators" import { refetchFulfillmentSet } from "../../helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: MedusaRequest, diff --git a/packages/medusa/src/api/admin/fulfillment-sets/helpers.ts b/packages/medusa/src/api/admin/fulfillment-sets/helpers.ts index 17494a7a66..aa9bdb9fc2 100644 --- a/packages/medusa/src/api/admin/fulfillment-sets/helpers.ts +++ b/packages/medusa/src/api/admin/fulfillment-sets/helpers.ts @@ -1,8 +1,8 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const refetchFulfillmentSet = async ( fulfillmentSetId: string, diff --git a/packages/medusa/src/api/admin/fulfillment-sets/middlewares.ts b/packages/medusa/src/api/admin/fulfillment-sets/middlewares.ts index 1ee6911a52..9649edf3c6 100644 --- a/packages/medusa/src/api/admin/fulfillment-sets/middlewares.ts +++ b/packages/medusa/src/api/admin/fulfillment-sets/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" import * as QueryConfig from "./query-config" diff --git a/packages/medusa/src/api/admin/fulfillments/[id]/cancel/route.ts b/packages/medusa/src/api/admin/fulfillments/[id]/cancel/route.ts index 5261475c1d..fa7b95ee45 100644 --- a/packages/medusa/src/api/admin/fulfillments/[id]/cancel/route.ts +++ b/packages/medusa/src/api/admin/fulfillments/[id]/cancel/route.ts @@ -4,7 +4,7 @@ import { MedusaResponse, } from "../../../../../types/routing" import { refetchFulfillment } from "../../helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/fulfillments/[id]/shipment/route.ts b/packages/medusa/src/api/admin/fulfillments/[id]/shipment/route.ts index c639da2117..685c25c48e 100644 --- a/packages/medusa/src/api/admin/fulfillments/[id]/shipment/route.ts +++ b/packages/medusa/src/api/admin/fulfillments/[id]/shipment/route.ts @@ -1,5 +1,5 @@ import { createShipmentWorkflow } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/fulfillments/helpers.ts b/packages/medusa/src/api/admin/fulfillments/helpers.ts index 16e512f6e8..96f69f6bb4 100644 --- a/packages/medusa/src/api/admin/fulfillments/helpers.ts +++ b/packages/medusa/src/api/admin/fulfillments/helpers.ts @@ -1,8 +1,8 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const refetchFulfillment = async ( fulfillmentId: string, diff --git a/packages/medusa/src/api/admin/fulfillments/middlewares.ts b/packages/medusa/src/api/admin/fulfillments/middlewares.ts index 7951b5824b..01cfbc0660 100644 --- a/packages/medusa/src/api/admin/fulfillments/middlewares.ts +++ b/packages/medusa/src/api/admin/fulfillments/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" import * as QueryConfig from "./query-config" diff --git a/packages/medusa/src/api/admin/fulfillments/route.ts b/packages/medusa/src/api/admin/fulfillments/route.ts index f23e6c959d..3452bd5e6f 100644 --- a/packages/medusa/src/api/admin/fulfillments/route.ts +++ b/packages/medusa/src/api/admin/fulfillments/route.ts @@ -1,5 +1,5 @@ import { createFulfillmentWorkflow } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/inventory-items/[id]/location-levels/[location_id]/route.ts b/packages/medusa/src/api/admin/inventory-items/[id]/location-levels/[location_id]/route.ts index 00a72f16c4..70cef0c548 100644 --- a/packages/medusa/src/api/admin/inventory-items/[id]/location-levels/[location_id]/route.ts +++ b/packages/medusa/src/api/admin/inventory-items/[id]/location-levels/[location_id]/route.ts @@ -2,14 +2,14 @@ import { ContainerRegistrationKeys, MedusaError, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { MedusaRequest, MedusaResponse } from "../../../../../../types/routing" import { deleteInventoryLevelsWorkflow, updateInventoryLevelsWorkflow, } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { refetchInventoryItem } from "../../../helpers" import { AdminUpdateInventoryLocationLevelType } from "../../../validators" diff --git a/packages/medusa/src/api/admin/inventory-items/[id]/location-levels/batch/route.ts b/packages/medusa/src/api/admin/inventory-items/[id]/location-levels/batch/route.ts index 12f2d2283d..e3069cef2f 100644 --- a/packages/medusa/src/api/admin/inventory-items/[id]/location-levels/batch/route.ts +++ b/packages/medusa/src/api/admin/inventory-items/[id]/location-levels/batch/route.ts @@ -5,7 +5,7 @@ import { import { MedusaRequest, MedusaResponse } from "../../../../../../types/routing" import { bulkCreateDeleteLevelsWorkflow } from "@medusajs/core-flows" -import { BatchMethodRequest } from "@medusajs/types" +import { BatchMethodRequest } from "@medusajs/framework/types" export const POST = async ( req: MedusaRequest< diff --git a/packages/medusa/src/api/admin/inventory-items/[id]/location-levels/route.ts b/packages/medusa/src/api/admin/inventory-items/[id]/location-levels/route.ts index 67e031ccdb..69cbc36b5c 100644 --- a/packages/medusa/src/api/admin/inventory-items/[id]/location-levels/route.ts +++ b/packages/medusa/src/api/admin/inventory-items/[id]/location-levels/route.ts @@ -1,7 +1,7 @@ import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { MedusaRequest, MedusaResponse } from "../../../../../types/routing" import { createInventoryLevelsWorkflow } from "@medusajs/core-flows" @@ -10,7 +10,7 @@ import { AdminGetInventoryLocationLevelsParamsType, } from "../../validators" import { refetchInventoryItem } from "../../helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: MedusaRequest, diff --git a/packages/medusa/src/api/admin/inventory-items/[id]/route.ts b/packages/medusa/src/api/admin/inventory-items/[id]/route.ts index 782cdd75c9..88778e6a88 100644 --- a/packages/medusa/src/api/admin/inventory-items/[id]/route.ts +++ b/packages/medusa/src/api/admin/inventory-items/[id]/route.ts @@ -1,4 +1,4 @@ -import { MedusaError } from "@medusajs/utils" +import { MedusaError } from "@medusajs/framework/utils" import { MedusaRequest, MedusaResponse } from "../../../../types/routing" import { deleteInventoryItemWorkflow, @@ -9,7 +9,7 @@ import { AdminUpdateInventoryItemType, } from "../validators" import { refetchInventoryItem } from "../helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: MedusaRequest, diff --git a/packages/medusa/src/api/admin/inventory-items/helpers.ts b/packages/medusa/src/api/admin/inventory-items/helpers.ts index bada406607..f57965535d 100644 --- a/packages/medusa/src/api/admin/inventory-items/helpers.ts +++ b/packages/medusa/src/api/admin/inventory-items/helpers.ts @@ -1,8 +1,8 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const refetchInventoryItem = async ( inventoryItemId: string, diff --git a/packages/medusa/src/api/admin/inventory-items/middlewares.ts b/packages/medusa/src/api/admin/inventory-items/middlewares.ts index 79452445c6..e792f10efb 100644 --- a/packages/medusa/src/api/admin/inventory-items/middlewares.ts +++ b/packages/medusa/src/api/admin/inventory-items/middlewares.ts @@ -1,5 +1,5 @@ import * as QueryConfig from "./query-config" -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformQuery } from "../../utils/validate-query" import { AdminCreateInventoryItem, diff --git a/packages/medusa/src/api/admin/inventory-items/route.ts b/packages/medusa/src/api/admin/inventory-items/route.ts index 4140f41f11..67544771aa 100644 --- a/packages/medusa/src/api/admin/inventory-items/route.ts +++ b/packages/medusa/src/api/admin/inventory-items/route.ts @@ -5,11 +5,11 @@ import { import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { createInventoryItemsWorkflow } from "@medusajs/core-flows" import { refetchInventoryItem } from "./helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/invites/[id]/resend/route.ts b/packages/medusa/src/api/admin/invites/[id]/resend/route.ts index 6a3072e45e..b2dfb02311 100644 --- a/packages/medusa/src/api/admin/invites/[id]/resend/route.ts +++ b/packages/medusa/src/api/admin/invites/[id]/resend/route.ts @@ -2,7 +2,7 @@ import { MedusaRequest, MedusaResponse } from "../../../../../types/routing" import { refreshInviteTokensWorkflow } from "@medusajs/core-flows" import { refetchInvite } from "../../helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: MedusaRequest, diff --git a/packages/medusa/src/api/admin/invites/[id]/route.ts b/packages/medusa/src/api/admin/invites/[id]/route.ts index 05b8972e9c..63111f0303 100644 --- a/packages/medusa/src/api/admin/invites/[id]/route.ts +++ b/packages/medusa/src/api/admin/invites/[id]/route.ts @@ -2,11 +2,11 @@ import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../types/routing" -import { MedusaError } from "@medusajs/utils" +import { MedusaError } from "@medusajs/framework/utils" import { deleteInvitesWorkflow } from "@medusajs/core-flows" import { refetchInvite } from "../helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/invites/accept/route.ts b/packages/medusa/src/api/admin/invites/accept/route.ts index bd7b2ba823..63bce0d205 100644 --- a/packages/medusa/src/api/admin/invites/accept/route.ts +++ b/packages/medusa/src/api/admin/invites/accept/route.ts @@ -1,6 +1,6 @@ import { acceptInviteWorkflow } from "@medusajs/core-flows" -import { HttpTypes, InviteWorkflow } from "@medusajs/types" -import { MedusaError } from "@medusajs/utils" +import { HttpTypes, InviteWorkflow } from "@medusajs/framework/types" +import { MedusaError } from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/invites/helpers.ts b/packages/medusa/src/api/admin/invites/helpers.ts index 6dfcf6f9b0..eb6f07118a 100644 --- a/packages/medusa/src/api/admin/invites/helpers.ts +++ b/packages/medusa/src/api/admin/invites/helpers.ts @@ -1,8 +1,8 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const refetchInvite = async ( inviteId: string, diff --git a/packages/medusa/src/api/admin/invites/middlewares.ts b/packages/medusa/src/api/admin/invites/middlewares.ts index 6fae59b9a9..3da7d0c38b 100644 --- a/packages/medusa/src/api/admin/invites/middlewares.ts +++ b/packages/medusa/src/api/admin/invites/middlewares.ts @@ -8,7 +8,7 @@ import { AdminInviteAccept, } from "./validators" -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { authenticate } from "../../../utils/middlewares/authenticate-middleware" import { validateAndTransformQuery } from "../../utils/validate-query" import { validateAndTransformBody } from "../../utils/validate-body" diff --git a/packages/medusa/src/api/admin/invites/route.ts b/packages/medusa/src/api/admin/invites/route.ts index 7e4b334526..b0fe542ab0 100644 --- a/packages/medusa/src/api/admin/invites/route.ts +++ b/packages/medusa/src/api/admin/invites/route.ts @@ -5,11 +5,11 @@ import { import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { createInvitesWorkflow } from "@medusajs/core-flows" import { refetchInvite } from "./helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/notifications/[id]/route.ts b/packages/medusa/src/api/admin/notifications/[id]/route.ts index 20b86d82b6..233fa6266f 100644 --- a/packages/medusa/src/api/admin/notifications/[id]/route.ts +++ b/packages/medusa/src/api/admin/notifications/[id]/route.ts @@ -4,7 +4,7 @@ import { } from "../../../../types/routing" import { AdminGetNotificationParamsType } from "../validators" import { refetchEntity } from "../../../utils/refetch-entity" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/notifications/middlewares.ts b/packages/medusa/src/api/admin/notifications/middlewares.ts index fef91e0728..b1b2e34f65 100644 --- a/packages/medusa/src/api/admin/notifications/middlewares.ts +++ b/packages/medusa/src/api/admin/notifications/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformQuery } from "../../utils/validate-query" import * as QueryConfig from "./query-config" import { diff --git a/packages/medusa/src/api/admin/notifications/route.ts b/packages/medusa/src/api/admin/notifications/route.ts index c79e1c8acd..eca1e96572 100644 --- a/packages/medusa/src/api/admin/notifications/route.ts +++ b/packages/medusa/src/api/admin/notifications/route.ts @@ -3,7 +3,7 @@ import { MedusaResponse, } from "../../../types/routing" import { refetchEntities } from "../../utils/refetch-entity" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/order-edits/[id]/confirm/route.ts b/packages/medusa/src/api/admin/order-edits/[id]/confirm/route.ts index bac689eb9b..9c1c3364da 100644 --- a/packages/medusa/src/api/admin/order-edits/[id]/confirm/route.ts +++ b/packages/medusa/src/api/admin/order-edits/[id]/confirm/route.ts @@ -1,5 +1,5 @@ import { confirmOrderEditRequestWorkflow } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/order-edits/[id]/items/[action_id]/route.ts b/packages/medusa/src/api/admin/order-edits/[id]/items/[action_id]/route.ts index 721f346f8e..6fdc273735 100644 --- a/packages/medusa/src/api/admin/order-edits/[id]/items/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/order-edits/[id]/items/[action_id]/route.ts @@ -2,7 +2,7 @@ import { removeItemOrderEditActionWorkflow, updateOrderEditAddItemWorkflow, } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/order-edits/[id]/items/item/[item_id]/route.ts b/packages/medusa/src/api/admin/order-edits/[id]/items/item/[item_id]/route.ts index ed281def06..64ac656cb3 100644 --- a/packages/medusa/src/api/admin/order-edits/[id]/items/item/[item_id]/route.ts +++ b/packages/medusa/src/api/admin/order-edits/[id]/items/item/[item_id]/route.ts @@ -1,5 +1,5 @@ import { orderEditUpdateItemQuantityWorkflow } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/order-edits/[id]/items/route.ts b/packages/medusa/src/api/admin/order-edits/[id]/items/route.ts index caafa223c4..99a85e4334 100644 --- a/packages/medusa/src/api/admin/order-edits/[id]/items/route.ts +++ b/packages/medusa/src/api/admin/order-edits/[id]/items/route.ts @@ -1,6 +1,6 @@ import { orderEditAddNewItemWorkflow } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/order-edits/[id]/request/route.ts b/packages/medusa/src/api/admin/order-edits/[id]/request/route.ts index 990a87b316..2bf308b0d3 100644 --- a/packages/medusa/src/api/admin/order-edits/[id]/request/route.ts +++ b/packages/medusa/src/api/admin/order-edits/[id]/request/route.ts @@ -1,5 +1,5 @@ import { requestOrderEditRequestWorkflow } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/order-edits/[id]/route.ts b/packages/medusa/src/api/admin/order-edits/[id]/route.ts index 1c09d4797a..e571cba5e4 100644 --- a/packages/medusa/src/api/admin/order-edits/[id]/route.ts +++ b/packages/medusa/src/api/admin/order-edits/[id]/route.ts @@ -1,5 +1,5 @@ import { cancelBeginOrderEditWorkflow } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/order-edits/[id]/shipping-method/[action_id]/route.ts b/packages/medusa/src/api/admin/order-edits/[id]/shipping-method/[action_id]/route.ts index 79bf65bf8a..a986b19e82 100644 --- a/packages/medusa/src/api/admin/order-edits/[id]/shipping-method/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/order-edits/[id]/shipping-method/[action_id]/route.ts @@ -2,7 +2,7 @@ import { removeOrderEditShippingMethodWorkflow, updateOrderEditShippingMethodWorkflow, } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/order-edits/[id]/shipping-method/route.ts b/packages/medusa/src/api/admin/order-edits/[id]/shipping-method/route.ts index d03a140eda..41cd661910 100644 --- a/packages/medusa/src/api/admin/order-edits/[id]/shipping-method/route.ts +++ b/packages/medusa/src/api/admin/order-edits/[id]/shipping-method/route.ts @@ -1,5 +1,5 @@ import { createOrderEditShippingMethodWorkflow } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/order-edits/middlewares.ts b/packages/medusa/src/api/admin/order-edits/middlewares.ts index ed3920d327..5154324b0f 100644 --- a/packages/medusa/src/api/admin/order-edits/middlewares.ts +++ b/packages/medusa/src/api/admin/order-edits/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformBody } from "../../utils/validate-body" import { AdminPostOrderEditsAddItemsReqSchema, diff --git a/packages/medusa/src/api/admin/order-edits/route.ts b/packages/medusa/src/api/admin/order-edits/route.ts index d470e492a1..fd9b4adaeb 100644 --- a/packages/medusa/src/api/admin/order-edits/route.ts +++ b/packages/medusa/src/api/admin/order-edits/route.ts @@ -1,5 +1,5 @@ import { beginOrderEditOrderWorkflow } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/orders/[id]/archive/route.ts b/packages/medusa/src/api/admin/orders/[id]/archive/route.ts index 8cdf4907c1..485578fee9 100644 --- a/packages/medusa/src/api/admin/orders/[id]/archive/route.ts +++ b/packages/medusa/src/api/admin/orders/[id]/archive/route.ts @@ -2,12 +2,12 @@ import { archiveOrderWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../types/routing" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/orders/[id]/cancel/route.ts b/packages/medusa/src/api/admin/orders/[id]/cancel/route.ts index ccb045640b..27b725f04d 100644 --- a/packages/medusa/src/api/admin/orders/[id]/cancel/route.ts +++ b/packages/medusa/src/api/admin/orders/[id]/cancel/route.ts @@ -1,9 +1,9 @@ import { cancelOrderWorkflow } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/orders/[id]/changes/route.ts b/packages/medusa/src/api/admin/orders/[id]/changes/route.ts index a80e219c4b..063e3d4d6e 100644 --- a/packages/medusa/src/api/admin/orders/[id]/changes/route.ts +++ b/packages/medusa/src/api/admin/orders/[id]/changes/route.ts @@ -1,8 +1,8 @@ -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/orders/[id]/complete/route.ts b/packages/medusa/src/api/admin/orders/[id]/complete/route.ts index 0f64ec681f..d00dd65a42 100644 --- a/packages/medusa/src/api/admin/orders/[id]/complete/route.ts +++ b/packages/medusa/src/api/admin/orders/[id]/complete/route.ts @@ -1,9 +1,9 @@ -import { AdditionalData, HttpTypes } from "@medusajs/types" +import { AdditionalData, HttpTypes } from "@medusajs/framework/types" import { completeOrderWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/orders/[id]/fulfillments/[fulfillment_id]/cancel/route.ts b/packages/medusa/src/api/admin/orders/[id]/fulfillments/[fulfillment_id]/cancel/route.ts index 9e8aab2127..99fe6248e9 100644 --- a/packages/medusa/src/api/admin/orders/[id]/fulfillments/[fulfillment_id]/cancel/route.ts +++ b/packages/medusa/src/api/admin/orders/[id]/fulfillments/[fulfillment_id]/cancel/route.ts @@ -1,9 +1,9 @@ import { cancelOrderFulfillmentWorkflow } from "@medusajs/core-flows" -import { AdditionalData, HttpTypes } from "@medusajs/types" +import { AdditionalData, HttpTypes } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/orders/[id]/fulfillments/[fulfillment_id]/mark-as-delivered/route.ts b/packages/medusa/src/api/admin/orders/[id]/fulfillments/[fulfillment_id]/mark-as-delivered/route.ts index 38775f1648..dc3cccbc65 100644 --- a/packages/medusa/src/api/admin/orders/[id]/fulfillments/[fulfillment_id]/mark-as-delivered/route.ts +++ b/packages/medusa/src/api/admin/orders/[id]/fulfillments/[fulfillment_id]/mark-as-delivered/route.ts @@ -1,5 +1,5 @@ import { markOrderFulfillmentAsDeliveredWorkflow } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/orders/[id]/fulfillments/[fulfillment_id]/shipments/route.ts b/packages/medusa/src/api/admin/orders/[id]/fulfillments/[fulfillment_id]/shipments/route.ts index 9f9b977687..9e13d3b5f2 100644 --- a/packages/medusa/src/api/admin/orders/[id]/fulfillments/[fulfillment_id]/shipments/route.ts +++ b/packages/medusa/src/api/admin/orders/[id]/fulfillments/[fulfillment_id]/shipments/route.ts @@ -2,13 +2,13 @@ import { createOrderShipmentWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../../types/routing" import { AdminOrderCreateShipmentType } from "../../../../validators" -import { AdditionalData, HttpTypes } from "@medusajs/types" +import { AdditionalData, HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest< diff --git a/packages/medusa/src/api/admin/orders/[id]/fulfillments/route.ts b/packages/medusa/src/api/admin/orders/[id]/fulfillments/route.ts index 3ac9c52ee0..43386fafe9 100644 --- a/packages/medusa/src/api/admin/orders/[id]/fulfillments/route.ts +++ b/packages/medusa/src/api/admin/orders/[id]/fulfillments/route.ts @@ -1,9 +1,9 @@ import { createOrderFulfillmentWorkflow } from "@medusajs/core-flows" -import { AdditionalData, HttpTypes } from "@medusajs/types" +import { AdditionalData, HttpTypes } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/orders/[id]/preview/route.ts b/packages/medusa/src/api/admin/orders/[id]/preview/route.ts index c4fd8f0423..65807ffb5d 100644 --- a/packages/medusa/src/api/admin/orders/[id]/preview/route.ts +++ b/packages/medusa/src/api/admin/orders/[id]/preview/route.ts @@ -1,5 +1,5 @@ -import { HttpTypes } from "@medusajs/types" -import { Modules } from "@medusajs/utils" +import { HttpTypes } from "@medusajs/framework/types" +import { Modules } from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/orders/[id]/route.ts b/packages/medusa/src/api/admin/orders/[id]/route.ts index d31a055f6d..790281ee80 100644 --- a/packages/medusa/src/api/admin/orders/[id]/route.ts +++ b/packages/medusa/src/api/admin/orders/[id]/route.ts @@ -2,12 +2,12 @@ import { getOrderDetailWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../types/routing" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/orders/middlewares.ts b/packages/medusa/src/api/admin/orders/middlewares.ts index 8516de3a82..fbd2b97097 100644 --- a/packages/medusa/src/api/admin/orders/middlewares.ts +++ b/packages/medusa/src/api/admin/orders/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" import * as QueryConfig from "./query-config" diff --git a/packages/medusa/src/api/admin/orders/route.ts b/packages/medusa/src/api/admin/orders/route.ts index 6440833a7c..acad912c77 100644 --- a/packages/medusa/src/api/admin/orders/route.ts +++ b/packages/medusa/src/api/admin/orders/route.ts @@ -1,5 +1,5 @@ import { getOrdersListWorkflow } from "@medusajs/core-flows" -import { HttpTypes, OrderDTO } from "@medusajs/types" +import { HttpTypes, OrderDTO } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/payment-collections/[id]/mark-as-paid/route.ts b/packages/medusa/src/api/admin/payment-collections/[id]/mark-as-paid/route.ts index 46767f49b7..43ffcd1224 100644 --- a/packages/medusa/src/api/admin/payment-collections/[id]/mark-as-paid/route.ts +++ b/packages/medusa/src/api/admin/payment-collections/[id]/mark-as-paid/route.ts @@ -1,5 +1,5 @@ import { markPaymentCollectionAsPaid } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/payment-collections/[id]/route.ts b/packages/medusa/src/api/admin/payment-collections/[id]/route.ts index 406cefba30..d24e2fc763 100644 --- a/packages/medusa/src/api/admin/payment-collections/[id]/route.ts +++ b/packages/medusa/src/api/admin/payment-collections/[id]/route.ts @@ -1,5 +1,5 @@ import { deleteOrderPaymentCollections } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/payment-collections/middlewares.ts b/packages/medusa/src/api/admin/payment-collections/middlewares.ts index 9ab5f65199..c66ca87290 100644 --- a/packages/medusa/src/api/admin/payment-collections/middlewares.ts +++ b/packages/medusa/src/api/admin/payment-collections/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" import * as queryConfig from "./query-config" diff --git a/packages/medusa/src/api/admin/payment-collections/route.ts b/packages/medusa/src/api/admin/payment-collections/route.ts index 09b4b132d6..a89de99f9e 100644 --- a/packages/medusa/src/api/admin/payment-collections/route.ts +++ b/packages/medusa/src/api/admin/payment-collections/route.ts @@ -1,5 +1,5 @@ import { createOrderPaymentCollectionWorkflow } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/payments/[id]/capture/route.ts b/packages/medusa/src/api/admin/payments/[id]/capture/route.ts index a0a3356ebd..7f9c5d8e8e 100644 --- a/packages/medusa/src/api/admin/payments/[id]/capture/route.ts +++ b/packages/medusa/src/api/admin/payments/[id]/capture/route.ts @@ -5,7 +5,7 @@ import { } from "../../../../../types/routing" import { refetchPayment } from "../../helpers" import { AdminCreatePaymentCaptureType } from "../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/payments/[id]/refund/route.ts b/packages/medusa/src/api/admin/payments/[id]/refund/route.ts index fe31792047..27b266bbbb 100644 --- a/packages/medusa/src/api/admin/payments/[id]/refund/route.ts +++ b/packages/medusa/src/api/admin/payments/[id]/refund/route.ts @@ -5,7 +5,7 @@ import { } from "../../../../../types/routing" import { refetchPayment } from "../../helpers" import { AdminCreatePaymentRefundType } from "../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/payments/[id]/route.ts b/packages/medusa/src/api/admin/payments/[id]/route.ts index 14ccd30af1..b94e391e35 100644 --- a/packages/medusa/src/api/admin/payments/[id]/route.ts +++ b/packages/medusa/src/api/admin/payments/[id]/route.ts @@ -4,7 +4,7 @@ import { } from "../../../../types/routing" import { AdminGetPaymentParamsType } from "../validators" import { refetchPayment } from "../helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/payments/helpers.ts b/packages/medusa/src/api/admin/payments/helpers.ts index 36f83ae660..e4ed177ea6 100644 --- a/packages/medusa/src/api/admin/payments/helpers.ts +++ b/packages/medusa/src/api/admin/payments/helpers.ts @@ -1,8 +1,8 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const refetchPayment = async ( paymentId: string, diff --git a/packages/medusa/src/api/admin/payments/middlewares.ts b/packages/medusa/src/api/admin/payments/middlewares.ts index 59b3173008..cc70a29201 100644 --- a/packages/medusa/src/api/admin/payments/middlewares.ts +++ b/packages/medusa/src/api/admin/payments/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { unlessPath } from "../../utils/unless-path" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" diff --git a/packages/medusa/src/api/admin/payments/payment-providers/route.ts b/packages/medusa/src/api/admin/payments/payment-providers/route.ts index c995af289d..043210e208 100644 --- a/packages/medusa/src/api/admin/payments/payment-providers/route.ts +++ b/packages/medusa/src/api/admin/payments/payment-providers/route.ts @@ -1,4 +1,4 @@ -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, @@ -6,7 +6,7 @@ import { import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/payments/route.ts b/packages/medusa/src/api/admin/payments/route.ts index 4646e08dc7..b2d2f6a8ba 100644 --- a/packages/medusa/src/api/admin/payments/route.ts +++ b/packages/medusa/src/api/admin/payments/route.ts @@ -1,12 +1,12 @@ import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../types/routing" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/price-lists/[id]/prices/batch/route.ts b/packages/medusa/src/api/admin/price-lists/[id]/prices/batch/route.ts index e3194c9a4f..4894ac944d 100644 --- a/packages/medusa/src/api/admin/price-lists/[id]/prices/batch/route.ts +++ b/packages/medusa/src/api/admin/price-lists/[id]/prices/batch/route.ts @@ -1,11 +1,11 @@ -import { promiseAll } from "@medusajs/utils" +import { promiseAll } from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../types/routing" import { listPrices } from "../../../queries" import { adminPriceListPriceRemoteQueryFields } from "../../../query-config" -import { BatchMethodRequest, HttpTypes } from "@medusajs/types" +import { BatchMethodRequest, HttpTypes } from "@medusajs/framework/types" import { AdminCreatePriceListPriceType, AdminUpdatePriceListPriceType, diff --git a/packages/medusa/src/api/admin/price-lists/[id]/products/route.ts b/packages/medusa/src/api/admin/price-lists/[id]/products/route.ts index cdd3f20da9..0b27a1667a 100644 --- a/packages/medusa/src/api/admin/price-lists/[id]/products/route.ts +++ b/packages/medusa/src/api/admin/price-lists/[id]/products/route.ts @@ -1,6 +1,6 @@ import { batchPriceListPricesWorkflow } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" -import { MedusaError } from "@medusajs/utils" +import { HttpTypes } from "@medusajs/framework/types" +import { MedusaError } from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/price-lists/[id]/route.ts b/packages/medusa/src/api/admin/price-lists/[id]/route.ts index 4c99816461..bf0d3f235a 100644 --- a/packages/medusa/src/api/admin/price-lists/[id]/route.ts +++ b/packages/medusa/src/api/admin/price-lists/[id]/route.ts @@ -8,7 +8,7 @@ import { } from "../../../../types/routing" import { fetchPriceList } from "../helpers" import { AdminUpdatePriceListType } from "../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/price-lists/helpers.ts b/packages/medusa/src/api/admin/price-lists/helpers.ts index 0e05563894..1d7adc348c 100644 --- a/packages/medusa/src/api/admin/price-lists/helpers.ts +++ b/packages/medusa/src/api/admin/price-lists/helpers.ts @@ -1,4 +1,4 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { buildPriceListRules, buildPriceSetPricesForCore, @@ -6,7 +6,7 @@ import { isPresent, MedusaError, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const fetchPriceList = async ( id: string, diff --git a/packages/medusa/src/api/admin/price-lists/middlewares.ts b/packages/medusa/src/api/admin/price-lists/middlewares.ts index 45fe2d0078..c6d6b7b76e 100644 --- a/packages/medusa/src/api/admin/price-lists/middlewares.ts +++ b/packages/medusa/src/api/admin/price-lists/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" import { createBatchBody } from "../../utils/validators" diff --git a/packages/medusa/src/api/admin/price-lists/queries/get-price-list.ts b/packages/medusa/src/api/admin/price-lists/queries/get-price-list.ts index 5a75fa0cbf..88f4898bd3 100644 --- a/packages/medusa/src/api/admin/price-lists/queries/get-price-list.ts +++ b/packages/medusa/src/api/admin/price-lists/queries/get-price-list.ts @@ -1,10 +1,10 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, MedusaError, isPresent, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AdminPriceListRemoteQueryDTO } from "../types" import { buildPriceListResponse } from "./" diff --git a/packages/medusa/src/api/admin/price-lists/queries/index.ts b/packages/medusa/src/api/admin/price-lists/queries/index.ts index d961a7eedb..4140e7f741 100644 --- a/packages/medusa/src/api/admin/price-lists/queries/index.ts +++ b/packages/medusa/src/api/admin/price-lists/queries/index.ts @@ -1,7 +1,7 @@ import { buildPriceListRules, buildPriceSetPricesForCore, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { cleanResponseData } from "../../../../utils/clean-response-data" import { AdminPriceListRemoteQueryDTO } from "../types" diff --git a/packages/medusa/src/api/admin/price-lists/queries/list-price-lists.ts b/packages/medusa/src/api/admin/price-lists/queries/list-price-lists.ts index 8ef674df0a..4f244fd8d7 100644 --- a/packages/medusa/src/api/admin/price-lists/queries/list-price-lists.ts +++ b/packages/medusa/src/api/admin/price-lists/queries/list-price-lists.ts @@ -1,8 +1,8 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AdminPriceListRemoteQueryDTO } from "../types" export async function listPriceLists({ diff --git a/packages/medusa/src/api/admin/price-lists/queries/list-prices.ts b/packages/medusa/src/api/admin/price-lists/queries/list-prices.ts index 43dd4eab50..4d63ca0d8f 100644 --- a/packages/medusa/src/api/admin/price-lists/queries/list-prices.ts +++ b/packages/medusa/src/api/admin/price-lists/queries/list-prices.ts @@ -1,8 +1,8 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const listPrices = async ( ids: string[], diff --git a/packages/medusa/src/api/admin/price-lists/route.ts b/packages/medusa/src/api/admin/price-lists/route.ts index dea51b773a..e5d959bc01 100644 --- a/packages/medusa/src/api/admin/price-lists/route.ts +++ b/packages/medusa/src/api/admin/price-lists/route.ts @@ -2,14 +2,14 @@ import { createPriceListsWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../types/routing" import { fetchPriceList, transformPriceList } from "./helpers" import { AdminCreatePriceListType } from "./validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/price-lists/types.ts b/packages/medusa/src/api/admin/price-lists/types.ts index 67ea8d3402..7a2b0c66f8 100644 --- a/packages/medusa/src/api/admin/price-lists/types.ts +++ b/packages/medusa/src/api/admin/price-lists/types.ts @@ -1,4 +1,4 @@ -import { PriceListStatus, PriceListType } from "@medusajs/types" +import { PriceListStatus, PriceListType } from "@medusajs/framework/types" export type AdminPriceListRemoteQueryDTO = { id: string diff --git a/packages/medusa/src/api/admin/price-lists/validators.ts b/packages/medusa/src/api/admin/price-lists/validators.ts index c1f7895ef1..beac237d97 100644 --- a/packages/medusa/src/api/admin/price-lists/validators.ts +++ b/packages/medusa/src/api/admin/price-lists/validators.ts @@ -1,4 +1,4 @@ -import { PriceListStatus, PriceListType } from "@medusajs/utils" +import { PriceListStatus, PriceListType } from "@medusajs/framework/utils" import { z } from "zod" import { createFindParams, diff --git a/packages/medusa/src/api/admin/price-preferences/[id]/route.ts b/packages/medusa/src/api/admin/price-preferences/[id]/route.ts index ac0811a78f..f07eb7a5a8 100644 --- a/packages/medusa/src/api/admin/price-preferences/[id]/route.ts +++ b/packages/medusa/src/api/admin/price-preferences/[id]/route.ts @@ -3,7 +3,7 @@ import { updatePricePreferencesWorkflow, } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/price-preferences/middlewares.ts b/packages/medusa/src/api/admin/price-preferences/middlewares.ts index f90e2584d6..32d1a57cee 100644 --- a/packages/medusa/src/api/admin/price-preferences/middlewares.ts +++ b/packages/medusa/src/api/admin/price-preferences/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" import * as QueryConfig from "./query-config" diff --git a/packages/medusa/src/api/admin/price-preferences/route.ts b/packages/medusa/src/api/admin/price-preferences/route.ts index b7409c7582..9dba160271 100644 --- a/packages/medusa/src/api/admin/price-preferences/route.ts +++ b/packages/medusa/src/api/admin/price-preferences/route.ts @@ -1,4 +1,4 @@ -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/product-categories/[id]/products/route.ts b/packages/medusa/src/api/admin/product-categories/[id]/products/route.ts index f27719463e..51055da1fb 100644 --- a/packages/medusa/src/api/admin/product-categories/[id]/products/route.ts +++ b/packages/medusa/src/api/admin/product-categories/[id]/products/route.ts @@ -2,7 +2,7 @@ import { batchLinkProductsToCategoryWorkflow } from "@medusajs/core-flows" import { AdminProductCategoryResponse, LinkMethodRequest, -} from "@medusajs/types" +} from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/product-categories/[id]/route.ts b/packages/medusa/src/api/admin/product-categories/[id]/route.ts index 25ef906faf..c106169cb3 100644 --- a/packages/medusa/src/api/admin/product-categories/[id]/route.ts +++ b/packages/medusa/src/api/admin/product-categories/[id]/route.ts @@ -2,7 +2,10 @@ import { deleteProductCategoriesWorkflow, updateProductCategoriesWorkflow, } from "@medusajs/core-flows" -import { AdminProductCategoryResponse, HttpTypes } from "@medusajs/types" +import { + AdminProductCategoryResponse, + HttpTypes, +} from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, @@ -12,7 +15,7 @@ import { AdminProductCategoryParamsType, AdminUpdateProductCategoryType, } from "../validators" -import { MedusaError } from "@medusajs/utils" +import { MedusaError } from "@medusajs/framework/utils" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/product-categories/middlewares.ts b/packages/medusa/src/api/admin/product-categories/middlewares.ts index 77fa02d46b..2097accdbd 100644 --- a/packages/medusa/src/api/admin/product-categories/middlewares.ts +++ b/packages/medusa/src/api/admin/product-categories/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" import { createLinkBody } from "../../utils/validators" diff --git a/packages/medusa/src/api/admin/product-categories/route.ts b/packages/medusa/src/api/admin/product-categories/route.ts index 4eb2745343..36edad2b79 100644 --- a/packages/medusa/src/api/admin/product-categories/route.ts +++ b/packages/medusa/src/api/admin/product-categories/route.ts @@ -1,5 +1,5 @@ import { createProductCategoriesWorkflow } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/product-tags/[id]/route.ts b/packages/medusa/src/api/admin/product-tags/[id]/route.ts index 6cafa71b39..7c88a5f5b0 100644 --- a/packages/medusa/src/api/admin/product-tags/[id]/route.ts +++ b/packages/medusa/src/api/admin/product-tags/[id]/route.ts @@ -12,8 +12,8 @@ import { AdminUpdateProductTagType, } from "../validators" import { refetchEntity } from "../../../utils/refetch-entity" -import { HttpTypes } from "@medusajs/types" -import { MedusaError } from "@medusajs/utils" +import { HttpTypes } from "@medusajs/framework/types" +import { MedusaError } from "@medusajs/framework/utils" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/product-tags/middlewares.ts b/packages/medusa/src/api/admin/product-tags/middlewares.ts index bbfe02af64..b064f893ac 100644 --- a/packages/medusa/src/api/admin/product-tags/middlewares.ts +++ b/packages/medusa/src/api/admin/product-tags/middlewares.ts @@ -1,5 +1,5 @@ import * as QueryConfig from "./query-config" -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformQuery } from "../../utils/validate-query" import { AdminCreateProductTag, diff --git a/packages/medusa/src/api/admin/product-tags/route.ts b/packages/medusa/src/api/admin/product-tags/route.ts index f586d101cf..d50a06f100 100644 --- a/packages/medusa/src/api/admin/product-tags/route.ts +++ b/packages/medusa/src/api/admin/product-tags/route.ts @@ -5,7 +5,7 @@ import { import { createProductTagsWorkflow } from "@medusajs/core-flows" import { refetchEntities, refetchEntity } from "../../utils/refetch-entity" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/product-types/[id]/route.ts b/packages/medusa/src/api/admin/product-types/[id]/route.ts index 312761d41b..a6c133dd9d 100644 --- a/packages/medusa/src/api/admin/product-types/[id]/route.ts +++ b/packages/medusa/src/api/admin/product-types/[id]/route.ts @@ -12,8 +12,8 @@ import { AdminGetProductTypeParamsType, AdminUpdateProductTypeType, } from "../validators" -import { HttpTypes } from "@medusajs/types" -import { MedusaError } from "@medusajs/utils" +import { HttpTypes } from "@medusajs/framework/types" +import { MedusaError } from "@medusajs/framework/utils" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/product-types/helpers.ts b/packages/medusa/src/api/admin/product-types/helpers.ts index 0ef85a0bc1..e19e3a8001 100644 --- a/packages/medusa/src/api/admin/product-types/helpers.ts +++ b/packages/medusa/src/api/admin/product-types/helpers.ts @@ -1,8 +1,8 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const refetchProductType = async ( productTypeId: string, diff --git a/packages/medusa/src/api/admin/product-types/middlewares.ts b/packages/medusa/src/api/admin/product-types/middlewares.ts index aa5bb52c24..9d0b68497f 100644 --- a/packages/medusa/src/api/admin/product-types/middlewares.ts +++ b/packages/medusa/src/api/admin/product-types/middlewares.ts @@ -1,5 +1,5 @@ import * as QueryConfig from "./query-config" -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformQuery } from "../../utils/validate-query" import { AdminCreateProductType, diff --git a/packages/medusa/src/api/admin/product-types/route.ts b/packages/medusa/src/api/admin/product-types/route.ts index 949585ee2f..3ed14936e7 100644 --- a/packages/medusa/src/api/admin/product-types/route.ts +++ b/packages/medusa/src/api/admin/product-types/route.ts @@ -6,10 +6,10 @@ import { import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { createProductTypesWorkflow } from "@medusajs/core-flows" import { refetchProductType } from "./helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/product-variants/middlewares.ts b/packages/medusa/src/api/admin/product-variants/middlewares.ts index 9c280f59f1..c950e2c9c7 100644 --- a/packages/medusa/src/api/admin/product-variants/middlewares.ts +++ b/packages/medusa/src/api/admin/product-variants/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformQuery } from "../../utils/validate-query" import * as QueryConfig from "./query-config" import { AdminGetProductVariantsParams } from "./validators" diff --git a/packages/medusa/src/api/admin/product-variants/route.ts b/packages/medusa/src/api/admin/product-variants/route.ts index 602226e7eb..6bf0e5d927 100644 --- a/packages/medusa/src/api/admin/product-variants/route.ts +++ b/packages/medusa/src/api/admin/product-variants/route.ts @@ -1,5 +1,8 @@ -import { AuthenticatedMedusaRequest, MedusaResponse } from "@medusajs/framework" -import { HttpTypes } from "@medusajs/types" +import { + AuthenticatedMedusaRequest, + MedusaResponse, +} from "@medusajs/framework/http" +import { HttpTypes } from "@medusajs/framework/types" import { wrapVariantsWithInventoryQuantity } from "../../utils/middlewares" import { refetchEntities } from "../../utils/refetch-entity" import { remapKeysForVariant, remapVariantResponse } from "../products/helpers" diff --git a/packages/medusa/src/api/admin/products/[id]/options/[option_id]/route.ts b/packages/medusa/src/api/admin/products/[id]/options/[option_id]/route.ts index 9d11100f1f..e7a83b067a 100644 --- a/packages/medusa/src/api/admin/products/[id]/options/[option_id]/route.ts +++ b/packages/medusa/src/api/admin/products/[id]/options/[option_id]/route.ts @@ -8,7 +8,7 @@ import { } from "@medusajs/core-flows" import { remapKeysForProduct, remapProductResponse } from "../../../helpers" -import { AdditionalData, HttpTypes } from "@medusajs/types" +import { AdditionalData, HttpTypes } from "@medusajs/framework/types" import { refetchEntity } from "../../../../../utils/refetch-entity" export const GET = async ( diff --git a/packages/medusa/src/api/admin/products/[id]/options/route.ts b/packages/medusa/src/api/admin/products/[id]/options/route.ts index 68d3e1a527..3d190e8842 100644 --- a/packages/medusa/src/api/admin/products/[id]/options/route.ts +++ b/packages/medusa/src/api/admin/products/[id]/options/route.ts @@ -5,7 +5,7 @@ import { import { createProductOptionsWorkflow } from "@medusajs/core-flows" import { remapKeysForProduct, remapProductResponse } from "../../helpers" -import { AdditionalData, HttpTypes } from "@medusajs/types" +import { AdditionalData, HttpTypes } from "@medusajs/framework/types" import { refetchEntities, refetchEntity, diff --git a/packages/medusa/src/api/admin/products/[id]/route.ts b/packages/medusa/src/api/admin/products/[id]/route.ts index 79f07bba94..c5a3151944 100644 --- a/packages/medusa/src/api/admin/products/[id]/route.ts +++ b/packages/medusa/src/api/admin/products/[id]/route.ts @@ -7,8 +7,8 @@ import { MedusaResponse, } from "../../../../types/routing" import { remapKeysForProduct, remapProductResponse } from "../helpers" -import { MedusaError } from "@medusajs/utils" -import { AdditionalData, HttpTypes } from "@medusajs/types" +import { MedusaError } from "@medusajs/framework/utils" +import { AdditionalData, HttpTypes } from "@medusajs/framework/types" import { refetchEntity } from "../../../utils/refetch-entity" export const GET = async ( diff --git a/packages/medusa/src/api/admin/products/[id]/variants/[variant_id]/inventory-items/[inventory_item_id]/route.ts b/packages/medusa/src/api/admin/products/[id]/variants/[variant_id]/inventory-items/[inventory_item_id]/route.ts index 0e837f4b0a..7770d7c58f 100644 --- a/packages/medusa/src/api/admin/products/[id]/variants/[variant_id]/inventory-items/[inventory_item_id]/route.ts +++ b/packages/medusa/src/api/admin/products/[id]/variants/[variant_id]/inventory-items/[inventory_item_id]/route.ts @@ -1,12 +1,12 @@ import { dismissLinksWorkflow, updateLinksWorkflow } from "@medusajs/core-flows" -import { Modules } from "@medusajs/utils" +import { Modules } from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../../../types/routing" import { refetchVariant } from "../../../../../helpers" import { AdminUpdateVariantInventoryItemType } from "../../../../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/products/[id]/variants/[variant_id]/inventory-items/route.ts b/packages/medusa/src/api/admin/products/[id]/variants/[variant_id]/inventory-items/route.ts index cf0a333048..af52142fb3 100644 --- a/packages/medusa/src/api/admin/products/[id]/variants/[variant_id]/inventory-items/route.ts +++ b/packages/medusa/src/api/admin/products/[id]/variants/[variant_id]/inventory-items/route.ts @@ -1,12 +1,12 @@ import { createLinksWorkflow } from "@medusajs/core-flows" -import { Modules } from "@medusajs/utils" +import { Modules } from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../../types/routing" import { refetchVariant } from "../../../../helpers" import { AdminCreateVariantInventoryItemType } from "../../../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/products/[id]/variants/[variant_id]/route.ts b/packages/medusa/src/api/admin/products/[id]/variants/[variant_id]/route.ts index 296da43b07..511f40c30d 100644 --- a/packages/medusa/src/api/admin/products/[id]/variants/[variant_id]/route.ts +++ b/packages/medusa/src/api/admin/products/[id]/variants/[variant_id]/route.ts @@ -7,7 +7,7 @@ import { MedusaResponse, } from "../../../../../../types/routing" -import { AdditionalData, HttpTypes } from "@medusajs/types" +import { AdditionalData, HttpTypes } from "@medusajs/framework/types" import { refetchEntity } from "../../../../../utils/refetch-entity" import { remapKeysForProduct, diff --git a/packages/medusa/src/api/admin/products/[id]/variants/batch/route.ts b/packages/medusa/src/api/admin/products/[id]/variants/batch/route.ts index 8e1ab555b6..d43b9cef49 100644 --- a/packages/medusa/src/api/admin/products/[id]/variants/batch/route.ts +++ b/packages/medusa/src/api/admin/products/[id]/variants/batch/route.ts @@ -4,7 +4,7 @@ import { MedusaResponse, } from "../../../../../../types/routing" import { refetchBatchVariants, remapVariantResponse } from "../../../helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/products/[id]/variants/inventory-items/batch/route.ts b/packages/medusa/src/api/admin/products/[id]/variants/inventory-items/batch/route.ts index d4b5ad4af3..a3fe3fe532 100644 --- a/packages/medusa/src/api/admin/products/[id]/variants/inventory-items/batch/route.ts +++ b/packages/medusa/src/api/admin/products/[id]/variants/inventory-items/batch/route.ts @@ -5,7 +5,7 @@ import { } from "../../../../../../../types/routing" import { buildBatchVariantInventoryData } from "../../../../helpers" import { AdminBatchVariantInventoryItemsType } from "../../../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/products/[id]/variants/route.ts b/packages/medusa/src/api/admin/products/[id]/variants/route.ts index 13d2d84370..04f1ca2c4e 100644 --- a/packages/medusa/src/api/admin/products/[id]/variants/route.ts +++ b/packages/medusa/src/api/admin/products/[id]/variants/route.ts @@ -1,5 +1,5 @@ import { createProductVariantsWorkflow } from "@medusajs/core-flows" -import { AdditionalData, HttpTypes } from "@medusajs/types" +import { AdditionalData, HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/products/batch/route.ts b/packages/medusa/src/api/admin/products/batch/route.ts index 18b8d8beb3..bd01bb54de 100644 --- a/packages/medusa/src/api/admin/products/batch/route.ts +++ b/packages/medusa/src/api/admin/products/batch/route.ts @@ -4,7 +4,7 @@ import { MedusaResponse, } from "../../../../types/routing" import { refetchBatchProducts, remapProductResponse } from "../helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/products/export/route.ts b/packages/medusa/src/api/admin/products/export/route.ts index 81309c7872..a61a3f5327 100644 --- a/packages/medusa/src/api/admin/products/export/route.ts +++ b/packages/medusa/src/api/admin/products/export/route.ts @@ -2,7 +2,7 @@ import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../types/routing" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { remapKeysForProduct } from "../helpers" import { exportProductsWorkflow } from "@medusajs/core-flows" diff --git a/packages/medusa/src/api/admin/products/helpers.ts b/packages/medusa/src/api/admin/products/helpers.ts index 19c0110fc7..364015bb01 100644 --- a/packages/medusa/src/api/admin/products/helpers.ts +++ b/packages/medusa/src/api/admin/products/helpers.ts @@ -7,13 +7,13 @@ import { PriceDTO, ProductDTO, ProductVariantDTO, -} from "@medusajs/types" +} from "@medusajs/framework/types" import { ContainerRegistrationKeys, Modules, promiseAll, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AdminBatchVariantInventoryItemsType } from "./validators" const isPricing = (fieldName: string) => diff --git a/packages/medusa/src/api/admin/products/import/[transaction_id]/confirm/route.ts b/packages/medusa/src/api/admin/products/import/[transaction_id]/confirm/route.ts index 294db0a8cf..c57fc247c4 100644 --- a/packages/medusa/src/api/admin/products/import/[transaction_id]/confirm/route.ts +++ b/packages/medusa/src/api/admin/products/import/[transaction_id]/confirm/route.ts @@ -7,9 +7,9 @@ import { importProductsWorkflowId, waitConfirmationProductImportStepId, } from "@medusajs/core-flows" -import { IWorkflowEngineService } from "@medusajs/types" -import { Modules, TransactionHandlerType } from "@medusajs/utils" -import { StepResponse } from "@medusajs/workflows-sdk" +import { IWorkflowEngineService } from "@medusajs/framework/types" +import { Modules, TransactionHandlerType } from "@medusajs/framework/utils" +import { StepResponse } from "@medusajs/framework/workflows-sdk" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/products/import/route.ts b/packages/medusa/src/api/admin/products/import/route.ts index 8c112e16f7..a61255fdce 100644 --- a/packages/medusa/src/api/admin/products/import/route.ts +++ b/packages/medusa/src/api/admin/products/import/route.ts @@ -2,8 +2,8 @@ import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../types/routing" -import { HttpTypes } from "@medusajs/types" -import { MedusaError } from "@medusajs/utils" +import { HttpTypes } from "@medusajs/framework/types" +import { MedusaError } from "@medusajs/framework/utils" import { importProductsWorkflow } from "@medusajs/core-flows" export const POST = async ( diff --git a/packages/medusa/src/api/admin/products/middlewares.ts b/packages/medusa/src/api/admin/products/middlewares.ts index 34669e830d..96154358fd 100644 --- a/packages/medusa/src/api/admin/products/middlewares.ts +++ b/packages/medusa/src/api/admin/products/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { maybeApplyLinkFilter } from "../../utils/maybe-apply-link-filter" import { unlessPath } from "../../utils/unless-path" import { validateAndTransformBody } from "../../utils/validate-body" diff --git a/packages/medusa/src/api/admin/products/route.ts b/packages/medusa/src/api/admin/products/route.ts index 79245cf909..3bbfb9a626 100644 --- a/packages/medusa/src/api/admin/products/route.ts +++ b/packages/medusa/src/api/admin/products/route.ts @@ -1,5 +1,5 @@ import { createProductsWorkflow } from "@medusajs/core-flows" -import { AdditionalData, HttpTypes } from "@medusajs/types" +import { AdditionalData, HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/products/utils/maybe-apply-price-lists-filter.ts b/packages/medusa/src/api/admin/products/utils/maybe-apply-price-lists-filter.ts index 3edbf4e7be..95af0c866e 100644 --- a/packages/medusa/src/api/admin/products/utils/maybe-apply-price-lists-filter.ts +++ b/packages/medusa/src/api/admin/products/utils/maybe-apply-price-lists-filter.ts @@ -1,8 +1,8 @@ -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { NextFunction } from "express" import { MedusaRequest } from "../../../../types/routing" diff --git a/packages/medusa/src/api/admin/products/validators.ts b/packages/medusa/src/api/admin/products/validators.ts index 0332f54600..2b63ebed97 100644 --- a/packages/medusa/src/api/admin/products/validators.ts +++ b/packages/medusa/src/api/admin/products/validators.ts @@ -1,5 +1,5 @@ -import { BatchMethodRequest } from "@medusajs/types" -import { ProductStatus } from "@medusajs/utils" +import { BatchMethodRequest } from "@medusajs/framework/types" +import { ProductStatus } from "@medusajs/framework/utils" import { z } from "zod" import { booleanString, diff --git a/packages/medusa/src/api/admin/promotions/[id]/[rule_type]/route.ts b/packages/medusa/src/api/admin/promotions/[id]/[rule_type]/route.ts index dc19c54722..dd85771868 100644 --- a/packages/medusa/src/api/admin/promotions/[id]/[rule_type]/route.ts +++ b/packages/medusa/src/api/admin/promotions/[id]/[rule_type]/route.ts @@ -1,10 +1,10 @@ -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, RuleOperator, RuleType, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/promotions/[id]/buy-rules/batch/route.ts b/packages/medusa/src/api/admin/promotions/[id]/buy-rules/batch/route.ts index 09777bf835..c4e42c7d3a 100644 --- a/packages/medusa/src/api/admin/promotions/[id]/buy-rules/batch/route.ts +++ b/packages/medusa/src/api/admin/promotions/[id]/buy-rules/batch/route.ts @@ -3,12 +3,12 @@ import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../types/routing" -import { BatchMethodRequest, HttpTypes } from "@medusajs/types" +import { BatchMethodRequest, HttpTypes } from "@medusajs/framework/types" import { AdminCreatePromotionRuleType, AdminUpdatePromotionRuleType, } from "../../../validators" -import { RuleType } from "@medusajs/utils" +import { RuleType } from "@medusajs/framework/utils" import { refetchBatchRules } from "../../../helpers" export const POST = async ( diff --git a/packages/medusa/src/api/admin/promotions/[id]/route.ts b/packages/medusa/src/api/admin/promotions/[id]/route.ts index 33b5b30301..8241b4dfd6 100644 --- a/packages/medusa/src/api/admin/promotions/[id]/route.ts +++ b/packages/medusa/src/api/admin/promotions/[id]/route.ts @@ -6,7 +6,7 @@ import { ContainerRegistrationKeys, MedusaError, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, @@ -16,7 +16,7 @@ import { AdminGetPromotionParamsType, AdminUpdatePromotionType, } from "../validators" -import { AdditionalData, HttpTypes } from "@medusajs/types" +import { AdditionalData, HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/promotions/[id]/rules/batch/route.ts b/packages/medusa/src/api/admin/promotions/[id]/rules/batch/route.ts index 9cb63edfe3..e1369d3ea9 100644 --- a/packages/medusa/src/api/admin/promotions/[id]/rules/batch/route.ts +++ b/packages/medusa/src/api/admin/promotions/[id]/rules/batch/route.ts @@ -3,12 +3,12 @@ import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../types/routing" -import { BatchMethodRequest, HttpTypes } from "@medusajs/types" +import { BatchMethodRequest, HttpTypes } from "@medusajs/framework/types" import { AdminCreatePromotionRuleType, AdminUpdatePromotionRuleType, } from "../../../validators" -import { RuleType } from "@medusajs/utils" +import { RuleType } from "@medusajs/framework/utils" import { refetchBatchRules } from "../../../helpers" export const POST = async ( diff --git a/packages/medusa/src/api/admin/promotions/[id]/target-rules/batch/route.ts b/packages/medusa/src/api/admin/promotions/[id]/target-rules/batch/route.ts index 771c1ef1d5..51dd72de1d 100644 --- a/packages/medusa/src/api/admin/promotions/[id]/target-rules/batch/route.ts +++ b/packages/medusa/src/api/admin/promotions/[id]/target-rules/batch/route.ts @@ -3,12 +3,12 @@ import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../types/routing" -import { BatchMethodRequest, HttpTypes } from "@medusajs/types" +import { BatchMethodRequest, HttpTypes } from "@medusajs/framework/types" import { AdminCreatePromotionRuleType, AdminUpdatePromotionRuleType, } from "../../../validators" -import { RuleType } from "@medusajs/utils" +import { RuleType } from "@medusajs/framework/utils" import { refetchBatchRules } from "../../../helpers" export const POST = async ( diff --git a/packages/medusa/src/api/admin/promotions/helpers.ts b/packages/medusa/src/api/admin/promotions/helpers.ts index df24ee6a25..701b7a4a9f 100644 --- a/packages/medusa/src/api/admin/promotions/helpers.ts +++ b/packages/medusa/src/api/admin/promotions/helpers.ts @@ -1,10 +1,10 @@ -import { BatchMethodResponse, BatchResponse } from "@medusajs/types" -import { PromotionRuleDTO, MedusaContainer } from "@medusajs/types" +import { BatchMethodResponse, BatchResponse } from "@medusajs/framework/types" +import { PromotionRuleDTO, MedusaContainer } from "@medusajs/framework/types" import { promiseAll, ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const refetchPromotion = async ( promotionId: string, diff --git a/packages/medusa/src/api/admin/promotions/middlewares.ts b/packages/medusa/src/api/admin/promotions/middlewares.ts index d6787afbbf..b4492d0ace 100644 --- a/packages/medusa/src/api/admin/promotions/middlewares.ts +++ b/packages/medusa/src/api/admin/promotions/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { unlessPath } from "../../utils/unless-path" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" diff --git a/packages/medusa/src/api/admin/promotions/route.ts b/packages/medusa/src/api/admin/promotions/route.ts index 599d1401ab..7c6dd4d930 100644 --- a/packages/medusa/src/api/admin/promotions/route.ts +++ b/packages/medusa/src/api/admin/promotions/route.ts @@ -2,13 +2,13 @@ import { createPromotionsWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../types/routing" import { refetchPromotion } from "./helpers" -import { AdditionalData, HttpTypes } from "@medusajs/types" +import { AdditionalData, HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/promotions/rule-attribute-options/[rule_type]/route.ts b/packages/medusa/src/api/admin/promotions/rule-attribute-options/[rule_type]/route.ts index 322d65a8a2..fb4fca9319 100644 --- a/packages/medusa/src/api/admin/promotions/rule-attribute-options/[rule_type]/route.ts +++ b/packages/medusa/src/api/admin/promotions/rule-attribute-options/[rule_type]/route.ts @@ -1,4 +1,4 @@ -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/promotions/rule-value-options/[rule_type]/[rule_attribute_id]/route.ts b/packages/medusa/src/api/admin/promotions/rule-value-options/[rule_type]/[rule_attribute_id]/route.ts index 1c14de85e2..4e81869556 100644 --- a/packages/medusa/src/api/admin/promotions/rule-value-options/[rule_type]/[rule_attribute_id]/route.ts +++ b/packages/medusa/src/api/admin/promotions/rule-value-options/[rule_type]/[rule_attribute_id]/route.ts @@ -1,7 +1,7 @@ import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, @@ -12,7 +12,7 @@ import { validateRuleType, } from "../../../utils" import { AdminGetPromotionRuleParamsType } from "../../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" /* This endpoint returns all the potential values for rules (promotion rules, target rules and buy rules) diff --git a/packages/medusa/src/api/admin/promotions/utils/operators-map.ts b/packages/medusa/src/api/admin/promotions/utils/operators-map.ts index 254f6b6dde..32f56a461f 100644 --- a/packages/medusa/src/api/admin/promotions/utils/operators-map.ts +++ b/packages/medusa/src/api/admin/promotions/utils/operators-map.ts @@ -1,4 +1,4 @@ -import { RuleOperator } from "@medusajs/utils" +import { RuleOperator } from "@medusajs/framework/utils" export const operatorsMap = { [RuleOperator.IN]: { diff --git a/packages/medusa/src/api/admin/promotions/utils/rule-attributes-map.ts b/packages/medusa/src/api/admin/promotions/utils/rule-attributes-map.ts index 7c97740506..06e31bb436 100644 --- a/packages/medusa/src/api/admin/promotions/utils/rule-attributes-map.ts +++ b/packages/medusa/src/api/admin/promotions/utils/rule-attributes-map.ts @@ -2,7 +2,7 @@ import { ApplicationMethodType, PromotionType, RuleOperator, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { operatorsMap } from "./operators-map" export enum DisguisedRule { diff --git a/packages/medusa/src/api/admin/promotions/utils/validate-rule-attribute.ts b/packages/medusa/src/api/admin/promotions/utils/validate-rule-attribute.ts index 5fd2097adc..1e1aca135f 100644 --- a/packages/medusa/src/api/admin/promotions/utils/validate-rule-attribute.ts +++ b/packages/medusa/src/api/admin/promotions/utils/validate-rule-attribute.ts @@ -1,4 +1,4 @@ -import { MedusaError } from "@medusajs/utils" +import { MedusaError } from "@medusajs/framework/utils" import { getRuleAttributesMap } from "./rule-attributes-map" export function validateRuleAttribute(attributes: { diff --git a/packages/medusa/src/api/admin/promotions/utils/validate-rule-type.ts b/packages/medusa/src/api/admin/promotions/utils/validate-rule-type.ts index e2ec7f6d78..da12327f36 100644 --- a/packages/medusa/src/api/admin/promotions/utils/validate-rule-type.ts +++ b/packages/medusa/src/api/admin/promotions/utils/validate-rule-type.ts @@ -1,4 +1,4 @@ -import { MedusaError, RuleType } from "@medusajs/utils" +import { MedusaError, RuleType } from "@medusajs/framework/utils" const validRuleTypes: string[] = Object.values(RuleType) diff --git a/packages/medusa/src/api/admin/promotions/validators.ts b/packages/medusa/src/api/admin/promotions/validators.ts index f18d4f51f7..f26be86824 100644 --- a/packages/medusa/src/api/admin/promotions/validators.ts +++ b/packages/medusa/src/api/admin/promotions/validators.ts @@ -4,7 +4,7 @@ import { ApplicationMethodType, PromotionRuleOperator, PromotionType, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { z } from "zod" import { createFindParams, diff --git a/packages/medusa/src/api/admin/refund-reasons/[id]/route.ts b/packages/medusa/src/api/admin/refund-reasons/[id]/route.ts index 37d4b0e2c3..1b95b6b3cb 100644 --- a/packages/medusa/src/api/admin/refund-reasons/[id]/route.ts +++ b/packages/medusa/src/api/admin/refund-reasons/[id]/route.ts @@ -2,7 +2,7 @@ import { deleteReturnReasonsWorkflow, updateRefundReasonsWorkflow, } from "@medusajs/core-flows" -import { HttpTypes, RefundReasonResponse } from "@medusajs/types" +import { HttpTypes, RefundReasonResponse } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/refund-reasons/middlewares.ts b/packages/medusa/src/api/admin/refund-reasons/middlewares.ts index ebc49b9243..45d05e6c3c 100644 --- a/packages/medusa/src/api/admin/refund-reasons/middlewares.ts +++ b/packages/medusa/src/api/admin/refund-reasons/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" import * as queryConfig from "./query-config" diff --git a/packages/medusa/src/api/admin/refund-reasons/route.ts b/packages/medusa/src/api/admin/refund-reasons/route.ts index d18d045325..7aaddd0c38 100644 --- a/packages/medusa/src/api/admin/refund-reasons/route.ts +++ b/packages/medusa/src/api/admin/refund-reasons/route.ts @@ -1,12 +1,15 @@ import { createRefundReasonsWorkflow } from "@medusajs/core-flows" -import { AuthenticatedMedusaRequest, MedusaResponse } from "@medusajs/framework" +import { + AuthenticatedMedusaRequest, + MedusaResponse, +} from "@medusajs/framework/http" import { AdminCreateRefundReason, HttpTypes, PaginatedResponse, RefundReasonResponse, RefundReasonsResponse, -} from "@medusajs/types" +} from "@medusajs/framework/types" import { refetchEntities, refetchEntity } from "../../utils/refetch-entity" export const GET = async ( diff --git a/packages/medusa/src/api/admin/regions/[id]/route.ts b/packages/medusa/src/api/admin/regions/[id]/route.ts index 82565ba6bb..bf09bd902e 100644 --- a/packages/medusa/src/api/admin/regions/[id]/route.ts +++ b/packages/medusa/src/api/admin/regions/[id]/route.ts @@ -2,14 +2,14 @@ import { deleteRegionsWorkflow, updateRegionsWorkflow, } from "@medusajs/core-flows" -import { MedusaError } from "@medusajs/utils" +import { MedusaError } from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../types/routing" import { refetchRegion } from "../helpers" import { AdminGetRegionParamsType, AdminUpdateRegionType } from "../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/regions/helpers.ts b/packages/medusa/src/api/admin/regions/helpers.ts index 204a1814a3..b8c8391f8b 100644 --- a/packages/medusa/src/api/admin/regions/helpers.ts +++ b/packages/medusa/src/api/admin/regions/helpers.ts @@ -1,8 +1,8 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const refetchRegion = async ( regionId: string, diff --git a/packages/medusa/src/api/admin/regions/middlewares.ts b/packages/medusa/src/api/admin/regions/middlewares.ts index 3756d9ab76..5fe924e6a7 100644 --- a/packages/medusa/src/api/admin/regions/middlewares.ts +++ b/packages/medusa/src/api/admin/regions/middlewares.ts @@ -1,5 +1,5 @@ import * as QueryConfig from "./query-config" -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformQuery } from "../../utils/validate-query" import { AdminCreateRegion, diff --git a/packages/medusa/src/api/admin/regions/route.ts b/packages/medusa/src/api/admin/regions/route.ts index d10ec3f31f..c679c5e882 100644 --- a/packages/medusa/src/api/admin/regions/route.ts +++ b/packages/medusa/src/api/admin/regions/route.ts @@ -6,9 +6,9 @@ import { createRegionsWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { refetchRegion } from "./helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/reservations/[id]/route.ts b/packages/medusa/src/api/admin/reservations/[id]/route.ts index e2376a9623..8562790688 100644 --- a/packages/medusa/src/api/admin/reservations/[id]/route.ts +++ b/packages/medusa/src/api/admin/reservations/[id]/route.ts @@ -6,11 +6,11 @@ import { AdminGetReservationParamsType, AdminUpdateReservationType, } from "../validators" -import { MedusaError } from "@medusajs/utils" +import { MedusaError } from "@medusajs/framework/utils" import { deleteReservationsWorkflow } from "@medusajs/core-flows" import { updateReservationsWorkflow } from "@medusajs/core-flows" import { refetchReservation } from "../helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/reservations/helpers.ts b/packages/medusa/src/api/admin/reservations/helpers.ts index 93a4c8df0d..b5f0d48367 100644 --- a/packages/medusa/src/api/admin/reservations/helpers.ts +++ b/packages/medusa/src/api/admin/reservations/helpers.ts @@ -1,8 +1,8 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const refetchReservation = async ( reservationId: string, diff --git a/packages/medusa/src/api/admin/reservations/middlewares.ts b/packages/medusa/src/api/admin/reservations/middlewares.ts index 10cd60ed9e..a63ff4eb56 100644 --- a/packages/medusa/src/api/admin/reservations/middlewares.ts +++ b/packages/medusa/src/api/admin/reservations/middlewares.ts @@ -1,6 +1,6 @@ import * as QueryConfig from "./query-config" -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformQuery } from "../../utils/validate-query" import { AdminCreateReservation, diff --git a/packages/medusa/src/api/admin/reservations/route.ts b/packages/medusa/src/api/admin/reservations/route.ts index f8c1d7931a..75ff850e40 100644 --- a/packages/medusa/src/api/admin/reservations/route.ts +++ b/packages/medusa/src/api/admin/reservations/route.ts @@ -5,11 +5,11 @@ import { import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { createReservationsWorkflow } from "@medusajs/core-flows" import { refetchReservation } from "./helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/return-reasons/[id]/route.ts b/packages/medusa/src/api/admin/return-reasons/[id]/route.ts index 0f81be9479..eab259317c 100644 --- a/packages/medusa/src/api/admin/return-reasons/[id]/route.ts +++ b/packages/medusa/src/api/admin/return-reasons/[id]/route.ts @@ -2,12 +2,12 @@ import { deleteReturnReasonsWorkflow, updateReturnReasonsWorkflow, } from "@medusajs/core-flows" -import { AdminReturnReasonResponse, HttpTypes } from "@medusajs/types" +import { AdminReturnReasonResponse, HttpTypes } from "@medusajs/framework/types" import { ContainerRegistrationKeys, MedusaError, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/return-reasons/middlewares.ts b/packages/medusa/src/api/admin/return-reasons/middlewares.ts index b2fa71c62d..5ea19aadfb 100644 --- a/packages/medusa/src/api/admin/return-reasons/middlewares.ts +++ b/packages/medusa/src/api/admin/return-reasons/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" import * as QueryConfig from "./query-config" diff --git a/packages/medusa/src/api/admin/return-reasons/route.ts b/packages/medusa/src/api/admin/return-reasons/route.ts index 27038e8500..2f16bddb28 100644 --- a/packages/medusa/src/api/admin/return-reasons/route.ts +++ b/packages/medusa/src/api/admin/return-reasons/route.ts @@ -1,9 +1,9 @@ import { createReturnReasonsWorkflow } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/returns/[id]/cancel/route.ts b/packages/medusa/src/api/admin/returns/[id]/cancel/route.ts index 507ec9b7a0..6f2663426d 100644 --- a/packages/medusa/src/api/admin/returns/[id]/cancel/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/cancel/route.ts @@ -4,7 +4,7 @@ import { MedusaResponse, } from "../../../../../types/routing" import { AdminPostCancelReturnReqSchemaType } from "../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/returns/[id]/dismiss-items/[action_id]/route.ts b/packages/medusa/src/api/admin/returns/[id]/dismiss-items/[action_id]/route.ts index 375afccc00..9be4c766c6 100644 --- a/packages/medusa/src/api/admin/returns/[id]/dismiss-items/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/dismiss-items/[action_id]/route.ts @@ -5,13 +5,13 @@ import { import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../types/routing" import { AdminPostReturnsDismissItemsActionReqSchemaType } from "../../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/returns/[id]/dismiss-items/route.ts b/packages/medusa/src/api/admin/returns/[id]/dismiss-items/route.ts index df1e087d03..3f8d4ddd4e 100644 --- a/packages/medusa/src/api/admin/returns/[id]/dismiss-items/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/dismiss-items/route.ts @@ -2,13 +2,13 @@ import { dismissItemReturnRequestWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../types/routing" import { AdminPostReturnsReceiveItemsReqSchemaType } from "../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/returns/[id]/receive-items/[action_id]/route.ts b/packages/medusa/src/api/admin/returns/[id]/receive-items/[action_id]/route.ts index 7d2223bcf6..d25b67af13 100644 --- a/packages/medusa/src/api/admin/returns/[id]/receive-items/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/receive-items/[action_id]/route.ts @@ -5,13 +5,13 @@ import { import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../types/routing" import { AdminPostReturnsReceiveItemsActionReqSchemaType } from "../../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/returns/[id]/receive-items/route.ts b/packages/medusa/src/api/admin/returns/[id]/receive-items/route.ts index 48c49d1780..a5fd460342 100644 --- a/packages/medusa/src/api/admin/returns/[id]/receive-items/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/receive-items/route.ts @@ -2,13 +2,13 @@ import { receiveItemReturnRequestWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../types/routing" import { AdminPostReturnsReceiveItemsReqSchemaType } from "../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/returns/[id]/receive/confirm/route.ts b/packages/medusa/src/api/admin/returns/[id]/receive/confirm/route.ts index c2442230b2..ed27acf55b 100644 --- a/packages/medusa/src/api/admin/returns/[id]/receive/confirm/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/receive/confirm/route.ts @@ -1,9 +1,9 @@ import { confirmReturnReceiveWorkflow } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/returns/[id]/receive/route.ts b/packages/medusa/src/api/admin/returns/[id]/receive/route.ts index 6ce4ee288a..2aa2a97ed6 100644 --- a/packages/medusa/src/api/admin/returns/[id]/receive/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/receive/route.ts @@ -2,13 +2,13 @@ import { beginReceiveReturnWorkflow, cancelReturnReceiveWorkflow, } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { ContainerRegistrationKeys, Modules, promiseAll, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/returns/[id]/request-items/[action_id]/route.ts b/packages/medusa/src/api/admin/returns/[id]/request-items/[action_id]/route.ts index 1ca8d97cbc..4b32c19b7f 100644 --- a/packages/medusa/src/api/admin/returns/[id]/request-items/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/request-items/[action_id]/route.ts @@ -5,13 +5,13 @@ import { import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../types/routing" import { AdminPostReturnsRequestItemsActionReqSchemaType } from "../../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/returns/[id]/request-items/route.ts b/packages/medusa/src/api/admin/returns/[id]/request-items/route.ts index 2c894e8a15..aec4decfcd 100644 --- a/packages/medusa/src/api/admin/returns/[id]/request-items/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/request-items/route.ts @@ -2,13 +2,13 @@ import { requestItemReturnWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../types/routing" import { AdminPostReturnsRequestItemsReqSchemaType } from "../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/returns/[id]/request/route.ts b/packages/medusa/src/api/admin/returns/[id]/request/route.ts index 883ade7587..1b7a065b42 100644 --- a/packages/medusa/src/api/admin/returns/[id]/request/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/request/route.ts @@ -2,11 +2,11 @@ import { cancelReturnRequestWorkflow, confirmReturnRequestWorkflow, } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/returns/[id]/route.ts b/packages/medusa/src/api/admin/returns/[id]/route.ts index 69ffb2a1c2..4879121bd2 100644 --- a/packages/medusa/src/api/admin/returns/[id]/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/route.ts @@ -2,13 +2,13 @@ import { updateReturnWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../types/routing" import { AdminPostReturnsReturnReqSchemaType } from "../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/returns/[id]/shipping-method/[action_id]/route.ts b/packages/medusa/src/api/admin/returns/[id]/shipping-method/[action_id]/route.ts index 549c1151d6..279a63d7ae 100644 --- a/packages/medusa/src/api/admin/returns/[id]/shipping-method/[action_id]/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/shipping-method/[action_id]/route.ts @@ -5,13 +5,13 @@ import { import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../types/routing" import { AdminPostReturnsShippingActionReqSchemaType } from "../../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/returns/[id]/shipping-method/route.ts b/packages/medusa/src/api/admin/returns/[id]/shipping-method/route.ts index 56531656d4..b75494e5d6 100644 --- a/packages/medusa/src/api/admin/returns/[id]/shipping-method/route.ts +++ b/packages/medusa/src/api/admin/returns/[id]/shipping-method/route.ts @@ -2,13 +2,13 @@ import { createReturnShippingMethodWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../types/routing" import { AdminPostReturnsShippingReqSchemaType } from "../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/returns/middlewares.ts b/packages/medusa/src/api/admin/returns/middlewares.ts index 6138a6b71e..603ecac5b6 100644 --- a/packages/medusa/src/api/admin/returns/middlewares.ts +++ b/packages/medusa/src/api/admin/returns/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" import * as QueryConfig from "./query-config" diff --git a/packages/medusa/src/api/admin/returns/route.ts b/packages/medusa/src/api/admin/returns/route.ts index cbb14f32d6..fbac8a8fc8 100644 --- a/packages/medusa/src/api/admin/returns/route.ts +++ b/packages/medusa/src/api/admin/returns/route.ts @@ -1,11 +1,11 @@ import { beginReturnOrderWorkflow } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { ContainerRegistrationKeys, Modules, promiseAll, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/sales-channels/[id]/products/route.ts b/packages/medusa/src/api/admin/sales-channels/[id]/products/route.ts index 9ed5544683..51216e19c5 100644 --- a/packages/medusa/src/api/admin/sales-channels/[id]/products/route.ts +++ b/packages/medusa/src/api/admin/sales-channels/[id]/products/route.ts @@ -4,7 +4,7 @@ import { } from "../../../../../types/routing" import { linkProductsToSalesChannelWorkflow } from "@medusajs/core-flows" -import { HttpTypes, LinkMethodRequest } from "@medusajs/types" +import { HttpTypes, LinkMethodRequest } from "@medusajs/framework/types" import { refetchSalesChannel } from "../../helpers" export const POST = async ( diff --git a/packages/medusa/src/api/admin/sales-channels/[id]/route.ts b/packages/medusa/src/api/admin/sales-channels/[id]/route.ts index e4317623ba..57f7d5a913 100644 --- a/packages/medusa/src/api/admin/sales-channels/[id]/route.ts +++ b/packages/medusa/src/api/admin/sales-channels/[id]/route.ts @@ -2,7 +2,7 @@ import { deleteSalesChannelsWorkflow, updateSalesChannelsWorkflow, } from "@medusajs/core-flows" -import { MedusaError } from "@medusajs/utils" +import { MedusaError } from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, @@ -12,7 +12,7 @@ import { AdminGetSalesChannelParamsType, AdminUpdateSalesChannelType, } from "../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/sales-channels/helpers.ts b/packages/medusa/src/api/admin/sales-channels/helpers.ts index 3ef743fe00..ab9093f617 100644 --- a/packages/medusa/src/api/admin/sales-channels/helpers.ts +++ b/packages/medusa/src/api/admin/sales-channels/helpers.ts @@ -1,8 +1,8 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const refetchSalesChannel = async ( salesChannelId: string, diff --git a/packages/medusa/src/api/admin/sales-channels/middlewares.ts b/packages/medusa/src/api/admin/sales-channels/middlewares.ts index 137aa7561e..e3ac4ffc28 100644 --- a/packages/medusa/src/api/admin/sales-channels/middlewares.ts +++ b/packages/medusa/src/api/admin/sales-channels/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { maybeApplyLinkFilter } from "../../utils/maybe-apply-link-filter" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" diff --git a/packages/medusa/src/api/admin/sales-channels/route.ts b/packages/medusa/src/api/admin/sales-channels/route.ts index 8952d0f797..efc06ca87f 100644 --- a/packages/medusa/src/api/admin/sales-channels/route.ts +++ b/packages/medusa/src/api/admin/sales-channels/route.ts @@ -2,13 +2,13 @@ import { createSalesChannelsWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../types/routing" import { refetchSalesChannel } from "./helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/shipping-options/[id]/route.ts b/packages/medusa/src/api/admin/shipping-options/[id]/route.ts index 4fdc8ea8d1..3397d75089 100644 --- a/packages/medusa/src/api/admin/shipping-options/[id]/route.ts +++ b/packages/medusa/src/api/admin/shipping-options/[id]/route.ts @@ -2,7 +2,7 @@ import { deleteShippingOptionsWorkflow, updateShippingOptionsWorkflow, } from "@medusajs/core-flows" -import { FulfillmentWorkflow, HttpTypes } from "@medusajs/types" +import { FulfillmentWorkflow, HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/shipping-options/[id]/rules/batch/route.ts b/packages/medusa/src/api/admin/shipping-options/[id]/rules/batch/route.ts index f88f72128d..1af620273b 100644 --- a/packages/medusa/src/api/admin/shipping-options/[id]/rules/batch/route.ts +++ b/packages/medusa/src/api/admin/shipping-options/[id]/rules/batch/route.ts @@ -2,7 +2,7 @@ import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../types/routing" -import { BatchMethodRequest, HttpTypes } from "@medusajs/types" +import { BatchMethodRequest, HttpTypes } from "@medusajs/framework/types" import { AdminCreateShippingOptionRuleType, AdminUpdateShippingOptionRuleType, diff --git a/packages/medusa/src/api/admin/shipping-options/helpers.ts b/packages/medusa/src/api/admin/shipping-options/helpers.ts index a8bfe51641..8c2c2df4b2 100644 --- a/packages/medusa/src/api/admin/shipping-options/helpers.ts +++ b/packages/medusa/src/api/admin/shipping-options/helpers.ts @@ -2,12 +2,12 @@ import { BatchMethodResponse, MedusaContainer, ShippingOptionRuleDTO, -} from "@medusajs/types" +} from "@medusajs/framework/types" import { ContainerRegistrationKeys, promiseAll, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const refetchShippingOption = async ( shippingOptionId: string, diff --git a/packages/medusa/src/api/admin/shipping-options/middlewares.ts b/packages/medusa/src/api/admin/shipping-options/middlewares.ts index dafab3888a..507201351d 100644 --- a/packages/medusa/src/api/admin/shipping-options/middlewares.ts +++ b/packages/medusa/src/api/admin/shipping-options/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { maybeApplyLinkFilter } from "../../utils/maybe-apply-link-filter" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" diff --git a/packages/medusa/src/api/admin/shipping-options/route.ts b/packages/medusa/src/api/admin/shipping-options/route.ts index ee766f440f..dba358fdcc 100644 --- a/packages/medusa/src/api/admin/shipping-options/route.ts +++ b/packages/medusa/src/api/admin/shipping-options/route.ts @@ -1,9 +1,9 @@ import { createShippingOptionsWorkflow } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/shipping-options/validators.ts b/packages/medusa/src/api/admin/shipping-options/validators.ts index d96769c8c4..1eb97ecb4e 100644 --- a/packages/medusa/src/api/admin/shipping-options/validators.ts +++ b/packages/medusa/src/api/admin/shipping-options/validators.ts @@ -1,7 +1,7 @@ import { RuleOperator, ShippingOptionPriceType as ShippingOptionPriceTypeEnum, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { z } from "zod" import { booleanString } from "../../utils/common-validators" import { diff --git a/packages/medusa/src/api/admin/shipping-profiles/[id]/route.ts b/packages/medusa/src/api/admin/shipping-profiles/[id]/route.ts index 5a8908d7d4..a8f896a026 100644 --- a/packages/medusa/src/api/admin/shipping-profiles/[id]/route.ts +++ b/packages/medusa/src/api/admin/shipping-profiles/[id]/route.ts @@ -2,8 +2,8 @@ import { deleteShippingProfileWorkflow, updateShippingProfilesWorkflow, } from "@medusajs/core-flows" -import { HttpTypes, IFulfillmentModuleService } from "@medusajs/types" -import { Modules } from "@medusajs/utils" +import { HttpTypes, IFulfillmentModuleService } from "@medusajs/framework/types" +import { Modules } from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/shipping-profiles/helpers.ts b/packages/medusa/src/api/admin/shipping-profiles/helpers.ts index 1a7a052a68..5d8d40519d 100644 --- a/packages/medusa/src/api/admin/shipping-profiles/helpers.ts +++ b/packages/medusa/src/api/admin/shipping-profiles/helpers.ts @@ -1,8 +1,8 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const refetchShippingProfile = async ( shippingProfileId: string, diff --git a/packages/medusa/src/api/admin/shipping-profiles/middlewares.ts b/packages/medusa/src/api/admin/shipping-profiles/middlewares.ts index 2d8e355a92..a44853d6fb 100644 --- a/packages/medusa/src/api/admin/shipping-profiles/middlewares.ts +++ b/packages/medusa/src/api/admin/shipping-profiles/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" import { diff --git a/packages/medusa/src/api/admin/shipping-profiles/route.ts b/packages/medusa/src/api/admin/shipping-profiles/route.ts index 65ad978f7e..8243fc1140 100644 --- a/packages/medusa/src/api/admin/shipping-profiles/route.ts +++ b/packages/medusa/src/api/admin/shipping-profiles/route.ts @@ -1,9 +1,9 @@ import { createShippingProfilesWorkflow } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/stock-locations/[id]/fulfillment-providers/route.ts b/packages/medusa/src/api/admin/stock-locations/[id]/fulfillment-providers/route.ts index e6c0bb8653..3db4728c62 100644 --- a/packages/medusa/src/api/admin/stock-locations/[id]/fulfillment-providers/route.ts +++ b/packages/medusa/src/api/admin/stock-locations/[id]/fulfillment-providers/route.ts @@ -1,6 +1,6 @@ import { batchLinksWorkflow } from "@medusajs/core-flows" -import { HttpTypes, LinkMethodRequest } from "@medusajs/types" -import { Modules } from "@medusajs/utils" +import { HttpTypes, LinkMethodRequest } from "@medusajs/framework/types" +import { Modules } from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/stock-locations/[id]/fulfillment-sets/route.ts b/packages/medusa/src/api/admin/stock-locations/[id]/fulfillment-sets/route.ts index 31683ff958..2e8ffa9db0 100644 --- a/packages/medusa/src/api/admin/stock-locations/[id]/fulfillment-sets/route.ts +++ b/packages/medusa/src/api/admin/stock-locations/[id]/fulfillment-sets/route.ts @@ -5,7 +5,7 @@ import { } from "../../../../../types/routing" import { refetchStockLocation } from "../../helpers" import { AdminCreateStockLocationFulfillmentSetType } from "../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/stock-locations/[id]/route.ts b/packages/medusa/src/api/admin/stock-locations/[id]/route.ts index a8c170728a..362c533f8a 100644 --- a/packages/medusa/src/api/admin/stock-locations/[id]/route.ts +++ b/packages/medusa/src/api/admin/stock-locations/[id]/route.ts @@ -7,13 +7,13 @@ import { deleteStockLocationsWorkflow, updateStockLocationsWorkflow, } from "@medusajs/core-flows" -import { MedusaError } from "@medusajs/utils" +import { MedusaError } from "@medusajs/framework/utils" import { refetchStockLocation } from "../helpers" import { AdminGetStockLocationParamsType, AdminUpdateStockLocationType, } from "../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/stock-locations/[id]/sales-channels/route.ts b/packages/medusa/src/api/admin/stock-locations/[id]/sales-channels/route.ts index dff906ceb1..1ae4cb1511 100644 --- a/packages/medusa/src/api/admin/stock-locations/[id]/sales-channels/route.ts +++ b/packages/medusa/src/api/admin/stock-locations/[id]/sales-channels/route.ts @@ -4,7 +4,7 @@ import { } from "../../../../../types/routing" import { linkSalesChannelsToStockLocationWorkflow } from "@medusajs/core-flows" -import { HttpTypes, LinkMethodRequest } from "@medusajs/types" +import { HttpTypes, LinkMethodRequest } from "@medusajs/framework/types" import { refetchStockLocation } from "../../helpers" export const POST = async ( diff --git a/packages/medusa/src/api/admin/stock-locations/helpers.ts b/packages/medusa/src/api/admin/stock-locations/helpers.ts index e8ecff06a5..78f1998dca 100644 --- a/packages/medusa/src/api/admin/stock-locations/helpers.ts +++ b/packages/medusa/src/api/admin/stock-locations/helpers.ts @@ -1,8 +1,8 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const refetchStockLocation = async ( stockLocationId: string, diff --git a/packages/medusa/src/api/admin/stock-locations/middlewares.ts b/packages/medusa/src/api/admin/stock-locations/middlewares.ts index 0df16c4416..da36ec96c4 100644 --- a/packages/medusa/src/api/admin/stock-locations/middlewares.ts +++ b/packages/medusa/src/api/admin/stock-locations/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { maybeApplyLinkFilter } from "../../utils/maybe-apply-link-filter" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" diff --git a/packages/medusa/src/api/admin/stock-locations/route.ts b/packages/medusa/src/api/admin/stock-locations/route.ts index 55540576d8..3e393e9011 100644 --- a/packages/medusa/src/api/admin/stock-locations/route.ts +++ b/packages/medusa/src/api/admin/stock-locations/route.ts @@ -1,7 +1,7 @@ import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, @@ -9,7 +9,7 @@ import { import { createStockLocationsWorkflow } from "@medusajs/core-flows" import { refetchStockLocation } from "./helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" // Create stock location export const POST = async ( diff --git a/packages/medusa/src/api/admin/stores/[id]/route.ts b/packages/medusa/src/api/admin/stores/[id]/route.ts index 0bf7453704..8c5117ad76 100644 --- a/packages/medusa/src/api/admin/stores/[id]/route.ts +++ b/packages/medusa/src/api/admin/stores/[id]/route.ts @@ -3,14 +3,14 @@ import { remoteQueryObjectFromString, ContainerRegistrationKeys, MedusaError, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../types/routing" import { AdminGetStoreParamsType, AdminUpdateStoreType } from "../validators" import { refetchStore } from "../helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/stores/helpers.ts b/packages/medusa/src/api/admin/stores/helpers.ts index f55d4924cd..2824f3803f 100644 --- a/packages/medusa/src/api/admin/stores/helpers.ts +++ b/packages/medusa/src/api/admin/stores/helpers.ts @@ -1,8 +1,8 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const refetchStore = async ( storeId: string, diff --git a/packages/medusa/src/api/admin/stores/middlewares.ts b/packages/medusa/src/api/admin/stores/middlewares.ts index 5056664cc3..97bff81e13 100644 --- a/packages/medusa/src/api/admin/stores/middlewares.ts +++ b/packages/medusa/src/api/admin/stores/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" import * as QueryConfig from "./query-config" diff --git a/packages/medusa/src/api/admin/stores/route.ts b/packages/medusa/src/api/admin/stores/route.ts index 09b809f174..c4be27b623 100644 --- a/packages/medusa/src/api/admin/stores/route.ts +++ b/packages/medusa/src/api/admin/stores/route.ts @@ -1,12 +1,12 @@ import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../types/routing" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/tax-rates/[id]/route.ts b/packages/medusa/src/api/admin/tax-rates/[id]/route.ts index f0b36a83cb..8aa369d23e 100644 --- a/packages/medusa/src/api/admin/tax-rates/[id]/route.ts +++ b/packages/medusa/src/api/admin/tax-rates/[id]/route.ts @@ -6,7 +6,7 @@ import { ContainerRegistrationKeys, MedusaError, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, @@ -16,7 +16,7 @@ import { AdminGetTaxRateParamsType, AdminUpdateTaxRateType, } from "../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/tax-rates/[id]/rules/[rule_id]/route.ts b/packages/medusa/src/api/admin/tax-rates/[id]/rules/[rule_id]/route.ts index 466fdbc349..ed64563235 100644 --- a/packages/medusa/src/api/admin/tax-rates/[id]/rules/[rule_id]/route.ts +++ b/packages/medusa/src/api/admin/tax-rates/[id]/rules/[rule_id]/route.ts @@ -4,7 +4,7 @@ import { MedusaResponse, } from "../../../../../../types/routing" import { refetchTaxRate } from "../../../helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const DELETE = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/tax-rates/[id]/rules/route.ts b/packages/medusa/src/api/admin/tax-rates/[id]/rules/route.ts index ff643688a8..07223c5797 100644 --- a/packages/medusa/src/api/admin/tax-rates/[id]/rules/route.ts +++ b/packages/medusa/src/api/admin/tax-rates/[id]/rules/route.ts @@ -5,7 +5,7 @@ import { } from "../../../../../types/routing" import { AdminCreateTaxRateRuleType } from "../../validators" import { refetchTaxRate } from "../../helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/tax-rates/helpers.ts b/packages/medusa/src/api/admin/tax-rates/helpers.ts index c44b954260..b8070a06e2 100644 --- a/packages/medusa/src/api/admin/tax-rates/helpers.ts +++ b/packages/medusa/src/api/admin/tax-rates/helpers.ts @@ -1,8 +1,8 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const refetchTaxRate = async ( taxRateId: string, diff --git a/packages/medusa/src/api/admin/tax-rates/middlewares.ts b/packages/medusa/src/api/admin/tax-rates/middlewares.ts index 4f8e01d077..fface469de 100644 --- a/packages/medusa/src/api/admin/tax-rates/middlewares.ts +++ b/packages/medusa/src/api/admin/tax-rates/middlewares.ts @@ -9,7 +9,7 @@ import { AdminUpdateTaxRate, } from "./validators" -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformBody } from "../../utils/validate-body" export const adminTaxRateRoutesMiddlewares: MiddlewareRoute[] = [ diff --git a/packages/medusa/src/api/admin/tax-rates/route.ts b/packages/medusa/src/api/admin/tax-rates/route.ts index 316ca9f554..6255e961c9 100644 --- a/packages/medusa/src/api/admin/tax-rates/route.ts +++ b/packages/medusa/src/api/admin/tax-rates/route.ts @@ -2,13 +2,13 @@ import { createTaxRatesWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../types/routing" import { refetchTaxRate } from "./helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/tax-regions/[id]/route.ts b/packages/medusa/src/api/admin/tax-regions/[id]/route.ts index dc0c3638bd..3e16c0d085 100644 --- a/packages/medusa/src/api/admin/tax-regions/[id]/route.ts +++ b/packages/medusa/src/api/admin/tax-regions/[id]/route.ts @@ -2,12 +2,12 @@ import { deleteTaxRegionsWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../types/routing" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/tax-regions/helpers.ts b/packages/medusa/src/api/admin/tax-regions/helpers.ts index aefc0d083e..43e51ded49 100644 --- a/packages/medusa/src/api/admin/tax-regions/helpers.ts +++ b/packages/medusa/src/api/admin/tax-regions/helpers.ts @@ -1,8 +1,8 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const refetchTaxRegion = async ( taxRegionId: string, diff --git a/packages/medusa/src/api/admin/tax-regions/middlewares.ts b/packages/medusa/src/api/admin/tax-regions/middlewares.ts index 8f60612701..cae55d57a2 100644 --- a/packages/medusa/src/api/admin/tax-regions/middlewares.ts +++ b/packages/medusa/src/api/admin/tax-regions/middlewares.ts @@ -6,7 +6,7 @@ import { AdminGetTaxRegionsParams, } from "./validators" -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" diff --git a/packages/medusa/src/api/admin/tax-regions/route.ts b/packages/medusa/src/api/admin/tax-regions/route.ts index 8a2dd58191..a330fc221f 100644 --- a/packages/medusa/src/api/admin/tax-regions/route.ts +++ b/packages/medusa/src/api/admin/tax-regions/route.ts @@ -2,13 +2,13 @@ import { createTaxRegionsWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../types/routing" import { refetchTaxRegion } from "./helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/uploads/[id]/route.ts b/packages/medusa/src/api/admin/uploads/[id]/route.ts index dffefe707c..ca95767b2a 100644 --- a/packages/medusa/src/api/admin/uploads/[id]/route.ts +++ b/packages/medusa/src/api/admin/uploads/[id]/route.ts @@ -3,9 +3,12 @@ import { MedusaResponse, } from "../../../../types/routing" import { deleteFilesWorkflow } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" -import { ContainerRegistrationKeys, MedusaError } from "@medusajs/utils" -import { remoteQueryObjectFromString } from "@medusajs/utils" +import { HttpTypes } from "@medusajs/framework/types" +import { + ContainerRegistrationKeys, + MedusaError, +} from "@medusajs/framework/utils" +import { remoteQueryObjectFromString } from "@medusajs/framework/utils" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/uploads/middlewares.ts b/packages/medusa/src/api/admin/uploads/middlewares.ts index e05f3b097b..291834c812 100644 --- a/packages/medusa/src/api/admin/uploads/middlewares.ts +++ b/packages/medusa/src/api/admin/uploads/middlewares.ts @@ -1,5 +1,5 @@ import multer from "multer" -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformQuery } from "../../utils/validate-query" import { retrieveUploadConfig } from "./query-config" import { AdminGetUploadParams } from "./validators" diff --git a/packages/medusa/src/api/admin/uploads/route.ts b/packages/medusa/src/api/admin/uploads/route.ts index a07e19952b..3debedff84 100644 --- a/packages/medusa/src/api/admin/uploads/route.ts +++ b/packages/medusa/src/api/admin/uploads/route.ts @@ -3,8 +3,8 @@ import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../types/routing" -import { MedusaError } from "@medusajs/utils" -import { HttpTypes } from "@medusajs/types" +import { MedusaError } from "@medusajs/framework/utils" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/users/[id]/route.ts b/packages/medusa/src/api/admin/users/[id]/route.ts index c6ee0ccd08..1604ff4a10 100644 --- a/packages/medusa/src/api/admin/users/[id]/route.ts +++ b/packages/medusa/src/api/admin/users/[id]/route.ts @@ -2,7 +2,7 @@ import { removeUserAccountWorkflow, updateUsersWorkflow, } from "@medusajs/core-flows" -import { HttpTypes, UpdateUserDTO } from "@medusajs/types" +import { HttpTypes, UpdateUserDTO } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, @@ -12,7 +12,7 @@ import { ContainerRegistrationKeys, MedusaError, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { refetchUser } from "../helpers" import { AdminUpdateUserType } from "../validators" diff --git a/packages/medusa/src/api/admin/users/helpers.ts b/packages/medusa/src/api/admin/users/helpers.ts index 25474edaa1..564475912f 100644 --- a/packages/medusa/src/api/admin/users/helpers.ts +++ b/packages/medusa/src/api/admin/users/helpers.ts @@ -1,8 +1,8 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const refetchUser = async ( userId: string, diff --git a/packages/medusa/src/api/admin/users/me/route.ts b/packages/medusa/src/api/admin/users/me/route.ts index 5a2582c318..440966c085 100644 --- a/packages/medusa/src/api/admin/users/me/route.ts +++ b/packages/medusa/src/api/admin/users/me/route.ts @@ -2,12 +2,12 @@ import { ContainerRegistrationKeys, MedusaError, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../types/routing" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/users/middlewares.ts b/packages/medusa/src/api/admin/users/middlewares.ts index d03cad05c0..0fb60be320 100644 --- a/packages/medusa/src/api/admin/users/middlewares.ts +++ b/packages/medusa/src/api/admin/users/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { authenticate } from "../../../utils/middlewares/authenticate-middleware" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" @@ -6,7 +6,7 @@ import * as QueryConfig from "./query-config" import { AdminGetUserParams, AdminGetUsersParams, - AdminUpdateUser + AdminUpdateUser, } from "./validators" // TODO: Due to issues with our routing (and using router.use for applying middlewares), we have to opt-out of global auth in all routes, and then reapply it here. @@ -29,8 +29,8 @@ export const adminUserRoutesMiddlewares: MiddlewareRoute[] = [ middlewares: [ authenticate("user", ["bearer", "session"]), validateAndTransformQuery( - AdminGetUserParams, - QueryConfig.retrieveTransformQueryConfig + AdminGetUserParams, + QueryConfig.retrieveTransformQueryConfig ), ], }, @@ -40,8 +40,8 @@ export const adminUserRoutesMiddlewares: MiddlewareRoute[] = [ middlewares: [ authenticate("user", ["bearer", "session"]), validateAndTransformQuery( - AdminGetUserParams, - QueryConfig.retrieveTransformQueryConfig + AdminGetUserParams, + QueryConfig.retrieveTransformQueryConfig ), ], }, @@ -52,8 +52,8 @@ export const adminUserRoutesMiddlewares: MiddlewareRoute[] = [ authenticate("user", ["bearer", "session"]), validateAndTransformBody(AdminUpdateUser), validateAndTransformQuery( - AdminGetUserParams, - QueryConfig.retrieveTransformQueryConfig + AdminGetUserParams, + QueryConfig.retrieveTransformQueryConfig ), ], }, diff --git a/packages/medusa/src/api/admin/users/route.ts b/packages/medusa/src/api/admin/users/route.ts index 8f366d6c9a..e228e0b3c8 100644 --- a/packages/medusa/src/api/admin/users/route.ts +++ b/packages/medusa/src/api/admin/users/route.ts @@ -1,8 +1,8 @@ -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/workflows-executions/[id]/route.ts b/packages/medusa/src/api/admin/workflows-executions/[id]/route.ts index 5b6581f178..56a0eee092 100644 --- a/packages/medusa/src/api/admin/workflows-executions/[id]/route.ts +++ b/packages/medusa/src/api/admin/workflows-executions/[id]/route.ts @@ -1,4 +1,4 @@ -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, @@ -8,7 +8,7 @@ import { AdminGetWorkflowExecutionDetailsParamsType } from "../validators" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/[transaction_id]/[step_id]/subscribe/route.ts b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/[transaction_id]/[step_id]/subscribe/route.ts index ce35b3ae48..d00439dabe 100644 --- a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/[transaction_id]/[step_id]/subscribe/route.ts +++ b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/[transaction_id]/[step_id]/subscribe/route.ts @@ -1,10 +1,10 @@ -import { IWorkflowEngineService } from "@medusajs/types" +import { IWorkflowEngineService } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../../types/routing" -import { Modules } from "@medusajs/utils" +import { Modules } from "@medusajs/framework/utils" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/[transaction_id]/route.ts b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/[transaction_id]/route.ts index e3e8b1af9a..6c803f8cab 100644 --- a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/[transaction_id]/route.ts +++ b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/[transaction_id]/route.ts @@ -6,9 +6,9 @@ import { import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AdminGetWorkflowExecutionDetailsParamsType } from "../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/run/route.ts b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/run/route.ts index 702e9fbcc4..531e0bbaa0 100644 --- a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/run/route.ts +++ b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/run/route.ts @@ -2,8 +2,8 @@ import { HttpTypes, IWorkflowEngineService, WorkflowOrchestratorRunDTO, -} from "@medusajs/types" -import { Modules } from "@medusajs/utils" +} from "@medusajs/framework/types" +import { Modules } from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/steps/failure/route.ts b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/steps/failure/route.ts index 460659763b..78a3b77637 100644 --- a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/steps/failure/route.ts +++ b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/steps/failure/route.ts @@ -1,12 +1,12 @@ -import { TransactionHandlerType, isDefined } from "@medusajs/utils" -import { StepResponse } from "@medusajs/workflows-sdk" +import { TransactionHandlerType, isDefined } from "@medusajs/framework/utils" +import { StepResponse } from "@medusajs/framework/workflows-sdk" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../types/routing" -import { IWorkflowEngineService } from "@medusajs/types" -import { Modules } from "@medusajs/utils" +import { IWorkflowEngineService } from "@medusajs/framework/types" +import { Modules } from "@medusajs/framework/utils" import { AdminCreateWorkflowsAsyncResponseType } from "../../../validators" export const POST = async ( diff --git a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/steps/success/route.ts b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/steps/success/route.ts index df453432e2..8cffbbaf19 100644 --- a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/steps/success/route.ts +++ b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/steps/success/route.ts @@ -1,12 +1,12 @@ -import { TransactionHandlerType, isDefined } from "@medusajs/utils" -import { StepResponse } from "@medusajs/workflows-sdk" +import { TransactionHandlerType, isDefined } from "@medusajs/framework/utils" +import { StepResponse } from "@medusajs/framework/workflows-sdk" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../types/routing" -import { IWorkflowEngineService } from "@medusajs/types" -import { Modules } from "@medusajs/utils" +import { IWorkflowEngineService } from "@medusajs/framework/types" +import { Modules } from "@medusajs/framework/utils" import { AdminCreateWorkflowsAsyncResponseType } from "../../../validators" export const POST = async ( diff --git a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/subscribe/route.ts b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/subscribe/route.ts index d260718031..e4b75b345d 100644 --- a/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/subscribe/route.ts +++ b/packages/medusa/src/api/admin/workflows-executions/[workflow_id]/subscribe/route.ts @@ -1,10 +1,10 @@ -import { IWorkflowEngineService } from "@medusajs/types" +import { IWorkflowEngineService } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../types/routing" -import { Modules } from "@medusajs/utils" +import { Modules } from "@medusajs/framework/utils" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/workflows-executions/middlewares.ts b/packages/medusa/src/api/admin/workflows-executions/middlewares.ts index 015b18efd2..65212987a4 100644 --- a/packages/medusa/src/api/admin/workflows-executions/middlewares.ts +++ b/packages/medusa/src/api/admin/workflows-executions/middlewares.ts @@ -7,7 +7,7 @@ import { AdminGetWorkflowExecutionsParams, } from "./validators" -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformQuery } from "../../utils/validate-query" import { validateAndTransformBody } from "../../utils/validate-body" diff --git a/packages/medusa/src/api/admin/workflows-executions/route.ts b/packages/medusa/src/api/admin/workflows-executions/route.ts index d93346f695..65aea7582b 100644 --- a/packages/medusa/src/api/admin/workflows-executions/route.ts +++ b/packages/medusa/src/api/admin/workflows-executions/route.ts @@ -1,4 +1,4 @@ -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, @@ -6,7 +6,7 @@ import { import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/admin/workflows-executions/validators.ts b/packages/medusa/src/api/admin/workflows-executions/validators.ts index 2d68aef7e8..6fec7312eb 100644 --- a/packages/medusa/src/api/admin/workflows-executions/validators.ts +++ b/packages/medusa/src/api/admin/workflows-executions/validators.ts @@ -1,4 +1,4 @@ -import { TransactionHandlerType } from "@medusajs/utils" +import { TransactionHandlerType } from "@medusajs/framework/utils" import { z } from "zod" import { createFindParams, createSelectParams } from "../../utils/validators" diff --git a/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/callback/route.ts b/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/callback/route.ts index cfbb9bee4f..1546eb2c77 100644 --- a/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/callback/route.ts +++ b/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/callback/route.ts @@ -2,12 +2,12 @@ import { AuthenticationInput, ConfigModule, IAuthModuleService, -} from "@medusajs/types" +} from "@medusajs/framework/types" import { ContainerRegistrationKeys, MedusaError, Modules, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { MedusaRequest, MedusaResponse } from "../../../../../types/routing" import { generateJwtTokenForAuthIdentity } from "../../../utils/generate-jwt-token" diff --git a/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/register/route.ts b/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/register/route.ts index 1b2206b2a7..e04a2ae623 100644 --- a/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/register/route.ts +++ b/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/register/route.ts @@ -2,12 +2,12 @@ import { AuthenticationInput, ConfigModule, IAuthModuleService, -} from "@medusajs/types" +} from "@medusajs/framework/types" import { ContainerRegistrationKeys, MedusaError, Modules, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { MedusaRequest, MedusaResponse } from "../../../../../types/routing" import { generateJwtTokenForAuthIdentity } from "../../../utils/generate-jwt-token" diff --git a/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/reset-password/route.ts b/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/reset-password/route.ts index 9e0bc5628e..a97234c58b 100644 --- a/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/reset-password/route.ts +++ b/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/reset-password/route.ts @@ -1,5 +1,5 @@ import { generateResetPasswordTokenWorkflow } from "@medusajs/core-flows" -import { ContainerRegistrationKeys } from "@medusajs/utils" +import { ContainerRegistrationKeys } from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/route.ts b/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/route.ts index 0ab887e953..e6b26d9fe9 100644 --- a/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/route.ts +++ b/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/route.ts @@ -2,12 +2,12 @@ import { AuthenticationInput, ConfigModule, IAuthModuleService, -} from "@medusajs/types" +} from "@medusajs/framework/types" import { ContainerRegistrationKeys, MedusaError, Modules, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { MedusaRequest, MedusaResponse } from "../../../../types/routing" import { generateJwtTokenForAuthIdentity } from "../../utils/generate-jwt-token" diff --git a/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/update/route.ts b/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/update/route.ts index 39f1a59653..750a80adf6 100644 --- a/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/update/route.ts +++ b/packages/medusa/src/api/auth/[actor_type]/[auth_provider]/update/route.ts @@ -1,6 +1,6 @@ -import { AuthenticatedMedusaRequest } from "@medusajs/framework" -import { IAuthModuleService } from "@medusajs/types" -import { MedusaError, Modules } from "@medusajs/utils" +import { AuthenticatedMedusaRequest } from "@medusajs/framework/http" +import { IAuthModuleService } from "@medusajs/framework/types" +import { MedusaError, Modules } from "@medusajs/framework/utils" import { MedusaResponse } from "../../../../../types/routing" export const POST = async ( diff --git a/packages/medusa/src/api/auth/middlewares.ts b/packages/medusa/src/api/auth/middlewares.ts index cbaca72e37..dd16f4fdeb 100644 --- a/packages/medusa/src/api/auth/middlewares.ts +++ b/packages/medusa/src/api/auth/middlewares.ts @@ -1,5 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" -import { authenticate } from "../../utils/middlewares/authenticate-middleware" +import { authenticate, MiddlewareRoute } from "@medusajs/framework/http" import { validateScopeProviderAssociation } from "./utils/validate-scope-provider-association" import { validateToken } from "./utils/validate-token" diff --git a/packages/medusa/src/api/auth/token/refresh/route.ts b/packages/medusa/src/api/auth/token/refresh/route.ts index 28e5697c20..413f6741b4 100644 --- a/packages/medusa/src/api/auth/token/refresh/route.ts +++ b/packages/medusa/src/api/auth/token/refresh/route.ts @@ -1,5 +1,5 @@ -import { IAuthModuleService } from "@medusajs/types" -import { ContainerRegistrationKeys, Modules } from "@medusajs/utils" +import { IAuthModuleService } from "@medusajs/framework/types" +import { ContainerRegistrationKeys, Modules } from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/auth/utils/generate-jwt-token.ts b/packages/medusa/src/api/auth/utils/generate-jwt-token.ts index 91c488faea..46a2dc14af 100644 --- a/packages/medusa/src/api/auth/utils/generate-jwt-token.ts +++ b/packages/medusa/src/api/auth/utils/generate-jwt-token.ts @@ -1,5 +1,5 @@ -import { AuthIdentityDTO } from "@medusajs/types" -import { generateJwtToken } from "@medusajs/utils" +import { AuthIdentityDTO } from "@medusajs/framework/types" +import { generateJwtToken } from "@medusajs/framework/utils" export function generateJwtTokenForAuthIdentity( { diff --git a/packages/medusa/src/api/auth/utils/validate-scope-provider-association.ts b/packages/medusa/src/api/auth/utils/validate-scope-provider-association.ts index d265cbf99e..7834aafb6b 100644 --- a/packages/medusa/src/api/auth/utils/validate-scope-provider-association.ts +++ b/packages/medusa/src/api/auth/utils/validate-scope-provider-association.ts @@ -2,9 +2,12 @@ import { MedusaNextFunction, MedusaRequest, MedusaResponse, -} from "@medusajs/framework" -import { ConfigModule } from "@medusajs/types" -import { ContainerRegistrationKeys, MedusaError } from "@medusajs/utils" +} from "@medusajs/framework/http" +import { ConfigModule } from "@medusajs/framework/types" +import { + ContainerRegistrationKeys, + MedusaError, +} from "@medusajs/framework/utils" // Middleware to validate that a scope is associated with a provider export const validateScopeProviderAssociation = () => { diff --git a/packages/medusa/src/api/auth/utils/validate-token.ts b/packages/medusa/src/api/auth/utils/validate-token.ts index 0de23ecb33..5740a81399 100644 --- a/packages/medusa/src/api/auth/utils/validate-token.ts +++ b/packages/medusa/src/api/auth/utils/validate-token.ts @@ -3,10 +3,10 @@ import { MedusaNextFunction, MedusaRequest, MedusaResponse, -} from "@medusajs/framework" -import { ConfigModule, IAuthModuleService } from "@medusajs/types" -import { ContainerRegistrationKeys, Modules } from "@medusajs/utils" -import { JwtPayload, decode, verify } from "jsonwebtoken" +} from "@medusajs/framework/http" +import { ConfigModule, IAuthModuleService } from "@medusajs/framework/types" +import { ContainerRegistrationKeys, Modules } from "@medusajs/framework/utils" +import { decode, JwtPayload, verify } from "jsonwebtoken" // Middleware to validate that a token is valid export const validateToken = () => { @@ -31,7 +31,7 @@ export const validateToken = () => { const authModule = req.scope.resolve(Modules.AUTH) - let decoded = decode(token as string) as JwtPayload + const decoded = decode(token as string) as JwtPayload const [providerIdentity] = await authModule.listProviderIdentities( { diff --git a/packages/medusa/src/api/hooks/middlewares.ts b/packages/medusa/src/api/hooks/middlewares.ts index 73873daecb..6d996f6b25 100644 --- a/packages/medusa/src/api/hooks/middlewares.ts +++ b/packages/medusa/src/api/hooks/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" export const hooksRoutesMiddlewares: MiddlewareRoute[] = [ { diff --git a/packages/medusa/src/api/hooks/payment/[provider]/route.ts b/packages/medusa/src/api/hooks/payment/[provider]/route.ts index 7fcbb3efc2..2be6739ca5 100644 --- a/packages/medusa/src/api/hooks/payment/[provider]/route.ts +++ b/packages/medusa/src/api/hooks/payment/[provider]/route.ts @@ -1,5 +1,5 @@ -import { PaymentModuleOptions } from "@medusajs/types" -import { Modules, PaymentWebhookEvents } from "@medusajs/utils" +import { PaymentModuleOptions } from "@medusajs/framework/types" +import { Modules, PaymentWebhookEvents } from "@medusajs/framework/utils" import { MedusaRequest, MedusaResponse } from "../../../../types/routing" diff --git a/packages/medusa/src/api/store/carts/[id]/complete/route.ts b/packages/medusa/src/api/store/carts/[id]/complete/route.ts index 5cba87d148..3e157eeb03 100644 --- a/packages/medusa/src/api/store/carts/[id]/complete/route.ts +++ b/packages/medusa/src/api/store/carts/[id]/complete/route.ts @@ -1,11 +1,11 @@ import { completeCartWorkflow } from "@medusajs/core-flows" -import { MedusaError } from "@medusajs/utils" +import { MedusaError } from "@medusajs/framework/utils" import { MedusaRequest, MedusaResponse } from "../../../../../types/routing" import { prepareRetrieveQuery } from "../../../../../utils/get-query-config" import { refetchOrder } from "../../../orders/helpers" import { refetchCart } from "../../helpers" import { defaultStoreCartFields } from "../../query-config" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: MedusaRequest, diff --git a/packages/medusa/src/api/store/carts/[id]/line-items/[line_id]/route.ts b/packages/medusa/src/api/store/carts/[id]/line-items/[line_id]/route.ts index ad447a9e5d..cead30d66c 100644 --- a/packages/medusa/src/api/store/carts/[id]/line-items/[line_id]/route.ts +++ b/packages/medusa/src/api/store/carts/[id]/line-items/[line_id]/route.ts @@ -2,8 +2,8 @@ import { deleteLineItemsWorkflow, updateLineItemInCartWorkflow, } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" -import { MedusaError } from "@medusajs/utils" +import { HttpTypes } from "@medusajs/framework/types" +import { MedusaError } from "@medusajs/framework/utils" import { MedusaRequest, MedusaResponse } from "../../../../../../types/routing" import { prepareListQuery } from "../../../../../../utils/get-query-config" import { refetchCart } from "../../../helpers" diff --git a/packages/medusa/src/api/store/carts/[id]/line-items/route.ts b/packages/medusa/src/api/store/carts/[id]/line-items/route.ts index f071e9d45e..c739ce7db9 100644 --- a/packages/medusa/src/api/store/carts/[id]/line-items/route.ts +++ b/packages/medusa/src/api/store/carts/[id]/line-items/route.ts @@ -2,7 +2,7 @@ import { addToCartWorkflow } from "@medusajs/core-flows" import { MedusaRequest, MedusaResponse } from "../../../../../types/routing" import { refetchCart } from "../../helpers" import { StoreAddCartLineItemType } from "../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: MedusaRequest, diff --git a/packages/medusa/src/api/store/carts/[id]/promotions/route.ts b/packages/medusa/src/api/store/carts/[id]/promotions/route.ts index 00ee082df4..a5b82f4690 100644 --- a/packages/medusa/src/api/store/carts/[id]/promotions/route.ts +++ b/packages/medusa/src/api/store/carts/[id]/promotions/route.ts @@ -1,12 +1,12 @@ import { updateCartPromotionsWorkflow } from "@medusajs/core-flows" -import { PromotionActions } from "@medusajs/utils" +import { PromotionActions } from "@medusajs/framework/utils" import { MedusaRequest, MedusaResponse } from "../../../../../types/routing" import { refetchCart } from "../../helpers" import { StoreAddCartPromotionsType, StoreRemoveCartPromotionsType, } from "../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: MedusaRequest, diff --git a/packages/medusa/src/api/store/carts/[id]/route.ts b/packages/medusa/src/api/store/carts/[id]/route.ts index edea5fdac9..c420807d2c 100644 --- a/packages/medusa/src/api/store/carts/[id]/route.ts +++ b/packages/medusa/src/api/store/carts/[id]/route.ts @@ -1,5 +1,9 @@ import { updateCartWorkflow } from "@medusajs/core-flows" -import { AdditionalData, HttpTypes, UpdateCartDataDTO } from "@medusajs/types" +import { + AdditionalData, + HttpTypes, + UpdateCartDataDTO, +} from "@medusajs/framework/types" import { MedusaRequest, MedusaResponse } from "../../../../types/routing" import { refetchCart } from "../helpers" diff --git a/packages/medusa/src/api/store/carts/[id]/shipping-methods/route.ts b/packages/medusa/src/api/store/carts/[id]/shipping-methods/route.ts index 8bfe40e0e7..65f69949d5 100644 --- a/packages/medusa/src/api/store/carts/[id]/shipping-methods/route.ts +++ b/packages/medusa/src/api/store/carts/[id]/shipping-methods/route.ts @@ -2,7 +2,7 @@ import { addShippingMethodToWorkflow } from "@medusajs/core-flows" import { MedusaRequest, MedusaResponse } from "../../../../../types/routing" import { refetchCart } from "../../helpers" import { StoreAddCartShippingMethodsType } from "../../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: MedusaRequest, diff --git a/packages/medusa/src/api/store/carts/[id]/taxes/route.ts b/packages/medusa/src/api/store/carts/[id]/taxes/route.ts index d4c56242d0..da56d20058 100644 --- a/packages/medusa/src/api/store/carts/[id]/taxes/route.ts +++ b/packages/medusa/src/api/store/carts/[id]/taxes/route.ts @@ -1,7 +1,7 @@ import { updateTaxLinesWorkflow } from "@medusajs/core-flows" import { MedusaRequest, MedusaResponse } from "../../../../../types/routing" import { refetchCart } from "../../helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: MedusaRequest, diff --git a/packages/medusa/src/api/store/carts/helpers.ts b/packages/medusa/src/api/store/carts/helpers.ts index 87fb9be088..6a237d2680 100644 --- a/packages/medusa/src/api/store/carts/helpers.ts +++ b/packages/medusa/src/api/store/carts/helpers.ts @@ -1,8 +1,8 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const refetchCart = async ( id: string, diff --git a/packages/medusa/src/api/store/carts/middlewares.ts b/packages/medusa/src/api/store/carts/middlewares.ts index 32696ee44c..c67f29d3b5 100644 --- a/packages/medusa/src/api/store/carts/middlewares.ts +++ b/packages/medusa/src/api/store/carts/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { ensurePublishableKeyAndSalesChannelMatch } from "../../utils/middlewares/common/ensure-pub-key-sales-channel-match" import { maybeAttachPublishableKeyScopes } from "../../utils/middlewares/common/maybe-attach-pub-key-scopes" import { validateAndTransformBody } from "../../utils/validate-body" diff --git a/packages/medusa/src/api/store/carts/route.ts b/packages/medusa/src/api/store/carts/route.ts index c50229f42c..b310eb1f1f 100644 --- a/packages/medusa/src/api/store/carts/route.ts +++ b/packages/medusa/src/api/store/carts/route.ts @@ -3,7 +3,7 @@ import { AdditionalData, CreateCartWorkflowInputDTO, HttpTypes, -} from "@medusajs/types" +} from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/store/collections/[id]/route.ts b/packages/medusa/src/api/store/collections/[id]/route.ts index e9a418ca68..563f8378ed 100644 --- a/packages/medusa/src/api/store/collections/[id]/route.ts +++ b/packages/medusa/src/api/store/collections/[id]/route.ts @@ -1,4 +1,4 @@ -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/store/collections/helpers.ts b/packages/medusa/src/api/store/collections/helpers.ts index e142f7f6a5..7f40b9c9bb 100644 --- a/packages/medusa/src/api/store/collections/helpers.ts +++ b/packages/medusa/src/api/store/collections/helpers.ts @@ -1,8 +1,8 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const refetchCollection = async ( collectionId: string, diff --git a/packages/medusa/src/api/store/collections/middlewares.ts b/packages/medusa/src/api/store/collections/middlewares.ts index 200fdce6d1..45aa4f0388 100644 --- a/packages/medusa/src/api/store/collections/middlewares.ts +++ b/packages/medusa/src/api/store/collections/middlewares.ts @@ -1,5 +1,5 @@ import * as QueryConfig from "./query-config" -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformQuery } from "../../utils/validate-query" import { StoreGetCollectionParams, diff --git a/packages/medusa/src/api/store/collections/route.ts b/packages/medusa/src/api/store/collections/route.ts index 3408e6cfc0..d40c814daa 100644 --- a/packages/medusa/src/api/store/collections/route.ts +++ b/packages/medusa/src/api/store/collections/route.ts @@ -1,4 +1,4 @@ -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { AuthenticatedMedusaRequest, MedusaResponse, @@ -7,7 +7,7 @@ import { import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/store/currencies/[code]/route.ts b/packages/medusa/src/api/store/currencies/[code]/route.ts index 68c9cbb0df..d239a0bd74 100644 --- a/packages/medusa/src/api/store/currencies/[code]/route.ts +++ b/packages/medusa/src/api/store/currencies/[code]/route.ts @@ -2,9 +2,9 @@ import { ContainerRegistrationKeys, MedusaError, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { MedusaRequest, MedusaResponse } from "../../../../types/routing" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: MedusaRequest, diff --git a/packages/medusa/src/api/store/currencies/middlewares.ts b/packages/medusa/src/api/store/currencies/middlewares.ts index 1166d2cae9..e9cde07fe6 100644 --- a/packages/medusa/src/api/store/currencies/middlewares.ts +++ b/packages/medusa/src/api/store/currencies/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformQuery } from "../../utils/validate-query" import * as QueryConfig from "./query-config" import { StoreGetCurrenciesParams, StoreGetCurrencyParams } from "./validators" diff --git a/packages/medusa/src/api/store/currencies/route.ts b/packages/medusa/src/api/store/currencies/route.ts index 5b7ba9ae56..461105918f 100644 --- a/packages/medusa/src/api/store/currencies/route.ts +++ b/packages/medusa/src/api/store/currencies/route.ts @@ -1,9 +1,9 @@ import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { MedusaRequest, MedusaResponse } from "../../../types/routing" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: MedusaRequest, diff --git a/packages/medusa/src/api/store/customers/helpers.ts b/packages/medusa/src/api/store/customers/helpers.ts index 5aee77c888..8b15d8af57 100644 --- a/packages/medusa/src/api/store/customers/helpers.ts +++ b/packages/medusa/src/api/store/customers/helpers.ts @@ -1,8 +1,8 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const refetchCustomer = async ( customerId: string, diff --git a/packages/medusa/src/api/store/customers/me/addresses/[address_id]/route.ts b/packages/medusa/src/api/store/customers/me/addresses/[address_id]/route.ts index 26451f2645..e33adef2bb 100644 --- a/packages/medusa/src/api/store/customers/me/addresses/[address_id]/route.ts +++ b/packages/medusa/src/api/store/customers/me/addresses/[address_id]/route.ts @@ -6,12 +6,12 @@ import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../../../../types/routing" -import { HttpTypes, MedusaContainer } from "@medusajs/types" +import { HttpTypes, MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, MedusaError, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { refetchCustomer } from "../../../helpers" import { StoreGetCustomerAddressParamsType, diff --git a/packages/medusa/src/api/store/customers/me/addresses/route.ts b/packages/medusa/src/api/store/customers/me/addresses/route.ts index ac6d21ab9e..bb1c801e1d 100644 --- a/packages/medusa/src/api/store/customers/me/addresses/route.ts +++ b/packages/medusa/src/api/store/customers/me/addresses/route.ts @@ -11,9 +11,9 @@ import { import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { refetchCustomer } from "../../helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/store/customers/me/route.ts b/packages/medusa/src/api/store/customers/me/route.ts index f99a2717c1..433870a771 100644 --- a/packages/medusa/src/api/store/customers/me/route.ts +++ b/packages/medusa/src/api/store/customers/me/route.ts @@ -8,9 +8,9 @@ import { StoreUpdateCustomerType, } from "../validators" import { refetchCustomer } from "../helpers" -import { MedusaError } from "@medusajs/utils" +import { MedusaError } from "@medusajs/framework/utils" import { updateCustomersWorkflow } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/store/customers/middlewares.ts b/packages/medusa/src/api/store/customers/middlewares.ts index 47cb542eaf..d36e691d60 100644 --- a/packages/medusa/src/api/store/customers/middlewares.ts +++ b/packages/medusa/src/api/store/customers/middlewares.ts @@ -10,7 +10,7 @@ import { StoreGetCustomerAddressParams, } from "./validators" -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { authenticate } from "../../../utils/middlewares/authenticate-middleware" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" diff --git a/packages/medusa/src/api/store/customers/route.ts b/packages/medusa/src/api/store/customers/route.ts index 64f08495fb..b43a7dfb45 100644 --- a/packages/medusa/src/api/store/customers/route.ts +++ b/packages/medusa/src/api/store/customers/route.ts @@ -1,11 +1,11 @@ -import { MedusaError } from "@medusajs/utils" +import { MedusaError } from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../types/routing" import { createCustomerAccountWorkflow } from "@medusajs/core-flows" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { refetchCustomer } from "./helpers" export const POST = async ( diff --git a/packages/medusa/src/api/store/middlewares.ts b/packages/medusa/src/api/store/middlewares.ts index 81a46e4d13..07e54e5e29 100644 --- a/packages/medusa/src/api/store/middlewares.ts +++ b/packages/medusa/src/api/store/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { ensurePublishableApiKey } from "../../utils/middlewares/ensure-publishable-api-key" export const storeRoutesMiddlewares: MiddlewareRoute[] = [ diff --git a/packages/medusa/src/api/store/orders/[id]/route.ts b/packages/medusa/src/api/store/orders/[id]/route.ts index 2d6eed1c78..454ca95c8f 100644 --- a/packages/medusa/src/api/store/orders/[id]/route.ts +++ b/packages/medusa/src/api/store/orders/[id]/route.ts @@ -1,4 +1,4 @@ -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" import { MedusaRequest, MedusaResponse } from "../../../../types/routing" import { refetchOrder } from "../helpers" diff --git a/packages/medusa/src/api/store/orders/helpers.ts b/packages/medusa/src/api/store/orders/helpers.ts index 1a9afaade7..aeba3eeb98 100644 --- a/packages/medusa/src/api/store/orders/helpers.ts +++ b/packages/medusa/src/api/store/orders/helpers.ts @@ -1,4 +1,4 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { refetchEntity } from "../../utils/refetch-entity" export const refetchOrder = async ( diff --git a/packages/medusa/src/api/store/orders/middlewares.ts b/packages/medusa/src/api/store/orders/middlewares.ts index e34a20ee22..acbed22d91 100644 --- a/packages/medusa/src/api/store/orders/middlewares.ts +++ b/packages/medusa/src/api/store/orders/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { authenticate } from "../../../utils/middlewares/authenticate-middleware" import { validateAndTransformQuery } from "../../utils/validate-query" import * as QueryConfig from "./query-config" diff --git a/packages/medusa/src/api/store/orders/route.ts b/packages/medusa/src/api/store/orders/route.ts index e898764271..48829d1cf2 100644 --- a/packages/medusa/src/api/store/orders/route.ts +++ b/packages/medusa/src/api/store/orders/route.ts @@ -1,12 +1,12 @@ import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../types/routing" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/store/payment-collections/[id]/payment-sessions/route.ts b/packages/medusa/src/api/store/payment-collections/[id]/payment-sessions/route.ts index 6a731bfeb2..e81fd92b60 100644 --- a/packages/medusa/src/api/store/payment-collections/[id]/payment-sessions/route.ts +++ b/packages/medusa/src/api/store/payment-collections/[id]/payment-sessions/route.ts @@ -5,7 +5,7 @@ import { } from "../../../../../types/routing" import { StoreCreatePaymentSessionType } from "../../validators" import { refetchPaymentCollection } from "../../helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/store/payment-collections/helpers.ts b/packages/medusa/src/api/store/payment-collections/helpers.ts index fd537a8b89..4f2deaa594 100644 --- a/packages/medusa/src/api/store/payment-collections/helpers.ts +++ b/packages/medusa/src/api/store/payment-collections/helpers.ts @@ -1,4 +1,7 @@ -import { MedusaContainer, PaymentCollectionDTO } from "@medusajs/types" +import { + MedusaContainer, + PaymentCollectionDTO, +} from "@medusajs/framework/types" import { refetchEntity } from "../../utils/refetch-entity" export const refetchPaymentCollection = async ( diff --git a/packages/medusa/src/api/store/payment-collections/middlewares.ts b/packages/medusa/src/api/store/payment-collections/middlewares.ts index 88219e85ac..29539c527d 100644 --- a/packages/medusa/src/api/store/payment-collections/middlewares.ts +++ b/packages/medusa/src/api/store/payment-collections/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" import * as queryConfig from "./query-config" diff --git a/packages/medusa/src/api/store/payment-collections/route.ts b/packages/medusa/src/api/store/payment-collections/route.ts index 85a76c259e..4e73da8615 100644 --- a/packages/medusa/src/api/store/payment-collections/route.ts +++ b/packages/medusa/src/api/store/payment-collections/route.ts @@ -2,12 +2,12 @@ import { createPaymentCollectionForCartWorkflow } from "@medusajs/core-flows" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, } from "../../../types/routing" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: AuthenticatedMedusaRequest, diff --git a/packages/medusa/src/api/store/payment-providers/middlewares.ts b/packages/medusa/src/api/store/payment-providers/middlewares.ts index aef68ec1e9..53c90492a1 100644 --- a/packages/medusa/src/api/store/payment-providers/middlewares.ts +++ b/packages/medusa/src/api/store/payment-providers/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformQuery } from "../../utils/validate-query" import * as queryConfig from "./query-config" import { StoreGetPaymentProvidersParams } from "./validators" diff --git a/packages/medusa/src/api/store/payment-providers/route.ts b/packages/medusa/src/api/store/payment-providers/route.ts index e0956cdf21..145b4b05ad 100644 --- a/packages/medusa/src/api/store/payment-providers/route.ts +++ b/packages/medusa/src/api/store/payment-providers/route.ts @@ -6,8 +6,8 @@ import { ContainerRegistrationKeys, MedusaError, remoteQueryObjectFromString, -} from "@medusajs/utils" -import { HttpTypes } from "@medusajs/types" +} from "@medusajs/framework/utils" +import { HttpTypes } from "@medusajs/framework/types" // TODO: Add more fields to provider, such as default name and maybe logo. export const GET = async ( diff --git a/packages/medusa/src/api/store/product-categories/[id]/route.ts b/packages/medusa/src/api/store/product-categories/[id]/route.ts index 8daf25bb83..2f32749d8b 100644 --- a/packages/medusa/src/api/store/product-categories/[id]/route.ts +++ b/packages/medusa/src/api/store/product-categories/[id]/route.ts @@ -1,5 +1,5 @@ -import { StoreProductCategoryResponse } from "@medusajs/types" -import { MedusaError } from "@medusajs/utils" +import { StoreProductCategoryResponse } from "@medusajs/framework/types" +import { MedusaError } from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/store/product-categories/helpers.ts b/packages/medusa/src/api/store/product-categories/helpers.ts index 64bf4afe89..995affc23e 100644 --- a/packages/medusa/src/api/store/product-categories/helpers.ts +++ b/packages/medusa/src/api/store/product-categories/helpers.ts @@ -1,8 +1,8 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" export const refetchCategory = async ( categoryId: string, diff --git a/packages/medusa/src/api/store/product-categories/middlewares.ts b/packages/medusa/src/api/store/product-categories/middlewares.ts index 427aab9da7..41339b5770 100644 --- a/packages/medusa/src/api/store/product-categories/middlewares.ts +++ b/packages/medusa/src/api/store/product-categories/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformQuery } from "../../utils/validate-query" import { applyCategoryFilters } from "./helpers" import * as QueryConfig from "./query-config" diff --git a/packages/medusa/src/api/store/product-categories/route.ts b/packages/medusa/src/api/store/product-categories/route.ts index 4bce959bb3..9f0571e7ff 100644 --- a/packages/medusa/src/api/store/product-categories/route.ts +++ b/packages/medusa/src/api/store/product-categories/route.ts @@ -1,11 +1,11 @@ import { StoreProductCategoryListParams, StoreProductCategoryListResponse, -} from "@medusajs/types" +} from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { AuthenticatedMedusaRequest, MedusaResponse, diff --git a/packages/medusa/src/api/store/products/[id]/route.ts b/packages/medusa/src/api/store/products/[id]/route.ts index 5e537dd84d..a062498744 100644 --- a/packages/medusa/src/api/store/products/[id]/route.ts +++ b/packages/medusa/src/api/store/products/[id]/route.ts @@ -1,4 +1,4 @@ -import { MedusaError, isPresent } from "@medusajs/utils" +import { MedusaError, isPresent } from "@medusajs/framework/utils" import { MedusaResponse } from "../../../../types/routing" import { wrapVariantsWithInventoryQuantity } from "../../../utils/middlewares" import { @@ -7,7 +7,7 @@ import { wrapProductsWithTaxPrices, } from "../helpers" import { StoreGetProductParamsType } from "../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: RequestWithContext, diff --git a/packages/medusa/src/api/store/products/helpers.ts b/packages/medusa/src/api/store/products/helpers.ts index c282a7460b..19896b52f6 100644 --- a/packages/medusa/src/api/store/products/helpers.ts +++ b/packages/medusa/src/api/store/products/helpers.ts @@ -4,8 +4,8 @@ import { MedusaContainer, TaxCalculationContext, TaxableItemDTO, -} from "@medusajs/types" -import { Modules, calculateAmountsWithTax } from "@medusajs/utils" +} from "@medusajs/framework/types" +import { Modules, calculateAmountsWithTax } from "@medusajs/framework/utils" import { MedusaRequest } from "../../../types/routing" import { refetchEntities, refetchEntity } from "../../utils/refetch-entity" diff --git a/packages/medusa/src/api/store/products/middlewares.ts b/packages/medusa/src/api/store/products/middlewares.ts index 5aead67d8a..0e447a1469 100644 --- a/packages/medusa/src/api/store/products/middlewares.ts +++ b/packages/medusa/src/api/store/products/middlewares.ts @@ -1,5 +1,5 @@ -import { isPresent, ProductStatus } from "@medusajs/utils" -import { MiddlewareRoute } from "@medusajs/framework" +import { isPresent, ProductStatus } from "@medusajs/framework/utils" +import { MiddlewareRoute } from "@medusajs/framework/http" import { maybeApplyLinkFilter } from "../../utils/maybe-apply-link-filter" import { applyDefaultFilters, diff --git a/packages/medusa/src/api/store/products/route.ts b/packages/medusa/src/api/store/products/route.ts index ae13e1a220..20bc1c401c 100644 --- a/packages/medusa/src/api/store/products/route.ts +++ b/packages/medusa/src/api/store/products/route.ts @@ -2,11 +2,11 @@ import { ContainerRegistrationKeys, isPresent, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { MedusaResponse } from "../../../types/routing" import { wrapVariantsWithInventoryQuantity } from "../../utils/middlewares" import { RequestWithContext, wrapProductsWithTaxPrices } from "./helpers" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: RequestWithContext, diff --git a/packages/medusa/src/api/store/regions/[id]/route.ts b/packages/medusa/src/api/store/regions/[id]/route.ts index 2eccb5c687..f511761271 100644 --- a/packages/medusa/src/api/store/regions/[id]/route.ts +++ b/packages/medusa/src/api/store/regions/[id]/route.ts @@ -2,9 +2,9 @@ import { ContainerRegistrationKeys, MedusaError, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { MedusaRequest, MedusaResponse } from "../../../../types/routing" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: MedusaRequest, diff --git a/packages/medusa/src/api/store/regions/middlewares.ts b/packages/medusa/src/api/store/regions/middlewares.ts index 1380fad478..066dbf4d77 100644 --- a/packages/medusa/src/api/store/regions/middlewares.ts +++ b/packages/medusa/src/api/store/regions/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformQuery } from "../../utils/validate-query" import * as QueryConfig from "./query-config" import { StoreGetRegionParams, StoreGetRegionsParams } from "./validators" diff --git a/packages/medusa/src/api/store/regions/route.ts b/packages/medusa/src/api/store/regions/route.ts index a33023cdab..987990670a 100644 --- a/packages/medusa/src/api/store/regions/route.ts +++ b/packages/medusa/src/api/store/regions/route.ts @@ -1,9 +1,9 @@ import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { MedusaRequest, MedusaResponse } from "../../../types/routing" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: MedusaRequest, diff --git a/packages/medusa/src/api/store/return-reasons/[id]/route.ts b/packages/medusa/src/api/store/return-reasons/[id]/route.ts index d695f8aa5f..c28997a67b 100644 --- a/packages/medusa/src/api/store/return-reasons/[id]/route.ts +++ b/packages/medusa/src/api/store/return-reasons/[id]/route.ts @@ -1,10 +1,10 @@ import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { MedusaRequest, MedusaResponse } from "../../../../types/routing" import { StoreReturnReasonParamsType } from "../validators" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: MedusaRequest, diff --git a/packages/medusa/src/api/store/return-reasons/middlewares.ts b/packages/medusa/src/api/store/return-reasons/middlewares.ts index e1bf95479d..408d71c32a 100644 --- a/packages/medusa/src/api/store/return-reasons/middlewares.ts +++ b/packages/medusa/src/api/store/return-reasons/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformQuery } from "../../utils/validate-query" import * as QueryConfig from "./query-config" import { StoreReturnReasonParams } from "./validators" diff --git a/packages/medusa/src/api/store/return-reasons/route.ts b/packages/medusa/src/api/store/return-reasons/route.ts index 4eeab980cf..2e584efa03 100644 --- a/packages/medusa/src/api/store/return-reasons/route.ts +++ b/packages/medusa/src/api/store/return-reasons/route.ts @@ -1,9 +1,9 @@ import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { MedusaRequest, MedusaResponse } from "../../../types/routing" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const GET = async ( req: MedusaRequest, diff --git a/packages/medusa/src/api/store/return/middlewares.ts b/packages/medusa/src/api/store/return/middlewares.ts index 83f074b87e..f38d3b070b 100644 --- a/packages/medusa/src/api/store/return/middlewares.ts +++ b/packages/medusa/src/api/store/return/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformBody } from "../../utils/validate-body" import { validateAndTransformQuery } from "../../utils/validate-query" import * as QueryConfig from "./query-config" diff --git a/packages/medusa/src/api/store/return/route.ts b/packages/medusa/src/api/store/return/route.ts index be3856bbfb..ed6c11aa07 100644 --- a/packages/medusa/src/api/store/return/route.ts +++ b/packages/medusa/src/api/store/return/route.ts @@ -1,6 +1,6 @@ import { createAndCompleteReturnOrderWorkflow } from "@medusajs/core-flows" import { MedusaRequest, MedusaResponse } from "../../../types/routing" -import { HttpTypes } from "@medusajs/types" +import { HttpTypes } from "@medusajs/framework/types" export const POST = async ( req: MedusaRequest, diff --git a/packages/medusa/src/api/store/shipping-options/middlewares.ts b/packages/medusa/src/api/store/shipping-options/middlewares.ts index 39e8e8f93b..b30af428d3 100644 --- a/packages/medusa/src/api/store/shipping-options/middlewares.ts +++ b/packages/medusa/src/api/store/shipping-options/middlewares.ts @@ -1,4 +1,4 @@ -import { MiddlewareRoute } from "@medusajs/framework" +import { MiddlewareRoute } from "@medusajs/framework/http" import { validateAndTransformQuery } from "../../utils/validate-query" import { listTransformQueryConfig } from "./query-config" import { StoreGetShippingOptions } from "./validators" diff --git a/packages/medusa/src/api/store/shipping-options/route.ts b/packages/medusa/src/api/store/shipping-options/route.ts index a58a441df7..91a476e825 100644 --- a/packages/medusa/src/api/store/shipping-options/route.ts +++ b/packages/medusa/src/api/store/shipping-options/route.ts @@ -1,6 +1,6 @@ import { listShippingOptionsForCartWorkflow } from "@medusajs/core-flows" -import { HttpTypes, ICartModuleService } from "@medusajs/types" -import { MedusaError, Modules } from "@medusajs/utils" +import { HttpTypes, ICartModuleService } from "@medusajs/framework/types" +import { MedusaError, Modules } from "@medusajs/framework/utils" import { MedusaRequest, MedusaResponse } from "../../../types/routing" export const GET = async ( diff --git a/packages/medusa/src/api/utils/__tests__/validate-body.spec.ts b/packages/medusa/src/api/utils/__tests__/validate-body.spec.ts index 2b6e712280..feadbcef9f 100644 --- a/packages/medusa/src/api/utils/__tests__/validate-body.spec.ts +++ b/packages/medusa/src/api/utils/__tests__/validate-body.spec.ts @@ -1,5 +1,5 @@ import zod from "zod" -import { MedusaError } from "@medusajs/utils" +import { MedusaError } from "@medusajs/framework/utils" import { createLinkBody } from "../validators" import { validateAndTransformBody } from "../validate-body" import { MedusaRequest, MedusaResponse } from "../../../types/routing" diff --git a/packages/medusa/src/api/utils/__tests__/validate-query.spec.ts b/packages/medusa/src/api/utils/__tests__/validate-query.spec.ts index fe9ea099bf..779f634b68 100644 --- a/packages/medusa/src/api/utils/__tests__/validate-query.spec.ts +++ b/packages/medusa/src/api/utils/__tests__/validate-query.spec.ts @@ -1,10 +1,8 @@ -import zod from "zod" -import { MedusaError } from "@medusajs/utils" +import { MedusaError } from "@medusajs/framework/utils" import { NextFunction, Request, Response } from "express" import { createFindParams } from "../validators" import { validateAndTransformQuery } from "../validate-query" -import { MedusaRequest, MedusaResponse } from "../../../types/routing" describe("validateAndTransformQuery", () => { afterEach(() => { diff --git a/packages/medusa/src/api/utils/common-validators/products/index.ts b/packages/medusa/src/api/utils/common-validators/products/index.ts index a7c7294139..655923dab1 100644 --- a/packages/medusa/src/api/utils/common-validators/products/index.ts +++ b/packages/medusa/src/api/utils/common-validators/products/index.ts @@ -1,5 +1,5 @@ -import { FilterableProductProps } from "@medusajs/types" -import { ProductStatus } from "@medusajs/utils" +import { FilterableProductProps } from "@medusajs/framework/types" +import { ProductStatus } from "@medusajs/framework/utils" import { z } from "zod" import { createOperatorMap } from "../../validators" import { booleanString } from "../common" diff --git a/packages/medusa/src/api/utils/maybe-apply-link-filter.ts b/packages/medusa/src/api/utils/maybe-apply-link-filter.ts index 68db5f2f62..ce34aa8ccc 100644 --- a/packages/medusa/src/api/utils/maybe-apply-link-filter.ts +++ b/packages/medusa/src/api/utils/maybe-apply-link-filter.ts @@ -2,7 +2,7 @@ import { arrayIntersection, ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { NextFunction } from "express" import { MedusaRequest } from "../../types/routing" diff --git a/packages/medusa/src/api/utils/middlewares/common/apply-default-filters.ts b/packages/medusa/src/api/utils/middlewares/common/apply-default-filters.ts index f74f8c61af..064be4b303 100644 --- a/packages/medusa/src/api/utils/middlewares/common/apply-default-filters.ts +++ b/packages/medusa/src/api/utils/middlewares/common/apply-default-filters.ts @@ -1,4 +1,4 @@ -import { isObject, isPresent } from "@medusajs/utils" +import { isObject, isPresent } from "@medusajs/framework/utils" import { NextFunction } from "express" import { MedusaRequest } from "../../../../types/routing" diff --git a/packages/medusa/src/api/utils/middlewares/common/maybe-attach-pub-key-scopes.ts b/packages/medusa/src/api/utils/middlewares/common/maybe-attach-pub-key-scopes.ts index 1828047a86..44671f1d04 100644 --- a/packages/medusa/src/api/utils/middlewares/common/maybe-attach-pub-key-scopes.ts +++ b/packages/medusa/src/api/utils/middlewares/common/maybe-attach-pub-key-scopes.ts @@ -1,8 +1,8 @@ -import { RemoteQueryFunction } from "@medusajs/types" +import { RemoteQueryFunction } from "@medusajs/framework/types" import { ContainerRegistrationKeys, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { NextFunction } from "express" import { MedusaRequest, MedusaResponse } from "../../../../types/routing" diff --git a/packages/medusa/src/api/utils/middlewares/products/filter-by-valid-sales-channels.ts b/packages/medusa/src/api/utils/middlewares/products/filter-by-valid-sales-channels.ts index 18763f8075..3a14e53b2d 100644 --- a/packages/medusa/src/api/utils/middlewares/products/filter-by-valid-sales-channels.ts +++ b/packages/medusa/src/api/utils/middlewares/products/filter-by-valid-sales-channels.ts @@ -1,5 +1,5 @@ -import { MedusaStoreRequest } from "@medusajs/framework" -import { arrayDifference, MedusaError } from "@medusajs/utils" +import { MedusaStoreRequest } from "@medusajs/framework/http" +import { arrayDifference, MedusaError } from "@medusajs/framework/utils" import { NextFunction } from "express" // Selection of sales channels happens in the following priority: diff --git a/packages/medusa/src/api/utils/middlewares/products/normalize-data-for-context.ts b/packages/medusa/src/api/utils/middlewares/products/normalize-data-for-context.ts index c2b90bd8f3..35c37b26ea 100644 --- a/packages/medusa/src/api/utils/middlewares/products/normalize-data-for-context.ts +++ b/packages/medusa/src/api/utils/middlewares/products/normalize-data-for-context.ts @@ -1,4 +1,4 @@ -import { MedusaError } from "@medusajs/utils" +import { MedusaError } from "@medusajs/framework/utils" import { NextFunction } from "express" import { AuthenticatedMedusaRequest } from "../../../../types/routing" import { refetchEntities, refetchEntity } from "../../refetch-entity" diff --git a/packages/medusa/src/api/utils/middlewares/products/set-pricing-context.ts b/packages/medusa/src/api/utils/middlewares/products/set-pricing-context.ts index 02a58cb962..501034c7f0 100644 --- a/packages/medusa/src/api/utils/middlewares/products/set-pricing-context.ts +++ b/packages/medusa/src/api/utils/middlewares/products/set-pricing-context.ts @@ -1,5 +1,5 @@ -import { MedusaPricingContext } from "@medusajs/types" -import { MedusaError } from "@medusajs/utils" +import { MedusaPricingContext } from "@medusajs/framework/types" +import { MedusaError } from "@medusajs/framework/utils" import { NextFunction } from "express" import { AuthenticatedMedusaRequest } from "../../../../types/routing" import { refetchEntities, refetchEntity } from "../../refetch-entity" diff --git a/packages/medusa/src/api/utils/middlewares/products/set-tax-context.ts b/packages/medusa/src/api/utils/middlewares/products/set-tax-context.ts index b87335a92d..80154c9622 100644 --- a/packages/medusa/src/api/utils/middlewares/products/set-tax-context.ts +++ b/packages/medusa/src/api/utils/middlewares/products/set-tax-context.ts @@ -1,11 +1,11 @@ -import { TaxCalculationContext } from "@medusajs/types" +import { TaxCalculationContext } from "@medusajs/framework/types" import { NextFunction } from "express" import { AuthenticatedMedusaRequest, MedusaRequest, } from "../../../../types/routing" import { refetchEntity } from "../../refetch-entity" -import { MedusaError } from "@medusajs/utils" +import { MedusaError } from "@medusajs/framework/utils" import { RequestWithContext } from "../../../store/products/helpers" export function setTaxContext() { diff --git a/packages/medusa/src/api/utils/middlewares/products/variant-inventory-quantity.ts b/packages/medusa/src/api/utils/middlewares/products/variant-inventory-quantity.ts index 4099560501..f9cae4fb15 100644 --- a/packages/medusa/src/api/utils/middlewares/products/variant-inventory-quantity.ts +++ b/packages/medusa/src/api/utils/middlewares/products/variant-inventory-quantity.ts @@ -2,7 +2,7 @@ import { ContainerRegistrationKeys, LINKS, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { MedusaRequest } from "../../../../types/routing" export async function getVariantInventoryItems({ diff --git a/packages/medusa/src/api/utils/refetch-entity.ts b/packages/medusa/src/api/utils/refetch-entity.ts index b3b8ee03d6..add64ea1b5 100644 --- a/packages/medusa/src/api/utils/refetch-entity.ts +++ b/packages/medusa/src/api/utils/refetch-entity.ts @@ -1,9 +1,9 @@ -import { MedusaContainer } from "@medusajs/types" +import { MedusaContainer } from "@medusajs/framework/types" import { ContainerRegistrationKeys, isString, remoteQueryObjectFromString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { MedusaRequest } from "../../types/routing" export const refetchEntities = async ( diff --git a/packages/medusa/src/api/utils/unless-path.ts b/packages/medusa/src/api/utils/unless-path.ts index 87e4177e49..7b8c779d84 100644 --- a/packages/medusa/src/api/utils/unless-path.ts +++ b/packages/medusa/src/api/utils/unless-path.ts @@ -1,4 +1,4 @@ -import { MiddlewareFunction } from "@medusajs/framework" +import { MiddlewareFunction } from "@medusajs/framework/http" import { NextFunction } from "express" import { MedusaRequest, MedusaResponse } from "../../types/routing" diff --git a/packages/medusa/src/api/utils/validate-query.ts b/packages/medusa/src/api/utils/validate-query.ts index 6987b3fbab..38f891332d 100644 --- a/packages/medusa/src/api/utils/validate-query.ts +++ b/packages/medusa/src/api/utils/validate-query.ts @@ -1,4 +1,8 @@ -import { BaseEntity, QueryConfig, RequestQueryFields } from "@medusajs/types" +import { + BaseEntity, + QueryConfig, + RequestQueryFields, +} from "@medusajs/framework/types" import { NextFunction } from "express" import { omit } from "lodash" import { z } from "zod" @@ -9,7 +13,7 @@ import { prepareRetrieveQuery, } from "../../utils/get-query-config" import { zodValidator } from "./zod-helper" -import { MedusaError } from "@medusajs/utils" +import { MedusaError } from "@medusajs/framework/utils" /** * Normalize an input query, especially from array like query params to an array type diff --git a/packages/medusa/src/api/utils/zod-helper.ts b/packages/medusa/src/api/utils/zod-helper.ts index be41e42e04..178fd4273c 100644 --- a/packages/medusa/src/api/utils/zod-helper.ts +++ b/packages/medusa/src/api/utils/zod-helper.ts @@ -1,4 +1,4 @@ -import { MedusaError } from "@medusajs/utils" +import { MedusaError } from "@medusajs/framework/utils" import { z, ZodError, diff --git a/packages/medusa/src/commands/build.ts b/packages/medusa/src/commands/build.ts index 149ef66582..c76767d6ea 100644 --- a/packages/medusa/src/commands/build.ts +++ b/packages/medusa/src/commands/build.ts @@ -1,5 +1,5 @@ -import { ConfigModule } from "@medusajs/types" -import { getConfigFile } from "@medusajs/utils" +import { ConfigModule } from "@medusajs/framework/types" +import { getConfigFile } from "@medusajs/framework/utils" import { transformFile } from "@swc/core" import { existsSync } from "node:fs" import { copyFile, mkdir, readdir, rm, writeFile } from "node:fs/promises" diff --git a/packages/medusa/src/commands/db/create.ts b/packages/medusa/src/commands/db/create.ts index c3c46dd356..09aa268369 100644 --- a/packages/medusa/src/commands/db/create.ts +++ b/packages/medusa/src/commands/db/create.ts @@ -1,14 +1,14 @@ import slugify from "slugify" import { basename } from "path" import input from "@inquirer/input" -import { logger } from "@medusajs/framework" +import { logger } from "@medusajs/framework/logger" import { + createClient, createDb, dbExists, EnvEditor, - createClient, parseConnectionString, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" /** * A low-level utility to create the database. This util should diff --git a/packages/medusa/src/commands/db/generate.ts b/packages/medusa/src/commands/db/generate.ts index c832f345bc..aeddb2a07e 100644 --- a/packages/medusa/src/commands/db/generate.ts +++ b/packages/medusa/src/commands/db/generate.ts @@ -1,6 +1,11 @@ import { join } from "path" -import { ContainerRegistrationKeys, MedusaError } from "@medusajs/utils" -import { LinkLoader, logger, MedusaAppLoader } from "@medusajs/framework" +import { + ContainerRegistrationKeys, + MedusaError, +} from "@medusajs/framework/utils" +import { LinkLoader } from "@medusajs/framework/links" +import { logger } from "@medusajs/framework/logger" +import { MedusaAppLoader } from "@medusajs/framework" import { ensureDbExists } from "../utils" import { initializeContainer } from "../../loaders" diff --git a/packages/medusa/src/commands/db/migrate.ts b/packages/medusa/src/commands/db/migrate.ts index 945a7c0ff3..b8b086280f 100644 --- a/packages/medusa/src/commands/db/migrate.ts +++ b/packages/medusa/src/commands/db/migrate.ts @@ -1,6 +1,8 @@ import { join } from "path" -import { ContainerRegistrationKeys } from "@medusajs/utils" -import { LinkLoader, logger, MedusaAppLoader } from "@medusajs/framework" +import { ContainerRegistrationKeys } from "@medusajs/framework/utils" +import { LinkLoader } from "@medusajs/framework/links" +import { logger } from "@medusajs/framework/logger" +import { MedusaAppLoader } from "@medusajs/framework" import { syncLinks } from "./sync-links" import { ensureDbExists } from "../utils" diff --git a/packages/medusa/src/commands/db/rollback.ts b/packages/medusa/src/commands/db/rollback.ts index 28e7de66a2..61ad13118e 100644 --- a/packages/medusa/src/commands/db/rollback.ts +++ b/packages/medusa/src/commands/db/rollback.ts @@ -1,6 +1,11 @@ import { join } from "path" -import { ContainerRegistrationKeys, MedusaError } from "@medusajs/utils" -import { LinkLoader, logger, MedusaAppLoader } from "@medusajs/framework" +import { + ContainerRegistrationKeys, + MedusaError, +} from "@medusajs/framework/utils" +import { LinkLoader } from "@medusajs/framework/links" +import { logger } from "@medusajs/framework/logger" +import { MedusaAppLoader } from "@medusajs/framework" import { ensureDbExists } from "../utils" import { initializeContainer } from "../../loaders" diff --git a/packages/medusa/src/commands/db/setup.ts b/packages/medusa/src/commands/db/setup.ts index 1427aac061..df64824a47 100644 --- a/packages/medusa/src/commands/db/setup.ts +++ b/packages/medusa/src/commands/db/setup.ts @@ -1,4 +1,4 @@ -import { logger } from "@medusajs/framework" +import { logger } from "@medusajs/framework/logger" import { dbCreate } from "./create" import { migrate } from "./migrate" diff --git a/packages/medusa/src/commands/db/sync-links.ts b/packages/medusa/src/commands/db/sync-links.ts index 88adad8978..a151c0f0a9 100644 --- a/packages/medusa/src/commands/db/sync-links.ts +++ b/packages/medusa/src/commands/db/sync-links.ts @@ -2,9 +2,11 @@ import boxen from "boxen" import chalk from "chalk" import { join } from "path" import checkbox from "@inquirer/checkbox" -import { ContainerRegistrationKeys } from "@medusajs/utils" -import { LinkMigrationsPlannerAction } from "@medusajs/types" -import { LinkLoader, logger, MedusaAppLoader } from "@medusajs/framework" +import { ContainerRegistrationKeys } from "@medusajs/framework/utils" +import { LinkMigrationsPlannerAction } from "@medusajs/framework/types" +import { LinkLoader } from "@medusajs/framework/links" +import { logger } from "@medusajs/framework/logger" +import { MedusaAppLoader } from "@medusajs/framework" import { ensureDbExists } from "../utils" import { initializeContainer } from "../../loaders" diff --git a/packages/medusa/src/commands/develop.ts b/packages/medusa/src/commands/develop.ts index 3647141bdd..353f8a4621 100644 --- a/packages/medusa/src/commands/develop.ts +++ b/packages/medusa/src/commands/develop.ts @@ -5,7 +5,8 @@ import { Store } from "medusa-telemetry" import { EOL } from "os" import path from "path" -import { logger, MEDUSA_CLI_PATH } from "@medusajs/framework" +import { logger } from "@medusajs/framework/logger" +import { MEDUSA_CLI_PATH } from "@medusajs/framework" const defaultConfig = { padding: 5, diff --git a/packages/medusa/src/commands/exec.ts b/packages/medusa/src/commands/exec.ts index f641120e2d..beb8df41ab 100644 --- a/packages/medusa/src/commands/exec.ts +++ b/packages/medusa/src/commands/exec.ts @@ -2,9 +2,9 @@ import loaders from "../loaders" import express from "express" import path from "path" import { existsSync } from "fs" -import { logger } from "@medusajs/framework" -import { ExecArgs } from "@medusajs/types" -import { dynamicImport } from "@medusajs/utils" +import { logger } from "@medusajs/framework/logger" +import { ExecArgs } from "@medusajs/framework/types" +import { dynamicImport } from "@medusajs/framework/utils" type Options = { file: string diff --git a/packages/medusa/src/commands/migrate.ts b/packages/medusa/src/commands/migrate.ts index 36f475167d..7b9cf72ed9 100644 --- a/packages/medusa/src/commands/migrate.ts +++ b/packages/medusa/src/commands/migrate.ts @@ -1,6 +1,11 @@ -import { LinkLoader, logger, MedusaAppLoader } from "@medusajs/framework" +import { LinkLoader } from "@medusajs/framework/links" +import { logger } from "@medusajs/framework/logger" +import { MedusaAppLoader } from "@medusajs/framework" import { initializeContainer } from "../loaders" -import { ContainerRegistrationKeys, MedusaError } from "@medusajs/utils" +import { + ContainerRegistrationKeys, + MedusaError, +} from "@medusajs/framework/utils" import { getResolvedPlugins } from "../loaders/helpers/resolve-plugins" import { join } from "path" diff --git a/packages/medusa/src/commands/start-cluster.ts b/packages/medusa/src/commands/start-cluster.ts index 181ae4f2d3..7a49be432d 100644 --- a/packages/medusa/src/commands/start-cluster.ts +++ b/packages/medusa/src/commands/start-cluster.ts @@ -4,8 +4,8 @@ import { track } from "medusa-telemetry" import { scheduleJob } from "node-schedule" import os from "os" -import { logger } from "@medusajs/framework" -import { GracefulShutdownServer, isPresent } from "@medusajs/utils" +import { logger } from "@medusajs/framework/logger" +import { GracefulShutdownServer, isPresent } from "@medusajs/framework/utils" import loaders from "../loaders" const EVERY_SIXTH_HOUR = "0 */6 * * *" diff --git a/packages/medusa/src/commands/start.ts b/packages/medusa/src/commands/start.ts index 9f254e2556..3d6f9fc8ac 100644 --- a/packages/medusa/src/commands/start.ts +++ b/packages/medusa/src/commands/start.ts @@ -3,12 +3,15 @@ import express from "express" import { track } from "medusa-telemetry" import { scheduleJob } from "node-schedule" -import { gqlSchemaToTypes, GracefulShutdownServer } from "@medusajs/utils" +import { + gqlSchemaToTypes, + GracefulShutdownServer, +} from "@medusajs/framework/utils" import http, { IncomingMessage, ServerResponse } from "http" -import { logger } from "@medusajs/framework" +import { logger } from "@medusajs/framework/logger" import loaders from "../loaders" -import { MedusaModule } from "@medusajs/modules-sdk" +import { MedusaModule } from "@medusajs/framework/modules-sdk" const EVERY_SIXTH_HOUR = "0 */6 * * *" const CRON_SCHEDULE = EVERY_SIXTH_HOUR @@ -29,7 +32,11 @@ async function registerInstrumentation(directory: string) { instrumentation.register() } } catch (error) { - if (!["ENOENT", "MODULE_NOT_FOUND"].includes(error.code)) { + if ( + !["ENOENT", "MODULE_NOT_FOUND", "ERR_MODULE_NOT_FOUND"].includes( + error.code + ) + ) { throw error } } diff --git a/packages/medusa/src/commands/user.ts b/packages/medusa/src/commands/user.ts index 5d75c0b80f..0d5002bc6a 100644 --- a/packages/medusa/src/commands/user.ts +++ b/packages/medusa/src/commands/user.ts @@ -1,5 +1,5 @@ -import { logger } from "@medusajs/framework" -import { Modules } from "@medusajs/utils" +import { logger } from "@medusajs/framework/logger" +import { Modules } from "@medusajs/framework/utils" import express from "express" import { track } from "medusa-telemetry" import loaders from "../loaders" diff --git a/packages/medusa/src/commands/utils/index.ts b/packages/medusa/src/commands/utils/index.ts index c78b4a1001..3d7983de98 100644 --- a/packages/medusa/src/commands/utils/index.ts +++ b/packages/medusa/src/commands/utils/index.ts @@ -1,6 +1,6 @@ -import { logger } from "@medusajs/framework" -import { MedusaContainer } from "@medusajs/types" -import { ContainerRegistrationKeys } from "@medusajs/utils" +import { logger } from "@medusajs/framework/logger" +import { MedusaContainer } from "@medusajs/framework/types" +import { ContainerRegistrationKeys } from "@medusajs/framework/utils" export async function ensureDbExists(container: MedusaContainer) { const pgConnection = container.resolve( diff --git a/packages/medusa/src/instrumentation/index.ts b/packages/medusa/src/instrumentation/index.ts index 6aa7101a79..5bcf91e4a6 100644 --- a/packages/medusa/src/instrumentation/index.ts +++ b/packages/medusa/src/instrumentation/index.ts @@ -1,8 +1,10 @@ import { snakeCase } from "lodash" -import { Query, RoutesLoader, Tracer } from "@medusajs/framework" +import { Query } from "@medusajs/framework" +import { RoutesLoader } from "@medusajs/framework/http" +import { Tracer } from "@medusajs/framework/telemetry" import type { SpanExporter } from "@opentelemetry/sdk-trace-node" import type { Instrumentation } from "@opentelemetry/instrumentation" -import { TransactionOrchestrator } from "@medusajs/orchestration" +import { TransactionOrchestrator } from "@medusajs/framework/orchestration" const EXCLUDED_RESOURCES = [".vite", "virtual:"] @@ -202,7 +204,10 @@ export function instrumentRemoteQuery() { * Instrument the workflows and steps execution */ export function instrumentWorkflows() { - const WorkflowsTracer = new Tracer("@medusajs/workflows-sdk", "2.0.0") + const WorkflowsTracer = new Tracer( + "@medusajs/framework/workflows-sdk", + "2.0.0" + ) TransactionOrchestrator.traceTransaction = async ( transactionResumeFn, diff --git a/packages/medusa/src/loaders/admin.ts b/packages/medusa/src/loaders/admin.ts index a5fe1f61be..bdeb793d05 100644 --- a/packages/medusa/src/loaders/admin.ts +++ b/packages/medusa/src/loaders/admin.ts @@ -1,4 +1,4 @@ -import { AdminOptions, ConfigModule } from "@medusajs/types" +import { AdminOptions, ConfigModule } from "@medusajs/framework/types" import { Express } from "express" import fs from "fs" import path from "path" diff --git a/packages/medusa/src/loaders/api.ts b/packages/medusa/src/loaders/api.ts index a91310f22f..4286fca604 100644 --- a/packages/medusa/src/loaders/api.ts +++ b/packages/medusa/src/loaders/api.ts @@ -1,8 +1,8 @@ import { Express } from "express" import { join } from "path" import qs from "qs" -import { RoutesLoader } from "@medusajs/framework" -import { MedusaContainer, PluginDetails } from "@medusajs/types" +import { RoutesLoader } from "@medusajs/framework/http" +import { MedusaContainer, PluginDetails } from "@medusajs/framework/types" type Options = { app: Express diff --git a/packages/medusa/src/loaders/feature-flags/analytics.ts b/packages/medusa/src/loaders/feature-flags/analytics.ts index f5a1c29ee8..a46e43aaa7 100644 --- a/packages/medusa/src/loaders/feature-flags/analytics.ts +++ b/packages/medusa/src/loaders/feature-flags/analytics.ts @@ -1,4 +1,4 @@ -import { FlagSettings } from "@medusajs/framework" +import { FlagSettings } from "@medusajs/framework/feature-flags" const AnalyticsFeatureFlag: FlagSettings = { key: "analytics", diff --git a/packages/medusa/src/loaders/feature-flags/medusa-v2.ts b/packages/medusa/src/loaders/feature-flags/medusa-v2.ts index ebdb42a1f4..62781944dd 100644 --- a/packages/medusa/src/loaders/feature-flags/medusa-v2.ts +++ b/packages/medusa/src/loaders/feature-flags/medusa-v2.ts @@ -1,3 +1,3 @@ -import { MedusaV2Flag } from "@medusajs/utils" +import { MedusaV2Flag } from "@medusajs/framework/utils" export default MedusaV2Flag diff --git a/packages/medusa/src/loaders/feature-flags/order-editing.ts b/packages/medusa/src/loaders/feature-flags/order-editing.ts index 343f6e83a2..a8b83e4bba 100644 --- a/packages/medusa/src/loaders/feature-flags/order-editing.ts +++ b/packages/medusa/src/loaders/feature-flags/order-editing.ts @@ -1,4 +1,4 @@ -import { FlagSettings } from "@medusajs/framework" +import { FlagSettings } from "@medusajs/framework/feature-flags" const OrderEditingFeatureFlag: FlagSettings = { key: "order_editing", diff --git a/packages/medusa/src/loaders/feature-flags/product-categories.ts b/packages/medusa/src/loaders/feature-flags/product-categories.ts index 7f0fd0015b..03c3999b22 100644 --- a/packages/medusa/src/loaders/feature-flags/product-categories.ts +++ b/packages/medusa/src/loaders/feature-flags/product-categories.ts @@ -1,4 +1,4 @@ -import { FlagSettings } from "@medusajs/framework" +import { FlagSettings } from "@medusajs/framework/feature-flags" const ProductCategoryFeatureFlag: FlagSettings = { key: "product_categories", diff --git a/packages/medusa/src/loaders/feature-flags/publishable-api-keys.ts b/packages/medusa/src/loaders/feature-flags/publishable-api-keys.ts index 5ccedfd3a7..9aa4d36a17 100644 --- a/packages/medusa/src/loaders/feature-flags/publishable-api-keys.ts +++ b/packages/medusa/src/loaders/feature-flags/publishable-api-keys.ts @@ -1,4 +1,4 @@ -import { FlagSettings } from "@medusajs/framework" +import { FlagSettings } from "@medusajs/framework/feature-flags" const PublishableAPIKeysFeatureFlag: FlagSettings = { key: "publishable_api_keys", diff --git a/packages/medusa/src/loaders/feature-flags/sales-channels.ts b/packages/medusa/src/loaders/feature-flags/sales-channels.ts index f5671a35a8..9137705461 100644 --- a/packages/medusa/src/loaders/feature-flags/sales-channels.ts +++ b/packages/medusa/src/loaders/feature-flags/sales-channels.ts @@ -1,4 +1,4 @@ -import { FlagSettings } from "@medusajs/framework" +import { FlagSettings } from "@medusajs/framework/feature-flags" const SalesChannelFeatureFlag: FlagSettings = { key: "sales_channels", diff --git a/packages/medusa/src/loaders/feature-flags/tax-inclusive-pricing.ts b/packages/medusa/src/loaders/feature-flags/tax-inclusive-pricing.ts index 6655b21283..0149675dac 100644 --- a/packages/medusa/src/loaders/feature-flags/tax-inclusive-pricing.ts +++ b/packages/medusa/src/loaders/feature-flags/tax-inclusive-pricing.ts @@ -1,4 +1,4 @@ -import { FlagSettings } from "@medusajs/framework" +import { FlagSettings } from "@medusajs/framework/feature-flags" const TaxInclusivePricingFeatureFlag: FlagSettings = { key: "tax_inclusive_pricing", diff --git a/packages/medusa/src/loaders/feature-flags/workflows.ts b/packages/medusa/src/loaders/feature-flags/workflows.ts index 7c214a0e7e..112d7b7e14 100644 --- a/packages/medusa/src/loaders/feature-flags/workflows.ts +++ b/packages/medusa/src/loaders/feature-flags/workflows.ts @@ -1,3 +1,3 @@ -import { WorkflowsFeatureFlag } from "@medusajs/utils" +import { WorkflowsFeatureFlag } from "@medusajs/framework/utils" export default WorkflowsFeatureFlag diff --git a/packages/medusa/src/loaders/helpers/resolve-plugins.ts b/packages/medusa/src/loaders/helpers/resolve-plugins.ts index 7b2f80f45f..52931c69aa 100644 --- a/packages/medusa/src/loaders/helpers/resolve-plugins.ts +++ b/packages/medusa/src/loaders/helpers/resolve-plugins.ts @@ -1,5 +1,5 @@ -import { ConfigModule, PluginDetails } from "@medusajs/types" -import { isString } from "@medusajs/utils" +import { ConfigModule, PluginDetails } from "@medusajs/framework/types" +import { isString } from "@medusajs/framework/utils" import fs from "fs" import { sync as existsSync } from "fs-exists-cached" import path, { isAbsolute } from "path" diff --git a/packages/medusa/src/loaders/index.ts b/packages/medusa/src/loaders/index.ts index 3c963ce815..df7417dafb 100644 --- a/packages/medusa/src/loaders/index.ts +++ b/packages/medusa/src/loaders/index.ts @@ -1,5 +1,13 @@ -import { ConfigModule, MedusaContainer, PluginDetails } from "@medusajs/types" -import { ContainerRegistrationKeys, promiseAll, GraphQLSchema } from "@medusajs/utils" +import { + ConfigModule, + MedusaContainer, + PluginDetails, +} from "@medusajs/framework/types" +import { + ContainerRegistrationKeys, + promiseAll, + GraphQLSchema, +} from "@medusajs/framework/utils" import { asValue } from "awilix" import { Express, NextFunction, Request, Response } from "express" import { join } from "path" @@ -7,19 +15,16 @@ import requestIp from "request-ip" import { v4 } from "uuid" import adminLoader from "./admin" import apiLoader from "./api" -import { - configLoader, - container, - expressLoader, - featureFlagsLoader, - JobLoader, - LinkLoader, - logger, - MedusaAppLoader, - pgConnectionLoader, - SubscriberLoader, - WorkflowLoader, -} from "@medusajs/framework" +import { configLoader } from "@medusajs/framework/config" +import { expressLoader } from "@medusajs/framework/http" +import { JobLoader } from "@medusajs/framework/jobs" +import { LinkLoader } from "@medusajs/framework/links" +import { logger } from "@medusajs/framework/logger" +import { container, MedusaAppLoader } from "@medusajs/framework" +import { pgConnectionLoader } from "@medusajs/framework/database" +import { SubscriberLoader } from "@medusajs/framework/subscribers" +import { WorkflowLoader } from "@medusajs/framework/workflows" +import { featureFlagsLoader } from "@medusajs/framework/feature-flags" import { getResolvedPlugins } from "./helpers/resolve-plugins" type Options = { diff --git a/packages/medusa/src/subscribers/configurable-notifications.ts b/packages/medusa/src/subscribers/configurable-notifications.ts index 4265be29c1..eea42f08db 100644 --- a/packages/medusa/src/subscribers/configurable-notifications.ts +++ b/packages/medusa/src/subscribers/configurable-notifications.ts @@ -1,5 +1,9 @@ -import { INotificationModuleService } from "@medusajs/types" -import { ContainerRegistrationKeys, Modules, promiseAll } from "@medusajs/utils" +import { INotificationModuleService } from "@medusajs/framework/types" +import { + ContainerRegistrationKeys, + Modules, + promiseAll, +} from "@medusajs/framework/utils" import { get } from "lodash" import { SubscriberArgs, SubscriberConfig } from "../types/subscribers" diff --git a/packages/medusa/src/subscribers/payment-webhook.ts b/packages/medusa/src/subscribers/payment-webhook.ts index 8ee4062bf4..8860e5f8a3 100644 --- a/packages/medusa/src/subscribers/payment-webhook.ts +++ b/packages/medusa/src/subscribers/payment-webhook.ts @@ -1,5 +1,8 @@ -import { IPaymentModuleService, ProviderWebhookPayload } from "@medusajs/types" -import { Modules, PaymentWebhookEvents } from "@medusajs/utils" +import { + IPaymentModuleService, + ProviderWebhookPayload, +} from "@medusajs/framework/types" +import { Modules, PaymentWebhookEvents } from "@medusajs/framework/utils" import { SubscriberArgs, SubscriberConfig } from "../types/subscribers" type SerializedBuffer = { diff --git a/packages/medusa/src/types/global.ts b/packages/medusa/src/types/global.ts index a04549a366..b0f3dfb516 100644 --- a/packages/medusa/src/types/global.ts +++ b/packages/medusa/src/types/global.ts @@ -1,7 +1,7 @@ import { MedusaContainer as coreMedusaContainer, RequestQueryFields, -} from "@medusajs/types" +} from "@medusajs/framework/types" import { FindConfig } from "./common" declare global { diff --git a/packages/medusa/src/types/routing.ts b/packages/medusa/src/types/routing.ts index 74a4de9d09..f9d4f1cf41 100644 --- a/packages/medusa/src/types/routing.ts +++ b/packages/medusa/src/types/routing.ts @@ -5,13 +5,18 @@ import { MedusaContainer, MedusaPricingContext, RequestQueryFields, -} from "@medusajs/types" -import * as core from "express-serve-static-core" +} from "@medusajs/framework/types" import { FindConfig } from "./common" // TODO this will be reqorked and move to the framework at a later point unless decided otherwise export interface MedusaRequest - extends Request { + extends Request< + { + [key: string]: string + }, + any, + Body + > { validatedBody: Body validatedQuery: RequestQueryFields & Record /** diff --git a/packages/medusa/src/types/subscribers.ts b/packages/medusa/src/types/subscribers.ts index 97a0a57662..254536aaa6 100644 --- a/packages/medusa/src/types/subscribers.ts +++ b/packages/medusa/src/types/subscribers.ts @@ -1,4 +1,4 @@ -import { Event, MedusaContainer } from "@medusajs/types" +import { Event, MedusaContainer } from "@medusajs/framework/types" interface SubscriberContext extends Record { subscriberId?: string diff --git a/packages/medusa/src/utils/api/http-compression.ts b/packages/medusa/src/utils/api/http-compression.ts index 1926c981f6..013681e65e 100644 --- a/packages/medusa/src/utils/api/http-compression.ts +++ b/packages/medusa/src/utils/api/http-compression.ts @@ -1,4 +1,7 @@ -import { HttpCompressionOptions, ProjectConfigOptions } from "@medusajs/types" +import { + HttpCompressionOptions, + ProjectConfigOptions, +} from "@medusajs/framework/types" import compression from "compression" import { Request, Response } from "express" diff --git a/packages/medusa/src/utils/clean-response-data.ts b/packages/medusa/src/utils/clean-response-data.ts index 66af60de0f..e99d12d426 100644 --- a/packages/medusa/src/utils/clean-response-data.ts +++ b/packages/medusa/src/utils/clean-response-data.ts @@ -1,4 +1,4 @@ -import { pickDeep } from "@medusajs/utils" +import { pickDeep } from "@medusajs/framework/utils" import { omitDeep } from "./omit-deep" // TODO: once the legacy totals decoration will be removed. diff --git a/packages/medusa/src/utils/define-middlewares.ts b/packages/medusa/src/utils/define-middlewares.ts index f966b11be5..a9a4fc96be 100644 --- a/packages/medusa/src/utils/define-middlewares.ts +++ b/packages/medusa/src/utils/define-middlewares.ts @@ -1,4 +1,4 @@ -import { defineMiddlewares as originalDefineMiddlewares } from "@medusajs/framework" +import { defineMiddlewares as originalDefineMiddlewares } from "@medusajs/framework/http" /** * A helper function to configure the routes by defining custom middleware, diff --git a/packages/medusa/src/utils/exception-formatter.ts b/packages/medusa/src/utils/exception-formatter.ts index d4907b22d9..d7b934c3c1 100644 --- a/packages/medusa/src/utils/exception-formatter.ts +++ b/packages/medusa/src/utils/exception-formatter.ts @@ -1,3 +1,3 @@ -import { formatException as originalFormatException } from "@medusajs/framework" +import { formatException as originalFormatException } from "@medusajs/framework/http" export const formatException = originalFormatException diff --git a/packages/medusa/src/utils/format-registration-name.ts b/packages/medusa/src/utils/format-registration-name.ts index 067cbc4258..6a892bf427 100644 --- a/packages/medusa/src/utils/format-registration-name.ts +++ b/packages/medusa/src/utils/format-registration-name.ts @@ -1,5 +1,5 @@ import { parse } from "path" -import { toCamelCase, upperCaseFirst } from "@medusajs/utils" +import { toCamelCase, upperCaseFirst } from "@medusajs/framework/utils" /** * Formats a filename into the correct container resolution name. diff --git a/packages/medusa/src/utils/get-query-config.ts b/packages/medusa/src/utils/get-query-config.ts index 4b930e1c79..7aefb1de61 100644 --- a/packages/medusa/src/utils/get-query-config.ts +++ b/packages/medusa/src/utils/get-query-config.ts @@ -1,11 +1,11 @@ -import { RequestQueryFields } from "@medusajs/types" +import { RequestQueryFields } from "@medusajs/framework/types" import { getSetDifference, isDefined, isPresent, MedusaError, stringToSelectRelationObject, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { pick } from "lodash" import { FindConfig, QueryConfig } from "../types/common" diff --git a/packages/medusa/src/utils/middlewares/authenticate-middleware.ts b/packages/medusa/src/utils/middlewares/authenticate-middleware.ts index 1e9fdac9a1..55b583fcf4 100644 --- a/packages/medusa/src/utils/middlewares/authenticate-middleware.ts +++ b/packages/medusa/src/utils/middlewares/authenticate-middleware.ts @@ -1,3 +1,3 @@ -import { authenticate as originalAuthenticate } from "@medusajs/framework" +import { authenticate as originalAuthenticate } from "@medusajs/framework/http" export const authenticate = originalAuthenticate diff --git a/packages/medusa/src/utils/middlewares/ensure-publishable-api-key.ts b/packages/medusa/src/utils/middlewares/ensure-publishable-api-key.ts index dd491ceae6..282d26090e 100644 --- a/packages/medusa/src/utils/middlewares/ensure-publishable-api-key.ts +++ b/packages/medusa/src/utils/middlewares/ensure-publishable-api-key.ts @@ -2,13 +2,13 @@ import { MedusaNextFunction, MedusaResponse, MedusaStoreRequest, -} from "@medusajs/framework" +} from "@medusajs/framework/http" import { ApiKeyType, isPresent, MedusaError, PUBLISHABLE_KEY_HEADER, -} from "@medusajs/utils" +} from "@medusajs/framework/utils" import { refetchEntity } from "../../api/utils/refetch-entity" export function ensurePublishableApiKey() { diff --git a/packages/medusa/src/utils/middlewares/error-handler.ts b/packages/medusa/src/utils/middlewares/error-handler.ts index 9ee979e41d..04523279e8 100644 --- a/packages/medusa/src/utils/middlewares/error-handler.ts +++ b/packages/medusa/src/utils/middlewares/error-handler.ts @@ -1,3 +1,3 @@ -import { errorHandler as originalErrorHandler } from "@medusajs/framework" +import { errorHandler as originalErrorHandler } from "@medusajs/framework/http" export const errorHandler = originalErrorHandler diff --git a/packages/medusa/src/utils/omit-deep.ts b/packages/medusa/src/utils/omit-deep.ts index 0c3639e3f7..848a208331 100644 --- a/packages/medusa/src/utils/omit-deep.ts +++ b/packages/medusa/src/utils/omit-deep.ts @@ -1,4 +1,4 @@ -import { isObject } from "@medusajs/utils" +import { isObject } from "@medusajs/framework/utils" export function omitDeep( input: object, diff --git a/packages/medusa/src/utils/remove-undefined-properties.ts b/packages/medusa/src/utils/remove-undefined-properties.ts index 1590f5e895..87e0ab9316 100644 --- a/packages/medusa/src/utils/remove-undefined-properties.ts +++ b/packages/medusa/src/utils/remove-undefined-properties.ts @@ -1,4 +1,4 @@ -import { isDefined } from "@medusajs/utils" +import { isDefined } from "@medusajs/framework/utils" export function removeUndefinedProperties(inputObj: T): T { const removeProperties = (obj: T) => { diff --git a/packages/medusa/tsconfig.json b/packages/medusa/tsconfig.json index fd0da6837a..161c09e5f3 100644 --- a/packages/medusa/tsconfig.json +++ b/packages/medusa/tsconfig.json @@ -1,32 +1,3 @@ { - "compilerOptions": { - "lib": ["es2021"], - "target": "es2021", - "outDir": "./dist", - "esModuleInterop": true, - "declarationMap": true, - "declaration": true, - "module": "commonjs", - "moduleResolution": "node", - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "sourceMap": true, - "noImplicitReturns": true, - "strictNullChecks": true, - "strictFunctionTypes": true, - "noUnusedLocals": true, - "noImplicitThis": true, - "allowJs": true, - "skipLibCheck": true, - "downlevelIteration": true, // to use ES5 specific tooling - "resolveJsonModule": true - }, - "include": ["./src/**/*", "index.d.ts"], - "exclude": [ - "./dist/**/*", - "./src/**/__tests__", - "./src/**/__mocks__", - "./src/**/__fixtures__", - "node_modules" - ] + "extends": "../../_tsconfig.base.json" } diff --git a/packages/medusa/tsconfig.spec.json b/packages/medusa/tsconfig.spec.json deleted file mode 100644 index a108b800db..0000000000 --- a/packages/medusa/tsconfig.spec.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "./tsconfig.json", - "include": [ - "./src/**/*", - "index.d.ts", - "./src/**/__tests__", - "./src/**/__mocks__" - ], - "exclude": ["node_modules"] -} diff --git a/yarn.lock b/yarn.lock index 3a4bc0911c..e5da97d068 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5207,7 +5207,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/core-flows@^0.0.9, @medusajs/core-flows@workspace:packages/core/core-flows": +"@medusajs/core-flows@^0.0.9, @medusajs/core-flows@workspace:*, @medusajs/core-flows@workspace:^, @medusajs/core-flows@workspace:packages/core/core-flows": version: 0.0.0-use.local resolution: "@medusajs/core-flows@workspace:packages/core/core-flows" dependencies: @@ -5233,7 +5233,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/currency@workspace:packages/modules/currency": +"@medusajs/currency@workspace:^, @medusajs/currency@workspace:packages/modules/currency": version: 0.0.0-use.local resolution: "@medusajs/currency@workspace:packages/modules/currency" dependencies: @@ -5427,7 +5427,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/framework@^0.0.1, @medusajs/framework@workspace:packages/core/framework": +"@medusajs/framework@^0.0.1, @medusajs/framework@workspace:^, @medusajs/framework@workspace:packages/core/framework": version: 0.0.0-use.local resolution: "@medusajs/framework@workspace:packages/core/framework" dependencies: @@ -5617,7 +5617,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/link-modules@^0.2.11, @medusajs/link-modules@workspace:packages/modules/link-modules": +"@medusajs/link-modules@^0.2.11, @medusajs/link-modules@workspace:^, @medusajs/link-modules@workspace:packages/modules/link-modules": version: 0.0.0-use.local resolution: "@medusajs/link-modules@workspace:packages/modules/link-modules" dependencies: @@ -5668,18 +5668,12 @@ __metadata: pg-god: ^1.0.12 prompts: ^2.4.2 resolve-cwd: ^3.0.0 - rimraf: ^6.0.1 + rimraf: ^5.0.1 stack-trace: ^0.0.10 - ts-node: ^10.9.2 typescript: ^5.6.2 ulid: ^2.3.0 winston: ^3.8.2 yargs: ^15.3.1 - peerDependencies: - ts-node: ^10.9.2 - peerDependenciesMeta: - ts-node: - optional: true bin: medusa: cli.js languageName: unknown @@ -5724,9 +5718,7 @@ __metadata: "@medusajs/core-flows": ^0.0.9 "@medusajs/framework": ^0.0.1 "@medusajs/link-modules": ^0.2.11 - "@medusajs/types": ^1.11.16 - "@medusajs/utils": ^1.11.9 - "@medusajs/workflows-sdk": ^0.1.6 + "@opentelemetry/api": ^1.9.0 "@opentelemetry/instrumentation": ^0.53.0 "@opentelemetry/instrumentation-pg": ^0.44.0 "@opentelemetry/resources": ^1.26.0 @@ -5736,23 +5728,17 @@ __metadata: "@swc/helpers": ^0.5.11 "@swc/jest": ^0.2.36 "@types/express": ^4.17.17 - "@types/ioredis": ^4.28.10 "@types/jsonwebtoken": ^8.5.9 "@types/lodash": ^4.14.191 "@types/multer": ^1.4.7 - body-parser: ^1.19.0 boxen: ^5.0.1 chalk: ^4.0.0 chokidar: ^3.4.2 compression: ^1.7.4 - connect-redis: ^5.0.0 - cookie-parser: ^1.4.6 - cors: ^2.8.5 - cross-env: ^5.2.1 express: ^4.18.2 fs-exists-cached: ^1.0.0 - glob: ^7.1.6 jest: ^29.7.0 + jsonwebtoken: ^9.0.2 lodash: ^4.17.21 medusa-telemetry: ^0.0.17 multer: ^1.4.5-lts.1 @@ -5761,11 +5747,11 @@ __metadata: request-ip: ^3.3.0 rimraf: ^5.0.1 slugify: ^1.6.6 - supertest: ^4.0.2 - typescript: ^5.3.3 + typescript: ^5.6.2 uuid: ^9.0.0 zod: 3.22.4 peerDependencies: + "@medusajs/framework": ^0.0.1 awilix: ^8.0.1 languageName: unknown linkType: soft @@ -5918,7 +5904,7 @@ __metadata: languageName: unknown linkType: soft -"@medusajs/payment@workspace:packages/modules/payment": +"@medusajs/payment@workspace:^, @medusajs/payment@workspace:packages/modules/payment": version: 0.0.0-use.local resolution: "@medusajs/payment@workspace:packages/modules/payment" dependencies: @@ -13141,15 +13127,6 @@ __metadata: languageName: node linkType: hard -"@types/ioredis@npm:^4.28.10": - version: 4.28.10 - resolution: "@types/ioredis@npm:4.28.10" - dependencies: - "@types/node": "*" - checksum: ff680fef6750721c465ee9d6060d3229e49e5b217d68503c4972c4b869b8f84b91cbd9b7d5195a40fb0bff6ab9a4f5e24a2cc17a368ddb0bfe2dfd4eb5fc1872 - languageName: node - linkType: hard - "@types/istanbul-lib-coverage@npm:*, @types/istanbul-lib-coverage@npm:^2.0.0, @types/istanbul-lib-coverage@npm:^2.0.1": version: 2.0.6 resolution: "@types/istanbul-lib-coverage@npm:2.0.6" @@ -15287,7 +15264,7 @@ __metadata: languageName: node linkType: hard -"body-parser@npm:1.20.2, body-parser@npm:^1.19.0": +"body-parser@npm:1.20.2": version: 1.20.2 resolution: "body-parser@npm:1.20.2" dependencies: @@ -16602,7 +16579,7 @@ __metadata: languageName: node linkType: hard -"connect-redis@npm:5.2.0, connect-redis@npm:^5.0.0": +"connect-redis@npm:5.2.0": version: 5.2.0 resolution: "connect-redis@npm:5.2.0" checksum: 89352028531d0c7ed86ebbb3af923e0cf41dc098aa556925d7372ec9b9fafb228bfc1085a77888a1c7c2373844c8ac336b2ebb8771cb9b89785770e932ae5888 @@ -16853,7 +16830,6 @@ __metadata: version: 0.0.0-use.local resolution: "create-medusa-app@workspace:packages/cli/create-medusa-app" dependencies: - "@medusajs/types": ^1.11.16 "@medusajs/utils": ^1.11.9 "@types/chalk": ^2.2.0 "@types/commander": ^2.12.2 @@ -16886,7 +16862,7 @@ __metadata: prettier: ^2.8.8 slugify: ^1.6.6 ts-node: ^10.9.1 - typescript: ^5.0.4 + typescript: ^5.6.2 uuid: ^9.0.0 validator: ^13.9.0 wait-on: ^7.0.1 @@ -20453,22 +20429,6 @@ __metadata: languageName: node linkType: hard -"glob@npm:^11.0.0": - version: 11.0.0 - resolution: "glob@npm:11.0.0" - dependencies: - foreground-child: ^3.1.0 - jackspeak: ^4.0.1 - minimatch: ^10.0.0 - minipass: ^7.1.2 - package-json-from-dist: ^1.0.0 - path-scurry: ^2.0.0 - bin: - glob: dist/esm/bin.mjs - checksum: 419866015d8795258a8ac51de5b9d1a99c72634fc3ead93338e4da388e89773ab21681e494eac0fbc4250b003451ca3110bb4f1c9393d15d14466270094fdb4e - languageName: node - linkType: hard - "glob@npm:^6.0.1": version: 6.0.4 resolution: "glob@npm:6.0.4" @@ -21370,6 +21330,7 @@ __metadata: "@medusajs/event-bus-local": "workspace:*" "@medusajs/medusa": "workspace:*" "@medusajs/modules-sdk": "workspace:^" + "@medusajs/payment": "workspace:^" "@medusajs/pricing": "workspace:^" "@medusajs/product": "workspace:^" "@medusajs/promotion": "workspace:^" @@ -21381,10 +21342,7 @@ __metadata: "@medusajs/workflow-engine-inmemory": "workspace:*" "@swc/core": ^1.4.8 "@swc/jest": ^0.2.36 - faker: ^5.5.3 - form-data: ^4.0.0 jest: ^29.7.0 - jest-environment-node: ^29.7.0 pg: ^8.11.3 typescript: ^5.6.2 languageName: unknown @@ -21397,6 +21355,7 @@ __metadata: "@medusajs/api-key": "workspace:^" "@medusajs/auth": "workspace:*" "@medusajs/cache-inmemory": "workspace:*" + "@medusajs/core-flows": "workspace:*" "@medusajs/customer": "workspace:^" "@medusajs/event-bus-local": "workspace:*" "@medusajs/fulfillment": "workspace:^" @@ -21417,9 +21376,9 @@ __metadata: "@medusajs/workflow-engine-inmemory": "workspace:*" "@swc/core": ^1.4.8 "@swc/jest": ^0.2.36 - faker: ^5.5.3 + form-data: ^4.0.0 jest: ^29.7.0 - jest-environment-node: ^29.7.0 + jsonwebtoken: ^9.0.2 medusa-test-utils: "workspace:*" pg: ^8.11.3 typescript: ^5.6.2 @@ -21433,13 +21392,18 @@ __metadata: "@medusajs/api-key": "workspace:^" "@medusajs/auth": "workspace:*" "@medusajs/cache-inmemory": "workspace:*" + "@medusajs/core-flows": "workspace:^" + "@medusajs/currency": "workspace:^" "@medusajs/customer": "workspace:^" "@medusajs/event-bus-local": "workspace:*" + "@medusajs/framework": "workspace:^" "@medusajs/fulfillment": "workspace:^" "@medusajs/fulfillment-manual": "workspace:^" "@medusajs/inventory-next": "workspace:^" + "@medusajs/link-modules": "workspace:^" "@medusajs/medusa": "workspace:*" "@medusajs/modules-sdk": "workspace:^" + "@medusajs/payment": "workspace:^" "@medusajs/pricing": "workspace:^" "@medusajs/product": "workspace:^" "@medusajs/promotion": "workspace:^" @@ -21455,9 +21419,10 @@ __metadata: "@swc/jest": ^0.2.36 faker: ^5.5.3 jest: ^29.7.0 - jest-environment-node: ^29.7.0 + jsonwebtoken: ^9.0.2 medusa-test-utils: "workspace:*" pg: ^8.11.3 + scrypt-kdf: ^2.0.1 typescript: ^5.6.2 languageName: unknown linkType: soft @@ -22321,15 +22286,6 @@ __metadata: languageName: node linkType: hard -"jackspeak@npm:^4.0.1": - version: 4.0.2 - resolution: "jackspeak@npm:4.0.2" - dependencies: - "@isaacs/cliui": ^8.0.2 - checksum: b26039d11c0163a95b1e58851b9ac453cce64ad6d1eb98a00b303ad5eeb761b29d33c9419d1e16c016d3f7151c8edf7df223e6cf93a1907655fd95d6ce85c0de - languageName: node - linkType: hard - "jake@npm:^10.8.5": version: 10.9.1 resolution: "jake@npm:10.9.1" @@ -23944,13 +23900,6 @@ __metadata: languageName: node linkType: hard -"lru-cache@npm:^11.0.0": - version: 11.0.1 - resolution: "lru-cache@npm:11.0.1" - checksum: 8bad6603dc67eb5b03520fba05bce5df6473dbba58ac4c6067ed088d29225a0a04416bb1462acd8c1f819d1fbf37920446a1c36bafd9c384bcc54cee0d3b697a - languageName: node - linkType: hard - "lru-cache@npm:^4.0.1": version: 4.1.5 resolution: "lru-cache@npm:4.1.5" @@ -24603,15 +24552,6 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:^10.0.0": - version: 10.0.1 - resolution: "minimatch@npm:10.0.1" - dependencies: - brace-expansion: ^2.0.1 - checksum: e6c29a81fe83e1877ad51348306be2e8aeca18c88fdee7a99df44322314279e15799e41d7cb274e4e8bb0b451a3bc622d6182e157dfa1717d6cda75e9cd8cd5d - languageName: node - linkType: hard - "minimatch@npm:^5.0.1": version: 5.1.6 resolution: "minimatch@npm:5.1.6" @@ -24722,13 +24662,6 @@ __metadata: languageName: node linkType: hard -"minipass@npm:^7.1.2": - version: 7.1.2 - resolution: "minipass@npm:7.1.2" - checksum: b0fd20bb9fb56e5fa9a8bfac539e8915ae07430a619e4b86ff71f5fc757ef3924b23b2c4230393af1eda647ed3d75739e4e0acb250a6b1eb277cf7f8fe449557 - languageName: node - linkType: hard - "minizlib@npm:^2.1.1, minizlib@npm:^2.1.2": version: 2.1.2 resolution: "minizlib@npm:2.1.2" @@ -25964,13 +25897,6 @@ __metadata: languageName: node linkType: hard -"package-json-from-dist@npm:^1.0.0": - version: 1.0.0 - resolution: "package-json-from-dist@npm:1.0.0" - checksum: e3ffaf6ac1040ab6082a658230c041ad14e72fabe99076a2081bb1d5d41210f11872403fc09082daf4387fc0baa6577f96c9c0e94c90c394fd57794b66aa4033 - languageName: node - linkType: hard - "package-name-regex@npm:~2.0.6": version: 2.0.6 resolution: "package-name-regex@npm:2.0.6" @@ -26176,16 +26102,6 @@ __metadata: languageName: node linkType: hard -"path-scurry@npm:^2.0.0": - version: 2.0.0 - resolution: "path-scurry@npm:2.0.0" - dependencies: - lru-cache: ^11.0.0 - minipass: ^7.1.2 - checksum: 3da4adedaa8e7ef8d6dc4f35a0ff8f05a9b4d8365f2b28047752b62d4c1ad73eec21e37b1579ef2d075920157856a3b52ae8309c480a6f1a8bbe06ff8e52b33c - languageName: node - linkType: hard - "path-to-regexp@npm:0.1.10": version: 0.1.10 resolution: "path-to-regexp@npm:0.1.10" @@ -28755,18 +28671,6 @@ __metadata: languageName: node linkType: hard -"rimraf@npm:^6.0.1": - version: 6.0.1 - resolution: "rimraf@npm:6.0.1" - dependencies: - glob: ^11.0.0 - package-json-from-dist: ^1.0.0 - bin: - rimraf: dist/esm/bin.mjs - checksum: b30b6b072771f0d1e73b4ca5f37bb2944ee09375be9db5f558fcd3310000d29dfcfa93cf7734d75295ad5a7486dc8e40f63089ced1722a664539ffc0c3ece8c6 - languageName: node - linkType: hard - "rimraf@npm:~2.4.0": version: 2.4.5 resolution: "rimraf@npm:2.4.5" @@ -31238,7 +31142,7 @@ __metadata: languageName: node linkType: hard -"ts-node@npm:^10.9.1, ts-node@npm:^10.9.2": +"ts-node@npm:^10.9.1": version: 10.9.2 resolution: "ts-node@npm:10.9.2" dependencies: @@ -31823,7 +31727,7 @@ __metadata: languageName: node linkType: hard -"typescript@npm:^5.0.4, typescript@npm:^5.1.6, typescript@npm:^5.3.3": +"typescript@npm:^5.1.6, typescript@npm:^5.3.3": version: 5.4.5 resolution: "typescript@npm:5.4.5" bin: @@ -31883,7 +31787,7 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@^5.0.4#~builtin, typescript@patch:typescript@^5.1.6#~builtin, typescript@patch:typescript@^5.3.3#~builtin": +"typescript@patch:typescript@^5.1.6#~builtin, typescript@patch:typescript@^5.3.3#~builtin": version: 5.4.5 resolution: "typescript@patch:typescript@npm%3A5.4.5#~builtin::version=5.4.5&hash=7ad353" bin: