From 54f351af9d6df4ee48ec3c1e750e02bae3871b30 Mon Sep 17 00:00:00 2001
From: chenos <chenlinxh@gmail.com>
Date: Tue, 7 Dec 2021 19:40:30 +0800
Subject: [PATCH] fix: plugin packages dependencies

---
 jest.config.js                                               | 2 +-
 package.json                                                 | 5 +----
 packages/database/package.json                               | 3 +++
 .../src/relation-repository/multiple-relation-repository.ts  | 2 +-
 packages/plugin-china-region/package.json                    | 3 +++
 packages/plugin-file-manager/package.json                    | 5 +++--
 packages/plugin-notifications/package.json                   | 1 +
 packages/plugin-system-settings/package.json                 | 3 +++
 8 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/jest.config.js b/jest.config.js
index 65e9f69e32..71ebb34f19 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -2,7 +2,7 @@ const { pathsToModuleNameMapper } = require('ts-jest/utils');
 const { compilerOptions } = require('./tsconfig.jest.json');
 
 module.exports = {
-  collectCoverage: true,
+  collectCoverage: false,
   verbose: true,
   testEnvironment: 'jsdom',
   preset: 'ts-jest',
diff --git a/package.json b/package.json
index 3b6d0fe68a..36ca89ff47 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "bootstrap": "lerna bootstrap",
     "clean": "rimraf -rf packages/*/{lib,esm,dist} && lerna clean",
     "build": "lerna run build",
-    "test": "jest --coverage",
+    "test": "jest",
     "lint": "eslint ."
   },
   "resolutions": {
@@ -17,13 +17,10 @@
     "@types/react-dom": "^17.0.0"
   },
   "devDependencies": {
-    "@types/bcrypt": "^5.0.0",
     "@types/jest": "^26.0.0",
     "@types/koa": "^2.13.4",
     "@types/koa-bodyparser": "^4.3.4",
-    "@types/koa-multer": "^1.0.1",
     "@types/lodash": "^4.14.177",
-    "@types/multer": "^1.4.5",
     "@types/node": "^12.6.8",
     "@types/react": "^17.0.0",
     "@types/react-dom": "^17.0.0",
diff --git a/packages/database/package.json b/packages/database/package.json
index 522e597cba..45f4a53098 100644
--- a/packages/database/package.json
+++ b/packages/database/package.json
@@ -19,6 +19,9 @@
     "glob": "^7.1.6",
     "sequelize": "^6.9.0"
   },
+  "devDependencies": {
+    "@types/bcrypt": "^5.0.0"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
diff --git a/packages/database/src/relation-repository/multiple-relation-repository.ts b/packages/database/src/relation-repository/multiple-relation-repository.ts
index 72a6272370..d83dce55f3 100644
--- a/packages/database/src/relation-repository/multiple-relation-repository.ts
+++ b/packages/database/src/relation-repository/multiple-relation-repository.ts
@@ -139,7 +139,7 @@ export abstract class MultipleRelationRepository extends RelationRepository {
 
     const values = guard.sanitize(options.values);
 
-    const queryOptions = this.buildQueryOptions(options);
+    const queryOptions = this.buildQueryOptions(options as any);
 
     const instances = await this.find(queryOptions);
 
diff --git a/packages/plugin-china-region/package.json b/packages/plugin-china-region/package.json
index 2b63deb1b8..a3cf895a4b 100644
--- a/packages/plugin-china-region/package.json
+++ b/packages/plugin-china-region/package.json
@@ -11,5 +11,8 @@
   "dependencies": {
     "china-division": "^2.4.0"
   },
+  "devDependencies": {
+    "@nocobase/test": "^0.6.0-alpha.0"
+  },
   "gitHead": "e7df1f93c4e23b9a666d99ee7372c02bdaec97c4"
 }
diff --git a/packages/plugin-file-manager/package.json b/packages/plugin-file-manager/package.json
index 25d8d9b234..f8ec0321b1 100644
--- a/packages/plugin-file-manager/package.json
+++ b/packages/plugin-file-manager/package.json
@@ -19,8 +19,9 @@
     "multer-s3": "^2.10.0"
   },
   "devDependencies": {
-    "@nocobase/database": "^0.6.0-alpha.0",
-    "@nocobase/test": "^0.6.0-alpha.0"
+    "@nocobase/test": "^0.6.0-alpha.0",
+    "@types/koa-multer": "^1.0.1",
+    "@types/multer": "^1.4.5"
   },
   "gitHead": "e7df1f93c4e23b9a666d99ee7372c02bdaec97c4"
 }
diff --git a/packages/plugin-notifications/package.json b/packages/plugin-notifications/package.json
index 8410f8a5d8..1806b25173 100644
--- a/packages/plugin-notifications/package.json
+++ b/packages/plugin-notifications/package.json
@@ -12,6 +12,7 @@
     "nodemailer": "^6.6.1"
   },
   "devDependencies": {
+    "@nocobase/test": "^0.6.0-alpha.0",
     "@types/nodemailer": "6.4.4",
     "nodemailer-mock": "^1.5.11"
   },
diff --git a/packages/plugin-system-settings/package.json b/packages/plugin-system-settings/package.json
index b0a9c872f4..71283a2b03 100644
--- a/packages/plugin-system-settings/package.json
+++ b/packages/plugin-system-settings/package.json
@@ -8,5 +8,8 @@
     "build:cjs": "tsc --project tsconfig.build.json",
     "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm"
   },
+  "devDependencies": {
+    "@nocobase/test": "^0.6.0-alpha.0"
+  },
   "gitHead": "e7df1f93c4e23b9a666d99ee7372c02bdaec97c4"
 }