Browse Source

Merge pull request #9624 from nocodb/develop

pull/9625/head 0.257.0
github-actions[bot] 1 month ago committed by GitHub
parent
commit
8ce481e78e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      packages/nc-gui/package.json
  2. 2
      packages/nc-gui/pages/index.vue
  3. 2
      packages/nocodb/package.json
  4. 35
      pnpm-lock.yaml

2
packages/nc-gui/package.json

@ -79,7 +79,7 @@
"marked": "^4.3.0", "marked": "^4.3.0",
"monaco-editor": "^0.50.0", "monaco-editor": "^0.50.0",
"monaco-sql-languages": "^0.11.0", "monaco-sql-languages": "^0.11.0",
"nocodb-sdk": "0.256.0", "nocodb-sdk": "workspace:^",
"papaparse": "^5.4.1", "papaparse": "^5.4.1",
"parse-github-url": "^1.0.2", "parse-github-url": "^1.0.2",
"pdfobject": "^2.3.0", "pdfobject": "^2.3.0",

2
packages/nc-gui/pages/index.vue

@ -41,7 +41,7 @@ const isSharedView = computed(() => {
// check route is not base page by route name // check route is not base page by route name
return ( return (
!routeName.startsWith('index-typeOrId-baseId-') && !routeName.startsWith('index-typeOrId-baseId-') &&
!['index', 'index-typeOrId', 'index-typeOrId-integrations'].includes(routeName) !['index', 'index-typeOrId', 'index-typeOrId-feed', 'index-typeOrId-integrations'].includes(routeName)
) )
}) })

2
packages/nocodb/package.json

@ -126,7 +126,7 @@
"nanoid": "^3.3.7", "nanoid": "^3.3.7",
"nc-lib-gui": "0.256.0", "nc-lib-gui": "0.256.0",
"nestjs-throttler-storage-redis": "^0.4.4", "nestjs-throttler-storage-redis": "^0.4.4",
"nocodb-sdk": "0.256.0", "nocodb-sdk": "workspace:^",
"nodemailer": "^6.9.13", "nodemailer": "^6.9.13",
"object-hash": "^3.0.0", "object-hash": "^3.0.0",
"object-sizeof": "^2.6.4", "object-sizeof": "^2.6.4",

35
pnpm-lock.yaml

@ -170,7 +170,7 @@ importers:
specifier: ^0.11.0 specifier: ^0.11.0
version: 0.11.0 version: 0.11.0
nocodb-sdk: nocodb-sdk:
specifier: 0.256.0 specifier: workspace:^
version: link:../nocodb-sdk version: link:../nocodb-sdk
papaparse: papaparse:
specifier: ^5.4.1 specifier: ^5.4.1
@ -809,7 +809,7 @@ importers:
specifier: ^0.4.4 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) 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: nocodb-sdk:
specifier: 0.256.0 specifier: workspace:^
version: link:../nocodb-sdk version: link:../nocodb-sdk
nodemailer: nodemailer:
specifier: ^6.9.13 specifier: ^6.9.13
@ -3141,16 +3141,9 @@ packages:
resolution: {integrity: sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==} resolution: {integrity: sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==}
engines: {node: '>=6.0.0'} engines: {node: '>=6.0.0'}
hasBin: true hasBin: true
dependencies:
'@babel/types': 7.24.0
dev: true
/@babel/parser@7.24.7:
resolution: {integrity: sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==}
engines: {node: '>=6.0.0'}
hasBin: true
dependencies: dependencies:
'@babel/types': 7.25.6 '@babel/types': 7.25.6
dev: true
/@babel/parser@7.25.6: /@babel/parser@7.25.6:
resolution: {integrity: sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==} resolution: {integrity: sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==}
@ -3410,15 +3403,6 @@ packages:
to-fast-properties: 2.0.0 to-fast-properties: 2.0.0
dev: true dev: true
/@babel/types@7.24.0:
resolution: {integrity: sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==}
engines: {node: '>=6.9.0'}
dependencies:
'@babel/helper-string-parser': 7.24.8
'@babel/helper-validator-identifier': 7.24.7
to-fast-properties: 2.0.0
dev: true
/@babel/types@7.25.6: /@babel/types@7.25.6:
resolution: {integrity: sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==} resolution: {integrity: sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==}
engines: {node: '>=6.9.0'} engines: {node: '>=6.9.0'}
@ -5117,9 +5101,9 @@ packages:
escodegen: 2.1.0 escodegen: 2.1.0
estree-walker: 2.0.2 estree-walker: 2.0.2
jsonc-eslint-parser: 2.3.0 jsonc-eslint-parser: 2.3.0
magic-string: 0.30.10 magic-string: 0.30.11
mlly: 1.6.1 mlly: 1.6.1
source-map-js: 1.2.0 source-map-js: 1.2.1
vue-i18n: 9.9.1(vue@3.5.11) vue-i18n: 9.9.1(vue@3.5.11)
yaml-eslint-parser: 1.2.2 yaml-eslint-parser: 1.2.2
dev: true dev: true
@ -11405,11 +11389,11 @@ packages:
/@vue/compiler-core@3.4.27: /@vue/compiler-core@3.4.27:
resolution: {integrity: sha512-E+RyqY24KnyDXsCuQrI+mlcdW3ALND6U7Gqa/+bVwbcpcR3BRRIckFoz7Qyd4TTlnugtwuI7YgjbvsLmxb+yvg==} resolution: {integrity: sha512-E+RyqY24KnyDXsCuQrI+mlcdW3ALND6U7Gqa/+bVwbcpcR3BRRIckFoz7Qyd4TTlnugtwuI7YgjbvsLmxb+yvg==}
dependencies: dependencies:
'@babel/parser': 7.24.7 '@babel/parser': 7.25.6
'@vue/shared': 3.4.27 '@vue/shared': 3.4.27
entities: 4.5.0 entities: 4.5.0
estree-walker: 2.0.2 estree-walker: 2.0.2
source-map-js: 1.2.0 source-map-js: 1.2.1
/@vue/compiler-core@3.5.11: /@vue/compiler-core@3.5.11:
resolution: {integrity: sha512-PwAdxs7/9Hc3ieBO12tXzmTD+Ln4qhT/56S+8DvrrZ4kLDn4Z/AMUr8tXJD0axiJBS0RKIoNaR0yMuQB9v9Udg==} resolution: {integrity: sha512-PwAdxs7/9Hc3ieBO12tXzmTD+Ln4qhT/56S+8DvrrZ4kLDn4Z/AMUr8tXJD0axiJBS0RKIoNaR0yMuQB9v9Udg==}
@ -21159,7 +21143,7 @@ packages:
/magic-string@0.30.10: /magic-string@0.30.10:
resolution: {integrity: sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==} resolution: {integrity: sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==}
dependencies: dependencies:
'@jridgewell/sourcemap-codec': 1.4.15 '@jridgewell/sourcemap-codec': 1.5.0
dev: true dev: true
/magic-string@0.30.11: /magic-string@0.30.11:
@ -24710,7 +24694,7 @@ packages:
dependencies: dependencies:
nanoid: 3.3.7 nanoid: 3.3.7
picocolors: 1.0.1 picocolors: 1.0.1
source-map-js: 1.2.0 source-map-js: 1.2.1
dev: true dev: true
/postcss@8.4.47: /postcss@8.4.47:
@ -26508,6 +26492,7 @@ packages:
/source-map-js@1.2.0: /source-map-js@1.2.0:
resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==} resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==}
engines: {node: '>=0.10.0'} engines: {node: '>=0.10.0'}
dev: true
/source-map-js@1.2.1: /source-map-js@1.2.1:
resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==} resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}

Loading…
Cancel
Save