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/2226/head
Wing-Kam Wong 3 years ago
parent
96fc023b38 17aabddd30
commit
6bd8e9aab6
9 changed files with 58 additions and 77 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. 3
      .github/workflows/release-draft.yml
  2. 2
      .github/workflows/release-nocodb.yml
  3. 46
      packages/nc-gui/package-lock.json
  4. 2
      packages/nc-gui/package.json
  5. 2
      packages/nc-lib-gui/package.json
  6. 4
      packages/nocodb-sdk/package-lock.json
  7. 2
      packages/nocodb-sdk/package.json
  8. 64
      packages/nocodb/package-lock.json
  9. 6
      packages/nocodb/package.json

3
.github/workflows/release-draft.yml
Unescape View File

@ -21,6 +21,9 @@ on:
description: "Previous Tag"
required: true
type: string
secrets:
NC_GITHUB_TOKEN:
required: true
jobs:
build:

2
.github/workflows/release-nocodb.yml
Unescape View File

@ -78,6 +78,8 @@ jobs:
with:
tag: ${{ needs.process-input.outputs.target_tag }}
prev_tag: ${{ needs.process-input.outputs.prev_tag }}
secrets:
NC_GITHUB_TOKEN: "${{ secrets.NC_GITHUB_TOKEN }}"
# Build docker image and push to docker hub
release-docker:

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

@ -28,7 +28,7 @@
"monaco-editor": "^0.19.3",
"monaco-themes": "^0.2.5",
"nano-assign": "^1.0.1",
"nocodb-sdk": "file:../nocodb-sdk",
"nocodb-sdk": "0.91.6",
"nuxt": "^2.14.0",
"odometer": "^0.4.8",
"papaparse": "^5.3.1",
@ -73,7 +73,8 @@
}
},
"../nocodb-sdk": {
"version": "0.91.1",
"version": "0.91.3",
"extraneous": true,
"license": "MIT",
"dependencies": {
"axios": "^0.21.1",
@ -10790,8 +10791,16 @@
}
},
"node_modules/nocodb-sdk": {
"resolved": "../nocodb-sdk",
"link": true
"version": "0.91.6",
"resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.91.6.tgz",
"integrity": "sha512-nwaBAzaMF7+ns5lqZN3sPdWN4EuisD+llOma/Uy5g8GLCHBgQqY9ug5ZvkulN5hhUli2KUb2584PUImE17WX6Q==",
"dependencies": {
"axios": "^0.21.1",
"jsep": "^1.3.6"
},
"engines": {
"node": ">=10"
}
},
"node_modules/node-fetch": {
"version": "2.6.7",
@ -25426,33 +25435,12 @@
}
},
"nocodb-sdk": {
"version": "file:../nocodb-sdk",
"version": "0.91.6",
"resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.91.6.tgz",
"integrity": "sha512-nwaBAzaMF7+ns5lqZN3sPdWN4EuisD+llOma/Uy5g8GLCHBgQqY9ug5ZvkulN5hhUli2KUb2584PUImE17WX6Q==",
"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",
"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.19.0",
"typescript": "^4.0.2"
"jsep": "^1.3.6"
}
},
"node-fetch": {

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

@ -31,7 +31,7 @@
"monaco-editor": "^0.19.3",
"monaco-themes": "^0.2.5",
"nano-assign": "^1.0.1",
"nocodb-sdk": "file:../nocodb-sdk",
"nocodb-sdk": "0.91.6",
"nuxt": "^2.14.0",
"odometer": "^0.4.8",
"papaparse": "^5.3.1",

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

@ -1,6 +1,6 @@
{
"name": "nc-lib-gui",
"version": "0.91.1",
"version": "0.91.6",
"description": "> TODO: description",
"author": "“pranavxc” <pranavxc@gmail.com>",
"homepage": "https://gitlab.com/xgenecloud-ts/xgenecloud-ts#readme",

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

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

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

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

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

@ -1,12 +1,12 @@
{
"name": "nocodb",
"version": "0.91.1",
"version": "0.91.6",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "nocodb",
"version": "0.91.1",
"version": "0.91.6",
"license": "AGPL-3.0-or-later",
"dependencies": {
"@google-cloud/storage": "^5.7.2",
@ -70,10 +70,10 @@
"nanoid": "^3.1.20",
"nc-common": "0.0.6",
"nc-help": "0.2.59",
"nc-lib-gui": "0.91.1",
"nc-lib-gui": "0.91.6",
"nc-plugin": "0.1.2",
"ncp": "^2.0.0",
"nocodb-sdk": "file:../nocodb-sdk",
"nocodb-sdk": "0.91.6",
"nodemailer": "^6.4.10",
"object-hash": "^3.0.0",
"ora": "^4.0.4",
@ -155,7 +155,8 @@
}
},
"../nocodb-sdk": {
"version": "0.91.1",
"version": "0.91.3",
"extraneous": true,
"license": "MIT",
"dependencies": {
"axios": "^0.21.1",
@ -16038,9 +16039,9 @@
}
},
"node_modules/nc-lib-gui": {
"version": "0.91.1",
"resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.91.1.tgz",
"integrity": "sha512-5TPO1oPG7leOYH3sH9GnfjYGuYGdSVJs5QallLgYaEcCDVRaR1HM+1spFPqaN4fntXMr/l09zCXuS8iyjJl05g==",
"version": "0.91.6",
"resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.91.6.tgz",
"integrity": "sha512-u2QeF1W4nAhGABQrwrh0Y8CJqr3yIRt9YUVSptvUEtyGTgAITcNT6x1duJP8UONl2UjNcBFOxYMekLgppxM63w==",
"dependencies": {
"axios": "^0.19.2",
"body-parser": "^1.19.0",
@ -16162,8 +16163,16 @@
"dev": true
},
"node_modules/nocodb-sdk": {
"resolved": "../nocodb-sdk",
"link": true
"version": "0.91.6",
"resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.91.6.tgz",
"integrity": "sha512-nwaBAzaMF7+ns5lqZN3sPdWN4EuisD+llOma/Uy5g8GLCHBgQqY9ug5ZvkulN5hhUli2KUb2584PUImE17WX6Q==",
"dependencies": {
"axios": "^0.21.1",
"jsep": "^1.3.6"
},
"engines": {
"node": ">=10"
}
},
"node_modules/node-addon-api": {
"version": "2.0.0",
@ -37330,9 +37339,9 @@
}
},
"nc-lib-gui": {
"version": "0.91.1",
"resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.91.1.tgz",
"integrity": "sha512-5TPO1oPG7leOYH3sH9GnfjYGuYGdSVJs5QallLgYaEcCDVRaR1HM+1spFPqaN4fntXMr/l09zCXuS8iyjJl05g==",
"version": "0.91.6",
"resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.91.6.tgz",
"integrity": "sha512-u2QeF1W4nAhGABQrwrh0Y8CJqr3yIRt9YUVSptvUEtyGTgAITcNT6x1duJP8UONl2UjNcBFOxYMekLgppxM63w==",
"requires": {
"axios": "^0.19.2",
"body-parser": "^1.19.0",
@ -37439,33 +37448,12 @@
"dev": true
},
"nocodb-sdk": {
"version": "file:../nocodb-sdk",
"version": "0.91.6",
"resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.91.6.tgz",
"integrity": "sha512-nwaBAzaMF7+ns5lqZN3sPdWN4EuisD+llOma/Uy5g8GLCHBgQqY9ug5ZvkulN5hhUli2KUb2584PUImE17WX6Q==",
"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",
"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.19.0",
"typescript": "^4.0.2"
"jsep": "^1.3.6"
}
},
"node-addon-api": {

6
packages/nocodb/package.json
Unescape View File

@ -1,6 +1,6 @@
{
"name": "nocodb",
"version": "0.91.1",
"version": "0.91.6",
"description": "NocoDB",
"main": "dist/bundle.js",
"repository": "https://github.com/nocodb/nocodb",
@ -153,10 +153,10 @@
"nanoid": "^3.1.20",
"nc-common": "0.0.6",
"nc-help": "0.2.59",
"nc-lib-gui": "0.91.1",
"nc-lib-gui": "0.91.6",
"nc-plugin": "0.1.2",
"ncp": "^2.0.0",
"nocodb-sdk": "file:../nocodb-sdk",
"nocodb-sdk": "0.91.6",
"nodemailer": "^6.4.10",
"object-hash": "^3.0.0",
"ora": "^4.0.4",

Write Preview
Loading…
Cancel
Save