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/3666/head
Wing-Kam Wong 2 years ago
parent
54d7263d6d a8e4c9ad4f
commit
a8a2e52bcc
5 changed files with 64 additions and 56 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. 66
      packages/nc-gui/package-lock.json
  2. 2
      packages/nc-gui/package.json
  3. 4
      packages/nocodb-sdk/package-lock.json
  4. 44
      packages/nocodb/package-lock.json
  5. 2
      packages/nocodb/package.json

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

@ -25,7 +25,7 @@
"jwt-decode": "^3.1.2",
"locale-codes": "^1.3.1",
"monaco-editor": "^0.33.0",
"nocodb-sdk": "0.98.3",
"nocodb-sdk": "file:../nocodb-sdk",
"papaparse": "^5.3.2",
"socket.io-client": "^4.5.1",
"sortablejs": "^1.15.0",
@ -87,7 +87,6 @@
},
"../nocodb-sdk": {
"version": "0.98.3",
"extraneous": true,
"license": "MIT",
"dependencies": {
"axios": "^0.21.1",
@ -8530,6 +8529,7 @@
"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",
@ -11806,24 +11806,8 @@
"dev": true
},
"node_modules/nocodb-sdk": {
"version": "0.98.3",
"resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.98.3.tgz",
"integrity": "sha512-UXnn0HS9giFGTEeCo4e7Kb5ZvvDNOWzukxHW/otHjcF2L7byE571BAyhzZkbnPegbum1Y0VSY4YzrJf2AQOGAA==",
"dependencies": {
"axios": "^0.21.1",
"jsep": "^1.3.6"
},
"engines": {
"node": ">=10"
}
},
"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"
}
"resolved": "../nocodb-sdk",
"link": true
},
"node_modules/node-abi": {
"version": "3.23.0",
@ -23160,7 +23144,8 @@
"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=="
"integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==",
"devOptional": true
},
"form-data": {
"version": "4.0.0",
@ -25566,22 +25551,33 @@
}
},
"nocodb-sdk": {
"version": "0.98.3",
"resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.98.3.tgz",
"integrity": "sha512-UXnn0HS9giFGTEeCo4e7Kb5ZvvDNOWzukxHW/otHjcF2L7byE571BAyhzZkbnPegbum1Y0VSY4YzrJf2AQOGAA==",
"version": "file:../nocodb-sdk",
"requires": {
"@ava/typescript": "^1.1.1",
"@istanbuljs/nyc-config-typescript": "^1.0.1",
"@typescript-eslint/eslint-plugin": "^4.0.1",
"@typescript-eslint/parser": "^4.0.1",
"ava": "^3.12.1",
"axios": "^0.21.1",
"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"
}
}
"codecov": "^3.5.0",
"cspell": "^4.1.0",
"cz-conventional-changelog": "^3.3.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",
"gh-pages": "^3.1.0",
"jsep": "^1.3.6",
"npm-run-all": "^4.1.5",
"nyc": "^15.1.0",
"open-cli": "^6.0.1",
"prettier": "^2.1.1",
"standard-version": "^9.0.0",
"ts-node": "^9.0.0",
"typedoc": "^0.23.16",
"typescript": "^4.0.2"
}
},
"node-abi": {

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

@ -34,7 +34,7 @@
"jwt-decode": "^3.1.2",
"locale-codes": "^1.3.1",
"monaco-editor": "^0.33.0",
"nocodb-sdk": "0.98.3",
"nocodb-sdk": "file:../nocodb-sdk",
"papaparse": "^5.3.2",
"socket.io-client": "^4.5.1",
"sortablejs": "^1.15.0",

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

@ -1,12 +1,12 @@
{
"name": "nocodb-sdk",
"version": "0.98.2",
"version": "0.98.3",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "nocodb-sdk",
"version": "0.98.2",
"version": "0.98.3",
"license": "MIT",
"dependencies": {
"axios": "^0.21.1",

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

@ -74,7 +74,7 @@
"nc-lib-gui": "0.98.3",
"nc-plugin": "0.1.2",
"ncp": "^2.0.0",
"nocodb-sdk": "0.98.3",
"nocodb-sdk": "file:../nocodb-sdk",
"nodemailer": "^6.4.10",
"object-hash": "^3.0.0",
"ora": "^4.0.4",
@ -176,7 +176,6 @@
},
"../nocodb-sdk": {
"version": "0.98.3",
"extraneous": true,
"license": "MIT",
"dependencies": {
"axios": "^0.21.1",
@ -15500,16 +15499,8 @@
}
},
"node_modules/nocodb-sdk": {
"version": "0.98.3",
"resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.98.3.tgz",
"integrity": "sha512-UXnn0HS9giFGTEeCo4e7Kb5ZvvDNOWzukxHW/otHjcF2L7byE571BAyhzZkbnPegbum1Y0VSY4YzrJf2AQOGAA==",
"dependencies": {
"axios": "^0.21.1",
"jsep": "^1.3.6"
},
"engines": {
"node": ">=10"
}
"resolved": "../nocodb-sdk",
"link": true
},
"node_modules/node-addon-api": {
"version": "2.0.0",
@ -36943,12 +36934,33 @@
}
},
"nocodb-sdk": {
"version": "0.98.3",
"resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.98.3.tgz",
"integrity": "sha512-UXnn0HS9giFGTEeCo4e7Kb5ZvvDNOWzukxHW/otHjcF2L7byE571BAyhzZkbnPegbum1Y0VSY4YzrJf2AQOGAA==",
"version": "file:../nocodb-sdk",
"requires": {
"@ava/typescript": "^1.1.1",
"@istanbuljs/nyc-config-typescript": "^1.0.1",
"@typescript-eslint/eslint-plugin": "^4.0.1",
"@typescript-eslint/parser": "^4.0.1",
"ava": "^3.12.1",
"axios": "^0.21.1",
"jsep": "^1.3.6"
"codecov": "^3.5.0",
"cspell": "^4.1.0",
"cz-conventional-changelog": "^3.3.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",
"gh-pages": "^3.1.0",
"jsep": "^1.3.6",
"npm-run-all": "^4.1.5",
"nyc": "^15.1.0",
"open-cli": "^6.0.1",
"prettier": "^2.1.1",
"standard-version": "^9.0.0",
"ts-node": "^9.0.0",
"typedoc": "^0.23.16",
"typescript": "^4.0.2"
}
},
"node-addon-api": {

2
packages/nocodb/package.json
Unescape View File

@ -159,7 +159,7 @@
"nc-lib-gui": "0.98.3",
"nc-plugin": "0.1.2",
"ncp": "^2.0.0",
"nocodb-sdk": "0.98.3",
"nocodb-sdk": "file:../nocodb-sdk",
"nodemailer": "^6.4.10",
"object-hash": "^3.0.0",
"ora": "^4.0.4",

Write Preview
Loading…
Cancel
Save