diff --git a/docs/features/software-templates/writing-custom-actions.md b/docs/features/software-templates/writing-custom-actions.md index f5ed9e4854..744c15ed75 100644 --- a/docs/features/software-templates/writing-custom-actions.md +++ b/docs/features/software-templates/writing-custom-actions.md @@ -56,7 +56,7 @@ its generated unit test. We will replace the existing placeholder code with our import { resolveSafeChildPath } from '@backstage/backend-plugin-api'; import { createTemplateAction } from '@backstage/plugin-scaffolder-node'; import fs from 'fs-extra'; -import { type z } from 'zod'; +import { type z } from 'zod/v3'; export const createNewFileAction = () => { return createTemplateAction({ diff --git a/docs/features/software-templates/writing-custom-field-extensions.md b/docs/features/software-templates/writing-custom-field-extensions.md index 3fe4d82a1f..f2e8486a07 100644 --- a/docs/features/software-templates/writing-custom-field-extensions.md +++ b/docs/features/software-templates/writing-custom-field-extensions.md @@ -290,7 +290,7 @@ and type for your field props to preventing having to duplicate the definitions: ```tsx //packages/app/src/scaffolder/MyCustomExtensionWithOptions/MyCustomExtensionWithOptions.tsx ... -import { z } from 'zod'; +import { z } from 'zod/v3'; import { makeFieldSchemaFromZod } from '@backstage/plugin-scaffolder'; const MyCustomExtensionWithOptionsFieldSchema = makeFieldSchemaFromZod( diff --git a/docs/permissions/custom-rules.md b/docs/permissions/custom-rules.md index 4b188ce7f9..039805bcb4 100644 --- a/docs/permissions/custom-rules.md +++ b/docs/permissions/custom-rules.md @@ -23,7 +23,7 @@ import { createConditionFactory, createPermissionRule, } from '@backstage/plugin-permission-node'; -import { z } from 'zod'; +import { z } from 'zod/v3'; export const isInSystemRule = createPermissionRule({ name: 'IS_IN_SYSTEM', diff --git a/docs/permissions/plugin-authors/03-adding-a-resource-permission-check.md b/docs/permissions/plugin-authors/03-adding-a-resource-permission-check.md index 1e1a73607b..afdb3b8c62 100644 --- a/docs/permissions/plugin-authors/03-adding-a-resource-permission-check.md +++ b/docs/permissions/plugin-authors/03-adding-a-resource-permission-check.md @@ -126,7 +126,7 @@ import { createPermissionRule, } from '@backstage/plugin-permission-node'; import { TODO_LIST_RESOURCE_TYPE } from '@internal/plugin-todo-list-common'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { Todo, TodoFilter } from './todos'; export const todoListPermissionResourceRef = createPermissionResourceRef< diff --git a/packages/backend-defaults/src/alpha/entrypoints/actionsRegistry/DefaultActionsRegistryService.ts b/packages/backend-defaults/src/alpha/entrypoints/actionsRegistry/DefaultActionsRegistryService.ts index 73b5126ab5..01255db10c 100644 --- a/packages/backend-defaults/src/alpha/entrypoints/actionsRegistry/DefaultActionsRegistryService.ts +++ b/packages/backend-defaults/src/alpha/entrypoints/actionsRegistry/DefaultActionsRegistryService.ts @@ -25,7 +25,7 @@ import { } from '@backstage/backend-plugin-api'; import PromiseRouter from 'express-promise-router'; import { Router, json } from 'express'; -import { z, AnyZodObject } from 'zod'; +import { z, AnyZodObject } from 'zod/v3'; import zodToJsonSchema from 'zod-to-json-schema'; import { ActionsRegistryActionOptions, diff --git a/packages/backend-defaults/src/entrypoints/auditor/types.ts b/packages/backend-defaults/src/entrypoints/auditor/types.ts index 7827a31d1f..49a6de75ea 100644 --- a/packages/backend-defaults/src/entrypoints/auditor/types.ts +++ b/packages/backend-defaults/src/entrypoints/auditor/types.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { z } from 'zod'; +import { z } from 'zod/v3'; /** @internal */ export const severityLogLevelMappingsSchema = z.record( diff --git a/packages/backend-defaults/src/entrypoints/auditor/utils.ts b/packages/backend-defaults/src/entrypoints/auditor/utils.ts index 719a227bf9..bf1e1f4756 100644 --- a/packages/backend-defaults/src/entrypoints/auditor/utils.ts +++ b/packages/backend-defaults/src/entrypoints/auditor/utils.ts @@ -16,7 +16,7 @@ import type { Config } from '@backstage/config'; import { InputError } from '@backstage/errors'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { CONFIG_ROOT_KEY, severityLogLevelMappingsSchema } from './types'; /** diff --git a/packages/backend-defaults/src/entrypoints/scheduler/lib/types.ts b/packages/backend-defaults/src/entrypoints/scheduler/lib/types.ts index f691ef78a0..c7f77e7a85 100644 --- a/packages/backend-defaults/src/entrypoints/scheduler/lib/types.ts +++ b/packages/backend-defaults/src/entrypoints/scheduler/lib/types.ts @@ -17,7 +17,7 @@ import { JsonObject } from '@backstage/types'; import { CronTime } from 'cron'; import { Duration } from 'luxon'; -import { z } from 'zod'; +import { z } from 'zod/v3'; function isValidOptionalDurationString(d: string | undefined): boolean { try { diff --git a/packages/backend-plugin-api/report-alpha.api.md b/packages/backend-plugin-api/report-alpha.api.md index 0f2c220609..72d9a2561e 100644 --- a/packages/backend-plugin-api/report-alpha.api.md +++ b/packages/backend-plugin-api/report-alpha.api.md @@ -3,7 +3,7 @@ > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/). ```ts -import { AnyZodObject } from 'zod'; +import { AnyZodObject } from 'zod/v3'; import { BackstageCredentials } from '@backstage/backend-plugin-api'; import { BasicPermission } from '@backstage/plugin-permission-common'; import { JsonObject } from '@backstage/types'; @@ -11,7 +11,7 @@ import { JSONSchema7 } from 'json-schema'; import { JsonValue } from '@backstage/types'; import { LoggerService } from '@backstage/backend-plugin-api'; import { ServiceRef } from '@backstage/backend-plugin-api'; -import { z } from 'zod'; +import { z } from 'zod/v3'; // @alpha (undocumented) export type ActionsRegistryActionContext = { diff --git a/packages/backend-plugin-api/src/alpha/ActionsRegistryService.ts b/packages/backend-plugin-api/src/alpha/ActionsRegistryService.ts index a707e350e9..20b4d769cc 100644 --- a/packages/backend-plugin-api/src/alpha/ActionsRegistryService.ts +++ b/packages/backend-plugin-api/src/alpha/ActionsRegistryService.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { z, AnyZodObject } from 'zod'; +import { z, AnyZodObject } from 'zod/v3'; import { BasicPermission } from '@backstage/plugin-permission-common'; import { LoggerService, diff --git a/packages/backend-plugin-api/src/services/definitions/ActionsRegistryService.ts b/packages/backend-plugin-api/src/services/definitions/ActionsRegistryService.ts index a17c82c6f2..05f6879f07 100644 --- a/packages/backend-plugin-api/src/services/definitions/ActionsRegistryService.ts +++ b/packages/backend-plugin-api/src/services/definitions/ActionsRegistryService.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { z, AnyZodObject } from 'zod'; +import { z, AnyZodObject } from 'zod/v3'; import { BasicPermission } from '@backstage/plugin-permission-common'; import { LoggerService } from './LoggerService'; import { BackstageCredentials } from './AuthService'; diff --git a/packages/backend-test-utils/report-alpha.api.md b/packages/backend-test-utils/report-alpha.api.md index b6bf9e883d..4813f49c35 100644 --- a/packages/backend-test-utils/report-alpha.api.md +++ b/packages/backend-test-utils/report-alpha.api.md @@ -7,7 +7,7 @@ import { ActionsRegistryActionOptions } from '@backstage/backend-plugin-api/alph import { ActionsRegistryService } from '@backstage/backend-plugin-api/alpha'; import { ActionsService } from '@backstage/backend-plugin-api/alpha'; import { ActionsServiceAction } from '@backstage/backend-plugin-api/alpha'; -import { AnyZodObject } from 'zod'; +import { AnyZodObject } from 'zod/v3'; import { BackstageCredentials } from '@backstage/backend-plugin-api'; import { JsonObject } from '@backstage/types'; import { JsonValue } from '@backstage/types'; diff --git a/packages/backend-test-utils/src/alpha/services/MockActionsRegistry.ts b/packages/backend-test-utils/src/alpha/services/MockActionsRegistry.ts index 94d844746f..03edb42fad 100644 --- a/packages/backend-test-utils/src/alpha/services/MockActionsRegistry.ts +++ b/packages/backend-test-utils/src/alpha/services/MockActionsRegistry.ts @@ -19,7 +19,7 @@ import { } from '@backstage/backend-plugin-api'; import { InputError, NotFoundError } from '@backstage/errors'; import { JsonObject, JsonValue } from '@backstage/types'; -import { z, AnyZodObject } from 'zod'; +import { z, AnyZodObject } from 'zod/v3'; import zodToJsonSchema from 'zod-to-json-schema'; import { mockCredentials } from '../../services'; import { diff --git a/packages/catalog-model/examples/apis/hello-world-trpc-api.yaml b/packages/catalog-model/examples/apis/hello-world-trpc-api.yaml index f5807537b3..f1847154ce 100644 --- a/packages/catalog-model/examples/apis/hello-world-trpc-api.yaml +++ b/packages/catalog-model/examples/apis/hello-world-trpc-api.yaml @@ -8,7 +8,7 @@ spec: lifecycle: experimental owner: team-c definition: | - import { z } from 'zod'; + import { z } from 'zod/v3'; import { publicProcedure, router } from '../trpc'; export const apiRouter = router({ diff --git a/packages/cli-module-auth/src/lib/auth.ts b/packages/cli-module-auth/src/lib/auth.ts index 0344d4636e..36bdf3dfbc 100644 --- a/packages/cli-module-auth/src/lib/auth.ts +++ b/packages/cli-module-auth/src/lib/auth.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { z } from 'zod'; +import { z } from 'zod/v3'; import { StoredInstance, upsertInstance, diff --git a/packages/cli-module-auth/src/lib/storage.ts b/packages/cli-module-auth/src/lib/storage.ts index 9d2551a4f9..0e7668a0ea 100644 --- a/packages/cli-module-auth/src/lib/storage.ts +++ b/packages/cli-module-auth/src/lib/storage.ts @@ -20,7 +20,7 @@ import os from 'node:os'; import path from 'node:path'; import lockfile from 'proper-lockfile'; import YAML from 'yaml'; -import { z } from 'zod'; +import { z } from 'zod/v3'; const METADATA_FILE = 'auth-instances.yaml'; diff --git a/packages/cli-module-new/src/lib/preparation/loadPortableTemplate.ts b/packages/cli-module-new/src/lib/preparation/loadPortableTemplate.ts index 6a683fb31c..13bae23f3c 100644 --- a/packages/cli-module-new/src/lib/preparation/loadPortableTemplate.ts +++ b/packages/cli-module-new/src/lib/preparation/loadPortableTemplate.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { z } from 'zod'; +import { z } from 'zod/v3'; import fs from 'fs-extra'; import recursiveReaddir from 'recursive-readdir'; import { resolve as resolvePath, relative as relativePath } from 'node:path'; diff --git a/packages/cli-module-new/src/lib/preparation/loadPortableTemplateConfig.ts b/packages/cli-module-new/src/lib/preparation/loadPortableTemplateConfig.ts index 50ffda7516..06625c79f8 100644 --- a/packages/cli-module-new/src/lib/preparation/loadPortableTemplateConfig.ts +++ b/packages/cli-module-new/src/lib/preparation/loadPortableTemplateConfig.ts @@ -25,7 +25,7 @@ import { TEMPLATE_FILE_NAME, } from '../types'; import { parse as parseYaml } from 'yaml'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { fromZodError } from 'zod-validation-error/v3'; import { ForwardedError } from '@backstage/errors'; diff --git a/packages/cli-module-new/templates/backend-plugin/src/router.ts b/packages/cli-module-new/templates/backend-plugin/src/router.ts index fba8a24cb2..0fbbc54cc3 100644 --- a/packages/cli-module-new/templates/backend-plugin/src/router.ts +++ b/packages/cli-module-new/templates/backend-plugin/src/router.ts @@ -1,6 +1,6 @@ import { HttpAuthService } from '@backstage/backend-plugin-api'; import { InputError } from '@backstage/errors'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import express from 'express'; import Router from 'express-promise-router'; import { todoListServiceRef } from './services/TodoListService'; diff --git a/packages/cli-node/src/roles/PackageRoles.ts b/packages/cli-node/src/roles/PackageRoles.ts index 7761b0d4cc..2987a7cbda 100644 --- a/packages/cli-node/src/roles/PackageRoles.ts +++ b/packages/cli-node/src/roles/PackageRoles.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { z } from 'zod'; +import { z } from 'zod/v3'; import { PackageRole, PackageRoleInfo } from './types'; const packageRoleInfos: PackageRoleInfo[] = [ diff --git a/packages/cli-node/src/yarn/yarnPlugin.ts b/packages/cli-node/src/yarn/yarnPlugin.ts index 65383edd0c..78f6c724be 100644 --- a/packages/cli-node/src/yarn/yarnPlugin.ts +++ b/packages/cli-node/src/yarn/yarnPlugin.ts @@ -17,7 +17,7 @@ import fs from 'fs-extra'; import { resolve as resolvePath } from 'node:path'; import yaml from 'yaml'; -import z from 'zod'; +import z from 'zod/v3'; import { targetPaths } from '@backstage/cli-common'; const yarnRcSchema = z.object({ diff --git a/packages/core-app-api/src/apis/implementations/auth/saml/types.ts b/packages/core-app-api/src/apis/implementations/auth/saml/types.ts index e5e32e3457..bc3e0c20fb 100644 --- a/packages/core-app-api/src/apis/implementations/auth/saml/types.ts +++ b/packages/core-app-api/src/apis/implementations/auth/saml/types.ts @@ -18,7 +18,7 @@ import { BackstageIdentityResponse, ProfileInfo, } from '@backstage/core-plugin-api'; -import { z } from 'zod'; +import { z } from 'zod/v3'; /** @internal */ export type SamlSession = { diff --git a/packages/core-app-api/src/lib/AuthSessionManager/AuthSessionStore.test.ts b/packages/core-app-api/src/lib/AuthSessionManager/AuthSessionStore.test.ts index 3f8622890b..b1bba12027 100644 --- a/packages/core-app-api/src/lib/AuthSessionManager/AuthSessionStore.test.ts +++ b/packages/core-app-api/src/lib/AuthSessionManager/AuthSessionStore.test.ts @@ -15,7 +15,7 @@ */ import { withLogCollector } from '@backstage/test-utils'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { AuthSessionStore } from './AuthSessionStore'; import { SessionManager } from './types'; diff --git a/packages/core-app-api/src/lib/AuthSessionManager/AuthSessionStore.ts b/packages/core-app-api/src/lib/AuthSessionManager/AuthSessionStore.ts index e1fb80d41f..d3be6748bf 100644 --- a/packages/core-app-api/src/lib/AuthSessionManager/AuthSessionStore.ts +++ b/packages/core-app-api/src/lib/AuthSessionManager/AuthSessionStore.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { ZodSchema } from 'zod'; +import { ZodSchema } from 'zod/v3'; import { MutableSessionManager, SessionScopesFunc, diff --git a/packages/core-components/src/layout/ProxiedSignInPage/types.test.ts b/packages/core-components/src/layout/ProxiedSignInPage/types.test.ts index 178714ecf9..d3088e5f19 100644 --- a/packages/core-components/src/layout/ProxiedSignInPage/types.test.ts +++ b/packages/core-components/src/layout/ProxiedSignInPage/types.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { TypeOf } from 'zod'; +import { TypeOf } from 'zod/v3'; import { ProxiedSession, proxiedSessionSchema } from './types'; describe('types', () => { diff --git a/packages/core-components/src/layout/ProxiedSignInPage/types.ts b/packages/core-components/src/layout/ProxiedSignInPage/types.ts index dd4230cd8b..bf237aabc7 100644 --- a/packages/core-components/src/layout/ProxiedSignInPage/types.ts +++ b/packages/core-components/src/layout/ProxiedSignInPage/types.ts @@ -18,7 +18,7 @@ import { BackstageIdentityResponse, ProfileInfo, } from '@backstage/core-plugin-api'; -import { z } from 'zod'; +import { z } from 'zod/v3'; export const proxiedSessionSchema = z.object({ providerInfo: z.object({}).catchall(z.unknown()).optional(), diff --git a/packages/filter-predicates/src/predicates/schema.test.ts b/packages/filter-predicates/src/predicates/schema.test.ts index 08c92c20e8..ff38dabfce 100644 --- a/packages/filter-predicates/src/predicates/schema.test.ts +++ b/packages/filter-predicates/src/predicates/schema.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { z } from 'zod'; +import { z } from 'zod/v3'; import { createZodV3FilterPredicateSchema, parseFilterPredicate, diff --git a/packages/frontend-plugin-api/report.api.md b/packages/frontend-plugin-api/report.api.md index b9c5bf269a..c3936ba0da 100644 --- a/packages/frontend-plugin-api/report.api.md +++ b/packages/frontend-plugin-api/report.api.md @@ -23,7 +23,7 @@ import { Observable } from '@backstage/types'; import { PropsWithChildren } from 'react'; import { ReactNode } from 'react'; import { SwappableComponentRef as SwappableComponentRef_2 } from '@backstage/frontend-plugin-api'; -import type { z } from 'zod'; +import type { z } from 'zod/v3'; // @public @deprecated export type AlertApi = { diff --git a/packages/frontend-plugin-api/src/schema/createSchemaFromZod.ts b/packages/frontend-plugin-api/src/schema/createSchemaFromZod.ts index b15ff980ec..6dbac61c62 100644 --- a/packages/frontend-plugin-api/src/schema/createSchemaFromZod.ts +++ b/packages/frontend-plugin-api/src/schema/createSchemaFromZod.ts @@ -15,7 +15,7 @@ */ import { JsonObject } from '@backstage/types'; -import { z, type ZodSchema, type ZodTypeDef } from 'zod'; +import { z, type ZodSchema, type ZodTypeDef } from 'zod/v3'; import zodToJsonSchema from 'zod-to-json-schema'; import { PortableSchema } from './types'; diff --git a/packages/frontend-plugin-api/src/wiring/createExtension.ts b/packages/frontend-plugin-api/src/wiring/createExtension.ts index 8632b3caeb..1b5869460a 100644 --- a/packages/frontend-plugin-api/src/wiring/createExtension.ts +++ b/packages/frontend-plugin-api/src/wiring/createExtension.ts @@ -26,7 +26,7 @@ import { } from '@internal/frontend'; import { ExtensionDataRef, ExtensionDataValue } from './createExtensionDataRef'; import { ExtensionInput } from './createExtensionInput'; -import type { z } from 'zod'; +import type { z } from 'zod/v3'; import { createSchemaFromZod } from '../schema/createSchemaFromZod'; import { OpaqueExtensionDefinition } from '@internal/frontend'; import { ExtensionDataContainer } from './types'; diff --git a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts index 2d2288b120..cd593f3c93 100644 --- a/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts +++ b/packages/frontend-plugin-api/src/wiring/createExtensionBlueprint.ts @@ -26,7 +26,7 @@ import { ctxParamsSymbol, VerifyExtensionAttachTo, } from './createExtension'; -import type { z } from 'zod'; +import type { z } from 'zod/v3'; import { ExtensionInput } from './createExtensionInput'; import { ExtensionDataRef, ExtensionDataValue } from './createExtensionDataRef'; import { createExtensionDataContainer } from '@internal/frontend'; diff --git a/packages/repo-tools/src/commands/package-docs/Cache.ts b/packages/repo-tools/src/commands/package-docs/Cache.ts index be005ac280..0ca38c1c39 100644 --- a/packages/repo-tools/src/commands/package-docs/Cache.ts +++ b/packages/repo-tools/src/commands/package-docs/Cache.ts @@ -19,7 +19,7 @@ import { dirname, join as joinPath, relative } from 'node:path'; import crypto from 'node:crypto'; import { Lockfile } from '@backstage/cli-node'; import { exists, rm, mkdirp } from 'fs-extra'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { CACHE_DIR, CACHE_FILE } from './constants'; const version = '1'; diff --git a/packages/scaffolder-internal/src/wiring/InternalFormDecorator.ts b/packages/scaffolder-internal/src/wiring/InternalFormDecorator.ts index 7942544acb..39de69a5bf 100644 --- a/packages/scaffolder-internal/src/wiring/InternalFormDecorator.ts +++ b/packages/scaffolder-internal/src/wiring/InternalFormDecorator.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import { OpaqueType } from '@internal/opaque'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { ScaffolderFormDecorator, diff --git a/packages/scaffolder-internal/src/wiring/InternalFormField.ts b/packages/scaffolder-internal/src/wiring/InternalFormField.ts index b711341ea5..24e279f47f 100644 --- a/packages/scaffolder-internal/src/wiring/InternalFormField.ts +++ b/packages/scaffolder-internal/src/wiring/InternalFormField.ts @@ -15,7 +15,7 @@ */ import { OpaqueType } from '@internal/opaque'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { FormFieldExtensionData, diff --git a/plugins/api-docs/dev/trpc-example-api.yaml b/plugins/api-docs/dev/trpc-example-api.yaml index f5807537b3..f1847154ce 100644 --- a/plugins/api-docs/dev/trpc-example-api.yaml +++ b/plugins/api-docs/dev/trpc-example-api.yaml @@ -8,7 +8,7 @@ spec: lifecycle: experimental owner: team-c definition: | - import { z } from 'zod'; + import { z } from 'zod/v3'; import { publicProcedure, router } from '../trpc'; export const apiRouter = router({ diff --git a/plugins/auth-backend-module-atlassian-provider/src/resolvers.ts b/plugins/auth-backend-module-atlassian-provider/src/resolvers.ts index 949f25db9c..21d07b772c 100644 --- a/plugins/auth-backend-module-atlassian-provider/src/resolvers.ts +++ b/plugins/auth-backend-module-atlassian-provider/src/resolvers.ts @@ -20,7 +20,7 @@ import { PassportProfile, SignInInfo, } from '@backstage/plugin-auth-node'; -import { z } from 'zod'; +import { z } from 'zod/v3'; /** * Available sign-in resolvers for the Atlassian auth provider. diff --git a/plugins/auth-backend-module-aws-alb-provider/src/resolvers.ts b/plugins/auth-backend-module-aws-alb-provider/src/resolvers.ts index 38b4b60f27..f3a65c9108 100644 --- a/plugins/auth-backend-module-aws-alb-provider/src/resolvers.ts +++ b/plugins/auth-backend-module-aws-alb-provider/src/resolvers.ts @@ -19,7 +19,7 @@ import { SignInInfo, } from '@backstage/plugin-auth-node'; import { AwsAlbResult } from './types'; -import { z } from 'zod'; +import { z } from 'zod/v3'; /** * Available sign-in resolvers for the AWS ALB auth provider. diff --git a/plugins/auth-backend-module-azure-easyauth-provider/src/resolvers.ts b/plugins/auth-backend-module-azure-easyauth-provider/src/resolvers.ts index 94afa90c5f..b40b137a11 100644 --- a/plugins/auth-backend-module-azure-easyauth-provider/src/resolvers.ts +++ b/plugins/auth-backend-module-azure-easyauth-provider/src/resolvers.ts @@ -19,7 +19,7 @@ import { SignInInfo, } from '@backstage/plugin-auth-node'; import { AzureEasyAuthResult } from './types'; -import { z } from 'zod'; +import { z } from 'zod/v3'; /** @public */ export namespace azureEasyAuthSignInResolvers { diff --git a/plugins/auth-backend-module-bitbucket-provider/src/resolvers.ts b/plugins/auth-backend-module-bitbucket-provider/src/resolvers.ts index 6691806e63..bef3d2b34d 100644 --- a/plugins/auth-backend-module-bitbucket-provider/src/resolvers.ts +++ b/plugins/auth-backend-module-bitbucket-provider/src/resolvers.ts @@ -20,7 +20,7 @@ import { PassportProfile, SignInInfo, } from '@backstage/plugin-auth-node'; -import { z } from 'zod'; +import { z } from 'zod/v3'; /** * Available sign-in resolvers for the Bitbucket auth provider. diff --git a/plugins/auth-backend-module-bitbucket-server-provider/src/resolvers.ts b/plugins/auth-backend-module-bitbucket-server-provider/src/resolvers.ts index 2e92d8c6ad..96821669bd 100644 --- a/plugins/auth-backend-module-bitbucket-server-provider/src/resolvers.ts +++ b/plugins/auth-backend-module-bitbucket-server-provider/src/resolvers.ts @@ -19,7 +19,7 @@ import { PassportProfile, SignInInfo, } from '@backstage/plugin-auth-node'; -import { z } from 'zod'; +import { z } from 'zod/v3'; /** * Available sign-in resolvers for the Bitbucket Server auth provider. diff --git a/plugins/auth-backend-module-cloudflare-access-provider/src/resolvers.ts b/plugins/auth-backend-module-cloudflare-access-provider/src/resolvers.ts index 21cb124be4..aadd80b2a2 100644 --- a/plugins/auth-backend-module-cloudflare-access-provider/src/resolvers.ts +++ b/plugins/auth-backend-module-cloudflare-access-provider/src/resolvers.ts @@ -19,7 +19,7 @@ import { SignInInfo, } from '@backstage/plugin-auth-node'; import { CloudflareAccessResult } from './types'; -import { z } from 'zod'; +import { z } from 'zod/v3'; /** * Available sign-in resolvers for the Cloudflare Access auth provider. diff --git a/plugins/auth-backend-module-gcp-iap-provider/src/resolvers.ts b/plugins/auth-backend-module-gcp-iap-provider/src/resolvers.ts index 77dc7b1062..9d57dc198e 100644 --- a/plugins/auth-backend-module-gcp-iap-provider/src/resolvers.ts +++ b/plugins/auth-backend-module-gcp-iap-provider/src/resolvers.ts @@ -19,7 +19,7 @@ import { SignInInfo, } from '@backstage/plugin-auth-node'; import { GcpIapResult } from './types'; -import { z } from 'zod'; +import { z } from 'zod/v3'; /** * Available sign-in resolvers for the Google auth provider. diff --git a/plugins/auth-backend-module-github-provider/src/resolvers.ts b/plugins/auth-backend-module-github-provider/src/resolvers.ts index e065432826..b66478d7a6 100644 --- a/plugins/auth-backend-module-github-provider/src/resolvers.ts +++ b/plugins/auth-backend-module-github-provider/src/resolvers.ts @@ -19,7 +19,7 @@ import { OAuthAuthenticatorResult, SignInInfo, } from '@backstage/plugin-auth-node'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { GithubProfile } from './authenticator'; diff --git a/plugins/auth-backend-module-gitlab-provider/src/resolvers.ts b/plugins/auth-backend-module-gitlab-provider/src/resolvers.ts index 0b6abd0f28..42e30709af 100644 --- a/plugins/auth-backend-module-gitlab-provider/src/resolvers.ts +++ b/plugins/auth-backend-module-gitlab-provider/src/resolvers.ts @@ -19,7 +19,7 @@ import { OAuthAuthenticatorResult, SignInInfo, } from '@backstage/plugin-auth-node'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { GitlabProfile } from './authenticator'; diff --git a/plugins/auth-backend-module-google-provider/src/resolvers.ts b/plugins/auth-backend-module-google-provider/src/resolvers.ts index 297ac0da6e..ed9b080b25 100644 --- a/plugins/auth-backend-module-google-provider/src/resolvers.ts +++ b/plugins/auth-backend-module-google-provider/src/resolvers.ts @@ -20,7 +20,7 @@ import { PassportProfile, SignInInfo, } from '@backstage/plugin-auth-node'; -import { z } from 'zod'; +import { z } from 'zod/v3'; /** * Available sign-in resolvers for the Google auth provider. diff --git a/plugins/auth-backend-module-microsoft-provider/src/resolvers.ts b/plugins/auth-backend-module-microsoft-provider/src/resolvers.ts index 0ce276522e..e27c406844 100644 --- a/plugins/auth-backend-module-microsoft-provider/src/resolvers.ts +++ b/plugins/auth-backend-module-microsoft-provider/src/resolvers.ts @@ -20,7 +20,7 @@ import { PassportProfile, SignInInfo, } from '@backstage/plugin-auth-node'; -import { z } from 'zod'; +import { z } from 'zod/v3'; /** * Available sign-in resolvers for the Microsoft auth provider. diff --git a/plugins/auth-backend-module-oauth2-provider/src/resolvers.ts b/plugins/auth-backend-module-oauth2-provider/src/resolvers.ts index bad3f015c8..f27f3c70a4 100644 --- a/plugins/auth-backend-module-oauth2-provider/src/resolvers.ts +++ b/plugins/auth-backend-module-oauth2-provider/src/resolvers.ts @@ -20,7 +20,7 @@ import { PassportProfile, SignInInfo, } from '@backstage/plugin-auth-node'; -import { z } from 'zod'; +import { z } from 'zod/v3'; /** * Available sign-in resolvers for the oauth2 auth provider. diff --git a/plugins/auth-backend-module-oauth2-proxy-provider/src/resolvers.ts b/plugins/auth-backend-module-oauth2-proxy-provider/src/resolvers.ts index 8ac639b3c0..6453b2ab6e 100644 --- a/plugins/auth-backend-module-oauth2-proxy-provider/src/resolvers.ts +++ b/plugins/auth-backend-module-oauth2-proxy-provider/src/resolvers.ts @@ -19,7 +19,7 @@ import { SignInInfo, } from '@backstage/plugin-auth-node'; import { OAuth2ProxyResult } from './types'; -import { z } from 'zod'; +import { z } from 'zod/v3'; /** * @public diff --git a/plugins/auth-backend-module-okta-provider/src/resolvers.ts b/plugins/auth-backend-module-okta-provider/src/resolvers.ts index cdb37dbaae..35839b4581 100644 --- a/plugins/auth-backend-module-okta-provider/src/resolvers.ts +++ b/plugins/auth-backend-module-okta-provider/src/resolvers.ts @@ -20,7 +20,7 @@ import { PassportProfile, SignInInfo, } from '@backstage/plugin-auth-node'; -import { z } from 'zod'; +import { z } from 'zod/v3'; /** * Available sign-in resolvers for the Okta auth provider. diff --git a/plugins/auth-backend-module-onelogin-provider/src/resolvers.ts b/plugins/auth-backend-module-onelogin-provider/src/resolvers.ts index 56710472be..288e070530 100644 --- a/plugins/auth-backend-module-onelogin-provider/src/resolvers.ts +++ b/plugins/auth-backend-module-onelogin-provider/src/resolvers.ts @@ -20,7 +20,7 @@ import { PassportProfile, SignInInfo, } from '@backstage/plugin-auth-node'; -import { z } from 'zod'; +import { z } from 'zod/v3'; /** * Available sign-in resolvers for the OneLogin auth provider. diff --git a/plugins/auth-backend-module-openshift-provider/src/authenticator.ts b/plugins/auth-backend-module-openshift-provider/src/authenticator.ts index 0c9acb6287..9972c62adf 100644 --- a/plugins/auth-backend-module-openshift-provider/src/authenticator.ts +++ b/plugins/auth-backend-module-openshift-provider/src/authenticator.ts @@ -22,7 +22,7 @@ import { } from '@backstage/plugin-auth-node'; import { createHash } from 'node:crypto'; import OAuth2Strategy from 'passport-oauth2'; -import { z } from 'zod'; +import { z } from 'zod/v3'; /** @public */ export interface OpenShiftAuthenticatorContext { diff --git a/plugins/auth-backend-module-openshift-provider/src/resolvers.ts b/plugins/auth-backend-module-openshift-provider/src/resolvers.ts index dee55ec4ca..f342b69133 100644 --- a/plugins/auth-backend-module-openshift-provider/src/resolvers.ts +++ b/plugins/auth-backend-module-openshift-provider/src/resolvers.ts @@ -25,7 +25,7 @@ import { DEFAULT_NAMESPACE, stringifyEntityRef, } from '@backstage/catalog-model'; -import { z } from 'zod'; +import { z } from 'zod/v3'; export namespace openshiftSignInResolvers { export const displayNameMatchingUserEntityName = createSignInResolverFactory({ diff --git a/plugins/auth-backend/src/service/OidcRouter.ts b/plugins/auth-backend/src/service/OidcRouter.ts index dc921a9489..304bfa5ed9 100644 --- a/plugins/auth-backend/src/service/OidcRouter.ts +++ b/plugins/auth-backend/src/service/OidcRouter.ts @@ -27,7 +27,7 @@ import { UserInfoDatabase } from '../database/UserInfoDatabase'; import { OidcDatabase } from '../database/OidcDatabase'; import { OfflineAccessService } from './OfflineAccessService'; import { json } from 'express'; -import { z } from 'zod'; +import { z } from 'zod/v4'; import { fromZodError } from 'zod-validation-error'; import { OidcError } from './OidcError'; diff --git a/plugins/auth-node/report.api.md b/plugins/auth-node/report.api.md index a5939e6e24..7cc68b44b3 100644 --- a/plugins/auth-node/report.api.md +++ b/plugins/auth-node/report.api.md @@ -16,8 +16,8 @@ import { Profile } from 'passport'; import { Request as Request_2 } from 'express'; import { Response as Response_2 } from 'express'; import { Strategy } from 'passport'; -import { ZodSchema } from 'zod'; -import { ZodTypeDef } from 'zod'; +import { ZodSchema } from 'zod/v3'; +import { ZodTypeDef } from 'zod/v3'; // @public (undocumented) export interface AuthOwnershipResolutionExtensionPoint { diff --git a/plugins/auth-node/src/sign-in/commonSignInResolvers.ts b/plugins/auth-node/src/sign-in/commonSignInResolvers.ts index 2b7442f746..2d593ec44a 100644 --- a/plugins/auth-node/src/sign-in/commonSignInResolvers.ts +++ b/plugins/auth-node/src/sign-in/commonSignInResolvers.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { z } from 'zod'; +import { z } from 'zod/v3'; import { createSignInResolverFactory } from './createSignInResolverFactory'; import { NotAllowedError } from '@backstage/errors'; diff --git a/plugins/auth-node/src/sign-in/createSignInResolverFactory.ts b/plugins/auth-node/src/sign-in/createSignInResolverFactory.ts index 2bcdbefbb2..e74be6dbb8 100644 --- a/plugins/auth-node/src/sign-in/createSignInResolverFactory.ts +++ b/plugins/auth-node/src/sign-in/createSignInResolverFactory.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { ZodSchema, ZodTypeDef } from 'zod'; +import { ZodSchema, ZodTypeDef } from 'zod/v3'; import { SignInResolver } from '../types'; import zodToJsonSchema from 'zod-to-json-schema'; import { JsonObject } from '@backstage/types'; diff --git a/plugins/catalog-backend/src/ingestion/CatalogRules.ts b/plugins/catalog-backend/src/ingestion/CatalogRules.ts index cfac644e34..3a5fec5891 100644 --- a/plugins/catalog-backend/src/ingestion/CatalogRules.ts +++ b/plugins/catalog-backend/src/ingestion/CatalogRules.ts @@ -19,7 +19,7 @@ import { Entity } from '@backstage/catalog-model'; import path from 'node:path'; import { LocationSpec } from '@backstage/plugin-catalog-common'; import { minimatch } from 'minimatch'; -import { z } from 'zod'; +import { z } from 'zod/v3'; /** * Rules to apply to catalog entities. diff --git a/plugins/catalog-backend/src/permissions/rules/createPropertyRule.ts b/plugins/catalog-backend/src/permissions/rules/createPropertyRule.ts index d0a37802e0..a7f348763b 100644 --- a/plugins/catalog-backend/src/permissions/rules/createPropertyRule.ts +++ b/plugins/catalog-backend/src/permissions/rules/createPropertyRule.ts @@ -17,7 +17,7 @@ import { catalogEntityPermissionResourceRef } from '@backstage/plugin-catalog-node/alpha'; import { createPermissionRule } from '@backstage/plugin-permission-node'; import { get } from 'lodash'; -import { z } from 'zod'; +import { z } from 'zod/v3'; export const createPropertyRule = (propertyType: 'metadata' | 'spec') => createPermissionRule({ diff --git a/plugins/catalog-backend/src/permissions/rules/hasAnnotation.ts b/plugins/catalog-backend/src/permissions/rules/hasAnnotation.ts index 32e0019715..825eb75cb8 100644 --- a/plugins/catalog-backend/src/permissions/rules/hasAnnotation.ts +++ b/plugins/catalog-backend/src/permissions/rules/hasAnnotation.ts @@ -16,7 +16,7 @@ import { catalogEntityPermissionResourceRef } from '@backstage/plugin-catalog-node/alpha'; import { createPermissionRule } from '@backstage/plugin-permission-node'; -import { z } from 'zod'; +import { z } from 'zod/v3'; /** * A catalog {@link @backstage/plugin-permission-node#PermissionRule} which diff --git a/plugins/catalog-backend/src/permissions/rules/hasLabel.ts b/plugins/catalog-backend/src/permissions/rules/hasLabel.ts index 40a96dbf49..f4bc8f3fee 100644 --- a/plugins/catalog-backend/src/permissions/rules/hasLabel.ts +++ b/plugins/catalog-backend/src/permissions/rules/hasLabel.ts @@ -16,7 +16,7 @@ import { catalogEntityPermissionResourceRef } from '@backstage/plugin-catalog-node/alpha'; import { createPermissionRule } from '@backstage/plugin-permission-node'; -import { z } from 'zod'; +import { z } from 'zod/v3'; /** * A catalog {@link @backstage/plugin-permission-node#PermissionRule} which diff --git a/plugins/catalog-backend/src/permissions/rules/isEntityKind.ts b/plugins/catalog-backend/src/permissions/rules/isEntityKind.ts index 6291692556..c0d045bea9 100644 --- a/plugins/catalog-backend/src/permissions/rules/isEntityKind.ts +++ b/plugins/catalog-backend/src/permissions/rules/isEntityKind.ts @@ -16,7 +16,7 @@ import { catalogEntityPermissionResourceRef } from '@backstage/plugin-catalog-node/alpha'; import { createPermissionRule } from '@backstage/plugin-permission-node'; -import { z } from 'zod'; +import { z } from 'zod/v3'; /** * A catalog {@link @backstage/plugin-permission-node#PermissionRule} which diff --git a/plugins/catalog-backend/src/permissions/rules/isEntityOwner.ts b/plugins/catalog-backend/src/permissions/rules/isEntityOwner.ts index de336ba966..74b22842e6 100644 --- a/plugins/catalog-backend/src/permissions/rules/isEntityOwner.ts +++ b/plugins/catalog-backend/src/permissions/rules/isEntityOwner.ts @@ -16,7 +16,7 @@ import { RELATION_OWNED_BY } from '@backstage/catalog-model'; import { createPermissionRule } from '@backstage/plugin-permission-node'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { catalogEntityPermissionResourceRef } from '@backstage/plugin-catalog-node/alpha'; /** diff --git a/plugins/catalog-backend/src/service/createRouter.test.ts b/plugins/catalog-backend/src/service/createRouter.test.ts index 88cd5abde3..9d5944f664 100644 --- a/plugins/catalog-backend/src/service/createRouter.test.ts +++ b/plugins/catalog-backend/src/service/createRouter.test.ts @@ -41,7 +41,7 @@ import { import express from 'express'; import { Server } from 'node:http'; import request from 'supertest'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { Cursor, EntitiesCatalog } from '../catalog/types'; import { applyDatabaseMigrations } from '../database/migrations'; import { DbLocationsRow } from '../database/tables'; diff --git a/plugins/catalog-backend/src/service/createRouter.ts b/plugins/catalog-backend/src/service/createRouter.ts index 89377c9e12..c2711a00ed 100644 --- a/plugins/catalog-backend/src/service/createRouter.ts +++ b/plugins/catalog-backend/src/service/createRouter.ts @@ -33,7 +33,7 @@ import { InputError, serializeError } from '@backstage/errors'; import { LocationAnalyzer } from '@backstage/plugin-catalog-node'; import express from 'express'; import yn from 'yn'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { Cursor, EntitiesCatalog } from '../catalog/types'; import { CatalogProcessingOrchestrator } from '../processing/types'; import { validateEntityEnvelope } from '../processing/util'; diff --git a/plugins/catalog-backend/src/service/request/entitiesBatchRequest.ts b/plugins/catalog-backend/src/service/request/entitiesBatchRequest.ts index 02ad1d5566..09e40f45bc 100644 --- a/plugins/catalog-backend/src/service/request/entitiesBatchRequest.ts +++ b/plugins/catalog-backend/src/service/request/entitiesBatchRequest.ts @@ -22,7 +22,6 @@ import { import { Request } from 'express'; import { z } from 'zod/v3'; import { fromZodError } from 'zod-validation-error/v3'; - const filterPredicateSchema = createZodV3FilterPredicateSchema(z); const schema = z.object({ diff --git a/plugins/catalog-backend/src/service/util.ts b/plugins/catalog-backend/src/service/util.ts index 708eec2de3..a83782a31b 100644 --- a/plugins/catalog-backend/src/service/util.ts +++ b/plugins/catalog-backend/src/service/util.ts @@ -18,7 +18,7 @@ import { InputError, NotAllowedError } from '@backstage/errors'; import { createZodV3FilterPredicateSchema } from '@backstage/filter-predicates'; import { Request } from 'express'; import lodash from 'lodash'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { Cursor, QueryEntitiesCursorRequest, diff --git a/plugins/home/src/components/CustomHomepage/types.ts b/plugins/home/src/components/CustomHomepage/types.ts index 8d73d6d66d..9ca12334d5 100644 --- a/plugins/home/src/components/CustomHomepage/types.ts +++ b/plugins/home/src/components/CustomHomepage/types.ts @@ -16,7 +16,7 @@ import { CSSProperties, ReactElement, ReactNode } from 'react'; import { Layout } from 'react-grid-layout'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { RJSFSchema, UiSchema } from '@rjsf/utils'; const RSJFTypeSchema: z.ZodType = z.any(); diff --git a/plugins/permission-backend/src/service/PermissionIntegrationClient.test.ts b/plugins/permission-backend/src/service/PermissionIntegrationClient.test.ts index 7d2a8a34c2..7f0caa9670 100644 --- a/plugins/permission-backend/src/service/PermissionIntegrationClient.test.ts +++ b/plugins/permission-backend/src/service/PermissionIntegrationClient.test.ts @@ -30,7 +30,7 @@ import { createPermissionRule, } from '@backstage/plugin-permission-node'; import { PermissionIntegrationClient } from './PermissionIntegrationClient'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { DiscoveryService } from '@backstage/backend-plugin-api'; describe('PermissionIntegrationClient', () => { diff --git a/plugins/permission-backend/src/service/PermissionIntegrationClient.ts b/plugins/permission-backend/src/service/PermissionIntegrationClient.ts index 610eb8b34b..83dc7780f3 100644 --- a/plugins/permission-backend/src/service/PermissionIntegrationClient.ts +++ b/plugins/permission-backend/src/service/PermissionIntegrationClient.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { z } from 'zod'; +import { z } from 'zod/v3'; import { AuthorizeResult, ConditionalPolicyDecision, diff --git a/plugins/permission-backend/src/service/router.ts b/plugins/permission-backend/src/service/router.ts index b6f570562b..92a2e40259 100644 --- a/plugins/permission-backend/src/service/router.ts +++ b/plugins/permission-backend/src/service/router.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { z } from 'zod'; +import { z } from 'zod/v3'; import express, { Request, Response } from 'express'; import Router from 'express-promise-router'; import { InputError } from '@backstage/errors'; diff --git a/plugins/permission-common/src/PermissionClient.ts b/plugins/permission-common/src/PermissionClient.ts index f801ba2a4b..d178dcf2af 100644 --- a/plugins/permission-common/src/PermissionClient.ts +++ b/plugins/permission-common/src/PermissionClient.ts @@ -18,7 +18,7 @@ import { Config } from '@backstage/config'; import { ResponseError } from '@backstage/errors'; import fetch from 'cross-fetch'; import * as uuid from 'uuid'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { AuthorizeResult, PermissionMessageBatch, diff --git a/plugins/permission-node/report.api.md b/plugins/permission-node/report.api.md index 6345861c93..09452b969b 100644 --- a/plugins/permission-node/report.api.md +++ b/plugins/permission-node/report.api.md @@ -30,7 +30,7 @@ import { PermissionsServiceRequestOptions } from '@backstage/backend-plugin-api' import { PolicyDecision } from '@backstage/plugin-permission-common'; import { QueryPermissionRequest } from '@backstage/plugin-permission-common'; import { ResourcePermission } from '@backstage/plugin-permission-common'; -import { z } from 'zod'; +import { z } from 'zod/v3'; // @public export type ApplyConditionsRequest = { diff --git a/plugins/permission-node/src/integration/createConditionExports.test.ts b/plugins/permission-node/src/integration/createConditionExports.test.ts index 926e607baa..341b4e73e1 100644 --- a/plugins/permission-node/src/integration/createConditionExports.test.ts +++ b/plugins/permission-node/src/integration/createConditionExports.test.ts @@ -18,7 +18,7 @@ import { AuthorizeResult, createPermission, } from '@backstage/plugin-permission-common'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { createConditionExports } from './createConditionExports'; import { createPermissionRule } from './createPermissionRule'; import { createPermissionResourceRef } from './createPermissionResourceRef'; diff --git a/plugins/permission-node/src/integration/createConditionFactory.test.ts b/plugins/permission-node/src/integration/createConditionFactory.test.ts index 520fcc01f9..02d01e7d14 100644 --- a/plugins/permission-node/src/integration/createConditionFactory.test.ts +++ b/plugins/permission-node/src/integration/createConditionFactory.test.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { z } from 'zod'; +import { z } from 'zod/v3'; import { createConditionFactory } from './createConditionFactory'; import { createPermissionRule } from './createPermissionRule'; diff --git a/plugins/permission-node/src/integration/createConditionTransformer.test.ts b/plugins/permission-node/src/integration/createConditionTransformer.test.ts index a5507f0b44..ce72567902 100644 --- a/plugins/permission-node/src/integration/createConditionTransformer.test.ts +++ b/plugins/permission-node/src/integration/createConditionTransformer.test.ts @@ -18,7 +18,7 @@ import { PermissionCondition, PermissionCriteria, } from '@backstage/plugin-permission-common'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { createConditionTransformer } from './createConditionTransformer'; import { createPermissionRule } from './createPermissionRule'; diff --git a/plugins/permission-node/src/integration/createPermissionIntegrationRouter.test.ts b/plugins/permission-node/src/integration/createPermissionIntegrationRouter.test.ts index 0d28ef710f..52352dc454 100644 --- a/plugins/permission-node/src/integration/createPermissionIntegrationRouter.test.ts +++ b/plugins/permission-node/src/integration/createPermissionIntegrationRouter.test.ts @@ -21,7 +21,7 @@ import { } from '@backstage/plugin-permission-common'; import express from 'express'; import request, { Response } from 'supertest'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { createPermissionIntegrationRouter, CreatePermissionIntegrationRouterResourceOptions, diff --git a/plugins/permission-node/src/integration/createPermissionIntegrationRouter.ts b/plugins/permission-node/src/integration/createPermissionIntegrationRouter.ts index 522e60bac5..6d96e45659 100644 --- a/plugins/permission-node/src/integration/createPermissionIntegrationRouter.ts +++ b/plugins/permission-node/src/integration/createPermissionIntegrationRouter.ts @@ -16,7 +16,7 @@ import express, { Response } from 'express'; import Router from 'express-promise-router'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import zodToJsonSchema from 'zod-to-json-schema'; import { InputError } from '@backstage/errors'; import { diff --git a/plugins/permission-node/src/integration/createPermissionRule.ts b/plugins/permission-node/src/integration/createPermissionRule.ts index 36f8205cf8..f1970a0254 100644 --- a/plugins/permission-node/src/integration/createPermissionRule.ts +++ b/plugins/permission-node/src/integration/createPermissionRule.ts @@ -19,7 +19,7 @@ import { PermissionRuleParams, } from '@backstage/plugin-permission-common'; import { NoInfer, PermissionRule } from '../types'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { PermissionResourceRef } from './createPermissionResourceRef'; /** diff --git a/plugins/permission-node/src/types.ts b/plugins/permission-node/src/types.ts index 578117a4f1..a8a337ca88 100644 --- a/plugins/permission-node/src/types.ts +++ b/plugins/permission-node/src/types.ts @@ -18,7 +18,7 @@ import type { PermissionCriteria, PermissionRuleParams, } from '@backstage/plugin-permission-common'; -import { z } from 'zod'; +import { z } from 'zod/v3'; /** * Prevent use of type parameter from contributing to type inference. diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/inputProperties.ts b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/inputProperties.ts index fadc8bcefb..ed35bfeab8 100644 --- a/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/inputProperties.ts +++ b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/inputProperties.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { z as zod } from 'zod'; +import { z as zod } from 'zod/v3'; const repoUrl = (z: typeof zod) => z.string({ diff --git a/plugins/scaffolder-backend-module-cookiecutter/report.api.md b/plugins/scaffolder-backend-module-cookiecutter/report.api.md index 49888ad784..43303508e7 100644 --- a/plugins/scaffolder-backend-module-cookiecutter/report.api.md +++ b/plugins/scaffolder-backend-module-cookiecutter/report.api.md @@ -4,12 +4,12 @@ ```ts import { BackendFeature } from '@backstage/backend-plugin-api'; -import { objectOutputType } from 'zod'; +import { objectOutputType } from 'zod/v3'; import { ScmIntegrations } from '@backstage/integration'; import { TemplateAction } from '@backstage/plugin-scaffolder-node'; import { UrlReaderService } from '@backstage/backend-plugin-api'; import { Writable } from 'node:stream'; -import { ZodTypeAny } from 'zod'; +import { ZodTypeAny } from 'zod/v3'; // @public export interface ContainerRunner { diff --git a/plugins/scaffolder-backend-module-github/src/actions/inputProperties.ts b/plugins/scaffolder-backend-module-github/src/actions/inputProperties.ts index a474272ef7..a2e0ae0bf3 100644 --- a/plugins/scaffolder-backend-module-github/src/actions/inputProperties.ts +++ b/plugins/scaffolder-backend-module-github/src/actions/inputProperties.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { z as zod } from 'zod'; +import { z as zod } from 'zod/v3'; const repoUrl = (z: typeof zod) => z.string({ diff --git a/plugins/scaffolder-backend-module-github/src/actions/outputProperties.ts b/plugins/scaffolder-backend-module-github/src/actions/outputProperties.ts index b35047083d..50a727be88 100644 --- a/plugins/scaffolder-backend-module-github/src/actions/outputProperties.ts +++ b/plugins/scaffolder-backend-module-github/src/actions/outputProperties.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { z as zod } from 'zod'; +import { z as zod } from 'zod/v3'; const remoteUrl = (z: typeof zod) => z.string({ diff --git a/plugins/scaffolder-backend-module-gitlab/src/commonGitlabConfig.ts b/plugins/scaffolder-backend-module-gitlab/src/commonGitlabConfig.ts index 5e8d92338e..4208cdb805 100644 --- a/plugins/scaffolder-backend-module-gitlab/src/commonGitlabConfig.ts +++ b/plugins/scaffolder-backend-module-gitlab/src/commonGitlabConfig.ts @@ -16,7 +16,7 @@ /* We want to maintain the same information as an enum, so we disable the redeclaration warning */ /* eslint-disable @typescript-eslint/no-redeclare */ -import { z } from 'zod'; +import { z } from 'zod/v3'; const commonGitlabConfig = z.object({ repoUrl: z.string({ description: 'Repository Location' }), diff --git a/plugins/scaffolder-backend-module-gitlab/src/util.ts b/plugins/scaffolder-backend-module-gitlab/src/util.ts index e5e27231e5..328f9d237e 100644 --- a/plugins/scaffolder-backend-module-gitlab/src/util.ts +++ b/plugins/scaffolder-backend-module-gitlab/src/util.ts @@ -21,7 +21,7 @@ import { ScmIntegrationRegistry, } from '@backstage/integration'; import { Gitlab, GroupSchema, RepositoryTreeSchema } from '@gitbeaker/rest'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import commonGitlabConfig from './commonGitlabConfig'; import { SerializedFile } from '@backstage/plugin-scaffolder-node'; diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/read.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/read.ts index 0e82092ab3..84fa7a33e5 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/read.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/filesystem/read.ts @@ -17,7 +17,7 @@ import { createTemplateAction } from '@backstage/plugin-scaffolder-node'; import { resolveSafeChildPath } from '@backstage/backend-plugin-api'; import fs from 'node:fs/promises'; import path from 'node:path'; -import { z as zod } from 'zod'; +import { z as zod } from 'zod/v3'; import { examples } from './read.examples'; const contentSchema = (z: typeof zod) => diff --git a/plugins/scaffolder-backend/src/service/router.ts b/plugins/scaffolder-backend/src/service/router.ts index 0c9daf53c2..9e84b38e39 100644 --- a/plugins/scaffolder-backend/src/service/router.ts +++ b/plugins/scaffolder-backend/src/service/router.ts @@ -85,7 +85,7 @@ import express from 'express'; import { Duration } from 'luxon'; import { pathToFileURL } from 'node:url'; import { v4 as uuid } from 'uuid'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { DatabaseTaskStore, DefaultTemplateActionRegistry, diff --git a/plugins/scaffolder-backend/src/service/rules.ts b/plugins/scaffolder-backend/src/service/rules.ts index 5753668089..7dea3e1f95 100644 --- a/plugins/scaffolder-backend/src/service/rules.ts +++ b/plugins/scaffolder-backend/src/service/rules.ts @@ -29,7 +29,7 @@ import { import { SerializedTask, TaskFilter } from '@backstage/plugin-scaffolder-node'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { JsonObject, JsonPrimitive } from '@backstage/types'; import { get } from 'lodash'; diff --git a/plugins/scaffolder-backend/src/util/templating.ts b/plugins/scaffolder-backend/src/util/templating.ts index 3318b64fdf..a088c95525 100644 --- a/plugins/scaffolder-backend/src/util/templating.ts +++ b/plugins/scaffolder-backend/src/util/templating.ts @@ -26,7 +26,7 @@ import { } from '@backstage/plugin-scaffolder-node/alpha'; import { JsonValue } from '@backstage/types'; import { Schema } from 'jsonschema'; -import { ZodType, z } from 'zod'; +import { ZodType, z } from 'zod/v3'; import zodToJsonSchema from 'zod-to-json-schema'; /** diff --git a/plugins/scaffolder-node/report-alpha.api.md b/plugins/scaffolder-node/report-alpha.api.md index 3a01b7f788..62240f210a 100644 --- a/plugins/scaffolder-node/report-alpha.api.md +++ b/plugins/scaffolder-node/report-alpha.api.md @@ -8,7 +8,7 @@ import { JsonValue } from '@backstage/types'; import { TaskBroker } from '@backstage/plugin-scaffolder-node'; import { TemplateFilter as TemplateFilter_2 } from '@backstage/plugin-scaffolder-node'; import { TemplateGlobal as TemplateGlobal_2 } from '@backstage/plugin-scaffolder-node'; -import { z } from 'zod'; +import { z } from 'zod/v3'; // @alpha export type AutocompleteHandler = (input: { diff --git a/plugins/scaffolder-node/report.api.md b/plugins/scaffolder-node/report.api.md index 24b51ed989..538f19cd1e 100644 --- a/plugins/scaffolder-node/report.api.md +++ b/plugins/scaffolder-node/report.api.md @@ -33,7 +33,7 @@ import { UpdateTaskCheckpointOptions } from '@backstage/plugin-scaffolder-node/a import { UrlReaderService } from '@backstage/backend-plugin-api'; import { UserEntity } from '@backstage/catalog-model'; import { Writable } from 'node:stream'; -import { z } from 'zod'; +import { z } from 'zod/v3'; // @public export type ActionContext< diff --git a/plugins/scaffolder-node/src/actions/createTemplateAction.ts b/plugins/scaffolder-node/src/actions/createTemplateAction.ts index edf3e203b9..a3dfe3f469 100644 --- a/plugins/scaffolder-node/src/actions/createTemplateAction.ts +++ b/plugins/scaffolder-node/src/actions/createTemplateAction.ts @@ -15,7 +15,7 @@ */ import { ActionContext, TemplateAction } from './types'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { Expand, JsonObject } from '@backstage/types'; import { parseSchemas } from './util'; diff --git a/plugins/scaffolder-node/src/actions/util.ts b/plugins/scaffolder-node/src/actions/util.ts index e698306a45..bddf3ba0f3 100644 --- a/plugins/scaffolder-node/src/actions/util.ts +++ b/plugins/scaffolder-node/src/actions/util.ts @@ -20,7 +20,7 @@ import { join as joinPath, normalize as normalizePath } from 'node:path'; import { ScmIntegrationRegistry } from '@backstage/integration'; import { TemplateActionOptions } from './createTemplateAction'; import zodToJsonSchema from 'zod-to-json-schema'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { Schema } from 'jsonschema'; import { trim } from 'lodash'; diff --git a/plugins/scaffolder-node/src/alpha/filters/createTemplateFilter.ts b/plugins/scaffolder-node/src/alpha/filters/createTemplateFilter.ts index f648658588..ce8bd517ee 100644 --- a/plugins/scaffolder-node/src/alpha/filters/createTemplateFilter.ts +++ b/plugins/scaffolder-node/src/alpha/filters/createTemplateFilter.ts @@ -16,7 +16,7 @@ import { ZodFunctionSchema } from '../types'; import { CreatedTemplateFilter, TemplateFilterExample } from './types'; -import { z } from 'zod'; +import { z } from 'zod/v3'; /** * This function is used to create new template filters in type-safe manner. diff --git a/plugins/scaffolder-node/src/alpha/filters/types.ts b/plugins/scaffolder-node/src/alpha/filters/types.ts index 1906ba1c9c..e721618f7a 100644 --- a/plugins/scaffolder-node/src/alpha/filters/types.ts +++ b/plugins/scaffolder-node/src/alpha/filters/types.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { z } from 'zod'; +import { z } from 'zod/v3'; import { ZodFunctionSchema } from '../types'; export type { TemplateFilter } from '../../types'; diff --git a/plugins/scaffolder-node/src/alpha/globals/createTemplateGlobal.ts b/plugins/scaffolder-node/src/alpha/globals/createTemplateGlobal.ts index 2687b83bb4..0d5a01650c 100644 --- a/plugins/scaffolder-node/src/alpha/globals/createTemplateGlobal.ts +++ b/plugins/scaffolder-node/src/alpha/globals/createTemplateGlobal.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { z } from 'zod'; +import { z } from 'zod/v3'; import { CreatedTemplateGlobalFunction, CreatedTemplateGlobalValue, diff --git a/plugins/scaffolder-node/src/alpha/globals/types.ts b/plugins/scaffolder-node/src/alpha/globals/types.ts index 27a3a700e5..977f733673 100644 --- a/plugins/scaffolder-node/src/alpha/globals/types.ts +++ b/plugins/scaffolder-node/src/alpha/globals/types.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import { JsonValue } from '@backstage/types'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { ZodFunctionSchema } from '../types'; export type { TemplateGlobal } from '../../types'; diff --git a/plugins/scaffolder-node/src/alpha/types.ts b/plugins/scaffolder-node/src/alpha/types.ts index ca52973775..171c8e85f9 100644 --- a/plugins/scaffolder-node/src/alpha/types.ts +++ b/plugins/scaffolder-node/src/alpha/types.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { z } from 'zod'; +import { z } from 'zod/v3'; /** * @alpha diff --git a/plugins/scaffolder-react/report-alpha.api.md b/plugins/scaffolder-react/report-alpha.api.md index 9e01257c5c..84c88bd319 100644 --- a/plugins/scaffolder-react/report-alpha.api.md +++ b/plugins/scaffolder-react/report-alpha.api.md @@ -40,7 +40,7 @@ import { TemplatePresentationV1beta3 } from '@backstage/plugin-scaffolder-common import { TranslationRef } from '@backstage/frontend-plugin-api'; import { UiSchema } from '@rjsf/utils'; import { WidgetProps } from '@rjsf/utils'; -import { z } from 'zod'; +import { z } from 'zod/v3'; // @alpha (undocumented) export type BackstageOverrides = Overrides & { diff --git a/plugins/scaffolder-react/report.api.md b/plugins/scaffolder-react/report.api.md index d40b0278bf..5c0ef0d2be 100644 --- a/plugins/scaffolder-react/report.api.md +++ b/plugins/scaffolder-react/report.api.md @@ -59,7 +59,7 @@ import { TemplatesType } from '@rjsf/utils'; import { UIOptionsType } from '@rjsf/utils'; import { UiSchema } from '@rjsf/utils'; import { ValidatorType } from '@rjsf/utils'; -import { z } from 'zod'; +import { z } from 'zod/v3'; // @public @deprecated export type Action = Action_2; diff --git a/plugins/scaffolder-react/src/next/blueprints/FormFieldBlueprint.tsx b/plugins/scaffolder-react/src/next/blueprints/FormFieldBlueprint.tsx index 8b5a88f7df..35eeb28c17 100644 --- a/plugins/scaffolder-react/src/next/blueprints/FormFieldBlueprint.tsx +++ b/plugins/scaffolder-react/src/next/blueprints/FormFieldBlueprint.tsx @@ -17,7 +17,7 @@ import { createExtensionBlueprint, createExtensionDataRef, } from '@backstage/frontend-plugin-api'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { OpaqueFormField } from '@internal/scaffolder'; import { FormFieldExtensionData } from './types'; diff --git a/plugins/scaffolder-react/src/next/blueprints/types.ts b/plugins/scaffolder-react/src/next/blueprints/types.ts index eccf7e4606..4f3de47e5e 100644 --- a/plugins/scaffolder-react/src/next/blueprints/types.ts +++ b/plugins/scaffolder-react/src/next/blueprints/types.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { z } from 'zod'; +import { z } from 'zod/v3'; import { CustomFieldValidator, FieldExtensionComponentProps, diff --git a/plugins/scaffolder-react/src/next/extensions/createScaffolderFormDecorator.ts b/plugins/scaffolder-react/src/next/extensions/createScaffolderFormDecorator.ts index 0064ae0397..51963072b4 100644 --- a/plugins/scaffolder-react/src/next/extensions/createScaffolderFormDecorator.ts +++ b/plugins/scaffolder-react/src/next/extensions/createScaffolderFormDecorator.ts @@ -16,7 +16,7 @@ import { AnyApiRef } from '@backstage/core-plugin-api'; import { JsonObject, JsonValue } from '@backstage/types'; import { OpaqueFormDecorator } from '@internal/scaffolder'; -import { z } from 'zod'; +import { z } from 'zod/v3'; /** @alpha */ export type ScaffolderFormDecoratorContext< diff --git a/plugins/scaffolder-react/src/utils.ts b/plugins/scaffolder-react/src/utils.ts index dc24df759d..c3ca898556 100644 --- a/plugins/scaffolder-react/src/utils.ts +++ b/plugins/scaffolder-react/src/utils.ts @@ -16,7 +16,7 @@ import zodToJsonSchema from 'zod-to-json-schema'; import { JSONSchema7 } from 'json-schema'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { CustomFieldExtensionSchema, FieldExtensionComponentProps, diff --git a/plugins/scaffolder/report.api.md b/plugins/scaffolder/report.api.md index 17fd25e646..7a34ac1cc2 100644 --- a/plugins/scaffolder/report.api.md +++ b/plugins/scaffolder/report.api.md @@ -49,7 +49,7 @@ import { TemplateGroupFilter } from '@backstage/plugin-scaffolder-react'; import { TemplateListPageProps } from '@backstage/plugin-scaffolder/alpha'; import { TemplateParameterSchema as TemplateParameterSchema_2 } from '@backstage/plugin-scaffolder-common'; import { TemplateWizardPageProps } from '@backstage/plugin-scaffolder/alpha'; -import { z } from 'zod'; +import { z } from 'zod/v3'; // @public @deprecated (undocumented) export const createScaffolderFieldExtension: typeof createScaffolderFieldExtension_2; diff --git a/plugins/scaffolder/src/components/fields/EntityPicker/schema.ts b/plugins/scaffolder/src/components/fields/EntityPicker/schema.ts index 9a77d6b26e..e69fed9df3 100644 --- a/plugins/scaffolder/src/components/fields/EntityPicker/schema.ts +++ b/plugins/scaffolder/src/components/fields/EntityPicker/schema.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { z as zod } from 'zod'; +import { z as zod } from 'zod/v3'; import { makeFieldSchema } from '@backstage/plugin-scaffolder-react'; export const createEntityQueryFilterExpressionSchema = (z: typeof zod) => diff --git a/plugins/scaffolder/src/components/fields/MultiEntityPicker/schema.ts b/plugins/scaffolder/src/components/fields/MultiEntityPicker/schema.ts index 667b4638b8..d07e2d031c 100644 --- a/plugins/scaffolder/src/components/fields/MultiEntityPicker/schema.ts +++ b/plugins/scaffolder/src/components/fields/MultiEntityPicker/schema.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { z as zod } from 'zod'; +import { z as zod } from 'zod/v3'; import { makeFieldSchema } from '@backstage/plugin-scaffolder-react'; export const entityQueryFilterExpressionSchema = zod.record( diff --git a/plugins/scaffolder/src/components/fields/utils.ts b/plugins/scaffolder/src/components/fields/utils.ts index 2fa6aab1b3..a2b01d91fa 100644 --- a/plugins/scaffolder/src/components/fields/utils.ts +++ b/plugins/scaffolder/src/components/fields/utils.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import { JSONSchema7 } from 'json-schema'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import zodToJsonSchema from 'zod-to-json-schema'; import { FieldSchema as FieldSchemaType } from '@backstage/plugin-scaffolder-react'; diff --git a/plugins/search-backend/src/service/router.ts b/plugins/search-backend/src/service/router.ts index eedd84105a..2be6612c8b 100644 --- a/plugins/search-backend/src/service/router.ts +++ b/plugins/search-backend/src/service/router.ts @@ -15,7 +15,7 @@ */ import express from 'express'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { InputError } from '@backstage/errors'; import { Config } from '@backstage/config'; import { JsonObject, JsonValue } from '@backstage/types'; diff --git a/plugins/user-settings-backend/src/service/router.ts b/plugins/user-settings-backend/src/service/router.ts index c9971bbb4d..6d1518eb8e 100644 --- a/plugins/user-settings-backend/src/service/router.ts +++ b/plugins/user-settings-backend/src/service/router.ts @@ -17,7 +17,7 @@ import { InputError } from '@backstage/errors'; import express, { Request } from 'express'; import Router from 'express-promise-router'; -import { z } from 'zod'; +import { z } from 'zod/v3'; import { UserSettingsStore } from '../database/UserSettingsStore'; import { SignalsService } from '@backstage/plugin-signals-node'; import { diff --git a/scripts/verify-plugin-directory.js b/scripts/verify-plugin-directory.js index 24c068b96e..70d3fbe9e9 100644 --- a/scripts/verify-plugin-directory.js +++ b/scripts/verify-plugin-directory.js @@ -18,7 +18,7 @@ const fs = require('fs-extra'); const { resolve, join } = require('node:path'); const yaml = require('js-yaml'); -const z = require('zod'); +const z = require('zod/v3'); const configSchema = z.object({ title: z.string(),