diff --git a/lerna.json b/lerna.json index f1858f7ecf..87ea522b04 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.4.3-alpha.0", + "version": "1.4.3-alpha.2", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 84d0814dd6..ddad708266 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -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", diff --git a/packages/backend-core/src/plugin/utils.js b/packages/backend-core/src/plugin/utils.js index 020fb4484d..ade84bf44a 100644 --- a/packages/backend-core/src/plugin/utils.js +++ b/packages/backend-core/src/plugin/utils.js @@ -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) diff --git a/packages/bbui/package.json b/packages/bbui/package.json index f6b58b0efc..8de3f1ced6 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -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", diff --git a/packages/builder/package.json b/packages/builder/package.json index bd1c3ea0e1..d80a3cfacf 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -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", diff --git a/packages/cli/package.json b/packages/cli/package.json index 415f5c3422..499acb5bfa 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -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", diff --git a/packages/client/package.json b/packages/client/package.json index ad5b286b16..3ef11a24aa 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -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", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 203eb4cbe7..bac0f054ac 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -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" } diff --git a/packages/server/package.json b/packages/server/package.json index 1dd263912e..ee6c109f64 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -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", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 6c21a21c03..593ac07e79 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -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" diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 11f32597cc..56ca048ee2 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -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", diff --git a/packages/types/package.json b/packages/types/package.json index 09b7a7baf6..3d3ad95259 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -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", diff --git a/packages/worker/package.json b/packages/worker/package.json index 962cc03396..9a49ca9d5a 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -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", diff --git a/packages/worker/src/api/routes/global/email.js b/packages/worker/src/api/routes/global/email.js index b771728a0f..940bb4d134 100644 --- a/packages/worker/src/api/routes/global/email.js +++ b/packages/worker/src/api/routes/global/email.js @@ -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), diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index d39f79b9cd..6df1ae5f67 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -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"