From ca7e74b3550a2d29ef091a97088d9252e0c8e7b1 Mon Sep 17 00:00:00 2001 From: fengmk2 Date: Sun, 7 Apr 2024 14:10:04 +0800 Subject: [PATCH 1/3] fix: use @eggjs/ajv-keywords --- plugin/ajv/lib/Ajv.ts | 2 +- plugin/ajv/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/ajv/lib/Ajv.ts b/plugin/ajv/lib/Ajv.ts index beca399d..f8a631e7 100644 --- a/plugin/ajv/lib/Ajv.ts +++ b/plugin/ajv/lib/Ajv.ts @@ -1,6 +1,6 @@ import Ajv2019, { type Schema } from 'ajv/dist/2019'; import addFormats from 'ajv-formats'; -import keyWords from 'ajv-keywords'; +import keyWords from '@eggjs/ajv-keywords'; import { type Ajv as IAjv, AjvInvalidParamError } from '@eggjs/tegg/ajv'; import { SingletonProto, AccessLevel, LifecycleInit } from '@eggjs/tegg'; diff --git a/plugin/ajv/package.json b/plugin/ajv/package.json index 9c2220a4..be824736 100644 --- a/plugin/ajv/package.json +++ b/plugin/ajv/package.json @@ -50,7 +50,7 @@ "@sinclair/typebox": "^0.32.20", "ajv": "^8.12.0", "ajv-formats": "^3.0.1", - "ajv-keywords": "^5.1.0" + "@eggjs/ajv-keywords": "^5.1.0" }, "devDependencies": { "@eggjs/tegg-config": "^3.36.0", From 21f44b5d1467fcaeaebcf6b98c9b7b032b970ad3 Mon Sep 17 00:00:00 2001 From: fengmk2 Date: Sun, 7 Apr 2024 14:24:50 +0800 Subject: [PATCH 2/3] f --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index f5266cbc..3dd72666 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "devDependencies": { "@eggjs/tsconfig": "^1.0.0", "@istanbuljs/nyc-config-typescript": "^1.0.1", + "ajv": "^8.12.0", "eslint": "^8.0.0", "eslint-config-egg": "^12.0.0", "eslint-plugin-import": "^2.24.2", From d173035841d9a13e93c6956e14fba68e2a5b12ba Mon Sep 17 00:00:00 2001 From: fengmk2 Date: Sun, 7 Apr 2024 14:39:26 +0800 Subject: [PATCH 3/3] f --- plugin/ajv/lib/Ajv.ts | 2 +- plugin/ajv/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/ajv/lib/Ajv.ts b/plugin/ajv/lib/Ajv.ts index f8a631e7..31bc5249 100644 --- a/plugin/ajv/lib/Ajv.ts +++ b/plugin/ajv/lib/Ajv.ts @@ -1,5 +1,5 @@ import Ajv2019, { type Schema } from 'ajv/dist/2019'; -import addFormats from 'ajv-formats'; +import addFormats from '@eggjs/ajv-formats'; import keyWords from '@eggjs/ajv-keywords'; import { type Ajv as IAjv, AjvInvalidParamError } from '@eggjs/tegg/ajv'; import { SingletonProto, AccessLevel, LifecycleInit } from '@eggjs/tegg'; diff --git a/plugin/ajv/package.json b/plugin/ajv/package.json index be824736..b553d640 100644 --- a/plugin/ajv/package.json +++ b/plugin/ajv/package.json @@ -49,7 +49,7 @@ "@eggjs/tegg": "^3.36.0", "@sinclair/typebox": "^0.32.20", "ajv": "^8.12.0", - "ajv-formats": "^3.0.1", + "@eggjs/ajv-formats": "^3.0.1", "@eggjs/ajv-keywords": "^5.1.0" }, "devDependencies": {