From 7c65167adb38a02e20ba5cabcc53007a0996a696 Mon Sep 17 00:00:00 2001 From: mertmit Date: Fri, 26 Jul 2024 10:51:40 +0000 Subject: [PATCH 1/3] [create-pull-request] automated change Signed-off-by: GitHub --- packages/nc-gui/components.d.ts | 2 -- packages/nc-gui/package.json | 2 +- packages/nc-lib-gui/package.json | 2 +- packages/nocodb-sdk/package.json | 2 +- packages/nocodb/package.json | 6 ++--- pnpm-lock.yaml | 39 ++++++++++---------------------- 6 files changed, 18 insertions(+), 35 deletions(-) diff --git a/packages/nc-gui/components.d.ts b/packages/nc-gui/components.d.ts index 4d762a59c2..a905e81053 100644 --- a/packages/nc-gui/components.d.ts +++ b/packages/nc-gui/components.d.ts @@ -81,8 +81,6 @@ declare module 'vue' { IcRoundKeyboardArrowDown: typeof import('~icons/ic/round-keyboard-arrow-down')['default'] IcRoundSearch: typeof import('~icons/ic/round-search')['default'] LogosGoogleGmail: typeof import('~icons/logos/google-gmail')['default'] - MaterialSymbolsArrowCircleLeftRounded: typeof import('~icons/material-symbols/arrow-circle-left-rounded')['default'] - MaterialSymbolsArrowCircleRightRounded: typeof import('~icons/material-symbols/arrow-circle-right-rounded')['default'] MaterialSymbolsAttachFile: typeof import('~icons/material-symbols/attach-file')['default'] MaterialSymbolsChevronRightRounded: typeof import('~icons/material-symbols/chevron-right-rounded')['default'] MaterialSymbolsCloseRounded: typeof import('~icons/material-symbols/close-rounded')['default'] diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json index bf9026a3d2..575476769d 100644 --- a/packages/nc-gui/package.json +++ b/packages/nc-gui/package.json @@ -77,7 +77,7 @@ "marked": "^4.3.0", "monaco-editor": "^0.45.0", "monaco-sql-languages": "^0.11.0", - "nocodb-sdk": "workspace:^", + "nocodb-sdk": "0.251.3", "papaparse": "^5.4.1", "parse-github-url": "^1.0.2", "pdfobject": "^2.3.0", diff --git a/packages/nc-lib-gui/package.json b/packages/nc-lib-gui/package.json index 5ccc539880..d09e45a3e9 100644 --- a/packages/nc-lib-gui/package.json +++ b/packages/nc-lib-gui/package.json @@ -1,6 +1,6 @@ { "name": "nc-lib-gui", - "version": "0.251.2", + "version": "0.251.3", "description": "NocoDB GUI", "author": { "name": "NocoDB", diff --git a/packages/nocodb-sdk/package.json b/packages/nocodb-sdk/package.json index c5efb60ea8..ecb1ff40d1 100644 --- a/packages/nocodb-sdk/package.json +++ b/packages/nocodb-sdk/package.json @@ -1,6 +1,6 @@ { "name": "nocodb-sdk", - "version": "0.251.2", + "version": "0.251.3", "description": "NocoDB SDK", "main": "build/main/index.js", "typings": "build/main/index.d.ts", diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json index d267394c7d..33642d812f 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -1,6 +1,6 @@ { "name": "nocodb", - "version": "0.251.2", + "version": "0.251.3", "description": "NocoDB Backend", "main": "dist/bundle.js", "author": { @@ -132,12 +132,12 @@ "mysql2": "^3.9.7", "nanoid": "^3.3.7", "nc-help": "0.3.1", - "nc-lib-gui": "0.251.2", + "nc-lib-gui": "0.251.3", "nc-plugin": "^0.1.3", "ncp": "^2.0.0", "nestjs-kafka": "^1.0.6", "nestjs-throttler-storage-redis": "^0.4.4", - "nocodb-sdk": "workspace:^", + "nocodb-sdk": "0.251.3", "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 9691b05007..f86f94cc63 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -161,7 +161,7 @@ importers: specifier: ^0.11.0 version: 0.11.0 nocodb-sdk: - specifier: workspace:^ + specifier: 0.251.3 version: link:../nocodb-sdk papaparse: specifier: ^5.4.1 @@ -724,8 +724,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.251.2 - version: 0.251.2 + specifier: 0.251.3 + version: 0.251.3 nc-plugin: specifier: ^0.1.3 version: 0.1.3 @@ -739,7 +739,7 @@ importers: specifier: ^0.4.4 version: 0.4.4(@nestjs/common@10.3.8)(@nestjs/core@10.3.8)(@nestjs/throttler@5.1.2)(ioredis@5.4.1)(reflect-metadata@0.2.1) nocodb-sdk: - specifier: workspace:^ + specifier: 0.251.3 version: link:../nocodb-sdk nodemailer: specifier: ^6.9.13 @@ -11240,7 +11240,7 @@ packages: dependencies: '@vueuse/core': 10.9.0(vue@3.4.34) '@vueuse/shared': 10.9.0(vue@3.4.34) - vue-demi: 0.14.9(vue@3.4.34) + vue-demi: 0.14.10(vue@3.4.34) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -11263,7 +11263,7 @@ packages: '@types/web-bluetooth': 0.0.20 '@vueuse/metadata': 10.9.0 '@vueuse/shared': 10.9.0(vue@3.4.34) - vue-demi: 0.14.9(vue@3.4.34) + vue-demi: 0.14.10(vue@3.4.34) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -11386,7 +11386,7 @@ packages: jwt-decode: 3.1.2 qrcode: 1.5.3 sortablejs: 1.15.2 - vue-demi: 0.14.9(vue@3.4.34) + vue-demi: 0.14.10(vue@3.4.34) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -11420,7 +11420,7 @@ packages: /@vueuse/shared@10.7.2(vue@3.4.34): resolution: {integrity: sha512-qFbXoxS44pi2FkgFjPvF4h7c9oMDutpyBdcJdMYIMg9XyXli2meFMuaKn+UMgsClo//Th6+beeCgqweT/79BVA==} dependencies: - vue-demi: 0.14.9(vue@3.4.34) + vue-demi: 0.14.10(vue@3.4.34) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -11428,7 +11428,7 @@ packages: /@vueuse/shared@10.9.0(vue@3.4.34): resolution: {integrity: sha512-Uud2IWncmAfJvRaFYzv5OHDli+FbOzxiVEQdLCKQKLyhz94PIyFC3CHcH7EDMwIn8NPtD06+PNbC/PiO0LGLtw==} dependencies: - vue-demi: 0.14.9(vue@3.4.34) + vue-demi: 0.14.10(vue@3.4.34) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -21609,8 +21609,8 @@ packages: - supports-color dev: false - /nc-lib-gui@0.251.2: - resolution: {integrity: sha512-AQb3sulST9kW6qXMbgYLCyWKCJcAY1LZe7OmdFMmBJ+Bmvlt5NceaioZ3v8x7nS3rz4cV1ao/4Ogqrkknv6ldw==} + /nc-lib-gui@0.251.3: + resolution: {integrity: sha512-PeTdOJ8R5Zi+3L6UqIGgPWrGvjPrUNL8zE9o8lvNC9mpS4oxVS2XY7VvyklpHfU2D81ZyHEBXQWMpDRWzJpfMQ==} dependencies: express: 4.19.2 transitivePeerDependencies: @@ -24020,7 +24020,7 @@ packages: engines: {node: ^10 || ^12 || >=14} dependencies: nanoid: 3.3.7 - picocolors: 1.0.0 + picocolors: 1.0.1 source-map-js: 1.2.0 dev: true @@ -28535,7 +28535,6 @@ packages: optional: true dependencies: vue: 3.4.34(typescript@5.4.5) - dev: false /vue-demi@0.14.6(vue@3.4.34): resolution: {integrity: sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==} @@ -28566,20 +28565,6 @@ packages: dependencies: vue: 3.4.34(typescript@5.4.5) - /vue-demi@0.14.9(vue@3.4.34): - resolution: {integrity: sha512-dC1TJMODGM8lxhP6wLToncaDPPNB3biVxxRDuNCYpuXwi70ou7NsGd97KVTJ2omepGId429JZt8oaZKeXbqxwg==} - engines: {node: '>=12'} - hasBin: true - requiresBuild: true - peerDependencies: - '@vue/composition-api': ^1.0.0-rc.1 - vue: latest - peerDependenciesMeta: - '@vue/composition-api': - optional: true - dependencies: - vue: 3.4.34(typescript@5.4.5) - /vue-devtools-stub@0.1.0: resolution: {integrity: sha512-RutnB7X8c5hjq39NceArgXg28WZtZpGc3+J16ljMiYnFhKvd8hITxSWQSQ5bvldxMDU6gG5mkxl1MTQLXckVSQ==} dev: true From 997a5a5360e0a8d9323e70d5d976451365f5780f Mon Sep 17 00:00:00 2001 From: Pranav C Date: Fri, 26 Jul 2024 20:13:36 +0530 Subject: [PATCH 2/3] Executable build action changes for supporting sharp library (#9086) * chore: executable build with `sharp` npm package Signed-off-by: Pranav C * chore: use latest pkg version Signed-off-by: Pranav C * chore: executable build action - sharp package binary installation specific to platform Signed-off-by: Pranav C --------- Signed-off-by: Pranav C --- .github/workflows/release-executables.yml | 50 +++++++++++++++++++---- 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release-executables.yml b/.github/workflows/release-executables.yml index 5fc5614e14..82def9a67c 100644 --- a/.github/workflows/release-executables.yml +++ b/.github/workflows/release-executables.yml @@ -75,6 +75,7 @@ jobs: # Install nocodb version based on provided tag name npm i -E nocodb@${{ github.event.inputs.tag || inputs.tag }} + # install npm dependendencies npm i @@ -91,16 +92,47 @@ jobs: # clean up code to optimize size npx modclean --patterns="default:*" --ignore="nc-lib-gui/**,nocodb/**,dayjs/**,express-status-monitor/**,sqlite3/**" --run - - # build executables - npm run build - - ls ./dist - - # Move macOS executables for signing + mkdir ./mac-dist - mv ./dist/Noco-macos-arm64 ./mac-dist/ - mv ./dist/Noco-macos-x64 ./mac-dist/ + mkdir ./dist + + # build darwin x64 executable + npm uninstall sharp + npm install --cpu=x64 --os=darwin sharp + npx --yes pkg@5.8.1 . --compress GZip -t node18-macos-x64 -o Noco-macos-x64 + mv ./Noco-macos-x64 ./mac-dist/ + + # build darwin arm64 executable + npm uninstall sharp + npm install --cpu=arm64 --os=darwin sharp + npx --yes pkg@5.8.1 . --compress GZip -t node18-macos-arm64 -o Noco-macos-arm64 + mv ./Noco-macos-arm64 ./mac-dist/ + + + # build linux x64 executable + npm uninstall sharp + npm install --cpu=x64 --os=linux sharp + npx --yes pkg@5.8.1 . --compress GZip -t node18-linux-x64 -o Noco-linux-x64 + mv ./Noco-linux-x64 ./dist/ + + # build linux arm64 executable + npm uninstall sharp + npm install --cpu=arm64 --os=linux sharp + npx --yes pkg@5.8.1 . --compress GZip -t node18-linux-arm64 -o Noco-linux-arm64 + mv ./Noco-linux-arm64 ./dist/ + + + # build windows x64 executable + npm uninstall sharp + npm install --cpu=x64 --os=win32 sharp + npx --yes pkg@5.8.1 . --compress GZip -t node18-win-x64 -o Noco-win-x64.exe + mv ./Noco-win-x64.exe ./dist/ + + # build windows arm64 executable + npm uninstall sharp + npm install --cpu=arm64 --os=win32 sharp + npx --yes pkg@5.8.1 . --compress GZip -t node18-win-arm64 -o Noco-win-arm64.exe + mv ./Noco-win-arm64.exe ./dist/ - name: Upload executables to asset id: upload-release-asset From fea6714e20ffbc50d43e582efc67c9a61898fbec Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 26 Jul 2024 10:53:26 +0000 Subject: [PATCH 3/3] chore: update sdk path --- packages/nc-gui/package.json | 2 +- packages/nocodb/package.json | 2 +- pnpm-lock.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json index 575476769d..bf9026a3d2 100644 --- a/packages/nc-gui/package.json +++ b/packages/nc-gui/package.json @@ -77,7 +77,7 @@ "marked": "^4.3.0", "monaco-editor": "^0.45.0", "monaco-sql-languages": "^0.11.0", - "nocodb-sdk": "0.251.3", + "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 33642d812f..fbee9c5d10 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -137,7 +137,7 @@ "ncp": "^2.0.0", "nestjs-kafka": "^1.0.6", "nestjs-throttler-storage-redis": "^0.4.4", - "nocodb-sdk": "0.251.3", + "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 f86f94cc63..79a9d41ae7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -161,7 +161,7 @@ importers: specifier: ^0.11.0 version: 0.11.0 nocodb-sdk: - specifier: 0.251.3 + specifier: workspace:^ version: link:../nocodb-sdk papaparse: specifier: ^5.4.1 @@ -739,7 +739,7 @@ importers: specifier: ^0.4.4 version: 0.4.4(@nestjs/common@10.3.8)(@nestjs/core@10.3.8)(@nestjs/throttler@5.1.2)(ioredis@5.4.1)(reflect-metadata@0.2.1) nocodb-sdk: - specifier: 0.251.3 + specifier: workspace:^ version: link:../nocodb-sdk nodemailer: specifier: ^6.9.13