From de53dc0e17288dbf9040ed0b80fdb6ae05fd7b27 Mon Sep 17 00:00:00 2001 From: pranavxc Date: Sat, 18 May 2024 07:37:39 +0000 Subject: [PATCH 1/8] [create-pull-request] automated change Signed-off-by: GitHub --- packages/nc-gui/package.json | 2 +- packages/nc-lib-gui/package.json | 2 +- packages/nocodb-sdk/package.json | 2 +- packages/nocodb-sdk/pnpm-lock.yaml | 26 +++++++++++++------------- packages/nocodb/package.json | 8 ++++---- pnpm-lock.yaml | 12 ++++++------ 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json index d656225251..e174658513 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": "workspace:^", + "nocodb-sdk": "0.207.2", "papaparse": "^5.4.1", "parse-github-url": "^1.0.2", "pinia": "^2.1.7", diff --git a/packages/nc-lib-gui/package.json b/packages/nc-lib-gui/package.json index 75b979955a..28eccf723d 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.207.1", + "version": "0.207.2", "description": "NocoDB GUI", "author": { "name": "NocoDB", diff --git a/packages/nocodb-sdk/package.json b/packages/nocodb-sdk/package.json index 2764fdff89..0c2a5be9f7 100644 --- a/packages/nocodb-sdk/package.json +++ b/packages/nocodb-sdk/package.json @@ -1,6 +1,6 @@ { "name": "nocodb-sdk", - "version": "0.207.1", + "version": "0.207.2", "description": "NocoDB SDK", "main": "build/main/index.js", "typings": "build/main/index.d.ts", diff --git a/packages/nocodb-sdk/pnpm-lock.yaml b/packages/nocodb-sdk/pnpm-lock.yaml index 5f2a0a9f6d..57724a454a 100644 --- a/packages/nocodb-sdk/pnpm-lock.yaml +++ b/packages/nocodb-sdk/pnpm-lock.yaml @@ -9,8 +9,8 @@ dependencies: specifier: ^1.6.8 version: 1.6.8 dayjs: - specifier: ^1.11.10 - version: 1.11.10 + specifier: ^1.11.11 + version: 1.11.11 jsep: specifier: ^1.3.8 version: 1.3.8 @@ -53,14 +53,14 @@ devDependencies: specifier: ^2.8.8 version: 2.8.8 rimraf: - specifier: ^5.0.5 - version: 5.0.5 + specifier: ^5.0.7 + version: 5.0.7 ts-jest: specifier: ^29.1.2 version: 29.1.2(@babel/core@7.23.6)(jest@29.7.0)(typescript@5.3.3) tsc-alias: - specifier: ^1.8.8 - version: 1.8.8 + specifier: ^1.8.10 + version: 1.8.10 typescript: specifier: ^5.3.3 version: 5.3.3 @@ -1830,8 +1830,8 @@ packages: minimatch: 3.1.2 dev: true - /dayjs@1.11.10: - resolution: {integrity: sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==} + /dayjs@1.11.11: + resolution: {integrity: sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==} dev: false /debug@3.2.7: @@ -4056,9 +4056,9 @@ packages: glob: 7.2.3 dev: true - /rimraf@5.0.5: - resolution: {integrity: sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==} - engines: {node: '>=14'} + /rimraf@5.0.7: + resolution: {integrity: sha512-nV6YcJo5wbLW77m+8KjH8aB/7/rxQy9SZ0HY5shnwULfS+9nmTtVXAJET5NdZmCzA4fPI/Hm1wo/Po/4mopOdg==} + engines: {node: '>=14.18'} hasBin: true dependencies: glob: 10.3.10 @@ -4420,8 +4420,8 @@ packages: yargs-parser: 21.1.1 dev: true - /tsc-alias@1.8.8: - resolution: {integrity: sha512-OYUOd2wl0H858NvABWr/BoSKNERw3N9GTi3rHPK8Iv4O1UyUXIrTTOAZNHsjlVpXFOhpJBVARI1s+rzwLivN3Q==} + /tsc-alias@1.8.10: + resolution: {integrity: sha512-Ibv4KAWfFkFdKJxnWfVtdOmB0Zi1RJVxcbPGiCDsFpCQSsmpWyuzHG3rQyI5YkobWwxFPEyQfu1hdo4qLG2zPw==} hasBin: true dependencies: chokidar: 3.5.3 diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json index 58d8a40d8c..7c9f700177 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -1,6 +1,6 @@ { "name": "nocodb", - "version": "0.207.1", + "version": "0.207.2", "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.207.1", + "nc-lib-gui": "0.207.2", "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.207.2", "nodemailer": "^6.9.13", "object-hash": "^3.0.0", "object-sizeof": "^2.6.4", @@ -229,4 +229,4 @@ "coverageDirectory": "../coverage", "testEnvironment": "node" } -} +} \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b463a0b483..f572fb32cc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -155,7 +155,7 @@ importers: specifier: ^0.11.0 version: 0.11.0 nocodb-sdk: - specifier: workspace:^ + specifier: 0.207.2 version: link:../nocodb-sdk papaparse: specifier: ^5.4.1 @@ -687,8 +687,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.207.1 - version: 0.207.1 + specifier: 0.207.2 + version: 0.207.2 nc-plugin: specifier: ^0.1.3 version: 0.1.3 @@ -702,7 +702,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.207.2 version: link:../nocodb-sdk nodemailer: specifier: ^6.9.13 @@ -20953,8 +20953,8 @@ packages: - supports-color dev: false - /nc-lib-gui@0.207.1: - resolution: {integrity: sha512-EY3HycJ9/2AE4cnE82P7mkhqrFpexXYFv41kwwZL8LDNSeX/7KqR3qveVs0zFygSp02kv67cqWG025MPqH33lg==} + /nc-lib-gui@0.207.2: + resolution: {integrity: sha512-+/u+N7/vPvcUBs7BN6WM2H2hKxhOta0KKZ75mFyZhb4D/p8Y2SMlCQDAqpkR3lsH0DZaTlKqjGKeYPFtmRw0Ug==} dependencies: express: 4.19.2 transitivePeerDependencies: From 7191a4c58edd33ff5e3f3365a854bf8162fd3293 Mon Sep 17 00:00:00 2001 From: mertmit Date: Thu, 23 May 2024 15:36:27 +0300 Subject: [PATCH 2/8] chore: sync to develop action Signed-off-by: mertmit --- .github/workflows/sync-to-develop.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/sync-to-develop.yml b/.github/workflows/sync-to-develop.yml index c0a4db783e..71aa5b2a3b 100644 --- a/.github/workflows/sync-to-develop.yml +++ b/.github/workflows/sync-to-develop.yml @@ -37,6 +37,8 @@ jobs: cd nocodb git fetch --quiet --unshallow origin git checkout master + # reset to origin/master + git reset --hard origin/master : # 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 From 40a8256edbec54b601142d3f03f222fb840e6a3e Mon Sep 17 00:00:00 2001 From: mertmit Date: Thu, 23 May 2024 15:45:50 +0300 Subject: [PATCH 3/8] chore: order of master to develop action Signed-off-by: mertmit --- .github/workflows/release-nocodb.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-nocodb.yml b/.github/workflows/release-nocodb.yml index e907d9bdcd..b393cb9e34 100644 --- a/.github/workflows/release-nocodb.yml +++ b/.github/workflows/release-nocodb.yml @@ -59,6 +59,11 @@ jobs: with: tag: ${{ needs.process-input.outputs.target_tag }} targetEnv: ${{ github.event.inputs.targetEnv || 'PROD' }} + + # Create a PR to sync changes back to develop branch from master + sync-to-develop: + needs: [pr-to-master, process-input] + uses: ./.github/workflows/sync-to-develop.yml # Build, install, publish frontend and backend to npm release-npm: @@ -116,8 +121,3 @@ jobs: uses: ./.github/workflows/publish-docs.yml secrets: GH_TOKEN: "${{ secrets.GH_TOKEN }}" - - # Sync changes to develop - sync-to-develop: - needs: publish-docs - uses: ./.github/workflows/sync-to-develop.yml From 1db6c3ef8b85fb004e919cf0afa52dd75044a112 Mon Sep 17 00:00:00 2001 From: pranavxc Date: Wed, 29 May 2024 06:27:51 +0000 Subject: [PATCH 4/8] [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 | 68 ++++++++++++++------------------ 6 files changed, 36 insertions(+), 46 deletions(-) diff --git a/packages/nc-gui/components.d.ts b/packages/nc-gui/components.d.ts index ae772bdf0f..ba1e4a0fa4 100644 --- a/packages/nc-gui/components.d.ts +++ b/packages/nc-gui/components.d.ts @@ -23,7 +23,6 @@ declare module 'vue' { ACollapse: typeof import('ant-design-vue/es')['Collapse'] ACollapsePanel: typeof import('ant-design-vue/es')['CollapsePanel'] AConfigProvider: typeof import('ant-design-vue/es')['ConfigProvider'] - ADatePicker: typeof import('ant-design-vue/es')['DatePicker'] ADivider: typeof import('ant-design-vue/es')['Divider'] ADropdown: typeof import('ant-design-vue/es')['Dropdown'] ADropdownButton: typeof import('ant-design-vue/es')['DropdownButton'] @@ -69,7 +68,6 @@ declare module 'vue' { ATextarea: typeof import('ant-design-vue/es')['Textarea'] ATimeline: typeof import('ant-design-vue/es')['Timeline'] ATimelineItem: typeof import('ant-design-vue/es')['TimelineItem'] - ATimePicker: typeof import('ant-design-vue/es')['TimePicker'] ATooltip: typeof import('ant-design-vue/es')['Tooltip'] ATree: typeof import('ant-design-vue/es')['Tree'] ATypographyTitle: typeof import('ant-design-vue/es')['TypographyTitle'] diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json index fe341a7663..f8aeb680d9 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.207.2", + "nocodb-sdk": "0.207.3", "papaparse": "^5.4.1", "parse-github-url": "^1.0.2", "pinia": "^2.1.7", diff --git a/packages/nc-lib-gui/package.json b/packages/nc-lib-gui/package.json index 28eccf723d..1c089b8a55 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.207.2", + "version": "0.207.3", "description": "NocoDB GUI", "author": { "name": "NocoDB", diff --git a/packages/nocodb-sdk/package.json b/packages/nocodb-sdk/package.json index 0c2a5be9f7..ba0970a1de 100644 --- a/packages/nocodb-sdk/package.json +++ b/packages/nocodb-sdk/package.json @@ -1,6 +1,6 @@ { "name": "nocodb-sdk", - "version": "0.207.2", + "version": "0.207.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 7c9f700177..7c92b77816 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -1,6 +1,6 @@ { "name": "nocodb", - "version": "0.207.2", + "version": "0.207.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.207.2", + "nc-lib-gui": "0.207.3", "nc-plugin": "^0.1.3", "ncp": "^2.0.0", "nestjs-kafka": "^1.0.6", "nestjs-throttler-storage-redis": "^0.4.4", - "nocodb-sdk": "0.207.2", + "nocodb-sdk": "0.207.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 88a464982b..370c5f0bed 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -54,19 +54,19 @@ importers: version: 0.5.1(vue@3.4.27) '@tiptap/extension-link': specifier: ^2.4.0 - version: 2.4.0(@tiptap/core@2.3.1)(@tiptap/pm@2.4.0) + version: 2.4.0(@tiptap/core@2.4.0)(@tiptap/pm@2.4.0) '@tiptap/extension-placeholder': specifier: ^2.4.0 - version: 2.4.0(@tiptap/core@2.3.1)(@tiptap/pm@2.4.0) + version: 2.4.0(@tiptap/core@2.4.0)(@tiptap/pm@2.4.0) '@tiptap/extension-task-list': specifier: 2.4.0 - version: 2.4.0(@tiptap/core@2.3.1) + version: 2.4.0(@tiptap/core@2.4.0) '@tiptap/extension-underline': specifier: ^2.4.0 - version: 2.4.0(@tiptap/core@2.3.1) + version: 2.4.0(@tiptap/core@2.4.0) '@tiptap/html': specifier: 2.4.0 - version: 2.4.0(@tiptap/core@2.3.1)(@tiptap/pm@2.4.0) + version: 2.4.0(@tiptap/core@2.4.0)(@tiptap/pm@2.4.0) '@tiptap/pm': specifier: ^2.4.0 version: 2.4.0 @@ -75,7 +75,7 @@ importers: version: 2.4.0(@tiptap/pm@2.4.0) '@tiptap/vue-3': specifier: 2.4.0 - version: 2.4.0(@tiptap/core@2.3.1)(@tiptap/pm@2.4.0)(vue@3.4.27) + version: 2.4.0(@tiptap/core@2.4.0)(@tiptap/pm@2.4.0)(vue@3.4.27) '@vue-flow/additional-components': specifier: ^1.3.3 version: 1.3.3(@vue-flow/core@1.31.0)(vue@3.4.27) @@ -155,7 +155,7 @@ importers: specifier: ^0.11.0 version: 0.11.0 nocodb-sdk: - specifier: 0.207.2 + specifier: 0.207.3 version: link:../nocodb-sdk papaparse: specifier: ^5.4.1 @@ -687,8 +687,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.207.2 - version: 0.207.2 + specifier: 0.207.3 + version: 0.207.3 nc-plugin: specifier: ^0.1.3 version: 0.1.3 @@ -702,7 +702,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.207.2 + specifier: 0.207.3 version: link:../nocodb-sdk nodemailer: specifier: ^6.9.13 @@ -8861,14 +8861,6 @@ packages: resolution: {integrity: sha512-7qSgZbincDDDFyRweCIEvZULFAw5iz/DeunhvuxpL31nfntX3P4Yd4HkHBRg9H8CdqY1e5WFN1PZIz/REL9MVQ==} dev: false - /@tiptap/core@2.3.1(@tiptap/pm@2.4.0): - resolution: {integrity: sha512-ycpQlmczAOc05TgB5sc3RUTEEBXAVmS8MR9PqQzg96qidaRfVkgE+2w4k7t83PMHl2duC0MGqOCy96pLYwSpeg==} - peerDependencies: - '@tiptap/pm': ^2.0.0 - dependencies: - '@tiptap/pm': 2.4.0 - dev: false - /@tiptap/core@2.4.0(@tiptap/pm@2.4.0): resolution: {integrity: sha512-YJSahk8pkxpCs8SflCZfTnJpE7IPyUWIylfgXM2DefjRQa5DZ+c6sNY0s/zbxKYFQ6AuHVX40r9pCfcqHChGxQ==} peerDependencies: @@ -8893,13 +8885,13 @@ packages: '@tiptap/core': 2.4.0(@tiptap/pm@2.4.0) dev: false - /@tiptap/extension-bubble-menu@2.4.0(@tiptap/core@2.3.1)(@tiptap/pm@2.4.0): + /@tiptap/extension-bubble-menu@2.4.0(@tiptap/core@2.4.0)(@tiptap/pm@2.4.0): resolution: {integrity: sha512-s99HmttUtpW3rScWq8rqk4+CGCwergNZbHLTkF6Rp6TSboMwfp+rwL5Q/JkcAG9KGLso1vGyXKbt1xHOvm8zMw==} peerDependencies: '@tiptap/core': ^2.0.0 '@tiptap/pm': ^2.0.0 dependencies: - '@tiptap/core': 2.3.1(@tiptap/pm@2.4.0) + '@tiptap/core': 2.4.0(@tiptap/pm@2.4.0) '@tiptap/pm': 2.4.0 tippy.js: 6.3.7 dev: false @@ -8948,13 +8940,13 @@ packages: '@tiptap/pm': 2.4.0 dev: false - /@tiptap/extension-floating-menu@2.4.0(@tiptap/core@2.3.1)(@tiptap/pm@2.4.0): + /@tiptap/extension-floating-menu@2.4.0(@tiptap/core@2.4.0)(@tiptap/pm@2.4.0): resolution: {integrity: sha512-vLb9v+htbHhXyty0oaXjT3VC8St4xuGSHWUB9GuAJAQ+NajIO6rBPbLUmm9qM0Eh2zico5mpSD1Qtn5FM6xYzg==} peerDependencies: '@tiptap/core': ^2.0.0 '@tiptap/pm': ^2.0.0 dependencies: - '@tiptap/core': 2.3.1(@tiptap/pm@2.4.0) + '@tiptap/core': 2.4.0(@tiptap/pm@2.4.0) '@tiptap/pm': 2.4.0 tippy.js: 6.3.7 dev: false @@ -9013,13 +9005,13 @@ packages: '@tiptap/core': 2.4.0(@tiptap/pm@2.4.0) dev: false - /@tiptap/extension-link@2.4.0(@tiptap/core@2.3.1)(@tiptap/pm@2.4.0): + /@tiptap/extension-link@2.4.0(@tiptap/core@2.4.0)(@tiptap/pm@2.4.0): resolution: {integrity: sha512-r3PjT0bjSKAorHAEBPA0icSMOlqALbxVlWU9vAc+Q3ndzt7ht0CTPNewzFF9kjzARABVt1cblXP/2+c0qGzcsg==} peerDependencies: '@tiptap/core': ^2.0.0 '@tiptap/pm': ^2.0.0 dependencies: - '@tiptap/core': 2.3.1(@tiptap/pm@2.4.0) + '@tiptap/core': 2.4.0(@tiptap/pm@2.4.0) '@tiptap/pm': 2.4.0 linkifyjs: 4.1.3 dev: false @@ -9048,13 +9040,13 @@ packages: '@tiptap/core': 2.4.0(@tiptap/pm@2.4.0) dev: false - /@tiptap/extension-placeholder@2.4.0(@tiptap/core@2.3.1)(@tiptap/pm@2.4.0): + /@tiptap/extension-placeholder@2.4.0(@tiptap/core@2.4.0)(@tiptap/pm@2.4.0): resolution: {integrity: sha512-SmWOjgWpmhFt0BPOnL65abCUH0wS5yksUJgtANn5bQoHF4HFSsyl7ETRmgf0ykxdjc7tzOg31FfpWVH4wzKSYg==} peerDependencies: '@tiptap/core': ^2.0.0 '@tiptap/pm': ^2.0.0 dependencies: - '@tiptap/core': 2.3.1(@tiptap/pm@2.4.0) + '@tiptap/core': 2.4.0(@tiptap/pm@2.4.0) '@tiptap/pm': 2.4.0 dev: false @@ -9066,12 +9058,12 @@ packages: '@tiptap/core': 2.4.0(@tiptap/pm@2.4.0) dev: false - /@tiptap/extension-task-list@2.4.0(@tiptap/core@2.3.1): + /@tiptap/extension-task-list@2.4.0(@tiptap/core@2.4.0): resolution: {integrity: sha512-vmUB3wEJU81QbiHUygBlselQW8YIW8/85UTwANvWx8+KEWyM7EUF4utcm5R2UobIprIcWb4hyVkvW/5iou25gg==} peerDependencies: '@tiptap/core': ^2.0.0 dependencies: - '@tiptap/core': 2.3.1(@tiptap/pm@2.4.0) + '@tiptap/core': 2.4.0(@tiptap/pm@2.4.0) dev: false /@tiptap/extension-text@2.4.0(@tiptap/core@2.4.0): @@ -9082,21 +9074,21 @@ packages: '@tiptap/core': 2.4.0(@tiptap/pm@2.4.0) dev: false - /@tiptap/extension-underline@2.4.0(@tiptap/core@2.3.1): + /@tiptap/extension-underline@2.4.0(@tiptap/core@2.4.0): resolution: {integrity: sha512-guWojb7JxUwLz4OKzwNExJwOkhZjgw/ttkXCMBT0PVe55k998MMYe1nvN0m2SeTW9IxurEPtScH4kYJ0XuSm8Q==} peerDependencies: '@tiptap/core': ^2.0.0 dependencies: - '@tiptap/core': 2.3.1(@tiptap/pm@2.4.0) + '@tiptap/core': 2.4.0(@tiptap/pm@2.4.0) dev: false - /@tiptap/html@2.4.0(@tiptap/core@2.3.1)(@tiptap/pm@2.4.0): + /@tiptap/html@2.4.0(@tiptap/core@2.4.0)(@tiptap/pm@2.4.0): resolution: {integrity: sha512-iM0sa6t0Hb5GTXnjdKvMDtD3KZgA4Mwx3QADeqfR10EjfPNlkh/BHU83oIhss/2JVRBXiUUDnNxW9cfpHX37/g==} peerDependencies: '@tiptap/core': ^2.0.0 '@tiptap/pm': ^2.0.0 dependencies: - '@tiptap/core': 2.3.1(@tiptap/pm@2.4.0) + '@tiptap/core': 2.4.0(@tiptap/pm@2.4.0) '@tiptap/pm': 2.4.0 zeed-dom: 0.10.11 dev: false @@ -9150,16 +9142,16 @@ packages: - '@tiptap/pm' dev: false - /@tiptap/vue-3@2.4.0(@tiptap/core@2.3.1)(@tiptap/pm@2.4.0)(vue@3.4.27): + /@tiptap/vue-3@2.4.0(@tiptap/core@2.4.0)(@tiptap/pm@2.4.0)(vue@3.4.27): resolution: {integrity: sha512-NCw1Y4ScIrMCKC9YlepUHSAB8jq/PQ2f+AbZKh5bY2t/kMSJYLCJVHq9NFzG4TQtktgMGWCcEQVcDJ7YNpsfxw==} peerDependencies: '@tiptap/core': ^2.0.0 '@tiptap/pm': ^2.0.0 vue: latest dependencies: - '@tiptap/core': 2.3.1(@tiptap/pm@2.4.0) - '@tiptap/extension-bubble-menu': 2.4.0(@tiptap/core@2.3.1)(@tiptap/pm@2.4.0) - '@tiptap/extension-floating-menu': 2.4.0(@tiptap/core@2.3.1)(@tiptap/pm@2.4.0) + '@tiptap/core': 2.4.0(@tiptap/pm@2.4.0) + '@tiptap/extension-bubble-menu': 2.4.0(@tiptap/core@2.4.0)(@tiptap/pm@2.4.0) + '@tiptap/extension-floating-menu': 2.4.0(@tiptap/core@2.4.0)(@tiptap/pm@2.4.0) '@tiptap/pm': 2.4.0 vue: 3.4.27 dev: false @@ -20894,8 +20886,8 @@ packages: - supports-color dev: false - /nc-lib-gui@0.207.2: - resolution: {integrity: sha512-+/u+N7/vPvcUBs7BN6WM2H2hKxhOta0KKZ75mFyZhb4D/p8Y2SMlCQDAqpkR3lsH0DZaTlKqjGKeYPFtmRw0Ug==} + /nc-lib-gui@0.207.3: + resolution: {integrity: sha512-2TTiNKjD+VQIRxCoHxO2VfdWlYvHdZcoH92ngZogxmFq+YnfM7wmsbKVyOoT7pOeoFmODhKcezTLd7S9aW46+Q==} dependencies: express: 4.19.2 transitivePeerDependencies: From 3b3a8213a1c1a7e2dd2c95bbff85725c08104104 Mon Sep 17 00:00:00 2001 From: mertmit Date: Wed, 29 May 2024 13:54:54 +0300 Subject: [PATCH 5/8] chore: move sync action after npm release as it pushes some commits Signed-off-by: mertmit --- .github/workflows/release-nocodb.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-nocodb.yml b/.github/workflows/release-nocodb.yml index b393cb9e34..bd0ffb4962 100644 --- a/.github/workflows/release-nocodb.yml +++ b/.github/workflows/release-nocodb.yml @@ -59,11 +59,6 @@ jobs: with: tag: ${{ needs.process-input.outputs.target_tag }} targetEnv: ${{ github.event.inputs.targetEnv || 'PROD' }} - - # Create a PR to sync changes back to develop branch from master - sync-to-develop: - needs: [pr-to-master, process-input] - uses: ./.github/workflows/sync-to-develop.yml # Build, install, publish frontend and backend to npm release-npm: @@ -75,6 +70,11 @@ jobs: secrets: NPM_TOKEN: "${{ secrets.NPM_TOKEN }}" + # Create a PR to sync changes back to develop branch from master + sync-to-develop: + needs: [release-npm, process-input] + uses: ./.github/workflows/sync-to-develop.yml + # Draft Release Note release-draft-note: needs: [release-npm, process-input] From fb6aeda24f5f1304c3984bb3ba1e65d92317d7e7 Mon Sep 17 00:00:00 2001 From: mertmit Date: Thu, 13 Jun 2024 12:57:34 +0000 Subject: [PATCH 6/8] [create-pull-request] automated change Signed-off-by: GitHub --- packages/nc-gui/components.d.ts | 1 - 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 | 14 +++++++------- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/packages/nc-gui/components.d.ts b/packages/nc-gui/components.d.ts index ba1e4a0fa4..d7fe7790e8 100644 --- a/packages/nc-gui/components.d.ts +++ b/packages/nc-gui/components.d.ts @@ -104,7 +104,6 @@ declare module 'vue' { MdiAccountCircleOutline: typeof import('~icons/mdi/account-circle-outline')['default'] MdiAccountSupervisorOutline: typeof import('~icons/mdi/account-supervisor-outline')['default'] MdiAppleKeyboardShift: typeof import('~icons/mdi/apple-keyboard-shift')['default'] - MdiArrowDownDropCircle: typeof import('~icons/mdi/arrow-down-drop-circle')['default'] MdiArrowDownDropCircleOutline: typeof import('~icons/mdi/arrow-down-drop-circle-outline')['default'] MdiArrowLeft: typeof import('~icons/mdi/arrow-left')['default'] MdiArrowULeftBottom: typeof import('~icons/mdi/arrow-u-left-bottom')['default'] diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json index c2616c8165..10c2b4096f 100644 --- a/packages/nc-gui/package.json +++ b/packages/nc-gui/package.json @@ -76,7 +76,7 @@ "marked": "^4.3.0", "monaco-editor": "^0.45.0", "monaco-sql-languages": "^0.11.0", - "nocodb-sdk": "0.207.3", + "nocodb-sdk": "0.250.0", "papaparse": "^5.4.1", "parse-github-url": "^1.0.2", "pinia": "^2.1.7", diff --git a/packages/nc-lib-gui/package.json b/packages/nc-lib-gui/package.json index 1c089b8a55..15c7fe0d99 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.207.3", + "version": "0.250.0", "description": "NocoDB GUI", "author": { "name": "NocoDB", diff --git a/packages/nocodb-sdk/package.json b/packages/nocodb-sdk/package.json index ba0970a1de..61f235deeb 100644 --- a/packages/nocodb-sdk/package.json +++ b/packages/nocodb-sdk/package.json @@ -1,6 +1,6 @@ { "name": "nocodb-sdk", - "version": "0.207.3", + "version": "0.250.0", "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 7c92b77816..0a5f090904 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -1,6 +1,6 @@ { "name": "nocodb", - "version": "0.207.3", + "version": "0.250.0", "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.207.3", + "nc-lib-gui": "0.250.0", "nc-plugin": "^0.1.3", "ncp": "^2.0.0", "nestjs-kafka": "^1.0.6", "nestjs-throttler-storage-redis": "^0.4.4", - "nocodb-sdk": "0.207.3", + "nocodb-sdk": "0.250.0", "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 052b9b8e21..f379d7b454 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -158,7 +158,7 @@ importers: specifier: ^0.11.0 version: 0.11.0 nocodb-sdk: - specifier: 0.207.3 + specifier: 0.250.0 version: link:../nocodb-sdk papaparse: specifier: ^5.4.1 @@ -712,8 +712,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.207.3 - version: 0.207.3 + specifier: 0.250.0 + version: 0.250.0 nc-plugin: specifier: ^0.1.3 version: 0.1.3 @@ -727,7 +727,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.207.3 + specifier: 0.250.0 version: link:../nocodb-sdk nodemailer: specifier: ^6.9.13 @@ -15661,7 +15661,7 @@ packages: eslint: 8.56.0 eslint-import-resolver-node: 0.3.9 eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint@8.56.0) - hasown: 2.0.0 + hasown: 2.0.1 is-core-module: 2.13.1 is-glob: 4.0.3 minimatch: 3.1.2 @@ -21306,8 +21306,8 @@ packages: - supports-color dev: false - /nc-lib-gui@0.207.3: - resolution: {integrity: sha512-2TTiNKjD+VQIRxCoHxO2VfdWlYvHdZcoH92ngZogxmFq+YnfM7wmsbKVyOoT7pOeoFmODhKcezTLd7S9aW46+Q==} + /nc-lib-gui@0.250.0: + resolution: {integrity: sha512-vjYYhuGlX/jcQ2UEEpZPBH7QjizF0IG0Rbt/rkI7kIy8MOeLX/ubF4EY/9StoaMaHs0TTshF+gJ/V7Tb+qUmFA==} dependencies: express: 4.19.2 transitivePeerDependencies: From 5c7ce2b17eba4f985208951d59527c0ecdc225f3 Mon Sep 17 00:00:00 2001 From: mertmit Date: Thu, 13 Jun 2024 14:24:44 +0000 Subject: [PATCH 7/8] [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 | 12 ++++++------ 6 files changed, 12 insertions(+), 14 deletions(-) diff --git a/packages/nc-gui/components.d.ts b/packages/nc-gui/components.d.ts index d7fe7790e8..a36e693d23 100644 --- a/packages/nc-gui/components.d.ts +++ b/packages/nc-gui/components.d.ts @@ -75,7 +75,6 @@ declare module 'vue' { CilFullscreen: typeof import('~icons/cil/fullscreen')['default'] CilFullscreenExit: typeof import('~icons/cil/fullscreen-exit')['default'] ClaritySuccessLine: typeof import('~icons/clarity/success-line')['default'] - IcBaselineArrowOutward: typeof import('~icons/ic/baseline-arrow-outward')['default'] IcBaselineMoreVert: typeof import('~icons/ic/baseline-more-vert')['default'] IcOutlineInsertDriveFile: typeof import('~icons/ic/outline-insert-drive-file')['default'] IcRoundEdit: typeof import('~icons/ic/round-edit')['default'] @@ -121,7 +120,6 @@ declare module 'vue' { MdiCodeTags: typeof import('~icons/mdi/code-tags')['default'] MdiContentCopy: typeof import('~icons/mdi/content-copy')['default'] MdiCurrencyUsd: typeof import('~icons/mdi/currency-usd')['default'] - MdiDeleteOutline: typeof import('~icons/mdi/delete-outline')['default'] MdiDiscord: typeof import('~icons/mdi/discord')['default'] MdiDotsHorizontal: typeof import('~icons/mdi/dots-horizontal')['default'] MdiDotsVertical: typeof import('~icons/mdi/dots-vertical')['default'] diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json index 10c2b4096f..4d97488dab 100644 --- a/packages/nc-gui/package.json +++ b/packages/nc-gui/package.json @@ -76,7 +76,7 @@ "marked": "^4.3.0", "monaco-editor": "^0.45.0", "monaco-sql-languages": "^0.11.0", - "nocodb-sdk": "0.250.0", + "nocodb-sdk": "0.250.1", "papaparse": "^5.4.1", "parse-github-url": "^1.0.2", "pinia": "^2.1.7", diff --git a/packages/nc-lib-gui/package.json b/packages/nc-lib-gui/package.json index 15c7fe0d99..3a44de7d45 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.250.0", + "version": "0.250.1", "description": "NocoDB GUI", "author": { "name": "NocoDB", diff --git a/packages/nocodb-sdk/package.json b/packages/nocodb-sdk/package.json index 61f235deeb..284425585c 100644 --- a/packages/nocodb-sdk/package.json +++ b/packages/nocodb-sdk/package.json @@ -1,6 +1,6 @@ { "name": "nocodb-sdk", - "version": "0.250.0", + "version": "0.250.1", "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 0a5f090904..c2b2cb22dc 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -1,6 +1,6 @@ { "name": "nocodb", - "version": "0.250.0", + "version": "0.250.1", "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.250.0", + "nc-lib-gui": "0.250.1", "nc-plugin": "^0.1.3", "ncp": "^2.0.0", "nestjs-kafka": "^1.0.6", "nestjs-throttler-storage-redis": "^0.4.4", - "nocodb-sdk": "0.250.0", + "nocodb-sdk": "0.250.1", "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 f379d7b454..22a83f89be 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -158,7 +158,7 @@ importers: specifier: ^0.11.0 version: 0.11.0 nocodb-sdk: - specifier: 0.250.0 + specifier: 0.250.1 version: link:../nocodb-sdk papaparse: specifier: ^5.4.1 @@ -712,8 +712,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.250.0 - version: 0.250.0 + specifier: 0.250.1 + version: 0.250.1 nc-plugin: specifier: ^0.1.3 version: 0.1.3 @@ -727,7 +727,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.250.0 + specifier: 0.250.1 version: link:../nocodb-sdk nodemailer: specifier: ^6.9.13 @@ -21306,8 +21306,8 @@ packages: - supports-color dev: false - /nc-lib-gui@0.250.0: - resolution: {integrity: sha512-vjYYhuGlX/jcQ2UEEpZPBH7QjizF0IG0Rbt/rkI7kIy8MOeLX/ubF4EY/9StoaMaHs0TTshF+gJ/V7Tb+qUmFA==} + /nc-lib-gui@0.250.1: + resolution: {integrity: sha512-Xhs4b8kodG7YV9sZctXuoBrmCjZvR7dCKWGjNqiqcMcl46zhhK9LNk6J+vxUHh3o+r7Dc+oHD8kJzMN7eJcB1g==} dependencies: express: 4.19.2 transitivePeerDependencies: From 53c9f7b1fc369a407347cc6ba8629ff00c339319 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 13 Jun 2024 14:26:28 +0000 Subject: [PATCH 8/8] 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 4d97488dab..61a2bf879d 100644 --- a/packages/nc-gui/package.json +++ b/packages/nc-gui/package.json @@ -76,7 +76,7 @@ "marked": "^4.3.0", "monaco-editor": "^0.45.0", "monaco-sql-languages": "^0.11.0", - "nocodb-sdk": "0.250.1", + "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 c2b2cb22dc..e21d016125 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.250.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 22a83f89be..13d523e041 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -158,7 +158,7 @@ importers: specifier: ^0.11.0 version: 0.11.0 nocodb-sdk: - specifier: 0.250.1 + specifier: workspace:^ version: link:../nocodb-sdk papaparse: specifier: ^5.4.1 @@ -727,7 +727,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.250.1 + specifier: workspace:^ version: link:../nocodb-sdk nodemailer: specifier: ^6.9.13