feat: update @artus/core to 2.x

packages/apps/artusx-api/package.json

@@ -9,20 +9,11 @@
     "build": "",
     "tsc": "rm -rf dist && tsc"
   },
-  "devDependencies": {
-    "@artus/tsconfig": "^1.0.1",
-    "@types/cron": "^2.0.0",
-    "@types/fs-extra": "^11.0.1",
-    "@types/node": "^18.11.17",
-    "@types/validator": "^13.7.12",
-    "ts-node": "^10.9.1",
-    "tslib": "^2.5.0",
-    "typescript": "^4.9.4"
-  },
   "dependencies": {
-    "@artus/core": "^1.0.3",
-    "@artus/pipeline": "^0.2.2",
+    "@artus/core": "^2.x",
+    "@artus/pipeline": "^0.2",
     "@artusx/core": "workspace:*",
+    "@artusx/utils": "workspace:*",
     "cron": "^2.2.0",
     "dayjs": "^1.11.7",
     "dotenv": "^16.0.3",
@@ -33,5 +24,15 @@
     "sequelize-typescript": "^2.1.5",
     "@artusx/plugin-sequelize": "workspace:*",
     "@artusx/plugin-redis": "workspace:*"
+  },
+  "devDependencies": {
+    "@artus/tsconfig": "^1.0.1",
+    "@types/cron": "^2.0.0",
+    "@types/fs-extra": "^11.0.1",
+    "@types/node": "^18.11.17",
+    "@types/validator": "^13.7.12",
+    "ts-node": "^10.9.1",
+    "tslib": "^2.5.0",
+    "typescript": "^4.9.4"
   }
 }

packages/apps/artusx-api/src/app/bootstrap.ts

@@ -1,26 +1,12 @@
-import 'reflect-metadata';
-import { ArtusApplication, ArtusInjectEnum, Scanner } from '@artus/core';
-
-export async function start(options: any = {}) {
-  const scanner = new Scanner({
-    needWriteFile: false,
-    configDir: 'config',
-    extensions: ['.ts'],
-    framework: options.framework || { path: __dirname },
-    exclude: options.exclude || ['bin', 'test', 'coverage', 'src']
+import path from 'path';
+import { Application } from '@artusx/utils';
+
+export async function start(options?: any) {
+  const app = await Application.start({
+    ...options,
+    root: path.resolve(__dirname),
+    configDir: 'config'
   });
 
-  const baseDir = options.baseDir || process.cwd();
-  const manifest = await scanner.scan(baseDir);
-
-  const artusEnv = options.artusEnv || 'default';
-  const app = new ArtusApplication({
-    env: 'default',
-    containerName: ArtusInjectEnum.DefaultContainerName
-  });
-  await app.load(manifest[artusEnv], baseDir);
-
-  await app.run();
-
   return app;
 }

packages/apps/artusx-api/src/app/config/config.default.ts

@@ -6,10 +6,6 @@ import checkAuth from '../middleware/checkAuth';
 dotenv.config();
 
 export default {
-  framework: {
-    package: '@artusx/core'
-  },
-
   port: 7001,
   middlewares: [checkAuth],
 

packages/apps/artusx-api/src/app/config/plugin.ts

@@ -1,4 +1,9 @@
 export default {
+  artusx: {
+    enable: true,
+    package: '@artusx/core'
+  },
+
   redis: {
     enable: true,
     package: '@artusx/plugin-redis'

packages/apps/artusx-web/package.json

@@ -9,18 +9,17 @@
   },
   "dependencies": {
     "nodemon": "~3.0.2",
-    "@artus/core": "~2.2.0",
+    "@artus/core": "^2.x",
     "@artusx/core": "workspace:*",
-    "@artusx/run": "workspace:*",
-    "@artusx/plugin-application-http": "workspace:*",
-    "tslib": "~2.6.2",
-    "typescript": "~5.3.3",
+    "@artusx/utils": "workspace:*",
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
+    "@artus/tsconfig": "~1.0.1",
+    "@types/node": "~20.10.6",
     "nodemon": "~3.0.2",
     "ts-node": "~10.9.2",
-    "@types/node": "~20.10.6",
-    "@artus/tsconfig": "~1.0.1"
+    "tslib": "~2.6.2",
+    "typescript": "~5.3.3"
   }
 }

packages/apps/artusx-web/src/bootstrap.ts

@@ -1,10 +1,9 @@
 import path from 'path';
-import { Application } from '@artusx/run';
+import { Application } from '@artusx/utils';
 
 (async () => {
   const app = await Application.start({
     root: path.resolve(__dirname),
-    name: 'app',
     configDir: 'config'
   });
 

packages/apps/artusx-web/src/config/config.default.ts

@@ -1,5 +1 @@
-export default {
-  framework: {
-    package: '@artusx/core'
-  }
-};
+export default {};

packages/apps/artusx-web/src/config/plugin.ts

@@ -1,8 +1,6 @@
 export default {
-  redis: {
-    enable: false
-  },
-  sequelize: {
-    enable: false
+  artusx: {
+    enable: true,
+    package: '@artusx/core'
   }
 };

packages/apps/artusx-web/src/controller/home.ts

@@ -1,6 +1,5 @@
-import { GET, HTTPController } from '@artusx/plugin-application-http';
-
-import { HTTPContext } from '@artusx/plugin-application-http';
+import { GET, HTTPController } from '../types';
+import type { HTTPContext } from '../types';
 
 @HTTPController()
 export default class HomeController {

packages/apps/artusx-web/src/types.ts

@@ -0,0 +1 @@
+export * from '@artusx/core/lib/types';