From eab3f89860288f89e37797d22b603fe5e0a961ac Mon Sep 17 00:00:00 2001
From: sealday <zhanglin@daoyoucloud.com>
Date: Tue, 2 Apr 2024 20:37:37 +0800
Subject: [PATCH] fix: multi app start error

---
 packages/core/test/package.json                      |  2 +-
 packages/core/test/src/e2e/e2eUtils.ts               |  2 +-
 .../@nocobase/plugin-ui-schema-storage/package.json  |  2 +-
 .../src/server/__tests__/ui-schema.test.ts           |  2 +-
 .../server/migrations/20230510235247-form-field.ts   |  2 +-
 pnpm-lock.yaml                                       | 12 ++++++------
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/core/test/package.json b/packages/core/test/package.json
index a284a8a4f..a6a88e425 100644
--- a/packages/core/test/package.json
+++ b/packages/core/test/package.json
@@ -41,8 +41,8 @@
   "types": "./lib/index.d.ts",
   "dependencies": {
     "@faker-js/faker": "8.1.0",
+    "@formily/shared": "2.2.27",
     "@nocobase/database": "workspace:*",
-    "@nocobase/schema": "workspace:*",
     "@nocobase/server": "workspace:*",
     "@playwright/test": "^1.42.1",
     "@testing-library/dom": "^9.3.3",
diff --git a/packages/core/test/src/e2e/e2eUtils.ts b/packages/core/test/src/e2e/e2eUtils.ts
index d8cacaab0..5f21adeb1 100644
--- a/packages/core/test/src/e2e/e2eUtils.ts
+++ b/packages/core/test/src/e2e/e2eUtils.ts
@@ -1,5 +1,5 @@
 import { faker } from '@faker-js/faker';
-import { uid } from '@nocobase/schema';
+import { uid } from '@formily/shared';
 import { Page, test as base, expect, request } from '@playwright/test';
 import _ from 'lodash';
 import { defineConfig } from './defineConfig';
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json b/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json
index 15c32201d..ac65a47af 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json
@@ -10,7 +10,7 @@
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
-    "@nocobase/schema": "workspace:*",
+    "@formily/json-schema": "2.2.27",
     "lodash": "4.17.21"
   },
   "peerDependencies": {
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/ui-schema.test.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/ui-schema.test.ts
index dd337049f..59478e813 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/ui-schema.test.ts
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/ui-schema.test.ts
@@ -1,4 +1,4 @@
-import { ISchema } from '@nocobase/schema';
+import { ISchema } from '@formily/json-schema';
 import { Database } from '@nocobase/database';
 import { createMockServer, MockServer } from '@nocobase/test';
 import { UiSchemaRepository } from '..';
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230510235247-form-field.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230510235247-form-field.ts
index 9d6316b49..a65925324 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230510235247-form-field.ts
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230510235247-form-field.ts
@@ -1,4 +1,4 @@
-import { Schema } from '@nocobase/schema';
+import { Schema } from '@formily/json-schema';
 import { Migration } from '@nocobase/server';
 import { uid } from '@nocobase/utils';
 import UiSchemaRepository from '../repository';
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 01b4c3e47..e0053ce9c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1130,12 +1130,12 @@ importers:
       '@faker-js/faker':
         specifier: 8.1.0
         version: 8.1.0
+      '@formily/shared':
+        specifier: 2.2.27
+        version: 2.2.27
       '@nocobase/database':
         specifier: workspace:*
         version: link:../database
-      '@nocobase/schema':
-        specifier: workspace:*
-        version: link:../schema
       '@nocobase/server':
         specifier: workspace:*
         version: link:../server
@@ -3723,9 +3723,9 @@ importers:
         specifier: workspace:*
         version: link:../../../core/utils
     devDependencies:
-      '@nocobase/schema':
-        specifier: workspace:*
-        version: link:../../../core/schema
+      '@formily/json-schema':
+        specifier: 2.2.27
+        version: 2.2.27(typescript@5.4.3)
       lodash:
         specifier: 4.17.21
         version: 4.17.21