From 122db55dcecccbc39b5ca36c1ce6cd28a5155dd3 Mon Sep 17 00:00:00 2001 From: adrinr Date: Mon, 10 Apr 2023 18:47:22 +0100 Subject: [PATCH 01/14] Fix tests --- .../src/api/routes/global/tests/scim.spec.ts | 46 +++---------------- packages/worker/src/tests/api/scim/shared.ts | 3 +- 2 files changed, 8 insertions(+), 41 deletions(-) diff --git a/packages/worker/src/api/routes/global/tests/scim.spec.ts b/packages/worker/src/api/routes/global/tests/scim.spec.ts index 3dff3fb7a5..6c411a640d 100644 --- a/packages/worker/src/api/routes/global/tests/scim.spec.ts +++ b/packages/worker/src/api/routes/global/tests/scim.spec.ts @@ -399,53 +399,19 @@ describe("scim", () => { }) it.each([false, "false", "False"])( - "can deactive an active user (sending %s)", + "deactivating an active user (sending %s) will delete it", async activeValue => { const body: ScimUpdateRequest = { schemas: ["urn:ietf:params:scim:api:messages:2.0:PatchOp"], Operations: [{ op: "Replace", path: "active", value: activeValue }], } - const response = await patchScimUser({ id: user.id, body }) + await patchScimUser( + { id: user.id, body }, + { expect: 204, skipContentTypeCheck: true } + ) - const expectedScimUser: ScimUserResponse = { - ...user, - active: false, - } - expect(response).toEqual(expectedScimUser) - - const persistedUser = await config.api.scimUsersAPI.find(user.id) - expect(persistedUser).toEqual(expectedScimUser) - } - ) - - it.each([true, "true", "True"])( - "can activate an inactive user (sending %s)", - async activeValue => { - // Deactivate user - await patchScimUser({ - id: user.id, - body: { - schemas: ["urn:ietf:params:scim:api:messages:2.0:PatchOp"], - Operations: [{ op: "Replace", path: "active", value: true }], - }, - }) - - const body: ScimUpdateRequest = { - schemas: ["urn:ietf:params:scim:api:messages:2.0:PatchOp"], - Operations: [{ op: "Replace", path: "active", value: activeValue }], - } - - const response = await patchScimUser({ id: user.id, body }) - - const expectedScimUser: ScimUserResponse = { - ...user, - active: true, - } - expect(response).toEqual(expectedScimUser) - - const persistedUser = await config.api.scimUsersAPI.find(user.id) - expect(persistedUser).toEqual(expectedScimUser) + await config.api.scimUsersAPI.find(user.id, { expect: 404 }) } ) diff --git a/packages/worker/src/tests/api/scim/shared.ts b/packages/worker/src/tests/api/scim/shared.ts index d99f4c20dc..1b064b8f41 100644 --- a/packages/worker/src/tests/api/scim/shared.ts +++ b/packages/worker/src/tests/api/scim/shared.ts @@ -4,6 +4,7 @@ import { TestAPI } from "../base" const defaultConfig = { expect: 200, setHeaders: true, + skipContentTypeCheck: false, } export type RequestSettings = typeof defaultConfig @@ -27,7 +28,7 @@ export abstract class ScimTestAPI extends TestAPI { "application/scim+json; charset=utf-8" ) - if (method !== "delete") { + if (method !== "delete" && !requestSettings?.skipContentTypeCheck) { request = request.expect("Content-Type", /json/) } From 2cc2b94346fdabc796a5501caa41ff94047b29bc Mon Sep 17 00:00:00 2001 From: Maurits Lourens Date: Mon, 10 Apr 2023 20:45:29 +0200 Subject: [PATCH 02/14] fix small typo (#10252) --- packages/client/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 786220d31c..9970553ed9 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -785,7 +785,7 @@ "barStyle": "picker", "options": [ { - "label": "Extra amall", + "label": "Extra small", "value": "XS" }, { From a3c0510ed702b49125cce6309f89f3f46c4fc604 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 10 Apr 2023 18:53:08 +0000 Subject: [PATCH 03/14] v2.4.44-alpha.10 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index 88a21a349a..5b8b7d25d9 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.44-alpha.9", + "version": "2.4.44-alpha.10", "npmClient": "yarn", "packages": ["packages/*"], "command": { diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index a81f4772d1..a0621e0b3a 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.44-alpha.9", + "version": "2.4.44-alpha.10", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.4.44-alpha.9", + "@budibase/types": "2.4.44-alpha.10", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 643dc9cbaa..806e5878a0 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": "2.4.44-alpha.9", + "version": "2.4.44-alpha.10", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.4.44-alpha.9", - "@budibase/string-templates": "2.4.44-alpha.9", + "@budibase/shared-core": "2.4.44-alpha.10", + "@budibase/string-templates": "2.4.44-alpha.10", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 0faf293b3c..96035e4143 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.44-alpha.9", + "version": "2.4.44-alpha.10", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.4.44-alpha.9", - "@budibase/client": "2.4.44-alpha.9", - "@budibase/frontend-core": "2.4.44-alpha.9", - "@budibase/shared-core": "2.4.44-alpha.9", - "@budibase/string-templates": "2.4.44-alpha.9", + "@budibase/bbui": "2.4.44-alpha.10", + "@budibase/client": "2.4.44-alpha.10", + "@budibase/frontend-core": "2.4.44-alpha.10", + "@budibase/shared-core": "2.4.44-alpha.10", + "@budibase/string-templates": "2.4.44-alpha.10", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 894616a22e..ae8daf020f 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.44-alpha.9", + "version": "2.4.44-alpha.10", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.4.44-alpha.9", - "@budibase/string-templates": "2.4.44-alpha.9", - "@budibase/types": "2.4.44-alpha.9", + "@budibase/backend-core": "2.4.44-alpha.10", + "@budibase/string-templates": "2.4.44-alpha.10", + "@budibase/types": "2.4.44-alpha.10", "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 9fcf7b0820..421db90ac5 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.44-alpha.9", + "version": "2.4.44-alpha.10", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.4.44-alpha.9", - "@budibase/frontend-core": "2.4.44-alpha.9", - "@budibase/shared-core": "2.4.44-alpha.9", - "@budibase/string-templates": "2.4.44-alpha.9", - "@budibase/types": "2.4.44-alpha.9", + "@budibase/bbui": "2.4.44-alpha.10", + "@budibase/frontend-core": "2.4.44-alpha.10", + "@budibase/shared-core": "2.4.44-alpha.10", + "@budibase/string-templates": "2.4.44-alpha.10", + "@budibase/types": "2.4.44-alpha.10", "@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 b512f6a423..ebec2bd299 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.44-alpha.9", + "version": "2.4.44-alpha.10", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.4.44-alpha.9", - "@budibase/shared-core": "2.4.44-alpha.9", + "@budibase/bbui": "2.4.44-alpha.10", + "@budibase/shared-core": "2.4.44-alpha.10", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index c42a07b72e..c358681ab2 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.44-alpha.9", + "version": "2.4.44-alpha.10", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index df259e0a1f..368b44524f 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.4.44-alpha.9", + "version": "2.4.44-alpha.10", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.4.44-alpha.9", - "@budibase/client": "2.4.44-alpha.9", + "@budibase/backend-core": "2.4.44-alpha.10", + "@budibase/client": "2.4.44-alpha.10", "@budibase/pro": "2.4.44-alpha.9", - "@budibase/shared-core": "2.4.44-alpha.9", - "@budibase/string-templates": "2.4.44-alpha.9", - "@budibase/types": "2.4.44-alpha.9", + "@budibase/shared-core": "2.4.44-alpha.10", + "@budibase/string-templates": "2.4.44-alpha.10", + "@budibase/types": "2.4.44-alpha.10", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index a807898cc1..404c85eb23 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.44-alpha.9", + "version": "2.4.44-alpha.10", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.4.44-alpha.9" + "@budibase/types": "2.4.44-alpha.10" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 4f0106563e..50b2c3bae1 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.44-alpha.9", + "version": "2.4.44-alpha.10", "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 f3b32a04b6..3090c8e9cc 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.44-alpha.9", + "version": "2.4.44-alpha.10", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index d138001e2e..08451546b7 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.4.44-alpha.9", + "version": "2.4.44-alpha.10", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.4.44-alpha.9", + "@budibase/backend-core": "2.4.44-alpha.10", "@budibase/pro": "2.4.44-alpha.9", - "@budibase/string-templates": "2.4.44-alpha.9", - "@budibase/types": "2.4.44-alpha.9", + "@budibase/string-templates": "2.4.44-alpha.10", + "@budibase/types": "2.4.44-alpha.10", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 069fb642453baba891bb0b951c2eb1ebd43a945d Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 10 Apr 2023 18:55:59 +0000 Subject: [PATCH 04/14] Update pro version to 2.4.44-alpha.10 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 368b44524f..42151e8ca4 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.4.44-alpha.10", "@budibase/client": "2.4.44-alpha.10", - "@budibase/pro": "2.4.44-alpha.9", + "@budibase/pro": "2.4.44-alpha.10", "@budibase/shared-core": "2.4.44-alpha.10", "@budibase/string-templates": "2.4.44-alpha.10", "@budibase/types": "2.4.44-alpha.10", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index dbfd5dae0c..d9989e8de1 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1290,14 +1290,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.44-alpha.9": - version "2.4.44-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.9.tgz#ea2f1ec39fe0a97172b00e551f9e3b51f860e53b" - integrity sha512-uuZEqeyXnVwyNDPSwI8gF8zCv26PWvhbLoEYXMQqNl9J9q5g4i/lNacfKs1x9JDPABHE93mtLL5eoTogzrqTIg== +"@budibase/backend-core@2.4.44-alpha.10": + version "2.4.44-alpha.10" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.10.tgz#02fdc24dad37fa244b9e3c7df731f355c9a5927a" + integrity sha512-mhwXyc366dxy+U8aU74I+tVr0b5TmVEqRH+sY/EG3u6wJgwatyz5e5Pq9srftJX/+nM+jXiu27oIKFUx4v+IkA== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "2.4.44-alpha.9" + "@budibase/types" "2.4.44-alpha.10" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1430,15 +1430,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.44-alpha.9": - version "2.4.44-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.9.tgz#f6a5bcfb607ebb2138762e53a04ad55cf6de6014" - integrity sha512-cPUXlt9XQ0DlwoR47wLiLGEQlib6vKW15cLkh0pkz57vHbr5T22Ix4G7vgKGPVr5kpaJVNVdYLxBZ3qy8hUnJQ== +"@budibase/pro@2.4.44-alpha.10": + version "2.4.44-alpha.10" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.10.tgz#48bba3422f0f90cb2948c109f7e518b98a1ef37e" + integrity sha512-E+WmuLnYu5B6R/C8h8vtLSNdENANKI71cWbXifPwI8lfnRVZxVyW0v98EWknZWGSpF55y8G8AUlKLTkDDOkZkA== dependencies: - "@budibase/backend-core" "2.4.44-alpha.9" + "@budibase/backend-core" "2.4.44-alpha.10" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.4.44-alpha.9" + "@budibase/types" "2.4.44-alpha.10" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1491,10 +1491,10 @@ resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.1.tgz#1679657aa180d9c59afa1dffa611bff0638bd933" integrity sha512-Sq+8HfM75EBMoOvKYFwELdlxmVN6wNZMofDjT/2G+9aF+Zfe5Tzw69C+unmdBgcGGjGCHEYWSz4mF0v8FPAGbg== -"@budibase/types@2.4.44-alpha.9": - version "2.4.44-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.9.tgz#a64fad8252f196bcb2a5fbd53f89ff5a90745813" - integrity sha512-auXyD1A1MZ42KYMaQpnHBgXbR3O3t6oycYESwhbkIaTHw3f9ir3m8Sus5R1eMI7YqI8nWjB6y9tW6lZoIAd/Pg== +"@budibase/types@2.4.44-alpha.10": + version "2.4.44-alpha.10" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.10.tgz#4f5a13948dc95cbe3a6fe305259159207b37b1d9" + integrity sha512-ZvBRXevf3L/N/4fn0pC96CDYXDrElY7C2pn6JlysLoaJMOr3bSQWf1PaslP1/E9gS7XFIKye1wN9VIWIHa0QLg== dependencies: scim-patch "^0.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 08451546b7..1ce16f7aaf 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.4.44-alpha.10", - "@budibase/pro": "2.4.44-alpha.9", + "@budibase/pro": "2.4.44-alpha.10", "@budibase/string-templates": "2.4.44-alpha.10", "@budibase/types": "2.4.44-alpha.10", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index c09dc187d3..605c183a10 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.44-alpha.9": - version "2.4.44-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.9.tgz#ea2f1ec39fe0a97172b00e551f9e3b51f860e53b" - integrity sha512-uuZEqeyXnVwyNDPSwI8gF8zCv26PWvhbLoEYXMQqNl9J9q5g4i/lNacfKs1x9JDPABHE93mtLL5eoTogzrqTIg== +"@budibase/backend-core@2.4.44-alpha.10": + version "2.4.44-alpha.10" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.10.tgz#02fdc24dad37fa244b9e3c7df731f355c9a5927a" + integrity sha512-mhwXyc366dxy+U8aU74I+tVr0b5TmVEqRH+sY/EG3u6wJgwatyz5e5Pq9srftJX/+nM+jXiu27oIKFUx4v+IkA== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "2.4.44-alpha.9" + "@budibase/types" "2.4.44-alpha.10" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -565,15 +565,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.44-alpha.9": - version "2.4.44-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.9.tgz#f6a5bcfb607ebb2138762e53a04ad55cf6de6014" - integrity sha512-cPUXlt9XQ0DlwoR47wLiLGEQlib6vKW15cLkh0pkz57vHbr5T22Ix4G7vgKGPVr5kpaJVNVdYLxBZ3qy8hUnJQ== +"@budibase/pro@2.4.44-alpha.10": + version "2.4.44-alpha.10" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.10.tgz#48bba3422f0f90cb2948c109f7e518b98a1ef37e" + integrity sha512-E+WmuLnYu5B6R/C8h8vtLSNdENANKI71cWbXifPwI8lfnRVZxVyW0v98EWknZWGSpF55y8G8AUlKLTkDDOkZkA== dependencies: - "@budibase/backend-core" "2.4.44-alpha.9" + "@budibase/backend-core" "2.4.44-alpha.10" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.4.44-alpha.9" + "@budibase/types" "2.4.44-alpha.10" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -608,10 +608,10 @@ resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.1.tgz#1679657aa180d9c59afa1dffa611bff0638bd933" integrity sha512-Sq+8HfM75EBMoOvKYFwELdlxmVN6wNZMofDjT/2G+9aF+Zfe5Tzw69C+unmdBgcGGjGCHEYWSz4mF0v8FPAGbg== -"@budibase/types@2.4.44-alpha.9": - version "2.4.44-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.9.tgz#a64fad8252f196bcb2a5fbd53f89ff5a90745813" - integrity sha512-auXyD1A1MZ42KYMaQpnHBgXbR3O3t6oycYESwhbkIaTHw3f9ir3m8Sus5R1eMI7YqI8nWjB6y9tW6lZoIAd/Pg== +"@budibase/types@2.4.44-alpha.10": + version "2.4.44-alpha.10" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.10.tgz#4f5a13948dc95cbe3a6fe305259159207b37b1d9" + integrity sha512-ZvBRXevf3L/N/4fn0pC96CDYXDrElY7C2pn6JlysLoaJMOr3bSQWf1PaslP1/E9gS7XFIKye1wN9VIWIHa0QLg== dependencies: scim-patch "^0.7.0" From e552a265f3485649980a7cec5b367a0e48da33a2 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Tue, 11 Apr 2023 08:04:02 +0100 Subject: [PATCH 05/14] Add loadEnvFiles to lerna config for run command to prevent local test failures (#10251) --- lerna.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lerna.json b/lerna.json index 5b8b7d25d9..562f2d5e09 100644 --- a/lerna.json +++ b/lerna.json @@ -11,6 +11,9 @@ "# We ignore every JSON file, except for built-in-modules, built-ins and plugins defined in babel-preset-env/data.", "@(!(built-in-modules|built-ins|plugins|package)).json" ] + }, + "run": { + "loadEnvFiles": false } } } From 6aefc6b643bce2dc9b63c44ab953ec89c04e6e35 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 11 Apr 2023 12:28:43 +0000 Subject: [PATCH 06/14] v2.4.44-alpha.11 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index 562f2d5e09..ec62402383 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.44-alpha.10", + "version": "2.4.44-alpha.11", "npmClient": "yarn", "packages": ["packages/*"], "command": { diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index a0621e0b3a..e49cdafe68 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.44-alpha.10", + "version": "2.4.44-alpha.11", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.4.44-alpha.10", + "@budibase/types": "2.4.44-alpha.11", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 806e5878a0..0096c488bd 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": "2.4.44-alpha.10", + "version": "2.4.44-alpha.11", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.4.44-alpha.10", - "@budibase/string-templates": "2.4.44-alpha.10", + "@budibase/shared-core": "2.4.44-alpha.11", + "@budibase/string-templates": "2.4.44-alpha.11", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 96035e4143..fb9b0b3edd 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.44-alpha.10", + "version": "2.4.44-alpha.11", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.4.44-alpha.10", - "@budibase/client": "2.4.44-alpha.10", - "@budibase/frontend-core": "2.4.44-alpha.10", - "@budibase/shared-core": "2.4.44-alpha.10", - "@budibase/string-templates": "2.4.44-alpha.10", + "@budibase/bbui": "2.4.44-alpha.11", + "@budibase/client": "2.4.44-alpha.11", + "@budibase/frontend-core": "2.4.44-alpha.11", + "@budibase/shared-core": "2.4.44-alpha.11", + "@budibase/string-templates": "2.4.44-alpha.11", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index ae8daf020f..1aa8317113 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.44-alpha.10", + "version": "2.4.44-alpha.11", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.4.44-alpha.10", - "@budibase/string-templates": "2.4.44-alpha.10", - "@budibase/types": "2.4.44-alpha.10", + "@budibase/backend-core": "2.4.44-alpha.11", + "@budibase/string-templates": "2.4.44-alpha.11", + "@budibase/types": "2.4.44-alpha.11", "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 421db90ac5..0f3e6d212c 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.44-alpha.10", + "version": "2.4.44-alpha.11", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.4.44-alpha.10", - "@budibase/frontend-core": "2.4.44-alpha.10", - "@budibase/shared-core": "2.4.44-alpha.10", - "@budibase/string-templates": "2.4.44-alpha.10", - "@budibase/types": "2.4.44-alpha.10", + "@budibase/bbui": "2.4.44-alpha.11", + "@budibase/frontend-core": "2.4.44-alpha.11", + "@budibase/shared-core": "2.4.44-alpha.11", + "@budibase/string-templates": "2.4.44-alpha.11", + "@budibase/types": "2.4.44-alpha.11", "@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 ebec2bd299..06bd691802 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.44-alpha.10", + "version": "2.4.44-alpha.11", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.4.44-alpha.10", - "@budibase/shared-core": "2.4.44-alpha.10", + "@budibase/bbui": "2.4.44-alpha.11", + "@budibase/shared-core": "2.4.44-alpha.11", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index c358681ab2..a029d825af 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.44-alpha.10", + "version": "2.4.44-alpha.11", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 42151e8ca4..e15990c44c 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.4.44-alpha.10", + "version": "2.4.44-alpha.11", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.4.44-alpha.10", - "@budibase/client": "2.4.44-alpha.10", + "@budibase/backend-core": "2.4.44-alpha.11", + "@budibase/client": "2.4.44-alpha.11", "@budibase/pro": "2.4.44-alpha.10", - "@budibase/shared-core": "2.4.44-alpha.10", - "@budibase/string-templates": "2.4.44-alpha.10", - "@budibase/types": "2.4.44-alpha.10", + "@budibase/shared-core": "2.4.44-alpha.11", + "@budibase/string-templates": "2.4.44-alpha.11", + "@budibase/types": "2.4.44-alpha.11", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 404c85eb23..8c1c829035 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.44-alpha.10", + "version": "2.4.44-alpha.11", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.4.44-alpha.10" + "@budibase/types": "2.4.44-alpha.11" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 50b2c3bae1..9cc24a3edb 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.44-alpha.10", + "version": "2.4.44-alpha.11", "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 3090c8e9cc..da8f6226dd 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.44-alpha.10", + "version": "2.4.44-alpha.11", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 1ce16f7aaf..7add48f0ca 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.4.44-alpha.10", + "version": "2.4.44-alpha.11", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.4.44-alpha.10", + "@budibase/backend-core": "2.4.44-alpha.11", "@budibase/pro": "2.4.44-alpha.10", - "@budibase/string-templates": "2.4.44-alpha.10", - "@budibase/types": "2.4.44-alpha.10", + "@budibase/string-templates": "2.4.44-alpha.11", + "@budibase/types": "2.4.44-alpha.11", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 0acb821b7068d0f0b40abe22569cf52419877d6f Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 11 Apr 2023 12:31:40 +0000 Subject: [PATCH 07/14] Update pro version to 2.4.44-alpha.11 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index e15990c44c..99c49139e0 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.4.44-alpha.11", "@budibase/client": "2.4.44-alpha.11", - "@budibase/pro": "2.4.44-alpha.10", + "@budibase/pro": "2.4.44-alpha.11", "@budibase/shared-core": "2.4.44-alpha.11", "@budibase/string-templates": "2.4.44-alpha.11", "@budibase/types": "2.4.44-alpha.11", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index d9989e8de1..f6de440c36 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1290,14 +1290,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.44-alpha.10": - version "2.4.44-alpha.10" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.10.tgz#02fdc24dad37fa244b9e3c7df731f355c9a5927a" - integrity sha512-mhwXyc366dxy+U8aU74I+tVr0b5TmVEqRH+sY/EG3u6wJgwatyz5e5Pq9srftJX/+nM+jXiu27oIKFUx4v+IkA== +"@budibase/backend-core@2.4.44-alpha.11": + version "2.4.44-alpha.11" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.11.tgz#fc84683ccc66c210e850e7796ba61ceef6f3fbba" + integrity sha512-Gk30FS/D9LQTUZ7KSOk7MVL9+ftodTKEbRVYuXQTt+tU/gZ1nDEFRE/aNoTVeAUinxWneC+KYtBdyuotSmWidQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "2.4.44-alpha.10" + "@budibase/types" "2.4.44-alpha.11" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1430,15 +1430,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.44-alpha.10": - version "2.4.44-alpha.10" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.10.tgz#48bba3422f0f90cb2948c109f7e518b98a1ef37e" - integrity sha512-E+WmuLnYu5B6R/C8h8vtLSNdENANKI71cWbXifPwI8lfnRVZxVyW0v98EWknZWGSpF55y8G8AUlKLTkDDOkZkA== +"@budibase/pro@2.4.44-alpha.11": + version "2.4.44-alpha.11" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.11.tgz#a5dd39bfc8e25d7ab589ad83b870a99add92597c" + integrity sha512-JNogKz98Vb6i9kfcqhQaCl96i84E5i5H0azSxFPf+6+c4PS1VCTbWYf8FCQzTvubqU5ZJaN2uSVgbA4pXxUiFA== dependencies: - "@budibase/backend-core" "2.4.44-alpha.10" + "@budibase/backend-core" "2.4.44-alpha.11" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.4.44-alpha.10" + "@budibase/types" "2.4.44-alpha.11" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1491,10 +1491,10 @@ resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.1.tgz#1679657aa180d9c59afa1dffa611bff0638bd933" integrity sha512-Sq+8HfM75EBMoOvKYFwELdlxmVN6wNZMofDjT/2G+9aF+Zfe5Tzw69C+unmdBgcGGjGCHEYWSz4mF0v8FPAGbg== -"@budibase/types@2.4.44-alpha.10": - version "2.4.44-alpha.10" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.10.tgz#4f5a13948dc95cbe3a6fe305259159207b37b1d9" - integrity sha512-ZvBRXevf3L/N/4fn0pC96CDYXDrElY7C2pn6JlysLoaJMOr3bSQWf1PaslP1/E9gS7XFIKye1wN9VIWIHa0QLg== +"@budibase/types@2.4.44-alpha.11": + version "2.4.44-alpha.11" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.11.tgz#e4daf6f0367d73df981992b61b65b069bfa7ac78" + integrity sha512-jN+1vcEyvvQhOt6BRBLKF4EYSSw8ULfmHYm+GmEdqZmgGE348c3arskWnkBUXc0crBIVAnG7ZLDG/R/cwAOn7g== dependencies: scim-patch "^0.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 7add48f0ca..e767d3dba4 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.4.44-alpha.11", - "@budibase/pro": "2.4.44-alpha.10", + "@budibase/pro": "2.4.44-alpha.11", "@budibase/string-templates": "2.4.44-alpha.11", "@budibase/types": "2.4.44-alpha.11", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 605c183a10..43b5408f69 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.44-alpha.10": - version "2.4.44-alpha.10" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.10.tgz#02fdc24dad37fa244b9e3c7df731f355c9a5927a" - integrity sha512-mhwXyc366dxy+U8aU74I+tVr0b5TmVEqRH+sY/EG3u6wJgwatyz5e5Pq9srftJX/+nM+jXiu27oIKFUx4v+IkA== +"@budibase/backend-core@2.4.44-alpha.11": + version "2.4.44-alpha.11" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.11.tgz#fc84683ccc66c210e850e7796ba61ceef6f3fbba" + integrity sha512-Gk30FS/D9LQTUZ7KSOk7MVL9+ftodTKEbRVYuXQTt+tU/gZ1nDEFRE/aNoTVeAUinxWneC+KYtBdyuotSmWidQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "2.4.44-alpha.10" + "@budibase/types" "2.4.44-alpha.11" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -565,15 +565,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.44-alpha.10": - version "2.4.44-alpha.10" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.10.tgz#48bba3422f0f90cb2948c109f7e518b98a1ef37e" - integrity sha512-E+WmuLnYu5B6R/C8h8vtLSNdENANKI71cWbXifPwI8lfnRVZxVyW0v98EWknZWGSpF55y8G8AUlKLTkDDOkZkA== +"@budibase/pro@2.4.44-alpha.11": + version "2.4.44-alpha.11" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.11.tgz#a5dd39bfc8e25d7ab589ad83b870a99add92597c" + integrity sha512-JNogKz98Vb6i9kfcqhQaCl96i84E5i5H0azSxFPf+6+c4PS1VCTbWYf8FCQzTvubqU5ZJaN2uSVgbA4pXxUiFA== dependencies: - "@budibase/backend-core" "2.4.44-alpha.10" + "@budibase/backend-core" "2.4.44-alpha.11" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.4.44-alpha.10" + "@budibase/types" "2.4.44-alpha.11" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -608,10 +608,10 @@ resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.1.tgz#1679657aa180d9c59afa1dffa611bff0638bd933" integrity sha512-Sq+8HfM75EBMoOvKYFwELdlxmVN6wNZMofDjT/2G+9aF+Zfe5Tzw69C+unmdBgcGGjGCHEYWSz4mF0v8FPAGbg== -"@budibase/types@2.4.44-alpha.10": - version "2.4.44-alpha.10" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.10.tgz#4f5a13948dc95cbe3a6fe305259159207b37b1d9" - integrity sha512-ZvBRXevf3L/N/4fn0pC96CDYXDrElY7C2pn6JlysLoaJMOr3bSQWf1PaslP1/E9gS7XFIKye1wN9VIWIHa0QLg== +"@budibase/types@2.4.44-alpha.11": + version "2.4.44-alpha.11" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.11.tgz#e4daf6f0367d73df981992b61b65b069bfa7ac78" + integrity sha512-jN+1vcEyvvQhOt6BRBLKF4EYSSw8ULfmHYm+GmEdqZmgGE348c3arskWnkBUXc0crBIVAnG7ZLDG/R/cwAOn7g== dependencies: scim-patch "^0.7.0" From 57a3ff96ea7e231357368360dd1b985d39976821 Mon Sep 17 00:00:00 2001 From: adrinr Date: Wed, 5 Apr 2023 10:56:55 +0100 Subject: [PATCH 08/14] Add new test for conflicting user email --- packages/worker/src/api/routes/global/tests/scim.spec.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/worker/src/api/routes/global/tests/scim.spec.ts b/packages/worker/src/api/routes/global/tests/scim.spec.ts index 6c411a640d..e76e6b6cda 100644 --- a/packages/worker/src/api/routes/global/tests/scim.spec.ts +++ b/packages/worker/src/api/routes/global/tests/scim.spec.ts @@ -318,6 +318,15 @@ describe("scim", () => { await postScimUser({ body }, { expect: 500 }) }) }) + + it("creating an existing user name returns a conflict", async () => { + const body = structures.scim.createUserRequest() + + await postScimUser({ body }) + + const res = await postScimUser({ body }, { expect: 409 }) + expect((res as any).message).toBe("Email already in use") + }) }) describe("GET /api/global/scim/v2/users/:id", () => { From e1279ffecdb93fbfe9fe47923b652b1ca1a2b998 Mon Sep 17 00:00:00 2001 From: adrinr Date: Mon, 10 Apr 2023 20:06:47 +0100 Subject: [PATCH 09/14] Use proper errors instead of string throwing --- packages/backend-core/src/errors/errors.ts | 8 ++++++++ packages/worker/src/sdk/users/users.ts | 7 ++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/packages/backend-core/src/errors/errors.ts b/packages/backend-core/src/errors/errors.ts index 54ca8456ab..0a632d7551 100644 --- a/packages/backend-core/src/errors/errors.ts +++ b/packages/backend-core/src/errors/errors.ts @@ -97,3 +97,11 @@ export class InvalidAPIKeyError extends BudibaseError { ) } } + +// USERS + +export class EmailUnavailableError extends Error { + constructor(email: string) { + super(`Email already taken: '${email}'`) + } +} diff --git a/packages/worker/src/sdk/users/users.ts b/packages/worker/src/sdk/users/users.ts index f05c6b98d2..2150654ae9 100644 --- a/packages/worker/src/sdk/users/users.ts +++ b/packages/worker/src/sdk/users/users.ts @@ -16,6 +16,7 @@ import { ViewName, env as coreEnv, context, + EmailUnavailableError, } from "@budibase/backend-core" import { AccountMetadata, @@ -158,7 +159,7 @@ const validateUniqueUser = async (email: string, tenantId: string) => { if (env.MULTI_TENANCY) { const tenantUser = await getPlatformUser(email) if (tenantUser != null && tenantUser.tenantId !== tenantId) { - throw `Unavailable` + throw new EmailUnavailableError(email) } } @@ -166,7 +167,7 @@ const validateUniqueUser = async (email: string, tenantId: string) => { if (!env.SELF_HOSTED && !env.DISABLE_ACCOUNT_PORTAL) { const account = await accounts.getAccount(email) if (account && account.verified && account.tenantId !== tenantId) { - throw `Unavailable` + throw new EmailUnavailableError(email) } } } @@ -235,7 +236,7 @@ export const save = async ( // no id was specified - load from email instead dbUser = await usersCore.getGlobalUserByEmail(email) if (dbUser && dbUser._id !== _id) { - throw `Unavailable` + throw new EmailUnavailableError(email) } } From 56567de04a406eae501ae81bb8006ed0a42b71e8 Mon Sep 17 00:00:00 2001 From: adrinr Date: Mon, 10 Apr 2023 20:12:42 +0100 Subject: [PATCH 10/14] Fix tests --- .../worker/src/api/routes/global/tests/users.spec.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/worker/src/api/routes/global/tests/users.spec.ts b/packages/worker/src/api/routes/global/tests/users.spec.ts index d1afa0191e..0311669355 100644 --- a/packages/worker/src/api/routes/global/tests/users.spec.ts +++ b/packages/worker/src/api/routes/global/tests/users.spec.ts @@ -48,7 +48,7 @@ describe("/api/global/users", () => { 400 ) - expect(res.body.message).toBe("Unavailable") + expect(res.body.message).toBe(`Unavailable`) expect(sendMailMock).toHaveBeenCalledTimes(0) expect(code).toBeUndefined() expect(events.user.invited).toBeCalledTimes(0) @@ -225,7 +225,7 @@ describe("/api/global/users", () => { const response = await config.api.users.saveUser(user, 400) - expect(response.body.message).toBe(`Unavailable`) + expect(response.body.message).toBe(`Email already taken: '${user.email}'`) expect(events.user.created).toBeCalledTimes(0) }) @@ -237,7 +237,9 @@ describe("/api/global/users", () => { delete user._id const response = await config.api.users.saveUser(user, 400) - expect(response.body.message).toBe(`Unavailable`) + expect(response.body.message).toBe( + `Email already taken: '${user.email}'` + ) expect(events.user.created).toBeCalledTimes(0) }) }) @@ -249,7 +251,7 @@ describe("/api/global/users", () => { const response = await config.api.users.saveUser(user, 400) - expect(response.body.message).toBe(`Unavailable`) + expect(response.body.message).toBe(`Email already taken: '${user.email}'`) expect(events.user.created).toBeCalledTimes(0) }) From c77ed3d737e3469668de5cacf608ad823f7c4588 Mon Sep 17 00:00:00 2001 From: adrinr Date: Mon, 10 Apr 2023 20:17:51 +0100 Subject: [PATCH 11/14] Renames --- packages/backend-core/src/errors/errors.ts | 2 +- .../worker/src/api/routes/global/tests/users.spec.ts | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/backend-core/src/errors/errors.ts b/packages/backend-core/src/errors/errors.ts index 0a632d7551..4e1f1abbb5 100644 --- a/packages/backend-core/src/errors/errors.ts +++ b/packages/backend-core/src/errors/errors.ts @@ -102,6 +102,6 @@ export class InvalidAPIKeyError extends BudibaseError { export class EmailUnavailableError extends Error { constructor(email: string) { - super(`Email already taken: '${email}'`) + super(`Email already in use: '${email}'`) } } diff --git a/packages/worker/src/api/routes/global/tests/users.spec.ts b/packages/worker/src/api/routes/global/tests/users.spec.ts index 0311669355..52d77cbae6 100644 --- a/packages/worker/src/api/routes/global/tests/users.spec.ts +++ b/packages/worker/src/api/routes/global/tests/users.spec.ts @@ -225,7 +225,9 @@ describe("/api/global/users", () => { const response = await config.api.users.saveUser(user, 400) - expect(response.body.message).toBe(`Email already taken: '${user.email}'`) + expect(response.body.message).toBe( + `Email already in use: '${user.email}'` + ) expect(events.user.created).toBeCalledTimes(0) }) @@ -238,7 +240,7 @@ describe("/api/global/users", () => { const response = await config.api.users.saveUser(user, 400) expect(response.body.message).toBe( - `Email already taken: '${user.email}'` + `Email already in use: '${user.email}'` ) expect(events.user.created).toBeCalledTimes(0) }) @@ -251,7 +253,9 @@ describe("/api/global/users", () => { const response = await config.api.users.saveUser(user, 400) - expect(response.body.message).toBe(`Email already taken: '${user.email}'`) + expect(response.body.message).toBe( + `Email already in use: '${user.email}'` + ) expect(events.user.created).toBeCalledTimes(0) }) From 9a330b85f89989dc47b937b8f12706feee101936 Mon Sep 17 00:00:00 2001 From: adrinr Date: Tue, 11 Apr 2023 14:20:15 +0100 Subject: [PATCH 12/14] Fix timeouts --- packages/server/src/api/routes/tests/automation.spec.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/server/src/api/routes/tests/automation.spec.js b/packages/server/src/api/routes/tests/automation.spec.js index 2eae5e2a61..47daa8975b 100644 --- a/packages/server/src/api/routes/tests/automation.spec.js +++ b/packages/server/src/api/routes/tests/automation.spec.js @@ -19,11 +19,14 @@ describe("/automations", () => { afterAll(setup.afterAll) - // For some reason this cannot be a beforeAll or the test "tests the automation successfully" fail - beforeEach(async () => { + beforeAll(async () => { await config.init() }) + beforeEach(() => { + events.automation.deleted.mockClear() + }) + describe("get definitions", () => { it("returns a list of definitions for actions", async () => { const res = await request From 08dbee5384c0f3f1b1d67763d12934cccd38bda8 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 11 Apr 2023 13:42:48 +0000 Subject: [PATCH 13/14] v2.4.44-alpha.12 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index ec62402383..29c24ab35e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.44-alpha.11", + "version": "2.4.44-alpha.12", "npmClient": "yarn", "packages": ["packages/*"], "command": { diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index e49cdafe68..9d3f75c583 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.44-alpha.11", + "version": "2.4.44-alpha.12", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.4.44-alpha.11", + "@budibase/types": "2.4.44-alpha.12", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 0096c488bd..c019e4165c 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": "2.4.44-alpha.11", + "version": "2.4.44-alpha.12", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.4.44-alpha.11", - "@budibase/string-templates": "2.4.44-alpha.11", + "@budibase/shared-core": "2.4.44-alpha.12", + "@budibase/string-templates": "2.4.44-alpha.12", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index fb9b0b3edd..97fac1e9a4 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.44-alpha.11", + "version": "2.4.44-alpha.12", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.4.44-alpha.11", - "@budibase/client": "2.4.44-alpha.11", - "@budibase/frontend-core": "2.4.44-alpha.11", - "@budibase/shared-core": "2.4.44-alpha.11", - "@budibase/string-templates": "2.4.44-alpha.11", + "@budibase/bbui": "2.4.44-alpha.12", + "@budibase/client": "2.4.44-alpha.12", + "@budibase/frontend-core": "2.4.44-alpha.12", + "@budibase/shared-core": "2.4.44-alpha.12", + "@budibase/string-templates": "2.4.44-alpha.12", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 1aa8317113..f4d530646b 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.44-alpha.11", + "version": "2.4.44-alpha.12", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.4.44-alpha.11", - "@budibase/string-templates": "2.4.44-alpha.11", - "@budibase/types": "2.4.44-alpha.11", + "@budibase/backend-core": "2.4.44-alpha.12", + "@budibase/string-templates": "2.4.44-alpha.12", + "@budibase/types": "2.4.44-alpha.12", "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 0f3e6d212c..82768ccc16 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.44-alpha.11", + "version": "2.4.44-alpha.12", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.4.44-alpha.11", - "@budibase/frontend-core": "2.4.44-alpha.11", - "@budibase/shared-core": "2.4.44-alpha.11", - "@budibase/string-templates": "2.4.44-alpha.11", - "@budibase/types": "2.4.44-alpha.11", + "@budibase/bbui": "2.4.44-alpha.12", + "@budibase/frontend-core": "2.4.44-alpha.12", + "@budibase/shared-core": "2.4.44-alpha.12", + "@budibase/string-templates": "2.4.44-alpha.12", + "@budibase/types": "2.4.44-alpha.12", "@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 06bd691802..7577e7c092 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.4.44-alpha.11", + "version": "2.4.44-alpha.12", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.4.44-alpha.11", - "@budibase/shared-core": "2.4.44-alpha.11", + "@budibase/bbui": "2.4.44-alpha.12", + "@budibase/shared-core": "2.4.44-alpha.12", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index a029d825af..852948bce7 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.44-alpha.11", + "version": "2.4.44-alpha.12", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 99c49139e0..7bdda5a4e5 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.4.44-alpha.11", + "version": "2.4.44-alpha.12", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.4.44-alpha.11", - "@budibase/client": "2.4.44-alpha.11", + "@budibase/backend-core": "2.4.44-alpha.12", + "@budibase/client": "2.4.44-alpha.12", "@budibase/pro": "2.4.44-alpha.11", - "@budibase/shared-core": "2.4.44-alpha.11", - "@budibase/string-templates": "2.4.44-alpha.11", - "@budibase/types": "2.4.44-alpha.11", + "@budibase/shared-core": "2.4.44-alpha.12", + "@budibase/string-templates": "2.4.44-alpha.12", + "@budibase/types": "2.4.44-alpha.12", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 8c1c829035..941285aa7e 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.4.44-alpha.11", + "version": "2.4.44-alpha.12", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.4.44-alpha.11" + "@budibase/types": "2.4.44-alpha.12" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 9cc24a3edb..3b871d1d56 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.44-alpha.11", + "version": "2.4.44-alpha.12", "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 da8f6226dd..4704f28e5e 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.44-alpha.11", + "version": "2.4.44-alpha.12", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index e767d3dba4..df26cbdac3 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.4.44-alpha.11", + "version": "2.4.44-alpha.12", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.4.44-alpha.11", + "@budibase/backend-core": "2.4.44-alpha.12", "@budibase/pro": "2.4.44-alpha.11", - "@budibase/string-templates": "2.4.44-alpha.11", - "@budibase/types": "2.4.44-alpha.11", + "@budibase/string-templates": "2.4.44-alpha.12", + "@budibase/types": "2.4.44-alpha.12", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 2e60ca7526384a3a8549b5607e0a771a29d17c4a Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 11 Apr 2023 13:46:00 +0000 Subject: [PATCH 14/14] Update pro version to 2.4.44-alpha.12 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 7bdda5a4e5..eb88e27bbe 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.4.44-alpha.12", "@budibase/client": "2.4.44-alpha.12", - "@budibase/pro": "2.4.44-alpha.11", + "@budibase/pro": "2.4.44-alpha.12", "@budibase/shared-core": "2.4.44-alpha.12", "@budibase/string-templates": "2.4.44-alpha.12", "@budibase/types": "2.4.44-alpha.12", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index f6de440c36..b0a06f30c0 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1290,14 +1290,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.44-alpha.11": - version "2.4.44-alpha.11" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.11.tgz#fc84683ccc66c210e850e7796ba61ceef6f3fbba" - integrity sha512-Gk30FS/D9LQTUZ7KSOk7MVL9+ftodTKEbRVYuXQTt+tU/gZ1nDEFRE/aNoTVeAUinxWneC+KYtBdyuotSmWidQ== +"@budibase/backend-core@2.4.44-alpha.12": + version "2.4.44-alpha.12" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.12.tgz#ac5617e6ccb844252fb998ea8daac2d635fe9b95" + integrity sha512-KB7WzDNYqdV3XEII4qyER6BXkkKPBA9UBZ+9QOHUsJgdDWyJjZQUXho5T4DOdFUNCsNrZ0MCMOZWNBG6W5bTXg== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "2.4.44-alpha.11" + "@budibase/types" "2.4.44-alpha.12" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1430,15 +1430,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.44-alpha.11": - version "2.4.44-alpha.11" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.11.tgz#a5dd39bfc8e25d7ab589ad83b870a99add92597c" - integrity sha512-JNogKz98Vb6i9kfcqhQaCl96i84E5i5H0azSxFPf+6+c4PS1VCTbWYf8FCQzTvubqU5ZJaN2uSVgbA4pXxUiFA== +"@budibase/pro@2.4.44-alpha.12": + version "2.4.44-alpha.12" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.12.tgz#964c0f0fd0b9c2e7cfbb1a39a455d84ea6c927ba" + integrity sha512-C1VXMKGvdzu55rVbTad1SE37EXPA36OWzFQ1IC6YEl4cs7bR6x7e8yXmn2LBH7uk8qArmjMrYJPKSmIlSHYfcA== dependencies: - "@budibase/backend-core" "2.4.44-alpha.11" + "@budibase/backend-core" "2.4.44-alpha.12" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.4.44-alpha.11" + "@budibase/types" "2.4.44-alpha.12" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1491,10 +1491,10 @@ resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.1.tgz#1679657aa180d9c59afa1dffa611bff0638bd933" integrity sha512-Sq+8HfM75EBMoOvKYFwELdlxmVN6wNZMofDjT/2G+9aF+Zfe5Tzw69C+unmdBgcGGjGCHEYWSz4mF0v8FPAGbg== -"@budibase/types@2.4.44-alpha.11": - version "2.4.44-alpha.11" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.11.tgz#e4daf6f0367d73df981992b61b65b069bfa7ac78" - integrity sha512-jN+1vcEyvvQhOt6BRBLKF4EYSSw8ULfmHYm+GmEdqZmgGE348c3arskWnkBUXc0crBIVAnG7ZLDG/R/cwAOn7g== +"@budibase/types@2.4.44-alpha.12": + version "2.4.44-alpha.12" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.12.tgz#cb7ad803f81ae2fd57412ef744b7dc953227b755" + integrity sha512-BJz4HtMVxnRJ+PJdgkJkRiL9FVMZPMx5ReikWalJPb2cYrceNsyZy04avuedIBCnS5S+6HXhGi7Hezlnm4unQQ== dependencies: scim-patch "^0.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index df26cbdac3..42cb8a18d3 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.4.44-alpha.12", - "@budibase/pro": "2.4.44-alpha.11", + "@budibase/pro": "2.4.44-alpha.12", "@budibase/string-templates": "2.4.44-alpha.12", "@budibase/types": "2.4.44-alpha.12", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 43b5408f69..de0a8e9656 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.44-alpha.11": - version "2.4.44-alpha.11" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.11.tgz#fc84683ccc66c210e850e7796ba61ceef6f3fbba" - integrity sha512-Gk30FS/D9LQTUZ7KSOk7MVL9+ftodTKEbRVYuXQTt+tU/gZ1nDEFRE/aNoTVeAUinxWneC+KYtBdyuotSmWidQ== +"@budibase/backend-core@2.4.44-alpha.12": + version "2.4.44-alpha.12" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.12.tgz#ac5617e6ccb844252fb998ea8daac2d635fe9b95" + integrity sha512-KB7WzDNYqdV3XEII4qyER6BXkkKPBA9UBZ+9QOHUsJgdDWyJjZQUXho5T4DOdFUNCsNrZ0MCMOZWNBG6W5bTXg== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "2.4.44-alpha.11" + "@budibase/types" "2.4.44-alpha.12" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -565,15 +565,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.44-alpha.11": - version "2.4.44-alpha.11" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.11.tgz#a5dd39bfc8e25d7ab589ad83b870a99add92597c" - integrity sha512-JNogKz98Vb6i9kfcqhQaCl96i84E5i5H0azSxFPf+6+c4PS1VCTbWYf8FCQzTvubqU5ZJaN2uSVgbA4pXxUiFA== +"@budibase/pro@2.4.44-alpha.12": + version "2.4.44-alpha.12" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.12.tgz#964c0f0fd0b9c2e7cfbb1a39a455d84ea6c927ba" + integrity sha512-C1VXMKGvdzu55rVbTad1SE37EXPA36OWzFQ1IC6YEl4cs7bR6x7e8yXmn2LBH7uk8qArmjMrYJPKSmIlSHYfcA== dependencies: - "@budibase/backend-core" "2.4.44-alpha.11" + "@budibase/backend-core" "2.4.44-alpha.12" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.4.44-alpha.11" + "@budibase/types" "2.4.44-alpha.12" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -608,10 +608,10 @@ resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.1.tgz#1679657aa180d9c59afa1dffa611bff0638bd933" integrity sha512-Sq+8HfM75EBMoOvKYFwELdlxmVN6wNZMofDjT/2G+9aF+Zfe5Tzw69C+unmdBgcGGjGCHEYWSz4mF0v8FPAGbg== -"@budibase/types@2.4.44-alpha.11": - version "2.4.44-alpha.11" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.11.tgz#e4daf6f0367d73df981992b61b65b069bfa7ac78" - integrity sha512-jN+1vcEyvvQhOt6BRBLKF4EYSSw8ULfmHYm+GmEdqZmgGE348c3arskWnkBUXc0crBIVAnG7ZLDG/R/cwAOn7g== +"@budibase/types@2.4.44-alpha.12": + version "2.4.44-alpha.12" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.12.tgz#cb7ad803f81ae2fd57412ef744b7dc953227b755" + integrity sha512-BJz4HtMVxnRJ+PJdgkJkRiL9FVMZPMx5ReikWalJPb2cYrceNsyZy04avuedIBCnS5S+6HXhGi7Hezlnm4unQQ== dependencies: scim-patch "^0.7.0"