From 6e93275377a22e410d4e84196b2bbf1f5d03d542 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 19 Nov 2024 07:06:28 +0000 Subject: [PATCH 1/2] chore: update sdk path --- packages/nc-gui/package.json | 2 +- packages/nocodb/package.json | 2 +- pnpm-lock.yaml | 26 +++++++------------------- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json index d51b53569a..e949bac46a 100644 --- a/packages/nc-gui/package.json +++ b/packages/nc-gui/package.json @@ -83,7 +83,7 @@ "marked": "^4.3.0", "monaco-editor": "^0.50.0", "monaco-sql-languages": "^0.11.0", - "nocodb-sdk": "0.258.1", + "nocodb-sdk": "workspace:^", "papaparse": "^5.4.1", "parse-github-url": "^1.0.2", "pdfobject": "^2.3.0", diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json index ffc7622f09..882e564360 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -126,7 +126,7 @@ "nanoid": "^3.3.7", "nc-lib-gui": "0.258.1", "nestjs-throttler-storage-redis": "^0.4.4", - "nocodb-sdk": "0.258.1", + "nocodb-sdk": "workspace:^", "nodemailer": "^6.9.13", "object-hash": "^3.0.0", "object-sizeof": "^2.6.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 70aeec8ad3..6991f27a5f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -173,8 +173,8 @@ importers: specifier: ^0.11.0 version: 0.11.0 nocodb-sdk: - specifier: 0.258.1 - version: 0.258.1(debug@4.3.4) + specifier: workspace:^ + version: link:../nocodb-sdk papaparse: specifier: ^5.4.1 version: 5.4.1 @@ -812,8 +812,8 @@ importers: specifier: ^0.4.4 version: 0.4.4(@nestjs/common@10.3.8(class-validator@0.14.1)(reflect-metadata@0.2.1)(rxjs@7.8.1))(@nestjs/core@10.3.8)(@nestjs/throttler@5.1.2(@nestjs/common@10.3.8(class-validator@0.14.1)(reflect-metadata@0.2.1)(rxjs@7.8.1))(@nestjs/core@10.3.8)(reflect-metadata@0.2.1))(ioredis@5.4.1)(reflect-metadata@0.2.1) nocodb-sdk: - specifier: 0.258.1 - version: 0.258.1(debug@4.3.4) + specifier: workspace:^ + version: link:../nocodb-sdk nodemailer: specifier: ^6.9.13 version: 6.9.13 @@ -1000,7 +1000,7 @@ importers: version: 6.3.4 ts-jest: specifier: 29.1.2 - version: 29.1.2(@babel/core@7.24.3)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.3))(jest@29.7.0)(typescript@5.4.5) + version: 29.1.2(@babel/core@7.24.3)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.3))(jest@29.7.0(@types/node@20.11.30)(ts-node@10.9.2(@swc/wasm@1.5.25)(@types/node@20.11.30)(typescript@5.4.5)))(typescript@5.4.5) ts-loader: specifier: ^9.5.1 version: 9.5.1(typescript@5.4.5)(webpack@5.90.1) @@ -1070,7 +1070,7 @@ importers: version: 5.0.7 ts-jest: specifier: ^29.1.2 - version: 29.1.2(@babel/core@7.24.3)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.3))(jest@29.7.0)(typescript@5.4.5) + version: 29.1.2(@babel/core@7.24.3)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.3))(jest@29.7.0(@types/node@20.11.30)(ts-node@10.9.2(@swc/wasm@1.5.25)(@types/node@20.11.30)(typescript@5.4.5)))(typescript@5.4.5) tsc-alias: specifier: ^1.8.10 version: 1.8.10 @@ -10966,10 +10966,6 @@ packages: xml2js: optional: true - nocodb-sdk@0.258.1: - resolution: {integrity: sha512-kBlgJrdybne99znyu8giB66IV0vHC0h+LelsyuiOcMCkxyQJEtxZ/KzJEEx0yQJWmhBierY+ACQuOBcgyhknow==} - engines: {node: '>=18.19.1'} - node-abi@3.47.0: resolution: {integrity: sha512-2s6B2CWZM//kPgwnuI0KrYwNjfdByE25zvAaEpq9IH4zcNsarH8Ihu/UuX6XMPEogDAxkuUFeZn60pXNHAqn3A==} engines: {node: '>=10'} @@ -28719,14 +28715,6 @@ snapshots: - supports-color - uWebSockets.js - nocodb-sdk@0.258.1(debug@4.3.4): - dependencies: - axios: 1.6.8(debug@4.3.4) - dayjs: 1.11.11 - jsep: 1.3.8 - transitivePeerDependencies: - - debug - node-abi@3.47.0: dependencies: semver: 7.6.3 @@ -31968,7 +31956,7 @@ snapshots: ts-custom-error@3.3.1: {} - ts-jest@29.1.2(@babel/core@7.24.3)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.3))(jest@29.7.0)(typescript@5.4.5): + ts-jest@29.1.2(@babel/core@7.24.3)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.3))(jest@29.7.0(@types/node@20.11.30)(ts-node@10.9.2(@swc/wasm@1.5.25)(@types/node@20.11.30)(typescript@5.4.5)))(typescript@5.4.5): dependencies: bs-logger: 0.2.6 fast-json-stable-stringify: 2.1.0 From f0ddb0fea62f745b417f8e67e01f9658c2a89080 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Tue, 19 Nov 2024 13:53:00 +0530 Subject: [PATCH 2/2] chore: add `py3-setuptools` for sqlite3 binary build --- packages/nocodb/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nocodb/Dockerfile b/packages/nocodb/Dockerfile index ad061035f2..b4b62b1dd6 100644 --- a/packages/nocodb/Dockerfile +++ b/packages/nocodb/Dockerfile @@ -21,7 +21,7 @@ FROM node:18-alpine as builder WORKDIR /usr/src/app # install node-gyp dependencies -RUN apk add --no-cache python3 make g++ +RUN apk add --no-cache python3 make g++ py3-setuptools # install pnpm RUN corepack enable && corepack prepare pnpm@latest --activate