From fb8a4de8cc103f9a69d406f71a7bd4f19a83bf03 Mon Sep 17 00:00:00 2001 From: chenos Date: Tue, 3 Jan 2023 15:27:22 +0800 Subject: [PATCH] fix: move assign to utils package --- packages/core/resourcer/src/action.ts | 3 +-- .../core/{resourcer => utils}/src/__tests__/assign.test.ts | 0 packages/core/{resourcer => utils}/src/assign.ts | 0 packages/core/utils/src/index.ts | 2 +- 4 files changed, 2 insertions(+), 3 deletions(-) rename packages/core/{resourcer => utils}/src/__tests__/assign.test.ts (100%) rename packages/core/{resourcer => utils}/src/assign.ts (100%) diff --git a/packages/core/resourcer/src/action.ts b/packages/core/resourcer/src/action.ts index c41ad889eb..8bab52a1ed 100644 --- a/packages/core/resourcer/src/action.ts +++ b/packages/core/resourcer/src/action.ts @@ -1,7 +1,6 @@ -import { requireModule } from '@nocobase/utils'; +import { assign, MergeStrategies, requireModule } from '@nocobase/utils'; import compose from 'koa-compose'; import _ from 'lodash'; -import { assign, MergeStrategies } from './assign'; import Middleware, { MiddlewareType } from './middleware'; import Resource from './resource'; import { HandlerType } from './resourcer'; diff --git a/packages/core/resourcer/src/__tests__/assign.test.ts b/packages/core/utils/src/__tests__/assign.test.ts similarity index 100% rename from packages/core/resourcer/src/__tests__/assign.test.ts rename to packages/core/utils/src/__tests__/assign.test.ts diff --git a/packages/core/resourcer/src/assign.ts b/packages/core/utils/src/assign.ts similarity index 100% rename from packages/core/resourcer/src/assign.ts rename to packages/core/utils/src/assign.ts diff --git a/packages/core/utils/src/index.ts b/packages/core/utils/src/index.ts index 973ec89733..7f3e4e78b1 100644 --- a/packages/core/utils/src/index.ts +++ b/packages/core/utils/src/index.ts @@ -7,4 +7,4 @@ export * from './registry'; export * from './requireModule'; export * from './toposort'; export * from './uid'; - +export * from './assign';