Merge branch 'main' into next

# Conflicts:
#	packages/plugins/@nocobase/plugin-departments/package.json
#	packages/plugins/@nocobase/plugin-departments/src/client/departments/DepartmentTable.tsx
#	packages/plugins/@nocobase/plugin-departments/src/server/__tests__/actions.test.ts
#	packages/plugins/@nocobase/plugin-departments/src/server/__tests__/data-sync.test.ts
#	packages/plugins/@nocobase/plugin-departments/src/server/__tests__/destroy-department-check.test.ts
#	packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-department-owners.test.ts
#	packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-departments-info.test.ts
#	packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-main-department.test.ts
#	packages/plugins/@nocobase/plugin-departments/src/server/__tests__/update-department-is-leaf.test.ts
#	packages/plugins/@nocobase/plugin-field-attachment-url/package.json
#	packages/plugins/@nocobase/plugin-field-attachment-url/src/client/component/AttachmentUrl.tsx
#	packages/plugins/@nocobase/plugin-field-attachment-url/src/client/hook/index.ts
#	packages/plugins/@nocobase/plugin-field-attachment-url/src/client/interfaces/attachment-url.tsx
#	packages/plugins/@nocobase/plugin-field-attachment-url/src/server/plugin.ts
#	packages/plugins/@nocobase/plugin-workflow-response-message/package.json
#	packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/instruction.test.ts
#	packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/multiple.test.ts
#	packages/presets/nocobase/package.json

packages/core/cli/src/util.js

@@ -460,8 +460,16 @@ exports.initEnv = function initEnv() {
   process.env.SOCKET_PATH = generateGatewayPath();
   fs.mkdirpSync(dirname(process.env.SOCKET_PATH), { force: true, recursive: true });
   fs.mkdirpSync(process.env.PM2_HOME, { force: true, recursive: true });
-  const pkgDir = resolve(process.cwd(), 'storage/plugins', '@nocobase/plugin-multi-app-manager');
+  const pkgs = [
-  fs.existsSync(pkgDir) && fs.rmdirSync(pkgDir, { recursive: true, force: true });
+    '@nocobase/plugin-multi-app-manager',
+    '@nocobase/plugin-departments',
+    '@nocobase/plugin-field-attachment-url',
+    '@nocobase/plugin-workflow-response-message',
+  ];
+  for (const pkg of pkgs) {
+    const pkgDir = resolve(process.cwd(), 'storage/plugins', pkg);
+    fs.existsSync(pkgDir) && fs.rmdirSync(pkgDir, { recursive: true, force: true });
+  }
 };
 
 exports.generatePlugins = function () {

packages/plugins/@nocobase/plugin-departments/package.json

@@ -6,6 +6,9 @@
   "description.zh-CN": "以部门来组织用户，设定上下级关系，绑定角色控制权限，并支持作为变量用于工作流和表达式。",
   "version": "1.7.0-beta.16",
   "main": "dist/server/index.js",
+  "devDependencies": {
+    "@nocobase/plugin-user-data-sync": "1.x"
+  },
   "peerDependencies": {
     "@nocobase/actions": "1.x",
     "@nocobase/client": "1.x",

packages/plugins/@nocobase/plugin-field-attachment-url/package.json

@@ -11,6 +11,9 @@
     "@nocobase/server": "1.x",
     "@nocobase/test": "1.x"
   },
+  "devDependencies": {
+    "@nocobase/plugin-file-manager": "1.x"
+  },
   "keywords": [
     "Collection fields"
   ]

packages/plugins/@nocobase/plugin-workflow-response-message/package.json

@@ -14,6 +14,9 @@
     "@nocobase/test": "1.x",
     "@nocobase/utils": "1.x"
   },
+  "devDependencies": {
+    "@nocobase/plugin-workflow": "1.x"
+  },
   "keywords": [
     "Workflow"
   ],

packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/instruction.test.ts

@@ -17,13 +17,13 @@
  */
 
 import Database from '@nocobase/database';
-import { MockServer } from '@nocobase/test';
 import { EXECUTION_STATUS, JOB_STATUS } from '@nocobase/plugin-workflow';
 import { getApp } from '@nocobase/plugin-workflow-test';
+import { MockServer } from '@nocobase/test';
 
 import Plugin from '..';
 
-describe('workflow > instructions > response-message', () => {
+describe.skip('workflow > instructions > response-message', () => {
   let app: MockServer;
   let db: Database;
   let PostRepo;

packages/plugins/@nocobase/plugin-workflow-response-message/src/server/__tests__/multiple.test.ts

@@ -17,13 +17,13 @@
  */
 
 import Database from '@nocobase/database';
-import { MockServer } from '@nocobase/test';
 import { EXECUTION_STATUS, JOB_STATUS } from '@nocobase/plugin-workflow';
 import { getApp } from '@nocobase/plugin-workflow-test';
+import { MockServer } from '@nocobase/test';
 
 import Plugin from '..';
 
-describe('workflow > multiple workflows', () => {
+describe.skip('workflow > multiple workflows', () => {
   let app: MockServer;
   let db: Database;
   let PostRepo;