Merge branch 'develop' into cypress-updates

This commit is contained in:
Mitch-Budibase 2023-01-05 16:56:01 +00:00
commit d75bd37fb5
22 changed files with 3429 additions and 1525 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
{
"version": "2.2.10-alpha.14",
"version": "2.2.10-alpha.16",
"npmClient": "yarn",
"packages": [
"packages/*"

View File

@ -1,6 +1,6 @@
{
"name": "@budibase/backend-core",
"version": "2.2.10-alpha.14",
"version": "2.2.10-alpha.16",
"description": "Budibase backend core libraries used in server and worker",
"main": "dist/src/index.js",
"types": "dist/src/index.d.ts",
@ -23,7 +23,7 @@
},
"dependencies": {
"@budibase/nano": "10.1.1",
"@budibase/types": "2.2.10-alpha.14",
"@budibase/types": "2.2.10-alpha.16",
"@shopify/jest-koa-mocks": "5.0.1",
"@techpass/passport-openidconnect": "0.3.2",
"aws-cloudfront-sign": "2.2.0",

View File

@ -482,10 +482,10 @@
qs "^6.11.0"
tough-cookie "^4.1.2"
"@budibase/types@2.2.10-alpha.11":
version "2.2.10-alpha.11"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.11.tgz#49986cdaca3c074eb500750905029b86cb0ca057"
integrity sha512-vm0JFxTuOtMdE7dFp2q04q998JRxSsGM0ckccWnKtKNFR8xWZE2J4UsPZSEzCtogHqrZFUV2hvVqeO3YFkTXQw==
"@budibase/types@2.2.10-alpha.13":
version "2.2.10-alpha.13"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.13.tgz#abc1a5bd9295a0fa63db67912c6520d12e8d6f66"
integrity sha512-XRmLQXCLKdOADxEoGB3h4QOrHlPIqbk9jOSxyOK2RDQIy8NdQ+aXanPw3TEHkgrDIYxrClVcf4KXrujqNnrk6g==
"@cspotcode/source-map-support@^0.8.0":
version "0.8.1"
@ -3551,9 +3551,9 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
json5@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
version "2.2.3"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
jsonwebtoken@9.0.0:
version "9.0.0"

View File

@ -1,7 +1,7 @@
{
"name": "@budibase/bbui",
"description": "A UI solution used in the different Budibase projects.",
"version": "2.2.10-alpha.14",
"version": "2.2.10-alpha.16",
"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": "2.2.10-alpha.14",
"@budibase/string-templates": "2.2.10-alpha.16",
"@spectrum-css/actionbutton": "1.0.1",
"@spectrum-css/actiongroup": "1.0.1",
"@spectrum-css/avatar": "3.0.2",

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{
"name": "@budibase/cli",
"version": "2.2.10-alpha.14",
"version": "2.2.10-alpha.16",
"description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "src/index.js",
"bin": {
@ -26,9 +26,9 @@
"outputPath": "build"
},
"dependencies": {
"@budibase/backend-core": "2.2.10-alpha.14",
"@budibase/string-templates": "2.2.10-alpha.14",
"@budibase/types": "2.2.10-alpha.14",
"@budibase/backend-core": "2.2.10-alpha.16",
"@budibase/string-templates": "2.2.10-alpha.16",
"@budibase/types": "2.2.10-alpha.16",
"axios": "0.21.2",
"chalk": "4.1.0",
"cli-progress": "3.11.2",

View File

@ -1,6 +1,6 @@
{
"name": "@budibase/client",
"version": "2.2.10-alpha.14",
"version": "2.2.10-alpha.16",
"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": "2.2.10-alpha.14",
"@budibase/frontend-core": "2.2.10-alpha.14",
"@budibase/string-templates": "2.2.10-alpha.14",
"@budibase/bbui": "2.2.10-alpha.16",
"@budibase/frontend-core": "2.2.10-alpha.16",
"@budibase/string-templates": "2.2.10-alpha.16",
"@spectrum-css/button": "^3.0.3",
"@spectrum-css/card": "^3.0.3",
"@spectrum-css/divider": "^1.0.3",

File diff suppressed because it is too large Load Diff

View File

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

View File

@ -1,6 +1,6 @@
{
"name": "@budibase/sdk",
"version": "2.2.10-alpha.14",
"version": "2.2.10-alpha.16",
"description": "Budibase Public API SDK",
"author": "Budibase",
"license": "MPL-2.0",

View File

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

View File

@ -419,7 +419,7 @@ class Orchestrator {
// Delete the step after the loop step as it's irrelevant, since information is included
// in the loop step
if (wasLoopStep) {
if (wasLoopStep && !loopStep) {
this._context.steps.splice(loopStepNumber + 1, 1)
wasLoopStep = false
}
@ -438,8 +438,8 @@ class Orchestrator {
})
this._context.steps[loopStepNumber] = tempOutput
loopSteps = undefined
wasLoopStep = true
loopSteps = []
}
}

View File

@ -1273,13 +1273,13 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@2.2.10-alpha.13":
version "2.2.10-alpha.13"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.13.tgz#05452df1333c7101d6ef36d986e5fb643b6f8a8d"
integrity sha512-RFK5z9nqMoox2w5sXEjUBY5pdcmXHa+1PVDXTachxUg7wLQ2/qPDbx9FxTL1/ICpMbvfO2Bzy5ZHcjboVl7GIA==
"@budibase/backend-core@2.2.10-alpha.16":
version "2.2.10-alpha.16"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.16.tgz#4771bec465824cb31cb7e49b68e637f2524d89b0"
integrity sha512-BEX8UnWreOMX1ro0uXB3Ko3fpMH5Fc965nvfBRLkR47IlGymWOo4HutRItOCVpkI143zuUY9m6E3CfUGyo8tIw==
dependencies:
"@budibase/nano" "10.1.1"
"@budibase/types" "2.2.10-alpha.13"
"@budibase/types" "2.2.10-alpha.16"
"@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2"
aws-cloudfront-sign "2.2.0"
@ -1373,13 +1373,13 @@
qs "^6.11.0"
tough-cookie "^4.1.2"
"@budibase/pro@2.2.10-alpha.13":
version "2.2.10-alpha.13"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.13.tgz#b1ef3364ad9b379785123065bad67c18cfd28924"
integrity sha512-bdYz5S5lS1x/68csWKioMAHf8WYpYdtkri+xN3TplXj2txSAVEkt4e6KGJ2VoA9cK/bA9HtDFtbs0VyHUoXHkA==
"@budibase/pro@2.2.10-alpha.16":
version "2.2.10-alpha.16"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.16.tgz#96c7e91f764b7549eb67a7435b050ff3c4c315d5"
integrity sha512-H/ZUmiAFM3ECVAKbBS8yqVmaCyBJu4izCaCHPZLaz5FxOILPC2wUkPWQppmgWCk6lj9+5aQqsDEPAyX54DESTA==
dependencies:
"@budibase/backend-core" "2.2.10-alpha.13"
"@budibase/types" "2.2.10-alpha.13"
"@budibase/backend-core" "2.2.10-alpha.16"
"@budibase/types" "2.2.10-alpha.16"
"@koa/router" "8.0.8"
bull "4.10.1"
joi "17.6.0"
@ -1404,10 +1404,10 @@
svelte-apexcharts "^1.0.2"
svelte-flatpickr "^3.1.0"
"@budibase/types@2.2.10-alpha.13":
version "2.2.10-alpha.13"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.13.tgz#abc1a5bd9295a0fa63db67912c6520d12e8d6f66"
integrity sha512-XRmLQXCLKdOADxEoGB3h4QOrHlPIqbk9jOSxyOK2RDQIy8NdQ+aXanPw3TEHkgrDIYxrClVcf4KXrujqNnrk6g==
"@budibase/types@2.2.10-alpha.16":
version "2.2.10-alpha.16"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.16.tgz#438230e7f7a2a21df112694bc0f7566587571191"
integrity sha512-lrpJXvfesr2/ffF4HQh2eB8X9ede4SEWALIjN+upJdvgfWAAIbi23d6pk8J361QBLN5mcld9UZWhMdr8Rp6M7w==
"@bull-board/api@3.7.0":
version "3.7.0"
@ -9559,9 +9559,9 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
json5@^2.1.2, json5@^2.2.0, json5@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
version "2.2.3"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
jsonfile@^4.0.0:
version "4.0.0"

View File

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

View File

@ -2874,11 +2874,9 @@ json-parse-even-better-errors@^2.3.0:
integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
json5@^2.1.2:
version "2.2.0"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
dependencies:
minimist "^1.2.5"
version "2.2.3"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.1.0, kind-of@^3.2.0:
version "3.2.2"

View File

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

View File

@ -522,9 +522,9 @@ inherits@2, inherits@2.0.4:
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
json5@*:
version "2.2.1"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
version "2.2.3"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
koa-body@4.2.0:
version "4.2.0"

View File

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

View File

@ -470,13 +470,13 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@2.2.10-alpha.13":
version "2.2.10-alpha.13"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.13.tgz#05452df1333c7101d6ef36d986e5fb643b6f8a8d"
integrity sha512-RFK5z9nqMoox2w5sXEjUBY5pdcmXHa+1PVDXTachxUg7wLQ2/qPDbx9FxTL1/ICpMbvfO2Bzy5ZHcjboVl7GIA==
"@budibase/backend-core@2.2.10-alpha.16":
version "2.2.10-alpha.16"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.10-alpha.16.tgz#4771bec465824cb31cb7e49b68e637f2524d89b0"
integrity sha512-BEX8UnWreOMX1ro0uXB3Ko3fpMH5Fc965nvfBRLkR47IlGymWOo4HutRItOCVpkI143zuUY9m6E3CfUGyo8tIw==
dependencies:
"@budibase/nano" "10.1.1"
"@budibase/types" "2.2.10-alpha.13"
"@budibase/types" "2.2.10-alpha.16"
"@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2"
aws-cloudfront-sign "2.2.0"
@ -520,23 +520,23 @@
qs "^6.11.0"
tough-cookie "^4.1.2"
"@budibase/pro@2.2.10-alpha.13":
version "2.2.10-alpha.13"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.13.tgz#b1ef3364ad9b379785123065bad67c18cfd28924"
integrity sha512-bdYz5S5lS1x/68csWKioMAHf8WYpYdtkri+xN3TplXj2txSAVEkt4e6KGJ2VoA9cK/bA9HtDFtbs0VyHUoXHkA==
"@budibase/pro@2.2.10-alpha.16":
version "2.2.10-alpha.16"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.10-alpha.16.tgz#96c7e91f764b7549eb67a7435b050ff3c4c315d5"
integrity sha512-H/ZUmiAFM3ECVAKbBS8yqVmaCyBJu4izCaCHPZLaz5FxOILPC2wUkPWQppmgWCk6lj9+5aQqsDEPAyX54DESTA==
dependencies:
"@budibase/backend-core" "2.2.10-alpha.13"
"@budibase/types" "2.2.10-alpha.13"
"@budibase/backend-core" "2.2.10-alpha.16"
"@budibase/types" "2.2.10-alpha.16"
"@koa/router" "8.0.8"
bull "4.10.1"
joi "17.6.0"
jsonwebtoken "8.5.1"
node-fetch "^2.6.1"
"@budibase/types@2.2.10-alpha.13":
version "2.2.10-alpha.13"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.13.tgz#abc1a5bd9295a0fa63db67912c6520d12e8d6f66"
integrity sha512-XRmLQXCLKdOADxEoGB3h4QOrHlPIqbk9jOSxyOK2RDQIy8NdQ+aXanPw3TEHkgrDIYxrClVcf4KXrujqNnrk6g==
"@budibase/types@2.2.10-alpha.16":
version "2.2.10-alpha.16"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.16.tgz#438230e7f7a2a21df112694bc0f7566587571191"
integrity sha512-lrpJXvfesr2/ffF4HQh2eB8X9ede4SEWALIjN+upJdvgfWAAIbi23d6pk8J361QBLN5mcld9UZWhMdr8Rp6M7w==
"@cspotcode/source-map-support@^0.8.0":
version "0.8.1"
@ -4850,9 +4850,9 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
json5@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
version "2.2.3"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
jsonwebtoken@8.5.1, jsonwebtoken@^8.2.0:
version "8.5.1"