feat: upgrade nx to 19.4.3 (#144)

api7 · Jul 14, 2024 · 2804ab6 · 2804ab6
1 parent 774595e
commit 2804ab6
Show file tree

Hide file tree

Showing 16 changed files with 410 additions and 410 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -24,12 +24,18 @@
     {
       "files": ["*.ts", "*.tsx"],
       "extends": ["plugin:@nx/typescript"],
-      "rules": {}
+      "rules": {
+        "@typescript-eslint/no-extra-semi": "error",
+        "no-extra-semi": "off"
+      }
     },
     {
       "files": ["*.js", "*.jsx"],
       "extends": ["plugin:@nx/javascript"],
-      "rules": {}
+      "rules": {
+        "@typescript-eslint/no-extra-semi": "error",
+        "no-extra-semi": "off"
+      }
     },
     {
       "files": ["*.spec.ts", "*.spec.tsx", "*.spec.js", "*.spec.jsx"],

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -6,6 +6,7 @@ on:
   pull_request:
     branches:
       - main
+    types: [opened, synchronize, reopened, labeled]
 jobs:
   apisix:
     runs-on: ubuntu-latest
@@ -38,7 +39,7 @@ jobs:
     if: contains(github.event.pull_request.labels.*.name, 'test/api7')
     strategy:
       matrix:
-        version: [3.2.13.8, 3.2.14.0]
+        version: [3.2.13.0, 3.2.14.0]
     env:
       BACKEND_API7_DOWNLOAD_URL: https://run.api7.ai/api7-ee/api7-ee-v${{ matrix.version }}.tar.gz
       BACKEND_API7_LICENSE: ${{ secrets.BACKEND_API7_LICENSE }}
@@ -49,9 +50,7 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 'lts/*'
-      - uses: pnpm/action-setup@v2
-        with:
-          version: latest
+      - uses: pnpm/action-setup@v4
       - name: Install dependencies
         run: pnpm install
 

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -15,10 +15,10 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 'lts/*'
-      - uses: pnpm/action-setup@v2
-        with:
-          version: latest
+      - uses: pnpm/action-setup@v4
       - name: Build ADC
+        env:
+          NODE_VERSION: 20.15.1
         run: |
           pnpm install
           NODE_ENV=production npx nx build cli

diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
@@ -14,9 +14,7 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 'lts/*'
-      - uses: pnpm/action-setup@v2
-        with:
-          version: latest
+      - uses: pnpm/action-setup@v4
       - name: Install dependencies
         run: pnpm install
 

diff --git a/.gitignore b/.gitignore
@@ -39,5 +39,6 @@ testem.log
 Thumbs.db
 
 .nx/cache
+.nx/workspace-data
 .env
 api7-ee
diff --git a/.prettierignore b/.prettierignore
@@ -1,4 +1,5 @@
 # Add files here to ignore them from prettier formatting
 /dist
 /coverage
-/.nx/cache
+/.nx/cache
+/.nx/workspace-data
diff --git a/apps/cli/scripts/download-node.ts b/apps/cli/scripts/download-node.ts
@@ -2,7 +2,7 @@ import { execSync } from 'child_process';
 import { cpSync, existsSync, mkdirSync, rmSync, unlinkSync } from 'fs';
 import { Listr } from 'listr2';
 
-const version = process.env.NODE_VERSION ?? '20.12.2';
+const version = process.env.NODE_VERSION ?? '20.15.1';
 
 const tasks = new Listr([
   {

diff --git a/libs/backend-api7/e2e/default-value.e2e-spec.ts b/libs/backend-api7/e2e/default-value.e2e-spec.ts
@@ -6,8 +6,8 @@ describe('Default Value', () => {
 
   beforeAll(() => {
     backend = new BackendAPI7({
-      server: globalThis.server,
-      token: globalThis.token,
+      server: process.env.SERVER,
+      token: process.env.TOKEN,
       tlsSkipVerify: true,
       gatewayGroup: 'default',
     });

diff --git a/libs/backend-api7/e2e/ping.e2e-spec.ts b/libs/backend-api7/e2e/ping.e2e-spec.ts
@@ -3,8 +3,8 @@ import { BackendAPI7 } from '../src';
 describe('Ping', () => {
   it('should success', async () => {
     const backend = new BackendAPI7({
-      server: globalThis.server,
-      token: globalThis.token,
+      server: process.env.SERVER,
+      token: process.env.TOKEN,
       tlsSkipVerify: true,
     });
     await backend.ping();
@@ -22,8 +22,8 @@ describe('Ping', () => {
 
   it('should failed (self-signed certificate)', async () => {
     const backend = new BackendAPI7({
-      server: globalThis.server,
-      token: globalThis.token,
+      server: process.env.SERVER,
+      token: process.env.TOKEN,
     });
     await expect(backend.ping()).rejects.toThrow('self-signed certificate');
   });

diff --git a/libs/backend-api7/e2e/support/global-setup.ts b/libs/backend-api7/e2e/support/global-setup.ts
@@ -61,13 +61,13 @@ const generateToken = async () => {
     { validateStatus: () => true },
   );
 
-  globalThis.token = resp.data.value.token;
+  process.env.TOKEN = resp.data.value.token;
 };
 
 export default async () => {
   if (process.env['SKIP_API7_SETUP'] !== 'true') await setupAPI7();
   await activateAPI7();
   await generateToken();
 
-  globalThis.server = 'https://localhost:7443';
+  process.env.SERVER = 'https://localhost:7443';
 };
diff --git a/libs/backend-api7/e2e/sync-and-dump-1.e2e-spec.ts b/libs/backend-api7/e2e/sync-and-dump-1.e2e-spec.ts
@@ -17,8 +17,8 @@ describe('Sync and Dump - 1', () => {
 
   beforeAll(() => {
     backend = new BackendAPI7({
-      server: globalThis.server,
-      token: globalThis.token,
+      server: process.env.SERVER,
+      token: process.env.TOKEN,
       tlsSkipVerify: true,
       gatewayGroup: 'default',
     });

diff --git a/libs/backend-api7/e2e/sync-and-dump-2.e2e-spec.ts b/libs/backend-api7/e2e/sync-and-dump-2.e2e-spec.ts
@@ -10,8 +10,8 @@ describe('Sync and Dump - 2', () => {
 
   beforeAll(() => {
     backend = new BackendAPI7({
-      server: globalThis.server,
-      token: globalThis.token,
+      server: process.env.SERVER,
+      token: process.env.TOKEN,
       tlsSkipVerify: true,
       gatewayGroup: 'default',
     });

diff --git a/libs/backend-api7/project.json b/libs/backend-api7/project.json
@@ -26,7 +26,8 @@
       ],
       "options": {
         "jestConfig": "libs/backend-api7/jest.config.e2e.ts",
-        "passWithNoTests": true
+        "passWithNoTests": true,
+        "runInBand": true
       }
     }
   },

diff --git a/package.json b/package.json
@@ -5,19 +5,19 @@
   "scripts": {},
   "private": true,
   "devDependencies": {
-    "@nx/esbuild": "18.3.4",
-    "@nx/eslint": "18.3.4",
-    "@nx/eslint-plugin": "18.3.4",
-    "@nx/jest": "18.3.4",
-    "@nx/js": "18.3.4",
-    "@nx/node": "18.3.4",
-    "@nx/webpack": "18.3.4",
-    "@nx/workspace": "18.3.4",
+    "@nx/esbuild": "19.4.3",
+    "@nx/eslint": "19.4.3",
+    "@nx/eslint-plugin": "19.4.3",
+    "@nx/jest": "19.4.3",
+    "@nx/js": "19.4.3",
+    "@nx/node": "19.4.3",
+    "@nx/webpack": "19.4.3",
+    "@nx/workspace": "19.4.3",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.13",
     "@svgr/webpack": "^8.1.0",
-    "@swc-node/register": "~1.8.0",
-    "@swc/core": "~1.3.107",
-    "@swc/helpers": "~0.5.11",
+    "@swc-node/register": "1.9.2",
+    "@swc/core": "1.5.7",
+    "@swc/helpers": "0.5.12",
     "@trivago/prettier-plugin-sort-imports": "^4.3.0",
     "@types/deep-diff": "^1.0.5",
     "@types/jest": "^29.5.12",
@@ -35,7 +35,7 @@
     "eslint-config-prettier": "^9.1.0",
     "jest": "^29.7.0",
     "jest-environment-node": "^29.7.0",
-    "nx": "18.3.4",
+    "nx": "19.4.3",
     "openapi-types": "^12.1.3",
     "prettier": "^3.2.5",
     "qs": "^6.12.1",
@@ -67,5 +67,6 @@
     "winston": "^3.13.0",
     "yaml": "^2.4.2",
     "zod": "^3.23.8"
-  }
+  },
+  "packageManager": "pnpm@9.5.0+sha512.140036830124618d624a2187b50d04289d5a087f326c9edfc0ccd733d76c4f52c3a313d4fc148794a2a9d81553016004e6742e8cf850670268a7387fc220c903"
 }