fix: remove decorator

midwayjs · czy88840616 · Oct 7, 2022 · Aug 29, 2022 · Aug 29, 2022 · Sep 12, 2022
commit c3506e007dd990398f4ff78d8167806f01d7c766
diff --git a/packages/bull-board/package.json b/packages/bull-board/package.json
@@ -25,7 +25,6 @@
   "license": "MIT",
   "devDependencies": {
     "@midwayjs/core": "^3.4.13",
-    "@midwayjs/decorator": "^3.4.11",
     "@midwayjs/koa": "^3.5.3",
     "@midwayjs/express": "^3.5.3",
     "@midwayjs/mock": "^3.4.13"

diff --git a/packages/bull-board/src/board.middleware.ts b/packages/bull-board/src/board.middleware.ts
@@ -3,16 +3,14 @@ import type {
   IMidwayApplication,
   IMidwayContext,
   NextFunction,
-} from '@midwayjs/core';
-import {
   Config,
   Init,
   Inject,
   Provide,
   Scope,
   ScopeEnum,
   MidwayFrameworkType,
-} from '@midwayjs/decorator';
+} from '@midwayjs/core';
 import { extname } from 'path';
 import * as bull from '@midwayjs/bull';
 import { createBullBoard } from '@bull-board/api';

diff --git a/packages/bull-board/src/configuration.ts b/packages/bull-board/src/configuration.ts
@@ -1,6 +1,10 @@
-import { Configuration, Inject } from '@midwayjs/decorator';
 import * as bull from '@midwayjs/bull';
-import { MidwayApplicationManager, MidwayConfigService } from '@midwayjs/core';
+import {
+  Configuration,
+  Inject,
+  MidwayApplicationManager,
+  MidwayConfigService,
+} from '@midwayjs/core';
 import { BoardMiddleware } from './board.middleware';
 
 @Configuration({

diff --git a/packages/bull-board/test/fixtures/base-app-express/src/configuration.ts b/packages/bull-board/test/fixtures/base-app-express/src/configuration.ts
@@ -1,4 +1,4 @@
-import { Configuration } from '@midwayjs/decorator';
+import { Configuration } from '@midwayjs/core';
 import * as bullBoard from '../../../../src';
 import { join } from 'path'
 import * as express from '@midwayjs/express';

diff --git a/packages/bull-board/test/fixtures/base-app-koa/src/configuration.ts b/packages/bull-board/test/fixtures/base-app-koa/src/configuration.ts
@@ -1,4 +1,4 @@
-import { Configuration } from '@midwayjs/decorator';
+import { Configuration } from '@midwayjs/core';
 import * as bullBoard from '../../../../src';
 import { join } from 'path'
 import * as koa from '@midwayjs/koa';

diff --git a/packages/bull/package.json b/packages/bull/package.json
@@ -25,7 +25,6 @@
   "license": "MIT",
   "devDependencies": {
     "@midwayjs/core": "^3.4.13",
-    "@midwayjs/decorator": "^3.4.11",
     "@midwayjs/mock": "^3.4.13"
   },
   "dependencies": {

diff --git a/packages/bull/src/configuration.ts b/packages/bull/src/configuration.ts
@@ -1,7 +1,11 @@
-import { Configuration, Init, Inject } from '@midwayjs/decorator';
+import {
+  Configuration,
+  Init,
+  Inject,
+  MidwayDecoratorService,
+} from '@midwayjs/core';
 import * as DefaultConfig from './config/config.default';
 import { BullFramework } from './framework';
-import { MidwayDecoratorService } from '@midwayjs/core';
 import { BULL_QUEUE_KEY } from './constants';
 
 @Configuration({

diff --git a/packages/bull/src/decorator.ts b/packages/bull/src/decorator.ts
@@ -5,7 +5,7 @@ import {
   saveModule,
   Scope,
   ScopeEnum,
-} from '@midwayjs/decorator';
+} from '@midwayjs/core';
 import { BULL_QUEUE_KEY, BULL_PROCESSOR_KEY } from './constants';
 import { JobOptions } from 'bull';
 

diff --git a/packages/bull/src/framework.ts b/packages/bull/src/framework.ts
@@ -1,10 +1,12 @@
-import { BaseFramework, extend, IMidwayBootstrapOptions } from '@midwayjs/core';
 import {
+  BaseFramework,
+  extend,
+  IMidwayBootstrapOptions,
   Framework,
   getClassMetadata,
   listModule,
   Utils,
-} from '@midwayjs/decorator';
+} from '@midwayjs/core';
 import {
   Application,
   Context,

diff --git a/packages/bull/test/fixtures/base-app-redis/src/configuration.ts b/packages/bull/test/fixtures/base-app-redis/src/configuration.ts
@@ -1,4 +1,4 @@
-import { Configuration, Inject } from '@midwayjs/decorator';
+import { Configuration, Inject } from '@midwayjs/core';
 import * as bull from '../../../../src';
 
 @Configuration({

diff --git a/packages/bull/test/fixtures/base-app-redis/src/task/hello.task.ts b/packages/bull/test/fixtures/base-app-redis/src/task/hello.task.ts
@@ -1,4 +1,4 @@
-import { FORMAT, App} from '@midwayjs/decorator';
+import { FORMAT, App} from '@midwayjs/core';
 import { IMidwayApplication } from '@midwayjs/core';
 import { IProcessor, Processor } from '../../../../../src';
 

diff --git a/packages/bull/test/fixtures/base-app/src/configuration.ts b/packages/bull/test/fixtures/base-app/src/configuration.ts
@@ -1,4 +1,4 @@
-import { Configuration } from '@midwayjs/decorator';
+import { Configuration } from '@midwayjs/core';
 import * as bull from '../../../../src';
 
 @Configuration({

diff --git a/packages/bull/test/fixtures/base-app/src/task/hello.task.ts b/packages/bull/test/fixtures/base-app/src/task/hello.task.ts
@@ -1,4 +1,4 @@
-import { FORMAT, App} from '@midwayjs/decorator';
+import { FORMAT, App} from '@midwayjs/core';
 import { IMidwayApplication } from '@midwayjs/core';
 import { IProcessor, Processor } from '../../../../../src';
 

diff --git a/packages/bull/test/fixtures/base-app/src/task/queue.task.ts b/packages/bull/test/fixtures/base-app/src/task/queue.task.ts
@@ -1,4 +1,4 @@
-import { App, Inject } from '@midwayjs/decorator';
+import { App, Inject } from '@midwayjs/core';
 import { Processor, Application } from '../../../../../src';
 
 @Processor('test')

diff --git a/packages/bull/test/index.test.ts b/packages/bull/test/index.test.ts
@@ -1,6 +1,6 @@
 import { createApp, close } from '@midwayjs/mock';
 import { join } from 'path';
-import { sleep } from '@midwayjs/decorator';
+import { sleep } from '@midwayjs/core';
 import * as bull from '../src';
 
 describe(`/test/index.test.ts`, () => {