From 79895cbe48e3b8f02b36e68ddf4135fa7849340c Mon Sep 17 00:00:00 2001 From: Pranav C Date: Wed, 11 Oct 2023 18:43:08 +0530 Subject: [PATCH 1/3] chore: docker build action bug Signed-off-by: Pranav C --- .github/workflows/release-docker.yml | 1 + packages/nocodb/package.json | 4 ++-- pnpm-lock.yaml | 23 +++++++++++++++++------ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release-docker.yml b/.github/workflows/release-docker.yml index ed6dc8ff15..bf8ccc2322 100644 --- a/.github/workflows/release-docker.yml +++ b/.github/workflows/release-docker.yml @@ -101,6 +101,7 @@ jobs: - name: Build nocodb and docker files run: | + pnpm install --ignore-scripts --no-frozen-lockfile pnpm run docker:build working-directory: ${{ env.working-directory }} diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json index 0137faffe7..6da3b19bb5 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -130,12 +130,12 @@ "mysql2": "^3.2.0", "nanoid": "^3.1.20", "nc-help": "0.3.1", - "nc-lib-gui": "0.111.4", + "nc-lib-gui": "0.202.0", "nc-plugin": "^0.1.3", "ncp": "^2.0.0", "nestjs-kafka": "^1.0.6", "nestjs-throttler-storage-redis": "^0.3.0", - "nocodb-sdk": "0.111.4", + "nocodb-sdk": "0.202.0", "nodemailer": "^6.4.10", "object-hash": "^3.0.0", "object-sizeof": "^2.6.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 64368f14ef..c1417a7b45 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -632,8 +632,8 @@ importers: specifier: 0.3.1 version: 0.3.1(asn1.js@5.4.1)(debug@4.3.4)(knex@2.4.2) nc-lib-gui: - specifier: 0.111.4 - version: 0.111.4 + specifier: 0.202.0 + version: 0.202.0 nc-plugin: specifier: ^0.1.3 version: 0.1.3 @@ -647,8 +647,8 @@ importers: specifier: ^0.3.0 version: 0.3.0(@nestjs/common@10.2.1)(@nestjs/core@10.2.1)(@nestjs/throttler@4.2.1)(ioredis@5.3.2)(reflect-metadata@0.1.13) nocodb-sdk: - specifier: 0.111.4 - version: link:../nocodb-sdk + specifier: 0.202.0 + version: 0.202.0(debug@4.3.4) nodemailer: specifier: ^6.4.10 version: 6.4.10 @@ -17743,8 +17743,8 @@ packages: - supports-color dev: false - /nc-lib-gui@0.111.4: - resolution: {integrity: sha512-2ST6vycxHpQ0mropVq9GRhVt9dWng3+hZZPyjZ6HiK8kXRjBrsv7Ck4WLIRj7TuloRTI8zn9Mixud9CkvgkvWQ==} + /nc-lib-gui@0.202.0: + resolution: {integrity: sha512-sfWrneJeDMpPx/xTy1B1cZRIILKbdj0mQGbNQ6s0sQ+O/PE1GEGZHSbvvk4SCexwUkcTMmLlc8LC2rLqtPG3MA==} dependencies: express: 4.18.2 transitivePeerDependencies: @@ -17899,6 +17899,17 @@ packages: tslib: 2.6.2 dev: false + /nocodb-sdk@0.202.0(debug@4.3.4): + resolution: {integrity: sha512-wZ7XcaKUWdJiMEN8U8nyBMkkC1Y/YL9AzIFPxSxbWKbogIE3P2i8I2wo0JhM6PziAGRmAVswPKvDNZMVg4Jaug==} + engines: {node: '>=18'} + requiresBuild: true + dependencies: + axios: 0.21.1(debug@4.3.4) + jsep: 1.3.6 + transitivePeerDependencies: + - debug + dev: false + /node-abi@3.47.0: resolution: {integrity: sha512-2s6B2CWZM//kPgwnuI0KrYwNjfdByE25zvAaEpq9IH4zcNsarH8Ihu/UuX6XMPEogDAxkuUFeZn60pXNHAqn3A==} engines: {node: '>=10'} From c3d5631f735d169f074272a14ef39ff439061a63 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Wed, 11 Oct 2023 19:13:40 +0530 Subject: [PATCH 2/3] chore: update nocodb-sdk version Signed-off-by: Pranav C --- packages/nc-gui/package.json | 4 ++-- packages/nocodb/package.json | 4 ++-- pnpm-lock.yaml | 17 +++-------------- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json index 5b26e23d77..104e63b62a 100644 --- a/packages/nc-gui/package.json +++ b/packages/nc-gui/package.json @@ -64,7 +64,7 @@ "locale-codes": "^1.3.1", "monaco-editor": "^0.33.0", "monaco-sql-languages": "^0.11.0", - "nocodb-sdk": "0.111.4", + "nocodb-sdk": "workspace:^", "papaparse": "^5.3.2", "parse-github-url": "^1.0.2", "pinia": "^2.1.4", @@ -154,4 +154,4 @@ "vitest": "^0.30.1", "windicss": "^3.5.6" } -} \ No newline at end of file +} diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json index 6da3b19bb5..cb406befe5 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -135,7 +135,7 @@ "ncp": "^2.0.0", "nestjs-kafka": "^1.0.6", "nestjs-throttler-storage-redis": "^0.3.0", - "nocodb-sdk": "0.202.0", + "nocodb-sdk": "workspace:^", "nodemailer": "^6.4.10", "object-hash": "^3.0.0", "object-sizeof": "^2.6.1", @@ -227,4 +227,4 @@ "coverageDirectory": "../coverage", "testEnvironment": "node" } -} \ No newline at end of file +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c1417a7b45..9dca3dfa25 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -112,7 +112,7 @@ importers: specifier: ^0.11.0 version: 0.11.0 nocodb-sdk: - specifier: 0.111.4 + specifier: workspace:^ version: link:../nocodb-sdk papaparse: specifier: ^5.3.2 @@ -647,8 +647,8 @@ importers: specifier: ^0.3.0 version: 0.3.0(@nestjs/common@10.2.1)(@nestjs/core@10.2.1)(@nestjs/throttler@4.2.1)(ioredis@5.3.2)(reflect-metadata@0.1.13) nocodb-sdk: - specifier: 0.202.0 - version: 0.202.0(debug@4.3.4) + specifier: workspace:^ + version: link:../nocodb-sdk nodemailer: specifier: ^6.4.10 version: 6.4.10 @@ -17899,17 +17899,6 @@ packages: tslib: 2.6.2 dev: false - /nocodb-sdk@0.202.0(debug@4.3.4): - resolution: {integrity: sha512-wZ7XcaKUWdJiMEN8U8nyBMkkC1Y/YL9AzIFPxSxbWKbogIE3P2i8I2wo0JhM6PziAGRmAVswPKvDNZMVg4Jaug==} - engines: {node: '>=18'} - requiresBuild: true - dependencies: - axios: 0.21.1(debug@4.3.4) - jsep: 1.3.6 - transitivePeerDependencies: - - debug - dev: false - /node-abi@3.47.0: resolution: {integrity: sha512-2s6B2CWZM//kPgwnuI0KrYwNjfdByE25zvAaEpq9IH4zcNsarH8Ihu/UuX6XMPEogDAxkuUFeZn60pXNHAqn3A==} engines: {node: '>=10'} From c2519bae16fa40e470d676959651d2c3a64e33de Mon Sep 17 00:00:00 2001 From: Pranav C Date: Wed, 11 Oct 2023 19:19:46 +0530 Subject: [PATCH 3/3] chore: update nc-lib-gui Signed-off-by: Pranav C --- packages/nocodb/package.json | 2 +- pnpm-lock.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json index cb406befe5..af673a73d1 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -130,7 +130,7 @@ "mysql2": "^3.2.0", "nanoid": "^3.1.20", "nc-help": "0.3.1", - "nc-lib-gui": "0.202.0", + "nc-lib-gui": "0.111.4", "nc-plugin": "^0.1.3", "ncp": "^2.0.0", "nestjs-kafka": "^1.0.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9dca3dfa25..273ac70098 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -632,8 +632,8 @@ importers: specifier: 0.3.1 version: 0.3.1(asn1.js@5.4.1)(debug@4.3.4)(knex@2.4.2) nc-lib-gui: - specifier: 0.202.0 - version: 0.202.0 + specifier: 0.111.4 + version: 0.111.4 nc-plugin: specifier: ^0.1.3 version: 0.1.3 @@ -17743,8 +17743,8 @@ packages: - supports-color dev: false - /nc-lib-gui@0.202.0: - resolution: {integrity: sha512-sfWrneJeDMpPx/xTy1B1cZRIILKbdj0mQGbNQ6s0sQ+O/PE1GEGZHSbvvk4SCexwUkcTMmLlc8LC2rLqtPG3MA==} + /nc-lib-gui@0.111.4: + resolution: {integrity: sha512-2ST6vycxHpQ0mropVq9GRhVt9dWng3+hZZPyjZ6HiK8kXRjBrsv7Ck4WLIRj7TuloRTI8zn9Mixud9CkvgkvWQ==} dependencies: express: 4.18.2 transitivePeerDependencies: