MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5961 from Budibase/merge-master 

Merge master
This commit is contained in:
Rory Powell 2022-05-18 14:37:59 +01:00 committed by GitHub
parent 82acb63cfa 2ce76881f2
commit 882dc5ab5e
13 changed files with 52 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,5 +1,5 @@
{
"version": "1.0.164-alpha.4",
"version": "1.0.166",
"npmClient": "yarn",
"packages": [
"packages/*"

2
packages/backend-core/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/backend-core",
"version": "1.0.164-alpha.4",
"version": "1.0.166",
"description": "Budibase backend core libraries used in server and worker",
"main": "src/index.js",
"author": "Budibase",

4
packages/bbui/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/bbui",
"description": "A UI solution used in the different Budibase projects.",
"version": "1.0.164-alpha.4",
"version": "1.0.166",
"license": "MPL-2.0",
"svelte": "src/index.js",
"module": "dist/bbui.es.js",
@ -38,7 +38,7 @@
],
"dependencies": {
"@adobe/spectrum-css-workflow-icons": "^1.2.1",
"@budibase/string-templates": "^1.0.164-alpha.4",
"@budibase/string-templates": "^1.0.166",
"@spectrum-css/actionbutton": "^1.0.1",
"@spectrum-css/actiongroup": "^1.0.1",
"@spectrum-css/avatar": "^3.0.2",

10
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/builder",
"version": "1.0.164-alpha.4",
"version": "1.0.166",
"license": "GPL-3.0",
"private": true,
"scripts": {
@ -67,10 +67,10 @@
}
},
"dependencies": {
"@budibase/bbui": "^1.0.164-alpha.4",
"@budibase/client": "^1.0.164-alpha.4",
"@budibase/frontend-core": "^1.0.164-alpha.4",
"@budibase/string-templates": "^1.0.164-alpha.4",
"@budibase/bbui": "^1.0.166",
"@budibase/client": "^1.0.166",
"@budibase/frontend-core": "^1.0.166",
"@budibase/string-templates": "^1.0.166",
"@sentry/browser": "5.19.1",
"@spectrum-css/page": "^3.0.1",
"@spectrum-css/vars": "^3.0.1",

2
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/cli",
"version": "1.0.164-alpha.4",
"version": "1.0.166",
"description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "src/index.js",
"bin": {

8
packages/client/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/client",
"version": "1.0.164-alpha.4",
"version": "1.0.166",
"license": "MPL-2.0",
"module": "dist/budibase-client.js",
"main": "dist/budibase-client.js",
@ -19,9 +19,9 @@
"dev:builder": "rollup -cw"
},
"dependencies": {
"@budibase/bbui": "^1.0.164-alpha.4",
"@budibase/frontend-core": "^1.0.164-alpha.4",
"@budibase/string-templates": "^1.0.164-alpha.4",
"@budibase/bbui": "^1.0.166",
"@budibase/frontend-core": "^1.0.166",
"@budibase/string-templates": "^1.0.166",
"@spectrum-css/button": "^3.0.3",
"@spectrum-css/card": "^3.0.3",
"@spectrum-css/divider": "^1.0.3",

4
packages/frontend-core/package.json
View File

@ -1,12 +1,12 @@
{
"name": "@budibase/frontend-core",
"version": "1.0.164-alpha.4",
"version": "1.0.166",
"description": "Budibase frontend core libraries used in builder and client",
"author": "Budibase",
"license": "MPL-2.0",
"svelte": "src/index.js",
"dependencies": {
"@budibase/bbui": "^1.0.164-alpha.4",
"@budibase/bbui": "^1.0.166",
"lodash": "^4.17.21",
"svelte": "^3.46.2"
}

11
packages/server/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/server",
"email": "hi@budibase.com",
"version": "1.0.164-alpha.4",
"version": "1.0.166",
"description": "Budibase Web Server",
"main": "src/index.ts",
"repository": {
@ -69,10 +69,10 @@
"license": "GPL-3.0",
"dependencies": {
"@apidevtools/swagger-parser": "^10.0.3",
"@budibase/backend-core": "^1.0.164-alpha.4",
"@budibase/client": "^1.0.164-alpha.4",
"@budibase/pro": "1.0.164-alpha.4",
"@budibase/string-templates": "^1.0.164-alpha.4",
"@budibase/backend-core": "^1.0.166",
"@budibase/client": "^1.0.166",
"@budibase/pro": "1.0.166",
"@budibase/string-templates": "^1.0.166",
"@bull-board/api": "^3.7.0",
"@bull-board/koa": "^3.7.0",
"@elastic/elasticsearch": "7.10.0",
@ -146,6 +146,7 @@
"@budibase/standard-components": "^0.9.139",
"@jest/test-sequencer": "^24.8.0",
"@types/apidoc": "^0.50.0",
"@types/bson": "^4.2.0",
"@types/bull": "^3.15.1",
"@types/google-spreadsheet": "^3.1.5",
"@types/jest": "^27.4.1",

21
packages/server/src/integrations/mongodb.ts
View File

@ -113,29 +113,20 @@ module MongoDBModule {
}
parseQueryParams(params: string, mode: string) {
let queryParams = params.split(/(?<=(},)).*{/g)
let group1 = queryParams[0]
let group2 = queryParams[2]
let group3 = queryParams[4]
if (group1) {
group1 = JSON.parse(group1.replace(/,+$/, ""))
}
if (group2) {
group2 = JSON.parse("{" + group2.replace(/,+$/, ""))
}
if (group3) {
group3 = JSON.parse("{" + group3.replace(/,+$/, ""))
}
let queryParams = params.split(/(?<=}),[\n\s]*(?={)/g)
let group1 = queryParams[0] ? JSON.parse(queryParams[0]) : {}
let group2 = queryParams[1] ? JSON.parse(queryParams[1]) : {}
let group3 = queryParams[2] ? JSON.parse(queryParams[2]) : {}
if (mode === "update") {
return {
filter: group1,
update: group2,
options: group3 ?? {},
options: group3,
}
}
return {
filter: group1,
options: group2 ?? {},
options: group2,
}
}

20
packages/server/yarn.lock
View File

@ -1014,10 +1014,10 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.0.163":
version "1.0.163"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.163.tgz#290f471f9a3d81537c710412920c167e860c89bd"
integrity sha512-rqjTj4b11NJK5Qj9Uxc4krFTIveL/+3ubjXYd7Djh94RIJ9LZ0vRMUYPJqqWxpsQFTEmr1viNG4YeQgph5IcnQ==
"@budibase/backend-core@1.0.164":
version "1.0.164"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.164.tgz#08c111dcebf5c74159a3c18218c7b3a0716de4f6"
integrity sha512-lpMudezndUD1hHBLfT9LDNKCunj8rQNlaJb30/xggdIUvp718u/jVP54hXF26NYxXOTMZ0EvMwCsIS4AucJ1Mg==
dependencies:
"@techpass/passport-openidconnect" "^0.3.0"
aws-sdk "^2.901.0"
@ -1091,12 +1091,12 @@
svelte-flatpickr "^3.2.3"
svelte-portal "^1.0.0"
"@budibase/pro@1.0.163":
version "1.0.163"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.163.tgz#5de1e026c390ae52678d3a37e5b5b45d3010b8f2"
integrity sha512-KG7YZ1CAyMDuV+brTuj9eJNm5r5Wd9zF4BJoYlMLMTCqQs0cC3e+nw4qcjFUkz86PrrBNQopbMi0tQg7jPg5Dg==
"@budibase/pro@1.0.164":
version "1.0.164"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.164.tgz#780ae38893d0609c87bf51fe96cc2c35bbdb431a"
integrity sha512-PgF7q2vADPPYzet4Wdma+THWuQPrEnN1+TfRly4l0oS9SUxutog3hYn0TlPmPS0AHgrqG/1v65TcEdC4ucX8TA==
dependencies:
"@budibase/backend-core" "1.0.163"
"@budibase/backend-core" "1.0.164"
node-fetch "^2.6.1"
"@budibase/standard-components@^0.9.139":
@ -2430,7 +2430,7 @@
"@types/connect" "*"
"@types/node" "*"
"@types/bson@*":
"@types/bson@*", "@types/bson@^4.2.0":
version "4.2.0"
resolved "https://registry.yarnpkg.com/@types/bson/-/bson-4.2.0.tgz#a2f71e933ff54b2c3bf267b67fa221e295a33337"
integrity sha512-ELCPqAdroMdcuxqwMgUpifQyRoTpyYCNr1V9xKyF40VsBobsj+BbWNRvwGchMgBPGqkw655ypkjj2MEF5ywVwg==

2
packages/string-templates/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/string-templates",
"version": "1.0.164-alpha.4",
"version": "1.0.166",
"description": "Handlebars wrapper for Budibase templating.",
"main": "src/index.cjs",
"module": "dist/bundle.mjs",

8
packages/worker/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/worker",
"email": "hi@budibase.com",
"version": "1.0.164-alpha.4",
"version": "1.0.166",
"description": "Budibase background service",
"main": "src/index.ts",
"repository": {
@ -31,9 +31,9 @@
"author": "Budibase",
"license": "GPL-3.0",
"dependencies": {
"@budibase/backend-core": "^1.0.164-alpha.4",
"@budibase/pro": "1.0.164-alpha.4",
"@budibase/string-templates": "^1.0.164-alpha.4",
"@budibase/backend-core": "^1.0.166",
"@budibase/pro": "1.0.166",
"@budibase/string-templates": "^1.0.166",
"@koa/router": "^8.0.0",
"@sentry/node": "6.17.7",
"@techpass/passport-openidconnect": "^0.3.0",

18
packages/worker/yarn.lock
View File

@ -293,10 +293,10 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.0.163":
version "1.0.163"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.163.tgz#290f471f9a3d81537c710412920c167e860c89bd"
integrity sha512-rqjTj4b11NJK5Qj9Uxc4krFTIveL/+3ubjXYd7Djh94RIJ9LZ0vRMUYPJqqWxpsQFTEmr1viNG4YeQgph5IcnQ==
"@budibase/backend-core@1.0.164":
version "1.0.164"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.164.tgz#08c111dcebf5c74159a3c18218c7b3a0716de4f6"
integrity sha512-lpMudezndUD1hHBLfT9LDNKCunj8rQNlaJb30/xggdIUvp718u/jVP54hXF26NYxXOTMZ0EvMwCsIS4AucJ1Mg==
dependencies:
"@techpass/passport-openidconnect" "^0.3.0"
aws-sdk "^2.901.0"
@ -321,12 +321,12 @@
uuid "^8.3.2"
zlib "^1.0.5"
"@budibase/pro@1.0.163":
version "1.0.163"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.163.tgz#5de1e026c390ae52678d3a37e5b5b45d3010b8f2"
integrity sha512-KG7YZ1CAyMDuV+brTuj9eJNm5r5Wd9zF4BJoYlMLMTCqQs0cC3e+nw4qcjFUkz86PrrBNQopbMi0tQg7jPg5Dg==
"@budibase/pro@1.0.164":
version "1.0.164"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.164.tgz#780ae38893d0609c87bf51fe96cc2c35bbdb431a"
integrity sha512-PgF7q2vADPPYzet4Wdma+THWuQPrEnN1+TfRly4l0oS9SUxutog3hYn0TlPmPS0AHgrqG/1v65TcEdC4ucX8TA==
dependencies:
"@budibase/backend-core" "1.0.163"
"@budibase/backend-core" "1.0.164"
node-fetch "^2.6.1"
"@cspotcode/source-map-consumer@0.8.0":