github
/
nocodb
mirror of https://github.com/nocodb/nocodb
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Merge branch 'master' into develop

pull/4817/head
GitHub Nightly Merge Action 2 years ago
parent
836c1c4dac 0c518dd6d1
commit
8137c0b7c2
6 changed files with 63 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 54
      packages/nc-gui/package-lock.json
  2. 2
      packages/nc-gui/package.json
  3. 2
      packages/nc-lib-gui/package.json
  4. 2
      packages/nocodb-sdk/package.json
  5. 50
      packages/nocodb/package-lock.json
  6. 8
      packages/nocodb/package.json

54
packages/nc-gui/package-lock.json generated
Unescape View File

@ -29,7 +29,7 @@
"jwt-decode": "^3.1.2",
"locale-codes": "^1.3.1",
"monaco-editor": "^0.33.0",
"nocodb-sdk": "file:../nocodb-sdk",
"nocodb-sdk": "0.101.0",
"papaparse": "^5.3.2",
"qrcode": "^1.5.1",
"socket.io-client": "^4.5.1",
@ -95,7 +95,8 @@
}
},
"../nocodb-sdk": {
"version": "0.101.0-beta.0",
"version": "0.101.0",
"extraneous": true,
"license": "AGPL-3.0-or-later",
"dependencies": {
"axios": "^0.21.1",
@ -8543,7 +8544,6 @@
"version": "1.15.1",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
"integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==",
"devOptional": true,
"funding": [
{
"type": "individual",
@ -11959,8 +11959,21 @@
}
},
"node_modules/nocodb-sdk": {
"resolved": "../nocodb-sdk",
"link": true
"version": "0.101.0",
"resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.101.0.tgz",
"integrity": "sha512-7TZ+ZlJq1DCW9lqf9yOFGGe9r9KuyFEzjxkrrcYigBgIb9I4ob+VGb/XbYIplhh73EeDFhxWLkC1lnTr1bWD5A==",
"dependencies": {
"axios": "^0.21.1",
"jsep": "^1.3.6"
}
},
"node_modules/nocodb-sdk/node_modules/axios": {
"version": "0.21.4",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
"integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
"dependencies": {
"follow-redirects": "^1.14.0"
}
},
"node_modules/node-abi": {
"version": "3.23.0",
@ -23924,8 +23937,7 @@
"follow-redirects": {
"version": "1.15.1",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
"integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==",
"devOptional": true
"integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="
},
"form-data": {
"version": "4.0.0",
@ -26398,22 +26410,22 @@
}
},
"nocodb-sdk": {
"version": "file:../nocodb-sdk",
"version": "0.101.0",
"resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.101.0.tgz",
"integrity": "sha512-7TZ+ZlJq1DCW9lqf9yOFGGe9r9KuyFEzjxkrrcYigBgIb9I4ob+VGb/XbYIplhh73EeDFhxWLkC1lnTr1bWD5A==",
"requires": {
"@typescript-eslint/eslint-plugin": "^4.0.1",
"@typescript-eslint/parser": "^4.0.1",
"axios": "^0.21.1",
"cspell": "^4.1.0",
"eslint": "^7.8.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-functional": "^3.0.2",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-prettier": "^4.0.0",
"jsep": "^1.3.6",
"npm-run-all": "^4.1.5",
"prettier": "^2.1.1",
"typescript": "^4.0.2"
"jsep": "^1.3.6"
},
"dependencies": {
"axios": {
"version": "0.21.4",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
"integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
"requires": {
"follow-redirects": "^1.14.0"
}
}
}
},
"node-abi": {

2
packages/nc-gui/package.json
Unescape View File

@ -52,7 +52,7 @@
"jwt-decode": "^3.1.2",
"locale-codes": "^1.3.1",
"monaco-editor": "^0.33.0",
"nocodb-sdk": "file:../nocodb-sdk",
"nocodb-sdk": "0.101.0",
"papaparse": "^5.3.2",
"qrcode": "^1.5.1",
"socket.io-client": "^4.5.1",

2
packages/nc-lib-gui/package.json
Unescape View File

@ -1,6 +1,6 @@
{
"name": "nc-lib-gui",
"version": "0.101.0-beta.0",
"version": "0.101.0",
"description": "NocoDB GUI",
"author": {
"name": "NocoDB",

2
packages/nocodb-sdk/package.json
Unescape View File

@ -1,6 +1,6 @@
{
"name": "nocodb-sdk",
"version": "0.101.0-beta.0",
"version": "0.101.0",
"description": "NocoDB SDK",
"main": "build/main/index.js",
"typings": "build/main/index.d.ts",

50
packages/nocodb/package-lock.json generated
Unescape View File

@ -1,12 +1,12 @@
{
"name": "nocodb",
"version": "0.101.0-beta.0",
"version": "0.101.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "nocodb",
"version": "0.101.0-beta.0",
"version": "0.101.0",
"license": "AGPL-3.0-or-later",
"dependencies": {
"@google-cloud/storage": "^5.7.2",
@ -65,10 +65,10 @@
"mysql2": "^2.2.5",
"nanoid": "^3.1.20",
"nc-help": "0.2.85",
"nc-lib-gui": "0.101.0-beta.0",
"nc-lib-gui": "0.101.0",
"nc-plugin": "0.1.2",
"ncp": "^2.0.0",
"nocodb-sdk": "file:../nocodb-sdk",
"nocodb-sdk": "0.101.0",
"nodemailer": "^6.4.10",
"object-hash": "^3.0.0",
"os-locale": "^5.0.0",
@ -153,7 +153,8 @@
}
},
"../nocodb-sdk": {
"version": "0.101.0-beta.0",
"version": "0.101.0",
"extraneous": true,
"license": "AGPL-3.0-or-later",
"dependencies": {
"axios": "^0.21.1",
@ -11161,9 +11162,9 @@
}
},
"node_modules/nc-lib-gui": {
"version": "0.101.0-beta.0",
"resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.101.0-beta.0.tgz",
"integrity": "sha512-7NuNn16fYm397ZcdqDY21f2smydPzk6gog9qZm8UdDn5i3Y49OnlGwpUWkqFX+ZM4T18uJ3rd+1Fe2T2sKWrWg==",
"version": "0.101.0",
"resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.101.0.tgz",
"integrity": "sha512-25sDt2KKlJNq2wFpi+97OZfG2WTNfBPIafN57MV0bIJ6OH3168hIUbSOwhY+Q4dujtKZw3goq6X2OX2Y/P9FHg==",
"dependencies": {
"express": "^4.17.1"
}
@ -11222,8 +11223,13 @@
"dev": true
},
"node_modules/nocodb-sdk": {
"resolved": "../nocodb-sdk",
"link": true
"version": "0.101.0",
"resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.101.0.tgz",
"integrity": "sha512-7TZ+ZlJq1DCW9lqf9yOFGGe9r9KuyFEzjxkrrcYigBgIb9I4ob+VGb/XbYIplhh73EeDFhxWLkC1lnTr1bWD5A==",
"dependencies": {
"axios": "^0.21.1",
"jsep": "^1.3.6"
}
},
"node_modules/node-abort-controller": {
"version": "3.0.1",
@ -27687,9 +27693,9 @@
}
},
"nc-lib-gui": {
"version": "0.101.0-beta.0",
"resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.101.0-beta.0.tgz",
"integrity": "sha512-7NuNn16fYm397ZcdqDY21f2smydPzk6gog9qZm8UdDn5i3Y49OnlGwpUWkqFX+ZM4T18uJ3rd+1Fe2T2sKWrWg==",
"version": "0.101.0",
"resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.101.0.tgz",
"integrity": "sha512-25sDt2KKlJNq2wFpi+97OZfG2WTNfBPIafN57MV0bIJ6OH3168hIUbSOwhY+Q4dujtKZw3goq6X2OX2Y/P9FHg==",
"requires": {
"express": "^4.17.1"
}
@ -27736,22 +27742,12 @@
"dev": true
},
"nocodb-sdk": {
"version": "file:../nocodb-sdk",
"version": "0.101.0",
"resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.101.0.tgz",
"integrity": "sha512-7TZ+ZlJq1DCW9lqf9yOFGGe9r9KuyFEzjxkrrcYigBgIb9I4ob+VGb/XbYIplhh73EeDFhxWLkC1lnTr1bWD5A==",
"requires": {
"@typescript-eslint/eslint-plugin": "^4.0.1",
"@typescript-eslint/parser": "^4.0.1",
"axios": "^0.21.1",
"cspell": "^4.1.0",
"eslint": "^7.8.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-functional": "^3.0.2",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-prettier": "^4.0.0",
"jsep": "^1.3.6",
"npm-run-all": "^4.1.5",
"prettier": "^2.1.1",
"typescript": "^4.0.2"
"jsep": "^1.3.6"
}
},
"node-abort-controller": {

8
packages/nocodb/package.json
Unescape View File

@ -1,6 +1,6 @@
{
"name": "nocodb",
"version": "0.101.0-beta.0",
"version": "0.101.0",
"description": "NocoDB Backend",
"main": "dist/bundle.js",
"author": {
@ -105,10 +105,10 @@
"mysql2": "^2.2.5",
"nanoid": "^3.1.20",
"nc-help": "0.2.85",
"nc-lib-gui": "0.101.0-beta.0",
"nc-lib-gui": "0.101.0",
"nc-plugin": "0.1.2",
"ncp": "^2.0.0",
"nocodb-sdk": "file:../nocodb-sdk",
"nocodb-sdk": "0.101.0",
"nodemailer": "^6.4.10",
"object-hash": "^3.0.0",
"os-locale": "^5.0.0",
@ -183,4 +183,4 @@
"prettier": {
"singleQuote": true
}
}
}
Write Preview
Loading…
Cancel
Save