diff --git a/.changeset/yellow-regions-marry.md b/.changeset/yellow-regions-marry.md new file mode 100644 index 0000000000..6e5f83d0ef --- /dev/null +++ b/.changeset/yellow-regions-marry.md @@ -0,0 +1,10 @@ +--- +"@medusajs/workflows-sdk": patch +"@medusajs/core-flows": patch +"@medusajs/framework": patch +"@medusajs/utils": patch +"@medusajs/medusa": patch +"@medusajs/deps": patch +--- + +feat(deps,framework): add zod as framework dependency diff --git a/integration-tests/http/__fixtures__/feature-flag/src/api/middlewares.ts b/integration-tests/http/__fixtures__/feature-flag/src/api/middlewares.ts index 2f6b38a473..6de8009916 100644 --- a/integration-tests/http/__fixtures__/feature-flag/src/api/middlewares.ts +++ b/integration-tests/http/__fixtures__/feature-flag/src/api/middlewares.ts @@ -2,7 +2,7 @@ import { defineMiddlewares, validateAndTransformBody, } from "@medusajs/framework/http" -import { z } from "zod" +import { z } from "@medusajs/framework/zod" const CustomPostSchema = z.object({ foo: z.string(), diff --git a/packages/core/core-flows/package.json b/packages/core/core-flows/package.json index a758256bae..b7e2a51c99 100644 --- a/packages/core/core-flows/package.json +++ b/packages/core/core-flows/package.json @@ -30,8 +30,7 @@ }, "dependencies": { "csv-parse": "^5.6.0", - "json-2-csv": "^5.5.4", - "zod": "3.25.76" + "json-2-csv": "^5.5.4" }, "peerDependencies": { "@medusajs/framework": "2.12.5" diff --git a/packages/core/core-flows/src/cart/utils/schemas.ts b/packages/core/core-flows/src/cart/utils/schemas.ts index 0de2fea0ac..859f456c0c 100644 --- a/packages/core/core-flows/src/cart/utils/schemas.ts +++ b/packages/core/core-flows/src/cart/utils/schemas.ts @@ -1,3 +1,3 @@ -import z from "zod" +import { z } from "@medusajs/framework/zod" export const pricingContextResult = z.record(z.string(), z.any()).optional() export const shippingOptionsContextResult = z.record(z.string(), z.any()).optional() diff --git a/packages/core/framework/package.json b/packages/core/framework/package.json index 575d3816bb..2e2dbccbbc 100644 --- a/packages/core/framework/package.json +++ b/packages/core/framework/package.json @@ -45,7 +45,8 @@ "./opentelemetry/resources": "./dist/deps/opentelemetry-resources.js", "./opentelemetry/api": "./dist/deps/opentelemetry-api.js", "./awilix": "./dist/deps/awilix.js", - "./pg": "./dist/deps/pg.js" + "./pg": "./dist/deps/pg.js", + "./zod": "./dist/deps/zod.js" }, "engines": { "node": ">=20" @@ -92,7 +93,6 @@ "morgan": "^1.9.1", "path-to-regexp": "^8.2.0", "tsconfig-paths": "^4.2.0", - "zod": "3.25.76", "zod-validation-error": "3.5.1" }, "peerDependencies": { diff --git a/packages/core/framework/src/deps/zod.ts b/packages/core/framework/src/deps/zod.ts new file mode 100644 index 0000000000..b23bb3fed0 --- /dev/null +++ b/packages/core/framework/src/deps/zod.ts @@ -0,0 +1 @@ +export * from "@medusajs/deps/zod" diff --git a/packages/core/framework/src/http/__fixtures__/routers-middleware/middlewares.ts b/packages/core/framework/src/http/__fixtures__/routers-middleware/middlewares.ts index 3c243d7526..d37ed723a5 100644 --- a/packages/core/framework/src/http/__fixtures__/routers-middleware/middlewares.ts +++ b/packages/core/framework/src/http/__fixtures__/routers-middleware/middlewares.ts @@ -1,5 +1,5 @@ import { raw } from "express" -import { z } from "zod" +import { z } from "../../../deps/zod" import { MedusaNextFunction, MedusaRequest, MedusaResponse } from "../../types" import { defineMiddlewares } from "../../utils/define-middlewares" import { diff --git a/packages/core/framework/src/http/__tests__/validate-body.spec.ts b/packages/core/framework/src/http/__tests__/validate-body.spec.ts index d84ff4f4b1..f1f4bde681 100644 --- a/packages/core/framework/src/http/__tests__/validate-body.spec.ts +++ b/packages/core/framework/src/http/__tests__/validate-body.spec.ts @@ -1,12 +1,12 @@ import { MedusaError } from "@medusajs/utils" -import zod, { ZodNullable, ZodObject, ZodOptional } from "zod" +import { z, ZodNullable, ZodObject, ZodOptional } from "@medusajs/deps/zod" import { MedusaRequest, MedusaResponse } from "../types" import { validateAndTransformBody } from "../utils/validate-body" const createLinkBody = () => { - return zod.object({ - add: zod.array(zod.string()).optional(), - remove: zod.array(zod.string()).optional(), + return z.object({ + add: z.array(z.string()).optional(), + remove: z.array(z.string()).optional(), }) } @@ -26,9 +26,9 @@ describe("validateAndTransformBody", () => { const mockResponse = {} as MedusaResponse const nextFunction = jest.fn() - mockRequest.additionalDataValidator = zod + mockRequest.additionalDataValidator = z .object({ - brand_id: zod.number(), + brand_id: z.number(), }) .nullish() @@ -62,9 +62,9 @@ describe("validateAndTransformBody", () => { const mockResponse = {} as MedusaResponse const nextFunction = jest.fn() - mockRequest.additionalDataValidator = zod + mockRequest.additionalDataValidator = z .object({ - brand_id: zod.number(), + brand_id: z.number(), }) .nullish() @@ -95,9 +95,9 @@ describe("validateAndTransformBody", () => { const mockResponse = {} as MedusaResponse const nextFunction = jest.fn() - mockRequest.additionalDataValidator = zod + mockRequest.additionalDataValidator = z .object({ - brand_id: zod.number().optional(), + brand_id: z.number().optional(), }) .nullish() diff --git a/packages/core/framework/src/http/__tests__/validate-query.spec.ts b/packages/core/framework/src/http/__tests__/validate-query.spec.ts index 527fac2c7e..64591eceb0 100644 --- a/packages/core/framework/src/http/__tests__/validate-query.spec.ts +++ b/packages/core/framework/src/http/__tests__/validate-query.spec.ts @@ -1,4 +1,4 @@ -import z from "zod" +import { z } from "@medusajs/deps/zod" import { MedusaError } from "@medusajs/utils" import { validateAndTransformQuery } from "../utils/validate-query" import { MedusaNextFunction, MedusaRequest, MedusaResponse } from "../types" diff --git a/packages/core/framework/src/http/middleware-file-loader.ts b/packages/core/framework/src/http/middleware-file-loader.ts index be39abc340..ec70f28c55 100644 --- a/packages/core/framework/src/http/middleware-file-loader.ts +++ b/packages/core/framework/src/http/middleware-file-loader.ts @@ -1,6 +1,6 @@ import { dynamicImport, FileSystem, isFileSkipped } from "@medusajs/utils" import { join } from "path" -import zod from "zod" +import { z } from "@medusajs/deps/zod" import { logger } from "../logger" import { @@ -120,7 +120,7 @@ export class MiddlewareFileLoader { matcher: matcher, methods, schema: route.additionalDataValidator, - validator: zod.object(route.additionalDataValidator).nullish(), + validator: z.object(route.additionalDataValidator).nullish(), }) } diff --git a/packages/core/framework/src/http/types.ts b/packages/core/framework/src/http/types.ts index c9b8f9f5b3..602ce7fa52 100644 --- a/packages/core/framework/src/http/types.ts +++ b/packages/core/framework/src/http/types.ts @@ -1,5 +1,5 @@ import type { NextFunction, Request, Response } from "express" -import type { ZodNullable, ZodObject, ZodOptional, ZodRawShape } from "zod" +import type { ZodNullable, ZodObject, ZodOptional, ZodRawShape } from "@medusajs/deps/zod" import { FindConfig, diff --git a/packages/core/framework/src/http/utils/define-middlewares.ts b/packages/core/framework/src/http/utils/define-middlewares.ts index 851157c405..be377d647e 100644 --- a/packages/core/framework/src/http/utils/define-middlewares.ts +++ b/packages/core/framework/src/http/utils/define-middlewares.ts @@ -6,7 +6,7 @@ import { MiddlewareVerb, ParserConfig, } from "../types" -import { ZodRawShape } from "zod" +import type { ZodRawShape } from "@medusajs/deps/zod" /** * A helper function to configure the routes by defining custom middleware, diff --git a/packages/core/framework/src/http/utils/validate-body.ts b/packages/core/framework/src/http/utils/validate-body.ts index 4758ca6a9b..84cac93f08 100644 --- a/packages/core/framework/src/http/utils/validate-body.ts +++ b/packages/core/framework/src/http/utils/validate-body.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/deps/zod" import { NextFunction } from "express" import { MedusaRequest, MedusaResponse } from "../types" import { zodValidator } from "../../zod" diff --git a/packages/core/framework/src/http/utils/validate-query.ts b/packages/core/framework/src/http/utils/validate-query.ts index e365655fb6..f0338cb83e 100644 --- a/packages/core/framework/src/http/utils/validate-query.ts +++ b/packages/core/framework/src/http/utils/validate-query.ts @@ -1,7 +1,7 @@ import { BaseEntity, QueryConfig, RequestQueryFields } from "@medusajs/types" import { MedusaError, removeUndefinedProperties } from "@medusajs/utils" import { NextFunction } from "express" -import { z } from "zod" +import { z } from "@medusajs/deps/zod" import { zodValidator } from "../../zod/zod-helpers" import { MedusaRequest, MedusaResponse } from "../types" diff --git a/packages/core/framework/src/zod/zod-helpers.ts b/packages/core/framework/src/zod/zod-helpers.ts index b9d314adc2..7f1d24e8a7 100644 --- a/packages/core/framework/src/zod/zod-helpers.ts +++ b/packages/core/framework/src/zod/zod-helpers.ts @@ -2,10 +2,10 @@ import { MedusaError } from "../utils" import { z, ZodError, - ZodInvalidTypeIssue, - ZodInvalidUnionIssue, - ZodIssue, -} from "zod" + type ZodInvalidTypeIssue, + type ZodInvalidUnionIssue, + type ZodIssue, +} from "@medusajs/deps/zod" const formatPath = (issue: ZodIssue) => { return issue.path.join(", ") diff --git a/packages/core/utils/package.json b/packages/core/utils/package.json index 2f5a762fe1..7ce2203d1c 100644 --- a/packages/core/utils/package.json +++ b/packages/core/utils/package.json @@ -43,8 +43,7 @@ "jsonwebtoken": "^9.0.2", "pg-connection-string": "^2.7.0", "pluralize": "^8.0.0", - "ulid": "^2.3.0", - "zod": "3.25.76" + "ulid": "^2.3.0" }, "peerDependencies": { "express": "^4.21.0" diff --git a/packages/core/utils/src/product/validators.ts b/packages/core/utils/src/product/validators.ts index accdc2ee49..3c8b120c99 100644 --- a/packages/core/utils/src/product/validators.ts +++ b/packages/core/utils/src/product/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/deps/zod" import { ProductStatus } from "./enums" export const booleanString = () => diff --git a/packages/core/workflows-sdk/src/utils/composer/__tests__/index.spec.ts b/packages/core/workflows-sdk/src/utils/composer/__tests__/index.spec.ts index 0760b830f3..4364a31aac 100644 --- a/packages/core/workflows-sdk/src/utils/composer/__tests__/index.spec.ts +++ b/packages/core/workflows-sdk/src/utils/composer/__tests__/index.spec.ts @@ -1,4 +1,4 @@ -import z from "zod" +import { z } from "@medusajs/deps/zod" import { expectTypeOf } from "expect-type" import { TransactionState } from "@medusajs/utils" import { createStep } from "../create-step" diff --git a/packages/core/workflows-sdk/src/utils/composer/create-hook.ts b/packages/core/workflows-sdk/src/utils/composer/create-hook.ts index a188635880..e070630d54 100644 --- a/packages/core/workflows-sdk/src/utils/composer/create-hook.ts +++ b/packages/core/workflows-sdk/src/utils/composer/create-hook.ts @@ -1,5 +1,5 @@ import { OrchestrationUtils } from "@medusajs/utils" -import { type ZodSchema } from "zod" +import { type ZodSchema } from "@medusajs/deps/zod" import { CompensateFn, createStep, diff --git a/packages/deps/package.json b/packages/deps/package.json index a44877a9bd..b3bacc2139 100644 --- a/packages/deps/package.json +++ b/packages/deps/package.json @@ -30,7 +30,8 @@ "./mikro-orm/migrations": "./dist/mikro-orm-migrations.js", "./mikro-orm/postgresql": "./dist/mikro-orm-postgresql.js", "./awilix": "./dist/awilix.js", - "./pg": "./dist/pg.js" + "./pg": "./dist/pg.js", + "./zod": "./dist/zod.js" }, "author": "Medusa", "license": "MIT", @@ -49,7 +50,8 @@ "@opentelemetry/sdk-node": "^0.200.0", "@opentelemetry/sdk-trace-node": "^2.0.0", "awilix": "^8.0.1", - "pg": "^8.16.3" + "pg": "^8.16.3", + "zod": "3.25.76" }, "gitHead": "41a5425405aea5045a26def95c0dc00cf4a5a44d" } diff --git a/packages/deps/src/zod.ts b/packages/deps/src/zod.ts new file mode 100644 index 0000000000..9a39e777a6 --- /dev/null +++ b/packages/deps/src/zod.ts @@ -0,0 +1 @@ +export * from "zod" diff --git a/packages/medusa/package.json b/packages/medusa/package.json index 8e1e15f761..d9c7ec0ac2 100644 --- a/packages/medusa/package.json +++ b/packages/medusa/package.json @@ -117,8 +117,7 @@ "qs": "^6.12.1", "request-ip": "^3.3.0", "slugify": "^1.6.6", - "uuid": "^9.0.0", - "zod": "3.25.76" + "uuid": "^9.0.0" }, "peerDependencies": { "@medusajs/framework": "2.12.5", diff --git a/packages/medusa/src/api/admin/api-keys/validators.ts b/packages/medusa/src/api/admin/api-keys/validators.ts index 51693efba5..49f5b18ec2 100644 --- a/packages/medusa/src/api/admin/api-keys/validators.ts +++ b/packages/medusa/src/api/admin/api-keys/validators.ts @@ -1,5 +1,5 @@ import { ApiKeyType } from "@medusajs/framework/utils" -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createOperatorMap, diff --git a/packages/medusa/src/api/admin/campaigns/validators.ts b/packages/medusa/src/api/admin/campaigns/validators.ts index dddc78be97..31a5f06619 100644 --- a/packages/medusa/src/api/admin/campaigns/validators.ts +++ b/packages/medusa/src/api/admin/campaigns/validators.ts @@ -1,5 +1,5 @@ import { CampaignBudgetType, isPresent } from "@medusajs/framework/utils" -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createSelectParams, diff --git a/packages/medusa/src/api/admin/claims/validators.ts b/packages/medusa/src/api/admin/claims/validators.ts index fbb84637cb..31c8b525a6 100644 --- a/packages/medusa/src/api/admin/claims/validators.ts +++ b/packages/medusa/src/api/admin/claims/validators.ts @@ -1,5 +1,5 @@ import { ClaimReason, ClaimType } from "@medusajs/framework/utils" -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createOperatorMap, diff --git a/packages/medusa/src/api/admin/collections/validators.ts b/packages/medusa/src/api/admin/collections/validators.ts index 2446f74993..5178d7cae2 100644 --- a/packages/medusa/src/api/admin/collections/validators.ts +++ b/packages/medusa/src/api/admin/collections/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { applyAndAndOrOperators } from "../../utils/common-validators" import { createFindParams, diff --git a/packages/medusa/src/api/admin/currencies/validators.ts b/packages/medusa/src/api/admin/currencies/validators.ts index 42de376d32..fbea16a2ac 100644 --- a/packages/medusa/src/api/admin/currencies/validators.ts +++ b/packages/medusa/src/api/admin/currencies/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createSelectParams } from "../../utils/validators" import { applyAndAndOrOperators } from "../../utils/common-validators" diff --git a/packages/medusa/src/api/admin/customer-groups/validators.ts b/packages/medusa/src/api/admin/customer-groups/validators.ts index cb0814c801..f60a9ac617 100644 --- a/packages/medusa/src/api/admin/customer-groups/validators.ts +++ b/packages/medusa/src/api/admin/customer-groups/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createOperatorMap, diff --git a/packages/medusa/src/api/admin/customers/validators.ts b/packages/medusa/src/api/admin/customers/validators.ts index 9a103cc742..edab43d05e 100644 --- a/packages/medusa/src/api/admin/customers/validators.ts +++ b/packages/medusa/src/api/admin/customers/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { applyAndAndOrOperators, booleanString, diff --git a/packages/medusa/src/api/admin/draft-orders/validators.ts b/packages/medusa/src/api/admin/draft-orders/validators.ts index d7d1057a7c..54f23efbb2 100644 --- a/packages/medusa/src/api/admin/draft-orders/validators.ts +++ b/packages/medusa/src/api/admin/draft-orders/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { AddressPayload, applyAndAndOrOperators, diff --git a/packages/medusa/src/api/admin/exchanges/validators.ts b/packages/medusa/src/api/admin/exchanges/validators.ts index 1cc926589c..0800357b03 100644 --- a/packages/medusa/src/api/admin/exchanges/validators.ts +++ b/packages/medusa/src/api/admin/exchanges/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createOperatorMap, diff --git a/packages/medusa/src/api/admin/fulfillment-providers/validators.ts b/packages/medusa/src/api/admin/fulfillment-providers/validators.ts index 78818a3d1b..05a0c2293e 100644 --- a/packages/medusa/src/api/admin/fulfillment-providers/validators.ts +++ b/packages/medusa/src/api/admin/fulfillment-providers/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { booleanString } from "../../utils/common-validators" import { createFindParams } from "../../utils/validators" diff --git a/packages/medusa/src/api/admin/fulfillment-sets/validators.ts b/packages/medusa/src/api/admin/fulfillment-sets/validators.ts index d29d0a8edd..6523984707 100644 --- a/packages/medusa/src/api/admin/fulfillment-sets/validators.ts +++ b/packages/medusa/src/api/admin/fulfillment-sets/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createSelectParams } from "../../utils/validators" import { geoZoneCitySchema, diff --git a/packages/medusa/src/api/admin/fulfillment-sets/validators/geo-zone.ts b/packages/medusa/src/api/admin/fulfillment-sets/validators/geo-zone.ts index 1949e7ccfa..db71f77921 100644 --- a/packages/medusa/src/api/admin/fulfillment-sets/validators/geo-zone.ts +++ b/packages/medusa/src/api/admin/fulfillment-sets/validators/geo-zone.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" const geoZoneBaseSchema = z.object({ country_code: z.string(), diff --git a/packages/medusa/src/api/admin/fulfillments/validators.ts b/packages/medusa/src/api/admin/fulfillments/validators.ts index 5dc1e59e97..0f17f7b315 100644 --- a/packages/medusa/src/api/admin/fulfillments/validators.ts +++ b/packages/medusa/src/api/admin/fulfillments/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { AddressPayload } from "../../utils/common-validators" import { createSelectParams } from "../../utils/validators" diff --git a/packages/medusa/src/api/admin/index/validator.ts b/packages/medusa/src/api/admin/index/validator.ts index 2395f64f35..0ab6485e6a 100644 --- a/packages/medusa/src/api/admin/index/validator.ts +++ b/packages/medusa/src/api/admin/index/validator.ts @@ -1,4 +1,4 @@ -import z from "zod" +import { z } from "@medusajs/framework/zod" export const AdminIndexSyncPayload = z.object({ strategy: z.enum(["full", "reset"]).optional(), diff --git a/packages/medusa/src/api/admin/inventory-items/validators.ts b/packages/medusa/src/api/admin/inventory-items/validators.ts index 8837580bbb..f04b866194 100644 --- a/packages/medusa/src/api/admin/inventory-items/validators.ts +++ b/packages/medusa/src/api/admin/inventory-items/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { applyAndAndOrOperators, booleanString, diff --git a/packages/medusa/src/api/admin/invites/validators.ts b/packages/medusa/src/api/admin/invites/validators.ts index 26c876591f..7da44c668b 100644 --- a/packages/medusa/src/api/admin/invites/validators.ts +++ b/packages/medusa/src/api/admin/invites/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createOperatorMap, diff --git a/packages/medusa/src/api/admin/locales/validators.ts b/packages/medusa/src/api/admin/locales/validators.ts index d2ae775bb9..09a87a9a96 100644 --- a/packages/medusa/src/api/admin/locales/validators.ts +++ b/packages/medusa/src/api/admin/locales/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createSelectParams } from "../../utils/validators" import { applyAndAndOrOperators } from "../../utils/common-validators" diff --git a/packages/medusa/src/api/admin/notifications/validators.ts b/packages/medusa/src/api/admin/notifications/validators.ts index cbb06d0eea..df39b8bbfd 100644 --- a/packages/medusa/src/api/admin/notifications/validators.ts +++ b/packages/medusa/src/api/admin/notifications/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createSelectParams } from "../../utils/validators" import { applyAndAndOrOperators } from "../../utils/common-validators" diff --git a/packages/medusa/src/api/admin/order-changes/validators.ts b/packages/medusa/src/api/admin/order-changes/validators.ts index 814ec78829..70b5404d1c 100644 --- a/packages/medusa/src/api/admin/order-changes/validators.ts +++ b/packages/medusa/src/api/admin/order-changes/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createOperatorMap, createSelectParams } from "../../utils/validators" diff --git a/packages/medusa/src/api/admin/order-edits/validators.ts b/packages/medusa/src/api/admin/order-edits/validators.ts index 2195271245..2af5e57673 100644 --- a/packages/medusa/src/api/admin/order-edits/validators.ts +++ b/packages/medusa/src/api/admin/order-edits/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" export const AdminPostOrderEditsReqSchema = z.object({ order_id: z.string(), diff --git a/packages/medusa/src/api/admin/orders/validators.ts b/packages/medusa/src/api/admin/orders/validators.ts index 54457bf322..e515f8df9d 100644 --- a/packages/medusa/src/api/admin/orders/validators.ts +++ b/packages/medusa/src/api/admin/orders/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { AddressPayload } from "../../utils/common-validators" import { createFindParams, diff --git a/packages/medusa/src/api/admin/payment-collections/validators.ts b/packages/medusa/src/api/admin/payment-collections/validators.ts index e3b424f979..3bb939a63d 100644 --- a/packages/medusa/src/api/admin/payment-collections/validators.ts +++ b/packages/medusa/src/api/admin/payment-collections/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createSelectParams } from "../../utils/validators" export type AdminGetPaymentCollectionParamsType = z.infer< diff --git a/packages/medusa/src/api/admin/payments/validators.ts b/packages/medusa/src/api/admin/payments/validators.ts index cba5bb3670..ce35e50bbf 100644 --- a/packages/medusa/src/api/admin/payments/validators.ts +++ b/packages/medusa/src/api/admin/payments/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { applyAndAndOrOperators, booleanString, diff --git a/packages/medusa/src/api/admin/price-lists/validators.ts b/packages/medusa/src/api/admin/price-lists/validators.ts index c5af548322..6c82ffe65d 100644 --- a/packages/medusa/src/api/admin/price-lists/validators.ts +++ b/packages/medusa/src/api/admin/price-lists/validators.ts @@ -1,5 +1,5 @@ import { PriceListStatus, PriceListType } from "@medusajs/framework/utils" -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createOperatorMap, diff --git a/packages/medusa/src/api/admin/price-preferences/validators.ts b/packages/medusa/src/api/admin/price-preferences/validators.ts index c2add70d66..498560fddd 100644 --- a/packages/medusa/src/api/admin/price-preferences/validators.ts +++ b/packages/medusa/src/api/admin/price-preferences/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createSelectParams } from "../../utils/validators" import { applyAndAndOrOperators } from "../../utils/common-validators" diff --git a/packages/medusa/src/api/admin/product-categories/validators.ts b/packages/medusa/src/api/admin/product-categories/validators.ts index f74d7d3b7e..14ffdd7d09 100644 --- a/packages/medusa/src/api/admin/product-categories/validators.ts +++ b/packages/medusa/src/api/admin/product-categories/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { applyAndAndOrOperators, booleanString, diff --git a/packages/medusa/src/api/admin/product-tags/validators.ts b/packages/medusa/src/api/admin/product-tags/validators.ts index c0dbfe921d..7465ff8e61 100644 --- a/packages/medusa/src/api/admin/product-tags/validators.ts +++ b/packages/medusa/src/api/admin/product-tags/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createOperatorMap, diff --git a/packages/medusa/src/api/admin/product-types/validators.ts b/packages/medusa/src/api/admin/product-types/validators.ts index 2f587632d8..7c12dee59f 100644 --- a/packages/medusa/src/api/admin/product-types/validators.ts +++ b/packages/medusa/src/api/admin/product-types/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createOperatorMap, diff --git a/packages/medusa/src/api/admin/product-variants/validators.ts b/packages/medusa/src/api/admin/product-variants/validators.ts index 01a31db0bc..168c54c4ff 100644 --- a/packages/medusa/src/api/admin/product-variants/validators.ts +++ b/packages/medusa/src/api/admin/product-variants/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { applyAndAndOrOperators, booleanString, diff --git a/packages/medusa/src/api/admin/products/validators.ts b/packages/medusa/src/api/admin/products/validators.ts index 863e3d3fd7..a94eb827c5 100644 --- a/packages/medusa/src/api/admin/products/validators.ts +++ b/packages/medusa/src/api/admin/products/validators.ts @@ -1,6 +1,6 @@ import { BatchMethodRequest, HttpTypes } from "@medusajs/framework/types" import { ProductStatus } from "@medusajs/framework/utils" -import { z, ZodType } from "zod" +import { z, type ZodType } from "@medusajs/framework/zod" import { applyAndAndOrOperators, booleanString, diff --git a/packages/medusa/src/api/admin/promotions/validators.ts b/packages/medusa/src/api/admin/promotions/validators.ts index 88c5bbf224..5ce7231ac6 100644 --- a/packages/medusa/src/api/admin/promotions/validators.ts +++ b/packages/medusa/src/api/admin/promotions/validators.ts @@ -6,7 +6,7 @@ import { PromotionStatus, PromotionType, } from "@medusajs/framework/utils" -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { applyAndAndOrOperators } from "../../utils/common-validators" import { createFindParams, diff --git a/packages/medusa/src/api/admin/refund-reasons/validators.ts b/packages/medusa/src/api/admin/refund-reasons/validators.ts index fdead308c5..09cd31b645 100644 --- a/packages/medusa/src/api/admin/refund-reasons/validators.ts +++ b/packages/medusa/src/api/admin/refund-reasons/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createOperatorMap, createSelectParams } from "../../utils/validators" export type AdminCreatePaymentRefundReasonType = z.infer< diff --git a/packages/medusa/src/api/admin/regions/validators.ts b/packages/medusa/src/api/admin/regions/validators.ts index e14e15e7dd..121cbb34f4 100644 --- a/packages/medusa/src/api/admin/regions/validators.ts +++ b/packages/medusa/src/api/admin/regions/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createOperatorMap, diff --git a/packages/medusa/src/api/admin/reservations/validators.ts b/packages/medusa/src/api/admin/reservations/validators.ts index 72eb20f95d..8cbe290216 100644 --- a/packages/medusa/src/api/admin/reservations/validators.ts +++ b/packages/medusa/src/api/admin/reservations/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createOperatorMap, diff --git a/packages/medusa/src/api/admin/return-reasons/validators.ts b/packages/medusa/src/api/admin/return-reasons/validators.ts index 099b33b588..78685a7a85 100644 --- a/packages/medusa/src/api/admin/return-reasons/validators.ts +++ b/packages/medusa/src/api/admin/return-reasons/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createOperatorMap, diff --git a/packages/medusa/src/api/admin/returns/validators.ts b/packages/medusa/src/api/admin/returns/validators.ts index 796c90e7ad..10277147b6 100644 --- a/packages/medusa/src/api/admin/returns/validators.ts +++ b/packages/medusa/src/api/admin/returns/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createOperatorMap, diff --git a/packages/medusa/src/api/admin/sales-channels/validators.ts b/packages/medusa/src/api/admin/sales-channels/validators.ts index 9343736bb4..faa1b56629 100644 --- a/packages/medusa/src/api/admin/sales-channels/validators.ts +++ b/packages/medusa/src/api/admin/sales-channels/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { applyAndAndOrOperators, booleanString, diff --git a/packages/medusa/src/api/admin/shipping-option-types/validators.ts b/packages/medusa/src/api/admin/shipping-option-types/validators.ts index 167dd9c167..5fa08bfb59 100644 --- a/packages/medusa/src/api/admin/shipping-option-types/validators.ts +++ b/packages/medusa/src/api/admin/shipping-option-types/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createOperatorMap, diff --git a/packages/medusa/src/api/admin/shipping-options/validators.ts b/packages/medusa/src/api/admin/shipping-options/validators.ts index 9f49e65e80..8c55c03c1e 100644 --- a/packages/medusa/src/api/admin/shipping-options/validators.ts +++ b/packages/medusa/src/api/admin/shipping-options/validators.ts @@ -3,7 +3,7 @@ import { RuleOperator, ShippingOptionPriceType as ShippingOptionPriceTypeEnum, } from "@medusajs/framework/utils" -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { booleanString } from "../../utils/common-validators" import { createFindParams, diff --git a/packages/medusa/src/api/admin/shipping-profiles/validators.ts b/packages/medusa/src/api/admin/shipping-profiles/validators.ts index 6195ee5a2a..2143a3b506 100644 --- a/packages/medusa/src/api/admin/shipping-profiles/validators.ts +++ b/packages/medusa/src/api/admin/shipping-profiles/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createOperatorMap, diff --git a/packages/medusa/src/api/admin/stock-locations/validators.ts b/packages/medusa/src/api/admin/stock-locations/validators.ts index 8d276df09d..55beab1352 100644 --- a/packages/medusa/src/api/admin/stock-locations/validators.ts +++ b/packages/medusa/src/api/admin/stock-locations/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createOperatorMap, diff --git a/packages/medusa/src/api/admin/stores/validators.ts b/packages/medusa/src/api/admin/stores/validators.ts index 1973d06102..bf48b6dc0b 100644 --- a/packages/medusa/src/api/admin/stores/validators.ts +++ b/packages/medusa/src/api/admin/stores/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createSelectParams } from "../../utils/validators" import { applyAndAndOrOperators } from "../../utils/common-validators" diff --git a/packages/medusa/src/api/admin/tax-providers/validators.ts b/packages/medusa/src/api/admin/tax-providers/validators.ts index 73c4df816d..a6c28010b5 100644 --- a/packages/medusa/src/api/admin/tax-providers/validators.ts +++ b/packages/medusa/src/api/admin/tax-providers/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams } from "../../utils/validators" import { applyAndAndOrOperators } from "../../utils/common-validators" diff --git a/packages/medusa/src/api/admin/tax-rates/validators.ts b/packages/medusa/src/api/admin/tax-rates/validators.ts index 7824dc8887..f762ef6c7e 100644 --- a/packages/medusa/src/api/admin/tax-rates/validators.ts +++ b/packages/medusa/src/api/admin/tax-rates/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createOperatorMap, diff --git a/packages/medusa/src/api/admin/tax-regions/validators.ts b/packages/medusa/src/api/admin/tax-regions/validators.ts index 08a980d7e9..c936518331 100644 --- a/packages/medusa/src/api/admin/tax-regions/validators.ts +++ b/packages/medusa/src/api/admin/tax-regions/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createOperatorMap, diff --git a/packages/medusa/src/api/admin/translations/validators.ts b/packages/medusa/src/api/admin/translations/validators.ts index 389835c1da..3aaac9de6c 100644 --- a/packages/medusa/src/api/admin/translations/validators.ts +++ b/packages/medusa/src/api/admin/translations/validators.ts @@ -4,7 +4,7 @@ import { createFindParams, createSelectParams, } from "../../utils/validators" -import { z } from "zod" +import { z } from "@medusajs/framework/zod" export const AdminGetTranslationParams = createSelectParams() diff --git a/packages/medusa/src/api/admin/uploads/validators.ts b/packages/medusa/src/api/admin/uploads/validators.ts index eecdb7b262..aa364c8848 100644 --- a/packages/medusa/src/api/admin/uploads/validators.ts +++ b/packages/medusa/src/api/admin/uploads/validators.ts @@ -1,4 +1,4 @@ -import { z, ZodType } from "zod" +import { z, type ZodType } from "@medusajs/framework/zod" import { HttpTypes } from "@medusajs/types" import { createSelectParams } from "../../utils/validators" diff --git a/packages/medusa/src/api/admin/users/validators.ts b/packages/medusa/src/api/admin/users/validators.ts index a44b651122..ee7d1b13d7 100644 --- a/packages/medusa/src/api/admin/users/validators.ts +++ b/packages/medusa/src/api/admin/users/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createOperatorMap, diff --git a/packages/medusa/src/api/admin/views/[entity]/columns/validators.ts b/packages/medusa/src/api/admin/views/[entity]/columns/validators.ts index ffee7f66f6..ead6e3508a 100644 --- a/packages/medusa/src/api/admin/views/[entity]/columns/validators.ts +++ b/packages/medusa/src/api/admin/views/[entity]/columns/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createSelectParams } from "../../../../utils/validators" export type AdminGetColumnsParamsType = z.infer diff --git a/packages/medusa/src/api/admin/views/[entity]/configurations/validators.ts b/packages/medusa/src/api/admin/views/[entity]/configurations/validators.ts index da66f90cd7..1af0003092 100644 --- a/packages/medusa/src/api/admin/views/[entity]/configurations/validators.ts +++ b/packages/medusa/src/api/admin/views/[entity]/configurations/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createOperatorMap, diff --git a/packages/medusa/src/api/admin/workflows-executions/validators.ts b/packages/medusa/src/api/admin/workflows-executions/validators.ts index f60f541abd..f22e82c238 100644 --- a/packages/medusa/src/api/admin/workflows-executions/validators.ts +++ b/packages/medusa/src/api/admin/workflows-executions/validators.ts @@ -1,5 +1,5 @@ import { TransactionHandlerType } from "@medusajs/framework/utils" -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createSelectParams } from "../../utils/validators" export type AdminGetWorkflowExecutionDetailsParamsType = z.infer< diff --git a/packages/medusa/src/api/auth/validators.ts b/packages/medusa/src/api/auth/validators.ts index c506cf061e..79b64c32e3 100644 --- a/packages/medusa/src/api/auth/validators.ts +++ b/packages/medusa/src/api/auth/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" export const ResetPasswordRequest = z.object({ identifier: z.string(), diff --git a/packages/medusa/src/api/store/carts/validators.ts b/packages/medusa/src/api/store/carts/validators.ts index 3939e9b7e8..a26590c796 100644 --- a/packages/medusa/src/api/store/carts/validators.ts +++ b/packages/medusa/src/api/store/carts/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { AddressPayload } from "../../utils/common-validators" import { createSelectParams, WithAdditionalData } from "../../utils/validators" diff --git a/packages/medusa/src/api/store/collections/validators.ts b/packages/medusa/src/api/store/collections/validators.ts index f38a515159..2c9fd57848 100644 --- a/packages/medusa/src/api/store/collections/validators.ts +++ b/packages/medusa/src/api/store/collections/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createOperatorMap, diff --git a/packages/medusa/src/api/store/currencies/validators.ts b/packages/medusa/src/api/store/currencies/validators.ts index 242e5a6689..6dc1d2dd0d 100644 --- a/packages/medusa/src/api/store/currencies/validators.ts +++ b/packages/medusa/src/api/store/currencies/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createSelectParams } from "../../utils/validators" import { applyAndAndOrOperators } from "../../utils/common-validators" diff --git a/packages/medusa/src/api/store/customers/validators.ts b/packages/medusa/src/api/store/customers/validators.ts index 0c07179b89..3958b5135e 100644 --- a/packages/medusa/src/api/store/customers/validators.ts +++ b/packages/medusa/src/api/store/customers/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { AddressPayload } from "../../utils/common-validators" import { createFindParams, createSelectParams } from "../../utils/validators" diff --git a/packages/medusa/src/api/store/orders/validators.ts b/packages/medusa/src/api/store/orders/validators.ts index 91ee447940..ee22f22deb 100644 --- a/packages/medusa/src/api/store/orders/validators.ts +++ b/packages/medusa/src/api/store/orders/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createSelectParams } from "../../utils/validators" import { applyAndAndOrOperators } from "../../utils/common-validators" diff --git a/packages/medusa/src/api/store/payment-collections/validators.ts b/packages/medusa/src/api/store/payment-collections/validators.ts index 506ca844bb..542060cfbc 100644 --- a/packages/medusa/src/api/store/payment-collections/validators.ts +++ b/packages/medusa/src/api/store/payment-collections/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createSelectParams } from "../../utils/validators" export type StoreGetPaymentCollectionParamsType = z.infer< diff --git a/packages/medusa/src/api/store/payment-providers/validators.ts b/packages/medusa/src/api/store/payment-providers/validators.ts index 118ed569e5..65a0e1ad11 100644 --- a/packages/medusa/src/api/store/payment-providers/validators.ts +++ b/packages/medusa/src/api/store/payment-providers/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams } from "../../utils/validators" export type StoreGetPaymentProvidersParamsType = z.infer< diff --git a/packages/medusa/src/api/store/product-categories/validators.ts b/packages/medusa/src/api/store/product-categories/validators.ts index 9b850e8181..f22d79a425 100644 --- a/packages/medusa/src/api/store/product-categories/validators.ts +++ b/packages/medusa/src/api/store/product-categories/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { applyAndAndOrOperators, booleanString, diff --git a/packages/medusa/src/api/store/product-tags/validators.ts b/packages/medusa/src/api/store/product-tags/validators.ts index 1bf00e8a2b..6de625a269 100644 --- a/packages/medusa/src/api/store/product-tags/validators.ts +++ b/packages/medusa/src/api/store/product-tags/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { applyAndAndOrOperators } from "../../utils/common-validators" import { createFindParams, diff --git a/packages/medusa/src/api/store/product-types/validators.ts b/packages/medusa/src/api/store/product-types/validators.ts index f85c9f3973..98274102e7 100644 --- a/packages/medusa/src/api/store/product-types/validators.ts +++ b/packages/medusa/src/api/store/product-types/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { applyAndAndOrOperators } from "../../utils/common-validators" import { createFindParams, diff --git a/packages/medusa/src/api/store/product-variants/validators.ts b/packages/medusa/src/api/store/product-variants/validators.ts index 4ac119a977..57d9173402 100644 --- a/packages/medusa/src/api/store/product-variants/validators.ts +++ b/packages/medusa/src/api/store/product-variants/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { applyAndAndOrOperators, booleanString, diff --git a/packages/medusa/src/api/store/products/validators.ts b/packages/medusa/src/api/store/products/validators.ts index 42bfacd5e4..9c9f5a2fa6 100644 --- a/packages/medusa/src/api/store/products/validators.ts +++ b/packages/medusa/src/api/store/products/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { applyAndAndOrOperators, GetProductsParams, diff --git a/packages/medusa/src/api/store/regions/validators.ts b/packages/medusa/src/api/store/regions/validators.ts index e1f8228c16..2a6aca5af2 100644 --- a/packages/medusa/src/api/store/regions/validators.ts +++ b/packages/medusa/src/api/store/regions/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createSelectParams } from "../../utils/validators" import { applyAndAndOrOperators } from "../../utils/common-validators" diff --git a/packages/medusa/src/api/store/return-reasons/validators.ts b/packages/medusa/src/api/store/return-reasons/validators.ts index 6751c3fe2a..6602678b2f 100644 --- a/packages/medusa/src/api/store/return-reasons/validators.ts +++ b/packages/medusa/src/api/store/return-reasons/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createFindParams, createSelectParams } from "../../utils/validators" export type StoreReturnReasonParamsType = z.infer< diff --git a/packages/medusa/src/api/store/returns/validators.ts b/packages/medusa/src/api/store/returns/validators.ts index 71fbc37bbe..4a8e2c67b6 100644 --- a/packages/medusa/src/api/store/returns/validators.ts +++ b/packages/medusa/src/api/store/returns/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { applyAndAndOrOperators } from "../../utils/common-validators" import { createFindParams, createSelectParams } from "../../utils/validators" diff --git a/packages/medusa/src/api/store/shipping-options/validators.ts b/packages/medusa/src/api/store/shipping-options/validators.ts index 13508e7727..f0dc21b30d 100644 --- a/packages/medusa/src/api/store/shipping-options/validators.ts +++ b/packages/medusa/src/api/store/shipping-options/validators.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { applyAndAndOrOperators, booleanString, diff --git a/packages/medusa/src/api/utils/common-validators/common.ts b/packages/medusa/src/api/utils/common-validators/common.ts index 2a781fff73..68015a9fd5 100644 --- a/packages/medusa/src/api/utils/common-validators/common.ts +++ b/packages/medusa/src/api/utils/common-validators/common.ts @@ -1,4 +1,4 @@ -import { z } from "zod" +import { z } from "@medusajs/framework/zod" export const AddressPayload = z .object({ 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 9706e62303..4e0adc1708 100644 --- a/packages/medusa/src/api/utils/common-validators/products/index.ts +++ b/packages/medusa/src/api/utils/common-validators/products/index.ts @@ -1,6 +1,6 @@ import { FilterableProductProps, OperatorMap } from "@medusajs/framework/types" import { isPresent, ProductStatus } from "@medusajs/framework/utils" -import { z } from "zod" +import { z } from "@medusajs/framework/zod" import { createOperatorMap } from "../../validators" import { booleanString } from "../common" diff --git a/packages/medusa/src/api/utils/validators.ts b/packages/medusa/src/api/utils/validators.ts index b26c7a0e2d..9df8eeca12 100644 --- a/packages/medusa/src/api/utils/validators.ts +++ b/packages/medusa/src/api/utils/validators.ts @@ -1,4 +1,10 @@ -import { z, ZodEffects, ZodNullable, ZodObject, ZodOptional } from "zod" +import { + z, + type ZodEffects, + type ZodNullable, + type ZodObject, + type ZodOptional +} from "@medusajs/framework/zod" /** * Wraps the original schema to a function to accept and merge diff --git a/yarn.lock b/yarn.lock index 7fa105c9c5..7a82e7d7c7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3410,7 +3410,6 @@ __metadata: "@medusajs/framework": 2.12.5 csv-parse: ^5.6.0 json-2-csv: ^5.5.4 - zod: 3.25.76 peerDependencies: "@medusajs/framework": 2.12.5 languageName: unknown @@ -3503,6 +3502,7 @@ __metadata: "@opentelemetry/sdk-trace-node": ^2.0.0 awilix: ^8.0.1 pg: ^8.16.3 + zod: 3.25.76 languageName: unknown linkType: soft @@ -3644,7 +3644,6 @@ __metadata: morgan: ^1.9.1 path-to-regexp: ^8.2.0 tsconfig-paths: ^4.2.0 - zod: 3.25.76 zod-validation-error: 3.5.1 peerDependencies: "@aws-sdk/client-dynamodb": ^3.218.0 @@ -3864,7 +3863,6 @@ __metadata: request-ip: ^3.3.0 slugify: ^1.6.6 uuid: ^9.0.0 - zod: 3.25.76 peerDependencies: "@medusajs/framework": 2.12.5 "@swc/core": ^1.7.28 @@ -4253,7 +4251,6 @@ __metadata: pg-connection-string: ^2.7.0 pluralize: ^8.0.0 ulid: ^2.3.0 - zod: 3.25.76 peerDependencies: express: ^4.21.0 languageName: unknown