Merge pull request #7858 from nocodb/develop

.github/workflows/ci-cd.yml

@@ -28,6 +28,33 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+    validate-swagger-json:
+      runs-on: ubuntu-20.04
+      timeout-minutes: 10
+      if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }}
+      steps:
+        - name: Checkout
+          uses: actions/checkout@v3
+          with:
+            fetch-depth: 1
+
+# enable after fixing all validation errors
+#        - name: Validate OpenAPI definition
+#          uses: char0n/swagger-editor-validate@v1
+#          with:
+#            swagger-editor-url: http://localhost/
+#            definition-file: packages/nocodb/src/schema/swagger.json
+
+        - name: Validate Swagger JSON
+          run: |
+            if ! jq empty packages/nocodb/src/schema/swagger.json; then
+              echo "swagger.json file is not valid JSON"
+              exit 1
+            fi
+            if ! jq empty packages/nocodb/src/schema/swagger-v2.json; then
+              echo "swaggerv2.json file is not valid JSON"
+              exit 1
+            fi
     unit-tests:
       runs-on: ubuntu-20.04
       timeout-minutes: 40
@@ -45,7 +72,7 @@ jobs:
           uses: actions/checkout@v3
           with:
             fetch-depth: 0
-        - name: remove use-node-version from .npmrc 
+        - name: remove use-node-version from .npmrc
           run:  sed -i '/^use-node-version/d' .npmrc
         - name: Get pnpm store directory
           shell: bash
@@ -80,8 +107,8 @@ jobs:
           uses: actions/checkout@v3
           with:
             fetch-depth: 0
-        - name: remove use-node-version from .npmrc 
-          run:  sed -i '/^use-node-version/d' .npmrc           
+        - name: remove use-node-version from .npmrc
+          run:  sed -i '/^use-node-version/d' .npmrc
         - name: Get pnpm store directory
           shell: bash
           run: |
@@ -134,7 +161,7 @@ jobs:
       uses: ./.github/workflows/playwright-test-workflow.yml
       with:
         db: mysql
-        shard: 4       
+        shard: 4
     playwright-sqlite-1:
       needs: pre-build-for-playwright
       if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }}
@@ -162,7 +189,7 @@ jobs:
       uses: ./.github/workflows/playwright-test-workflow.yml
       with:
         db: sqlite
-        shard: 4           
+        shard: 4
     playwright-pg-shard-1:
       needs: pre-build-for-playwright
       if: ${{ github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'trigger-CI') || !github.event.pull_request.draft }}
@@ -190,4 +217,4 @@ jobs:
       uses: ./.github/workflows/playwright-test-workflow.yml
       with:
         db: pg
-        shard: 4       
+        shard: 4

.github/workflows/unit-test.yml

@@ -20,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: 18.19.0
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:

docker-compose/traefik/docker-compose.yml

@@ -34,7 +34,7 @@ services:
       retries: 10
       test: "pg_isready -U ${DATABASE_USER} -d ${DATABASE_NAME}"
       timeout: 2s
-    image: "postgres:12.1-alpine"
+    image: "postgres:12.17-alpine"
     networks: 
       - traefik_proxy
     restart: always
@@ -71,7 +71,7 @@ services:
         - "-c"
         - "http://localhost:8081/ping"
       timeout: 3s
-    image: "traefik:v2.2"
+    image: "traefik:v2.11"
     networks: 
       - default
       - traefik_proxy

package.json

@@ -19,7 +19,7 @@
     "fs": "0.0.1-security",
     "lerna": "^7.4.2",
     "husky": "^8.0.3",
-    "xlsx": "^0.17.5"
+    "xlsx": "https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz"
   },
   "husky": {
     "hooks": {
@@ -47,7 +47,16 @@
   "pnpm": {
     "overrides": {
       "vue": "3.3.13",
-      "typescript": "latest"
+      "typescript": "latest",
+      "ajv@<6.12.3": ">=6.12.3",
+      "node.extend@<1.1.7": ">=1.1.7",
+      "tough-cookie@<4.1.3": ">=4.1.3",
+      "@babel/traverse@<7.23.2": ">=7.23.2",
+      "follow-redirects@<1.15.4": ">=1.15.4",
+      "axios@>=0.8.1 <0.28.0": ">=0.28.0",
+      "ip@<1.1.9": ">=1.1.9",
+      "ip@=2.0.0": ">=2.0.1",
+      "xml2js@<0.5.0": ">=0.5.0"
     }
   }
 }