chore(deps): migrate to pnpm catalog and upgrade (#389)

Author: bzp2010

.github/workflows/lint.yaml

@@ -0,0 +1,24 @@
+name: Lint
+permissions:
+  contents: read
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "lts/*"
+      - uses: pnpm/action-setup@v4
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Lint
+        run: pnpm exec nx run-many --target=lint --all --skip-nx-cache

.github/workflows/typecheck.yaml

@@ -9,17 +9,16 @@ on:
     branches:
       - main
 jobs:
-  test:
+  typecheck:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 'lts/*'
+          node-version: "lts/*"
       - uses: pnpm/action-setup@v4
       - name: Install dependencies
         run: pnpm install
 
-      - name: Run TypeScript Type Check
-        run: npx nx run-many --target=typecheck --all --skip-nx-cache
-
+      - name: Typecheck
+        run: pnpm exec nx run-many --target=typecheck --all --skip-nx-cache

apps/cli/package.json

@@ -7,32 +7,38 @@
     "@api7/adc-converter-openapi": "workspace:*",
     "@api7/adc-differ": "workspace:*",
     "@types/express": "^5.0.3",
+    "@types/js-yaml": "^4.0.9",
+    "@types/lodash": "catalog:",
     "@types/supertest": "^6.0.3",
+    "@types/pluralize": "^0.0.33",
+    "@types/qs": "^6.9.15",
+    "@types/signale": "^1.4.7",
+    "@types/semver": "catalog:",
     "supertest": "^7.1.4",
-    "vitest": "^3.0.0",
-    "@nx/webpack": "21.6.4",
+    "vitest": "catalog:",
     "webpack": "5.101.3",
-    "terser-webpack-plugin": "^5.3.14"
+    "terser-webpack-plugin": "^5.3.14",
+    "semver": "catalog:"
   },
   "dependencies": {
+    "@api7/adc-sdk": "workspace:*",
     "express": "^5.1.0",
     "winston": "^3.17.0",
-    "axios": "^1.13.1",
-    "rxjs": "^7.8.1",
+    "axios": "catalog:",
+    "rxjs": "catalog:",
+    "lodash": "catalog:",
+    "zod": "catalog:",
     "pluralize": "^8.0.0",
-    "listr2": "^8.2.1",
+    "listr2": "catalog:",
     "commander": "^13.1.0",
-    "js-yaml": "^4.1.0",
-    "lodash": "^4.17.21",
     "chalk": "^4.1.2",
     "parse-duration": "^1.1.0",
     "qs": "^6.12.1",
     "dotenv": "^16.4.5",
-    "zod": "^4.0.10",
     "source-map-support": "^0.5.21",
     "agentkeepalive": "^4.6.0",
-    "glob": "^11.0.3",
     "signale": "^1.4.0",
-    "@api7/adc-sdk": "workspace:*"
+    "glob": "^13.0.0",
+    "js-yaml": "catalog:"
   }
 }

apps/cli/project.json

@@ -7,19 +7,15 @@
   "targets": {
     "build": {
       "executor": "@nx/webpack:webpack",
-      "outputs": [
-        "{options.outputPath}"
-      ],
+      "outputs": ["{options.outputPath}"],
       "defaultConfiguration": "production",
       "options": {
         "target": "node",
         "compiler": "tsc",
         "outputPath": "dist/apps/cli",
         "main": "apps/cli/src/main.ts",
         "tsConfig": "apps/cli/tsconfig.app.json",
-        "assets": [
-          "apps/cli/src/assets"
-        ],
+        "assets": ["apps/cli/src/assets"],
         "webpackConfig": "apps/cli/webpack.config.js",
         "sourceMap": true
       },
@@ -30,12 +26,10 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": [
-        "{options.outputFile}"
-      ]
+      "outputs": ["{options.outputFile}"]
     },
     "test": {
-      "executor": "@nx/vite:test",
+      "executor": "@nx/vitest:test",
       "options": {
         "configFile": "apps/cli/vitest.config.ts"
       }

apps/cli/tsconfig.json

@@ -3,24 +3,6 @@
   "files": [],
   "include": [],
   "references": [
-    {
-      "path": "../../libs/differ"
-    },
-    {
-      "path": "../../libs/converter-openapi"
-    },
-    {
-      "path": "../../libs/backend-apisix-standalone"
-    },
-    {
-      "path": "../../libs/backend-apisix"
-    },
-    {
-      "path": "../../libs/backend-api7"
-    },
-    {
-      "path": "../../libs/sdk"
-    },
     {
       "path": "./tsconfig.app.json"
     },

apps/cli/tsconfig.spec.json

@@ -5,7 +5,6 @@
     "types": [
       "vitest/globals",
       "vitest/importMeta",
-      "vite/client",
       "node",
       "vitest"
     ]

libs/backend-api7/e2e/support/utils.ts

@@ -1,29 +1,10 @@
 import * as ADCSDK from '@api7/adc-sdk';
-import { Listr, SilentRenderer } from 'listr2';
 import { Agent as httpsAgent } from 'node:https';
 import { lastValueFrom, toArray } from 'rxjs';
 import * as semver from 'semver';
 
 import { BackendAPI7 } from '../../src';
 
-export const runTask = async (tasks: Listr, ctx = {}) => {
-  // add sync delay
-  if (Array.isArray(tasks.task)) {
-    const delayedTasks = tasks.task.reduce((pv, cv) => {
-      pv.push(cv, {
-        task: async () => new Promise((resolve) => setTimeout(resolve, 20)),
-      });
-      return pv;
-    }, []);
-    tasks = new Listr(delayedTasks, { concurrent: false });
-  }
-
-  //@ts-expect-error just ignore
-  tasks.renderer = new SilentRenderer();
-  await tasks.run(ctx);
-  return tasks.ctx.local;
-};
-
 export const syncEvents = async (
   backend: BackendAPI7,
   events: Array<ADCSDK.Event> = [],

libs/backend-api7/package.json

@@ -10,7 +10,19 @@
   },
   "devDependencies": {
     "@api7/adc-differ": "workspace:*",
-    "@api7/adc-sdk": "workspace:*"
+    "@api7/adc-sdk": "workspace:*",
+    "@types/lodash": "catalog:",
+    "@types/semver": "catalog:",
+    "@types/json-schema": "^7.0.15",
+    "vitest": "catalog:"
+  },
+  "dependencies": {
+    "axios": "catalog:",
+    "rxjs": "catalog:",
+    "lodash": "catalog:",
+    "tslib": "catalog:",
+    "semver": "catalog:",
+    "immer": "catalog:"
   },
   "nx": {
     "name": "backend-api7",
@@ -23,7 +35,7 @@
         ]
       },
       "test": {
-        "executor": "@nx/vite:test",
+        "executor": "@nx/vitest:test",
         "options": {
           "configFile": "libs/backend-api7/vitest.config.ts"
         }

libs/backend-api7/src/index.ts

@@ -1,6 +1,6 @@
 import * as ADCSDK from '@api7/adc-sdk';
 import axios, { type AxiosInstance } from 'axios';
-import { JSONSchema4 } from 'json-schema';
+import type { JSONSchema4 } from 'json-schema';
 import { isEmpty, isNil } from 'lodash';
 import { Subject, forkJoin, from, switchMap } from 'rxjs';
 import semver, { SemVer } from 'semver';

libs/backend-api7/tsconfig.json

@@ -3,12 +3,6 @@
   "files": [],
   "include": [],
   "references": [
-    {
-      "path": "../differ"
-    },
-    {
-      "path": "../sdk"
-    },
     {
       "path": "./tsconfig.lib.json"
     },