From bafc68ec002ae636dd017b6c62e500c56f345661 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Mar 2024 16:12:13 +0800 Subject: [PATCH 1/8] chore(renovate): Update patch to v0.204.8 (#7936) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/nc-gui/package.json | 2 +- packages/nocodb/package.json | 2 +- pnpm-lock.yaml | 24 ++++++++++++++++++------ scripts/pkg-executable/package.json | 2 +- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json index 20810b052b0..674f4381fb7 100644 --- a/packages/nc-gui/package.json +++ b/packages/nc-gui/package.json @@ -75,7 +75,7 @@ "marked": "^4.3.0", "monaco-editor": "^0.45.0", "monaco-sql-languages": "^0.11.0", - "nocodb-sdk": "0.204.7", + "nocodb-sdk": "0.204.8", "papaparse": "^5.4.1", "parse-github-url": "^1.0.2", "pinia": "^2.1.7", diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json index 27e56e60718..7a31cbd33e2 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -132,7 +132,7 @@ "mysql2": "^3.9.2", "nanoid": "^3.3.7", "nc-help": "0.3.1", - "nc-lib-gui": "0.204.7", + "nc-lib-gui": "0.204.8", "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 1fe1e717e0c..2676c3449c0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -154,8 +154,8 @@ importers: specifier: ^0.11.0 version: 0.11.0 nocodb-sdk: - specifier: 0.204.7 - version: link:../nocodb-sdk + specifier: 0.204.8 + version: 0.204.8 papaparse: specifier: ^5.4.1 version: 5.4.1 @@ -686,8 +686,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.204.7 - version: 0.204.7 + specifier: 0.204.8 + version: 0.204.8 nc-plugin: specifier: ^0.1.3 version: 0.1.3 @@ -20252,8 +20252,8 @@ packages: - supports-color dev: false - /nc-lib-gui@0.204.7: - resolution: {integrity: sha512-Lh6iV/Mq1Oy5pkLbt+3cGpyJLV7VVIURtFd3SwE8nxTslg/0lnWRat874IAHUXTybISdF5e+HU9Kdf/+m6L45A==} + /nc-lib-gui@0.204.8: + resolution: {integrity: sha512-S32TCXy6ybo/k/Zh6nyHWnQ3HUHpV0tDz39/z70A2qAV0viOnDr4ez6CYAAyHD3NWxz1jSNJkN6mZ3p6hLiXmw==} dependencies: express: 4.18.3 transitivePeerDependencies: @@ -20409,6 +20409,18 @@ packages: - uWebSockets.js dev: true + /nocodb-sdk@0.204.8: + resolution: {integrity: sha512-zNSnoXEx5tf4CiK7nxaXSWYCkgWXYigwdyZtaOGE3cIuia07L4fK6doBXYNGicQ96xUYaBtRKAWGKraIecm+xg==} + engines: {node: '>=18.19.1'} + requiresBuild: true + dependencies: + axios: 1.6.8(debug@3.2.7) + dayjs: 1.11.10 + jsep: 1.3.8 + transitivePeerDependencies: + - debug + dev: false + /node-abi@3.47.0: resolution: {integrity: sha512-2s6B2CWZM//kPgwnuI0KrYwNjfdByE25zvAaEpq9IH4zcNsarH8Ihu/UuX6XMPEogDAxkuUFeZn60pXNHAqn3A==} engines: {node: '>=10'} diff --git a/scripts/pkg-executable/package.json b/scripts/pkg-executable/package.json index 947b425e176..c1e70117383 100644 --- a/scripts/pkg-executable/package.json +++ b/scripts/pkg-executable/package.json @@ -30,7 +30,7 @@ "@nestjs/common": "^10.3.4", "@nestjs/core": "^10.3.4", "express": "^4.18.3", - "nocodb": "0.204.7" + "nocodb": "0.204.8" }, "overrides": { "sqlite3": "5.1.7" From 5e08297d7d9223b78508f4aa2d8360ac8744a6a6 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Fri, 22 Mar 2024 14:18:39 +0530 Subject: [PATCH 2/8] chore: update sdk path --- packages/nc-gui/package.json | 2 +- packages/nocodb/package.json | 2 +- pnpm-lock.yaml | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json index 674f4381fb7..469adefc1c3 100644 --- a/packages/nc-gui/package.json +++ b/packages/nc-gui/package.json @@ -75,7 +75,7 @@ "marked": "^4.3.0", "monaco-editor": "^0.45.0", "monaco-sql-languages": "^0.11.0", - "nocodb-sdk": "0.204.8", + "nocodb-sdk": "workspace:^", "papaparse": "^5.4.1", "parse-github-url": "^1.0.2", "pinia": "^2.1.7", diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json index 41eec0dbc0c..a9d9e661ea7 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.204.8", + "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 17ec76b12d9..058141c506d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -154,7 +154,7 @@ importers: specifier: ^0.11.0 version: 0.11.0 nocodb-sdk: - specifier: 0.204.8 + specifier: workspace:^ version: link:../nocodb-sdk papaparse: specifier: ^5.4.1 @@ -701,7 +701,7 @@ importers: specifier: ^0.4.4 version: 0.4.4(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(@nestjs/throttler@5.1.2)(ioredis@5.3.2)(reflect-metadata@0.2.1) nocodb-sdk: - specifier: 0.204.8 + specifier: workspace:^ version: link:../nocodb-sdk nodemailer: specifier: ^6.9.13 @@ -24071,6 +24071,9 @@ packages: /sqlite3@5.1.6: resolution: {integrity: sha512-olYkWoKFVNSSSQNvxVUfjiVbz3YtBwTJj+mfV5zpHmqW3sELx2Cf4QCdirMelhM5Zh+KDVaKgQHqCxrqiWHybw==} requiresBuild: true + peerDependenciesMeta: + node-gyp: + optional: true dependencies: '@mapbox/node-pre-gyp': 1.0.11 node-addon-api: 4.3.0 @@ -24085,6 +24088,9 @@ packages: /sqlite3@5.1.7: resolution: {integrity: sha512-GGIyOiFaG+TUra3JIfkI/zGP8yZYLPQ0pl1bH+ODjiX57sPhrLU5sQJn1y9bDKZUFYkX1crlrPfSYt0BKKdkog==} requiresBuild: true + peerDependenciesMeta: + node-gyp: + optional: true dependencies: bindings: 1.5.0 node-addon-api: 7.0.0 From 1303a9cba1d662bc7647d09611697a8e053faac3 Mon Sep 17 00:00:00 2001 From: mertmit Date: Fri, 22 Mar 2024 13:31:09 +0300 Subject: [PATCH 3/8] chore: create PR for master sync after release Signed-off-by: mertmit --- .github/workflows/sync-to-develop.yml | 39 ++++++++++++++++++++------- scripts/upgradeNocodbSdk.js | 5 ++++ 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/.github/workflows/sync-to-develop.yml b/.github/workflows/sync-to-develop.yml index 28a770b963e..2b7c4b3707f 100644 --- a/.github/workflows/sync-to-develop.yml +++ b/.github/workflows/sync-to-develop.yml @@ -9,15 +9,36 @@ jobs: sync-to-develop: runs-on: ubuntu-latest steps: + - name: Setup Node + uses: actions/setup-node@v3 + with: + node-version: 18.19.1 - name: Checkout - uses: actions/checkout@v1 - - - name: Merge from master to develop - uses: wingkwong/gh-action-nightly-merge@master + uses: actions/checkout@v3 with: - stable_branch: 'master' - development_branch: 'develop' - allow_ff: true - allow_forks: true + token: ${{ secrets.GITHUB_TOKEN }} + path: nocodb + - name: Prepare GH Cli + id: gh + run: | + wget https://github.com/cli/cli/releases/download/v2.33.0/gh_2.33.0_linux_amd64.tar.gz + tar -xvf gh_2.33.0_linux_amd64.tar.gz + GH=gh_2.33.0_linux_amd64/bin/gh + echo "GH=${GH}" >> $GITHUB_OUTPUT + - name: Sync Master to Develop + id: sync env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + cd nocodb + git fetch --quiet --unshallow origin + git checkout master + BRANCH_NAME=oss/$(git rev-list -n 3 HEAD | tail -1 | cut -c1-8) + git checkout -b $BRANCH_NAME + git config user.name 'github-actions[bot]' + git config user.email 'github-actions[bot]@users.noreply.github.com' + revertSDK=true node scripts/upgradeNocodbSdk.js + git add . + git diff-index --quiet HEAD || git commit -m "chore: update sdk path" + git push origin $BRANCH_NAME + ../${{ steps.gh.outputs.GH }} pr create --title "chore: post-release sync" --body "$(echo -e "This is an automated pull request to sync the master branch to develop.\nPlease review and merge this pull request if it looks good.")" --base develop --head $BRANCH_NAME diff --git a/scripts/upgradeNocodbSdk.js b/scripts/upgradeNocodbSdk.js index 344b85d8bcd..e95a86438ac 100644 --- a/scripts/upgradeNocodbSdk.js +++ b/scripts/upgradeNocodbSdk.js @@ -5,6 +5,11 @@ const execSync = require('child_process').execSync; // extract latest version from package.json const nocodbSdkPackage = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'packages', 'nocodb-sdk', 'package.json'), 'utf8')) + +if (process.env.revertSDK === 'true') { + nocodbSdkPackage.version = 'workspace:^'; +} + const replacePackageName = (filePath) => { return new Promise((resolve, reject) => { return fs.readFile(filePath, 'utf8', function (err, data) { From d3d847d73a4d2693dd6fff583a09772b9d1b8e63 Mon Sep 17 00:00:00 2001 From: navi Date: Sat, 23 Mar 2024 03:44:48 +0000 Subject: [PATCH 4/8] New Crowdin updates (#7944) * New translations en.json (French) * New translations en.json (Spanish) * New translations en.json (Arabic) * New translations en.json (Czech) * New translations en.json (Danish) * New translations en.json (German) * New translations en.json (Basque) * New translations en.json (Finnish) * New translations en.json (Hebrew) * New translations en.json (Italian) * New translations en.json (Japanese) * New translations en.json (Korean) * New translations en.json (Dutch) * New translations en.json (Norwegian) * New translations en.json (Polish) * New translations en.json (Portuguese) * New translations en.json (Russian) * New translations en.json (Slovak) * New translations en.json (Slovenian) * New translations en.json (Swedish) * New translations en.json (Turkish) * New translations en.json (Ukrainian) * New translations en.json (Chinese Simplified) * New translations en.json (Chinese Traditional) * New translations en.json (English) * New translations en.json (Vietnamese) * New translations en.json (Portuguese, Brazilian) * New translations en.json (Indonesian) * New translations en.json (Persian) * New translations en.json (Thai) * New translations en.json (Croatian) * New translations en.json (Latvian) * New translations en.json (Hindi) * New translations en.json (Bengali, India) --- packages/nc-gui/lang/ar.json | 2 +- packages/nc-gui/lang/bn_IN.json | 2 +- packages/nc-gui/lang/cs.json | 2 +- packages/nc-gui/lang/da.json | 2 +- packages/nc-gui/lang/de.json | 2 +- packages/nc-gui/lang/en.json | 2 +- packages/nc-gui/lang/es.json | 2 +- packages/nc-gui/lang/eu.json | 2 +- packages/nc-gui/lang/fa.json | 2 +- packages/nc-gui/lang/fi.json | 2 +- packages/nc-gui/lang/fr.json | 2 +- packages/nc-gui/lang/he.json | 2 +- packages/nc-gui/lang/hi.json | 2 +- packages/nc-gui/lang/hr.json | 2 +- packages/nc-gui/lang/id.json | 2 +- packages/nc-gui/lang/it.json | 2 +- packages/nc-gui/lang/ja.json | 2 +- packages/nc-gui/lang/ko.json | 2 +- packages/nc-gui/lang/lv.json | 2 +- packages/nc-gui/lang/nl.json | 2 +- packages/nc-gui/lang/no.json | 2 +- packages/nc-gui/lang/pl.json | 2 +- packages/nc-gui/lang/pt.json | 2 +- packages/nc-gui/lang/pt_BR.json | 2 +- packages/nc-gui/lang/ru.json | 2 +- packages/nc-gui/lang/sk.json | 2 +- packages/nc-gui/lang/sl.json | 2 +- packages/nc-gui/lang/sv.json | 2 +- packages/nc-gui/lang/th.json | 2 +- packages/nc-gui/lang/tr.json | 2 +- packages/nc-gui/lang/uk.json | 2 +- packages/nc-gui/lang/vi.json | 2 +- packages/nc-gui/lang/zh-Hans.json | 2 +- packages/nc-gui/lang/zh-Hant.json | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/packages/nc-gui/lang/ar.json b/packages/nc-gui/lang/ar.json index e47c2d5b31e..39f01d3b6ec 100644 --- a/packages/nc-gui/lang/ar.json +++ b/packages/nc-gui/lang/ar.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Source name is required", "changeWsName": "Change Workspace Name", "pressEnter": "Press Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "New form will be loaded after", "webhook": "Webhook", "multiField": { "newField": "New field", diff --git a/packages/nc-gui/lang/bn_IN.json b/packages/nc-gui/lang/bn_IN.json index 39fccec3a98..b296a608922 100644 --- a/packages/nc-gui/lang/bn_IN.json +++ b/packages/nc-gui/lang/bn_IN.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Source name is required", "changeWsName": "Change Workspace Name", "pressEnter": "Press Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "New form will be loaded after", "webhook": "Webhook", "multiField": { "newField": "New field", diff --git a/packages/nc-gui/lang/cs.json b/packages/nc-gui/lang/cs.json index afb73b0606a..0e7960c70f1 100644 --- a/packages/nc-gui/lang/cs.json +++ b/packages/nc-gui/lang/cs.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Source name is required", "changeWsName": "Change Workspace Name", "pressEnter": "Press Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "New form will be loaded after", "webhook": "Webhook", "multiField": { "newField": "New field", diff --git a/packages/nc-gui/lang/da.json b/packages/nc-gui/lang/da.json index 731a291dba3..914d664701c 100644 --- a/packages/nc-gui/lang/da.json +++ b/packages/nc-gui/lang/da.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Source name is required", "changeWsName": "Change Workspace Name", "pressEnter": "Press Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "New form will be loaded after", "webhook": "Webhook", "multiField": { "newField": "New field", diff --git a/packages/nc-gui/lang/de.json b/packages/nc-gui/lang/de.json index 857dcc2ab4a..804a6095ba3 100644 --- a/packages/nc-gui/lang/de.json +++ b/packages/nc-gui/lang/de.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Source name is required", "changeWsName": "Name des Arbeitsbereichs ändern", "pressEnter": "Press Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "New form will be loaded after", "webhook": "Webhook", "multiField": { "newField": "New field", diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json index c1d1e5e2664..bf29da34c1a 100644 --- a/packages/nc-gui/lang/en.json +++ b/packages/nc-gui/lang/en.json @@ -699,7 +699,7 @@ "hideNocodbBranding": "Hide NocoDB Branding", "showOnConditions": "Show on condtions", "showFieldOnConditionsMet": "Shows field only when conditions are met", - "limitOptions": "Limit options", + "limitOptions": "Limit ptions", "limitOptionsSubtext": "Limit options visible to users by selecting available options", "clearSelection": "Clear selection" }, diff --git a/packages/nc-gui/lang/es.json b/packages/nc-gui/lang/es.json index cf0442a3ec4..e50e1996e23 100644 --- a/packages/nc-gui/lang/es.json +++ b/packages/nc-gui/lang/es.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Se requiere el nombre de la fuente", "changeWsName": "Cambiar el nombre del espacio de trabajo", "pressEnter": "Pulsa Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "El nuevo formulario se cargará después de", "webhook": "Webhook", "multiField": { "newField": "Nuevo campo", diff --git a/packages/nc-gui/lang/eu.json b/packages/nc-gui/lang/eu.json index c7063dd56f3..e573e7f99e5 100644 --- a/packages/nc-gui/lang/eu.json +++ b/packages/nc-gui/lang/eu.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Source name is required", "changeWsName": "Change Workspace Name", "pressEnter": "Press Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "New form will be loaded after", "webhook": "Webhook", "multiField": { "newField": "New field", diff --git a/packages/nc-gui/lang/fa.json b/packages/nc-gui/lang/fa.json index f0ed3fd44a0..eeeb066d8b2 100644 --- a/packages/nc-gui/lang/fa.json +++ b/packages/nc-gui/lang/fa.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Source name is required", "changeWsName": "Change Workspace Name", "pressEnter": "Press Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "New form will be loaded after", "webhook": "Webhook", "multiField": { "newField": "New field", diff --git a/packages/nc-gui/lang/fi.json b/packages/nc-gui/lang/fi.json index c7a211b4305..673b34278c5 100644 --- a/packages/nc-gui/lang/fi.json +++ b/packages/nc-gui/lang/fi.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Source name is required", "changeWsName": "Change Workspace Name", "pressEnter": "Press Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "New form will be loaded after", "webhook": "Webhook", "multiField": { "newField": "New field", diff --git a/packages/nc-gui/lang/fr.json b/packages/nc-gui/lang/fr.json index 59836760555..eef6fb053d0 100644 --- a/packages/nc-gui/lang/fr.json +++ b/packages/nc-gui/lang/fr.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Source name is required", "changeWsName": "Change Workspace Name", "pressEnter": "Appuyez sur Entrée", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "New form will be loaded after", "webhook": "Webhook", "multiField": { "newField": "New field", diff --git a/packages/nc-gui/lang/he.json b/packages/nc-gui/lang/he.json index 808cdbf1e46..a77fd3866f9 100644 --- a/packages/nc-gui/lang/he.json +++ b/packages/nc-gui/lang/he.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Source name is required", "changeWsName": "Change Workspace Name", "pressEnter": "Press Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "New form will be loaded after", "webhook": "Webhook", "multiField": { "newField": "New field", diff --git a/packages/nc-gui/lang/hi.json b/packages/nc-gui/lang/hi.json index f349fe006b5..8217bfef572 100644 --- a/packages/nc-gui/lang/hi.json +++ b/packages/nc-gui/lang/hi.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Source name is required", "changeWsName": "Change Workspace Name", "pressEnter": "Press Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "New form will be loaded after", "webhook": "Webhook", "multiField": { "newField": "New field", diff --git a/packages/nc-gui/lang/hr.json b/packages/nc-gui/lang/hr.json index c63e2e70123..66a0770044c 100644 --- a/packages/nc-gui/lang/hr.json +++ b/packages/nc-gui/lang/hr.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Source name is required", "changeWsName": "Change Workspace Name", "pressEnter": "Press Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "New form will be loaded after", "webhook": "Webhook", "multiField": { "newField": "New field", diff --git a/packages/nc-gui/lang/id.json b/packages/nc-gui/lang/id.json index 4e0bd93b00f..5e21c051411 100644 --- a/packages/nc-gui/lang/id.json +++ b/packages/nc-gui/lang/id.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Source name is required", "changeWsName": "Change Workspace Name", "pressEnter": "Press Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "New form will be loaded after", "webhook": "Webhook", "multiField": { "newField": "New field", diff --git a/packages/nc-gui/lang/it.json b/packages/nc-gui/lang/it.json index 80ce7eb9a2c..2468d630017 100644 --- a/packages/nc-gui/lang/it.json +++ b/packages/nc-gui/lang/it.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Nome sorgente obbligatorio", "changeWsName": "Cambia nome area di lavoro", "pressEnter": "Premi Invio", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "Il nuovo form verrà caricato dopo", "webhook": "Webhook", "multiField": { "newField": "Nuovo campo", diff --git a/packages/nc-gui/lang/ja.json b/packages/nc-gui/lang/ja.json index a4e40594751..5643dd9dcbd 100644 --- a/packages/nc-gui/lang/ja.json +++ b/packages/nc-gui/lang/ja.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Source name is required", "changeWsName": "Change Workspace Name", "pressEnter": "Press Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "New form will be loaded after", "webhook": "Webhook", "multiField": { "newField": "New field", diff --git a/packages/nc-gui/lang/ko.json b/packages/nc-gui/lang/ko.json index 59505d9b4c5..ff0c8deb548 100644 --- a/packages/nc-gui/lang/ko.json +++ b/packages/nc-gui/lang/ko.json @@ -683,7 +683,7 @@ "sourceNameRequired": "소스 이름이 필요합니다", "changeWsName": "작업 공간 이름 변경", "pressEnter": "Enter를 누르세요", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "새로운 폼이 로드되었습니다.", "webhook": "Webhook", "multiField": { "newField": "New field", diff --git a/packages/nc-gui/lang/lv.json b/packages/nc-gui/lang/lv.json index 7dd77931e02..20bae84bf22 100644 --- a/packages/nc-gui/lang/lv.json +++ b/packages/nc-gui/lang/lv.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Source name is required", "changeWsName": "Change Workspace Name", "pressEnter": "Press Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "New form will be loaded after", "webhook": "Webhook", "multiField": { "newField": "New field", diff --git a/packages/nc-gui/lang/nl.json b/packages/nc-gui/lang/nl.json index b0316521623..c0870e93140 100644 --- a/packages/nc-gui/lang/nl.json +++ b/packages/nc-gui/lang/nl.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Source name is required", "changeWsName": "Change Workspace Name", "pressEnter": "Press Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "New form will be loaded after", "webhook": "Webhook", "multiField": { "newField": "New field", diff --git a/packages/nc-gui/lang/no.json b/packages/nc-gui/lang/no.json index d35b7827234..98e34529f90 100644 --- a/packages/nc-gui/lang/no.json +++ b/packages/nc-gui/lang/no.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Source name is required", "changeWsName": "Change Workspace Name", "pressEnter": "Press Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "New form will be loaded after", "webhook": "Webhook", "multiField": { "newField": "New field", diff --git a/packages/nc-gui/lang/pl.json b/packages/nc-gui/lang/pl.json index d8d238ca150..f14a2115590 100644 --- a/packages/nc-gui/lang/pl.json +++ b/packages/nc-gui/lang/pl.json @@ -683,7 +683,7 @@ "sourceNameRequired": "nazwa źródła jest wymagana", "changeWsName": "Zmień nazwę przestrzeni roboczej", "pressEnter": "Naciśnij Enter", - "newFormLoaded": "Ładowanie nowego formularza w", + "newFormLoaded": "Nowy formularz zostanie załadowany po", "webhook": "Webhook", "multiField": { "newField": "Nowe pole", diff --git a/packages/nc-gui/lang/pt.json b/packages/nc-gui/lang/pt.json index ad5c452f45c..96d15ef9e7a 100644 --- a/packages/nc-gui/lang/pt.json +++ b/packages/nc-gui/lang/pt.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Source name is required", "changeWsName": "Change Workspace Name", "pressEnter": "Press Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "New form will be loaded after", "webhook": "Webhook", "multiField": { "newField": "New field", diff --git a/packages/nc-gui/lang/pt_BR.json b/packages/nc-gui/lang/pt_BR.json index 838dc912ad6..fd5f3e97601 100644 --- a/packages/nc-gui/lang/pt_BR.json +++ b/packages/nc-gui/lang/pt_BR.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Source name is required", "changeWsName": "Change Workspace Name", "pressEnter": "Press Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "New form will be loaded after", "webhook": "Webhook", "multiField": { "newField": "New field", diff --git a/packages/nc-gui/lang/ru.json b/packages/nc-gui/lang/ru.json index f1f1ccc7046..fadce105ed9 100644 --- a/packages/nc-gui/lang/ru.json +++ b/packages/nc-gui/lang/ru.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Имя источника обязательно", "changeWsName": "Изменить название рабочего пространства", "pressEnter": "Нажмите Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "Новая форма будет загружена после", "webhook": "Вебхук", "multiField": { "newField": "Новое поле", diff --git a/packages/nc-gui/lang/sk.json b/packages/nc-gui/lang/sk.json index 6172b8264b7..bf90adc3434 100644 --- a/packages/nc-gui/lang/sk.json +++ b/packages/nc-gui/lang/sk.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Source name is required", "changeWsName": "Change Workspace Name", "pressEnter": "Press Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "New form will be loaded after", "webhook": "Webhook", "multiField": { "newField": "New field", diff --git a/packages/nc-gui/lang/sl.json b/packages/nc-gui/lang/sl.json index 90e7a0bbfdc..64309283fd9 100644 --- a/packages/nc-gui/lang/sl.json +++ b/packages/nc-gui/lang/sl.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Source name is required", "changeWsName": "Change Workspace Name", "pressEnter": "Press Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "New form will be loaded after", "webhook": "Webhook", "multiField": { "newField": "New field", diff --git a/packages/nc-gui/lang/sv.json b/packages/nc-gui/lang/sv.json index 8571453d09b..6ce5583a808 100644 --- a/packages/nc-gui/lang/sv.json +++ b/packages/nc-gui/lang/sv.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Source name is required", "changeWsName": "Change Workspace Name", "pressEnter": "Press Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "New form will be loaded after", "webhook": "Webhook", "multiField": { "newField": "New field", diff --git a/packages/nc-gui/lang/th.json b/packages/nc-gui/lang/th.json index 9511223af81..96c18f6f925 100644 --- a/packages/nc-gui/lang/th.json +++ b/packages/nc-gui/lang/th.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Source name is required", "changeWsName": "Change Workspace Name", "pressEnter": "Press Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "New form will be loaded after", "webhook": "Webhook", "multiField": { "newField": "New field", diff --git a/packages/nc-gui/lang/tr.json b/packages/nc-gui/lang/tr.json index e2c76e0f07d..0378d3bdbb5 100644 --- a/packages/nc-gui/lang/tr.json +++ b/packages/nc-gui/lang/tr.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Source name is required", "changeWsName": "Change Workspace Name", "pressEnter": "Press Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "New form will be loaded after", "webhook": "Webhook", "multiField": { "newField": "New field", diff --git a/packages/nc-gui/lang/uk.json b/packages/nc-gui/lang/uk.json index c342965110b..d2809710e1f 100644 --- a/packages/nc-gui/lang/uk.json +++ b/packages/nc-gui/lang/uk.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Source name is required", "changeWsName": "Change Workspace Name", "pressEnter": "Press Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "New form will be loaded after", "webhook": "Webhook", "multiField": { "newField": "New field", diff --git a/packages/nc-gui/lang/vi.json b/packages/nc-gui/lang/vi.json index d5e54730472..a34c9fb658d 100644 --- a/packages/nc-gui/lang/vi.json +++ b/packages/nc-gui/lang/vi.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Source name is required", "changeWsName": "Change Workspace Name", "pressEnter": "Press Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "New form will be loaded after", "webhook": "Webhook", "multiField": { "newField": "New field", diff --git a/packages/nc-gui/lang/zh-Hans.json b/packages/nc-gui/lang/zh-Hans.json index 043c0863bcd..9782a3cd6aa 100644 --- a/packages/nc-gui/lang/zh-Hans.json +++ b/packages/nc-gui/lang/zh-Hans.json @@ -683,7 +683,7 @@ "sourceNameRequired": "必须填写源名称", "changeWsName": "更改工作区名称", "pressEnter": "按回车键", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "新表格将在", "webhook": "网络钩子", "multiField": { "newField": "新建字段", diff --git a/packages/nc-gui/lang/zh-Hant.json b/packages/nc-gui/lang/zh-Hant.json index c5ed92e4387..cb8bd0a06ea 100644 --- a/packages/nc-gui/lang/zh-Hant.json +++ b/packages/nc-gui/lang/zh-Hant.json @@ -683,7 +683,7 @@ "sourceNameRequired": "Source name is required", "changeWsName": "Change Workspace Name", "pressEnter": "Press Enter", - "newFormLoaded": "Loading new form in", + "newFormLoaded": "New form will be loaded after", "webhook": "Webhook", "multiField": { "newField": "New field", From 25afed4a2713a9e20393a09bae4c6eb357fe5ecf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 23 Mar 2024 12:27:14 +0800 Subject: [PATCH 5/8] chore(renovate): Update patch (#7937) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/nc-gui/package.json | 6 +- packages/nocodb/package.json | 12 +- pnpm-lock.yaml | 194 ++++++++++++++-------------- scripts/pkg-executable/package.json | 4 +- 4 files changed, 108 insertions(+), 108 deletions(-) diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json index 674f4381fb7..a2e967b283b 100644 --- a/packages/nc-gui/package.json +++ b/packages/nc-gui/package.json @@ -114,11 +114,11 @@ "@iconify-json/clarity": "^1.1.12", "@iconify-json/eva": "^1.1.10", "@iconify-json/ic": "^1.1.17", - "@iconify-json/ion": "^1.1.15", + "@iconify-json/ion": "^1.1.16", "@iconify-json/la": "^1.1.8", "@iconify-json/logos": "^1.1.42", - "@iconify-json/lucide": "^1.1.176", - "@iconify-json/material-symbols": "^1.1.75", + "@iconify-json/lucide": "^1.1.177", + "@iconify-json/material-symbols": "^1.1.76", "@iconify-json/mdi": "^1.1.64", "@iconify-json/mi": "^1.1.8", "@iconify-json/ph": "^1.1.11", diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json index 7a31cbd33e2..3574f68ce60 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -53,18 +53,18 @@ "@graphql-tools/merge": "^6.2.17", "@jm18457/kafkajs-msk-iam-authentication-mechanism": "^3.1.2", "@nestjs/bull": "^10.0.1", - "@nestjs/common": "^10.3.4", + "@nestjs/common": "^10.3.5", "@nestjs/config": "^3.1.1", - "@nestjs/core": "^10.3.4", + "@nestjs/core": "^10.3.5", "@nestjs/event-emitter": "^2.0.4", "@nestjs/jwt": "^10.2.0", "@nestjs/mapped-types": "^2.0.5", "@nestjs/passport": "^10.0.3", - "@nestjs/platform-express": "^10.3.4", - "@nestjs/platform-socket.io": "^10.3.4", + "@nestjs/platform-express": "^10.3.5", + "@nestjs/platform-socket.io": "^10.3.5", "@nestjs/serve-static": "^4.0.1", "@nestjs/throttler": "^5.1.2", - "@nestjs/websockets": "^10.3.4", + "@nestjs/websockets": "^10.3.5", "@ntegral/nestjs-sentry": "^4.0.1", "@sentry/node": "^6.19.7", "@techpass/passport-openidconnect": "^0.3.3", @@ -177,7 +177,7 @@ "devDependencies": { "@nestjs/cli": "^10.3.2", "@nestjs/schematics": "^10.1.1", - "@nestjs/testing": "^10.3.4", + "@nestjs/testing": "^10.3.5", "@nestjsplus/dyn-schematics": "^1.0.12", "@types/ejs": "^3.1.5", "@types/express": "^4.17.21", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2676c3449c0..f8fcf53696a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -266,8 +266,8 @@ importers: specifier: ^1.1.17 version: 1.1.17 '@iconify-json/ion': - specifier: ^1.1.15 - version: 1.1.15 + specifier: ^1.1.16 + version: 1.1.16 '@iconify-json/la': specifier: ^1.1.8 version: 1.1.8 @@ -275,11 +275,11 @@ importers: specifier: ^1.1.42 version: 1.1.42 '@iconify-json/lucide': - specifier: ^1.1.176 - version: 1.1.176 + specifier: ^1.1.177 + version: 1.1.177 '@iconify-json/material-symbols': - specifier: ^1.1.75 - version: 1.1.75 + specifier: ^1.1.76 + version: 1.1.76 '@iconify-json/mdi': specifier: ^1.1.64 version: 1.1.64 @@ -447,46 +447,46 @@ importers: version: 3.1.2 '@nestjs/bull': specifier: ^10.0.1 - version: 10.0.1(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(bull@4.12.2) + version: 10.0.1(@nestjs/common@10.3.5)(@nestjs/core@10.3.5)(bull@4.12.2) '@nestjs/common': - specifier: ^10.3.4 - version: 10.3.4(reflect-metadata@0.2.1)(rxjs@7.8.1) + specifier: ^10.3.5 + version: 10.3.5(reflect-metadata@0.2.1)(rxjs@7.8.1) '@nestjs/config': specifier: ^3.1.1 - version: 3.1.1(@nestjs/common@10.3.4)(reflect-metadata@0.2.1) + version: 3.1.1(@nestjs/common@10.3.5)(reflect-metadata@0.2.1) '@nestjs/core': - specifier: ^10.3.4 - version: 10.3.4(@nestjs/common@10.3.4)(@nestjs/platform-express@10.3.4)(@nestjs/websockets@10.3.4)(reflect-metadata@0.2.1)(rxjs@7.8.1) + specifier: ^10.3.5 + version: 10.3.5(@nestjs/common@10.3.5)(@nestjs/platform-express@10.3.5)(@nestjs/websockets@10.3.5)(reflect-metadata@0.2.1)(rxjs@7.8.1) '@nestjs/event-emitter': specifier: ^2.0.4 - version: 2.0.4(@nestjs/common@10.3.4)(@nestjs/core@10.3.4) + version: 2.0.4(@nestjs/common@10.3.5)(@nestjs/core@10.3.5) '@nestjs/jwt': specifier: ^10.2.0 - version: 10.2.0(@nestjs/common@10.3.4) + version: 10.2.0(@nestjs/common@10.3.5) '@nestjs/mapped-types': specifier: ^2.0.5 - version: 2.0.5(@nestjs/common@10.3.4)(reflect-metadata@0.2.1) + version: 2.0.5(@nestjs/common@10.3.5)(reflect-metadata@0.2.1) '@nestjs/passport': specifier: ^10.0.3 - version: 10.0.3(@nestjs/common@10.3.4)(passport@0.7.0) + version: 10.0.3(@nestjs/common@10.3.5)(passport@0.7.0) '@nestjs/platform-express': - specifier: ^10.3.4 - version: 10.3.4(@nestjs/common@10.3.4)(@nestjs/core@10.3.4) + specifier: ^10.3.5 + version: 10.3.5(@nestjs/common@10.3.5)(@nestjs/core@10.3.5) '@nestjs/platform-socket.io': - specifier: ^10.3.4 - version: 10.3.4(@nestjs/common@10.3.4)(@nestjs/websockets@10.3.4)(rxjs@7.8.1) + specifier: ^10.3.5 + version: 10.3.5(@nestjs/common@10.3.5)(@nestjs/websockets@10.3.5)(rxjs@7.8.1) '@nestjs/serve-static': specifier: ^4.0.1 - version: 4.0.1(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(express@4.18.3) + version: 4.0.1(@nestjs/common@10.3.5)(@nestjs/core@10.3.5)(express@4.18.3) '@nestjs/throttler': specifier: ^5.1.2 - version: 5.1.2(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(reflect-metadata@0.2.1) + version: 5.1.2(@nestjs/common@10.3.5)(@nestjs/core@10.3.5)(reflect-metadata@0.2.1) '@nestjs/websockets': - specifier: ^10.3.4 - version: 10.3.4(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(@nestjs/platform-socket.io@10.3.4)(reflect-metadata@0.2.1)(rxjs@7.8.1) + specifier: ^10.3.5 + version: 10.3.5(@nestjs/common@10.3.5)(@nestjs/core@10.3.5)(@nestjs/platform-socket.io@10.3.5)(reflect-metadata@0.2.1)(rxjs@7.8.1) '@ntegral/nestjs-sentry': specifier: ^4.0.1 - version: 4.0.1(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(@sentry/hub@7.103.0)(@sentry/node@6.19.7)(graphql@15.8.0)(reflect-metadata@0.2.1)(rimraf@3.0.2)(rxjs@7.8.1) + version: 4.0.1(@nestjs/common@10.3.5)(@nestjs/core@10.3.5)(@sentry/hub@7.103.0)(@sentry/node@6.19.7)(graphql@15.8.0)(reflect-metadata@0.2.1)(rimraf@3.0.2)(rxjs@7.8.1) '@sentry/node': specifier: ^6.19.7 version: 6.19.7 @@ -699,7 +699,7 @@ importers: version: 1.0.6(debug@4.3.4)(kafkajs@2.2.4)(reflect-metadata@0.2.1) nestjs-throttler-storage-redis: specifier: ^0.4.4 - version: 0.4.4(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(@nestjs/throttler@5.1.2)(ioredis@5.3.2)(reflect-metadata@0.2.1) + version: 0.4.4(@nestjs/common@10.3.5)(@nestjs/core@10.3.5)(@nestjs/throttler@5.1.2)(ioredis@5.3.2)(reflect-metadata@0.2.1) nocodb-sdk: specifier: workspace:^ version: link:../nocodb-sdk @@ -816,8 +816,8 @@ importers: specifier: ^10.1.1 version: 10.1.1(typescript@5.3.2) '@nestjs/testing': - specifier: ^10.3.4 - version: 10.3.4(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(@nestjs/platform-express@10.3.4) + specifier: ^10.3.5 + version: 10.3.5(@nestjs/common@10.3.5)(@nestjs/core@10.3.5)(@nestjs/platform-express@10.3.5) '@nestjsplus/dyn-schematics': specifier: ^1.0.12 version: 1.0.12 @@ -4572,8 +4572,8 @@ packages: '@iconify/types': 2.0.0 dev: true - /@iconify-json/ion@1.1.15: - resolution: {integrity: sha512-ouEW3wypJCwv9pB6b5k7f2cRMXKSCuxn23S1e9TjJLXXWCF45Juyjls5olrnSRNqYdZise7ZLSojgM8/2kaDtA==} + /@iconify-json/ion@1.1.16: + resolution: {integrity: sha512-UDI1ZfGoS2dN68yg0LzogEHdQdtG7aktFmExDZ67nvHRQLQqQK//SxsRKeEzJpXDhW9+ygOBPRy5LYvU73OsfA==} dependencies: '@iconify/types': 2.0.0 dev: true @@ -4590,14 +4590,14 @@ packages: '@iconify/types': 2.0.0 dev: true - /@iconify-json/lucide@1.1.176: - resolution: {integrity: sha512-qO2TsQ+9WhfJgdGaW5J1Is2OxpMjcx1C1E86caWftKXv2B6APSSlw4A8mXn/aOJLhYiv4adjYKNha71TD+FE/Q==} + /@iconify-json/lucide@1.1.177: + resolution: {integrity: sha512-SQbHei3LEBDR+7O8odUWWWncIovVfJ1oulG9+MaLysNU/7BwjsEuALnGPH3mIYS57mZ2MlLvPr5yj3TILTLU/Q==} dependencies: '@iconify/types': 2.0.0 dev: true - /@iconify-json/material-symbols@1.1.75: - resolution: {integrity: sha512-YMLagGENDw9QNoo4sPDoMX9wO20YptQ2FuTDCf/H/uRH4lGmD08C+z+kYwR4A90qyyo6hYG7yccPEiMOuLow5A==} + /@iconify-json/material-symbols@1.1.76: + resolution: {integrity: sha512-U3S0n2eENEZmAK+b+zvNBPxHySm7eo9bFQaKODlbrFyjNfaZVwpQMs7pZ3ZmeX9YLp0CtV8XqzmRb2YdhLJIkQ==} dependencies: '@iconify/types': 2.0.0 dev: true @@ -5558,27 +5558,27 @@ packages: dev: false optional: true - /@nestjs/bull-shared@10.0.1(@nestjs/common@10.3.4)(@nestjs/core@10.3.4): + /@nestjs/bull-shared@10.0.1(@nestjs/common@10.3.5)(@nestjs/core@10.3.5): resolution: {integrity: sha512-8Td36l2i5x9+iQWjPB5Bd5+6u5Eangb5DclNcwrdwKqvd28xE92MSW97P4JV52C2kxrTjZwx8ck/wObAwtpQPw==} peerDependencies: '@nestjs/common': ^8.0.0 || ^9.0.0 || ^10.0.0 '@nestjs/core': ^8.0.0 || ^9.0.0 || ^10.0.0 dependencies: - '@nestjs/common': 10.3.4(reflect-metadata@0.2.1)(rxjs@7.8.1) - '@nestjs/core': 10.3.4(@nestjs/common@10.3.4)(@nestjs/platform-express@10.3.4)(@nestjs/websockets@10.3.4)(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/common': 10.3.5(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/core': 10.3.5(@nestjs/common@10.3.5)(@nestjs/platform-express@10.3.5)(@nestjs/websockets@10.3.5)(reflect-metadata@0.2.1)(rxjs@7.8.1) tslib: 2.6.0 dev: false - /@nestjs/bull@10.0.1(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(bull@4.12.2): + /@nestjs/bull@10.0.1(@nestjs/common@10.3.5)(@nestjs/core@10.3.5)(bull@4.12.2): resolution: {integrity: sha512-1GcJ8BkHDgQdBMZ7SqAqgUHiFnISXmpGvewFeTc8wf87JLk2PweiKv9j9/KQKU+NI237pCe82XB0bXzTnsdxSw==} peerDependencies: '@nestjs/common': ^8.0.0 || ^9.0.0 || ^10.0.0 '@nestjs/core': ^8.0.0 || ^9.0.0 || ^10.0.0 bull: ^3.3 || ^4.0.0 dependencies: - '@nestjs/bull-shared': 10.0.1(@nestjs/common@10.3.4)(@nestjs/core@10.3.4) - '@nestjs/common': 10.3.4(reflect-metadata@0.2.1)(rxjs@7.8.1) - '@nestjs/core': 10.3.4(@nestjs/common@10.3.4)(@nestjs/platform-express@10.3.4)(@nestjs/websockets@10.3.4)(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/bull-shared': 10.0.1(@nestjs/common@10.3.5)(@nestjs/core@10.3.5) + '@nestjs/common': 10.3.5(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/core': 10.3.5(@nestjs/common@10.3.5)(@nestjs/platform-express@10.3.5)(@nestjs/websockets@10.3.5)(reflect-metadata@0.2.1)(rxjs@7.8.1) bull: 4.12.2 tslib: 2.6.0 dev: false @@ -5624,8 +5624,8 @@ packages: - webpack-cli dev: true - /@nestjs/common@10.3.4(reflect-metadata@0.2.1)(rxjs@7.8.1): - resolution: {integrity: sha512-HmehujZhUZjf9TN2o0TyzWYNwEgyRYqZZ5qIcF/mCgIUZ4olIKlazna0kGK56FGlCvviHWNKQM5eTuVeTstIgA==} + /@nestjs/common@10.3.5(reflect-metadata@0.2.1)(rxjs@7.8.1): + resolution: {integrity: sha512-XWxbDf2ey/jAyEa3/XpckgfzJZ9j3I05ZkEFx7cAlebFuVKeq5UDDb5Sq9O7hMmbH9xdQj3pYT19SSj01hKeug==} peerDependencies: class-transformer: '*' class-validator: '*' @@ -5669,13 +5669,13 @@ packages: - debug dev: false - /@nestjs/config@3.1.1(@nestjs/common@10.3.4)(reflect-metadata@0.2.1): + /@nestjs/config@3.1.1(@nestjs/common@10.3.5)(reflect-metadata@0.2.1): resolution: {integrity: sha512-qu5QlNiJdqQtOsnB6lx4JCXPQ96jkKUsOGd+JXfXwqJqZcOSAq6heNFg0opW4pq4J/VZoNwoo87TNnx9wthnqQ==} peerDependencies: '@nestjs/common': ^8.0.0 || ^9.0.0 || ^10.0.0 reflect-metadata: ^0.1.13 dependencies: - '@nestjs/common': 10.3.4(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/common': 10.3.5(reflect-metadata@0.2.1)(rxjs@7.8.1) dotenv: 16.3.1 dotenv-expand: 10.0.0 lodash: 4.17.21 @@ -5683,8 +5683,8 @@ packages: uuid: 9.0.0 dev: false - /@nestjs/core@10.3.4(@nestjs/common@10.3.4)(@nestjs/platform-express@10.3.4)(@nestjs/websockets@10.3.4)(reflect-metadata@0.2.1)(rxjs@7.8.1): - resolution: {integrity: sha512-rF0yebuHmMj+9/CkbjPWWMvlF5x8j5Biw2DRvbl8R8n2X3OdFBN+06x/9xm3/ZssR5tLoB9tsYspFUb+SvnnwA==} + /@nestjs/core@10.3.5(@nestjs/common@10.3.5)(@nestjs/platform-express@10.3.5)(@nestjs/websockets@10.3.5)(reflect-metadata@0.2.1)(rxjs@7.8.1): + resolution: {integrity: sha512-U7SrGD9/Mu4eUtxfZYiGdY38FcksEyJegs4dQZ8B19nnusw0aTocPEy4HVsmx0LLO4sG+fBLLYzCDDr9kFwXAQ==} requiresBuild: true peerDependencies: '@nestjs/common': ^10.0.0 @@ -5701,9 +5701,9 @@ packages: '@nestjs/websockets': optional: true dependencies: - '@nestjs/common': 10.3.4(reflect-metadata@0.2.1)(rxjs@7.8.1) - '@nestjs/platform-express': 10.3.4(@nestjs/common@10.3.4)(@nestjs/core@10.3.4) - '@nestjs/websockets': 10.3.4(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(@nestjs/platform-socket.io@10.3.4)(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/common': 10.3.5(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/platform-express': 10.3.5(@nestjs/common@10.3.5)(@nestjs/core@10.3.5) + '@nestjs/websockets': 10.3.5(@nestjs/common@10.3.5)(@nestjs/core@10.3.5)(@nestjs/platform-socket.io@10.3.5)(reflect-metadata@0.2.1)(rxjs@7.8.1) '@nuxtjs/opencollective': 0.3.2 fast-safe-stringify: 2.1.1 iterare: 1.2.1 @@ -5715,18 +5715,18 @@ packages: transitivePeerDependencies: - encoding - /@nestjs/event-emitter@2.0.4(@nestjs/common@10.3.4)(@nestjs/core@10.3.4): + /@nestjs/event-emitter@2.0.4(@nestjs/common@10.3.5)(@nestjs/core@10.3.5): resolution: {integrity: sha512-quMiw8yOwoSul0pp3mOonGz8EyXWHSBTqBy8B0TbYYgpnG1Ix2wGUnuTksLWaaBiiOTDhciaZ41Y5fJZsSJE1Q==} peerDependencies: '@nestjs/common': ^8.0.0 || ^9.0.0 || ^10.0.0 '@nestjs/core': ^8.0.0 || ^9.0.0 || ^10.0.0 dependencies: - '@nestjs/common': 10.3.4(reflect-metadata@0.2.1)(rxjs@7.8.1) - '@nestjs/core': 10.3.4(@nestjs/common@10.3.4)(@nestjs/platform-express@10.3.4)(@nestjs/websockets@10.3.4)(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/common': 10.3.5(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/core': 10.3.5(@nestjs/common@10.3.5)(@nestjs/platform-express@10.3.5)(@nestjs/websockets@10.3.5)(reflect-metadata@0.2.1)(rxjs@7.8.1) eventemitter2: 6.4.9 dev: false - /@nestjs/graphql@12.0.11(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(graphql@15.8.0)(reflect-metadata@0.2.1): + /@nestjs/graphql@12.0.11(@nestjs/common@10.3.5)(@nestjs/core@10.3.5)(graphql@15.8.0)(reflect-metadata@0.2.1): resolution: {integrity: sha512-iCyVs9+utCQt9ehMhUjQcEdjRN/MrcTBINd7P44O1fzGENuWMbt1Z8RCoZbeGi5iVPBY63HgYik+BnnICqmxZw==} requiresBuild: true peerDependencies: @@ -5751,9 +5751,9 @@ packages: '@graphql-tools/merge': 9.0.0(graphql@15.8.0) '@graphql-tools/schema': 10.0.0(graphql@15.8.0) '@graphql-tools/utils': 10.0.8(graphql@15.8.0) - '@nestjs/common': 10.3.4(reflect-metadata@0.2.1)(rxjs@7.8.1) - '@nestjs/core': 10.3.4(@nestjs/common@10.3.4)(@nestjs/platform-express@10.3.4)(@nestjs/websockets@10.3.4)(reflect-metadata@0.2.1)(rxjs@7.8.1) - '@nestjs/mapped-types': 2.0.2(@nestjs/common@10.3.4)(reflect-metadata@0.2.1) + '@nestjs/common': 10.3.5(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/core': 10.3.5(@nestjs/common@10.3.5)(@nestjs/platform-express@10.3.5)(@nestjs/websockets@10.3.5)(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/mapped-types': 2.0.2(@nestjs/common@10.3.5)(reflect-metadata@0.2.1) chokidar: 3.5.3 fast-glob: 3.3.2 graphql: 15.8.0 @@ -5772,17 +5772,17 @@ packages: dev: false optional: true - /@nestjs/jwt@10.2.0(@nestjs/common@10.3.4): + /@nestjs/jwt@10.2.0(@nestjs/common@10.3.5): resolution: {integrity: sha512-x8cG90SURkEiLOehNaN2aRlotxT0KZESUliOPKKnjWiyJOcWurkF3w345WOX0P4MgFzUjGoZ1Sy0aZnxeihT0g==} peerDependencies: '@nestjs/common': ^8.0.0 || ^9.0.0 || ^10.0.0 dependencies: - '@nestjs/common': 10.3.4(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/common': 10.3.5(reflect-metadata@0.2.1)(rxjs@7.8.1) '@types/jsonwebtoken': 9.0.5 jsonwebtoken: 9.0.2 dev: false - /@nestjs/mapped-types@2.0.2(@nestjs/common@10.3.4)(reflect-metadata@0.2.1): + /@nestjs/mapped-types@2.0.2(@nestjs/common@10.3.5)(reflect-metadata@0.2.1): resolution: {integrity: sha512-V0izw6tWs6fTp9+KiiPUbGHWALy563Frn8X6Bm87ANLRuE46iuBMD5acKBDP5lKL/75QFvrzSJT7HkCbB0jTpg==} requiresBuild: true peerDependencies: @@ -5796,12 +5796,12 @@ packages: class-validator: optional: true dependencies: - '@nestjs/common': 10.3.4(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/common': 10.3.5(reflect-metadata@0.2.1)(rxjs@7.8.1) reflect-metadata: 0.2.1 dev: false optional: true - /@nestjs/mapped-types@2.0.5(@nestjs/common@10.3.4)(reflect-metadata@0.2.1): + /@nestjs/mapped-types@2.0.5(@nestjs/common@10.3.5)(reflect-metadata@0.2.1): resolution: {integrity: sha512-bSJv4pd6EY99NX9CjBIyn4TVDoSit82DUZlL4I3bqNfy5Gt+gXTa86i3I/i0iIV9P4hntcGM5GyO+FhZAhxtyg==} peerDependencies: '@nestjs/common': ^8.0.0 || ^9.0.0 || ^10.0.0 @@ -5814,28 +5814,28 @@ packages: class-validator: optional: true dependencies: - '@nestjs/common': 10.3.4(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/common': 10.3.5(reflect-metadata@0.2.1)(rxjs@7.8.1) reflect-metadata: 0.2.1 dev: false - /@nestjs/passport@10.0.3(@nestjs/common@10.3.4)(passport@0.7.0): + /@nestjs/passport@10.0.3(@nestjs/common@10.3.5)(passport@0.7.0): resolution: {integrity: sha512-znJ9Y4S8ZDVY+j4doWAJ8EuuVO7SkQN3yOBmzxbGaXbvcSwFDAdGJ+OMCg52NdzIO4tQoN4pYKx8W6M0ArfFRQ==} peerDependencies: '@nestjs/common': ^8.0.0 || ^9.0.0 || ^10.0.0 passport: ^0.4.0 || ^0.5.0 || ^0.6.0 || ^0.7.0 dependencies: - '@nestjs/common': 10.3.4(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/common': 10.3.5(reflect-metadata@0.2.1)(rxjs@7.8.1) passport: 0.7.0 dev: false - /@nestjs/platform-express@10.3.4(@nestjs/common@10.3.4)(@nestjs/core@10.3.4): - resolution: {integrity: sha512-rzUUUZCGYNs/viT9I6W5izJ1+oYCG0ym/dAn31NmYJW9UchxJdX5PCJqWF8iIbys6JgfbdcapMR5t+L7OZsasQ==} + /@nestjs/platform-express@10.3.5(@nestjs/common@10.3.5)(@nestjs/core@10.3.5): + resolution: {integrity: sha512-IhVomwLvdLlv4zCdQK2ROT/nInk1i8m4K48lAUHJV5UVktgVmg0WbQga2/9KywaTjNbx+eWhZXXFii+vtFRAOw==} peerDependencies: '@nestjs/common': ^10.0.0 '@nestjs/core': ^10.0.0 dependencies: - '@nestjs/common': 10.3.4(reflect-metadata@0.2.1)(rxjs@7.8.1) - '@nestjs/core': 10.3.4(@nestjs/common@10.3.4)(@nestjs/platform-express@10.3.4)(@nestjs/websockets@10.3.4)(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/common': 10.3.5(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/core': 10.3.5(@nestjs/common@10.3.5)(@nestjs/platform-express@10.3.5)(@nestjs/websockets@10.3.5)(reflect-metadata@0.2.1)(rxjs@7.8.1) body-parser: 1.20.2 cors: 2.8.5 express: 4.18.3 @@ -5844,15 +5844,15 @@ packages: transitivePeerDependencies: - supports-color - /@nestjs/platform-socket.io@10.3.4(@nestjs/common@10.3.4)(@nestjs/websockets@10.3.4)(rxjs@7.8.1): - resolution: {integrity: sha512-HiL7FbLQBanf8ORxQDpub8wdkRJmXHj8vmExDJ+lD1/E2ChrJbBgRDaKWI7QcSzPKF1uS8VVwz3w0zn3F/EDtA==} + /@nestjs/platform-socket.io@10.3.5(@nestjs/common@10.3.5)(@nestjs/websockets@10.3.5)(rxjs@7.8.1): + resolution: {integrity: sha512-G2N3sTd9tZ7XQQ7RlrpaQdt1/IBztVHuKg686QmBTLVlRHZ1AMOmXouBk+q5SINT1XURiABa8tQh1Ydx0OEh9w==} peerDependencies: '@nestjs/common': ^10.0.0 '@nestjs/websockets': ^10.0.0 rxjs: ^7.1.0 dependencies: - '@nestjs/common': 10.3.4(reflect-metadata@0.2.1)(rxjs@7.8.1) - '@nestjs/websockets': 10.3.4(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(@nestjs/platform-socket.io@10.3.4)(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/common': 10.3.5(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/websockets': 10.3.5(@nestjs/common@10.3.5)(@nestjs/core@10.3.5)(@nestjs/platform-socket.io@10.3.5)(reflect-metadata@0.2.1)(rxjs@7.8.1) rxjs: 7.8.1 socket.io: 4.7.5 tslib: 2.6.2 @@ -5891,7 +5891,7 @@ packages: - chokidar dev: true - /@nestjs/serve-static@4.0.1(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(express@4.18.3): + /@nestjs/serve-static@4.0.1(@nestjs/common@10.3.5)(@nestjs/core@10.3.5)(express@4.18.3): resolution: {integrity: sha512-AoOrVdAe+WmsceuCcA8nWmKUYmaOsg9pqBCbIj7PS4W3XdikJQMtfxgSIoOlyUksZdhTBFjHqKh0Yhpj6pulwQ==} peerDependencies: '@fastify/static': ^6.5.0 @@ -5907,14 +5907,14 @@ packages: fastify: optional: true dependencies: - '@nestjs/common': 10.3.4(reflect-metadata@0.2.1)(rxjs@7.8.1) - '@nestjs/core': 10.3.4(@nestjs/common@10.3.4)(@nestjs/platform-express@10.3.4)(@nestjs/websockets@10.3.4)(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/common': 10.3.5(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/core': 10.3.5(@nestjs/common@10.3.5)(@nestjs/platform-express@10.3.5)(@nestjs/websockets@10.3.5)(reflect-metadata@0.2.1)(rxjs@7.8.1) express: 4.18.3 path-to-regexp: 0.2.5 dev: false - /@nestjs/testing@10.3.4(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(@nestjs/platform-express@10.3.4): - resolution: {integrity: sha512-g3NQnRUFBcYF+ySkB7INg5RiV7CNfkP5zwaf3NFo0WjhBrfih9f1jMZ/19blLZ4djN/ngulYks2E3lzROAW8RQ==} + /@nestjs/testing@10.3.5(@nestjs/common@10.3.5)(@nestjs/core@10.3.5)(@nestjs/platform-express@10.3.5): + resolution: {integrity: sha512-j30/lxH0BayeDTigapYtQn/XhMRR7CzlFsm3dHoWViWQv0qT1r2ffe3927BbBLX3N/ZzglE10OAqW06ADZV8dw==} peerDependencies: '@nestjs/common': ^10.0.0 '@nestjs/core': ^10.0.0 @@ -5926,26 +5926,26 @@ packages: '@nestjs/platform-express': optional: true dependencies: - '@nestjs/common': 10.3.4(reflect-metadata@0.2.1)(rxjs@7.8.1) - '@nestjs/core': 10.3.4(@nestjs/common@10.3.4)(@nestjs/platform-express@10.3.4)(@nestjs/websockets@10.3.4)(reflect-metadata@0.2.1)(rxjs@7.8.1) - '@nestjs/platform-express': 10.3.4(@nestjs/common@10.3.4)(@nestjs/core@10.3.4) + '@nestjs/common': 10.3.5(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/core': 10.3.5(@nestjs/common@10.3.5)(@nestjs/platform-express@10.3.5)(@nestjs/websockets@10.3.5)(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/platform-express': 10.3.5(@nestjs/common@10.3.5)(@nestjs/core@10.3.5) tslib: 2.6.2 dev: true - /@nestjs/throttler@5.1.2(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(reflect-metadata@0.2.1): + /@nestjs/throttler@5.1.2(@nestjs/common@10.3.5)(@nestjs/core@10.3.5)(reflect-metadata@0.2.1): resolution: {integrity: sha512-60MqhSLYUqWOgc38P6C6f76JIpf6mVjly7gpuPBCKtVd0p5e8Fq855j7bJuO4/v25vgaOo1OdVs0U1qtgYioGw==} peerDependencies: '@nestjs/common': ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0 '@nestjs/core': ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0 reflect-metadata: ^0.1.13 || ^0.2.0 dependencies: - '@nestjs/common': 10.3.4(reflect-metadata@0.2.1)(rxjs@7.8.1) - '@nestjs/core': 10.3.4(@nestjs/common@10.3.4)(@nestjs/platform-express@10.3.4)(@nestjs/websockets@10.3.4)(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/common': 10.3.5(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/core': 10.3.5(@nestjs/common@10.3.5)(@nestjs/platform-express@10.3.5)(@nestjs/websockets@10.3.5)(reflect-metadata@0.2.1)(rxjs@7.8.1) reflect-metadata: 0.2.1 dev: false - /@nestjs/websockets@10.3.4(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(@nestjs/platform-socket.io@10.3.4)(reflect-metadata@0.2.1)(rxjs@7.8.1): - resolution: {integrity: sha512-ZGDY8t1bBYzY2xbOe2QOxYG+D6W1mALSS3VD/rcVW34oaysF4iQQEr4t2ktYLbPAuZlEvwM5EhutqCkBUsDw7Q==} + /@nestjs/websockets@10.3.5(@nestjs/common@10.3.5)(@nestjs/core@10.3.5)(@nestjs/platform-socket.io@10.3.5)(reflect-metadata@0.2.1)(rxjs@7.8.1): + resolution: {integrity: sha512-6w383LUBFHoZ0eFODqEHN2NoIRUwbTd37Hc1KqtZZihhFUzscC/0LMAV20o9LdfS/Xjog5ShNTxvOHuzNBnE4A==} peerDependencies: '@nestjs/common': ^10.0.0 '@nestjs/core': ^10.0.0 @@ -5956,9 +5956,9 @@ packages: '@nestjs/platform-socket.io': optional: true dependencies: - '@nestjs/common': 10.3.4(reflect-metadata@0.2.1)(rxjs@7.8.1) - '@nestjs/core': 10.3.4(@nestjs/common@10.3.4)(@nestjs/platform-express@10.3.4)(@nestjs/websockets@10.3.4)(reflect-metadata@0.2.1)(rxjs@7.8.1) - '@nestjs/platform-socket.io': 10.3.4(@nestjs/common@10.3.4)(@nestjs/websockets@10.3.4)(rxjs@7.8.1) + '@nestjs/common': 10.3.5(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/core': 10.3.5(@nestjs/common@10.3.5)(@nestjs/platform-express@10.3.5)(@nestjs/websockets@10.3.5)(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/platform-socket.io': 10.3.5(@nestjs/common@10.3.5)(@nestjs/websockets@10.3.5)(rxjs@7.8.1) iterare: 1.2.1 object-hash: 3.0.0 reflect-metadata: 0.2.1 @@ -6157,7 +6157,7 @@ packages: - debug dev: true - /@ntegral/nestjs-sentry@4.0.1(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(@sentry/hub@7.103.0)(@sentry/node@6.19.7)(graphql@15.8.0)(reflect-metadata@0.2.1)(rimraf@3.0.2)(rxjs@7.8.1): + /@ntegral/nestjs-sentry@4.0.1(@nestjs/common@10.3.5)(@nestjs/core@10.3.5)(@sentry/hub@7.103.0)(@sentry/node@6.19.7)(graphql@15.8.0)(reflect-metadata@0.2.1)(rimraf@3.0.2)(rxjs@7.8.1): resolution: {integrity: sha512-GQUL0Bm0T+FhTNJXUbnF5mZc2u5YuvUV2H6naXxrnw8tY0b9eE/DGj+GUyHNL7V2DuHHFzsYP2c30O5FoGoYfQ==} peerDependencies: '@nestjs/common': '>=10.0.0' @@ -6168,15 +6168,15 @@ packages: rimraf: ^3.0.2 rxjs: ^7.2.0 dependencies: - '@nestjs/common': 10.3.4(reflect-metadata@0.2.1)(rxjs@7.8.1) - '@nestjs/core': 10.3.4(@nestjs/common@10.3.4)(@nestjs/platform-express@10.3.4)(@nestjs/websockets@10.3.4)(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/common': 10.3.5(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/core': 10.3.5(@nestjs/common@10.3.5)(@nestjs/platform-express@10.3.5)(@nestjs/websockets@10.3.5)(reflect-metadata@0.2.1)(rxjs@7.8.1) '@sentry/hub': 7.103.0 '@sentry/node': 6.19.7 reflect-metadata: 0.2.1 rimraf: 3.0.2 rxjs: 7.8.1 optionalDependencies: - '@nestjs/graphql': 12.0.11(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(graphql@15.8.0)(reflect-metadata@0.2.1) + '@nestjs/graphql': 12.0.11(@nestjs/common@10.3.5)(@nestjs/core@10.3.5)(graphql@15.8.0)(reflect-metadata@0.2.1) transitivePeerDependencies: - '@apollo/subgraph' - bufferutil @@ -20297,7 +20297,7 @@ packages: - reflect-metadata dev: false - /nestjs-throttler-storage-redis@0.4.4(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(@nestjs/throttler@5.1.2)(ioredis@5.3.2)(reflect-metadata@0.2.1): + /nestjs-throttler-storage-redis@0.4.4(@nestjs/common@10.3.5)(@nestjs/core@10.3.5)(@nestjs/throttler@5.1.2)(ioredis@5.3.2)(reflect-metadata@0.2.1): resolution: {integrity: sha512-QLYfsat/qutHQaTn3QAoa79WEHG4Uyk8rWRqNhVCVxzQ+qdzaNBUlBwxb8MYhfCmgoCA+eX3Paws8FZI/bYe7A==} peerDependencies: '@nestjs/common': ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0 @@ -20306,9 +20306,9 @@ packages: ioredis: '>=5.0.0' reflect-metadata: ^0.2.1 dependencies: - '@nestjs/common': 10.3.4(reflect-metadata@0.2.1)(rxjs@7.8.1) - '@nestjs/core': 10.3.4(@nestjs/common@10.3.4)(@nestjs/platform-express@10.3.4)(@nestjs/websockets@10.3.4)(reflect-metadata@0.2.1)(rxjs@7.8.1) - '@nestjs/throttler': 5.1.2(@nestjs/common@10.3.4)(@nestjs/core@10.3.4)(reflect-metadata@0.2.1) + '@nestjs/common': 10.3.5(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/core': 10.3.5(@nestjs/common@10.3.5)(@nestjs/platform-express@10.3.5)(@nestjs/websockets@10.3.5)(reflect-metadata@0.2.1)(rxjs@7.8.1) + '@nestjs/throttler': 5.1.2(@nestjs/common@10.3.5)(@nestjs/core@10.3.5)(reflect-metadata@0.2.1) ioredis: 5.3.2 reflect-metadata: 0.2.1 dev: false diff --git a/scripts/pkg-executable/package.json b/scripts/pkg-executable/package.json index c1e70117383..995b25b5aa6 100644 --- a/scripts/pkg-executable/package.json +++ b/scripts/pkg-executable/package.json @@ -27,8 +27,8 @@ "author": "", "license": "ISC", "dependencies": { - "@nestjs/common": "^10.3.4", - "@nestjs/core": "^10.3.4", + "@nestjs/common": "^10.3.5", + "@nestjs/core": "^10.3.5", "express": "^4.18.3", "nocodb": "0.204.8" }, From caf7160e7d3e1c09f452447f19fbb0fbfe344a3d Mon Sep 17 00:00:00 2001 From: Pranav C Date: Sat, 23 Mar 2024 12:19:29 +0530 Subject: [PATCH 6/8] fix: use column title as alias in bulk insert return statement Signed-off-by: Pranav C --- packages/nocodb/src/db/BaseModelSqlv2.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts index ed998012e5e..68987c6256d 100644 --- a/packages/nocodb/src/db/BaseModelSqlv2.ts +++ b/packages/nocodb/src/db/BaseModelSqlv2.ts @@ -3582,11 +3582,11 @@ class BaseModelSqlv2 { ); } } else { - const returningArr: string[] = []; + const returningObj: Record = {}; if (!raw) { for (const col of this.model.primaryKeys) { - returningArr.push(col.column_name); + returningObj[col.title] = col.column_name; } } @@ -3594,7 +3594,7 @@ class BaseModelSqlv2 { !raw && (this.isPg || this.isMssql) ? await trx .batchInsert(this.tnPath, insertDatas, chunkSize) - .returning(this.model.primaryKeys?.length ? returningArr : '*') + .returning(this.model.primaryKeys?.length ? returningObj : '*') : await trx.batchInsert(this.tnPath, insertDatas, chunkSize); } @@ -6622,7 +6622,12 @@ export function extractCondition( if (aliasColObjMap[alias]) { if ( - [UITypes.Date, UITypes.DateTime, UITypes.LastModifiedTime, UITypes.CreatedTime].includes(aliasColObjMap[alias].uidt) + [ + UITypes.Date, + UITypes.DateTime, + UITypes.LastModifiedTime, + UITypes.CreatedTime, + ].includes(aliasColObjMap[alias].uidt) ) { value = value?.split(','); // the first element would be sub_op From e4af50e1dec63005142c7e325d7f7aa7d20ccc9c Mon Sep 17 00:00:00 2001 From: mertmit Date: Sat, 23 Mar 2024 13:54:18 +0300 Subject: [PATCH 7/8] chore: change logic for branch name and add a comment Signed-off-by: mertmit --- .github/workflows/sync-to-develop.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sync-to-develop.yml b/.github/workflows/sync-to-develop.yml index 2b7c4b3707f..2f95378921d 100644 --- a/.github/workflows/sync-to-develop.yml +++ b/.github/workflows/sync-to-develop.yml @@ -33,7 +33,8 @@ jobs: cd nocodb git fetch --quiet --unshallow origin git checkout master - BRANCH_NAME=oss/$(git rev-list -n 3 HEAD | tail -1 | cut -c1-8) + : # Use the first 8 characters of the latest commit hash as the branch name + BRANCH_NAME=nc/$(git rev-list -n 1 HEAD | cut -c1-8) git checkout -b $BRANCH_NAME git config user.name 'github-actions[bot]' git config user.email 'github-actions[bot]@users.noreply.github.com' From 74b351483b49001953da8518c0acfbb59445383a Mon Sep 17 00:00:00 2001 From: Pranav C Date: Sat, 23 Mar 2024 18:10:34 +0530 Subject: [PATCH 8/8] refactor: type correction Signed-off-by: Pranav C --- packages/nocodb/src/db/BaseModelSqlv2.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts index 68987c6256d..ef874ea2802 100644 --- a/packages/nocodb/src/db/BaseModelSqlv2.ts +++ b/packages/nocodb/src/db/BaseModelSqlv2.ts @@ -3582,7 +3582,7 @@ class BaseModelSqlv2 { ); } } else { - const returningObj: Record = {}; + const returningObj: Record = {}; if (!raw) { for (const col of this.model.primaryKeys) {