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

Merge branch 'develop' of github.com:Budibase/budibase into public-api-sdk

This commit is contained in:
Andrew Kingston 2022-09-21 09:09:27 +01:00
parent 0fe1696b18 2787b5498a
commit b9bee3aede
15 changed files with 73 additions and 62 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.4.3-alpha.0",
"version": "1.4.3-alpha.2",
"npmClient": "yarn",
"packages": [
"packages/*"

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

@ -1,6 +1,6 @@
{
"name": "@budibase/backend-core",
"version": "1.4.3-alpha.0",
"version": "1.4.3-alpha.2",
"description": "Budibase backend core libraries used in server and worker",
"main": "dist/src/index.js",
"types": "dist/src/index.d.ts",
@ -20,7 +20,7 @@
"test:watch": "jest --watchAll"
},
"dependencies": {
"@budibase/types": "1.4.3-alpha.0",
"@budibase/types": "1.4.3-alpha.2",
"@shopify/jest-koa-mocks": "5.0.1",
"@techpass/passport-openidconnect": "0.3.2",
"aws-sdk": "2.1030.0",

9
packages/backend-core/src/plugin/utils.js
View File

@ -75,6 +75,15 @@ function validateDatasource(schema) {
})
.unknown(true)
.required(),
extra: joi.object().pattern(
joi.string(),
joi.object({
type: joi.string().required(),
displayName: joi.string().required(),
required: joi.boolean(),
data: joi.object(),
})
),
}),
})
runJoi(validator, schema)

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.4.3-alpha.0",
"version": "1.4.3-alpha.2",
"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.4.3-alpha.0",
"@budibase/string-templates": "1.4.3-alpha.2",
"@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.4.3-alpha.0",
"version": "1.4.3-alpha.2",
"license": "GPL-3.0",
"private": true,
"scripts": {
@ -71,10 +71,10 @@
}
},
"dependencies": {
"@budibase/bbui": "1.4.3-alpha.0",
"@budibase/client": "1.4.3-alpha.0",
"@budibase/frontend-core": "1.4.3-alpha.0",
"@budibase/string-templates": "1.4.3-alpha.0",
"@budibase/bbui": "1.4.3-alpha.2",
"@budibase/client": "1.4.3-alpha.2",
"@budibase/frontend-core": "1.4.3-alpha.2",
"@budibase/string-templates": "1.4.3-alpha.2",
"@sentry/browser": "5.19.1",
"@spectrum-css/page": "^3.0.1",
"@spectrum-css/vars": "^3.0.1",

4
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/cli",
"version": "1.4.3-alpha.0",
"version": "1.4.3-alpha.2",
"description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "src/index.js",
"bin": {
@ -26,7 +26,7 @@
"outputPath": "build"
},
"dependencies": {
"@budibase/backend-core": "1.4.3-alpha.0",
"@budibase/backend-core": "1.4.3-alpha.2",
"axios": "0.21.2",
"chalk": "4.1.0",
"cli-progress": "3.11.2",

8
packages/client/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/client",
"version": "1.4.3-alpha.0",
"version": "1.4.3-alpha.2",
"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.4.3-alpha.0",
"@budibase/frontend-core": "1.4.3-alpha.0",
"@budibase/string-templates": "1.4.3-alpha.0",
"@budibase/bbui": "1.4.3-alpha.2",
"@budibase/frontend-core": "1.4.3-alpha.2",
"@budibase/string-templates": "1.4.3-alpha.2",
"@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.4.3-alpha.0",
"version": "1.4.3-alpha.2",
"description": "Budibase frontend core libraries used in builder and client",
"author": "Budibase",
"license": "MPL-2.0",
"svelte": "src/index.js",
"dependencies": {
"@budibase/bbui": "1.4.3-alpha.0",
"@budibase/bbui": "1.4.3-alpha.2",
"lodash": "^4.17.21",
"svelte": "^3.46.2"
}

12
packages/server/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/server",
"email": "hi@budibase.com",
"version": "1.4.3-alpha.0",
"version": "1.4.3-alpha.2",
"description": "Budibase Web Server",
"main": "src/index.ts",
"repository": {
@ -77,11 +77,11 @@
"license": "GPL-3.0",
"dependencies": {
"@apidevtools/swagger-parser": "10.0.3",
"@budibase/backend-core": "1.4.3-alpha.0",
"@budibase/client": "1.4.3-alpha.0",
"@budibase/pro": "1.4.3-alpha.0",
"@budibase/string-templates": "1.4.3-alpha.0",
"@budibase/types": "1.4.3-alpha.0",
"@budibase/backend-core": "1.4.3-alpha.2",
"@budibase/client": "1.4.3-alpha.2",
"@budibase/pro": "1.4.3-alpha.2",
"@budibase/string-templates": "1.4.3-alpha.2",
"@budibase/types": "1.4.3-alpha.2",
"@bull-board/api": "3.7.0",
"@bull-board/koa": "3.9.4",
"@elastic/elasticsearch": "7.10.0",

30
packages/server/yarn.lock
View File

@ -1094,12 +1094,12 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.4.3-alpha.0":
version "1.4.3-alpha.0"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.3-alpha.0.tgz#5b96bd4f41fb8692daeeb1ac95c2960b9344ca88"
integrity sha512-erkKqDBTJx4XXmVGclm63AVmFZL0ziR4Go1S5tJJHhLpxqrd3STN1HNzfCIi59f35Cqc0VMp9LouS2u0Uly+KQ==
"@budibase/backend-core@1.4.3-alpha.2":
version "1.4.3-alpha.2"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.3-alpha.2.tgz#7e0ccffd393004e45c24cc633b296e2bdcd978a5"
integrity sha512-K40Hz2n0ESlfn4YWs5NL21kvY+NNX4aTatMyWBfz4ifio554ry0qZ6gZP4lxtj/shg5eedmldmDKJ2T+FiR2pA==
dependencies:
"@budibase/types" "1.4.3-alpha.0"
"@budibase/types" "1.4.3-alpha.2"
"@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0"
@ -1180,13 +1180,13 @@
svelte-flatpickr "^3.2.3"
svelte-portal "^1.0.0"
"@budibase/pro@1.4.3-alpha.0":
version "1.4.3-alpha.0"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.3-alpha.0.tgz#5e356146eb8822d21a22b2c280f4f7ff856277f5"
integrity sha512-xkPyFg0Nvv88GlnC7h1Hh3FhR8C3Y3UpUPdUNg7zpkEUs/q0r13R9lM8jSrY0CsqCJleTZ+G8AECS9V5sWBH/w==
"@budibase/pro@1.4.3-alpha.2":
version "1.4.3-alpha.2"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.3-alpha.2.tgz#044aa5cf0e55793a914b9e0c6e931b8a9f5e8f39"
integrity sha512-TakJ8A8RY6VwxRYZ4528zD3rQOwJW422sNrUbOcOK9H08B/EFltXMZBP+Okk9sX8e9/8+0pxGQLQ6RdKHYYXww==
dependencies:
"@budibase/backend-core" "1.4.3-alpha.0"
"@budibase/types" "1.4.3-alpha.0"
"@budibase/backend-core" "1.4.3-alpha.2"
"@budibase/types" "1.4.3-alpha.2"
"@koa/router" "8.0.8"
joi "17.6.0"
node-fetch "^2.6.1"
@ -1209,10 +1209,10 @@
svelte-apexcharts "^1.0.2"
svelte-flatpickr "^3.1.0"
"@budibase/types@1.4.3-alpha.0":
version "1.4.3-alpha.0"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.3-alpha.0.tgz#7a440dc3c6bee2167dc1c8a6be1af717ef4764b4"
integrity sha512-0AuWmIGrXfhQvkWgoT8Uvsk+6lZhom5bE3JpI2mAmixiZKJSg+GPPFua1Uw1JLdjznVTropCDF2zoEPd/+oKxw==
"@budibase/types@1.4.3-alpha.2":
version "1.4.3-alpha.2"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.3-alpha.2.tgz#55d52cb8f3fc1a56b9d5b008ddc9b3e46f3e078e"
integrity sha512-2kOrlHjtjfgYqaE8JAGV5X5FHSIzeb2LqSsUDzWHIlVWk9r0/bZ2NTvAvFMT5LSImfF4A4qbNXS0ZVtqjX2qzw==
"@bull-board/api@3.7.0":
version "3.7.0"

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

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

2
packages/types/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/types",
"version": "1.4.3-alpha.0",
"version": "1.4.3-alpha.2",
"description": "Budibase types",
"main": "dist/index.js",
"types": "dist/index.d.ts",

10
packages/worker/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/worker",
"email": "hi@budibase.com",
"version": "1.4.3-alpha.0",
"version": "1.4.3-alpha.2",
"description": "Budibase background service",
"main": "src/index.ts",
"repository": {
@ -36,10 +36,10 @@
"author": "Budibase",
"license": "GPL-3.0",
"dependencies": {
"@budibase/backend-core": "1.4.3-alpha.0",
"@budibase/pro": "1.4.3-alpha.0",
"@budibase/string-templates": "1.4.3-alpha.0",
"@budibase/types": "1.4.3-alpha.0",
"@budibase/backend-core": "1.4.3-alpha.2",
"@budibase/pro": "1.4.3-alpha.2",
"@budibase/string-templates": "1.4.3-alpha.2",
"@budibase/types": "1.4.3-alpha.2",
"@koa/router": "8.0.8",
"@sentry/node": "6.17.7",
"@techpass/passport-openidconnect": "0.3.2",

4
packages/worker/src/api/routes/global/email.js
View File

@ -10,7 +10,9 @@ const router = Router()
function buildEmailSendValidation() {
// prettier-ignore
return joiValidator.body(Joi.object({
email: Joi.string().email(),
email: Joi.string().email({
multiple: true,
}),
purpose: Joi.string().valid(...Object.values(EmailTemplatePurpose)),
workspaceId: Joi.string().allow("", null),
from: Joi.string().allow("", null),

30
packages/worker/yarn.lock
View File

@ -291,12 +291,12 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.4.3-alpha.0":
version "1.4.3-alpha.0"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.3-alpha.0.tgz#5b96bd4f41fb8692daeeb1ac95c2960b9344ca88"
integrity sha512-erkKqDBTJx4XXmVGclm63AVmFZL0ziR4Go1S5tJJHhLpxqrd3STN1HNzfCIi59f35Cqc0VMp9LouS2u0Uly+KQ==
"@budibase/backend-core@1.4.3-alpha.2":
version "1.4.3-alpha.2"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.3-alpha.2.tgz#7e0ccffd393004e45c24cc633b296e2bdcd978a5"
integrity sha512-K40Hz2n0ESlfn4YWs5NL21kvY+NNX4aTatMyWBfz4ifio554ry0qZ6gZP4lxtj/shg5eedmldmDKJ2T+FiR2pA==
dependencies:
"@budibase/types" "1.4.3-alpha.0"
"@budibase/types" "1.4.3-alpha.2"
"@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0"
@ -327,21 +327,21 @@
uuid "8.3.2"
zlib "1.0.5"
"@budibase/pro@1.4.3-alpha.0":
version "1.4.3-alpha.0"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.3-alpha.0.tgz#5e356146eb8822d21a22b2c280f4f7ff856277f5"
integrity sha512-xkPyFg0Nvv88GlnC7h1Hh3FhR8C3Y3UpUPdUNg7zpkEUs/q0r13R9lM8jSrY0CsqCJleTZ+G8AECS9V5sWBH/w==
"@budibase/pro@1.4.3-alpha.2":
version "1.4.3-alpha.2"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.3-alpha.2.tgz#044aa5cf0e55793a914b9e0c6e931b8a9f5e8f39"
integrity sha512-TakJ8A8RY6VwxRYZ4528zD3rQOwJW422sNrUbOcOK9H08B/EFltXMZBP+Okk9sX8e9/8+0pxGQLQ6RdKHYYXww==
dependencies:
"@budibase/backend-core" "1.4.3-alpha.0"
"@budibase/types" "1.4.3-alpha.0"
"@budibase/backend-core" "1.4.3-alpha.2"
"@budibase/types" "1.4.3-alpha.2"
"@koa/router" "8.0.8"
joi "17.6.0"
node-fetch "^2.6.1"
"@budibase/types@1.4.3-alpha.0":
version "1.4.3-alpha.0"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.3-alpha.0.tgz#7a440dc3c6bee2167dc1c8a6be1af717ef4764b4"
integrity sha512-0AuWmIGrXfhQvkWgoT8Uvsk+6lZhom5bE3JpI2mAmixiZKJSg+GPPFua1Uw1JLdjznVTropCDF2zoEPd/+oKxw==
"@budibase/types@1.4.3-alpha.2":
version "1.4.3-alpha.2"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.3-alpha.2.tgz#55d52cb8f3fc1a56b9d5b008ddc9b3e46f3e078e"
integrity sha512-2kOrlHjtjfgYqaE8JAGV5X5FHSIzeb2LqSsUDzWHIlVWk9r0/bZ2NTvAvFMT5LSImfF4A4qbNXS0ZVtqjX2qzw==
"@cspotcode/source-map-consumer@0.8.0":
version "0.8.0"