From 051d39690aec68f55f605c8cf3fc5f30c6ec26aa Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Sun, 2 Apr 2023 18:15:15 +0000 Subject: [PATCH 01/91] v2.4.44 --- 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 41735dd374..0915086cb1 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.44-alpha.1", + "version": "2.4.44", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 8dff7c1867..8c6c9367f0 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.1", + "version": "2.4.44", "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.1", + "@budibase/types": "^2.4.44", "@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 7d0af9a709..916f998311 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.1", + "version": "2.4.44", "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.1", - "@budibase/string-templates": "2.4.44-alpha.1", + "@budibase/shared-core": "^2.4.44", + "@budibase/string-templates": "^2.4.44", "@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 8d9c52e7fd..f8568f366e 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.44-alpha.1", + "version": "2.4.44", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.4.44-alpha.1", - "@budibase/client": "2.4.44-alpha.1", - "@budibase/frontend-core": "2.4.44-alpha.1", - "@budibase/shared-core": "2.4.44-alpha.1", - "@budibase/string-templates": "2.4.44-alpha.1", + "@budibase/bbui": "^2.4.44", + "@budibase/client": "^2.4.44", + "@budibase/frontend-core": "^2.4.44", + "@budibase/shared-core": "^2.4.44", + "@budibase/string-templates": "^2.4.44", "@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 0046d8cb26..ce52afe801 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.44-alpha.1", + "version": "2.4.44", "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.1", - "@budibase/string-templates": "2.4.44-alpha.1", - "@budibase/types": "2.4.44-alpha.1", + "@budibase/backend-core": "^2.4.44", + "@budibase/string-templates": "^2.4.44", + "@budibase/types": "^2.4.44", "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 102a55f6d6..61ad44d488 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.44-alpha.1", + "version": "2.4.44", "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.1", - "@budibase/frontend-core": "2.4.44-alpha.1", - "@budibase/shared-core": "2.4.44-alpha.1", - "@budibase/string-templates": "2.4.44-alpha.1", - "@budibase/types": "2.4.44-alpha.1", + "@budibase/bbui": "^2.4.44", + "@budibase/frontend-core": "^2.4.44", + "@budibase/shared-core": "^2.4.44", + "@budibase/string-templates": "^2.4.44", + "@budibase/types": "^2.4.44", "@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 4328c99303..9d1e3cef97 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.1", + "version": "2.4.44", "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.1", - "@budibase/shared-core": "2.4.44-alpha.1", + "@budibase/bbui": "^2.4.44", + "@budibase/shared-core": "^2.4.44", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 5191e6c786..92a153b09a 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.44-alpha.1", + "version": "2.4.44", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index fce3ac5b41..7b9cf0a09e 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.1", + "version": "2.4.44", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -44,12 +44,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.4.44-alpha.1", - "@budibase/client": "2.4.44-alpha.1", + "@budibase/backend-core": "^2.4.44", + "@budibase/client": "^2.4.44", "@budibase/pro": "2.4.44-alpha.1", - "@budibase/shared-core": "2.4.44-alpha.1", - "@budibase/string-templates": "2.4.44-alpha.1", - "@budibase/types": "2.4.44-alpha.1", + "@budibase/shared-core": "^2.4.44", + "@budibase/string-templates": "^2.4.44", + "@budibase/types": "^2.4.44", "@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 f53ce707b6..867c9d8d43 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.1", + "version": "2.4.44", "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.1" + "@budibase/types": "^2.4.44" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 171d90adec..355e91ea13 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.1", + "version": "2.4.44", "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 edd86ce76f..4934787316 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.44-alpha.1", + "version": "2.4.44", "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 7705f823b8..7245d34abd 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.1", + "version": "2.4.44", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.4.44-alpha.1", + "@budibase/backend-core": "^2.4.44", "@budibase/pro": "2.4.44-alpha.1", - "@budibase/string-templates": "2.4.44-alpha.1", - "@budibase/types": "2.4.44-alpha.1", + "@budibase/string-templates": "^2.4.44", + "@budibase/types": "^2.4.44", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From d68930ee6114427769d2ff7862a5b52ab5ac772a Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Sun, 2 Apr 2023 18:18:15 +0000 Subject: [PATCH 02/91] Update pro version to 2.4.44 --- 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 7b9cf0a09e..e2f0d8bb77 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -46,7 +46,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.4.44", "@budibase/client": "^2.4.44", - "@budibase/pro": "2.4.44-alpha.1", + "@budibase/pro": "2.4.44", "@budibase/shared-core": "^2.4.44", "@budibase/string-templates": "^2.4.44", "@budibase/types": "^2.4.44", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 5dea4ea009..c03bb709b8 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.1": - version "2.4.44-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.1.tgz#0c558082e54806ec6197a042b5b8333f7aa171ea" - integrity sha512-bm4WK74CcDnxJuZXtFhhyf7ZtfrUskdqZMgdqZPS9TSlvauVBnv9dcZh+ufrGlLRvR65WBYjWRg4LVQcivm8Fw== +"@budibase/backend-core@2.4.44": + version "2.4.44" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44.tgz#f71ba2c0ef87decde928dfd83dc13928c38aaa3d" + integrity sha512-M/3WL9eJbfwXnLsnR3EgE6ErG0Myaz3D3UQOTdJT/SrlwVcbMNPjjq+FJ8l+pmjxuI3xmCLMfPFcLGRzEFdoew== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "2.4.44-alpha.1" + "@budibase/types" "^2.4.44" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1429,14 +1429,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.44-alpha.1": - version "2.4.44-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.1.tgz#d0eec378bca0d4edf809319eda2c7b0967c3a5dd" - integrity sha512-d2kNUvDzKCORdDKlhwEH9naN1xc3GjJ1KCvPoYuMaYdJ8ruTLsFsDAc4ndPd05HmrBJhXpcMWev/hh80QYmcrw== +"@budibase/pro@2.4.44": + version "2.4.44" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44.tgz#0f2e51e1718e2728b070b78d5988de455ca339e5" + integrity sha512-2ouPYiAPBYkr822fAWQmi6ZCAR3XHSLuwsLRGsl2Tkbl8IL9QLuHyrZ4NZUebC7RDmFtkS7QtTKurm/jLNVdxg== dependencies: - "@budibase/backend-core" "2.4.44-alpha.1" + "@budibase/backend-core" "2.4.44" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.44-alpha.1" + "@budibase/types" "2.4.44" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1475,10 +1475,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.44-alpha.1": - version "2.4.44-alpha.1" - 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", "@budibase/types@^2.4.44": + version "2.4.44" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44.tgz#35ae607795ce6eea14a3abc45f9c7848511dc8b4" + integrity sha512-u0HzjQoa0YLwK+FeLNUEA4AN72krcuZM5yQWUDJk1P6aw7vJU0kWCxJvMEp27opdkM5oesh2imh9gPi6NYCQ8w== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 7245d34abd..0e03cea678 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.4.44", - "@budibase/pro": "2.4.44-alpha.1", + "@budibase/pro": "2.4.44", "@budibase/string-templates": "^2.4.44", "@budibase/types": "^2.4.44", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 0da2c4d7b8..d7be5a4306 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.1": - version "2.4.44-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.1.tgz#0c558082e54806ec6197a042b5b8333f7aa171ea" - integrity sha512-bm4WK74CcDnxJuZXtFhhyf7ZtfrUskdqZMgdqZPS9TSlvauVBnv9dcZh+ufrGlLRvR65WBYjWRg4LVQcivm8Fw== +"@budibase/backend-core@2.4.44": + version "2.4.44" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44.tgz#f71ba2c0ef87decde928dfd83dc13928c38aaa3d" + integrity sha512-M/3WL9eJbfwXnLsnR3EgE6ErG0Myaz3D3UQOTdJT/SrlwVcbMNPjjq+FJ8l+pmjxuI3xmCLMfPFcLGRzEFdoew== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "2.4.44-alpha.1" + "@budibase/types" "^2.4.44" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.44-alpha.1": - version "2.4.44-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.1.tgz#d0eec378bca0d4edf809319eda2c7b0967c3a5dd" - integrity sha512-d2kNUvDzKCORdDKlhwEH9naN1xc3GjJ1KCvPoYuMaYdJ8ruTLsFsDAc4ndPd05HmrBJhXpcMWev/hh80QYmcrw== +"@budibase/pro@2.4.44": + version "2.4.44" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44.tgz#0f2e51e1718e2728b070b78d5988de455ca339e5" + integrity sha512-2ouPYiAPBYkr822fAWQmi6ZCAR3XHSLuwsLRGsl2Tkbl8IL9QLuHyrZ4NZUebC7RDmFtkS7QtTKurm/jLNVdxg== dependencies: - "@budibase/backend-core" "2.4.44-alpha.1" + "@budibase/backend-core" "2.4.44" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.44-alpha.1" + "@budibase/types" "2.4.44" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.44-alpha.1": - version "2.4.44-alpha.1" - 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", "@budibase/types@^2.4.44": + version "2.4.44" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44.tgz#35ae607795ce6eea14a3abc45f9c7848511dc8b4" + integrity sha512-u0HzjQoa0YLwK+FeLNUEA4AN72krcuZM5yQWUDJk1P6aw7vJU0kWCxJvMEp27opdkM5oesh2imh9gPi6NYCQ8w== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From be8dfd2ef11b3b535192ac363be92c2aab4f33a1 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 3 Apr 2023 13:10:52 +0000 Subject: [PATCH 03/91] v2.5.0 --- 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 0915086cb1..2e2c24267e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.44", + "version": "2.5.0", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 8c6c9367f0..94acc86db0 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", + "version": "2.5.0", "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", + "@budibase/types": "^2.5.0", "@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 916f998311..78c74e70a3 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", + "version": "2.5.0", "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", - "@budibase/string-templates": "^2.4.44", + "@budibase/shared-core": "^2.5.0", + "@budibase/string-templates": "^2.5.0", "@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 f8568f366e..cf54c2d5eb 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.44", + "version": "2.5.0", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.44", - "@budibase/client": "^2.4.44", - "@budibase/frontend-core": "^2.4.44", - "@budibase/shared-core": "^2.4.44", - "@budibase/string-templates": "^2.4.44", + "@budibase/bbui": "^2.5.0", + "@budibase/client": "^2.5.0", + "@budibase/frontend-core": "^2.5.0", + "@budibase/shared-core": "^2.5.0", + "@budibase/string-templates": "^2.5.0", "@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 ce52afe801..b383978807 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.44", + "version": "2.5.0", "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", - "@budibase/string-templates": "^2.4.44", - "@budibase/types": "^2.4.44", + "@budibase/backend-core": "^2.5.0", + "@budibase/string-templates": "^2.5.0", + "@budibase/types": "^2.5.0", "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 61ad44d488..693c9fb907 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.44", + "version": "2.5.0", "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", - "@budibase/frontend-core": "^2.4.44", - "@budibase/shared-core": "^2.4.44", - "@budibase/string-templates": "^2.4.44", - "@budibase/types": "^2.4.44", + "@budibase/bbui": "^2.5.0", + "@budibase/frontend-core": "^2.5.0", + "@budibase/shared-core": "^2.5.0", + "@budibase/string-templates": "^2.5.0", + "@budibase/types": "^2.5.0", "@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 9d1e3cef97..4eab005593 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", + "version": "2.5.0", "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", - "@budibase/shared-core": "^2.4.44", + "@budibase/bbui": "^2.5.0", + "@budibase/shared-core": "^2.5.0", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 92a153b09a..a2312a4c01 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.44", + "version": "2.5.0", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index e2f0d8bb77..5d99cd9594 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", + "version": "2.5.0", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -44,12 +44,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.44", - "@budibase/client": "^2.4.44", + "@budibase/backend-core": "^2.5.0", + "@budibase/client": "^2.5.0", "@budibase/pro": "2.4.44", - "@budibase/shared-core": "^2.4.44", - "@budibase/string-templates": "^2.4.44", - "@budibase/types": "^2.4.44", + "@budibase/shared-core": "^2.5.0", + "@budibase/string-templates": "^2.5.0", + "@budibase/types": "^2.5.0", "@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 867c9d8d43..b85a9bd52b 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", + "version": "2.5.0", "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" + "@budibase/types": "^2.5.0" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 355e91ea13..2db85a3360 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", + "version": "2.5.0", "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 4934787316..06fb4ffb87 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.44", + "version": "2.5.0", "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 0e03cea678..d18ff81864 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", + "version": "2.5.0", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.4.44", + "@budibase/backend-core": "^2.5.0", "@budibase/pro": "2.4.44", - "@budibase/string-templates": "^2.4.44", - "@budibase/types": "^2.4.44", + "@budibase/string-templates": "^2.5.0", + "@budibase/types": "^2.5.0", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From fbbb36b8091ab50efbdb123f490757be9215c2eb Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 3 Apr 2023 13:14:16 +0000 Subject: [PATCH 04/91] Update pro version to 2.5.0 --- 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 5d99cd9594..1096c0ddc3 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -46,7 +46,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.5.0", "@budibase/client": "^2.5.0", - "@budibase/pro": "2.4.44", + "@budibase/pro": "2.5.0", "@budibase/shared-core": "^2.5.0", "@budibase/string-templates": "^2.5.0", "@budibase/types": "^2.5.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index c03bb709b8..ac1e753ef4 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": - version "2.4.44" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44.tgz#f71ba2c0ef87decde928dfd83dc13928c38aaa3d" - integrity sha512-M/3WL9eJbfwXnLsnR3EgE6ErG0Myaz3D3UQOTdJT/SrlwVcbMNPjjq+FJ8l+pmjxuI3xmCLMfPFcLGRzEFdoew== +"@budibase/backend-core@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.0.tgz#95f5905b6207f64ecc8fa805f8ea741bbc50a3b1" + integrity sha512-IHFTVO2b+ceoL2bKdvjlRcWA30yJeskEOHxx2Tmyd5Y+dXbsT23kTMYzW33ka+4B0OJh4G05+v96NRVgwzI3bA== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.44" + "@budibase/types" "^2.5.0" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1429,14 +1429,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.44": - version "2.4.44" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44.tgz#0f2e51e1718e2728b070b78d5988de455ca339e5" - integrity sha512-2ouPYiAPBYkr822fAWQmi6ZCAR3XHSLuwsLRGsl2Tkbl8IL9QLuHyrZ4NZUebC7RDmFtkS7QtTKurm/jLNVdxg== +"@budibase/pro@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.0.tgz#1cfd240ed005d92da44013070de826a52437eda3" + integrity sha512-xLAlWHLJ49gtZK7NGqIqzdd+xHvWZbOneO8LqRokFaSVcscOh5pFIZjySLaIi57MB3ghHoty3tFmTCnNjsXOHg== dependencies: - "@budibase/backend-core" "2.4.44" + "@budibase/backend-core" "2.5.0" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.44" + "@budibase/types" "2.5.0" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1475,10 +1475,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.44", "@budibase/types@^2.4.44": - version "2.4.44" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44.tgz#35ae607795ce6eea14a3abc45f9c7848511dc8b4" - integrity sha512-u0HzjQoa0YLwK+FeLNUEA4AN72krcuZM5yQWUDJk1P6aw7vJU0kWCxJvMEp27opdkM5oesh2imh9gPi6NYCQ8w== +"@budibase/types@2.5.0", "@budibase/types@^2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.0.tgz#3adb71706ea5ee94eeba4c2eeb58d8491be9d296" + integrity sha512-r8L/KH/G0UGC9Ur5qrwe+VnAx5r6JeMk3EA5MZs+f7/lRavGlQm0CcWvS6j7uXPTrBbavQHq88lPbG6LmBXtyQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index d18ff81864..5de84dae78 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.5.0", - "@budibase/pro": "2.4.44", + "@budibase/pro": "2.5.0", "@budibase/string-templates": "^2.5.0", "@budibase/types": "^2.5.0", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index d7be5a4306..b60329cc4e 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": - version "2.4.44" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44.tgz#f71ba2c0ef87decde928dfd83dc13928c38aaa3d" - integrity sha512-M/3WL9eJbfwXnLsnR3EgE6ErG0Myaz3D3UQOTdJT/SrlwVcbMNPjjq+FJ8l+pmjxuI3xmCLMfPFcLGRzEFdoew== +"@budibase/backend-core@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.0.tgz#95f5905b6207f64ecc8fa805f8ea741bbc50a3b1" + integrity sha512-IHFTVO2b+ceoL2bKdvjlRcWA30yJeskEOHxx2Tmyd5Y+dXbsT23kTMYzW33ka+4B0OJh4G05+v96NRVgwzI3bA== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.44" + "@budibase/types" "^2.5.0" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.44": - version "2.4.44" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44.tgz#0f2e51e1718e2728b070b78d5988de455ca339e5" - integrity sha512-2ouPYiAPBYkr822fAWQmi6ZCAR3XHSLuwsLRGsl2Tkbl8IL9QLuHyrZ4NZUebC7RDmFtkS7QtTKurm/jLNVdxg== +"@budibase/pro@2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.0.tgz#1cfd240ed005d92da44013070de826a52437eda3" + integrity sha512-xLAlWHLJ49gtZK7NGqIqzdd+xHvWZbOneO8LqRokFaSVcscOh5pFIZjySLaIi57MB3ghHoty3tFmTCnNjsXOHg== dependencies: - "@budibase/backend-core" "2.4.44" + "@budibase/backend-core" "2.5.0" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.44" + "@budibase/types" "2.5.0" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.44", "@budibase/types@^2.4.44": - version "2.4.44" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44.tgz#35ae607795ce6eea14a3abc45f9c7848511dc8b4" - integrity sha512-u0HzjQoa0YLwK+FeLNUEA4AN72krcuZM5yQWUDJk1P6aw7vJU0kWCxJvMEp27opdkM5oesh2imh9gPi6NYCQ8w== +"@budibase/types@2.5.0", "@budibase/types@^2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.0.tgz#3adb71706ea5ee94eeba4c2eeb58d8491be9d296" + integrity sha512-r8L/KH/G0UGC9Ur5qrwe+VnAx5r6JeMk3EA5MZs+f7/lRavGlQm0CcWvS6j7uXPTrBbavQHq88lPbG6LmBXtyQ== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From ff98ba5a0a5a7aad323dd0f4e4217eadc4f52067 Mon Sep 17 00:00:00 2001 From: Michael Drury Date: Tue, 4 Apr 2023 00:25:15 +0100 Subject: [PATCH 05/91] Adding a document update queue based on the events which can be used to track when certain documents have changed, using this for users and groups to detect when a re-sync is needed. --- packages/backend-core/src/docUpdates/index.ts | 1 + .../backend-core/src/docUpdates/updates.ts | 62 +++++++++++++++++++ .../processors/DocumentUpdateProcessor.ts | 42 +++++++++++++ .../src/events/processors/index.ts | 3 + packages/backend-core/src/index.ts | 1 + packages/backend-core/src/queue/constants.ts | 1 + .../server/src/sdk/app/applications/sync.ts | 16 ++++- packages/server/src/startup.ts | 1 + packages/types/src/sdk/events/event.ts | 16 +++++ 9 files changed, 142 insertions(+), 1 deletion(-) create mode 100644 packages/backend-core/src/docUpdates/index.ts create mode 100644 packages/backend-core/src/docUpdates/updates.ts create mode 100644 packages/backend-core/src/events/processors/DocumentUpdateProcessor.ts diff --git a/packages/backend-core/src/docUpdates/index.ts b/packages/backend-core/src/docUpdates/index.ts new file mode 100644 index 0000000000..c6c80aad8a --- /dev/null +++ b/packages/backend-core/src/docUpdates/index.ts @@ -0,0 +1 @@ +export * from "./updates" diff --git a/packages/backend-core/src/docUpdates/updates.ts b/packages/backend-core/src/docUpdates/updates.ts new file mode 100644 index 0000000000..478d29f4eb --- /dev/null +++ b/packages/backend-core/src/docUpdates/updates.ts @@ -0,0 +1,62 @@ +import { createQueue, JobQueue } from "../queue" +import BullQueue from "bull" +import { DocumentType, SEPARATOR } from "../constants" +import { doInContext, doInTenant } from "../context" + +type DocUpdateEvent = { + id: string + tenantId: string + appId?: string +} + +type Processor = (update: DocUpdateEvent) => Promise + +const processors: { types: DocumentType[]; processor: Processor }[] = [] +let queue: BullQueue.Queue +let processingPromise: Promise + +export function init() { + queue = createQueue(JobQueue.DOC_UPDATE) +} + +export async function shutdown() { + if (queue) { + await queue.close() + } +} + +export async function update(opts: DocUpdateEvent) { + if (!queue) { + init() + } + await queue.add(opts) +} + +async function handleJob(data: DocUpdateEvent) { + for (let { types, processor } of processors) { + if (types.find(type => data.id.startsWith(`${type}${SEPARATOR}`))) { + const context = data.appId || data.tenantId + const contextFn = data.appId ? doInContext : doInTenant + await contextFn(context, async () => { + await processor(data) + }) + } + } +} + +export async function process(types: DocumentType[], processor: Processor) { + if (!queue) { + init() + } + // add to processor list + processors.push({ + types, + processor, + }) + // if not processing in this instance, kick it off + if (!processingPromise) { + processingPromise = queue.process(async job => { + await handleJob(job.data) + }) + } +} diff --git a/packages/backend-core/src/events/processors/DocumentUpdateProcessor.ts b/packages/backend-core/src/events/processors/DocumentUpdateProcessor.ts new file mode 100644 index 0000000000..496da7e923 --- /dev/null +++ b/packages/backend-core/src/events/processors/DocumentUpdateProcessor.ts @@ -0,0 +1,42 @@ +import { Event, Identity, Group, DocumentUpdateEvents } from "@budibase/types" +import { EventProcessor } from "./types" +import * as docUpdates from "../../docUpdates" +import { getTenantId } from "../../context" + +export default class DocumentUpdateProcessor implements EventProcessor { + async processEvent( + event: Event, + identity: Identity, + properties: any, + timestamp?: string + ): Promise { + // only user and group IDs supported right now - no app documents yet + if (DocumentUpdateEvents.indexOf(event) !== -1 && identity.tenantId) { + await docUpdates.update({ + id: this.getId(properties), + tenantId: getTenantId(), + }) + } + } + + getId(properties: any) { + let possibleProps = ["groupId", "userId"] + for (let prop of possibleProps) { + if (properties[prop]) { + return properties[prop] + } + } + } + + async identify(identity: Identity, timestamp?: string | number) { + // no-op + } + + async identifyGroup(group: Group, timestamp?: string | number) { + // no-op + } + + shutdown(): void { + docUpdates.shutdown() + } +} diff --git a/packages/backend-core/src/events/processors/index.ts b/packages/backend-core/src/events/processors/index.ts index 6646764e47..3582838d31 100644 --- a/packages/backend-core/src/events/processors/index.ts +++ b/packages/backend-core/src/events/processors/index.ts @@ -1,12 +1,14 @@ import AnalyticsProcessor from "./AnalyticsProcessor" import LoggingProcessor from "./LoggingProcessor" import AuditLogsProcessor from "./AuditLogsProcessor" +import DocumentUpdateProcessor from "./DocumentUpdateProcessor" import Processors from "./Processors" import { AuditLogFn } from "@budibase/types" export const analyticsProcessor = new AnalyticsProcessor() const loggingProcessor = new LoggingProcessor() const auditLogsProcessor = new AuditLogsProcessor() +const documentUpdateProcessor = new DocumentUpdateProcessor() export function init(auditingFn: AuditLogFn) { return AuditLogsProcessor.init(auditingFn) @@ -16,4 +18,5 @@ export const processors = new Processors([ analyticsProcessor, loggingProcessor, auditLogsProcessor, + documentUpdateProcessor, ]) diff --git a/packages/backend-core/src/index.ts b/packages/backend-core/src/index.ts index 30072196ba..40233b3827 100644 --- a/packages/backend-core/src/index.ts +++ b/packages/backend-core/src/index.ts @@ -27,6 +27,7 @@ export * as errors from "./errors" export * as timers from "./timers" export { default as env } from "./environment" export * as blacklist from "./blacklist" +export * as docUpdates from "./docUpdates" export { SearchParams } from "./db" // Add context to tenancy for backwards compatibility // only do this for external usages to prevent internal diff --git a/packages/backend-core/src/queue/constants.ts b/packages/backend-core/src/queue/constants.ts index 9261ed1176..72d2e4742c 100644 --- a/packages/backend-core/src/queue/constants.ts +++ b/packages/backend-core/src/queue/constants.ts @@ -2,4 +2,5 @@ export enum JobQueue { AUTOMATION = "automationQueue", APP_BACKUP = "appBackupQueue", AUDIT_LOG = "auditLogQueue", + DOC_UPDATE = "docUpdateQueue", } diff --git a/packages/server/src/sdk/app/applications/sync.ts b/packages/server/src/sdk/app/applications/sync.ts index 6fb3576ae6..682fd7b519 100644 --- a/packages/server/src/sdk/app/applications/sync.ts +++ b/packages/server/src/sdk/app/applications/sync.ts @@ -1,7 +1,21 @@ import env from "../../../environment" -import { db as dbCore, context } from "@budibase/backend-core" +import { + db as dbCore, + context, + docUpdates, + constants, +} from "@budibase/backend-core" import sdk from "../../" +export function initUserGroupSync() { + const types = [constants.DocumentType.USER, constants.DocumentType.GROUP] + docUpdates.process(types, async update => { + console.log("syncing - ", JSON.stringify(update)) + // TODO: make the sync smarter + await sdk.users.syncGlobalUsers() + }) +} + export async function syncApp( appId: string, opts?: { automationOnly?: boolean } diff --git a/packages/server/src/startup.ts b/packages/server/src/startup.ts index 6cdbf87c2c..77164f9a75 100644 --- a/packages/server/src/startup.ts +++ b/packages/server/src/startup.ts @@ -64,6 +64,7 @@ export async function startup(app?: any, server?: any) { eventEmitter.emitPort(env.PORT) fileSystem.init() await redis.init() + sdk.applications.initUserGroupSync() // run migrations on startup if not done via http // not recommended in a clustered environment diff --git a/packages/types/src/sdk/events/event.ts b/packages/types/src/sdk/events/event.ts index 0d59576435..92965fa533 100644 --- a/packages/types/src/sdk/events/event.ts +++ b/packages/types/src/sdk/events/event.ts @@ -186,6 +186,22 @@ export enum Event { AUDIT_LOGS_DOWNLOADED = "audit_log:downloaded", } +export const DocumentUpdateEvents: Event[] = [ + Event.USER_CREATED, + Event.USER_UPDATED, + Event.USER_DELETED, + Event.USER_PERMISSION_ADMIN_ASSIGNED, + Event.USER_PERMISSION_ADMIN_REMOVED, + Event.USER_PERMISSION_BUILDER_ASSIGNED, + Event.USER_PERMISSION_BUILDER_REMOVED, + Event.USER_GROUP_CREATED, + Event.USER_GROUP_UPDATED, + Event.USER_GROUP_DELETED, + Event.USER_GROUP_USERS_ADDED, + Event.USER_GROUP_USERS_REMOVED, + Event.USER_GROUP_PERMISSIONS_EDITED, +] + // all events that are not audited have been added to this record as undefined, this means // that Typescript can protect us against new events being added and auditing of those // events not being considered. This might be a little ugly, but provides a level of From c571a3f881425cc716090c58c8088b6b65b9e960 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Tue, 4 Apr 2023 09:12:15 +0100 Subject: [PATCH 06/91] Fix issue with REST bindings not being shown in drawer --- packages/builder/src/builderStore/dataBinding.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js index fca106edbd..0d41931a55 100644 --- a/packages/builder/src/builderStore/dataBinding.js +++ b/packages/builder/src/builderStore/dataBinding.js @@ -120,7 +120,7 @@ export const toBindingsArray = (valueMap, prefix, category) => { return [] } return Object.keys(valueMap).reduce((acc, binding) => { - if (!binding || !valueMap[binding]) { + if (!binding) { return acc } From 5eecb6e686f21b99d7534e8325400d575907a86d Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Tue, 4 Apr 2023 10:14:20 +0100 Subject: [PATCH 07/91] Remove loop for get account during user bulk import (#10203) --- .../src/api/routes/global/tests/auth.spec.ts | 10 ++-- .../worker/src/sdk/users/tests/users.spec.ts | 52 +++++++++++++------ packages/worker/src/sdk/users/users.ts | 19 ++++--- 3 files changed, 52 insertions(+), 29 deletions(-) diff --git a/packages/worker/src/api/routes/global/tests/auth.spec.ts b/packages/worker/src/api/routes/global/tests/auth.spec.ts index 6c133df652..5e62b2123f 100644 --- a/packages/worker/src/api/routes/global/tests/auth.spec.ts +++ b/packages/worker/src/api/routes/global/tests/auth.spec.ts @@ -126,9 +126,8 @@ describe("/api/global/auth", () => { it("should prevent user from logging in", async () => { user = await config.createUser() const account = structures.accounts.ssoAccount() as CloudAccount - mocks.accounts.getAccount.mockReturnValueOnce( - Promise.resolve(account) - ) + account.email = user.email + mocks.accounts.getAccountByTenantId.mockResolvedValueOnce(account) await testSSOUser() }) @@ -186,9 +185,8 @@ describe("/api/global/auth", () => { it("should prevent user from generating password reset email", async () => { user = await config.createUser(structures.users.user()) const account = structures.accounts.ssoAccount() as CloudAccount - mocks.accounts.getAccount.mockReturnValueOnce( - Promise.resolve(account) - ) + account.email = user.email + mocks.accounts.getAccountByTenantId.mockResolvedValueOnce(account) await testSSOUser() }) diff --git a/packages/worker/src/sdk/users/tests/users.spec.ts b/packages/worker/src/sdk/users/tests/users.spec.ts index 77f02eec7a..a24f074512 100644 --- a/packages/worker/src/sdk/users/tests/users.spec.ts +++ b/packages/worker/src/sdk/users/tests/users.spec.ts @@ -1,6 +1,6 @@ import { structures } from "../../../tests" import { mocks } from "@budibase/backend-core/tests" -import { env } from "@budibase/backend-core" +import { env, context } from "@budibase/backend-core" import * as users from "../users" import { CloudAccount } from "@budibase/types" import { isPreventPasswordActions } from "../users" @@ -16,32 +16,50 @@ describe("users", () => { describe("isPreventPasswordActions", () => { it("returns false for non sso user", async () => { - const user = structures.users.user() - const result = await users.isPreventPasswordActions(user) - expect(result).toBe(false) + await context.doInTenant(structures.tenant.id(), async () => { + const user = structures.users.user() + const result = await users.isPreventPasswordActions(user) + expect(result).toBe(false) + }) }) it("returns true for sso account user", async () => { - const user = structures.users.user() - mocks.accounts.getAccount.mockReturnValue( - Promise.resolve(structures.accounts.ssoAccount() as CloudAccount) - ) - const result = await users.isPreventPasswordActions(user) - expect(result).toBe(true) + await context.doInTenant(structures.tenant.id(), async () => { + const user = structures.users.user() + const account = structures.accounts.ssoAccount() as CloudAccount + account.email = user.email + mocks.accounts.getAccountByTenantId.mockResolvedValueOnce(account) + const result = await users.isPreventPasswordActions(user) + expect(result).toBe(true) + }) + }) + + it("returns false when account doesn't match user email", async () => { + await context.doInTenant(structures.tenant.id(), async () => { + const user = structures.users.user() + const account = structures.accounts.ssoAccount() as CloudAccount + mocks.accounts.getAccountByTenantId.mockResolvedValueOnce(account) + const result = await users.isPreventPasswordActions(user) + expect(result).toBe(false) + }) }) it("returns true for sso user", async () => { - const user = structures.users.ssoUser() - const result = await users.isPreventPasswordActions(user) - expect(result).toBe(true) + await context.doInTenant(structures.tenant.id(), async () => { + const user = structures.users.ssoUser() + const result = await users.isPreventPasswordActions(user) + expect(result).toBe(true) + }) }) describe("enforced sso", () => { it("returns true for all users when sso is enforced", async () => { - const user = structures.users.user() - pro.features.isSSOEnforced.mockReturnValue(Promise.resolve(true)) - const result = await users.isPreventPasswordActions(user) - expect(result).toBe(true) + await context.doInTenant(structures.tenant.id(), async () => { + const user = structures.users.user() + pro.features.isSSOEnforced.mockResolvedValueOnce(true) + const result = await users.isPreventPasswordActions(user) + expect(result).toBe(true) + }) }) }) diff --git a/packages/worker/src/sdk/users/users.ts b/packages/worker/src/sdk/users/users.ts index 135128d816..c520ea2fd1 100644 --- a/packages/worker/src/sdk/users/users.ts +++ b/packages/worker/src/sdk/users/users.ts @@ -31,6 +31,7 @@ import { SearchUsersRequest, User, SaveUserOpts, + Account, } from "@budibase/types" import { sendEmail } from "../../utilities/email" import { EmailTemplatePurpose } from "../../constants" @@ -127,7 +128,8 @@ const buildUser = async ( requirePassword: true, }, tenantId: string, - dbUser?: any + dbUser?: any, + account?: Account ): Promise => { let { password, _id } = user @@ -138,7 +140,7 @@ const buildUser = async ( let hashedPassword if (password) { - if (await isPreventPasswordActions(user)) { + if (await isPreventPasswordActions(user, account)) { throw new HTTPError("Password change is disabled for this user", 400) } hashedPassword = opts.hashPassword ? await utils.hash(password) : password @@ -209,7 +211,7 @@ const validateUniqueUser = async (email: string, tenantId: string) => { } } -export async function isPreventPasswordActions(user: User) { +export async function isPreventPasswordActions(user: User, account?: Account) { // when in maintenance mode we allow sso users with the admin role // to perform any password action - this prevents lockout if (coreEnv.ENABLE_SSO_MAINTENANCE_MODE && user.admin?.global) { @@ -227,8 +229,10 @@ export async function isPreventPasswordActions(user: User) { } // Check account sso - const account = await accountSdk.api.getAccount(user.email) - return !!(account && isSSOAccount(account)) + if (!account) { + account = await accountSdk.api.getAccountByTenantId(tenancy.getTenantId()) + } + return !!(account && account.email === user.email && isSSOAccount(account)) } export const save = async ( @@ -439,6 +443,7 @@ export const bulkCreate = async ( newUsers.push(newUser) } + const account = await accountSdk.api.getAccountByTenantId(tenantId) // create the promises array that will be called by bulkDocs newUsers.forEach((user: any) => { usersToSave.push( @@ -448,7 +453,9 @@ export const bulkCreate = async ( hashPassword: true, requirePassword: user.requirePassword, }, - tenantId + tenantId, + undefined, // no dbUser + account ) ) }) From 917c5100ad1b8ad4bb828d1b7e0d412d2ea5d88b Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 4 Apr 2023 09:24:27 +0000 Subject: [PATCH 08/91] v2.5.1 --- 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 2e2c24267e..c7b024ba7f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.0", + "version": "2.5.1", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 94acc86db0..f35d560aff 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.0", + "version": "2.5.1", "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.5.0", + "@budibase/types": "^2.5.1", "@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 78c74e70a3..3f2ae122a3 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.5.0", + "version": "2.5.1", "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.5.0", - "@budibase/string-templates": "^2.5.0", + "@budibase/shared-core": "^2.5.1", + "@budibase/string-templates": "^2.5.1", "@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 cf54c2d5eb..81324c273f 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.0", + "version": "2.5.1", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.5.0", - "@budibase/client": "^2.5.0", - "@budibase/frontend-core": "^2.5.0", - "@budibase/shared-core": "^2.5.0", - "@budibase/string-templates": "^2.5.0", + "@budibase/bbui": "^2.5.1", + "@budibase/client": "^2.5.1", + "@budibase/frontend-core": "^2.5.1", + "@budibase/shared-core": "^2.5.1", + "@budibase/string-templates": "^2.5.1", "@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 b383978807..e50232edcc 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.0", + "version": "2.5.1", "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.5.0", - "@budibase/string-templates": "^2.5.0", - "@budibase/types": "^2.5.0", + "@budibase/backend-core": "^2.5.1", + "@budibase/string-templates": "^2.5.1", + "@budibase/types": "^2.5.1", "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 693c9fb907..89c7498788 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.0", + "version": "2.5.1", "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.5.0", - "@budibase/frontend-core": "^2.5.0", - "@budibase/shared-core": "^2.5.0", - "@budibase/string-templates": "^2.5.0", - "@budibase/types": "^2.5.0", + "@budibase/bbui": "^2.5.1", + "@budibase/frontend-core": "^2.5.1", + "@budibase/shared-core": "^2.5.1", + "@budibase/string-templates": "^2.5.1", + "@budibase/types": "^2.5.1", "@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 4eab005593..7db07ceb74 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.0", + "version": "2.5.1", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.5.0", - "@budibase/shared-core": "^2.5.0", + "@budibase/bbui": "^2.5.1", + "@budibase/shared-core": "^2.5.1", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index a2312a4c01..c061f4f22d 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.0", + "version": "2.5.1", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 1096c0ddc3..7acf4351e4 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.0", + "version": "2.5.1", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -44,12 +44,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.5.0", - "@budibase/client": "^2.5.0", + "@budibase/backend-core": "^2.5.1", + "@budibase/client": "^2.5.1", "@budibase/pro": "2.5.0", - "@budibase/shared-core": "^2.5.0", - "@budibase/string-templates": "^2.5.0", - "@budibase/types": "^2.5.0", + "@budibase/shared-core": "^2.5.1", + "@budibase/string-templates": "^2.5.1", + "@budibase/types": "^2.5.1", "@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 b85a9bd52b..149e5e2025 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.0", + "version": "2.5.1", "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.5.0" + "@budibase/types": "^2.5.1" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 2db85a3360..6e157fae3c 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.0", + "version": "2.5.1", "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 06fb4ffb87..67dac687aa 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.0", + "version": "2.5.1", "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 5de84dae78..4069911d91 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.0", + "version": "2.5.1", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.5.0", + "@budibase/backend-core": "^2.5.1", "@budibase/pro": "2.5.0", - "@budibase/string-templates": "^2.5.0", - "@budibase/types": "^2.5.0", + "@budibase/string-templates": "^2.5.1", + "@budibase/types": "^2.5.1", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From b1325e474212190d81caac392a7860e763dba766 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 4 Apr 2023 09:27:35 +0000 Subject: [PATCH 09/91] Update pro version to 2.5.1 --- 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 7acf4351e4..af30782a82 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -46,7 +46,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.5.1", "@budibase/client": "^2.5.1", - "@budibase/pro": "2.5.0", + "@budibase/pro": "2.5.1", "@budibase/shared-core": "^2.5.1", "@budibase/string-templates": "^2.5.1", "@budibase/types": "^2.5.1", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index ac1e753ef4..557fe0c7f4 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.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.0.tgz#95f5905b6207f64ecc8fa805f8ea741bbc50a3b1" - integrity sha512-IHFTVO2b+ceoL2bKdvjlRcWA30yJeskEOHxx2Tmyd5Y+dXbsT23kTMYzW33ka+4B0OJh4G05+v96NRVgwzI3bA== +"@budibase/backend-core@2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.1.tgz#94f4be07b08d8c61dc74bd9e86acaeba4eb7ef8c" + integrity sha512-Pl099USxugkHtgZvtHfnok0HRwZInIME1VqQet/NfLiN7UX8ZUp4a6F0rdovVwi54imPLez2PJrStMjKeyQAIQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.0" + "@budibase/types" "^2.5.1" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1429,14 +1429,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.0.tgz#1cfd240ed005d92da44013070de826a52437eda3" - integrity sha512-xLAlWHLJ49gtZK7NGqIqzdd+xHvWZbOneO8LqRokFaSVcscOh5pFIZjySLaIi57MB3ghHoty3tFmTCnNjsXOHg== +"@budibase/pro@2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.1.tgz#8af7fdccc4aaf677fbc0757e52366e42879d1784" + integrity sha512-WUPW3LKN4aqtI6GQWd/Fv9FYEM1yuAu0UnawdVLGFEmn1k180N5L/hC5uMu2dMc/RXS1ZZUJSUTzK2NloBZXRg== dependencies: - "@budibase/backend-core" "2.5.0" + "@budibase/backend-core" "2.5.1" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.0" + "@budibase/types" "2.5.1" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1475,10 +1475,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.5.0", "@budibase/types@^2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.0.tgz#3adb71706ea5ee94eeba4c2eeb58d8491be9d296" - integrity sha512-r8L/KH/G0UGC9Ur5qrwe+VnAx5r6JeMk3EA5MZs+f7/lRavGlQm0CcWvS6j7uXPTrBbavQHq88lPbG6LmBXtyQ== +"@budibase/types@2.5.1", "@budibase/types@^2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.1.tgz#d4bf8ac4b65b1163ed6d2fc9c0b70bcfbc13e784" + integrity sha512-cJfobY3BZfaEpBszKEHO2OgNBDTXzuMnUeEyTsjq5Afjoj/xZUwYHTFRNwYIc66syxxd82/su1+P2k05TOatwA== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 4069911d91..e81eb8b256 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.5.1", - "@budibase/pro": "2.5.0", + "@budibase/pro": "2.5.1", "@budibase/string-templates": "^2.5.1", "@budibase/types": "^2.5.1", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index b60329cc4e..cd5acdf930 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.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.0.tgz#95f5905b6207f64ecc8fa805f8ea741bbc50a3b1" - integrity sha512-IHFTVO2b+ceoL2bKdvjlRcWA30yJeskEOHxx2Tmyd5Y+dXbsT23kTMYzW33ka+4B0OJh4G05+v96NRVgwzI3bA== +"@budibase/backend-core@2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.1.tgz#94f4be07b08d8c61dc74bd9e86acaeba4eb7ef8c" + integrity sha512-Pl099USxugkHtgZvtHfnok0HRwZInIME1VqQet/NfLiN7UX8ZUp4a6F0rdovVwi54imPLez2PJrStMjKeyQAIQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.0" + "@budibase/types" "^2.5.1" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.0.tgz#1cfd240ed005d92da44013070de826a52437eda3" - integrity sha512-xLAlWHLJ49gtZK7NGqIqzdd+xHvWZbOneO8LqRokFaSVcscOh5pFIZjySLaIi57MB3ghHoty3tFmTCnNjsXOHg== +"@budibase/pro@2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.1.tgz#8af7fdccc4aaf677fbc0757e52366e42879d1784" + integrity sha512-WUPW3LKN4aqtI6GQWd/Fv9FYEM1yuAu0UnawdVLGFEmn1k180N5L/hC5uMu2dMc/RXS1ZZUJSUTzK2NloBZXRg== dependencies: - "@budibase/backend-core" "2.5.0" + "@budibase/backend-core" "2.5.1" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.0" + "@budibase/types" "2.5.1" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.5.0", "@budibase/types@^2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.0.tgz#3adb71706ea5ee94eeba4c2eeb58d8491be9d296" - integrity sha512-r8L/KH/G0UGC9Ur5qrwe+VnAx5r6JeMk3EA5MZs+f7/lRavGlQm0CcWvS6j7uXPTrBbavQHq88lPbG6LmBXtyQ== +"@budibase/types@2.5.1", "@budibase/types@^2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.1.tgz#d4bf8ac4b65b1163ed6d2fc9c0b70bcfbc13e784" + integrity sha512-cJfobY3BZfaEpBszKEHO2OgNBDTXzuMnUeEyTsjq5Afjoj/xZUwYHTFRNwYIc66syxxd82/su1+P2k05TOatwA== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From a2cabb01d5253c4bfeb52b877915878dbe017334 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 4 Apr 2023 13:53:30 +0100 Subject: [PATCH 10/91] Removing user app sync calls from worker - no longer required. --- packages/worker/src/sdk/users/users.ts | 10 ----- packages/worker/src/utilities/appService.ts | 46 --------------------- 2 files changed, 56 deletions(-) delete mode 100644 packages/worker/src/utilities/appService.ts diff --git a/packages/worker/src/sdk/users/users.ts b/packages/worker/src/sdk/users/users.ts index f05c6b98d2..efc683302e 100644 --- a/packages/worker/src/sdk/users/users.ts +++ b/packages/worker/src/sdk/users/users.ts @@ -1,5 +1,4 @@ import env from "../../environment" -import * as apps from "../../utilities/appService" import * as eventHelpers from "./events" import { accounts, @@ -29,7 +28,6 @@ import { PlatformUser, PlatformUserByEmail, RowResponse, - SearchUsersRequest, User, SaveUserOpts, } from "@budibase/types" @@ -275,9 +273,6 @@ export const save = async ( await platform.users.addUser(tenantId, builtUser._id!, builtUser.email) await cache.user.invalidateUser(response.id) - // let server know to sync user - await apps.syncUserInApps(_id, dbUser) - await Promise.all(groupPromises) // finally returned the saved user from the db @@ -424,7 +419,6 @@ export const bulkCreate = async ( // instead of relying on looping tenant creation await platform.users.addUser(tenantId, user._id, user.email) await eventHelpers.handleSaveEvents(user, undefined) - await apps.syncUserInApps(user._id) } const saved = usersToBulkSave.map(user => { @@ -563,8 +557,6 @@ export const destroy = async (id: string) => { await eventHelpers.handleDeleteEvents(dbUser) await cache.user.invalidateUser(userId) await sessions.invalidateSessions(userId, { reason: "deletion" }) - // let server know to sync user - await apps.syncUserInApps(userId, dbUser) } const bulkDeleteProcessing = async (dbUser: User) => { @@ -573,8 +565,6 @@ const bulkDeleteProcessing = async (dbUser: User) => { await eventHelpers.handleDeleteEvents(dbUser) await cache.user.invalidateUser(userId) await sessions.invalidateSessions(userId, { reason: "bulk-deletion" }) - // let server know to sync user - await apps.syncUserInApps(userId, dbUser) } export const invite = async ( diff --git a/packages/worker/src/utilities/appService.ts b/packages/worker/src/utilities/appService.ts deleted file mode 100644 index 8f411d58fa..0000000000 --- a/packages/worker/src/utilities/appService.ts +++ /dev/null @@ -1,46 +0,0 @@ -import fetch from "node-fetch" -import { - constants, - tenancy, - logging, - env as coreEnv, -} from "@budibase/backend-core" -import { checkSlashesInUrl } from "../utilities" -import env from "../environment" -import { SyncUserRequest, User } from "@budibase/types" - -async function makeAppRequest(url: string, method: string, body: any) { - if (env.isTest()) { - return - } - const request: any = { headers: {} } - request.headers[constants.Header.API_KEY] = coreEnv.INTERNAL_API_KEY - if (tenancy.isTenantIdSet()) { - request.headers[constants.Header.TENANT_ID] = tenancy.getTenantId() - } - if (body) { - request.headers["Content-Type"] = "application/json" - request.body = JSON.stringify(body) - } - request.method = method - - // add x-budibase-correlation-id header - logging.correlation.setHeader(request.headers) - - return fetch(checkSlashesInUrl(env.APPS_URL + url), request) -} - -export async function syncUserInApps(userId: string, previousUser?: User) { - const body: SyncUserRequest = { - previousUser, - } - - const response = await makeAppRequest( - `/api/users/metadata/sync/${userId}`, - "POST", - body - ) - if (response && response.status !== 200) { - throw "Unable to sync user." - } -} From e699f4684a7423f1809a221be6192c434c624d6d Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 4 Apr 2023 18:03:56 +0100 Subject: [PATCH 11/91] Updating the global user sync to be more accurate and also remove old user metadata from apps that users don't have access to anymore. --- packages/server/src/api/controllers/user.ts | 106 ++----------- packages/server/src/api/routes/user.ts | 5 - .../server/src/sdk/app/applications/sync.ts | 143 +++++++++++++++--- packages/server/src/sdk/users/utils.ts | 23 ++- packages/server/src/utilities/global.ts | 11 +- 5 files changed, 151 insertions(+), 137 deletions(-) diff --git a/packages/server/src/api/controllers/user.ts b/packages/server/src/api/controllers/user.ts index 1ae1a68824..b66f11bc1c 100644 --- a/packages/server/src/api/controllers/user.ts +++ b/packages/server/src/api/controllers/user.ts @@ -1,98 +1,12 @@ import { generateUserMetadataID, generateUserFlagID } from "../../db/utils" import { InternalTables } from "../../db/utils" -import { getGlobalUsers, getRawGlobalUser } from "../../utilities/global" +import { getGlobalUsers } from "../../utilities/global" import { getFullUser } from "../../utilities/users" -import { - context, - roles as rolesCore, - db as dbCore, -} from "@budibase/backend-core" -import { BBContext, Ctx, SyncUserRequest, User } from "@budibase/types" +import { context } from "@budibase/backend-core" +import { UserCtx } from "@budibase/types" import sdk from "../../sdk" -export async function syncUser(ctx: Ctx) { - let deleting = false, - user: User | any - const userId = ctx.params.id - - const previousUser = ctx.request.body?.previousUser - - try { - user = (await getRawGlobalUser(userId)) as User - } catch (err: any) { - if (err && err.status === 404) { - user = {} - deleting = true - } else { - throw err - } - } - - let previousApps = previousUser - ? Object.keys(previousUser.roles).map(appId => appId) - : [] - - const roles = deleting ? {} : user.roles - // remove props which aren't useful to metadata - delete user.password - delete user.forceResetPassword - delete user.roles - // run through all production appIDs in the users roles - let prodAppIds - // if they are a builder then get all production app IDs - if ((user.builder && user.builder.global) || deleting) { - prodAppIds = await dbCore.getProdAppIDs() - } else { - prodAppIds = Object.entries(roles) - .filter(entry => entry[1] !== rolesCore.BUILTIN_ROLE_IDS.PUBLIC) - .map(([appId]) => appId) - } - for (let prodAppId of new Set([...prodAppIds, ...previousApps])) { - const roleId = roles[prodAppId] - const deleteFromApp = !roleId - const devAppId = dbCore.getDevelopmentAppID(prodAppId) - for (let appId of [prodAppId, devAppId]) { - if (!(await dbCore.dbExists(appId))) { - continue - } - await context.doInAppContext(appId, async () => { - const db = context.getAppDB() - const metadataId = generateUserMetadataID(userId) - let metadata - try { - metadata = await db.get(metadataId) - } catch (err) { - if (deleteFromApp) { - return - } - metadata = { - tableId: InternalTables.USER_METADATA, - } - } - - if (deleteFromApp) { - await db.remove(metadata) - return - } - - // assign the roleId for the metadata doc - if (roleId) { - metadata.roleId = roleId - } - let combined = sdk.users.combineMetadataAndUser(user, metadata) - // if its null then there was no updates required - if (combined) { - await db.put(combined) - } - }) - } - } - ctx.body = { - message: "User synced.", - } -} - -export async function fetchMetadata(ctx: BBContext) { +export async function fetchMetadata(ctx: UserCtx) { const global = await getGlobalUsers() const metadata = await sdk.users.rawUserMetadata() const users = [] @@ -111,7 +25,7 @@ export async function fetchMetadata(ctx: BBContext) { ctx.body = users } -export async function updateSelfMetadata(ctx: BBContext) { +export async function updateSelfMetadata(ctx: UserCtx) { // overwrite the ID with current users ctx.request.body._id = ctx.user?._id // make sure no stale rev @@ -121,7 +35,7 @@ export async function updateSelfMetadata(ctx: BBContext) { await updateMetadata(ctx) } -export async function updateMetadata(ctx: BBContext) { +export async function updateMetadata(ctx: UserCtx) { const db = context.getAppDB() const user = ctx.request.body // this isn't applicable to the user @@ -133,7 +47,7 @@ export async function updateMetadata(ctx: BBContext) { ctx.body = await db.put(metadata) } -export async function destroyMetadata(ctx: BBContext) { +export async function destroyMetadata(ctx: UserCtx) { const db = context.getAppDB() try { const dbUser = await db.get(ctx.params.id) @@ -146,11 +60,11 @@ export async function destroyMetadata(ctx: BBContext) { } } -export async function findMetadata(ctx: BBContext) { +export async function findMetadata(ctx: UserCtx) { ctx.body = await getFullUser(ctx, ctx.params.id) } -export async function setFlag(ctx: BBContext) { +export async function setFlag(ctx: UserCtx) { const userId = ctx.user?._id const { flag, value } = ctx.request.body if (!flag) { @@ -169,7 +83,7 @@ export async function setFlag(ctx: BBContext) { ctx.body = { message: "Flag set successfully" } } -export async function getFlags(ctx: BBContext) { +export async function getFlags(ctx: UserCtx) { const userId = ctx.user?._id const docId = generateUserFlagID(userId!) const db = context.getAppDB() diff --git a/packages/server/src/api/routes/user.ts b/packages/server/src/api/routes/user.ts index 14deb111e6..24f33140a6 100644 --- a/packages/server/src/api/routes/user.ts +++ b/packages/server/src/api/routes/user.ts @@ -32,11 +32,6 @@ router authorized(PermissionType.USER, PermissionLevel.WRITE), controller.destroyMetadata ) - .post( - "/api/users/metadata/sync/:id", - authorized(PermissionType.USER, PermissionLevel.WRITE), - controller.syncUser - ) .post( "/api/users/flags", authorized(PermissionType.USER, PermissionLevel.WRITE), diff --git a/packages/server/src/sdk/app/applications/sync.ts b/packages/server/src/sdk/app/applications/sync.ts index 682fd7b519..3572e047e6 100644 --- a/packages/server/src/sdk/app/applications/sync.ts +++ b/packages/server/src/sdk/app/applications/sync.ts @@ -4,15 +4,114 @@ import { context, docUpdates, constants, + logging, + roles, } from "@budibase/backend-core" +import { User, ContextUser } from "@budibase/types" import sdk from "../../" +import { getGlobalUsers, updateAppRole } from "../../../utilities/global" +import { generateUserMetadataID, InternalTables } from "../../../db/utils" + +type DeletedUser = { _id: string; deleted: boolean } + +async function syncUsersToApp(appId: string, users: (User | DeletedUser)[]) { + if (!(await dbCore.dbExists(appId))) { + return + } + await context.doInAppContext(appId, async () => { + const db = context.getAppDB() + for (let user of users) { + let ctxUser = user as ContextUser + let deletedUser = false + const metadataId = generateUserMetadataID(user._id!) + if ((user as DeletedUser).deleted) { + deletedUser = true + } + + // make sure role is correct + if (!deletedUser) { + ctxUser = updateAppRole(ctxUser, { appId }) + } + let roleId = ctxUser.roleId + if (roleId === roles.BUILTIN_ROLE_IDS.PUBLIC) { + roleId = undefined + } + + let metadata + try { + metadata = await db.get(metadataId) + } catch (err: any) { + if (err.status !== 404) { + throw err + } + // no metadata and user is to be deleted, can skip + // no role - user isn't in app anyway + if (!roleId) { + continue + } else if (!deletedUser) { + // doesn't exist yet, creating it + metadata = { + tableId: InternalTables.USER_METADATA, + } + } + } + + // the user doesn't exist, or doesn't have a role anymore + // get rid of their metadata + if (deletedUser || !roleId) { + await db.remove(metadata) + continue + } + + // assign the roleId for the metadata doc + if (roleId) { + metadata.roleId = roleId + } + + let combined = sdk.users.combineMetadataAndUser(ctxUser, metadata) + // if no combined returned, there are no updates to make + if (combined) { + await db.put(combined) + } + } + }) +} + +async function syncUsersToAllApps(userIds: string[]) { + // list of users, if one has been deleted it will be undefined in array + const users = (await getGlobalUsers(userIds)) as User[] + const finalUsers: (User | DeletedUser)[] = [] + for (let userId of userIds) { + if (!users.find(user => user._id === userId)) { + finalUsers.push({ _id: userId, deleted: true }) + } + } + const devAppIds = await dbCore.getDevAppIDs() + let promises = [] + for (let devAppId of devAppIds) { + const prodAppId = dbCore.getProdAppID(devAppId) + for (let appId of [prodAppId, devAppId]) { + promises.push(syncUsersToApp(appId, finalUsers)) + } + } + const resp = await Promise.allSettled(promises) + const failed = resp.filter(promise => promise.status === "rejected") + if (failed.length > 0) { + const reasons = failed.map(fail => (fail as PromiseRejectedResult).reason) + logging.logAlert("Failed to sync users to apps", reasons) + } +} export function initUserGroupSync() { const types = [constants.DocumentType.USER, constants.DocumentType.GROUP] docUpdates.process(types, async update => { - console.log("syncing - ", JSON.stringify(update)) - // TODO: make the sync smarter - await sdk.users.syncGlobalUsers() + const docId = update.id + const isGroup = docId.startsWith(constants.DocumentType.GROUP) + if (isGroup) { + // TODO: get the group, get users in the group then run the function + } else { + await syncUsersToAllApps([docId]) + } }) } @@ -37,32 +136,28 @@ export async function syncApp( // specific case, want to make sure setup is skipped const prodDb = context.getProdAppDB({ skip_setup: true }) const exists = await prodDb.exists() - if (!exists) { - // the database doesn't exist. Don't replicate - return { - message: "App sync not required, app not deployed.", - } - } - const replication = new dbCore.Replication({ - source: prodAppId, - target: appId, - }) let error - try { - const replOpts = replication.appReplicateOpts() - if (opts?.automationOnly) { - replOpts.filter = (doc: any) => - doc._id.startsWith(dbCore.DocumentType.AUTOMATION) + if (exists) { + const replication = new dbCore.Replication({ + source: prodAppId, + target: appId, + }) + try { + const replOpts = replication.appReplicateOpts() + if (opts?.automationOnly) { + replOpts.filter = (doc: any) => + doc._id.startsWith(dbCore.DocumentType.AUTOMATION) + } + await replication.replicate(replOpts) + } catch (err) { + error = err + } finally { + await replication.close() } - await replication.replicate(replOpts) - } catch (err) { - error = err - } finally { - await replication.close() } - // sync the users + // sync the users - kept for safe keeping await sdk.users.syncGlobalUsers() if (error) { diff --git a/packages/server/src/sdk/users/utils.ts b/packages/server/src/sdk/users/utils.ts index 9b9ea04c56..a3982fd45b 100644 --- a/packages/server/src/sdk/users/utils.ts +++ b/packages/server/src/sdk/users/utils.ts @@ -1,12 +1,13 @@ import { getGlobalUsers } from "../../utilities/global" import { context, roles as rolesCore } from "@budibase/backend-core" import { + getGlobalIDFromUserMetadataID, generateUserMetadataID, getUserMetadataParams, InternalTables, } from "../../db/utils" import { isEqual } from "lodash" -import { ContextUser, UserMetadata } from "@budibase/types" +import { ContextUser, UserMetadata, User } from "@budibase/types" export function combineMetadataAndUser( user: ContextUser, @@ -37,6 +38,10 @@ export function combineMetadataAndUser( if (found) { newDoc._rev = found._rev } + // clear fields that shouldn't be in metadata + delete newDoc.password + delete newDoc.forceResetPassword + delete newDoc.roles if (found == null || !isEqual(newDoc, found)) { return { ...found, @@ -60,10 +65,9 @@ export async function rawUserMetadata() { export async function syncGlobalUsers() { // sync user metadata const db = context.getAppDB() - const [users, metadata] = await Promise.all([ - getGlobalUsers(), - rawUserMetadata(), - ]) + const resp = await Promise.all([getGlobalUsers(), rawUserMetadata()]) + const users = resp[0] as User[] + const metadata = resp[1] as UserMetadata[] const toWrite = [] for (let user of users) { const combined = combineMetadataAndUser(user, metadata) @@ -71,5 +75,14 @@ export async function syncGlobalUsers() { toWrite.push(combined) } } + for (let data of metadata) { + if (!data._id) { + continue + } + const globalId = getGlobalIDFromUserMetadataID(data._id) + if (!users.find(user => user._id === globalId)) { + toWrite.push({ ...data, _deleted: true }) + } + } await db.bulkDocs(toWrite) } diff --git a/packages/server/src/utilities/global.ts b/packages/server/src/utilities/global.ts index a75fcc0b30..0debb68d54 100644 --- a/packages/server/src/utilities/global.ts +++ b/packages/server/src/utilities/global.ts @@ -94,16 +94,13 @@ export async function getGlobalUser(userId: string) { return processUser(user, { appId }) } -export async function getGlobalUsers(users?: ContextUser[]) { +export async function getGlobalUsers(userIds?: string[]) { const appId = context.getAppId() const db = tenancy.getGlobalDB() const allGroups = await groups.fetch() let globalUsers - if (users) { - const globalIds = users.map(user => - getGlobalIDFromUserMetadataID(user._id!) - ) - globalUsers = (await db.allDocs(getMultiIDParams(globalIds))).rows.map( + if (userIds) { + globalUsers = (await db.allDocs(getMultiIDParams(userIds))).rows.map( row => row.doc ) } else { @@ -134,7 +131,7 @@ export async function getGlobalUsers(users?: ContextUser[]) { } export async function getGlobalUsersFromMetadata(users: ContextUser[]) { - const globalUsers = await getGlobalUsers(users) + const globalUsers = await getGlobalUsers(users.map(user => user._id!)) return users.map(user => { const globalUser = globalUsers.find( globalUser => globalUser && user._id?.includes(globalUser._id) From 373952a59bf0b84299fd80de8d09d9b25a01e30e Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 5 Apr 2023 17:43:35 +0100 Subject: [PATCH 12/91] Fixing #10155 - some options errors were being swallowed and in general it was never considered to be an error state due to the 'handled' flag being consistently sent, changed the logic a bit here. --- .../backend/DataTable/RowFieldControl.svelte | 2 +- .../DataTable/modals/CreateEditRow.svelte | 27 ++++++++++--------- .../scripts/integrations/postgres/init.sql | 5 ++-- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte index 1c93880ec1..aff143452f 100644 --- a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte +++ b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte @@ -42,7 +42,7 @@ {#if type === "options" && meta.constraints.inclusion.length !== 0} - {:else if type === "datetime"} Date: Wed, 5 Apr 2023 17:50:14 +0100 Subject: [PATCH 13/91] Reverting test sql changes. --- packages/server/scripts/integrations/postgres/init.sql | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/server/scripts/integrations/postgres/init.sql b/packages/server/scripts/integrations/postgres/init.sql index 19a6446ad2..78af4c20b9 100644 --- a/packages/server/scripts/integrations/postgres/init.sql +++ b/packages/server/scripts/integrations/postgres/init.sql @@ -7,7 +7,6 @@ CREATE TABLE Persons ( LastName varchar(255), FirstName varchar(255), Address varchar(255), - Age INT NOT NULL, City varchar(255) DEFAULT 'Belfast', Type person_job ); @@ -43,8 +42,8 @@ CREATE TABLE test.table1 ( id SERIAL PRIMARY KEY, Name varchar(255) ); -INSERT INTO Persons (FirstName, LastName, Address, City, Type, Age) VALUES ('Mike', 'Hughes', '123 Fake Street', 'Belfast', 'qa', 20); -INSERT INTO Persons (FirstName, LastName, Address, City, Type, Age) VALUES ('John', 'Smith', '64 Updown Road', 'Dublin', 'programmer', 30); +INSERT INTO Persons (FirstName, LastName, Address, City, Type) VALUES ('Mike', 'Hughes', '123 Fake Street', 'Belfast', 'qa'); +INSERT INTO Persons (FirstName, LastName, Address, City, Type) VALUES ('John', 'Smith', '64 Updown Road', 'Dublin', 'programmer'); INSERT INTO Tasks (ExecutorID, QaID, TaskName, Completed) VALUES (1, 2, 'assembling', TRUE); INSERT INTO Tasks (ExecutorID, QaID, TaskName, Completed) VALUES (2, 1, 'processing', FALSE); INSERT INTO Products (ProductName) VALUES ('Computers'); From 022b3acbccaaf78637efcfa46342d5bda3c0b0be Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 5 Apr 2023 17:54:05 +0100 Subject: [PATCH 14/91] Linting. --- .../components/backend/DataTable/RowFieldControl.svelte | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte index aff143452f..1a4ced9f3a 100644 --- a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte +++ b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte @@ -42,7 +42,13 @@ {#if type === "options" && meta.constraints.inclusion.length !== 0} - {:else if type === "datetime"} Date: Wed, 5 Apr 2023 20:32:41 +0100 Subject: [PATCH 15/91] Removing console logging. --- .../components/backend/DataTable/modals/CreateEditRow.svelte | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte index c4127d36bd..2bca6474d2 100644 --- a/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte +++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte @@ -29,10 +29,8 @@ } catch (error) { const response = error.json if (error.handled && response?.errors) { - console.error("FIRST") errors = response.errors } else if (error.handled && response?.validationErrors) { - console.error(response.validationErrors) const mappedErrors = {} for (let field in response.validationErrors) { mappedErrors[ @@ -40,7 +38,6 @@ ] = `${field} ${response.validationErrors[field][0]}` } errors = mappedErrors - console.log(errors) } else { notifications.error(`Failed to save row - ${error.message}`) } From 70c9d06832b63fcff55a8ccdbaa9a3432efca30f Mon Sep 17 00:00:00 2001 From: Michael Drury Date: Wed, 5 Apr 2023 20:51:47 +0100 Subject: [PATCH 16/91] Adding group management to background user/group sync. --- packages/server/src/sdk/app/applications/sync.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/server/src/sdk/app/applications/sync.ts b/packages/server/src/sdk/app/applications/sync.ts index 3572e047e6..ce59740f2a 100644 --- a/packages/server/src/sdk/app/applications/sync.ts +++ b/packages/server/src/sdk/app/applications/sync.ts @@ -8,6 +8,7 @@ import { roles, } from "@budibase/backend-core" import { User, ContextUser } from "@budibase/types" +import { sdk as proSdk } from "@budibase/pro" import sdk from "../../" import { getGlobalUsers, updateAppRole } from "../../../utilities/global" import { generateUserMetadataID, InternalTables } from "../../../db/utils" @@ -107,10 +108,15 @@ export function initUserGroupSync() { docUpdates.process(types, async update => { const docId = update.id const isGroup = docId.startsWith(constants.DocumentType.GROUP) + let userIds: string[] if (isGroup) { - // TODO: get the group, get users in the group then run the function + const group = await proSdk.groups.get(docId) + userIds = group.users?.map(user => user._id) || [] } else { - await syncUsersToAllApps([docId]) + userIds = [docId] + } + if (userIds.length > 0) { + await syncUsersToAllApps(userIds) } }) } From 0771ec55fbee2578daf2e42bff476ad764432ad1 Mon Sep 17 00:00:00 2001 From: Michael Drury Date: Wed, 5 Apr 2023 21:22:50 +0100 Subject: [PATCH 17/91] Small change to make sure no duplicates ever occur. --- packages/server/src/sdk/users/utils.ts | 7 ++++++- packages/types/src/documents/app/user.ts | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/server/src/sdk/users/utils.ts b/packages/server/src/sdk/users/utils.ts index a3982fd45b..7f7f0b4809 100644 --- a/packages/server/src/sdk/users/utils.ts +++ b/packages/server/src/sdk/users/utils.ts @@ -75,14 +75,19 @@ export async function syncGlobalUsers() { toWrite.push(combined) } } + let foundEmails: string[] = [] for (let data of metadata) { if (!data._id) { continue } + const alreadyExisting = data.email && foundEmails.indexOf(data.email) !== -1 const globalId = getGlobalIDFromUserMetadataID(data._id) - if (!users.find(user => user._id === globalId)) { + if (!users.find(user => user._id === globalId) || alreadyExisting) { toWrite.push({ ...data, _deleted: true }) } + if (data.email) { + foundEmails.push(data.email) + } } await db.bulkDocs(toWrite) } diff --git a/packages/types/src/documents/app/user.ts b/packages/types/src/documents/app/user.ts index b5f31ca349..4defd4a414 100644 --- a/packages/types/src/documents/app/user.ts +++ b/packages/types/src/documents/app/user.ts @@ -2,4 +2,5 @@ import { Document } from "../document" export interface UserMetadata extends Document { roleId: string + email?: string } From 58d0a8210897a72b06d959aeee218d8c29fa20b9 Mon Sep 17 00:00:00 2001 From: Michael Drury Date: Wed, 5 Apr 2023 22:35:01 +0100 Subject: [PATCH 18/91] First sync test, checking that a user is created correctly. --- .../server/src/sdk/app/applications/sync.ts | 11 +++- .../sdk/app/applications/tests/sync.spec.ts | 61 +++++++++++++++++++ 2 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 packages/server/src/sdk/app/applications/tests/sync.spec.ts diff --git a/packages/server/src/sdk/app/applications/sync.ts b/packages/server/src/sdk/app/applications/sync.ts index ce59740f2a..4a0c782ebd 100644 --- a/packages/server/src/sdk/app/applications/sync.ts +++ b/packages/server/src/sdk/app/applications/sync.ts @@ -83,8 +83,11 @@ async function syncUsersToAllApps(userIds: string[]) { const users = (await getGlobalUsers(userIds)) as User[] const finalUsers: (User | DeletedUser)[] = [] for (let userId of userIds) { - if (!users.find(user => user._id === userId)) { + const user = users.find(user => user._id === userId) + if (!user) { finalUsers.push({ _id: userId, deleted: true }) + } else { + finalUsers.push(user) } } const devAppIds = await dbCore.getDevAppIDs() @@ -103,7 +106,7 @@ async function syncUsersToAllApps(userIds: string[]) { } } -export function initUserGroupSync() { +export function initUserGroupSync(updateCb?: () => void) { const types = [constants.DocumentType.USER, constants.DocumentType.GROUP] docUpdates.process(types, async update => { const docId = update.id @@ -118,6 +121,10 @@ export function initUserGroupSync() { if (userIds.length > 0) { await syncUsersToAllApps(userIds) } + // used to tracking when updates have occurred + if (updateCb) { + updateCb() + } }) } diff --git a/packages/server/src/sdk/app/applications/tests/sync.spec.ts b/packages/server/src/sdk/app/applications/tests/sync.spec.ts new file mode 100644 index 0000000000..9ad6fe2eef --- /dev/null +++ b/packages/server/src/sdk/app/applications/tests/sync.spec.ts @@ -0,0 +1,61 @@ +import TestConfiguration from "../../../../tests/utilities/TestConfiguration" +import { events, context, roles, db as dbCore } from "@budibase/backend-core" +import { initUserGroupSync } from "../sync" +import { rawUserMetadata } from "../../../users/utils" +import EventEmitter from "events" +import { UserMetadata, UserRoles } from "@budibase/types" + +const config = new TestConfiguration() +let app +const ROLE_ID = roles.BUILTIN_ROLE_IDS.BASIC + +const emitter = new EventEmitter() + +function updateCb() { + emitter.emit("update") +} + +function waitForUpdate() { + return new Promise((resolve, reject) => { + const timeout = setTimeout(() => { + reject() + }, 5000) + emitter.on("update", () => { + clearTimeout(timeout) + resolve() + }) + }) +} + +beforeAll(async () => { + app = await config.init("syncApp") + initUserGroupSync(updateCb) +}) + +async function createUser(email: string, roles: UserRoles, appId?: string) { + const user = await config.createUser({ email, roles }) + await context.doInContext(appId || config.appId!, async () => { + await events.user.created(user) + }) +} + +async function getUserMetadata(appId?: string): Promise { + return context.doInContext(appId || config.appId!, async () => { + return await rawUserMetadata() + }) +} + +function buildRoles(appId?: string) { + const prodAppId = dbCore.getProdAppID(appId || config.appId!) + return { [prodAppId]: ROLE_ID } +} + +describe("app user/group sync", () => { + it("should be able to sync a new user", async () => { + const email = "test@test.com" + await createUser(email, buildRoles()) + await waitForUpdate() + const metadata = await getUserMetadata() + expect(metadata.find(data => data.email === email)).toBeDefined() + }) +}) From 60d7764add2c05fb57e6b788cc7b1fbff0c30bf0 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Fri, 7 Apr 2023 21:58:36 +0100 Subject: [PATCH 19/91] bump vm2 versions --- packages/server/package.json | 2 +- packages/server/yarn.lock | 576 ++++++++++++++++++++++++- packages/string-templates/package.json | 2 +- packages/string-templates/yarn.lock | 8 +- 4 files changed, 574 insertions(+), 14 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index af30782a82..b46d5d2782 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -116,7 +116,7 @@ "to-json-schema": "0.2.5", "uuid": "3.3.2", "validate.js": "0.13.1", - "vm2": "3.9.11", + "vm2": "^3.9.15", "worker-farm": "1.7.0", "xml2js": "0.4.23", "yargs": "13.2.4", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 557fe0c7f4..8606a8f04c 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -2,6 +2,11 @@ # yarn lockfile v1 +"@adobe/spectrum-css-workflow-icons@1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@adobe/spectrum-css-workflow-icons/-/spectrum-css-workflow-icons-1.2.1.tgz#7e2cb3fcfb5c8b12d7275afafbb6ec44913551b4" + integrity sha512-uVgekyBXnOVkxp+CUssjN/gefARtudZC8duEn1vm0lBQFwGRZFlDEzU1QC+aIRWCrD1Z8OgRpmBYlSZ7QS003w== + "@adobe/spectrum-css-workflow-icons@^1.2.1": version "1.5.3" resolved "https://registry.yarnpkg.com/@adobe/spectrum-css-workflow-icons/-/spectrum-css-workflow-icons-1.5.3.tgz#5e31ce842b7626f4b99f9d5cd0b17599d287b0bf" @@ -1290,7 +1295,7 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.5.1": +"@budibase/backend-core@2.5.1", "@budibase/backend-core@^2.5.1": version "2.5.1" resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.1.tgz#94f4be07b08d8c61dc74bd9e86acaeba4eb7ef8c" integrity sha512-Pl099USxugkHtgZvtHfnok0HRwZInIME1VqQet/NfLiN7UX8ZUp4a6F0rdovVwi54imPLez2PJrStMjKeyQAIQ== @@ -1379,6 +1384,104 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" +"@budibase/bbui@^2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-2.5.1.tgz#81a41a640c688293b885b9038d18e62d6461d9ae" + integrity sha512-20LjOOq6RH3BYI712DqViKL9YdmDmOHGyrIsr1nxcQ6UnP5Mx4t3Ww0CvMXOuV1nvnNd8AVsUg0j1SZ7AXE2rQ== + dependencies: + "@adobe/spectrum-css-workflow-icons" "1.2.1" + "@budibase/shared-core" "^2.5.1" + "@budibase/string-templates" "^2.5.1" + "@spectrum-css/accordion" "3.0.24" + "@spectrum-css/actionbutton" "1.0.1" + "@spectrum-css/actiongroup" "1.0.1" + "@spectrum-css/avatar" "3.0.2" + "@spectrum-css/button" "3.0.1" + "@spectrum-css/buttongroup" "3.0.2" + "@spectrum-css/checkbox" "3.0.2" + "@spectrum-css/dialog" "3.0.1" + "@spectrum-css/divider" "1.0.3" + "@spectrum-css/dropzone" "3.0.2" + "@spectrum-css/fieldgroup" "3.0.2" + "@spectrum-css/fieldlabel" "3.0.1" + "@spectrum-css/icon" "3.0.1" + "@spectrum-css/illustratedmessage" "3.0.2" + "@spectrum-css/inlinealert" "2.0.1" + "@spectrum-css/inputgroup" "3.0.2" + "@spectrum-css/label" "2.0.10" + "@spectrum-css/link" "3.1.1" + "@spectrum-css/menu" "3.0.1" + "@spectrum-css/modal" "3.0.1" + "@spectrum-css/pagination" "3.0.3" + "@spectrum-css/picker" "1.0.1" + "@spectrum-css/popover" "3.0.1" + "@spectrum-css/progressbar" "1.0.2" + "@spectrum-css/progresscircle" "1.0.2" + "@spectrum-css/radio" "3.0.2" + "@spectrum-css/search" "3.0.2" + "@spectrum-css/sidenav" "3.0.2" + "@spectrum-css/slider" "3.0.1" + "@spectrum-css/statuslight" "3.0.2" + "@spectrum-css/stepper" "3.0.3" + "@spectrum-css/switch" "1.0.2" + "@spectrum-css/table" "3.0.1" + "@spectrum-css/tabs" "3.2.12" + "@spectrum-css/tags" "3.0.2" + "@spectrum-css/textfield" "3.0.1" + "@spectrum-css/toast" "3.0.1" + "@spectrum-css/tooltip" "3.0.3" + "@spectrum-css/treeview" "3.0.2" + "@spectrum-css/typography" "3.0.1" + "@spectrum-css/underlay" "2.0.9" + "@spectrum-css/vars" "3.0.1" + dayjs "^1.10.4" + easymde "^2.16.1" + svelte-flatpickr "^3.2.3" + svelte-portal "^1.0.0" + +"@budibase/client@^2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@budibase/client/-/client-2.5.1.tgz#0859fa6dc8d68ebf91be879414df3587ece8bd5a" + integrity sha512-m6zvvSDtidpASz7u7EmYsDa+2mU7O+FeWcx8rD0nySY1S7hcDp1Lc8mdVgZwa6V3F+/NEj/uPdLQ7LlVlvOg9g== + dependencies: + "@budibase/bbui" "^2.5.1" + "@budibase/frontend-core" "^2.5.1" + "@budibase/shared-core" "^2.5.1" + "@budibase/string-templates" "^2.5.1" + "@budibase/types" "^2.5.1" + "@spectrum-css/button" "^3.0.3" + "@spectrum-css/card" "^3.0.3" + "@spectrum-css/divider" "^1.0.3" + "@spectrum-css/link" "^3.1.3" + "@spectrum-css/page" "^3.0.1" + "@spectrum-css/tag" "^3.1.4" + "@spectrum-css/typography" "^3.0.2" + "@spectrum-css/vars" "^3.0.1" + apexcharts "^3.22.1" + dayjs "^1.10.5" + downloadjs "1.4.7" + html5-qrcode "^2.2.1" + leaflet "^1.7.1" + regexparam "^1.3.0" + sanitize-html "^2.7.0" + screenfull "^6.0.1" + shortid "^2.2.15" + socket.io-client "^4.5.1" + svelte "^3.49.0" + svelte-apexcharts "^1.0.2" + svelte-flatpickr "^3.1.0" + svelte-spa-router "^3.0.5" + +"@budibase/frontend-core@^2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@budibase/frontend-core/-/frontend-core-2.5.1.tgz#209a0315ed5793d800cd06109f305d4658f07c1a" + integrity sha512-6Ke09jmoMnOq4iwSJ2aZxvbuk4Ho5clonBf0npm0AO1leITxs/czcpQNXp8pAGNK01M57xzFP5okecVObMvaLQ== + dependencies: + "@budibase/bbui" "^2.5.1" + "@budibase/shared-core" "^2.5.1" + lodash "^4.17.21" + svelte "^3.46.2" + "@budibase/handlebars-helpers@^0.11.8": version "0.11.8" resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841" @@ -1445,6 +1548,13 @@ memorystream "^0.3.1" node-fetch "^2.6.1" +"@budibase/shared-core@^2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@budibase/shared-core/-/shared-core-2.5.1.tgz#e66a39265af761de1c75a1225670cbf17d96b39e" + integrity sha512-EHx04r0pi6GoAeOl+9v2zdt0mgwC1eTrX/n2JoyJFclx6d3lLnvFPm0sWKAhFimLxu60a9z0l+3i0MvyKmowUw== + dependencies: + "@budibase/types" "^2.5.1" + "@budibase/standard-components@^0.9.139": version "0.9.139" resolved "https://registry.yarnpkg.com/@budibase/standard-components/-/standard-components-0.9.139.tgz#cf8e2b759ae863e469e50272b3ca87f2827e66e3" @@ -1475,6 +1585,18 @@ lodash "^4.17.20" vm2 "^3.9.4" +"@budibase/string-templates@^2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.5.1.tgz#2744a583f84fc8df5714865e7efc203e72b0b937" + integrity sha512-y4Q1DkMK0lUMpdeF6CzJJmqaEE0vUJBnfPx0PFJf5F8cWqXevcMrFcMr/rYB7DoaKigpO/u/fYwqKJwlodhfzw== + dependencies: + "@budibase/handlebars-helpers" "^0.11.8" + dayjs "^1.10.4" + handlebars "^4.7.6" + handlebars-utils "^1.0.6" + lodash "^4.17.20" + vm2 "^3.9.4" + "@budibase/types@2.5.1", "@budibase/types@^2.5.1": version "2.5.1" resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.1.tgz#d4bf8ac4b65b1163ed6d2fc9c0b70bcfbc13e784" @@ -2638,26 +2760,51 @@ resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553" integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg== +"@spectrum-css/accordion@3.0.24": + version "3.0.24" + resolved "https://registry.yarnpkg.com/@spectrum-css/accordion/-/accordion-3.0.24.tgz#f89066c120c57b0cfc9aba66d60c39fc1cf69f74" + integrity sha512-jNOmUsxmiT3lRLButnN5KKHM94fd+87fjiF8L0c4uRNgJl6ZsBuxPXrM15lV4y1f8D2IACAw01/ZkGRAeaCOFA== + +"@spectrum-css/actionbutton@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.0.1.tgz#9c75da37ea6915919fb574c74bd60dacc03b6577" + integrity sha512-AUqtyNabHF451Aj9i3xz82TxS5Z6k1dttA68/1hMeU9kbPCSS4P6Viw3vaRGs9CSspuR8xnnhDgrq+F+zMy2Hw== + "@spectrum-css/actionbutton@^1.0.1": version "1.1.14" resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.1.14.tgz#4e12eb7f482fb5944c3d97547591964baebeb1d4" integrity sha512-ViBjdWi23J6vIR4t8JTRQ6jY/+KgpZgCALj3otgy495zMNG7jPeN7sKoy6i6JZJcdIRJA4MjOTVvcDOGkYWUZg== +"@spectrum-css/actiongroup@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/actiongroup/-/actiongroup-1.0.1.tgz#b95b86e7af229e90fe1e70399d8d4b547b4bd31c" + integrity sha512-5Q6uMjzv5BFA2TwGASr/jAtJpTWl26fhWvgGY8kOA0RCSij35l+YJg/FPXf6Nnj2qCOl8DkNycjT9YXJ+bhyVA== + "@spectrum-css/actiongroup@^1.0.1": version "1.0.26" resolved "https://registry.yarnpkg.com/@spectrum-css/actiongroup/-/actiongroup-1.0.26.tgz#181ee059f28b1342389a128c39d20d2e10566aae" integrity sha512-T1IK9a2Gxix9givm+chGvFtZh5oGBZQc/S2UA9F76JZKu45eCkLkvUH6F670XOrBhDGkVfzvN21QnFymSY43ow== -"@spectrum-css/avatar@^3.0.2": +"@spectrum-css/avatar@3.0.2", "@spectrum-css/avatar@^3.0.2": version "3.0.2" resolved "https://registry.yarnpkg.com/@spectrum-css/avatar/-/avatar-3.0.2.tgz#4f1826223eae330e64b6d3cc899e9bc2e98dac95" integrity sha512-wEczvSqxttTWSiL3cOvXV/RmGRwSkw2w6+slcHhnf0kb7ovymMM+9oz8vvEpEsSeo5u598bc+7ktrKFpAd6soQ== +"@spectrum-css/button@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.1.tgz#6db8c3e851baecd0f1c2d88fef37d49d01c6e643" + integrity sha512-YXrBtjIYisk4Vaxnp0RiE4gdElQX04P2mc4Pi2GlQ27dJKlHmufYcF+kAqGdtiyK5yjdN/vKRcC8y13aA4rusA== + "@spectrum-css/button@^3.0.1", "@spectrum-css/button@^3.0.3": version "3.0.3" resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.3.tgz#2df1efaab6c7e0b3b06cb4b59e1eae59c7f1fc84" integrity sha512-6CnLPqqtaU/PcSSIGeGRi0iFIIxIUByYLKFO6zn5NEUc12KQ28dJ4PLwB6WBa0L8vRoAGlnWWH2ZZweTijbXgg== +"@spectrum-css/buttongroup@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/buttongroup/-/buttongroup-3.0.2.tgz#fd3387973ca3131609e32112de42a1c0400a48d8" + integrity sha512-Wu7B4GJ/SAeVHz9SUGAkeIH8pLaZh4t+w2ykSKOPQIRuK2jCBoudkEClVxviNVwqekccf5XLFXg9GpYF1a3Uaw== + "@spectrum-css/buttongroup@^3.0.2": version "3.0.10" resolved "https://registry.yarnpkg.com/@spectrum-css/buttongroup/-/buttongroup-3.0.10.tgz#897ea04b3ffea389fc7fe5bf67a6d1f3454b774d" @@ -2668,16 +2815,33 @@ resolved "https://registry.yarnpkg.com/@spectrum-css/card/-/card-3.0.3.tgz#56b2e2da6b80c1583228baa279de7407383bfb6b" integrity sha512-+oKLUI2a0QmQP9EzySeq/G4FpUkkdaDNbuEbqCj2IkPMc/2v/nwzsPhh1fj2UIghGAiiUwXfPpzax1e8fyhQUg== +"@spectrum-css/checkbox@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/checkbox/-/checkbox-3.0.2.tgz#53ca2fba0d9faa1fead10e7206eb1f6cdcfd6ddd" + integrity sha512-hPbGcnm7kJvJS4jp/P/bdaZvbyR1eIE9mteuZqcBgdmyp9m/k6+mW5jmsbtqb3Y4mMPWvOJFfz/sIvWJP0F0Zg== + "@spectrum-css/checkbox@^3.0.2": version "3.1.2" resolved "https://registry.yarnpkg.com/@spectrum-css/checkbox/-/checkbox-3.1.2.tgz#88698969091da9b50de781d25839446084b4a5f4" integrity sha512-vIuknIhRF/Xtq6OHjOtlhYt722FPcTLBb7Y7tY0Ho8VEpynj3JrVLP/1YYp/YIrYMpsTugxPmbCrEkikkdL6Mg== +"@spectrum-css/dialog@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/dialog/-/dialog-3.0.1.tgz#33aae036282159f6aa998848b8c0828640a9620a" + integrity sha512-hUFbRR6RGT63MNuP7wP+k9KU+uRuICsduMihskh700e+jiQ+Gsv53fBFDlB843FoZYlIXzFQXgtjMUC5a4Qibw== + "@spectrum-css/dialog@^3.0.1": version "3.0.12" resolved "https://registry.yarnpkg.com/@spectrum-css/dialog/-/dialog-3.0.12.tgz#fc97e002ca768a3d99dd10cb6a135c2b06052004" integrity sha512-50rbFa+9eUKT+3uYBX7CkmI7SbQ0Z3CAFwjyjai+itYZ8kf/FcHVFwcLjgrry9scUnKhexMs94kkr0gfQpPe8Q== +"@spectrum-css/divider@1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/divider/-/divider-1.0.3.tgz#639e2ebaa0834efa40f42397668bbd5c153ea385" + integrity sha512-Zy4Rn40w8UtzMh3wx/U9+CepSCpm1aOCGftHgWDub0XZuVTzh0c1WwyzTuLCx2Hf21z5VRGNiDh8bGEEzSbtNA== + dependencies: + "@spectrum-css/vars" "^3.0.2" + "@spectrum-css/divider@^1.0.3": version "1.0.26" resolved "https://registry.yarnpkg.com/@spectrum-css/divider/-/divider-1.0.26.tgz#44b610b1b6c747536fca08b3f09286341e18ab29" @@ -2685,56 +2849,106 @@ dependencies: "@spectrum-css/vars" "^8.0.0" +"@spectrum-css/dropzone@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/dropzone/-/dropzone-3.0.2.tgz#34f137851054442b219fed7f32006b93fc5e0bcf" + integrity sha512-BuBBzm5re6lM0AWgd6V+mI5eEGnnmFEtcFiJBEn9jYNEQYgflFhvnERUt89jMX5WmspiecwI2JBWJFrtFsOzug== + "@spectrum-css/dropzone@^3.0.2": version "3.0.24" resolved "https://registry.yarnpkg.com/@spectrum-css/dropzone/-/dropzone-3.0.24.tgz#edefb3ca5a01705a64d0161a599c59199bab6299" integrity sha512-JY60hUZAAuzS+o2xFOKv0o31cc+5/cjLpTyKEy73oGKsdUXEEMiQtW2PQBCuxh7PNyw29wCULeZ1EW1QdNPyxg== +"@spectrum-css/fieldgroup@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/fieldgroup/-/fieldgroup-3.0.2.tgz#1c1afd3c444d8650fefac275dc66a7a913933846" + integrity sha512-Vyw0kQJdLW18J6w4H+YAsoLntvkw5rXmW3CH5H3SDTXkBztxtHSSe3e106Nw5MoZxTfHlom6CxbYXYCTjQfqGw== + "@spectrum-css/fieldgroup@^3.0.2": version "3.1.3" resolved "https://registry.yarnpkg.com/@spectrum-css/fieldgroup/-/fieldgroup-3.1.3.tgz#945123da56534f1ff6118a9defd18b8a883e34a8" integrity sha512-HIbB3jweNviWXcADoYQW3hanww9RTUIsBUhe0YxSMXUXnQJc/7nlyeLoTRMr2eEVSCREfRnMot/8bZloW7ctnA== +"@spectrum-css/fieldlabel@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/fieldlabel/-/fieldlabel-3.0.1.tgz#39f7c0f25cc2ff402afeff005341b0832f7c588c" + integrity sha512-LMfwrwIq8wEEvxFLobdLvXRwKrp8o9Fty4iJ9aYl2Rj1uXkfRd8qLz9HGZjLEE1OuJgoTBgamYABl7EvoA5PLw== + "@spectrum-css/fieldlabel@^3.0.1": version "3.0.3" resolved "https://registry.yarnpkg.com/@spectrum-css/fieldlabel/-/fieldlabel-3.0.3.tgz#f73c04d20734d4718ffb620dc46458904685b449" integrity sha512-nEvIkEXCD5n4fW67Unq6Iu7VXoauEd/JGpfTY02VsC5p4FJLnwKfPDbJUuUsqClAxqw7nAsmXVKtn4zQFf5yPQ== +"@spectrum-css/icon@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/icon/-/icon-3.0.1.tgz#e300a6fc353c85c6b5d6e7a364408a940c31b177" + integrity sha512-cGFtIrcQ/7tthdkHK1npuEFiCdYVHLqwmLxghUYQw8Tb8KgJaw3OBO1tpjgsUizexNgu26BjVRIbGxNWuBXIHQ== + "@spectrum-css/icon@^3.0.1": version "3.0.22" resolved "https://registry.yarnpkg.com/@spectrum-css/icon/-/icon-3.0.22.tgz#1dd77e2460121951c60c583edb470d0ba52e6822" integrity sha512-ilrPlHDRGzn7kXVVAwUhoSaMfS6sGlb21ix2gn8IRLBAjDOV8BBV1wJJtjGNw+kzCXMhnVnVOekTdht17Oe9bw== +"@spectrum-css/illustratedmessage@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/illustratedmessage/-/illustratedmessage-3.0.2.tgz#6a480be98b027e050b086e7899e40d87adb0a8c0" + integrity sha512-dqnE8X27bGcO0HN8+dYx8O4o0dNNIAqeivOzDHhe2El+V4dTzMrNIerF6G0NLm3GjVf6XliwmitsZK+K6FmbtA== + "@spectrum-css/illustratedmessage@^3.0.2": version "3.0.17" resolved "https://registry.yarnpkg.com/@spectrum-css/illustratedmessage/-/illustratedmessage-3.0.17.tgz#49cb2549fda97a6812156bfba6ccdd3a18bebd11" integrity sha512-kpDqeq1U+rEjG1XuiXkbGvS71vn6mpFF/hiwCgFJWudVOfypDPQ4KLfYw1ditFSUzMCm5H6U/RqAShAJn8oMWA== +"@spectrum-css/inlinealert@2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/inlinealert/-/inlinealert-2.0.1.tgz#7521f88f6c845806403cc7d925773c7414e204a2" + integrity sha512-Xy5RCOwgurqUXuGQCsEDUduDd5408bmEpmFg+feynG7VFUgLFZWBeylSENB/OqjlFtO76PHXNVdHkhDscPIHTA== + "@spectrum-css/inlinealert@^2.0.1": version "2.0.6" resolved "https://registry.yarnpkg.com/@spectrum-css/inlinealert/-/inlinealert-2.0.6.tgz#4c5e923a1f56a96cc1adb30ef1f06ae04f2c6376" integrity sha512-OpvvoWP02wWyCnF4IgG8SOPkXymovkC9cGtgMS1FdDubnG3tJZB/JeKTsRR9C9Vt3WBaOmISRdSKlZ4lC9CFzA== +"@spectrum-css/inputgroup@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/inputgroup/-/inputgroup-3.0.2.tgz#f1b13603832cbd22394f3d898af13203961f8691" + integrity sha512-O0G3Lw9gxsh8gTLQWIAKkN1O8cWhjpEUl+oR1PguIKFni72uNr2ikU9piOwy/r0gJG2Q/TVs6hAshoAAkmsSzw== + "@spectrum-css/inputgroup@^3.0.2": version "3.0.8" resolved "https://registry.yarnpkg.com/@spectrum-css/inputgroup/-/inputgroup-3.0.8.tgz#fc23afc8a73c24d17249c9d2337e8b42085b298b" integrity sha512-cmQWzFp0GU+4IMc8SSeVFdmQDlRUdPelXaQdKUR9mZuO2iYettg37s0lfBCeJyYkUNTagz0zP8O7A0iXfmeE6g== -"@spectrum-css/label@^2.0.10": +"@spectrum-css/label@2.0.10", "@spectrum-css/label@^2.0.10": version "2.0.10" resolved "https://registry.yarnpkg.com/@spectrum-css/label/-/label-2.0.10.tgz#2368651d7636a19385b5d300cdf6272db1916001" integrity sha512-xCbtEiQkZIlLdWFikuw7ifDCC21DOC/KMgVrrVJHXFc4KRQe9LTZSqmGF3tovm+CSq1adE59mYoTbojVQ9YuEQ== +"@spectrum-css/link@3.1.1": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.1.tgz#cb526a2e10b50ef5a7ae29cca7272e2610d597eb" + integrity sha512-Bi88lRhTY7g6nM/ryW1yY4Cji211ZYNtRxkxbV7n2lPvwMAAQtyx0qVD3ru4kTGj/FFVvmPR3XiOE10K13HSNA== + "@spectrum-css/link@^3.1.1", "@spectrum-css/link@^3.1.3": version "3.1.22" resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.22.tgz#1e061d674789c5b3be5b0680f9f6eae3e695e1c1" integrity sha512-Zf8bfy+rtq07l4qoR6chNxefmatLZQZjudIm96v+lsCXBkjVbiMpjkW9oOcNwTqKB08koMONHHhOf1wk2Faqiw== +"@spectrum-css/menu@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/menu/-/menu-3.0.1.tgz#2a376f991acc24e12ec892bb6b9db2650fc41fbe" + integrity sha512-Qjg0+1O0eC89sb/bRFq2AGnQ8XqhVy23TUXHyffNM8qdcMssnlny3QmhzjURCZKvx/Y5UytCpzhedPQqSpQwZg== + "@spectrum-css/menu@^3.0.1": version "3.0.21" resolved "https://registry.yarnpkg.com/@spectrum-css/menu/-/menu-3.0.21.tgz#d1f7e6e69d30b5e1edd7ed2c86ea4e08dfd670ab" integrity sha512-G5AIUO26O6IAc6HUGZu4AZgyw0QRyLfSbcKlFGu4oJHzP36cQc1S1uCh8Xp4g5d+n6mU62LxNDLSMpVbwnA00A== +"@spectrum-css/modal@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/modal/-/modal-3.0.1.tgz#613a6b83d0330a4d38db41a98090800751c56d8d" + integrity sha512-F7D99F3cjDGT9DM9sogx/p49jrNYT7a1J6TUoqV73wUf+0gP+dTsskBOo9jB8VbUE+POQPjiDLB+SWLp6iBB+w== + "@spectrum-css/modal@^3.0.1": version "3.0.22" resolved "https://registry.yarnpkg.com/@spectrum-css/modal/-/modal-3.0.22.tgz#05593a613e246a7cbef85d08a6945219e1207209" @@ -2747,107 +2961,222 @@ dependencies: "@spectrum-css/vars" "^4.3.1" +"@spectrum-css/pagination@3.0.3": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/pagination/-/pagination-3.0.3.tgz#b204c3ada384c4af751a354bc428346d82eeea65" + integrity sha512-OJ/v9GeNXJOZ9Yr9LDBYPrR2NCiLOWP9wANT/a5sqFuugRnQbn/HYMnRp9TBxwpDY6ihaPo0T/wi7kLiAJFdDw== + "@spectrum-css/pagination@^3.0.3": version "3.0.11" resolved "https://registry.yarnpkg.com/@spectrum-css/pagination/-/pagination-3.0.11.tgz#68d9f34fe8eb36bf922e41b11f49eac62ac2fc41" integrity sha512-wjZr7NAcqHK6fxNIGKTYEVtAOJugJTbcz4d8K7DZuUDgBVwLJJHJBi4uJ4KrIRYliMWOvqWTZzCJLmmTfx4cyw== +"@spectrum-css/picker@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/picker/-/picker-1.0.1.tgz#98991198576d26bd14160824e7b6f3c278ff930b" + integrity sha512-Rv4/UBOdNW1gs7WVBCJnPD5VFly8MqP++psDX6kcugUIcfJy0GC3acvElotmKRlCDk8Qxks2W2A0jKeSgphTmA== + "@spectrum-css/picker@^1.0.1": version "1.2.9" resolved "https://registry.yarnpkg.com/@spectrum-css/picker/-/picker-1.2.9.tgz#854cdca407daaf8e1f821777978690f0804b3c08" integrity sha512-HDUDiqHwM84xfbHJWm4wR67Km3NXcDluhDrkVn8uqOEZrm8y4YiW+esL6FzPgzqLdPIHboQjrdpRq4LiDzGjjA== +"@spectrum-css/popover@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/popover/-/popover-3.0.1.tgz#5863c1efc53f98f9aba2de9186666780041303fc" + integrity sha512-LmOSj/yCwQQ9iGmCYnHiJsJR/HfPiGqI1Jl7pkKxBOCxYBMS/5+ans9vfCN2Qnd0eK7WSbfPg72S6mjye7db2Q== + "@spectrum-css/popover@^3.0.1": version "3.0.11" resolved "https://registry.yarnpkg.com/@spectrum-css/popover/-/popover-3.0.11.tgz#a7450c01bcf1609264b4a9df58821368b9e224d1" integrity sha512-bzyNQJVw6Mn1EBelTaRlXCdd0ZfykNX9O6SHx3a+jXPYu8VBrRpHm0gsfWzPAz1etd1vj1CxwG/teQt4qvyZ/Q== +"@spectrum-css/progressbar@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/progressbar/-/progressbar-1.0.2.tgz#b5a59432517f9ae6dad49d9504691bc5ac42b424" + integrity sha512-+jExeBLtVCqo3BqtFq5WCtZ028Dzk+oUnX6y4z6ZamKPqOyOELOtFnhYnyhyRndQOqYwKUTXx9zsaWA/lpJOHw== + "@spectrum-css/progressbar@^1.0.2": version "1.0.30" resolved "https://registry.yarnpkg.com/@spectrum-css/progressbar/-/progressbar-1.0.30.tgz#1f1e81ab6080fb843831421f736ed2bccc9b18ed" integrity sha512-tUquDN33RQG8gyrWmwPaCu6I2rxRyv5BBGBPii+1sK7L/DTCJrKXe7TAqoxjNEYzdCvTF/HI1NvnSColWNq0Rw== +"@spectrum-css/progresscircle@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/progresscircle/-/progresscircle-1.0.2.tgz#258ea9170fb70f795edda03e38a61d93bef4487c" + integrity sha512-JLULpyzjIY95lzlWR1yE1gv4l1K6p+scQ+edmuZZUHBzwM3pUtkvHJmUlA9TYdResUYW6Uka60VRdY6lZ8gnFQ== + "@spectrum-css/progresscircle@^1.0.2": version "1.0.22" resolved "https://registry.yarnpkg.com/@spectrum-css/progresscircle/-/progresscircle-1.0.22.tgz#80c8fd2ac4ee6855297d98c60c3b36082020a32a" integrity sha512-EGb+q+7RxbbsrEPFpJ1P4XBQ4s6Ra0okjQCDDTTKTp/sUY2WIT2BjPzwxlZTxVmSXWiiuRyzyuSYUrgBw9UgWg== +"@spectrum-css/radio@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/radio/-/radio-3.0.2.tgz#9c1386894920bbed604e4e174fbbd45d9d762152" + integrity sha512-0TDdzC9omNXnpKHEXNuuGeXdNh4x8jvTKVUqMRLb7vY4hY94hAdt6X01NBqka+jzK35HxGzpDdPADAz62yZLPQ== + "@spectrum-css/radio@^3.0.2": version "3.0.23" resolved "https://registry.yarnpkg.com/@spectrum-css/radio/-/radio-3.0.23.tgz#118a28c407e7b58bec139483d7e23074d840ae77" integrity sha512-x+08GSufmsyrUU4iBOOMRXZrcHxabXMMm/q2vazDJE8CShztvmdjghCxcwtyM74sjiYmXnCW1V3ztr6zaG5xig== +"@spectrum-css/search@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/search/-/search-3.0.2.tgz#70e93e321032d40b399498b2324e3b70e050551e" + integrity sha512-3UbT8yZmNOwrZxq+CUmumE+26ZySZ8OoKNM6U20SLMPLgdx6MrRugVE88r3Bl0sJ0RZX/5bU8nausdiHeX+Jlw== + "@spectrum-css/search@^3.0.2": version "3.1.2" resolved "https://registry.yarnpkg.com/@spectrum-css/search/-/search-3.1.2.tgz#8d43f35f884f7c190e7694c8d26a3f2cfed01ef0" integrity sha512-8cMK1QB07dbReZ/ECyTyoT2dELZ7hK1b3jEDiWSeLBbXcKirR1OI24sZEnewQY/XWFd/62Z1YdNaaA8S6UuXWQ== +"@spectrum-css/sidenav@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/sidenav/-/sidenav-3.0.2.tgz#9d70f408d588ee79c69857751010333671f32713" + integrity sha512-YpIdH/F0jEICYmoduGrnkTmxwJq1kfKxEp0wOs+ZkQOsvKMv1an7nyhsfOKCQqcGNfYzJ9mJAk7/u5+vsxHa8g== + "@spectrum-css/sidenav@^3.0.2": version "3.0.23" resolved "https://registry.yarnpkg.com/@spectrum-css/sidenav/-/sidenav-3.0.23.tgz#c218560d472e13a3e0d1499b762df1206dcffbfd" integrity sha512-4IFw2/HMQJRzM0M2c5na/HeY7y5vJoGpMFBkXNpQyhW4TRo7N1rGwYQ5dRD3s4OVEWV4/rjfGV0d/qhfwKUTog== +"@spectrum-css/slider@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/slider/-/slider-3.0.1.tgz#5281e6f47eb5a4fd3d1816c138bf66d01d7f2e49" + integrity sha512-DI2dtMRnQuDM1miVzl3SGyR1khUEKnwdXfO5EHDFwkC3yav43F5QogkfjmjFmWWobMVovdJlAuiaaJ/IHejD0Q== + +"@spectrum-css/statuslight@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/statuslight/-/statuslight-3.0.2.tgz#dc54b6cd113413dcdb909c486b5d7bae60db65c5" + integrity sha512-xodB8g8vGJH20XmUj9ZsPlM1jHrGeRbvmVXkz0q7YvQrYAhim8pP3W+XKKZAletPFAuu8cmUOc6SWn6i4X4z6w== + "@spectrum-css/statuslight@^3.0.2": version "3.0.8" resolved "https://registry.yarnpkg.com/@spectrum-css/statuslight/-/statuslight-3.0.8.tgz#3b0ea80712573679870a85d469850230e794a0f7" integrity sha512-zMTHs8lk+I7fLdi9waEEbsCmJ1FxeHcjQ0yltWxuRmGk2vl4MQdQIuHIMI63iblqEaiwnJRjXJoKnWlNvndTJQ== +"@spectrum-css/stepper@3.0.3": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/stepper/-/stepper-3.0.3.tgz#ae89846886431e3edeee060207b8f81540f73a34" + integrity sha512-prAD61ImlOTs9b6PfB3cB08x4lAfxtvnW+RZiTYky0E8GgZdrc/MfCkL5/oqQaIQUtyQv/3Lb7ELAf/0K8QTXw== + "@spectrum-css/stepper@^3.0.3": version "3.0.25" resolved "https://registry.yarnpkg.com/@spectrum-css/stepper/-/stepper-3.0.25.tgz#a6e77d501a9671c083b6dd9a37c6a3f224ffc961" integrity sha512-nlAZKY4KCYQ4IFuFj/P0LXPsB4Ze36ziuaa3k3iy3+1pBDD4gDcGmNpNcTG1LENu0Bt87KhSj8Ba2NV3wBSY8w== +"@spectrum-css/switch@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/switch/-/switch-1.0.2.tgz#f0b4c69271964573e02b08e90998096e49e1de44" + integrity sha512-zqmHpgWPNg1gEwdUNFYV3CBX5JaeALfIqcJIxE0FLZqr9d1C4+oLE0ItIFzt1bwr4bFAOmkEpvtiY+amluzGxQ== + "@spectrum-css/switch@^1.0.2": version "1.0.22" resolved "https://registry.yarnpkg.com/@spectrum-css/switch/-/switch-1.0.22.tgz#8f2fe25a52b4511b9cfde7af45f9bd824b9774d7" integrity sha512-/Q8IxnkSQYo+i3G3BObslSvoKgM0Mm1mS7kmssULOtaQPbaRlRsUNQVaHzcNEX33+fiF/9zKSvs7ypgIvbWp+Q== +"@spectrum-css/table@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/table/-/table-3.0.1.tgz#753e0e2498082c0c36b9600828516aff3ac338cd" + integrity sha512-XQ+srMTv9hK1H0nctWUtqyzitmvyb5TNR+7mjAmKRdkBRSTQQSipDhenxZp72ekzMtMoSYZVZ77kgo0Iw3Fpug== + "@spectrum-css/table@^3.0.1": version "3.0.3" resolved "https://registry.yarnpkg.com/@spectrum-css/table/-/table-3.0.3.tgz#7f7f19905ef3275cbf907ce3a5818e63c30b2caf" integrity sha512-nxwzVjLPsXoY/v4sdxOVYLcC+cEbGgJyLcLclT5LT9MGSbngFeUMJzzVR4EvehzuN4dH7hrATG7Mbuq29Mf0Hg== +"@spectrum-css/tabs@3.2.12": + version "3.2.12" + resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.2.12.tgz#9b08f23d5aa881b3441af7757800c7173e5685ff" + integrity sha512-rPFUW9SSW4+3/UJ3UrtY2/l3sQvlqB1fqxHLPDjgykvbfrnMejcCTNV4ZrFNHXpE/6+kGnk+yVViSPtWGwJzkA== + "@spectrum-css/tabs@^3.0.1": version "3.2.16" resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.2.16.tgz#c3f7800d8d6f7c9930c28cd01354816328bf72b1" integrity sha512-JUcMB/fiDG/KoyrVstlUMacFJUY4OHKqhMRuPtu9ggUXWCRbSkY8he92v6u0HwY3DuhDoOxNTK8d/PLjk/fsbg== +"@spectrum-css/tag@^3.1.4": + version "3.3.15" + resolved "https://registry.yarnpkg.com/@spectrum-css/tag/-/tag-3.3.15.tgz#971184fd8cb977b85a529f808313851863123278" + integrity sha512-pF6Wh61Z7hmAy20twIlpjdDuivYj6UPtWIzK7giyJKr/qcn20BjVN2ChIeFB1N+vBamJdLsuQOewv4AJ3+LZ2Q== + +"@spectrum-css/tags@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/tags/-/tags-3.0.2.tgz#5bf35fb79c97cd9344de485bd4626ad5b9f07757" + integrity sha512-HbvMk+QHvCDD1/ScvSErpKROcpAbXuMD4Hl/Gz/1A1lQ0fJ/CJeCq/MMsL7zjK1nlItU/ySu8r8KIuRF+6F8SQ== + "@spectrum-css/tags@^3.0.2": version "3.0.3" resolved "https://registry.yarnpkg.com/@spectrum-css/tags/-/tags-3.0.3.tgz#fc76d2735cdc442de91b7eb3bee49a928c0767ac" integrity sha512-SL8vPxVDfWcY5VdIuyl0TImEXcOU1I7yCyXkk7MudMwfnYs81FaIyY32hFV9OHj0Tz/36UzRzc7AVMSuRQ53pw== +"@spectrum-css/textfield@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/textfield/-/textfield-3.0.1.tgz#e875b8e37817378ad08fc4af7d53026df38911e5" + integrity sha512-MUV5q87CVxbkNdSNoxGrFbgyKc51ft/WWf3aVEoPdPw5yBnXqFe1w1YmAit5zYDOOhhs58sCLAlUcCMlOpkgrA== + "@spectrum-css/textfield@^3.0.1": version "3.2.3" resolved "https://registry.yarnpkg.com/@spectrum-css/textfield/-/textfield-3.2.3.tgz#52830498fb3b8957f84bb9bf2cafec7edc55e490" integrity sha512-mtxSQe8VZjQ8PHKlUE03dATAjjxp2Y8XfYmWWFBWWZLeqaojSLv9Q8C/ouK5AenhzCaYpJxTotMjAoivwtmUSw== +"@spectrum-css/toast@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/toast/-/toast-3.0.1.tgz#36f62ea05302761e59b9d53e05f6c04423861796" + integrity sha512-jov++S358BrN2tmMfaoYk1N6u9HojgeuQk61keXrK2m3VE5/n94x7Lg3kIPeSWO0odyDfBlMqT9jacbRey3QTg== + "@spectrum-css/toast@^3.0.1": version "3.0.3" resolved "https://registry.yarnpkg.com/@spectrum-css/toast/-/toast-3.0.3.tgz#97c1527384707600832ecda35643ed304615250f" integrity sha512-CjLeaMs+cjUXojCCRtbj0YkD2BoZW16kjj2o5omkEpUTjA34IJ8xJ1a+CCtDILWekhXvN0MBN4sbumcnwcnx8w== +"@spectrum-css/tooltip@3.0.3": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/tooltip/-/tooltip-3.0.3.tgz#26b8ca3b3d30e29630244d85eb4fc11d0c841281" + integrity sha512-ztRF7WW1FzyNavXBRc+80z67UoOrY9wl3cMYsVD3MpDnyxdzP8cjza1pCcolKBaFqRTcQKkxKw3GWtGICRKR5A== + "@spectrum-css/tooltip@^3.0.3": version "3.1.17" resolved "https://registry.yarnpkg.com/@spectrum-css/tooltip/-/tooltip-3.1.17.tgz#1f0822c8b69d16d5f940a2b7eb6514d719e6a0fd" integrity sha512-YDuC+Cc6B8DExjL/7fkPnWb8QwlCkjuMHyuttwP/tq/lryWnrdntojgwK5KvgFRjnZ2WfepZVryIt5LOD3tMdg== +"@spectrum-css/treeview@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/treeview/-/treeview-3.0.2.tgz#d54d8f17290babb1c885f5d9355e225421beb0d2" + integrity sha512-foO7UBJv1JMFaKgDPVt8jBghZSVbqhXR8TaGaxHSnMubv7ygmKkc1AITrWC2STILCn84ju2vchOohMZfW6sYwg== + "@spectrum-css/treeview@^3.0.2": version "3.0.3" resolved "https://registry.yarnpkg.com/@spectrum-css/treeview/-/treeview-3.0.3.tgz#aeda5175158b9f8d7529cb2b394428eb2a428046" integrity sha512-D5gGzZC/KtRArdx86Mesc9+99W9nTbUOeyYGqoJoAfJSOttoT6Tk5CrDvlCmAqjKf5rajemAkGri1ChqvUIwkw== +"@spectrum-css/typography@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/typography/-/typography-3.0.1.tgz#957dafd9b18c314fa37a88b549042ba2175f5b3f" + integrity sha512-XyR68K2rIZX3u4j7HhMLOqLVHDJZcapp3XUqgYMzMWccBFleA0qPxKpfRWqVIA5DzTMSIw0wEcZPYKWFZ2e6dA== + "@spectrum-css/typography@^3.0.1", "@spectrum-css/typography@^3.0.2": version "3.0.2" resolved "https://registry.yarnpkg.com/@spectrum-css/typography/-/typography-3.0.2.tgz#ea3ca0a60e18064527819d48c8c4364cab4fcd38" integrity sha512-5ZOLmQe0edzsDMyhghUd4hBb5uxGsFrxzf+WasfcUw9klSfTsRZ09n1BsaaWbgrLjlMQ+EEHS46v5VNo0Ms2CA== +"@spectrum-css/underlay@2.0.9": + version "2.0.9" + resolved "https://registry.yarnpkg.com/@spectrum-css/underlay/-/underlay-2.0.9.tgz#fc10f971d1325cc844b727e6260f7217844060e8" + integrity sha512-X86xd0PG4QobmUyXA90BFGnyygaI8kW64dA4ysf4z0cOvUWjNbAAl3a/DB/WRyrnp63Zqv83T/cgNbetagTbWg== + "@spectrum-css/underlay@^2.0.9": version "2.0.30" resolved "https://registry.yarnpkg.com/@spectrum-css/underlay/-/underlay-2.0.30.tgz#401cfd68df945692bd6bbe281fee98889c930dd1" integrity sha512-Ssq/KERbDuJu3PUWPkBv9+ZIbKooke3oncRoYMXeyP/Gcw5bmQSXOvnlddU5DIK4PJR+pPGVZ9CUUFaYZot4YQ== -"@spectrum-css/vars@^3.0.1": +"@spectrum-css/vars@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-3.0.1.tgz#561fd69098f896a647242dd8d6108af603bfa31e" + integrity sha512-l4oRcCOqInChYXZN6OQhpe3isk6l4OE6Ys8cgdlsiKp53suNoQxyyd9p/eGRbCjZgH3xQ8nK0t4DHa7QYC0S6w== + +"@spectrum-css/vars@^3.0.1", "@spectrum-css/vars@^3.0.2": version "3.0.2" resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-3.0.2.tgz#ea9062c3c98dfc6ba59e5df14a03025ad8969999" integrity sha512-vzS9KqYXot4J3AEER/u618MXWAS+IoMvYMNrOoscKiLLKYQWenaueakUWulFonToPd/9vIpqtdbwxznqrK5qDw== @@ -3059,6 +3388,13 @@ resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.2.tgz#f65d3d6389e01eeb458bd54dc8f52b95a9463bc8" integrity sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w== +"@types/codemirror@^5.60.4": + version "5.60.7" + resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-5.60.7.tgz#efbb78e5e79f90c6762c2127c02096648e600808" + integrity sha512-QXIC+RPzt/1BGSuD6iFn6UMC9TDp+9hkOANYNPVsjjrDdzKphfRkwQDKGp2YaC54Yhz0g6P5uYTCCibZZEiMAA== + dependencies: + "@types/tern" "*" + "@types/connect@*": version "3.4.35" resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" @@ -3266,6 +3602,11 @@ resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a" integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA== +"@types/marked@^4.0.7": + version "4.0.8" + resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.0.8.tgz#b316887ab3499d0a8f4c70b7bd8508f92d477955" + integrity sha512-HVNzMT5QlWCOdeuBsgXP8EZzKUf0+AXzN+sLmjvaB3ZlLqO+e4u0uXrdw9ub69wBKFs+c6/pA4r9sy6cCDvImw== + "@types/mime@^1": version "1.3.2" resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" @@ -3567,6 +3908,13 @@ "@types/node" "*" minipass "^3.3.5" +"@types/tern@*": + version "0.23.4" + resolved "https://registry.yarnpkg.com/@types/tern/-/tern-0.23.4.tgz#03926eb13dbeaf3ae0d390caf706b2643a0127fb" + integrity sha512-JAUw1iXGO1qaWwEOzxTKJZ/5JxVeON9kvGZ/osgZaJImBnyjyn0cjovPsf6FNLmyGY8Vw9DoXZCMlfMkMwHRWg== + dependencies: + "@types/estree" "*" + "@types/tough-cookie@*", "@types/tough-cookie@^4.0.2": version "4.0.2" resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397" @@ -5190,6 +5538,18 @@ co@^4.6.0: resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== +codemirror-spell-checker@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/codemirror-spell-checker/-/codemirror-spell-checker-1.1.2.tgz#1c660f9089483ccb5113b9ba9ca19c3f4993371e" + integrity sha512-2Tl6n0v+GJRsC9K3MLCdLaMOmvWL0uukajNJseorZJsslaxZyZMgENocPU8R0DyoTAiKsyqiemSOZo7kjGV0LQ== + dependencies: + typo-js "*" + +codemirror@^5.63.1: + version "5.65.12" + resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.12.tgz#294fdf097d10ac5b56a9e011a91eff252afc73ae" + integrity sha512-z2jlHBocElRnPYysN2HAuhXbO3DNB0bcSKmNz3hcWR2Js2Dkhc1bEOxG93Z3DeUrnm+qx56XOY5wQmbP5KY0sw== + collect-v8-coverage@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" @@ -5978,11 +6338,41 @@ doctrine@3.0.0, doctrine@^3.0.0: dependencies: esutils "^2.0.2" +dom-serializer@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53" + integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg== + dependencies: + domelementtype "^2.3.0" + domhandler "^5.0.2" + entities "^4.2.0" + dom-walk@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84" integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w== +domelementtype@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" + integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== + +domhandler@^5.0.1, domhandler@^5.0.2, domhandler@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31" + integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w== + dependencies: + domelementtype "^2.3.0" + +domutils@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c" + integrity sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q== + dependencies: + dom-serializer "^2.0.0" + domelementtype "^2.3.0" + domhandler "^5.0.1" + dot-prop@^5.2.0: version "5.3.0" resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" @@ -6027,6 +6417,11 @@ download@8.0.0: p-event "^2.1.0" pify "^4.0.1" +downloadjs@1.4.7: + version "1.4.7" + resolved "https://registry.yarnpkg.com/downloadjs/-/downloadjs-1.4.7.tgz#f69f96f940e0d0553dac291139865a3cd0101e3c" + integrity sha512-LN1gO7+u9xjU5oEScGFKvXhYf7Y/empUIIEAGBs1LzUq/rg5duiDrkuH5A2lQGd5jfMOb9X9usDa2oVXwJ0U/Q== + duplexer3@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" @@ -6042,6 +6437,17 @@ duplexify@^4.0.0: readable-stream "^3.1.1" stream-shift "^1.0.0" +easymde@^2.16.1: + version "2.18.0" + resolved "https://registry.yarnpkg.com/easymde/-/easymde-2.18.0.tgz#ff1397d07329b1a7b9187d2d0c20766fa16b3b1b" + integrity sha512-IxVVUxNWIoXLeqtBU4BLc+eS/ScYhT1Dcb6yF5Wchoj1iXAV+TIIDWx+NCaZhY7RcSHqDPKllbYq7nwGKILnoA== + dependencies: + "@types/codemirror" "^5.60.4" + "@types/marked" "^4.0.7" + codemirror "^5.63.1" + codemirror-spell-checker "1.1.2" + marked "^4.1.0" + ecc-jsbn@~0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" @@ -6204,6 +6610,17 @@ end-stream@~0.1.0: dependencies: write-stream "~0.4.3" +engine.io-client@~6.4.0: + version "6.4.0" + resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.4.0.tgz#88cd3082609ca86d7d3c12f0e746d12db4f47c91" + integrity sha512-GyKPDyoEha+XZ7iEqam49vz6auPnNJ9ZBfy89f+rMMas8AuiMWOZ9PVzu8xb9ZC6rafUqiGHSCfu22ih66E+1g== + dependencies: + "@socket.io/component-emitter" "~3.1.0" + debug "~4.3.1" + engine.io-parser "~5.0.3" + ws "~8.11.0" + xmlhttprequest-ssl "~2.0.0" + engine.io-parser@~5.0.3: version "5.0.4" resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.4.tgz#0b13f704fa9271b3ec4f33112410d8f3f41d0fc0" @@ -6238,6 +6655,11 @@ ent@^2.2.0: resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA== +entities@^4.2.0, entities@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174" + integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA== + entities@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5" @@ -7946,6 +8368,21 @@ html-tag@^2.0.0: is-self-closing "^1.0.1" kind-of "^6.0.0" +html5-qrcode@^2.2.1: + version "2.3.7" + resolved "https://registry.yarnpkg.com/html5-qrcode/-/html5-qrcode-2.3.7.tgz#09ed2ca7473a47bd551088c15fcfcb7cb409a5be" + integrity sha512-Jmlok9Ynm49hgVXkdupWryf8o430proIFoQsRl1LmTg4Rq461W72omylR9yw9tsEMtswMEw3wacUM5y0agOBQA== + +htmlparser2@^8.0.0: + version "8.0.2" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.2.tgz#f002151705b383e62433b5cf466f5b716edaec21" + integrity sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA== + dependencies: + domelementtype "^2.3.0" + domhandler "^5.0.3" + domutils "^3.0.1" + entities "^4.4.0" + http-assert@^1.3.0: version "1.5.0" resolved "https://registry.yarnpkg.com/http-assert/-/http-assert-1.5.0.tgz#c389ccd87ac16ed2dfa6246fd73b926aa00e6b8f" @@ -8581,6 +9018,11 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" +is-plain-object@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" + integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== + is-property@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" @@ -9809,6 +10251,11 @@ lcid@^2.0.0: dependencies: invert-kv "^2.0.0" +leaflet@^1.7.1: + version "1.9.3" + resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.3.tgz#52ec436954964e2d3d39e0d433da4b2500d74414" + integrity sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ== + level-codec@9.0.2, level-codec@^9.0.0: version "9.0.2" resolved "https://registry.yarnpkg.com/level-codec/-/level-codec-9.0.2.tgz#fd60df8c64786a80d44e63423096ffead63d8cbc" @@ -10293,6 +10740,11 @@ markdown-it@^12.2.0: mdurl "^1.0.1" uc.micro "^1.0.5" +marked@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/marked/-/marked-4.3.0.tgz#796362821b019f734054582038b116481b456cf3" + integrity sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A== + matcher@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" @@ -10691,6 +11143,16 @@ nan@^2.15.0, nan@^2.16.0: resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb" integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ== +nanoid@^2.1.0: + version "2.1.11" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280" + integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA== + +nanoid@^3.3.4: + version "3.3.6" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" + integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== + nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -11351,6 +11813,11 @@ parse-passwd@^1.0.0: resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q== +parse-srcset@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1" + integrity sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q== + parseurl@^1.3.2, parseurl@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" @@ -11692,6 +12159,15 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg== +postcss@^8.3.11: + version "8.4.21" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4" + integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg== + dependencies: + nanoid "^3.3.4" + picocolors "^1.0.0" + source-map-js "^1.0.2" + postgres-array@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e" @@ -12437,6 +12913,16 @@ regexp.prototype.flags@^1.4.3: define-properties "^1.1.3" functions-have-names "^1.2.2" +regexparam@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-2.0.1.tgz#c912f5dae371e3798100b3c9ce22b7414d0889fa" + integrity sha512-zRgSaYemnNYxUv+/5SeoHI0eJIgTL/A2pUtXUPLHQxUldagouJ9p+K6IbIZ/JiQuCEv2E2B1O11SjVQy3aMCkw== + +regexparam@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-1.3.0.tgz#2fe42c93e32a40eff6235d635e0ffa344b92965f" + integrity sha512-6IQpFBv6e5vz1QAqI+V4k8P2e/3gRrqfCJ9FI+O1FLQTO+Uz6RXZEZOPmTJ6hlGj7gkERzY5BRCv09whKP96/g== + regexpp@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" @@ -12759,6 +13245,18 @@ safe-stable-stringify@^2.3.1: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== +sanitize-html@^2.7.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.10.0.tgz#74d28848dfcf72c39693139131895c78900ab452" + integrity sha512-JqdovUd81dG4k87vZt6uA6YhDfWkUGruUu/aPmXLxXi45gZExnt9Bnw/qeQU8oGf82vPyaE0vO4aH0PbobB9JQ== + dependencies: + deepmerge "^4.2.2" + escape-string-regexp "^4.0.0" + htmlparser2 "^8.0.0" + is-plain-object "^5.0.0" + parse-srcset "^1.0.2" + postcss "^8.3.11" + sanitize-s3-objectkey@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/sanitize-s3-objectkey/-/sanitize-s3-objectkey-0.0.1.tgz#efa9887cd45275b40234fb4bb12fc5754fe64e7e" @@ -12790,6 +13288,11 @@ schema-utils@^3.1.0, schema-utils@^3.1.1: ajv "^6.12.5" ajv-keywords "^3.5.2" +screenfull@^6.0.1: + version "6.0.2" + resolved "https://registry.yarnpkg.com/screenfull/-/screenfull-6.0.2.tgz#3dbe4b8c4f8f49fb8e33caa8f69d0bca730ab238" + integrity sha512-AQdy8s4WhNvUZ6P8F6PB21tSPIYKniic+Ogx0AacBMjKP1GUHN2E9URxQHtCusiwxudnCKkdy4GrHXPPJSkCCw== + search-params@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/search-params/-/search-params-3.0.0.tgz#dbc7c243058e5a33ae1e9870be91f5aced4100d8" @@ -12964,6 +13467,13 @@ shimmer@^1.2.0: resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337" integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw== +shortid@^2.2.15: + version "2.2.16" + resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz#b742b8f0cb96406fd391c76bfc18a67a57fe5608" + integrity sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g== + dependencies: + nanoid "^2.1.0" + side-channel@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" @@ -13099,6 +13609,16 @@ socket.io-adapter@~2.4.0: resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz#b50a4a9ecdd00c34d4c8c808224daa1a786152a6" integrity sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg== +socket.io-client@^4.5.1: + version "4.6.1" + resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.6.1.tgz#80d97d5eb0feca448a0fb6d69a7b222d3d547eab" + integrity sha512-5UswCV6hpaRsNg5kkEHVcbBIXEYoVbMQaHJBXJCyEQ+CiFPV1NIOY0XOFWG4XR4GZcB8Kn6AsRs/9cy9TbqVMQ== + dependencies: + "@socket.io/component-emitter" "~3.1.0" + debug "~4.3.2" + engine.io-client "~6.4.0" + socket.io-parser "~4.2.1" + socket.io-parser@~4.2.0: version "4.2.1" resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.1.tgz#01c96efa11ded938dcb21cbe590c26af5eff65e5" @@ -13107,6 +13627,14 @@ socket.io-parser@~4.2.0: "@socket.io/component-emitter" "~3.1.0" debug "~4.3.1" +socket.io-parser@~4.2.1: + version "4.2.2" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.2.tgz#1dd384019e25b7a3d374877f492ab34f2ad0d206" + integrity sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw== + dependencies: + "@socket.io/component-emitter" "~3.1.0" + debug "~4.3.1" + socket.io@^4.5.1: version "4.5.2" resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.5.2.tgz#1eb25fd380ab3d63470aa8279f8e48d922d443ac" @@ -13161,6 +13689,11 @@ source-list-map@^2.0.1: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== +source-map-js@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" + integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== + source-map-resolve@^0.5.0: version "0.5.3" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" @@ -13647,11 +14180,23 @@ svelte-portal@^1.0.0: resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-1.0.0.tgz#36a47c5578b1a4d9b4dc60fa32a904640ec4cdd3" integrity sha512-nHf+DS/jZ6jjnZSleBMSaZua9JlG5rZv9lOGKgJuaZStfevtjIlUJrkLc3vbV8QdBvPPVmvcjTlazAzfKu0v3Q== +svelte-spa-router@^3.0.5: + version "3.3.0" + resolved "https://registry.yarnpkg.com/svelte-spa-router/-/svelte-spa-router-3.3.0.tgz#2fc0967a49dc361dfe4d38dddad6e662eed5b42c" + integrity sha512-cwRNe7cxD43sCvSfEeaKiNZg3FCizGxeMcf7CPiWRP3jKXjEma3vxyyuDtPOam6nWbVxl9TNM3hlE/i87ZlqcQ== + dependencies: + regexparam "2.0.1" + svelte@3.49.0: version "3.49.0" resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.49.0.tgz#5baee3c672306de1070c3b7888fc2204e36a4029" integrity sha512-+lmjic1pApJWDfPCpUUTc1m8azDqYCG1JN9YEngrx/hUyIcFJo6VZhj0A1Ai0wqoHcEIuQy+e9tk+4uDgdtsFA== +svelte@^3.46.2, svelte@^3.49.0: + version "3.58.0" + resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.58.0.tgz#d3e6f103efd6129e51c7d709225ad3b4c052b64e" + integrity sha512-brIBNNB76mXFmU/Kerm4wFnkskBbluBDCjx/8TcpYRb298Yh2dztS2kQ6bhtjMcvUhd5ynClfwpz5h2gnzdQ1A== + svg.draggable.js@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/svg.draggable.js/-/svg.draggable.js-2.2.2.tgz#c514a2f1405efb6f0263e7958f5b68fce50603ba" @@ -14293,6 +14838,11 @@ typescript@4.7.3: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d" integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA== +typo-js@*: + version "1.2.2" + resolved "https://registry.yarnpkg.com/typo-js/-/typo-js-1.2.2.tgz#340484d81fe518e77c81a5a770162b14492f183b" + integrity sha512-C7pYBQK17EjSg8tVNY91KHdUt5Nf6FMJ+c3js076quPmBML57PmNMzAcIq/2kf/hSYtFABNDIYNYlJRl5BJhGw== + uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" @@ -14616,10 +15166,10 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -vm2@3.9.11: - version "3.9.11" - resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.11.tgz#a880f510a606481719ec3f9803b940c5805a06fe" - integrity sha512-PFG8iJRSjvvBdisowQ7iVF580DXb1uCIiGaXgm7tynMR1uTBlv7UJlB1zdv5KJ+Tmq1f0Upnj3fayoEOPpCBKg== +vm2@^3.9.15: + version "3.9.15" + resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.15.tgz#c544e6a9bc31e4e40d2e5f532342cf799ea56a6e" + integrity sha512-XqNqknHGw2avJo13gbIwLNZUumvrSHc9mLqoadFZTpo3KaNEJoe1I0lqTFhRXmXD7WkLyG01aaraXdXT0pa4ag== dependencies: acorn "^8.7.0" acorn-walk "^8.2.0" @@ -14943,6 +15493,11 @@ write@1.0.3: dependencies: mkdirp "^0.5.1" +ws@~8.11.0: + version "8.11.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143" + integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg== + ws@~8.2.3: version "8.2.3" resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba" @@ -15006,6 +15561,11 @@ xmlbuilder@~9.0.1: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= +xmlhttprequest-ssl@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67" + integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A== + xpath.js@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/xpath.js/-/xpath.js-1.1.0.tgz#3816a44ed4bb352091083d002a383dd5104a5ff1" diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 6e157fae3c..0ca6fc9dbe 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -30,7 +30,7 @@ "handlebars": "^4.7.6", "handlebars-utils": "^1.0.6", "lodash": "^4.17.20", - "vm2": "^3.9.4" + "vm2": "^3.9.15" }, "devDependencies": { "@rollup/plugin-commonjs": "^17.1.0", diff --git a/packages/string-templates/yarn.lock b/packages/string-templates/yarn.lock index 4488e58d46..ce8fd70553 100644 --- a/packages/string-templates/yarn.lock +++ b/packages/string-templates/yarn.lock @@ -4410,10 +4410,10 @@ vlq@^0.2.2: resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26" integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow== -vm2@^3.9.4: - version "3.9.11" - resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.11.tgz#a880f510a606481719ec3f9803b940c5805a06fe" - integrity sha512-PFG8iJRSjvvBdisowQ7iVF580DXb1uCIiGaXgm7tynMR1uTBlv7UJlB1zdv5KJ+Tmq1f0Upnj3fayoEOPpCBKg== +vm2@^3.9.15: + version "3.9.15" + resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.15.tgz#c544e6a9bc31e4e40d2e5f532342cf799ea56a6e" + integrity sha512-XqNqknHGw2avJo13gbIwLNZUumvrSHc9mLqoadFZTpo3KaNEJoe1I0lqTFhRXmXD7WkLyG01aaraXdXT0pa4ag== dependencies: acorn "^8.7.0" acorn-walk "^8.2.0" From 3b32120f833b7fab826ed692069cac3bc7c298c0 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Fri, 7 Apr 2023 22:06:19 +0100 Subject: [PATCH 20/91] bumping worker leaf version --- packages/server/yarn.lock | 568 +------------------------------------- packages/worker/yarn.lock | 6 +- 2 files changed, 7 insertions(+), 567 deletions(-) diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 8606a8f04c..b91aa63dc5 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -2,11 +2,6 @@ # yarn lockfile v1 -"@adobe/spectrum-css-workflow-icons@1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@adobe/spectrum-css-workflow-icons/-/spectrum-css-workflow-icons-1.2.1.tgz#7e2cb3fcfb5c8b12d7275afafbb6ec44913551b4" - integrity sha512-uVgekyBXnOVkxp+CUssjN/gefARtudZC8duEn1vm0lBQFwGRZFlDEzU1QC+aIRWCrD1Z8OgRpmBYlSZ7QS003w== - "@adobe/spectrum-css-workflow-icons@^1.2.1": version "1.5.3" resolved "https://registry.yarnpkg.com/@adobe/spectrum-css-workflow-icons/-/spectrum-css-workflow-icons-1.5.3.tgz#5e31ce842b7626f4b99f9d5cd0b17599d287b0bf" @@ -1295,7 +1290,7 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.5.1", "@budibase/backend-core@^2.5.1": +"@budibase/backend-core@2.5.1": version "2.5.1" resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.1.tgz#94f4be07b08d8c61dc74bd9e86acaeba4eb7ef8c" integrity sha512-Pl099USxugkHtgZvtHfnok0HRwZInIME1VqQet/NfLiN7UX8ZUp4a6F0rdovVwi54imPLez2PJrStMjKeyQAIQ== @@ -1384,104 +1379,6 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/bbui@^2.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-2.5.1.tgz#81a41a640c688293b885b9038d18e62d6461d9ae" - integrity sha512-20LjOOq6RH3BYI712DqViKL9YdmDmOHGyrIsr1nxcQ6UnP5Mx4t3Ww0CvMXOuV1nvnNd8AVsUg0j1SZ7AXE2rQ== - dependencies: - "@adobe/spectrum-css-workflow-icons" "1.2.1" - "@budibase/shared-core" "^2.5.1" - "@budibase/string-templates" "^2.5.1" - "@spectrum-css/accordion" "3.0.24" - "@spectrum-css/actionbutton" "1.0.1" - "@spectrum-css/actiongroup" "1.0.1" - "@spectrum-css/avatar" "3.0.2" - "@spectrum-css/button" "3.0.1" - "@spectrum-css/buttongroup" "3.0.2" - "@spectrum-css/checkbox" "3.0.2" - "@spectrum-css/dialog" "3.0.1" - "@spectrum-css/divider" "1.0.3" - "@spectrum-css/dropzone" "3.0.2" - "@spectrum-css/fieldgroup" "3.0.2" - "@spectrum-css/fieldlabel" "3.0.1" - "@spectrum-css/icon" "3.0.1" - "@spectrum-css/illustratedmessage" "3.0.2" - "@spectrum-css/inlinealert" "2.0.1" - "@spectrum-css/inputgroup" "3.0.2" - "@spectrum-css/label" "2.0.10" - "@spectrum-css/link" "3.1.1" - "@spectrum-css/menu" "3.0.1" - "@spectrum-css/modal" "3.0.1" - "@spectrum-css/pagination" "3.0.3" - "@spectrum-css/picker" "1.0.1" - "@spectrum-css/popover" "3.0.1" - "@spectrum-css/progressbar" "1.0.2" - "@spectrum-css/progresscircle" "1.0.2" - "@spectrum-css/radio" "3.0.2" - "@spectrum-css/search" "3.0.2" - "@spectrum-css/sidenav" "3.0.2" - "@spectrum-css/slider" "3.0.1" - "@spectrum-css/statuslight" "3.0.2" - "@spectrum-css/stepper" "3.0.3" - "@spectrum-css/switch" "1.0.2" - "@spectrum-css/table" "3.0.1" - "@spectrum-css/tabs" "3.2.12" - "@spectrum-css/tags" "3.0.2" - "@spectrum-css/textfield" "3.0.1" - "@spectrum-css/toast" "3.0.1" - "@spectrum-css/tooltip" "3.0.3" - "@spectrum-css/treeview" "3.0.2" - "@spectrum-css/typography" "3.0.1" - "@spectrum-css/underlay" "2.0.9" - "@spectrum-css/vars" "3.0.1" - dayjs "^1.10.4" - easymde "^2.16.1" - svelte-flatpickr "^3.2.3" - svelte-portal "^1.0.0" - -"@budibase/client@^2.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@budibase/client/-/client-2.5.1.tgz#0859fa6dc8d68ebf91be879414df3587ece8bd5a" - integrity sha512-m6zvvSDtidpASz7u7EmYsDa+2mU7O+FeWcx8rD0nySY1S7hcDp1Lc8mdVgZwa6V3F+/NEj/uPdLQ7LlVlvOg9g== - dependencies: - "@budibase/bbui" "^2.5.1" - "@budibase/frontend-core" "^2.5.1" - "@budibase/shared-core" "^2.5.1" - "@budibase/string-templates" "^2.5.1" - "@budibase/types" "^2.5.1" - "@spectrum-css/button" "^3.0.3" - "@spectrum-css/card" "^3.0.3" - "@spectrum-css/divider" "^1.0.3" - "@spectrum-css/link" "^3.1.3" - "@spectrum-css/page" "^3.0.1" - "@spectrum-css/tag" "^3.1.4" - "@spectrum-css/typography" "^3.0.2" - "@spectrum-css/vars" "^3.0.1" - apexcharts "^3.22.1" - dayjs "^1.10.5" - downloadjs "1.4.7" - html5-qrcode "^2.2.1" - leaflet "^1.7.1" - regexparam "^1.3.0" - sanitize-html "^2.7.0" - screenfull "^6.0.1" - shortid "^2.2.15" - socket.io-client "^4.5.1" - svelte "^3.49.0" - svelte-apexcharts "^1.0.2" - svelte-flatpickr "^3.1.0" - svelte-spa-router "^3.0.5" - -"@budibase/frontend-core@^2.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@budibase/frontend-core/-/frontend-core-2.5.1.tgz#209a0315ed5793d800cd06109f305d4658f07c1a" - integrity sha512-6Ke09jmoMnOq4iwSJ2aZxvbuk4Ho5clonBf0npm0AO1leITxs/czcpQNXp8pAGNK01M57xzFP5okecVObMvaLQ== - dependencies: - "@budibase/bbui" "^2.5.1" - "@budibase/shared-core" "^2.5.1" - lodash "^4.17.21" - svelte "^3.46.2" - "@budibase/handlebars-helpers@^0.11.8": version "0.11.8" resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841" @@ -1548,13 +1445,6 @@ memorystream "^0.3.1" node-fetch "^2.6.1" -"@budibase/shared-core@^2.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@budibase/shared-core/-/shared-core-2.5.1.tgz#e66a39265af761de1c75a1225670cbf17d96b39e" - integrity sha512-EHx04r0pi6GoAeOl+9v2zdt0mgwC1eTrX/n2JoyJFclx6d3lLnvFPm0sWKAhFimLxu60a9z0l+3i0MvyKmowUw== - dependencies: - "@budibase/types" "^2.5.1" - "@budibase/standard-components@^0.9.139": version "0.9.139" resolved "https://registry.yarnpkg.com/@budibase/standard-components/-/standard-components-0.9.139.tgz#cf8e2b759ae863e469e50272b3ca87f2827e66e3" @@ -1585,18 +1475,6 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/string-templates@^2.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.5.1.tgz#2744a583f84fc8df5714865e7efc203e72b0b937" - integrity sha512-y4Q1DkMK0lUMpdeF6CzJJmqaEE0vUJBnfPx0PFJf5F8cWqXevcMrFcMr/rYB7DoaKigpO/u/fYwqKJwlodhfzw== - dependencies: - "@budibase/handlebars-helpers" "^0.11.8" - dayjs "^1.10.4" - handlebars "^4.7.6" - handlebars-utils "^1.0.6" - lodash "^4.17.20" - vm2 "^3.9.4" - "@budibase/types@2.5.1", "@budibase/types@^2.5.1": version "2.5.1" resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.1.tgz#d4bf8ac4b65b1163ed6d2fc9c0b70bcfbc13e784" @@ -2760,51 +2638,26 @@ resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553" integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg== -"@spectrum-css/accordion@3.0.24": - version "3.0.24" - resolved "https://registry.yarnpkg.com/@spectrum-css/accordion/-/accordion-3.0.24.tgz#f89066c120c57b0cfc9aba66d60c39fc1cf69f74" - integrity sha512-jNOmUsxmiT3lRLButnN5KKHM94fd+87fjiF8L0c4uRNgJl6ZsBuxPXrM15lV4y1f8D2IACAw01/ZkGRAeaCOFA== - -"@spectrum-css/actionbutton@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.0.1.tgz#9c75da37ea6915919fb574c74bd60dacc03b6577" - integrity sha512-AUqtyNabHF451Aj9i3xz82TxS5Z6k1dttA68/1hMeU9kbPCSS4P6Viw3vaRGs9CSspuR8xnnhDgrq+F+zMy2Hw== - "@spectrum-css/actionbutton@^1.0.1": version "1.1.14" resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.1.14.tgz#4e12eb7f482fb5944c3d97547591964baebeb1d4" integrity sha512-ViBjdWi23J6vIR4t8JTRQ6jY/+KgpZgCALj3otgy495zMNG7jPeN7sKoy6i6JZJcdIRJA4MjOTVvcDOGkYWUZg== -"@spectrum-css/actiongroup@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/actiongroup/-/actiongroup-1.0.1.tgz#b95b86e7af229e90fe1e70399d8d4b547b4bd31c" - integrity sha512-5Q6uMjzv5BFA2TwGASr/jAtJpTWl26fhWvgGY8kOA0RCSij35l+YJg/FPXf6Nnj2qCOl8DkNycjT9YXJ+bhyVA== - "@spectrum-css/actiongroup@^1.0.1": version "1.0.26" resolved "https://registry.yarnpkg.com/@spectrum-css/actiongroup/-/actiongroup-1.0.26.tgz#181ee059f28b1342389a128c39d20d2e10566aae" integrity sha512-T1IK9a2Gxix9givm+chGvFtZh5oGBZQc/S2UA9F76JZKu45eCkLkvUH6F670XOrBhDGkVfzvN21QnFymSY43ow== -"@spectrum-css/avatar@3.0.2", "@spectrum-css/avatar@^3.0.2": +"@spectrum-css/avatar@^3.0.2": version "3.0.2" resolved "https://registry.yarnpkg.com/@spectrum-css/avatar/-/avatar-3.0.2.tgz#4f1826223eae330e64b6d3cc899e9bc2e98dac95" integrity sha512-wEczvSqxttTWSiL3cOvXV/RmGRwSkw2w6+slcHhnf0kb7ovymMM+9oz8vvEpEsSeo5u598bc+7ktrKFpAd6soQ== -"@spectrum-css/button@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.1.tgz#6db8c3e851baecd0f1c2d88fef37d49d01c6e643" - integrity sha512-YXrBtjIYisk4Vaxnp0RiE4gdElQX04P2mc4Pi2GlQ27dJKlHmufYcF+kAqGdtiyK5yjdN/vKRcC8y13aA4rusA== - "@spectrum-css/button@^3.0.1", "@spectrum-css/button@^3.0.3": version "3.0.3" resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.3.tgz#2df1efaab6c7e0b3b06cb4b59e1eae59c7f1fc84" integrity sha512-6CnLPqqtaU/PcSSIGeGRi0iFIIxIUByYLKFO6zn5NEUc12KQ28dJ4PLwB6WBa0L8vRoAGlnWWH2ZZweTijbXgg== -"@spectrum-css/buttongroup@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/buttongroup/-/buttongroup-3.0.2.tgz#fd3387973ca3131609e32112de42a1c0400a48d8" - integrity sha512-Wu7B4GJ/SAeVHz9SUGAkeIH8pLaZh4t+w2ykSKOPQIRuK2jCBoudkEClVxviNVwqekccf5XLFXg9GpYF1a3Uaw== - "@spectrum-css/buttongroup@^3.0.2": version "3.0.10" resolved "https://registry.yarnpkg.com/@spectrum-css/buttongroup/-/buttongroup-3.0.10.tgz#897ea04b3ffea389fc7fe5bf67a6d1f3454b774d" @@ -2815,33 +2668,16 @@ resolved "https://registry.yarnpkg.com/@spectrum-css/card/-/card-3.0.3.tgz#56b2e2da6b80c1583228baa279de7407383bfb6b" integrity sha512-+oKLUI2a0QmQP9EzySeq/G4FpUkkdaDNbuEbqCj2IkPMc/2v/nwzsPhh1fj2UIghGAiiUwXfPpzax1e8fyhQUg== -"@spectrum-css/checkbox@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/checkbox/-/checkbox-3.0.2.tgz#53ca2fba0d9faa1fead10e7206eb1f6cdcfd6ddd" - integrity sha512-hPbGcnm7kJvJS4jp/P/bdaZvbyR1eIE9mteuZqcBgdmyp9m/k6+mW5jmsbtqb3Y4mMPWvOJFfz/sIvWJP0F0Zg== - "@spectrum-css/checkbox@^3.0.2": version "3.1.2" resolved "https://registry.yarnpkg.com/@spectrum-css/checkbox/-/checkbox-3.1.2.tgz#88698969091da9b50de781d25839446084b4a5f4" integrity sha512-vIuknIhRF/Xtq6OHjOtlhYt722FPcTLBb7Y7tY0Ho8VEpynj3JrVLP/1YYp/YIrYMpsTugxPmbCrEkikkdL6Mg== -"@spectrum-css/dialog@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/dialog/-/dialog-3.0.1.tgz#33aae036282159f6aa998848b8c0828640a9620a" - integrity sha512-hUFbRR6RGT63MNuP7wP+k9KU+uRuICsduMihskh700e+jiQ+Gsv53fBFDlB843FoZYlIXzFQXgtjMUC5a4Qibw== - "@spectrum-css/dialog@^3.0.1": version "3.0.12" resolved "https://registry.yarnpkg.com/@spectrum-css/dialog/-/dialog-3.0.12.tgz#fc97e002ca768a3d99dd10cb6a135c2b06052004" integrity sha512-50rbFa+9eUKT+3uYBX7CkmI7SbQ0Z3CAFwjyjai+itYZ8kf/FcHVFwcLjgrry9scUnKhexMs94kkr0gfQpPe8Q== -"@spectrum-css/divider@1.0.3": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/divider/-/divider-1.0.3.tgz#639e2ebaa0834efa40f42397668bbd5c153ea385" - integrity sha512-Zy4Rn40w8UtzMh3wx/U9+CepSCpm1aOCGftHgWDub0XZuVTzh0c1WwyzTuLCx2Hf21z5VRGNiDh8bGEEzSbtNA== - dependencies: - "@spectrum-css/vars" "^3.0.2" - "@spectrum-css/divider@^1.0.3": version "1.0.26" resolved "https://registry.yarnpkg.com/@spectrum-css/divider/-/divider-1.0.26.tgz#44b610b1b6c747536fca08b3f09286341e18ab29" @@ -2849,106 +2685,56 @@ dependencies: "@spectrum-css/vars" "^8.0.0" -"@spectrum-css/dropzone@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/dropzone/-/dropzone-3.0.2.tgz#34f137851054442b219fed7f32006b93fc5e0bcf" - integrity sha512-BuBBzm5re6lM0AWgd6V+mI5eEGnnmFEtcFiJBEn9jYNEQYgflFhvnERUt89jMX5WmspiecwI2JBWJFrtFsOzug== - "@spectrum-css/dropzone@^3.0.2": version "3.0.24" resolved "https://registry.yarnpkg.com/@spectrum-css/dropzone/-/dropzone-3.0.24.tgz#edefb3ca5a01705a64d0161a599c59199bab6299" integrity sha512-JY60hUZAAuzS+o2xFOKv0o31cc+5/cjLpTyKEy73oGKsdUXEEMiQtW2PQBCuxh7PNyw29wCULeZ1EW1QdNPyxg== -"@spectrum-css/fieldgroup@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/fieldgroup/-/fieldgroup-3.0.2.tgz#1c1afd3c444d8650fefac275dc66a7a913933846" - integrity sha512-Vyw0kQJdLW18J6w4H+YAsoLntvkw5rXmW3CH5H3SDTXkBztxtHSSe3e106Nw5MoZxTfHlom6CxbYXYCTjQfqGw== - "@spectrum-css/fieldgroup@^3.0.2": version "3.1.3" resolved "https://registry.yarnpkg.com/@spectrum-css/fieldgroup/-/fieldgroup-3.1.3.tgz#945123da56534f1ff6118a9defd18b8a883e34a8" integrity sha512-HIbB3jweNviWXcADoYQW3hanww9RTUIsBUhe0YxSMXUXnQJc/7nlyeLoTRMr2eEVSCREfRnMot/8bZloW7ctnA== -"@spectrum-css/fieldlabel@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/fieldlabel/-/fieldlabel-3.0.1.tgz#39f7c0f25cc2ff402afeff005341b0832f7c588c" - integrity sha512-LMfwrwIq8wEEvxFLobdLvXRwKrp8o9Fty4iJ9aYl2Rj1uXkfRd8qLz9HGZjLEE1OuJgoTBgamYABl7EvoA5PLw== - "@spectrum-css/fieldlabel@^3.0.1": version "3.0.3" resolved "https://registry.yarnpkg.com/@spectrum-css/fieldlabel/-/fieldlabel-3.0.3.tgz#f73c04d20734d4718ffb620dc46458904685b449" integrity sha512-nEvIkEXCD5n4fW67Unq6Iu7VXoauEd/JGpfTY02VsC5p4FJLnwKfPDbJUuUsqClAxqw7nAsmXVKtn4zQFf5yPQ== -"@spectrum-css/icon@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/icon/-/icon-3.0.1.tgz#e300a6fc353c85c6b5d6e7a364408a940c31b177" - integrity sha512-cGFtIrcQ/7tthdkHK1npuEFiCdYVHLqwmLxghUYQw8Tb8KgJaw3OBO1tpjgsUizexNgu26BjVRIbGxNWuBXIHQ== - "@spectrum-css/icon@^3.0.1": version "3.0.22" resolved "https://registry.yarnpkg.com/@spectrum-css/icon/-/icon-3.0.22.tgz#1dd77e2460121951c60c583edb470d0ba52e6822" integrity sha512-ilrPlHDRGzn7kXVVAwUhoSaMfS6sGlb21ix2gn8IRLBAjDOV8BBV1wJJtjGNw+kzCXMhnVnVOekTdht17Oe9bw== -"@spectrum-css/illustratedmessage@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/illustratedmessage/-/illustratedmessage-3.0.2.tgz#6a480be98b027e050b086e7899e40d87adb0a8c0" - integrity sha512-dqnE8X27bGcO0HN8+dYx8O4o0dNNIAqeivOzDHhe2El+V4dTzMrNIerF6G0NLm3GjVf6XliwmitsZK+K6FmbtA== - "@spectrum-css/illustratedmessage@^3.0.2": version "3.0.17" resolved "https://registry.yarnpkg.com/@spectrum-css/illustratedmessage/-/illustratedmessage-3.0.17.tgz#49cb2549fda97a6812156bfba6ccdd3a18bebd11" integrity sha512-kpDqeq1U+rEjG1XuiXkbGvS71vn6mpFF/hiwCgFJWudVOfypDPQ4KLfYw1ditFSUzMCm5H6U/RqAShAJn8oMWA== -"@spectrum-css/inlinealert@2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/inlinealert/-/inlinealert-2.0.1.tgz#7521f88f6c845806403cc7d925773c7414e204a2" - integrity sha512-Xy5RCOwgurqUXuGQCsEDUduDd5408bmEpmFg+feynG7VFUgLFZWBeylSENB/OqjlFtO76PHXNVdHkhDscPIHTA== - "@spectrum-css/inlinealert@^2.0.1": version "2.0.6" resolved "https://registry.yarnpkg.com/@spectrum-css/inlinealert/-/inlinealert-2.0.6.tgz#4c5e923a1f56a96cc1adb30ef1f06ae04f2c6376" integrity sha512-OpvvoWP02wWyCnF4IgG8SOPkXymovkC9cGtgMS1FdDubnG3tJZB/JeKTsRR9C9Vt3WBaOmISRdSKlZ4lC9CFzA== -"@spectrum-css/inputgroup@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/inputgroup/-/inputgroup-3.0.2.tgz#f1b13603832cbd22394f3d898af13203961f8691" - integrity sha512-O0G3Lw9gxsh8gTLQWIAKkN1O8cWhjpEUl+oR1PguIKFni72uNr2ikU9piOwy/r0gJG2Q/TVs6hAshoAAkmsSzw== - "@spectrum-css/inputgroup@^3.0.2": version "3.0.8" resolved "https://registry.yarnpkg.com/@spectrum-css/inputgroup/-/inputgroup-3.0.8.tgz#fc23afc8a73c24d17249c9d2337e8b42085b298b" integrity sha512-cmQWzFp0GU+4IMc8SSeVFdmQDlRUdPelXaQdKUR9mZuO2iYettg37s0lfBCeJyYkUNTagz0zP8O7A0iXfmeE6g== -"@spectrum-css/label@2.0.10", "@spectrum-css/label@^2.0.10": +"@spectrum-css/label@^2.0.10": version "2.0.10" resolved "https://registry.yarnpkg.com/@spectrum-css/label/-/label-2.0.10.tgz#2368651d7636a19385b5d300cdf6272db1916001" integrity sha512-xCbtEiQkZIlLdWFikuw7ifDCC21DOC/KMgVrrVJHXFc4KRQe9LTZSqmGF3tovm+CSq1adE59mYoTbojVQ9YuEQ== -"@spectrum-css/link@3.1.1": - version "3.1.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.1.tgz#cb526a2e10b50ef5a7ae29cca7272e2610d597eb" - integrity sha512-Bi88lRhTY7g6nM/ryW1yY4Cji211ZYNtRxkxbV7n2lPvwMAAQtyx0qVD3ru4kTGj/FFVvmPR3XiOE10K13HSNA== - "@spectrum-css/link@^3.1.1", "@spectrum-css/link@^3.1.3": version "3.1.22" resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.22.tgz#1e061d674789c5b3be5b0680f9f6eae3e695e1c1" integrity sha512-Zf8bfy+rtq07l4qoR6chNxefmatLZQZjudIm96v+lsCXBkjVbiMpjkW9oOcNwTqKB08koMONHHhOf1wk2Faqiw== -"@spectrum-css/menu@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/menu/-/menu-3.0.1.tgz#2a376f991acc24e12ec892bb6b9db2650fc41fbe" - integrity sha512-Qjg0+1O0eC89sb/bRFq2AGnQ8XqhVy23TUXHyffNM8qdcMssnlny3QmhzjURCZKvx/Y5UytCpzhedPQqSpQwZg== - "@spectrum-css/menu@^3.0.1": version "3.0.21" resolved "https://registry.yarnpkg.com/@spectrum-css/menu/-/menu-3.0.21.tgz#d1f7e6e69d30b5e1edd7ed2c86ea4e08dfd670ab" integrity sha512-G5AIUO26O6IAc6HUGZu4AZgyw0QRyLfSbcKlFGu4oJHzP36cQc1S1uCh8Xp4g5d+n6mU62LxNDLSMpVbwnA00A== -"@spectrum-css/modal@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/modal/-/modal-3.0.1.tgz#613a6b83d0330a4d38db41a98090800751c56d8d" - integrity sha512-F7D99F3cjDGT9DM9sogx/p49jrNYT7a1J6TUoqV73wUf+0gP+dTsskBOo9jB8VbUE+POQPjiDLB+SWLp6iBB+w== - "@spectrum-css/modal@^3.0.1": version "3.0.22" resolved "https://registry.yarnpkg.com/@spectrum-css/modal/-/modal-3.0.22.tgz#05593a613e246a7cbef85d08a6945219e1207209" @@ -2961,222 +2747,107 @@ dependencies: "@spectrum-css/vars" "^4.3.1" -"@spectrum-css/pagination@3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/pagination/-/pagination-3.0.3.tgz#b204c3ada384c4af751a354bc428346d82eeea65" - integrity sha512-OJ/v9GeNXJOZ9Yr9LDBYPrR2NCiLOWP9wANT/a5sqFuugRnQbn/HYMnRp9TBxwpDY6ihaPo0T/wi7kLiAJFdDw== - "@spectrum-css/pagination@^3.0.3": version "3.0.11" resolved "https://registry.yarnpkg.com/@spectrum-css/pagination/-/pagination-3.0.11.tgz#68d9f34fe8eb36bf922e41b11f49eac62ac2fc41" integrity sha512-wjZr7NAcqHK6fxNIGKTYEVtAOJugJTbcz4d8K7DZuUDgBVwLJJHJBi4uJ4KrIRYliMWOvqWTZzCJLmmTfx4cyw== -"@spectrum-css/picker@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/picker/-/picker-1.0.1.tgz#98991198576d26bd14160824e7b6f3c278ff930b" - integrity sha512-Rv4/UBOdNW1gs7WVBCJnPD5VFly8MqP++psDX6kcugUIcfJy0GC3acvElotmKRlCDk8Qxks2W2A0jKeSgphTmA== - "@spectrum-css/picker@^1.0.1": version "1.2.9" resolved "https://registry.yarnpkg.com/@spectrum-css/picker/-/picker-1.2.9.tgz#854cdca407daaf8e1f821777978690f0804b3c08" integrity sha512-HDUDiqHwM84xfbHJWm4wR67Km3NXcDluhDrkVn8uqOEZrm8y4YiW+esL6FzPgzqLdPIHboQjrdpRq4LiDzGjjA== -"@spectrum-css/popover@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/popover/-/popover-3.0.1.tgz#5863c1efc53f98f9aba2de9186666780041303fc" - integrity sha512-LmOSj/yCwQQ9iGmCYnHiJsJR/HfPiGqI1Jl7pkKxBOCxYBMS/5+ans9vfCN2Qnd0eK7WSbfPg72S6mjye7db2Q== - "@spectrum-css/popover@^3.0.1": version "3.0.11" resolved "https://registry.yarnpkg.com/@spectrum-css/popover/-/popover-3.0.11.tgz#a7450c01bcf1609264b4a9df58821368b9e224d1" integrity sha512-bzyNQJVw6Mn1EBelTaRlXCdd0ZfykNX9O6SHx3a+jXPYu8VBrRpHm0gsfWzPAz1etd1vj1CxwG/teQt4qvyZ/Q== -"@spectrum-css/progressbar@1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/progressbar/-/progressbar-1.0.2.tgz#b5a59432517f9ae6dad49d9504691bc5ac42b424" - integrity sha512-+jExeBLtVCqo3BqtFq5WCtZ028Dzk+oUnX6y4z6ZamKPqOyOELOtFnhYnyhyRndQOqYwKUTXx9zsaWA/lpJOHw== - "@spectrum-css/progressbar@^1.0.2": version "1.0.30" resolved "https://registry.yarnpkg.com/@spectrum-css/progressbar/-/progressbar-1.0.30.tgz#1f1e81ab6080fb843831421f736ed2bccc9b18ed" integrity sha512-tUquDN33RQG8gyrWmwPaCu6I2rxRyv5BBGBPii+1sK7L/DTCJrKXe7TAqoxjNEYzdCvTF/HI1NvnSColWNq0Rw== -"@spectrum-css/progresscircle@1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/progresscircle/-/progresscircle-1.0.2.tgz#258ea9170fb70f795edda03e38a61d93bef4487c" - integrity sha512-JLULpyzjIY95lzlWR1yE1gv4l1K6p+scQ+edmuZZUHBzwM3pUtkvHJmUlA9TYdResUYW6Uka60VRdY6lZ8gnFQ== - "@spectrum-css/progresscircle@^1.0.2": version "1.0.22" resolved "https://registry.yarnpkg.com/@spectrum-css/progresscircle/-/progresscircle-1.0.22.tgz#80c8fd2ac4ee6855297d98c60c3b36082020a32a" integrity sha512-EGb+q+7RxbbsrEPFpJ1P4XBQ4s6Ra0okjQCDDTTKTp/sUY2WIT2BjPzwxlZTxVmSXWiiuRyzyuSYUrgBw9UgWg== -"@spectrum-css/radio@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/radio/-/radio-3.0.2.tgz#9c1386894920bbed604e4e174fbbd45d9d762152" - integrity sha512-0TDdzC9omNXnpKHEXNuuGeXdNh4x8jvTKVUqMRLb7vY4hY94hAdt6X01NBqka+jzK35HxGzpDdPADAz62yZLPQ== - "@spectrum-css/radio@^3.0.2": version "3.0.23" resolved "https://registry.yarnpkg.com/@spectrum-css/radio/-/radio-3.0.23.tgz#118a28c407e7b58bec139483d7e23074d840ae77" integrity sha512-x+08GSufmsyrUU4iBOOMRXZrcHxabXMMm/q2vazDJE8CShztvmdjghCxcwtyM74sjiYmXnCW1V3ztr6zaG5xig== -"@spectrum-css/search@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/search/-/search-3.0.2.tgz#70e93e321032d40b399498b2324e3b70e050551e" - integrity sha512-3UbT8yZmNOwrZxq+CUmumE+26ZySZ8OoKNM6U20SLMPLgdx6MrRugVE88r3Bl0sJ0RZX/5bU8nausdiHeX+Jlw== - "@spectrum-css/search@^3.0.2": version "3.1.2" resolved "https://registry.yarnpkg.com/@spectrum-css/search/-/search-3.1.2.tgz#8d43f35f884f7c190e7694c8d26a3f2cfed01ef0" integrity sha512-8cMK1QB07dbReZ/ECyTyoT2dELZ7hK1b3jEDiWSeLBbXcKirR1OI24sZEnewQY/XWFd/62Z1YdNaaA8S6UuXWQ== -"@spectrum-css/sidenav@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/sidenav/-/sidenav-3.0.2.tgz#9d70f408d588ee79c69857751010333671f32713" - integrity sha512-YpIdH/F0jEICYmoduGrnkTmxwJq1kfKxEp0wOs+ZkQOsvKMv1an7nyhsfOKCQqcGNfYzJ9mJAk7/u5+vsxHa8g== - "@spectrum-css/sidenav@^3.0.2": version "3.0.23" resolved "https://registry.yarnpkg.com/@spectrum-css/sidenav/-/sidenav-3.0.23.tgz#c218560d472e13a3e0d1499b762df1206dcffbfd" integrity sha512-4IFw2/HMQJRzM0M2c5na/HeY7y5vJoGpMFBkXNpQyhW4TRo7N1rGwYQ5dRD3s4OVEWV4/rjfGV0d/qhfwKUTog== -"@spectrum-css/slider@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/slider/-/slider-3.0.1.tgz#5281e6f47eb5a4fd3d1816c138bf66d01d7f2e49" - integrity sha512-DI2dtMRnQuDM1miVzl3SGyR1khUEKnwdXfO5EHDFwkC3yav43F5QogkfjmjFmWWobMVovdJlAuiaaJ/IHejD0Q== - -"@spectrum-css/statuslight@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/statuslight/-/statuslight-3.0.2.tgz#dc54b6cd113413dcdb909c486b5d7bae60db65c5" - integrity sha512-xodB8g8vGJH20XmUj9ZsPlM1jHrGeRbvmVXkz0q7YvQrYAhim8pP3W+XKKZAletPFAuu8cmUOc6SWn6i4X4z6w== - "@spectrum-css/statuslight@^3.0.2": version "3.0.8" resolved "https://registry.yarnpkg.com/@spectrum-css/statuslight/-/statuslight-3.0.8.tgz#3b0ea80712573679870a85d469850230e794a0f7" integrity sha512-zMTHs8lk+I7fLdi9waEEbsCmJ1FxeHcjQ0yltWxuRmGk2vl4MQdQIuHIMI63iblqEaiwnJRjXJoKnWlNvndTJQ== -"@spectrum-css/stepper@3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/stepper/-/stepper-3.0.3.tgz#ae89846886431e3edeee060207b8f81540f73a34" - integrity sha512-prAD61ImlOTs9b6PfB3cB08x4lAfxtvnW+RZiTYky0E8GgZdrc/MfCkL5/oqQaIQUtyQv/3Lb7ELAf/0K8QTXw== - "@spectrum-css/stepper@^3.0.3": version "3.0.25" resolved "https://registry.yarnpkg.com/@spectrum-css/stepper/-/stepper-3.0.25.tgz#a6e77d501a9671c083b6dd9a37c6a3f224ffc961" integrity sha512-nlAZKY4KCYQ4IFuFj/P0LXPsB4Ze36ziuaa3k3iy3+1pBDD4gDcGmNpNcTG1LENu0Bt87KhSj8Ba2NV3wBSY8w== -"@spectrum-css/switch@1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/switch/-/switch-1.0.2.tgz#f0b4c69271964573e02b08e90998096e49e1de44" - integrity sha512-zqmHpgWPNg1gEwdUNFYV3CBX5JaeALfIqcJIxE0FLZqr9d1C4+oLE0ItIFzt1bwr4bFAOmkEpvtiY+amluzGxQ== - "@spectrum-css/switch@^1.0.2": version "1.0.22" resolved "https://registry.yarnpkg.com/@spectrum-css/switch/-/switch-1.0.22.tgz#8f2fe25a52b4511b9cfde7af45f9bd824b9774d7" integrity sha512-/Q8IxnkSQYo+i3G3BObslSvoKgM0Mm1mS7kmssULOtaQPbaRlRsUNQVaHzcNEX33+fiF/9zKSvs7ypgIvbWp+Q== -"@spectrum-css/table@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/table/-/table-3.0.1.tgz#753e0e2498082c0c36b9600828516aff3ac338cd" - integrity sha512-XQ+srMTv9hK1H0nctWUtqyzitmvyb5TNR+7mjAmKRdkBRSTQQSipDhenxZp72ekzMtMoSYZVZ77kgo0Iw3Fpug== - "@spectrum-css/table@^3.0.1": version "3.0.3" resolved "https://registry.yarnpkg.com/@spectrum-css/table/-/table-3.0.3.tgz#7f7f19905ef3275cbf907ce3a5818e63c30b2caf" integrity sha512-nxwzVjLPsXoY/v4sdxOVYLcC+cEbGgJyLcLclT5LT9MGSbngFeUMJzzVR4EvehzuN4dH7hrATG7Mbuq29Mf0Hg== -"@spectrum-css/tabs@3.2.12": - version "3.2.12" - resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.2.12.tgz#9b08f23d5aa881b3441af7757800c7173e5685ff" - integrity sha512-rPFUW9SSW4+3/UJ3UrtY2/l3sQvlqB1fqxHLPDjgykvbfrnMejcCTNV4ZrFNHXpE/6+kGnk+yVViSPtWGwJzkA== - "@spectrum-css/tabs@^3.0.1": version "3.2.16" resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.2.16.tgz#c3f7800d8d6f7c9930c28cd01354816328bf72b1" integrity sha512-JUcMB/fiDG/KoyrVstlUMacFJUY4OHKqhMRuPtu9ggUXWCRbSkY8he92v6u0HwY3DuhDoOxNTK8d/PLjk/fsbg== -"@spectrum-css/tag@^3.1.4": - version "3.3.15" - resolved "https://registry.yarnpkg.com/@spectrum-css/tag/-/tag-3.3.15.tgz#971184fd8cb977b85a529f808313851863123278" - integrity sha512-pF6Wh61Z7hmAy20twIlpjdDuivYj6UPtWIzK7giyJKr/qcn20BjVN2ChIeFB1N+vBamJdLsuQOewv4AJ3+LZ2Q== - -"@spectrum-css/tags@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/tags/-/tags-3.0.2.tgz#5bf35fb79c97cd9344de485bd4626ad5b9f07757" - integrity sha512-HbvMk+QHvCDD1/ScvSErpKROcpAbXuMD4Hl/Gz/1A1lQ0fJ/CJeCq/MMsL7zjK1nlItU/ySu8r8KIuRF+6F8SQ== - "@spectrum-css/tags@^3.0.2": version "3.0.3" resolved "https://registry.yarnpkg.com/@spectrum-css/tags/-/tags-3.0.3.tgz#fc76d2735cdc442de91b7eb3bee49a928c0767ac" integrity sha512-SL8vPxVDfWcY5VdIuyl0TImEXcOU1I7yCyXkk7MudMwfnYs81FaIyY32hFV9OHj0Tz/36UzRzc7AVMSuRQ53pw== -"@spectrum-css/textfield@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/textfield/-/textfield-3.0.1.tgz#e875b8e37817378ad08fc4af7d53026df38911e5" - integrity sha512-MUV5q87CVxbkNdSNoxGrFbgyKc51ft/WWf3aVEoPdPw5yBnXqFe1w1YmAit5zYDOOhhs58sCLAlUcCMlOpkgrA== - "@spectrum-css/textfield@^3.0.1": version "3.2.3" resolved "https://registry.yarnpkg.com/@spectrum-css/textfield/-/textfield-3.2.3.tgz#52830498fb3b8957f84bb9bf2cafec7edc55e490" integrity sha512-mtxSQe8VZjQ8PHKlUE03dATAjjxp2Y8XfYmWWFBWWZLeqaojSLv9Q8C/ouK5AenhzCaYpJxTotMjAoivwtmUSw== -"@spectrum-css/toast@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/toast/-/toast-3.0.1.tgz#36f62ea05302761e59b9d53e05f6c04423861796" - integrity sha512-jov++S358BrN2tmMfaoYk1N6u9HojgeuQk61keXrK2m3VE5/n94x7Lg3kIPeSWO0odyDfBlMqT9jacbRey3QTg== - "@spectrum-css/toast@^3.0.1": version "3.0.3" resolved "https://registry.yarnpkg.com/@spectrum-css/toast/-/toast-3.0.3.tgz#97c1527384707600832ecda35643ed304615250f" integrity sha512-CjLeaMs+cjUXojCCRtbj0YkD2BoZW16kjj2o5omkEpUTjA34IJ8xJ1a+CCtDILWekhXvN0MBN4sbumcnwcnx8w== -"@spectrum-css/tooltip@3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/tooltip/-/tooltip-3.0.3.tgz#26b8ca3b3d30e29630244d85eb4fc11d0c841281" - integrity sha512-ztRF7WW1FzyNavXBRc+80z67UoOrY9wl3cMYsVD3MpDnyxdzP8cjza1pCcolKBaFqRTcQKkxKw3GWtGICRKR5A== - "@spectrum-css/tooltip@^3.0.3": version "3.1.17" resolved "https://registry.yarnpkg.com/@spectrum-css/tooltip/-/tooltip-3.1.17.tgz#1f0822c8b69d16d5f940a2b7eb6514d719e6a0fd" integrity sha512-YDuC+Cc6B8DExjL/7fkPnWb8QwlCkjuMHyuttwP/tq/lryWnrdntojgwK5KvgFRjnZ2WfepZVryIt5LOD3tMdg== -"@spectrum-css/treeview@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/treeview/-/treeview-3.0.2.tgz#d54d8f17290babb1c885f5d9355e225421beb0d2" - integrity sha512-foO7UBJv1JMFaKgDPVt8jBghZSVbqhXR8TaGaxHSnMubv7ygmKkc1AITrWC2STILCn84ju2vchOohMZfW6sYwg== - "@spectrum-css/treeview@^3.0.2": version "3.0.3" resolved "https://registry.yarnpkg.com/@spectrum-css/treeview/-/treeview-3.0.3.tgz#aeda5175158b9f8d7529cb2b394428eb2a428046" integrity sha512-D5gGzZC/KtRArdx86Mesc9+99W9nTbUOeyYGqoJoAfJSOttoT6Tk5CrDvlCmAqjKf5rajemAkGri1ChqvUIwkw== -"@spectrum-css/typography@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/typography/-/typography-3.0.1.tgz#957dafd9b18c314fa37a88b549042ba2175f5b3f" - integrity sha512-XyR68K2rIZX3u4j7HhMLOqLVHDJZcapp3XUqgYMzMWccBFleA0qPxKpfRWqVIA5DzTMSIw0wEcZPYKWFZ2e6dA== - "@spectrum-css/typography@^3.0.1", "@spectrum-css/typography@^3.0.2": version "3.0.2" resolved "https://registry.yarnpkg.com/@spectrum-css/typography/-/typography-3.0.2.tgz#ea3ca0a60e18064527819d48c8c4364cab4fcd38" integrity sha512-5ZOLmQe0edzsDMyhghUd4hBb5uxGsFrxzf+WasfcUw9klSfTsRZ09n1BsaaWbgrLjlMQ+EEHS46v5VNo0Ms2CA== -"@spectrum-css/underlay@2.0.9": - version "2.0.9" - resolved "https://registry.yarnpkg.com/@spectrum-css/underlay/-/underlay-2.0.9.tgz#fc10f971d1325cc844b727e6260f7217844060e8" - integrity sha512-X86xd0PG4QobmUyXA90BFGnyygaI8kW64dA4ysf4z0cOvUWjNbAAl3a/DB/WRyrnp63Zqv83T/cgNbetagTbWg== - "@spectrum-css/underlay@^2.0.9": version "2.0.30" resolved "https://registry.yarnpkg.com/@spectrum-css/underlay/-/underlay-2.0.30.tgz#401cfd68df945692bd6bbe281fee98889c930dd1" integrity sha512-Ssq/KERbDuJu3PUWPkBv9+ZIbKooke3oncRoYMXeyP/Gcw5bmQSXOvnlddU5DIK4PJR+pPGVZ9CUUFaYZot4YQ== -"@spectrum-css/vars@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-3.0.1.tgz#561fd69098f896a647242dd8d6108af603bfa31e" - integrity sha512-l4oRcCOqInChYXZN6OQhpe3isk6l4OE6Ys8cgdlsiKp53suNoQxyyd9p/eGRbCjZgH3xQ8nK0t4DHa7QYC0S6w== - -"@spectrum-css/vars@^3.0.1", "@spectrum-css/vars@^3.0.2": +"@spectrum-css/vars@^3.0.1": version "3.0.2" resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-3.0.2.tgz#ea9062c3c98dfc6ba59e5df14a03025ad8969999" integrity sha512-vzS9KqYXot4J3AEER/u618MXWAS+IoMvYMNrOoscKiLLKYQWenaueakUWulFonToPd/9vIpqtdbwxznqrK5qDw== @@ -3388,13 +3059,6 @@ resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.2.tgz#f65d3d6389e01eeb458bd54dc8f52b95a9463bc8" integrity sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w== -"@types/codemirror@^5.60.4": - version "5.60.7" - resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-5.60.7.tgz#efbb78e5e79f90c6762c2127c02096648e600808" - integrity sha512-QXIC+RPzt/1BGSuD6iFn6UMC9TDp+9hkOANYNPVsjjrDdzKphfRkwQDKGp2YaC54Yhz0g6P5uYTCCibZZEiMAA== - dependencies: - "@types/tern" "*" - "@types/connect@*": version "3.4.35" resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" @@ -3602,11 +3266,6 @@ resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a" integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA== -"@types/marked@^4.0.7": - version "4.0.8" - resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.0.8.tgz#b316887ab3499d0a8f4c70b7bd8508f92d477955" - integrity sha512-HVNzMT5QlWCOdeuBsgXP8EZzKUf0+AXzN+sLmjvaB3ZlLqO+e4u0uXrdw9ub69wBKFs+c6/pA4r9sy6cCDvImw== - "@types/mime@^1": version "1.3.2" resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" @@ -3908,13 +3567,6 @@ "@types/node" "*" minipass "^3.3.5" -"@types/tern@*": - version "0.23.4" - resolved "https://registry.yarnpkg.com/@types/tern/-/tern-0.23.4.tgz#03926eb13dbeaf3ae0d390caf706b2643a0127fb" - integrity sha512-JAUw1iXGO1qaWwEOzxTKJZ/5JxVeON9kvGZ/osgZaJImBnyjyn0cjovPsf6FNLmyGY8Vw9DoXZCMlfMkMwHRWg== - dependencies: - "@types/estree" "*" - "@types/tough-cookie@*", "@types/tough-cookie@^4.0.2": version "4.0.2" resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397" @@ -5538,18 +5190,6 @@ co@^4.6.0: resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== -codemirror-spell-checker@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/codemirror-spell-checker/-/codemirror-spell-checker-1.1.2.tgz#1c660f9089483ccb5113b9ba9ca19c3f4993371e" - integrity sha512-2Tl6n0v+GJRsC9K3MLCdLaMOmvWL0uukajNJseorZJsslaxZyZMgENocPU8R0DyoTAiKsyqiemSOZo7kjGV0LQ== - dependencies: - typo-js "*" - -codemirror@^5.63.1: - version "5.65.12" - resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.12.tgz#294fdf097d10ac5b56a9e011a91eff252afc73ae" - integrity sha512-z2jlHBocElRnPYysN2HAuhXbO3DNB0bcSKmNz3hcWR2Js2Dkhc1bEOxG93Z3DeUrnm+qx56XOY5wQmbP5KY0sw== - collect-v8-coverage@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" @@ -6338,41 +5978,11 @@ doctrine@3.0.0, doctrine@^3.0.0: dependencies: esutils "^2.0.2" -dom-serializer@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53" - integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg== - dependencies: - domelementtype "^2.3.0" - domhandler "^5.0.2" - entities "^4.2.0" - dom-walk@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84" integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w== -domelementtype@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" - integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== - -domhandler@^5.0.1, domhandler@^5.0.2, domhandler@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31" - integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w== - dependencies: - domelementtype "^2.3.0" - -domutils@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c" - integrity sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q== - dependencies: - dom-serializer "^2.0.0" - domelementtype "^2.3.0" - domhandler "^5.0.1" - dot-prop@^5.2.0: version "5.3.0" resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" @@ -6417,11 +6027,6 @@ download@8.0.0: p-event "^2.1.0" pify "^4.0.1" -downloadjs@1.4.7: - version "1.4.7" - resolved "https://registry.yarnpkg.com/downloadjs/-/downloadjs-1.4.7.tgz#f69f96f940e0d0553dac291139865a3cd0101e3c" - integrity sha512-LN1gO7+u9xjU5oEScGFKvXhYf7Y/empUIIEAGBs1LzUq/rg5duiDrkuH5A2lQGd5jfMOb9X9usDa2oVXwJ0U/Q== - duplexer3@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" @@ -6437,17 +6042,6 @@ duplexify@^4.0.0: readable-stream "^3.1.1" stream-shift "^1.0.0" -easymde@^2.16.1: - version "2.18.0" - resolved "https://registry.yarnpkg.com/easymde/-/easymde-2.18.0.tgz#ff1397d07329b1a7b9187d2d0c20766fa16b3b1b" - integrity sha512-IxVVUxNWIoXLeqtBU4BLc+eS/ScYhT1Dcb6yF5Wchoj1iXAV+TIIDWx+NCaZhY7RcSHqDPKllbYq7nwGKILnoA== - dependencies: - "@types/codemirror" "^5.60.4" - "@types/marked" "^4.0.7" - codemirror "^5.63.1" - codemirror-spell-checker "1.1.2" - marked "^4.1.0" - ecc-jsbn@~0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" @@ -6610,17 +6204,6 @@ end-stream@~0.1.0: dependencies: write-stream "~0.4.3" -engine.io-client@~6.4.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.4.0.tgz#88cd3082609ca86d7d3c12f0e746d12db4f47c91" - integrity sha512-GyKPDyoEha+XZ7iEqam49vz6auPnNJ9ZBfy89f+rMMas8AuiMWOZ9PVzu8xb9ZC6rafUqiGHSCfu22ih66E+1g== - dependencies: - "@socket.io/component-emitter" "~3.1.0" - debug "~4.3.1" - engine.io-parser "~5.0.3" - ws "~8.11.0" - xmlhttprequest-ssl "~2.0.0" - engine.io-parser@~5.0.3: version "5.0.4" resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.4.tgz#0b13f704fa9271b3ec4f33112410d8f3f41d0fc0" @@ -6655,11 +6238,6 @@ ent@^2.2.0: resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA== -entities@^4.2.0, entities@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174" - integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA== - entities@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5" @@ -8368,21 +7946,6 @@ html-tag@^2.0.0: is-self-closing "^1.0.1" kind-of "^6.0.0" -html5-qrcode@^2.2.1: - version "2.3.7" - resolved "https://registry.yarnpkg.com/html5-qrcode/-/html5-qrcode-2.3.7.tgz#09ed2ca7473a47bd551088c15fcfcb7cb409a5be" - integrity sha512-Jmlok9Ynm49hgVXkdupWryf8o430proIFoQsRl1LmTg4Rq461W72omylR9yw9tsEMtswMEw3wacUM5y0agOBQA== - -htmlparser2@^8.0.0: - version "8.0.2" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.2.tgz#f002151705b383e62433b5cf466f5b716edaec21" - integrity sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA== - dependencies: - domelementtype "^2.3.0" - domhandler "^5.0.3" - domutils "^3.0.1" - entities "^4.4.0" - http-assert@^1.3.0: version "1.5.0" resolved "https://registry.yarnpkg.com/http-assert/-/http-assert-1.5.0.tgz#c389ccd87ac16ed2dfa6246fd73b926aa00e6b8f" @@ -9018,11 +8581,6 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" -is-plain-object@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" - integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== - is-property@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" @@ -10251,11 +9809,6 @@ lcid@^2.0.0: dependencies: invert-kv "^2.0.0" -leaflet@^1.7.1: - version "1.9.3" - resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.3.tgz#52ec436954964e2d3d39e0d433da4b2500d74414" - integrity sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ== - level-codec@9.0.2, level-codec@^9.0.0: version "9.0.2" resolved "https://registry.yarnpkg.com/level-codec/-/level-codec-9.0.2.tgz#fd60df8c64786a80d44e63423096ffead63d8cbc" @@ -10740,11 +10293,6 @@ markdown-it@^12.2.0: mdurl "^1.0.1" uc.micro "^1.0.5" -marked@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/marked/-/marked-4.3.0.tgz#796362821b019f734054582038b116481b456cf3" - integrity sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A== - matcher@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" @@ -11143,16 +10691,6 @@ nan@^2.15.0, nan@^2.16.0: resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb" integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ== -nanoid@^2.1.0: - version "2.1.11" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280" - integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA== - -nanoid@^3.3.4: - version "3.3.6" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" - integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== - nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -11813,11 +11351,6 @@ parse-passwd@^1.0.0: resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q== -parse-srcset@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1" - integrity sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q== - parseurl@^1.3.2, parseurl@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" @@ -12159,15 +11692,6 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg== -postcss@^8.3.11: - version "8.4.21" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4" - integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg== - dependencies: - nanoid "^3.3.4" - picocolors "^1.0.0" - source-map-js "^1.0.2" - postgres-array@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e" @@ -12913,16 +12437,6 @@ regexp.prototype.flags@^1.4.3: define-properties "^1.1.3" functions-have-names "^1.2.2" -regexparam@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-2.0.1.tgz#c912f5dae371e3798100b3c9ce22b7414d0889fa" - integrity sha512-zRgSaYemnNYxUv+/5SeoHI0eJIgTL/A2pUtXUPLHQxUldagouJ9p+K6IbIZ/JiQuCEv2E2B1O11SjVQy3aMCkw== - -regexparam@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-1.3.0.tgz#2fe42c93e32a40eff6235d635e0ffa344b92965f" - integrity sha512-6IQpFBv6e5vz1QAqI+V4k8P2e/3gRrqfCJ9FI+O1FLQTO+Uz6RXZEZOPmTJ6hlGj7gkERzY5BRCv09whKP96/g== - regexpp@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" @@ -13245,18 +12759,6 @@ safe-stable-stringify@^2.3.1: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sanitize-html@^2.7.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.10.0.tgz#74d28848dfcf72c39693139131895c78900ab452" - integrity sha512-JqdovUd81dG4k87vZt6uA6YhDfWkUGruUu/aPmXLxXi45gZExnt9Bnw/qeQU8oGf82vPyaE0vO4aH0PbobB9JQ== - dependencies: - deepmerge "^4.2.2" - escape-string-regexp "^4.0.0" - htmlparser2 "^8.0.0" - is-plain-object "^5.0.0" - parse-srcset "^1.0.2" - postcss "^8.3.11" - sanitize-s3-objectkey@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/sanitize-s3-objectkey/-/sanitize-s3-objectkey-0.0.1.tgz#efa9887cd45275b40234fb4bb12fc5754fe64e7e" @@ -13288,11 +12790,6 @@ schema-utils@^3.1.0, schema-utils@^3.1.1: ajv "^6.12.5" ajv-keywords "^3.5.2" -screenfull@^6.0.1: - version "6.0.2" - resolved "https://registry.yarnpkg.com/screenfull/-/screenfull-6.0.2.tgz#3dbe4b8c4f8f49fb8e33caa8f69d0bca730ab238" - integrity sha512-AQdy8s4WhNvUZ6P8F6PB21tSPIYKniic+Ogx0AacBMjKP1GUHN2E9URxQHtCusiwxudnCKkdy4GrHXPPJSkCCw== - search-params@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/search-params/-/search-params-3.0.0.tgz#dbc7c243058e5a33ae1e9870be91f5aced4100d8" @@ -13467,13 +12964,6 @@ shimmer@^1.2.0: resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337" integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw== -shortid@^2.2.15: - version "2.2.16" - resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz#b742b8f0cb96406fd391c76bfc18a67a57fe5608" - integrity sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g== - dependencies: - nanoid "^2.1.0" - side-channel@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" @@ -13609,16 +13099,6 @@ socket.io-adapter@~2.4.0: resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz#b50a4a9ecdd00c34d4c8c808224daa1a786152a6" integrity sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg== -socket.io-client@^4.5.1: - version "4.6.1" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.6.1.tgz#80d97d5eb0feca448a0fb6d69a7b222d3d547eab" - integrity sha512-5UswCV6hpaRsNg5kkEHVcbBIXEYoVbMQaHJBXJCyEQ+CiFPV1NIOY0XOFWG4XR4GZcB8Kn6AsRs/9cy9TbqVMQ== - dependencies: - "@socket.io/component-emitter" "~3.1.0" - debug "~4.3.2" - engine.io-client "~6.4.0" - socket.io-parser "~4.2.1" - socket.io-parser@~4.2.0: version "4.2.1" resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.1.tgz#01c96efa11ded938dcb21cbe590c26af5eff65e5" @@ -13627,14 +13107,6 @@ socket.io-parser@~4.2.0: "@socket.io/component-emitter" "~3.1.0" debug "~4.3.1" -socket.io-parser@~4.2.1: - version "4.2.2" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.2.tgz#1dd384019e25b7a3d374877f492ab34f2ad0d206" - integrity sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw== - dependencies: - "@socket.io/component-emitter" "~3.1.0" - debug "~4.3.1" - socket.io@^4.5.1: version "4.5.2" resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.5.2.tgz#1eb25fd380ab3d63470aa8279f8e48d922d443ac" @@ -13689,11 +13161,6 @@ source-list-map@^2.0.1: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== -source-map-js@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" - integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== - source-map-resolve@^0.5.0: version "0.5.3" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" @@ -14180,23 +13647,11 @@ svelte-portal@^1.0.0: resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-1.0.0.tgz#36a47c5578b1a4d9b4dc60fa32a904640ec4cdd3" integrity sha512-nHf+DS/jZ6jjnZSleBMSaZua9JlG5rZv9lOGKgJuaZStfevtjIlUJrkLc3vbV8QdBvPPVmvcjTlazAzfKu0v3Q== -svelte-spa-router@^3.0.5: - version "3.3.0" - resolved "https://registry.yarnpkg.com/svelte-spa-router/-/svelte-spa-router-3.3.0.tgz#2fc0967a49dc361dfe4d38dddad6e662eed5b42c" - integrity sha512-cwRNe7cxD43sCvSfEeaKiNZg3FCizGxeMcf7CPiWRP3jKXjEma3vxyyuDtPOam6nWbVxl9TNM3hlE/i87ZlqcQ== - dependencies: - regexparam "2.0.1" - svelte@3.49.0: version "3.49.0" resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.49.0.tgz#5baee3c672306de1070c3b7888fc2204e36a4029" integrity sha512-+lmjic1pApJWDfPCpUUTc1m8azDqYCG1JN9YEngrx/hUyIcFJo6VZhj0A1Ai0wqoHcEIuQy+e9tk+4uDgdtsFA== -svelte@^3.46.2, svelte@^3.49.0: - version "3.58.0" - resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.58.0.tgz#d3e6f103efd6129e51c7d709225ad3b4c052b64e" - integrity sha512-brIBNNB76mXFmU/Kerm4wFnkskBbluBDCjx/8TcpYRb298Yh2dztS2kQ6bhtjMcvUhd5ynClfwpz5h2gnzdQ1A== - svg.draggable.js@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/svg.draggable.js/-/svg.draggable.js-2.2.2.tgz#c514a2f1405efb6f0263e7958f5b68fce50603ba" @@ -14838,11 +14293,6 @@ typescript@4.7.3: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d" integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA== -typo-js@*: - version "1.2.2" - resolved "https://registry.yarnpkg.com/typo-js/-/typo-js-1.2.2.tgz#340484d81fe518e77c81a5a770162b14492f183b" - integrity sha512-C7pYBQK17EjSg8tVNY91KHdUt5Nf6FMJ+c3js076quPmBML57PmNMzAcIq/2kf/hSYtFABNDIYNYlJRl5BJhGw== - uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" @@ -15493,11 +14943,6 @@ write@1.0.3: dependencies: mkdirp "^0.5.1" -ws@~8.11.0: - version "8.11.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143" - integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg== - ws@~8.2.3: version "8.2.3" resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba" @@ -15561,11 +15006,6 @@ xmlbuilder@~9.0.1: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= -xmlhttprequest-ssl@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67" - integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A== - xpath.js@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/xpath.js/-/xpath.js-1.1.0.tgz#3816a44ed4bb352091083d002a383dd5104a5ff1" diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index cd5acdf930..bd8fcd98ee 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -9303,9 +9303,9 @@ verror@1.10.0: extsprintf "^1.2.0" vm2@^3.9.4: - version "3.9.14" - resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.14.tgz#964042b474cf1e6e4f475a39144773cdb9deb734" - integrity sha512-HgvPHYHeQy8+QhzlFryvSteA4uQLBCOub02mgqdR+0bN/akRZ48TGB1v0aCv7ksyc0HXx16AZtMHKS38alc6TA== + version "3.9.15" + resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.15.tgz#c544e6a9bc31e4e40d2e5f532342cf799ea56a6e" + integrity sha512-XqNqknHGw2avJo13gbIwLNZUumvrSHc9mLqoadFZTpo3KaNEJoe1I0lqTFhRXmXD7WkLyG01aaraXdXT0pa4ag== dependencies: acorn "^8.7.0" acorn-walk "^8.2.0" From 1b0635e957b9be25cb81b9b832749f04b4fe5a34 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 7 Apr 2023 21:30:39 +0000 Subject: [PATCH 21/91] v2.5.2 --- 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 c7b024ba7f..7abf6f8029 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.1", + "version": "2.5.2", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index f35d560aff..0f27200afe 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.1", + "version": "2.5.2", "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.5.1", + "@budibase/types": "^2.5.2", "@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 3f2ae122a3..6c013ae989 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.5.1", + "version": "2.5.2", "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.5.1", - "@budibase/string-templates": "^2.5.1", + "@budibase/shared-core": "^2.5.2", + "@budibase/string-templates": "^2.5.2", "@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 81324c273f..ed8089ed3a 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.1", + "version": "2.5.2", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.5.1", - "@budibase/client": "^2.5.1", - "@budibase/frontend-core": "^2.5.1", - "@budibase/shared-core": "^2.5.1", - "@budibase/string-templates": "^2.5.1", + "@budibase/bbui": "^2.5.2", + "@budibase/client": "^2.5.2", + "@budibase/frontend-core": "^2.5.2", + "@budibase/shared-core": "^2.5.2", + "@budibase/string-templates": "^2.5.2", "@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 e50232edcc..1549d94be3 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.1", + "version": "2.5.2", "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.5.1", - "@budibase/string-templates": "^2.5.1", - "@budibase/types": "^2.5.1", + "@budibase/backend-core": "^2.5.2", + "@budibase/string-templates": "^2.5.2", + "@budibase/types": "^2.5.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 89c7498788..bb8ce5837a 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.1", + "version": "2.5.2", "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.5.1", - "@budibase/frontend-core": "^2.5.1", - "@budibase/shared-core": "^2.5.1", - "@budibase/string-templates": "^2.5.1", - "@budibase/types": "^2.5.1", + "@budibase/bbui": "^2.5.2", + "@budibase/frontend-core": "^2.5.2", + "@budibase/shared-core": "^2.5.2", + "@budibase/string-templates": "^2.5.2", + "@budibase/types": "^2.5.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 7db07ceb74..4ade9a2813 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.1", + "version": "2.5.2", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.5.1", - "@budibase/shared-core": "^2.5.1", + "@budibase/bbui": "^2.5.2", + "@budibase/shared-core": "^2.5.2", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index c061f4f22d..8fd5510512 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.1", + "version": "2.5.2", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index b46d5d2782..86cf754965 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.1", + "version": "2.5.2", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -44,12 +44,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.5.1", - "@budibase/client": "^2.5.1", + "@budibase/backend-core": "^2.5.2", + "@budibase/client": "^2.5.2", "@budibase/pro": "2.5.1", - "@budibase/shared-core": "^2.5.1", - "@budibase/string-templates": "^2.5.1", - "@budibase/types": "^2.5.1", + "@budibase/shared-core": "^2.5.2", + "@budibase/string-templates": "^2.5.2", + "@budibase/types": "^2.5.2", "@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 149e5e2025..f4ea6b26c9 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.1", + "version": "2.5.2", "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.5.1" + "@budibase/types": "^2.5.2" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 0ca6fc9dbe..f73563b93d 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.1", + "version": "2.5.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 67dac687aa..5e2ed18d41 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.1", + "version": "2.5.2", "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 e81eb8b256..d60ad88f6f 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.1", + "version": "2.5.2", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.5.1", + "@budibase/backend-core": "^2.5.2", "@budibase/pro": "2.5.1", - "@budibase/string-templates": "^2.5.1", - "@budibase/types": "^2.5.1", + "@budibase/string-templates": "^2.5.2", + "@budibase/types": "^2.5.2", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 7d63586c8c09f9840c4c2467442af5096439773c Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 7 Apr 2023 21:33:30 +0000 Subject: [PATCH 22/91] Update pro version to 2.5.2 --- 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 86cf754965..fa1768414c 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -46,7 +46,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.5.2", "@budibase/client": "^2.5.2", - "@budibase/pro": "2.5.1", + "@budibase/pro": "2.5.2", "@budibase/shared-core": "^2.5.2", "@budibase/string-templates": "^2.5.2", "@budibase/types": "^2.5.2", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index b91aa63dc5..a5c09181d5 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.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.1.tgz#94f4be07b08d8c61dc74bd9e86acaeba4eb7ef8c" - integrity sha512-Pl099USxugkHtgZvtHfnok0HRwZInIME1VqQet/NfLiN7UX8ZUp4a6F0rdovVwi54imPLez2PJrStMjKeyQAIQ== +"@budibase/backend-core@2.5.2": + version "2.5.2" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.2.tgz#6c8397250648764c8b8f4eca6f8f374281f64267" + integrity sha512-A2DOzDpbaEtDYmWZ672p3LOUpfru8dtwdTRoaW3pG+5a60GsDKAn4mXu8EqTHYqHNxUJ90D4zLvwJfSNhUxvZQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.1" + "@budibase/types" "^2.5.2" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1429,14 +1429,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.1.tgz#8af7fdccc4aaf677fbc0757e52366e42879d1784" - integrity sha512-WUPW3LKN4aqtI6GQWd/Fv9FYEM1yuAu0UnawdVLGFEmn1k180N5L/hC5uMu2dMc/RXS1ZZUJSUTzK2NloBZXRg== +"@budibase/pro@2.5.2": + version "2.5.2" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.2.tgz#58b1b266d9ab940fd4a91f1556be59fa468d4376" + integrity sha512-+w0Uq3cycBUDJPEEoBSjBvJwyhGkIFuDof7MoA7q1ifd/3pvUofATtir+5s4nTO/7bbKB4zppawTShxevSkb/g== dependencies: - "@budibase/backend-core" "2.5.1" + "@budibase/backend-core" "2.5.2" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.1" + "@budibase/types" "2.5.2" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1475,10 +1475,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.5.1", "@budibase/types@^2.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.1.tgz#d4bf8ac4b65b1163ed6d2fc9c0b70bcfbc13e784" - integrity sha512-cJfobY3BZfaEpBszKEHO2OgNBDTXzuMnUeEyTsjq5Afjoj/xZUwYHTFRNwYIc66syxxd82/su1+P2k05TOatwA== +"@budibase/types@2.5.2", "@budibase/types@^2.5.2": + version "2.5.2" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.2.tgz#6f560176f40a5e91729c3977d908e463578d7946" + integrity sha512-FRuN1XYkL8KxiVi2rIsPEO7asy+14FnjQ3PXFE6Kj1QUXS/gQaiPgsbD5qH2qHztKFEtRR9pZqOTdSY4DkFEPA== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index d60ad88f6f..0d51384a9b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.5.2", - "@budibase/pro": "2.5.1", + "@budibase/pro": "2.5.2", "@budibase/string-templates": "^2.5.2", "@budibase/types": "^2.5.2", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index bd8fcd98ee..64e2029014 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.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.1.tgz#94f4be07b08d8c61dc74bd9e86acaeba4eb7ef8c" - integrity sha512-Pl099USxugkHtgZvtHfnok0HRwZInIME1VqQet/NfLiN7UX8ZUp4a6F0rdovVwi54imPLez2PJrStMjKeyQAIQ== +"@budibase/backend-core@2.5.2": + version "2.5.2" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.2.tgz#6c8397250648764c8b8f4eca6f8f374281f64267" + integrity sha512-A2DOzDpbaEtDYmWZ672p3LOUpfru8dtwdTRoaW3pG+5a60GsDKAn4mXu8EqTHYqHNxUJ90D4zLvwJfSNhUxvZQ== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.1" + "@budibase/types" "^2.5.2" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.1.tgz#8af7fdccc4aaf677fbc0757e52366e42879d1784" - integrity sha512-WUPW3LKN4aqtI6GQWd/Fv9FYEM1yuAu0UnawdVLGFEmn1k180N5L/hC5uMu2dMc/RXS1ZZUJSUTzK2NloBZXRg== +"@budibase/pro@2.5.2": + version "2.5.2" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.2.tgz#58b1b266d9ab940fd4a91f1556be59fa468d4376" + integrity sha512-+w0Uq3cycBUDJPEEoBSjBvJwyhGkIFuDof7MoA7q1ifd/3pvUofATtir+5s4nTO/7bbKB4zppawTShxevSkb/g== dependencies: - "@budibase/backend-core" "2.5.1" + "@budibase/backend-core" "2.5.2" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.1" + "@budibase/types" "2.5.2" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.5.1", "@budibase/types@^2.5.1": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.1.tgz#d4bf8ac4b65b1163ed6d2fc9c0b70bcfbc13e784" - integrity sha512-cJfobY3BZfaEpBszKEHO2OgNBDTXzuMnUeEyTsjq5Afjoj/xZUwYHTFRNwYIc66syxxd82/su1+P2k05TOatwA== +"@budibase/types@2.5.2", "@budibase/types@^2.5.2": + version "2.5.2" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.2.tgz#6f560176f40a5e91729c3977d908e463578d7946" + integrity sha512-FRuN1XYkL8KxiVi2rIsPEO7asy+14FnjQ3PXFE6Kj1QUXS/gQaiPgsbD5qH2qHztKFEtRR9pZqOTdSY4DkFEPA== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From fb268f1655bb0cff01a1826c316ce0b1b5987b90 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 11 Apr 2023 13:46:26 +0000 Subject: [PATCH 23/91] v2.5.3 --- 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 7abf6f8029..99eb222147 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.2", + "version": "2.5.3", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 0f27200afe..54c0bc1201 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.2", + "version": "2.5.3", "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.5.2", + "@budibase/types": "^2.5.3", "@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 6c013ae989..bab2dc25e3 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.5.2", + "version": "2.5.3", "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.5.2", - "@budibase/string-templates": "^2.5.2", + "@budibase/shared-core": "^2.5.3", + "@budibase/string-templates": "^2.5.3", "@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 ed8089ed3a..251627d695 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.2", + "version": "2.5.3", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.5.2", - "@budibase/client": "^2.5.2", - "@budibase/frontend-core": "^2.5.2", - "@budibase/shared-core": "^2.5.2", - "@budibase/string-templates": "^2.5.2", + "@budibase/bbui": "^2.5.3", + "@budibase/client": "^2.5.3", + "@budibase/frontend-core": "^2.5.3", + "@budibase/shared-core": "^2.5.3", + "@budibase/string-templates": "^2.5.3", "@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 1549d94be3..391adc51af 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.2", + "version": "2.5.3", "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.5.2", - "@budibase/string-templates": "^2.5.2", - "@budibase/types": "^2.5.2", + "@budibase/backend-core": "^2.5.3", + "@budibase/string-templates": "^2.5.3", + "@budibase/types": "^2.5.3", "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 bb8ce5837a..ef70feb269 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.2", + "version": "2.5.3", "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.5.2", - "@budibase/frontend-core": "^2.5.2", - "@budibase/shared-core": "^2.5.2", - "@budibase/string-templates": "^2.5.2", - "@budibase/types": "^2.5.2", + "@budibase/bbui": "^2.5.3", + "@budibase/frontend-core": "^2.5.3", + "@budibase/shared-core": "^2.5.3", + "@budibase/string-templates": "^2.5.3", + "@budibase/types": "^2.5.3", "@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 4ade9a2813..f996f27d09 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.2", + "version": "2.5.3", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.5.2", - "@budibase/shared-core": "^2.5.2", + "@budibase/bbui": "^2.5.3", + "@budibase/shared-core": "^2.5.3", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 8fd5510512..fc30ee845b 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.2", + "version": "2.5.3", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index fa1768414c..2c72eb1979 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.2", + "version": "2.5.3", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -44,12 +44,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.5.2", - "@budibase/client": "^2.5.2", + "@budibase/backend-core": "^2.5.3", + "@budibase/client": "^2.5.3", "@budibase/pro": "2.5.2", - "@budibase/shared-core": "^2.5.2", - "@budibase/string-templates": "^2.5.2", - "@budibase/types": "^2.5.2", + "@budibase/shared-core": "^2.5.3", + "@budibase/string-templates": "^2.5.3", + "@budibase/types": "^2.5.3", "@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 f4ea6b26c9..2752e02a46 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.2", + "version": "2.5.3", "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.5.2" + "@budibase/types": "^2.5.3" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index f73563b93d..4923d8e09b 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.2", + "version": "2.5.3", "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 5e2ed18d41..fe906cf410 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.2", + "version": "2.5.3", "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 0d51384a9b..0212146b73 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.2", + "version": "2.5.3", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.5.2", + "@budibase/backend-core": "^2.5.3", "@budibase/pro": "2.5.2", - "@budibase/string-templates": "^2.5.2", - "@budibase/types": "^2.5.2", + "@budibase/string-templates": "^2.5.3", + "@budibase/types": "^2.5.3", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 471bb82f7b60b5db8a4eb1a8d70622506bee6bb0 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 11 Apr 2023 13:49:55 +0000 Subject: [PATCH 24/91] Update pro version to 2.5.3 --- 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 2c72eb1979..afa7fcb64f 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -46,7 +46,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.5.3", "@budibase/client": "^2.5.3", - "@budibase/pro": "2.5.2", + "@budibase/pro": "2.5.3", "@budibase/shared-core": "^2.5.3", "@budibase/string-templates": "^2.5.3", "@budibase/types": "^2.5.3", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index a5c09181d5..0a65148dc8 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.5.2": - version "2.5.2" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.2.tgz#6c8397250648764c8b8f4eca6f8f374281f64267" - integrity sha512-A2DOzDpbaEtDYmWZ672p3LOUpfru8dtwdTRoaW3pG+5a60GsDKAn4mXu8EqTHYqHNxUJ90D4zLvwJfSNhUxvZQ== +"@budibase/backend-core@2.5.3": + version "2.5.3" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.3.tgz#60326ad24e8e39ba85b364c875386e4f261fb28f" + integrity sha512-Foy2tjUW8m0+XypDKvX0K283Lmi49rQV7zgCPNr3AwHd7vs2n+Vh9Icr6m3Gvs9GijRIJDusjzPy0ypRnTF1cg== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.2" + "@budibase/types" "^2.5.3" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1429,14 +1429,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.2": - version "2.5.2" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.2.tgz#58b1b266d9ab940fd4a91f1556be59fa468d4376" - integrity sha512-+w0Uq3cycBUDJPEEoBSjBvJwyhGkIFuDof7MoA7q1ifd/3pvUofATtir+5s4nTO/7bbKB4zppawTShxevSkb/g== +"@budibase/pro@2.5.3": + version "2.5.3" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.3.tgz#593c9c9ec53e50815d7b2e385ed366d208685ac3" + integrity sha512-Ti4gvopKoFyEjzjDMUAKghW5uTBUVIeZfj5lwyuLJc3gaB4cwYPFgYaP1t5We04+8DhdrSc19ZI+eEWYr+IDig== dependencies: - "@budibase/backend-core" "2.5.2" + "@budibase/backend-core" "2.5.3" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.2" + "@budibase/types" "2.5.3" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1475,10 +1475,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.5.2", "@budibase/types@^2.5.2": - version "2.5.2" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.2.tgz#6f560176f40a5e91729c3977d908e463578d7946" - integrity sha512-FRuN1XYkL8KxiVi2rIsPEO7asy+14FnjQ3PXFE6Kj1QUXS/gQaiPgsbD5qH2qHztKFEtRR9pZqOTdSY4DkFEPA== +"@budibase/types@2.5.3", "@budibase/types@^2.5.3": + version "2.5.3" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.3.tgz#0ce057894b653d7acc87e24a86d261183d61fed1" + integrity sha512-+psso87t0DYp+g841VLwfx06Wl00w/Yb8dkCqOUhnE+rtaCeSgpC0YBQlR3ML/mMgfue3p1eQBbh9BWp5GfAYg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 0212146b73..06a0edcac9 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.5.3", - "@budibase/pro": "2.5.2", + "@budibase/pro": "2.5.3", "@budibase/string-templates": "^2.5.3", "@budibase/types": "^2.5.3", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 64e2029014..8f676eecbe 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.5.2": - version "2.5.2" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.2.tgz#6c8397250648764c8b8f4eca6f8f374281f64267" - integrity sha512-A2DOzDpbaEtDYmWZ672p3LOUpfru8dtwdTRoaW3pG+5a60GsDKAn4mXu8EqTHYqHNxUJ90D4zLvwJfSNhUxvZQ== +"@budibase/backend-core@2.5.3": + version "2.5.3" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.3.tgz#60326ad24e8e39ba85b364c875386e4f261fb28f" + integrity sha512-Foy2tjUW8m0+XypDKvX0K283Lmi49rQV7zgCPNr3AwHd7vs2n+Vh9Icr6m3Gvs9GijRIJDusjzPy0ypRnTF1cg== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.2" + "@budibase/types" "^2.5.3" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.2": - version "2.5.2" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.2.tgz#58b1b266d9ab940fd4a91f1556be59fa468d4376" - integrity sha512-+w0Uq3cycBUDJPEEoBSjBvJwyhGkIFuDof7MoA7q1ifd/3pvUofATtir+5s4nTO/7bbKB4zppawTShxevSkb/g== +"@budibase/pro@2.5.3": + version "2.5.3" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.3.tgz#593c9c9ec53e50815d7b2e385ed366d208685ac3" + integrity sha512-Ti4gvopKoFyEjzjDMUAKghW5uTBUVIeZfj5lwyuLJc3gaB4cwYPFgYaP1t5We04+8DhdrSc19ZI+eEWYr+IDig== dependencies: - "@budibase/backend-core" "2.5.2" + "@budibase/backend-core" "2.5.3" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.2" + "@budibase/types" "2.5.3" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.5.2", "@budibase/types@^2.5.2": - version "2.5.2" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.2.tgz#6f560176f40a5e91729c3977d908e463578d7946" - integrity sha512-FRuN1XYkL8KxiVi2rIsPEO7asy+14FnjQ3PXFE6Kj1QUXS/gQaiPgsbD5qH2qHztKFEtRR9pZqOTdSY4DkFEPA== +"@budibase/types@2.5.3", "@budibase/types@^2.5.3": + version "2.5.3" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.3.tgz#0ce057894b653d7acc87e24a86d261183d61fed1" + integrity sha512-+psso87t0DYp+g841VLwfx06Wl00w/Yb8dkCqOUhnE+rtaCeSgpC0YBQlR3ML/mMgfue3p1eQBbh9BWp5GfAYg== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From e623820478a84043678de36a298b05075b8ddb92 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 11 Apr 2023 17:33:52 +0100 Subject: [PATCH 25/91] Adding test cases. --- .../server/src/sdk/app/applications/tests/sync.spec.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/server/src/sdk/app/applications/tests/sync.spec.ts b/packages/server/src/sdk/app/applications/tests/sync.spec.ts index 9ad6fe2eef..a98297dbe3 100644 --- a/packages/server/src/sdk/app/applications/tests/sync.spec.ts +++ b/packages/server/src/sdk/app/applications/tests/sync.spec.ts @@ -58,4 +58,12 @@ describe("app user/group sync", () => { const metadata = await getUserMetadata() expect(metadata.find(data => data.email === email)).toBeDefined() }) + + it("should be able to sync a group", async () => { + + }) + + it("should be able to remove user", async () => { + + }) }) From 23e99ca4b7061deba2d67ca172e24fa050b09480 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 12 Apr 2023 19:59:05 +0100 Subject: [PATCH 26/91] Adding group and user tests for user sync. --- packages/backend-core/src/db/views.ts | 20 +++- .../server/src/sdk/app/applications/sync.ts | 59 ++++++---- .../sdk/app/applications/tests/sync.spec.ts | 101 ++++++++++++++---- .../src/tests/utilities/TestConfiguration.ts | 28 +++++ packages/server/src/utilities/global.ts | 28 +++-- 5 files changed, 180 insertions(+), 56 deletions(-) diff --git a/packages/backend-core/src/db/views.ts b/packages/backend-core/src/db/views.ts index 8a2c2e7efd..f0057cd7c3 100644 --- a/packages/backend-core/src/db/views.ts +++ b/packages/backend-core/src/db/views.ts @@ -42,7 +42,11 @@ async function removeDeprecated(db: Database, viewName: ViewName) { } } -export async function createView(db: any, viewJs: string, viewName: string) { +export async function createView( + db: any, + viewJs: string, + viewName: string +): Promise { let designDoc try { designDoc = (await db.get(DESIGN_DB)) as DesignDocument @@ -57,7 +61,15 @@ export async function createView(db: any, viewJs: string, viewName: string) { ...designDoc.views, [viewName]: view, } - await db.put(designDoc) + try { + await db.put(designDoc) + } catch (err: any) { + if (err.status === 409) { + return await createView(db, viewJs, viewName) + } else { + throw err + } + } } export const createNewUserEmailView = async () => { @@ -135,6 +147,10 @@ export const queryView = async ( await removeDeprecated(db, viewName) await createFunc() return queryView(viewName, params, db, createFunc, opts) + } else if (err.status === 409) { + // can happen when multiple queries occur at once, view couldn't be created + // other design docs being updated, re-run + return queryView(viewName, params, db, createFunc, opts) } else { throw err } diff --git a/packages/server/src/sdk/app/applications/sync.ts b/packages/server/src/sdk/app/applications/sync.ts index 4a0c782ebd..66fd5d2d59 100644 --- a/packages/server/src/sdk/app/applications/sync.ts +++ b/packages/server/src/sdk/app/applications/sync.ts @@ -7,15 +7,19 @@ import { logging, roles, } from "@budibase/backend-core" -import { User, ContextUser } from "@budibase/types" +import { User, ContextUser, UserGroup } from "@budibase/types" import { sdk as proSdk } from "@budibase/pro" import sdk from "../../" -import { getGlobalUsers, updateAppRole } from "../../../utilities/global" +import { getGlobalUsers, processUser } from "../../../utilities/global" import { generateUserMetadataID, InternalTables } from "../../../db/utils" type DeletedUser = { _id: string; deleted: boolean } -async function syncUsersToApp(appId: string, users: (User | DeletedUser)[]) { +async function syncUsersToApp( + appId: string, + users: (User | DeletedUser)[], + groups: UserGroup[] +) { if (!(await dbCore.dbExists(appId))) { return } @@ -31,7 +35,7 @@ async function syncUsersToApp(appId: string, users: (User | DeletedUser)[]) { // make sure role is correct if (!deletedUser) { - ctxUser = updateAppRole(ctxUser, { appId }) + ctxUser = await processUser(ctxUser, { appId, groups }) } let roleId = ctxUser.roleId if (roleId === roles.BUILTIN_ROLE_IDS.PUBLIC) { @@ -80,7 +84,10 @@ async function syncUsersToApp(appId: string, users: (User | DeletedUser)[]) { async function syncUsersToAllApps(userIds: string[]) { // list of users, if one has been deleted it will be undefined in array - const users = (await getGlobalUsers(userIds)) as User[] + const users = (await getGlobalUsers(userIds, { + noProcessing: true, + })) as User[] + const groups = await proSdk.groups.fetch() const finalUsers: (User | DeletedUser)[] = [] for (let userId of userIds) { const user = users.find(user => user._id === userId) @@ -95,7 +102,7 @@ async function syncUsersToAllApps(userIds: string[]) { for (let devAppId of devAppIds) { const prodAppId = dbCore.getProdAppID(devAppId) for (let appId of [prodAppId, devAppId]) { - promises.push(syncUsersToApp(appId, finalUsers)) + promises.push(syncUsersToApp(appId, finalUsers, groups)) } } const resp = await Promise.allSettled(promises) @@ -106,24 +113,32 @@ async function syncUsersToAllApps(userIds: string[]) { } } -export function initUserGroupSync(updateCb?: () => void) { +export function initUserGroupSync(updateCb?: (docId: string) => void) { const types = [constants.DocumentType.USER, constants.DocumentType.GROUP] docUpdates.process(types, async update => { - const docId = update.id - const isGroup = docId.startsWith(constants.DocumentType.GROUP) - let userIds: string[] - if (isGroup) { - const group = await proSdk.groups.get(docId) - userIds = group.users?.map(user => user._id) || [] - } else { - userIds = [docId] - } - if (userIds.length > 0) { - await syncUsersToAllApps(userIds) - } - // used to tracking when updates have occurred - if (updateCb) { - updateCb() + try { + const docId = update.id + const isGroup = docId.startsWith(constants.DocumentType.GROUP) + let userIds: string[] + if (isGroup) { + const group = await proSdk.groups.get(docId) + userIds = group.users?.map(user => user._id) || [] + } else { + userIds = [docId] + } + if (userIds.length > 0) { + await syncUsersToAllApps(userIds) + } + if (updateCb) { + updateCb(docId) + } + } catch (err: any) { + // if something not found - no changes to perform + if (err?.status === 404) { + return + } else { + logging.logAlert("Failed to perform user/group app sync", err) + } } }) } diff --git a/packages/server/src/sdk/app/applications/tests/sync.spec.ts b/packages/server/src/sdk/app/applications/tests/sync.spec.ts index a98297dbe3..a2ea2a485a 100644 --- a/packages/server/src/sdk/app/applications/tests/sync.spec.ts +++ b/packages/server/src/sdk/app/applications/tests/sync.spec.ts @@ -1,26 +1,32 @@ import TestConfiguration from "../../../../tests/utilities/TestConfiguration" -import { events, context, roles, db as dbCore } from "@budibase/backend-core" +import { events, context, roles, constants } from "@budibase/backend-core" import { initUserGroupSync } from "../sync" import { rawUserMetadata } from "../../../users/utils" import EventEmitter from "events" -import { UserMetadata, UserRoles } from "@budibase/types" +import { UserGroup, UserMetadata, UserRoles, User } from "@budibase/types" const config = new TestConfiguration() -let app +let app, group: UserGroup, groupUser: User const ROLE_ID = roles.BUILTIN_ROLE_IDS.BASIC const emitter = new EventEmitter() -function updateCb() { - emitter.emit("update") +function updateCb(docId: string) { + const isGroup = docId.startsWith(constants.DocumentType.GROUP) + if (isGroup) { + emitter.emit("update-group") + } else { + emitter.emit("update-user") + } } -function waitForUpdate() { +function waitForUpdate(opts: { group?: boolean }) { return new Promise((resolve, reject) => { const timeout = setTimeout(() => { reject() }, 5000) - emitter.on("update", () => { + const event = opts?.group ? "update-group" : "update-user" + emitter.on(event, () => { clearTimeout(timeout) resolve() }) @@ -32,38 +38,89 @@ beforeAll(async () => { initUserGroupSync(updateCb) }) -async function createUser(email: string, roles: UserRoles, appId?: string) { +async function createUser(email: string, roles: UserRoles) { const user = await config.createUser({ email, roles }) - await context.doInContext(appId || config.appId!, async () => { + await context.doInContext(config.appId!, async () => { await events.user.created(user) }) + return user +} + +async function removeUserRole(user: User) { + const final = await config.globalUser({ + ...user, + id: user._id, + roles: {}, + builder: false, + admin: false, + }) + await context.doInContext(config.appId!, async () => { + await events.user.updated(final) + }) } -async function getUserMetadata(appId?: string): Promise { - return context.doInContext(appId || config.appId!, async () => { +async function createGroupAndUser(email: string) { + groupUser = await config.createUser({ + email, + roles: {}, + builder: false, + admin: false, + }) + group = await config.createGroup() + await config.addUserToGroup(group._id!, groupUser._id!) +} + +async function removeUserFromGroup() { + await config.removeUserFromGroup(group._id!, groupUser._id!) + return context.doInContext(config.appId!, async () => { + await events.user.updated(groupUser) + }) +} + +async function getUserMetadata(): Promise { + return context.doInContext(config.appId!, async () => { return await rawUserMetadata() }) } -function buildRoles(appId?: string) { - const prodAppId = dbCore.getProdAppID(appId || config.appId!) - return { [prodAppId]: ROLE_ID } +function buildRoles() { + return { [config.prodAppId!]: ROLE_ID } } describe("app user/group sync", () => { - it("should be able to sync a new user", async () => { - const email = "test@test.com" - await createUser(email, buildRoles()) - await waitForUpdate() + const groupEmail = "test2@test.com", + normalEmail = "test@test.com" + async function checkEmail( + email: string, + opts?: { group?: boolean; notFound?: boolean } + ) { + await waitForUpdate(opts || {}) const metadata = await getUserMetadata() - expect(metadata.find(data => data.email === email)).toBeDefined() + const found = metadata.find(data => data.email === email) + if (opts?.notFound) { + expect(found).toBeUndefined() + } else { + expect(found).toBeDefined() + } + } + + it("should be able to sync a new user, add then remove", async () => { + const user = await createUser(normalEmail, buildRoles()) + await checkEmail(normalEmail) + await removeUserRole(user) + await checkEmail(normalEmail, { notFound: true }) }) it("should be able to sync a group", async () => { - + await createGroupAndUser(groupEmail) + await checkEmail(groupEmail, { group: true }) }) - it("should be able to remove user", async () => { - + it("should be able to remove user from group", async () => { + if (!group) { + await createGroupAndUser(groupEmail) + } + await removeUserFromGroup() + await checkEmail(groupEmail, { notFound: true }) }) }) diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts index ca48dd7f86..f5887e6558 100644 --- a/packages/server/src/tests/utilities/TestConfiguration.ts +++ b/packages/server/src/tests/utilities/TestConfiguration.ts @@ -49,6 +49,7 @@ import { SearchFilters, UserRoles, } from "@budibase/types" +import { BUILTIN_ROLE_IDS } from "@budibase/backend-core/src/security/roles" type DefaultUserValues = { globalUserId: string @@ -306,6 +307,33 @@ class TestConfiguration { } } + async createGroup(roleId: string = BUILTIN_ROLE_IDS.BASIC) { + return context.doInTenant(this.tenantId!, async () => { + const baseGroup = structures.userGroups.userGroup() + baseGroup.roles = { + [this.prodAppId]: roleId, + } + const { id, rev } = await pro.sdk.groups.save(baseGroup) + return { + _id: id, + _rev: rev, + ...baseGroup, + } + }) + } + + async addUserToGroup(groupId: string, userId: string) { + return context.doInTenant(this.tenantId!, async () => { + await pro.sdk.groups.addUsers(groupId, [userId]) + }) + } + + async removeUserFromGroup(groupId: string, userId: string) { + return context.doInTenant(this.tenantId!, async () => { + await pro.sdk.groups.removeUsers(groupId, [userId]) + }) + } + async login({ roleId, userId, builder, prodApp = false }: any = {}) { const appId = prodApp ? this.prodAppId : this.appId return context.doInAppContext(appId, async () => { diff --git a/packages/server/src/utilities/global.ts b/packages/server/src/utilities/global.ts index 0debb68d54..21e86a28b9 100644 --- a/packages/server/src/utilities/global.ts +++ b/packages/server/src/utilities/global.ts @@ -9,6 +9,7 @@ import { import env from "../environment" import { groups } from "@budibase/pro" import { UserCtx, ContextUser, User, UserGroup } from "@budibase/types" +import { global } from "yargs" export function updateAppRole( user: ContextUser, @@ -16,7 +17,7 @@ export function updateAppRole( ) { appId = appId || context.getAppId() - if (!user || !user.roles) { + if (!user || (!user.roles && !user.userGroups)) { return user } // if in an multi-tenancy environment make sure roles are never updated @@ -27,7 +28,7 @@ export function updateAppRole( return user } // always use the deployed app - if (appId) { + if (appId && user.roles) { user.roleId = user.roles[dbCore.getProdAppID(appId)] } // if a role wasn't found then either set as admin (builder) or public (everyone else) @@ -60,7 +61,7 @@ async function checkGroupRoles( return user } -async function processUser( +export async function processUser( user: ContextUser, opts: { appId?: string; groups?: UserGroup[] } = {} ) { @@ -94,10 +95,12 @@ export async function getGlobalUser(userId: string) { return processUser(user, { appId }) } -export async function getGlobalUsers(userIds?: string[]) { +export async function getGlobalUsers( + userIds?: string[], + opts?: { noProcessing?: boolean } +) { const appId = context.getAppId() const db = tenancy.getGlobalDB() - const allGroups = await groups.fetch() let globalUsers if (userIds) { globalUsers = (await db.allDocs(getMultiIDParams(userIds))).rows.map( @@ -123,11 +126,16 @@ export async function getGlobalUsers(userIds?: string[]) { return globalUsers } - // pass in the groups, meaning we don't actually need to retrieve them for - // each user individually - return Promise.all( - globalUsers.map(user => processUser(user, { groups: allGroups })) - ) + if (opts?.noProcessing) { + return globalUsers + } else { + // pass in the groups, meaning we don't actually need to retrieve them for + // each user individually + const allGroups = await groups.fetch() + return Promise.all( + globalUsers.map(user => processUser(user, { groups: allGroups })) + ) + } } export async function getGlobalUsersFromMetadata(users: ContextUser[]) { From b2d7f24ff30c0fc5f3a403f7ad82e9e46cb5c764 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 12 Apr 2023 20:02:37 +0100 Subject: [PATCH 27/91] Adding builder test case. --- .../src/sdk/app/applications/tests/sync.spec.ts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/server/src/sdk/app/applications/tests/sync.spec.ts b/packages/server/src/sdk/app/applications/tests/sync.spec.ts index a2ea2a485a..90493c541d 100644 --- a/packages/server/src/sdk/app/applications/tests/sync.spec.ts +++ b/packages/server/src/sdk/app/applications/tests/sync.spec.ts @@ -38,8 +38,13 @@ beforeAll(async () => { initUserGroupSync(updateCb) }) -async function createUser(email: string, roles: UserRoles) { - const user = await config.createUser({ email, roles }) +async function createUser(email: string, roles: UserRoles, builder?: boolean) { + const user = await config.createUser({ + email, + roles, + builder: builder || false, + admin: false, + }) await context.doInContext(config.appId!, async () => { await events.user.created(user) }) @@ -123,4 +128,9 @@ describe("app user/group sync", () => { await removeUserFromGroup() await checkEmail(groupEmail, { notFound: true }) }) + + it("should be able to handle builder users", async () => { + await createUser("test3@test.com", {}, true) + await checkEmail("test3@test.com") + }) }) From 727aba9177db2d79b88593e611316599aeb19fc9 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 13 Apr 2023 11:19:28 +0100 Subject: [PATCH 28/91] Fixing build. --- .../src/api/controllers/row/internal.ts | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/packages/server/src/api/controllers/row/internal.ts b/packages/server/src/api/controllers/row/internal.ts index 039f03c015..a0bebc2490 100644 --- a/packages/server/src/api/controllers/row/internal.ts +++ b/packages/server/src/api/controllers/row/internal.ts @@ -30,7 +30,6 @@ import { finaliseRow, updateRelatedFormula } from "./staticFormula" import { csv, json, jsonWithSchema, Format } from "../view/exporters" import { apiFileReturn } from "../../../utilities/fileSystem" import { - Ctx, UserCtx, Database, LinkDocumentValue, @@ -72,7 +71,7 @@ async function getView(db: Database, viewName: string) { return viewInfo } -async function getRawTableData(ctx: Ctx, db: Database, tableId: string) { +async function getRawTableData(ctx: UserCtx, db: Database, tableId: string) { let rows if (tableId === InternalTables.USER_METADATA) { await userController.fetchMetadata(ctx) @@ -188,7 +187,7 @@ export async function save(ctx: UserCtx) { }) } -export async function fetchView(ctx: Ctx) { +export async function fetchView(ctx: UserCtx) { const viewName = decodeURIComponent(ctx.params.viewName) // if this is a table view being looked for just transfer to that @@ -255,7 +254,7 @@ export async function fetchView(ctx: Ctx) { return rows } -export async function fetch(ctx: Ctx) { +export async function fetch(ctx: UserCtx) { const db = context.getAppDB() const tableId = ctx.params.tableId @@ -264,7 +263,7 @@ export async function fetch(ctx: Ctx) { return outputProcessing(table, rows) } -export async function find(ctx: Ctx) { +export async function find(ctx: UserCtx) { const db = dbCore.getDB(ctx.appId) const table = await db.get(ctx.params.tableId) let row = await utils.findRow(ctx, ctx.params.tableId, ctx.params.rowId) @@ -272,7 +271,7 @@ export async function find(ctx: Ctx) { return row } -export async function destroy(ctx: Ctx) { +export async function destroy(ctx: UserCtx) { const db = context.getAppDB() const { _id } = ctx.request.body let row = await db.get(_id) @@ -308,7 +307,7 @@ export async function destroy(ctx: Ctx) { return { response, row } } -export async function bulkDestroy(ctx: Ctx) { +export async function bulkDestroy(ctx: UserCtx) { const db = context.getAppDB() const tableId = ctx.params.tableId const table = await db.get(tableId) @@ -347,7 +346,7 @@ export async function bulkDestroy(ctx: Ctx) { return { response: { ok: true }, rows: processedRows } } -export async function search(ctx: Ctx) { +export async function search(ctx: UserCtx) { // Fetch the whole table when running in cypress, as search doesn't work if (!env.COUCH_DB_URL && env.isCypress()) { return { rows: await fetch(ctx) } @@ -387,7 +386,7 @@ export async function search(ctx: Ctx) { return response } -export async function exportRows(ctx: Ctx) { +export async function exportRows(ctx: UserCtx) { const db = context.getAppDB() const table = await db.get(ctx.params.tableId) const rowIds = ctx.request.body.rows @@ -439,7 +438,7 @@ export async function exportRows(ctx: Ctx) { } } -export async function fetchEnrichedRow(ctx: Ctx) { +export async function fetchEnrichedRow(ctx: UserCtx) { const db = context.getAppDB() const tableId = ctx.params.tableId const rowId = ctx.params.rowId From 7da330624fb46ec54b844bb600a3392a5441ce95 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 13 Apr 2023 12:17:29 +0100 Subject: [PATCH 29/91] Fixing build (again). --- packages/server/src/api/controllers/row/utils.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/src/api/controllers/row/utils.ts b/packages/server/src/api/controllers/row/utils.ts index 2cf3b5472f..e96a4fe6ee 100644 --- a/packages/server/src/api/controllers/row/utils.ts +++ b/packages/server/src/api/controllers/row/utils.ts @@ -5,7 +5,7 @@ import { context } from "@budibase/backend-core" import { makeExternalQuery } from "../../../integrations/base/query" import { Row, Table } from "@budibase/types" import { Format } from "../view/exporters" -import { Ctx } from "@budibase/types" +import { UserCtx } from "@budibase/types" import sdk from "../../../sdk" const validateJs = require("validate.js") const { cloneDeep } = require("lodash/fp") @@ -26,7 +26,7 @@ export async function getDatasourceAndQuery(json: any) { return makeExternalQuery(datasource, json) } -export async function findRow(ctx: Ctx, tableId: string, rowId: string) { +export async function findRow(ctx: UserCtx, tableId: string, rowId: string) { const db = context.getAppDB() let row // TODO remove special user case in future From 8f8843aece28d161f46eca1b968782b679adaddf Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 13 Apr 2023 12:53:25 +0100 Subject: [PATCH 30/91] Updating test cases based on new user sync and removing old endpoint testcases (endpoint removed). --- .../server/src/api/routes/tests/user.spec.js | 37 ------------------- .../server/src/sdk/users/tests/utils.spec.ts | 2 +- 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/packages/server/src/api/routes/tests/user.spec.js b/packages/server/src/api/routes/tests/user.spec.js index 0a2b02364a..e8ffd8df2b 100644 --- a/packages/server/src/api/routes/tests/user.spec.js +++ b/packages/server/src/api/routes/tests/user.spec.js @@ -205,41 +205,4 @@ describe("/users", () => { expect(res.body.message).toEqual("Flag set successfully") }) }) - - describe("syncUser", () => { - it("should sync the user", async () => { - let user = await config.createUser() - await config.createApp("New App") - let res = await request - .post(`/api/users/metadata/sync/${user._id}`) - .set(config.defaultHeaders()) - .expect(200) - .expect("Content-Type", /json/) - expect(res.body.message).toEqual("User synced.") - }) - - it("should sync the user when a previous user is specified", async () => { - const app1 = await config.createApp("App 1") - const app2 = await config.createApp("App 2") - - let user = await config.createUser({ - builder: false, - admin: true, - roles: { [app1.appId]: "ADMIN" }, - }) - let res = await request - .post(`/api/users/metadata/sync/${user._id}`) - .set(config.defaultHeaders()) - .send({ - previousUser: { - ...user, - roles: { ...user.roles, [app2.appId]: "BASIC" }, - }, - }) - .expect(200) - .expect("Content-Type", /json/) - - expect(res.body.message).toEqual("User synced.") - }) - }) }) diff --git a/packages/server/src/sdk/users/tests/utils.spec.ts b/packages/server/src/sdk/users/tests/utils.spec.ts index 11c2c53643..9e7b078ab5 100644 --- a/packages/server/src/sdk/users/tests/utils.spec.ts +++ b/packages/server/src/sdk/users/tests/utils.spec.ts @@ -121,7 +121,7 @@ describe("syncGlobalUsers", () => { await syncGlobalUsers() const metadata = await rawUserMetadata() - expect(metadata).toHaveLength(1) + expect(metadata).toHaveLength(0) }) }) }) From f87974caf1cd2717e2459db514feb7954f094bd6 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 13 Apr 2023 13:10:51 +0100 Subject: [PATCH 31/91] Removing duplicate test case. --- .../server/src/sdk/users/tests/utils.spec.ts | 31 ------------------- 1 file changed, 31 deletions(-) diff --git a/packages/server/src/sdk/users/tests/utils.spec.ts b/packages/server/src/sdk/users/tests/utils.spec.ts index 9e7b078ab5..5c6777df59 100644 --- a/packages/server/src/sdk/users/tests/utils.spec.ts +++ b/packages/server/src/sdk/users/tests/utils.spec.ts @@ -125,35 +125,4 @@ describe("syncGlobalUsers", () => { }) }) }) - - it("app users are removed when app is removed from user group", async () => { - await config.doInTenant(async () => { - const group = await proSdk.groups.save(structures.userGroups.userGroup()) - const user1 = await config.createUser({ admin: false, builder: false }) - const user2 = await config.createUser({ admin: false, builder: false }) - await proSdk.groups.updateGroupApps(group.id, { - appsToAdd: [ - { appId: config.prodAppId!, roleId: roles.BUILTIN_ROLE_IDS.BASIC }, - ], - }) - await proSdk.groups.addUsers(group.id, [user1._id, user2._id]) - - await config.doInContext(config.appId, async () => { - await syncGlobalUsers() - expect(await rawUserMetadata()).toHaveLength(3) - - await proSdk.groups.removeUsers(group.id, [user1._id]) - await syncGlobalUsers() - - const metadata = await rawUserMetadata() - expect(metadata).toHaveLength(2) - - expect(metadata).not.toContainEqual( - expect.objectContaining({ - _id: db.generateUserMetadataID(user1._id), - }) - ) - }) - }) - }) }) From 2629817741af50df75cbc41ea7a9168d80eef4b8 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 13 Apr 2023 13:30:47 +0100 Subject: [PATCH 32/91] Fixing qa-core message now that sync always occurs (dev and prod). --- qa-core/src/internal-api/tests/applications/publish.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa-core/src/internal-api/tests/applications/publish.spec.ts b/qa-core/src/internal-api/tests/applications/publish.spec.ts index 3d5fa7c598..e614a0f2a4 100644 --- a/qa-core/src/internal-api/tests/applications/publish.spec.ts +++ b/qa-core/src/internal-api/tests/applications/publish.spec.ts @@ -36,7 +36,7 @@ describe("Internal API - Application creation, update, publish and delete", () = const [syncResponse, sync] = await config.api.apps.sync(app.appId!) expect(sync).toEqual({ - message: "App sync not required, app not deployed.", + message: "App sync completed successfully.", }) }) From 52aa5f1a669004a37468cab67f29e9ef877e02c0 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 14 Apr 2023 09:05:38 +0000 Subject: [PATCH 33/91] v2.5.4 --- 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 99eb222147..19903a71a0 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.3", + "version": "2.5.4", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 54c0bc1201..7ccd1ab87c 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.3", + "version": "2.5.4", "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.5.3", + "@budibase/types": "^2.5.4", "@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 bab2dc25e3..e8db77cd38 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.5.3", + "version": "2.5.4", "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.5.3", - "@budibase/string-templates": "^2.5.3", + "@budibase/shared-core": "^2.5.4", + "@budibase/string-templates": "^2.5.4", "@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 251627d695..622f38cd4d 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.3", + "version": "2.5.4", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.5.3", - "@budibase/client": "^2.5.3", - "@budibase/frontend-core": "^2.5.3", - "@budibase/shared-core": "^2.5.3", - "@budibase/string-templates": "^2.5.3", + "@budibase/bbui": "^2.5.4", + "@budibase/client": "^2.5.4", + "@budibase/frontend-core": "^2.5.4", + "@budibase/shared-core": "^2.5.4", + "@budibase/string-templates": "^2.5.4", "@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 391adc51af..0f9d6af51b 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.3", + "version": "2.5.4", "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.5.3", - "@budibase/string-templates": "^2.5.3", - "@budibase/types": "^2.5.3", + "@budibase/backend-core": "^2.5.4", + "@budibase/string-templates": "^2.5.4", + "@budibase/types": "^2.5.4", "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 ef70feb269..3f0edbf7c7 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.3", + "version": "2.5.4", "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.5.3", - "@budibase/frontend-core": "^2.5.3", - "@budibase/shared-core": "^2.5.3", - "@budibase/string-templates": "^2.5.3", - "@budibase/types": "^2.5.3", + "@budibase/bbui": "^2.5.4", + "@budibase/frontend-core": "^2.5.4", + "@budibase/shared-core": "^2.5.4", + "@budibase/string-templates": "^2.5.4", + "@budibase/types": "^2.5.4", "@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 f996f27d09..96bbb02e80 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.3", + "version": "2.5.4", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.5.3", - "@budibase/shared-core": "^2.5.3", + "@budibase/bbui": "^2.5.4", + "@budibase/shared-core": "^2.5.4", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index fc30ee845b..c564c8f8b1 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.3", + "version": "2.5.4", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index afa7fcb64f..6a930198a6 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.3", + "version": "2.5.4", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -44,12 +44,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.5.3", - "@budibase/client": "^2.5.3", + "@budibase/backend-core": "^2.5.4", + "@budibase/client": "^2.5.4", "@budibase/pro": "2.5.3", - "@budibase/shared-core": "^2.5.3", - "@budibase/string-templates": "^2.5.3", - "@budibase/types": "^2.5.3", + "@budibase/shared-core": "^2.5.4", + "@budibase/string-templates": "^2.5.4", + "@budibase/types": "^2.5.4", "@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 2752e02a46..dba357b7b0 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.3", + "version": "2.5.4", "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.5.3" + "@budibase/types": "^2.5.4" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 4923d8e09b..ed72db5200 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.3", + "version": "2.5.4", "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 fe906cf410..3b7b501882 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.3", + "version": "2.5.4", "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 06a0edcac9..6ea55fab1d 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.3", + "version": "2.5.4", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.5.3", + "@budibase/backend-core": "^2.5.4", "@budibase/pro": "2.5.3", - "@budibase/string-templates": "^2.5.3", - "@budibase/types": "^2.5.3", + "@budibase/string-templates": "^2.5.4", + "@budibase/types": "^2.5.4", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From dc3d0e5e98e060fed5341b9af33a27e25d797a71 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 14 Apr 2023 09:08:57 +0000 Subject: [PATCH 34/91] Update pro version to 2.5.4 --- 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 6a930198a6..8d7c733616 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -46,7 +46,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.5.4", "@budibase/client": "^2.5.4", - "@budibase/pro": "2.5.3", + "@budibase/pro": "2.5.4", "@budibase/shared-core": "^2.5.4", "@budibase/string-templates": "^2.5.4", "@budibase/types": "^2.5.4", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 0a65148dc8..da0aa05fc6 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.5.3": - version "2.5.3" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.3.tgz#60326ad24e8e39ba85b364c875386e4f261fb28f" - integrity sha512-Foy2tjUW8m0+XypDKvX0K283Lmi49rQV7zgCPNr3AwHd7vs2n+Vh9Icr6m3Gvs9GijRIJDusjzPy0ypRnTF1cg== +"@budibase/backend-core@2.5.4": + version "2.5.4" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.4.tgz#0aa0b064181d548b86b8a38b0fe0d70009fec44e" + integrity sha512-YlywtDtEUp5kqPp09D81l8p9YR3xewbDZ5cPINpZ8LVfpS29NRTvIgVqcq5lDTYmXPAE78zJF8wdjT7dZsbNTw== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.3" + "@budibase/types" "^2.5.4" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1429,14 +1429,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.3": - version "2.5.3" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.3.tgz#593c9c9ec53e50815d7b2e385ed366d208685ac3" - integrity sha512-Ti4gvopKoFyEjzjDMUAKghW5uTBUVIeZfj5lwyuLJc3gaB4cwYPFgYaP1t5We04+8DhdrSc19ZI+eEWYr+IDig== +"@budibase/pro@2.5.4": + version "2.5.4" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.4.tgz#9368117a41b276ec97d3994e3ec67d9f2570a5bc" + integrity sha512-xPNVlRFTcjpWn+oZCvrfgDd9SoslkUgJsS2Bnff+qDoWcTFz30KoOyZPAkSwXxX3Y8FmZRO9csl0AZa9TsUs7A== dependencies: - "@budibase/backend-core" "2.5.3" + "@budibase/backend-core" "2.5.4" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.3" + "@budibase/types" "2.5.4" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1475,10 +1475,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.5.3", "@budibase/types@^2.5.3": - version "2.5.3" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.3.tgz#0ce057894b653d7acc87e24a86d261183d61fed1" - integrity sha512-+psso87t0DYp+g841VLwfx06Wl00w/Yb8dkCqOUhnE+rtaCeSgpC0YBQlR3ML/mMgfue3p1eQBbh9BWp5GfAYg== +"@budibase/types@2.5.4", "@budibase/types@^2.5.4": + version "2.5.4" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.4.tgz#6a06e5f81beee05df3c5cab6eca693206b3b3084" + integrity sha512-cqqZaA9ZNNV6YawDpd3NMAN7/f3wwy5/bLtjiH6RhurQuZV7tUYnu0VQSUfWz/l7r5XgAsNCPOpiCvdDneSSKQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 6ea55fab1d..a31969aa86 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.5.4", - "@budibase/pro": "2.5.3", + "@budibase/pro": "2.5.4", "@budibase/string-templates": "^2.5.4", "@budibase/types": "^2.5.4", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 8f676eecbe..cd6d83ec15 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.5.3": - version "2.5.3" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.3.tgz#60326ad24e8e39ba85b364c875386e4f261fb28f" - integrity sha512-Foy2tjUW8m0+XypDKvX0K283Lmi49rQV7zgCPNr3AwHd7vs2n+Vh9Icr6m3Gvs9GijRIJDusjzPy0ypRnTF1cg== +"@budibase/backend-core@2.5.4": + version "2.5.4" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.4.tgz#0aa0b064181d548b86b8a38b0fe0d70009fec44e" + integrity sha512-YlywtDtEUp5kqPp09D81l8p9YR3xewbDZ5cPINpZ8LVfpS29NRTvIgVqcq5lDTYmXPAE78zJF8wdjT7dZsbNTw== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.5.3" + "@budibase/types" "^2.5.4" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.3": - version "2.5.3" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.3.tgz#593c9c9ec53e50815d7b2e385ed366d208685ac3" - integrity sha512-Ti4gvopKoFyEjzjDMUAKghW5uTBUVIeZfj5lwyuLJc3gaB4cwYPFgYaP1t5We04+8DhdrSc19ZI+eEWYr+IDig== +"@budibase/pro@2.5.4": + version "2.5.4" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.4.tgz#9368117a41b276ec97d3994e3ec67d9f2570a5bc" + integrity sha512-xPNVlRFTcjpWn+oZCvrfgDd9SoslkUgJsS2Bnff+qDoWcTFz30KoOyZPAkSwXxX3Y8FmZRO9csl0AZa9TsUs7A== dependencies: - "@budibase/backend-core" "2.5.3" + "@budibase/backend-core" "2.5.4" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.3" + "@budibase/types" "2.5.4" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.5.3", "@budibase/types@^2.5.3": - version "2.5.3" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.3.tgz#0ce057894b653d7acc87e24a86d261183d61fed1" - integrity sha512-+psso87t0DYp+g841VLwfx06Wl00w/Yb8dkCqOUhnE+rtaCeSgpC0YBQlR3ML/mMgfue3p1eQBbh9BWp5GfAYg== +"@budibase/types@2.5.4", "@budibase/types@^2.5.4": + version "2.5.4" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.4.tgz#6a06e5f81beee05df3c5cab6eca693206b3b3084" + integrity sha512-cqqZaA9ZNNV6YawDpd3NMAN7/f3wwy5/bLtjiH6RhurQuZV7tUYnu0VQSUfWz/l7r5XgAsNCPOpiCvdDneSSKQ== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 62b5e08cdeff6b039b2029d53296a800538f0131 Mon Sep 17 00:00:00 2001 From: Mateus Badan de Pieri Date: Fri, 14 Apr 2023 10:25:38 +0100 Subject: [PATCH 35/91] primary test cases, level to number working already --- .../backend-core/src/security/permissions.ts | 2 +- .../src/security/tests/permissions.spec.ts | 74 +++++++++++++++++++ 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 packages/backend-core/src/security/tests/permissions.spec.ts diff --git a/packages/backend-core/src/security/permissions.ts b/packages/backend-core/src/security/permissions.ts index 42189bba0c..1daf7d7067 100644 --- a/packages/backend-core/src/security/permissions.ts +++ b/packages/backend-core/src/security/permissions.ts @@ -34,7 +34,7 @@ class Permission { } } -function levelToNumber(perm: PermissionLevel) { +export function levelToNumber(perm: PermissionLevel) { switch (perm) { // not everything has execute privileges case PermissionLevel.EXECUTE: diff --git a/packages/backend-core/src/security/tests/permissions.spec.ts b/packages/backend-core/src/security/tests/permissions.spec.ts new file mode 100644 index 0000000000..e77394d947 --- /dev/null +++ b/packages/backend-core/src/security/tests/permissions.spec.ts @@ -0,0 +1,74 @@ +import { + doesHaveBasePermission, + getBuiltinPermissionByID, + isPermissionLevelHigherThanRead, + PermissionLevel, + PermissionType, + levelToNumber, +} from "../permissions" + +describe("levelToNumber", () => { + it("should return 0 for EXECUTE", () => { + expect(levelToNumber(PermissionLevel.EXECUTE)).toBe(0) + }) + + it("should return 1 for READ", () => { + expect(levelToNumber(PermissionLevel.READ)).toBe(1) + }) + + it("should return 2 for WRITE", () => { + expect(levelToNumber(PermissionLevel.WRITE)).toBe(2) + }) + + it("should return 3 for ADMIN", () => { + expect(levelToNumber(PermissionLevel.ADMIN)).toBe(3) + }) + + it("should return -1 for an unknown permission level", () => { + expect(levelToNumber("unknown" as PermissionLevel)).toBe(-1) + }) +}) +describe("getBuiltinPermissionByID", () => { + it("should return the correct permission object", () => { + const id = "123" + const permission = { _id: id, name: "Test Permission" } + expect(getBuiltinPermissionByID(id)).toEqual(permission) + expect(getBuiltinPermissionByID("456")).toBeUndefined() + }) +}) + +describe("doesHaveBasePermission", () => { + it("should return true if base permission has the required level", () => { + const permType = PermissionType.APP + const permLevel = PermissionLevel.READ + const rolesHierarchy = [ + { roleId: "role1", permissionId: "permission1" }, + { roleId: "role2", permissionId: "permission2" }, + ] + expect(doesHaveBasePermission(permType, permLevel, rolesHierarchy)).toBe( + true + ) + }) + + it("should return false if base permission does not have the required level", () => { + const permType = PermissionType.APP + const permLevel = PermissionLevel.READ + const rolesHierarchy = [ + { roleId: "role1", permissionId: "permission1" }, + { roleId: "role2", permissionId: "permission2" }, + ] + expect(doesHaveBasePermission(permType, permLevel, rolesHierarchy)).toBe( + false + ) + }) +}) + +describe("isPermissionLevelHigherThanRead", () => { + it("should return true if level is higher than read", () => { + expect(isPermissionLevelHigherThanRead(PermissionLevel.WRITE)).toBe(true) + }) + + it("should return false if level is read or lower", () => { + expect(isPermissionLevelHigherThanRead(PermissionLevel.READ)).toBe(false) + }) +}) From fa83c5d7a1dd77e34d967d764f7c07987b3e54a4 Mon Sep 17 00:00:00 2001 From: Mateus Badan de Pieri Date: Fri, 14 Apr 2023 10:29:52 +0100 Subject: [PATCH 36/91] added get allowed levels (not working yet) --- .../src/security/tests/permissions.spec.ts | 39 ++++++++++++++++--- 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/packages/backend-core/src/security/tests/permissions.spec.ts b/packages/backend-core/src/security/tests/permissions.spec.ts index e77394d947..264e521f8b 100644 --- a/packages/backend-core/src/security/tests/permissions.spec.ts +++ b/packages/backend-core/src/security/tests/permissions.spec.ts @@ -5,6 +5,7 @@ import { PermissionLevel, PermissionType, levelToNumber, + getAllowedLevels, } from "../permissions" describe("levelToNumber", () => { @@ -28,12 +29,38 @@ describe("levelToNumber", () => { expect(levelToNumber("unknown" as PermissionLevel)).toBe(-1) }) }) -describe("getBuiltinPermissionByID", () => { - it("should return the correct permission object", () => { - const id = "123" - const permission = { _id: id, name: "Test Permission" } - expect(getBuiltinPermissionByID(id)).toEqual(permission) - expect(getBuiltinPermissionByID("456")).toBeUndefined() +describe("getAllowedLevels", () => { + it('should return ["execute"] for EXECUTE', () => { + expect(getAllowedLevels(PermissionLevel.EXECUTE)).toEqual([ + PermissionLevel.EXECUTE, + ]) + }) + + it('should return ["execute", "read"] for READ', () => { + expect(getAllowedLevels(PermissionLevel.READ)).toEqual([ + PermissionLevel.EXECUTE, + PermissionLevel.READ, + ]) + }) + + it('should return ["execute", "read", "write"] for WRITE', () => { + expect(getAllowedLevels(PermissionLevel.WRITE)).toEqual([ + PermissionLevel.EXECUTE, + PermissionLevel.READ, + PermissionLevel.WRITE, + ]) + }) + + it('should return ["execute", "read", "write"] for ADMIN', () => { + expect(getAllowedLevels(PermissionLevel.ADMIN)).toEqual([ + PermissionLevel.EXECUTE, + PermissionLevel.READ, + PermissionLevel.WRITE, + ]) + }) + + it("should return [] for an unknown permission level", () => { + expect(getAllowedLevels("unknown" as PermissionLevel)).toEqual([]) }) }) From 696eea9f92224cd6395d7a0821a100e7ae8911a4 Mon Sep 17 00:00:00 2001 From: Mateus Badan de Pieri Date: Fri, 14 Apr 2023 11:39:36 +0100 Subject: [PATCH 37/91] exporting function to test --- packages/backend-core/src/security/permissions.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/backend-core/src/security/permissions.ts b/packages/backend-core/src/security/permissions.ts index 1daf7d7067..dfe7988f76 100644 --- a/packages/backend-core/src/security/permissions.ts +++ b/packages/backend-core/src/security/permissions.ts @@ -55,7 +55,7 @@ export function levelToNumber(perm: PermissionLevel) { * @param {string} userPermLevel The permission level of the user. * @return {string[]} All the permission levels this user is allowed to carry out. */ -function getAllowedLevels(userPermLevel: PermissionLevel) { +export function getAllowedLevels(userPermLevel: PermissionLevel): string[] { switch (userPermLevel) { case PermissionLevel.EXECUTE: return [PermissionLevel.EXECUTE] @@ -64,9 +64,9 @@ function getAllowedLevels(userPermLevel: PermissionLevel) { case PermissionLevel.WRITE: case PermissionLevel.ADMIN: return [ + PermissionLevel.EXECUTE, PermissionLevel.READ, PermissionLevel.WRITE, - PermissionLevel.EXECUTE, ] default: return [] From 038476523fd9a5c6fcfe2152cfddad99cc0fd2b9 Mon Sep 17 00:00:00 2001 From: Mateus Badan de Pieri Date: Fri, 14 Apr 2023 11:39:52 +0100 Subject: [PATCH 38/91] doesHaveBasePermission tests --- .../src/security/tests/permissions.spec.ts | 64 ++++++++++++------- 1 file changed, 41 insertions(+), 23 deletions(-) diff --git a/packages/backend-core/src/security/tests/permissions.spec.ts b/packages/backend-core/src/security/tests/permissions.spec.ts index 264e521f8b..621a662933 100644 --- a/packages/backend-core/src/security/tests/permissions.spec.ts +++ b/packages/backend-core/src/security/tests/permissions.spec.ts @@ -1,13 +1,21 @@ import { - doesHaveBasePermission, - getBuiltinPermissionByID, - isPermissionLevelHigherThanRead, + RoleHierarchy, PermissionLevel, PermissionType, levelToNumber, getAllowedLevels, + BuiltinPermissionID, + getBuiltinPermissions, + getBuiltinPermissionByID, + doesHaveBasePermission, + isPermissionLevelHigherThanRead, + BUILDER, } from "../permissions" +jest.mock("../permissions", () => ({ + // getTenantId: jest.fn(() => "budibase"), + // DEFAULT_TENANT_ID: "default", +})) describe("levelToNumber", () => { it("should return 0 for EXECUTE", () => { expect(levelToNumber(PermissionLevel.EXECUTE)).toBe(0) @@ -65,28 +73,38 @@ describe("getAllowedLevels", () => { }) describe("doesHaveBasePermission", () => { - it("should return true if base permission has the required level", () => { - const permType = PermissionType.APP - const permLevel = PermissionLevel.READ - const rolesHierarchy = [ - { roleId: "role1", permissionId: "permission1" }, - { roleId: "role2", permissionId: "permission2" }, - ] - expect(doesHaveBasePermission(permType, permLevel, rolesHierarchy)).toBe( - true - ) + const rolesHierarchy: RoleHierarchy = [ + { permissionId: BuiltinPermissionID.READ_ONLY }, + ] + + it("should return true for read permission of read only role", () => { + expect( + doesHaveBasePermission( + PermissionType.TABLE, + PermissionLevel.READ, + rolesHierarchy + ) + ).toBe(true) }) - it("should return false if base permission does not have the required level", () => { - const permType = PermissionType.APP - const permLevel = PermissionLevel.READ - const rolesHierarchy = [ - { roleId: "role1", permissionId: "permission1" }, - { roleId: "role2", permissionId: "permission2" }, - ] - expect(doesHaveBasePermission(permType, permLevel, rolesHierarchy)).toBe( - false - ) + it("should return false for write permission of read only role", () => { + expect( + doesHaveBasePermission( + PermissionType.TABLE, + PermissionLevel.WRITE, + rolesHierarchy + ) + ).toBe(false) + }) + + it("should return true for execute permission of public role", () => { + expect( + doesHaveBasePermission( + PermissionType.WEBHOOK, + PermissionLevel.EXECUTE, + rolesHierarchy + ) + ).toBe(true) }) }) From 2f98ce977254d86683c7de0bf4f77de29a230614 Mon Sep 17 00:00:00 2001 From: Mateus Badan de Pieri Date: Fri, 14 Apr 2023 11:45:27 +0100 Subject: [PATCH 39/91] reverting some breaking changes --- .../src/security/tests/permissions.spec.ts | 64 +++++++------------ 1 file changed, 23 insertions(+), 41 deletions(-) diff --git a/packages/backend-core/src/security/tests/permissions.spec.ts b/packages/backend-core/src/security/tests/permissions.spec.ts index 621a662933..264e521f8b 100644 --- a/packages/backend-core/src/security/tests/permissions.spec.ts +++ b/packages/backend-core/src/security/tests/permissions.spec.ts @@ -1,21 +1,13 @@ import { - RoleHierarchy, + doesHaveBasePermission, + getBuiltinPermissionByID, + isPermissionLevelHigherThanRead, PermissionLevel, PermissionType, levelToNumber, getAllowedLevels, - BuiltinPermissionID, - getBuiltinPermissions, - getBuiltinPermissionByID, - doesHaveBasePermission, - isPermissionLevelHigherThanRead, - BUILDER, } from "../permissions" -jest.mock("../permissions", () => ({ - // getTenantId: jest.fn(() => "budibase"), - // DEFAULT_TENANT_ID: "default", -})) describe("levelToNumber", () => { it("should return 0 for EXECUTE", () => { expect(levelToNumber(PermissionLevel.EXECUTE)).toBe(0) @@ -73,38 +65,28 @@ describe("getAllowedLevels", () => { }) describe("doesHaveBasePermission", () => { - const rolesHierarchy: RoleHierarchy = [ - { permissionId: BuiltinPermissionID.READ_ONLY }, - ] - - it("should return true for read permission of read only role", () => { - expect( - doesHaveBasePermission( - PermissionType.TABLE, - PermissionLevel.READ, - rolesHierarchy - ) - ).toBe(true) + it("should return true if base permission has the required level", () => { + const permType = PermissionType.APP + const permLevel = PermissionLevel.READ + const rolesHierarchy = [ + { roleId: "role1", permissionId: "permission1" }, + { roleId: "role2", permissionId: "permission2" }, + ] + expect(doesHaveBasePermission(permType, permLevel, rolesHierarchy)).toBe( + true + ) }) - it("should return false for write permission of read only role", () => { - expect( - doesHaveBasePermission( - PermissionType.TABLE, - PermissionLevel.WRITE, - rolesHierarchy - ) - ).toBe(false) - }) - - it("should return true for execute permission of public role", () => { - expect( - doesHaveBasePermission( - PermissionType.WEBHOOK, - PermissionLevel.EXECUTE, - rolesHierarchy - ) - ).toBe(true) + it("should return false if base permission does not have the required level", () => { + const permType = PermissionType.APP + const permLevel = PermissionLevel.READ + const rolesHierarchy = [ + { roleId: "role1", permissionId: "permission1" }, + { roleId: "role2", permissionId: "permission2" }, + ] + expect(doesHaveBasePermission(permType, permLevel, rolesHierarchy)).toBe( + false + ) }) }) From 788b7b6492868ec11711b18cb3354e761c46f110 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 14 Apr 2023 11:03:56 +0000 Subject: [PATCH 40/91] v2.4.44-alpha.23 --- 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 b1838f1d32..e31e1c8b4a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.44-alpha.22", + "version": "2.4.44-alpha.23", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 46d86fc4a6..9ec5f1ec5d 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.22", + "version": "2.4.44-alpha.23", "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.22", + "@budibase/types": "2.4.44-alpha.23", "@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 d6e166dbfc..8f4bd482b4 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.22", + "version": "2.4.44-alpha.23", "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.22", - "@budibase/string-templates": "2.4.44-alpha.22", + "@budibase/shared-core": "2.4.44-alpha.23", + "@budibase/string-templates": "2.4.44-alpha.23", "@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 77445b4415..9072cfe5d3 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.44-alpha.22", + "version": "2.4.44-alpha.23", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.4.44-alpha.22", - "@budibase/client": "2.4.44-alpha.22", - "@budibase/frontend-core": "2.4.44-alpha.22", - "@budibase/shared-core": "2.4.44-alpha.22", - "@budibase/string-templates": "2.4.44-alpha.22", + "@budibase/bbui": "2.4.44-alpha.23", + "@budibase/client": "2.4.44-alpha.23", + "@budibase/frontend-core": "2.4.44-alpha.23", + "@budibase/shared-core": "2.4.44-alpha.23", + "@budibase/string-templates": "2.4.44-alpha.23", "@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 5bccc0f394..73bdc7a8d4 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.44-alpha.22", + "version": "2.4.44-alpha.23", "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.22", - "@budibase/string-templates": "2.4.44-alpha.22", - "@budibase/types": "2.4.44-alpha.22", + "@budibase/backend-core": "2.4.44-alpha.23", + "@budibase/string-templates": "2.4.44-alpha.23", + "@budibase/types": "2.4.44-alpha.23", "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 7a6503943e..4b495d55d9 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.44-alpha.22", + "version": "2.4.44-alpha.23", "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.22", - "@budibase/frontend-core": "2.4.44-alpha.22", - "@budibase/shared-core": "2.4.44-alpha.22", - "@budibase/string-templates": "2.4.44-alpha.22", - "@budibase/types": "2.4.44-alpha.22", + "@budibase/bbui": "2.4.44-alpha.23", + "@budibase/frontend-core": "2.4.44-alpha.23", + "@budibase/shared-core": "2.4.44-alpha.23", + "@budibase/string-templates": "2.4.44-alpha.23", + "@budibase/types": "2.4.44-alpha.23", "@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 821e6649fd..50b325a10a 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.22", + "version": "2.4.44-alpha.23", "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.22", - "@budibase/shared-core": "2.4.44-alpha.22", + "@budibase/bbui": "2.4.44-alpha.23", + "@budibase/shared-core": "2.4.44-alpha.23", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index d2baddab5d..7a910063fc 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.44-alpha.22", + "version": "2.4.44-alpha.23", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index d758723281..039f654f01 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.22", + "version": "2.4.44-alpha.23", "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.22", - "@budibase/client": "2.4.44-alpha.22", + "@budibase/backend-core": "2.4.44-alpha.23", + "@budibase/client": "2.4.44-alpha.23", "@budibase/pro": "2.4.44-alpha.22", - "@budibase/shared-core": "2.4.44-alpha.22", - "@budibase/string-templates": "2.4.44-alpha.22", - "@budibase/types": "2.4.44-alpha.22", + "@budibase/shared-core": "2.4.44-alpha.23", + "@budibase/string-templates": "2.4.44-alpha.23", + "@budibase/types": "2.4.44-alpha.23", "@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 e7343bc8a9..a7306be0b5 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.22", + "version": "2.4.44-alpha.23", "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.22" + "@budibase/types": "2.4.44-alpha.23" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 0e4094369c..a6c3b46a7b 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.22", + "version": "2.4.44-alpha.23", "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 bebab03721..bcf33fdd82 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.44-alpha.22", + "version": "2.4.44-alpha.23", "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 1fbd1202ff..09ab6aefe2 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.22", + "version": "2.4.44-alpha.23", "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.22", + "@budibase/backend-core": "2.4.44-alpha.23", "@budibase/pro": "2.4.44-alpha.22", - "@budibase/string-templates": "2.4.44-alpha.22", - "@budibase/types": "2.4.44-alpha.22", + "@budibase/string-templates": "2.4.44-alpha.23", + "@budibase/types": "2.4.44-alpha.23", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From b81804b9059bcf41306d233fededd83e883783b5 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 14 Apr 2023 11:05:30 +0000 Subject: [PATCH 41/91] Update pro version to 2.4.44-alpha.23 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 59 ++++-------------------------------- 3 files changed, 8 insertions(+), 55 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 039f654f01..1396c97325 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.23", "@budibase/client": "2.4.44-alpha.23", - "@budibase/pro": "2.4.44-alpha.22", + "@budibase/pro": "2.4.44-alpha.23", "@budibase/shared-core": "2.4.44-alpha.23", "@budibase/string-templates": "2.4.44-alpha.23", "@budibase/types": "2.4.44-alpha.23", diff --git a/packages/worker/package.json b/packages/worker/package.json index 09ab6aefe2..53d37e7f8c 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.23", - "@budibase/pro": "2.4.44-alpha.22", + "@budibase/pro": "2.4.44-alpha.23", "@budibase/string-templates": "2.4.44-alpha.23", "@budibase/types": "2.4.44-alpha.23", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 68b574473c..e13f2e568e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1386,46 +1386,6 @@ 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.20": - version "2.4.44-alpha.20" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.20.tgz#038074ff8ea654b06d02b41423dc60fa6742007a" - integrity sha512-F0MjLk9BE+Cstue3gv8bcJ/Tcs7uNbZB5GTJ7Oy6+s0RiSTQ6O785AEQMz0EhoMtIcV31X190C/8k3MCt1b7iQ== - dependencies: - "@budibase/nano" "10.1.2" - "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "2.4.44-alpha.20" - "@shopify/jest-koa-mocks" "5.0.1" - "@techpass/passport-openidconnect" "0.3.2" - aws-cloudfront-sign "2.2.0" - aws-sdk "2.1030.0" - bcrypt "5.0.1" - bcryptjs "2.4.3" - bull "4.10.1" - correlation-id "4.0.0" - dotenv "16.0.1" - emitter-listener "1.1.2" - ioredis "4.28.0" - joi "17.6.0" - jsonwebtoken "9.0.0" - koa-passport "4.1.4" - koa-pino-logger "4.0.0" - lodash "4.17.21" - lodash.isarguments "3.1.0" - node-fetch "2.6.7" - passport-google-oauth "2.0.0" - passport-jwt "4.0.0" - passport-local "1.0.0" - passport-oauth2-refresh "^2.1.0" - posthog-node "1.3.0" - pouchdb "7.3.0" - pouchdb-find "7.2.2" - redlock "4.2.0" - sanitize-s3-objectkey "0.0.1" - semver "7.3.7" - tar-fs "2.1.1" - uuid "8.3.2" - zlib "1.0.5" - "@budibase/bbui@^0.9.139": version "0.9.190" resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.190.tgz#e1ec400ac90f556bfbc80fc23a04506f1585ea81" @@ -1526,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.44-alpha.20": - version "2.4.44-alpha.20" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.20.tgz#5db64cde22371ba536e6f53f2c4380ea2f243353" - integrity sha512-dMZcqlvoiMfNdOfB62Np4wJLYO6VfpQpc1TA8ocsG5CiJkg1Tow7wDblFO/6Y1erNbkt8uxV6zZgiXWpowUhkQ== +"@budibase/pro@2.4.44-alpha.22": + version "2.4.44-alpha.22" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.22.tgz#5709ae5261b95cc0e53a19905a62bce6bdb6d54a" + integrity sha512-DWRufe9tROX/bNqWo2wJ/G5g6zdph1y3wmK1C6p7eVNvuNBgddQojsr2hPHqKxaBo1XbnLvRJeyfja0sAmNrKA== dependencies: - "@budibase/backend-core" "2.4.44-alpha.20" + "@budibase/backend-core" "2.4.44-alpha.22" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.4.44-alpha.20" + "@budibase/types" "2.4.44-alpha.22" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1587,13 +1547,6 @@ 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.20": - version "2.4.44-alpha.20" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.20.tgz#c1693ce0aa4c714453700ac2c3f24d01b11a2acc" - integrity sha512-BIVAIfMlgIMy2F2Kmz6q4f+ynf+aNxAZAipLK8ywTZOCUtal8C9mu5CZTRWS4sANLzgH7RCOkUZRZaPkWoiakw== - dependencies: - scim-patch "^0.7.0" - "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" From 1a26877f08852ba62b126118caae8002c5307544 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 14 Apr 2023 12:10:49 +0100 Subject: [PATCH 42/91] v2.4.44-alpha.24 --- 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 e31e1c8b4a..608f805405 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.44-alpha.23", + "version": "2.4.44-alpha.24", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 9ec5f1ec5d..1820376ab1 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.23", + "version": "2.4.44-alpha.24", "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.23", + "@budibase/types": "2.4.44-alpha.24", "@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 8f4bd482b4..3d438a5a20 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.23", + "version": "2.4.44-alpha.24", "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.23", - "@budibase/string-templates": "2.4.44-alpha.23", + "@budibase/shared-core": "2.4.44-alpha.24", + "@budibase/string-templates": "2.4.44-alpha.24", "@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 9072cfe5d3..42dc474138 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.44-alpha.23", + "version": "2.4.44-alpha.24", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.4.44-alpha.23", - "@budibase/client": "2.4.44-alpha.23", - "@budibase/frontend-core": "2.4.44-alpha.23", - "@budibase/shared-core": "2.4.44-alpha.23", - "@budibase/string-templates": "2.4.44-alpha.23", + "@budibase/bbui": "2.4.44-alpha.24", + "@budibase/client": "2.4.44-alpha.24", + "@budibase/frontend-core": "2.4.44-alpha.24", + "@budibase/shared-core": "2.4.44-alpha.24", + "@budibase/string-templates": "2.4.44-alpha.24", "@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 73bdc7a8d4..5d81999bc3 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.44-alpha.23", + "version": "2.4.44-alpha.24", "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.23", - "@budibase/string-templates": "2.4.44-alpha.23", - "@budibase/types": "2.4.44-alpha.23", + "@budibase/backend-core": "2.4.44-alpha.24", + "@budibase/string-templates": "2.4.44-alpha.24", + "@budibase/types": "2.4.44-alpha.24", "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 4b495d55d9..65f4c51c9d 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.44-alpha.23", + "version": "2.4.44-alpha.24", "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.23", - "@budibase/frontend-core": "2.4.44-alpha.23", - "@budibase/shared-core": "2.4.44-alpha.23", - "@budibase/string-templates": "2.4.44-alpha.23", - "@budibase/types": "2.4.44-alpha.23", + "@budibase/bbui": "2.4.44-alpha.24", + "@budibase/frontend-core": "2.4.44-alpha.24", + "@budibase/shared-core": "2.4.44-alpha.24", + "@budibase/string-templates": "2.4.44-alpha.24", + "@budibase/types": "2.4.44-alpha.24", "@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 50b325a10a..c680b8946f 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.23", + "version": "2.4.44-alpha.24", "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.23", - "@budibase/shared-core": "2.4.44-alpha.23", + "@budibase/bbui": "2.4.44-alpha.24", + "@budibase/shared-core": "2.4.44-alpha.24", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 7a910063fc..b83adb2c27 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.44-alpha.23", + "version": "2.4.44-alpha.24", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 1396c97325..370ea4ceb0 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.23", + "version": "2.4.44-alpha.24", "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.23", - "@budibase/client": "2.4.44-alpha.23", + "@budibase/backend-core": "2.4.44-alpha.24", + "@budibase/client": "2.4.44-alpha.24", "@budibase/pro": "2.4.44-alpha.23", - "@budibase/shared-core": "2.4.44-alpha.23", - "@budibase/string-templates": "2.4.44-alpha.23", - "@budibase/types": "2.4.44-alpha.23", + "@budibase/shared-core": "2.4.44-alpha.24", + "@budibase/string-templates": "2.4.44-alpha.24", + "@budibase/types": "2.4.44-alpha.24", "@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 a7306be0b5..396e9e259a 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.23", + "version": "2.4.44-alpha.24", "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.23" + "@budibase/types": "2.4.44-alpha.24" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index a6c3b46a7b..110c157663 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.23", + "version": "2.4.44-alpha.24", "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 bcf33fdd82..c62a623ad3 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.44-alpha.23", + "version": "2.4.44-alpha.24", "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 53d37e7f8c..ef991c8d5c 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.23", + "version": "2.4.44-alpha.24", "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.23", + "@budibase/backend-core": "2.4.44-alpha.24", "@budibase/pro": "2.4.44-alpha.23", - "@budibase/string-templates": "2.4.44-alpha.23", - "@budibase/types": "2.4.44-alpha.23", + "@budibase/string-templates": "2.4.44-alpha.24", + "@budibase/types": "2.4.44-alpha.24", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From aa02cb1c653aac5ff5e408e48598a5379f87531e Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 14 Apr 2023 12:13:39 +0100 Subject: [PATCH 43/91] Add skiplibcheck on string-templates --- packages/string-templates/tsconfig.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/string-templates/tsconfig.json b/packages/string-templates/tsconfig.json index e7a001cc42..9f52241a44 100644 --- a/packages/string-templates/tsconfig.json +++ b/packages/string-templates/tsconfig.json @@ -7,6 +7,7 @@ "emitDeclarationOnly": true, "outDir": "dist", "esModuleInterop": true, - "types": ["node"] + "types": ["node"], + "skipLibCheck": true } } From 5180ac29d2a99122309f73b57cfa713b65223930 Mon Sep 17 00:00:00 2001 From: Mateus Badan de Pieri Date: Fri, 14 Apr 2023 12:16:01 +0100 Subject: [PATCH 44/91] final functions being tested --- .../backend-core/src/security/permissions.ts | 4 +- .../src/security/tests/permissions.spec.ts | 41 ++++++++++++++++--- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/packages/backend-core/src/security/permissions.ts b/packages/backend-core/src/security/permissions.ts index dfe7988f76..6cacc12dd6 100644 --- a/packages/backend-core/src/security/permissions.ts +++ b/packages/backend-core/src/security/permissions.ts @@ -24,7 +24,7 @@ export enum PermissionType { QUERY = "query", } -class Permission { +export class Permission { type: PermissionType level: PermissionLevel @@ -81,7 +81,7 @@ export enum BuiltinPermissionID { POWER = "power", } -const BUILTIN_PERMISSIONS = { +export const BUILTIN_PERMISSIONS = { PUBLIC: { _id: BuiltinPermissionID.PUBLIC, name: "Public", diff --git a/packages/backend-core/src/security/tests/permissions.spec.ts b/packages/backend-core/src/security/tests/permissions.spec.ts index 264e521f8b..8f6ee76c81 100644 --- a/packages/backend-core/src/security/tests/permissions.spec.ts +++ b/packages/backend-core/src/security/tests/permissions.spec.ts @@ -1,3 +1,4 @@ +import { cloneDeep } from "lodash" import { doesHaveBasePermission, getBuiltinPermissionByID, @@ -6,7 +7,12 @@ import { PermissionType, levelToNumber, getAllowedLevels, + BuiltinPermissionID, + getBuiltinPermissions, + BUILTIN_PERMISSIONS, + Permission, } from "../permissions" +import { BUILTIN_ROLE_IDS } from "../roles" describe("levelToNumber", () => { it("should return 0 for EXECUTE", () => { @@ -66,11 +72,13 @@ describe("getAllowedLevels", () => { describe("doesHaveBasePermission", () => { it("should return true if base permission has the required level", () => { - const permType = PermissionType.APP + const permType = PermissionType.USER const permLevel = PermissionLevel.READ const rolesHierarchy = [ - { roleId: "role1", permissionId: "permission1" }, - { roleId: "role2", permissionId: "permission2" }, + { + roleId: BUILTIN_ROLE_IDS.ADMIN, + permissionId: BuiltinPermissionID.ADMIN, + }, ] expect(doesHaveBasePermission(permType, permLevel, rolesHierarchy)).toBe( true @@ -81,8 +89,10 @@ describe("doesHaveBasePermission", () => { const permType = PermissionType.APP const permLevel = PermissionLevel.READ const rolesHierarchy = [ - { roleId: "role1", permissionId: "permission1" }, - { roleId: "role2", permissionId: "permission2" }, + { + roleId: BUILTIN_ROLE_IDS.PUBLIC, + permissionId: BuiltinPermissionID.PUBLIC, + }, ] expect(doesHaveBasePermission(permType, permLevel, rolesHierarchy)).toBe( false @@ -99,3 +109,24 @@ describe("isPermissionLevelHigherThanRead", () => { expect(isPermissionLevelHigherThanRead(PermissionLevel.READ)).toBe(false) }) }) + +describe("getBuiltinPermissions", () => { + test("returns a clone of the builtin permissions", () => { + const builtins = getBuiltinPermissions() + expect(builtins).toEqual(cloneDeep(BUILTIN_PERMISSIONS)) + expect(builtins).not.toBe(BUILTIN_PERMISSIONS) + }) +}) + +describe("getBuiltinPermissionByID", () => { + test("returns correct permission object for valid ID", () => { + const expectedPermission = { + _id: BuiltinPermissionID.PUBLIC, + name: "Public", + permissions: [ + new Permission(PermissionType.WEBHOOK, PermissionLevel.EXECUTE), + ], + } + expect(getBuiltinPermissionByID("public")).toEqual(expectedPermission) + }) +}) From d20e475fad36d1cd382a5261fbd30867aa0daff2 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 14 Apr 2023 12:18:08 +0100 Subject: [PATCH 45/91] Change skiplibcheck on @budibase/types --- packages/string-templates/tsconfig.json | 3 +-- packages/types/tsconfig-base.build.json | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/string-templates/tsconfig.json b/packages/string-templates/tsconfig.json index 9f52241a44..e7a001cc42 100644 --- a/packages/string-templates/tsconfig.json +++ b/packages/string-templates/tsconfig.json @@ -7,7 +7,6 @@ "emitDeclarationOnly": true, "outDir": "dist", "esModuleInterop": true, - "types": ["node"], - "skipLibCheck": true + "types": ["node"] } } diff --git a/packages/types/tsconfig-base.build.json b/packages/types/tsconfig-base.build.json index a955d2a179..d2403d75fc 100644 --- a/packages/types/tsconfig-base.build.json +++ b/packages/types/tsconfig-base.build.json @@ -7,7 +7,8 @@ "resolveJsonModule": true, "incremental": true, "sourceMap": true, - "declaration": true + "declaration": true, + "skipLibCheck": true }, "include": ["src/**/*"], "exclude": ["node_modules", "dist", "**/*.spec.ts", "**/*.spec.js"] From 9f4a3409273c4a993d0eb2f68b5009be91241252 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 14 Apr 2023 11:18:12 +0000 Subject: [PATCH 46/91] v2.4.44-alpha.25 --- 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 608f805405..ae5d3b0663 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.44-alpha.24", + "version": "2.4.44-alpha.25", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 1820376ab1..ae2fbc99fb 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.24", + "version": "2.4.44-alpha.25", "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.24", + "@budibase/types": "2.4.44-alpha.25", "@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 3d438a5a20..731f195dcd 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.24", + "version": "2.4.44-alpha.25", "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.24", - "@budibase/string-templates": "2.4.44-alpha.24", + "@budibase/shared-core": "2.4.44-alpha.25", + "@budibase/string-templates": "2.4.44-alpha.25", "@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 42dc474138..22e2302017 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.44-alpha.24", + "version": "2.4.44-alpha.25", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.4.44-alpha.24", - "@budibase/client": "2.4.44-alpha.24", - "@budibase/frontend-core": "2.4.44-alpha.24", - "@budibase/shared-core": "2.4.44-alpha.24", - "@budibase/string-templates": "2.4.44-alpha.24", + "@budibase/bbui": "2.4.44-alpha.25", + "@budibase/client": "2.4.44-alpha.25", + "@budibase/frontend-core": "2.4.44-alpha.25", + "@budibase/shared-core": "2.4.44-alpha.25", + "@budibase/string-templates": "2.4.44-alpha.25", "@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 5d81999bc3..9a30c9e887 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.44-alpha.24", + "version": "2.4.44-alpha.25", "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.24", - "@budibase/string-templates": "2.4.44-alpha.24", - "@budibase/types": "2.4.44-alpha.24", + "@budibase/backend-core": "2.4.44-alpha.25", + "@budibase/string-templates": "2.4.44-alpha.25", + "@budibase/types": "2.4.44-alpha.25", "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 65f4c51c9d..3ccfeb488e 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.44-alpha.24", + "version": "2.4.44-alpha.25", "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.24", - "@budibase/frontend-core": "2.4.44-alpha.24", - "@budibase/shared-core": "2.4.44-alpha.24", - "@budibase/string-templates": "2.4.44-alpha.24", - "@budibase/types": "2.4.44-alpha.24", + "@budibase/bbui": "2.4.44-alpha.25", + "@budibase/frontend-core": "2.4.44-alpha.25", + "@budibase/shared-core": "2.4.44-alpha.25", + "@budibase/string-templates": "2.4.44-alpha.25", + "@budibase/types": "2.4.44-alpha.25", "@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 c680b8946f..a772b9a8e0 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.24", + "version": "2.4.44-alpha.25", "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.24", - "@budibase/shared-core": "2.4.44-alpha.24", + "@budibase/bbui": "2.4.44-alpha.25", + "@budibase/shared-core": "2.4.44-alpha.25", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index b83adb2c27..54880808e4 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.44-alpha.24", + "version": "2.4.44-alpha.25", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 370ea4ceb0..73531ff64b 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.24", + "version": "2.4.44-alpha.25", "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.24", - "@budibase/client": "2.4.44-alpha.24", + "@budibase/backend-core": "2.4.44-alpha.25", + "@budibase/client": "2.4.44-alpha.25", "@budibase/pro": "2.4.44-alpha.23", - "@budibase/shared-core": "2.4.44-alpha.24", - "@budibase/string-templates": "2.4.44-alpha.24", - "@budibase/types": "2.4.44-alpha.24", + "@budibase/shared-core": "2.4.44-alpha.25", + "@budibase/string-templates": "2.4.44-alpha.25", + "@budibase/types": "2.4.44-alpha.25", "@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 396e9e259a..16799e078a 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.24", + "version": "2.4.44-alpha.25", "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.24" + "@budibase/types": "2.4.44-alpha.25" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 110c157663..ac10edd4b6 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.24", + "version": "2.4.44-alpha.25", "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 c62a623ad3..587a51a054 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.44-alpha.24", + "version": "2.4.44-alpha.25", "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 ef991c8d5c..17ab0da182 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.24", + "version": "2.4.44-alpha.25", "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.24", + "@budibase/backend-core": "2.4.44-alpha.25", "@budibase/pro": "2.4.44-alpha.23", - "@budibase/string-templates": "2.4.44-alpha.24", - "@budibase/types": "2.4.44-alpha.24", + "@budibase/string-templates": "2.4.44-alpha.25", + "@budibase/types": "2.4.44-alpha.25", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From d9e2ea1272bfd42ca21a9930164b2ecd7e650c93 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 14 Apr 2023 11:19:39 +0000 Subject: [PATCH 47/91] Update pro version to 2.4.44-alpha.25 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 59 ++++++++++++++++++++++++++++++++---- 3 files changed, 55 insertions(+), 8 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 73531ff64b..495d96de4e 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.25", "@budibase/client": "2.4.44-alpha.25", - "@budibase/pro": "2.4.44-alpha.23", + "@budibase/pro": "2.4.44-alpha.25", "@budibase/shared-core": "2.4.44-alpha.25", "@budibase/string-templates": "2.4.44-alpha.25", "@budibase/types": "2.4.44-alpha.25", diff --git a/packages/worker/package.json b/packages/worker/package.json index 17ab0da182..7206d00612 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.25", - "@budibase/pro": "2.4.44-alpha.23", + "@budibase/pro": "2.4.44-alpha.25", "@budibase/string-templates": "2.4.44-alpha.25", "@budibase/types": "2.4.44-alpha.25", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index e13f2e568e..c9eff0c0c7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1386,6 +1386,46 @@ 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.23": + version "2.4.44-alpha.23" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.23.tgz#ddd0a16c66355e45649f98379b35f6eea47c82db" + integrity sha512-RLFOcRBt2Mv6GTZpywwQcnHS8pkNSoinKi9tdepdzAvvstM7C6FZJ/IlWpoR73rJbz5McPxVoS6LfVUf7sta+g== + dependencies: + "@budibase/nano" "10.1.2" + "@budibase/pouchdb-replication-stream" "1.2.10" + "@budibase/types" "2.4.44-alpha.23" + "@shopify/jest-koa-mocks" "5.0.1" + "@techpass/passport-openidconnect" "0.3.2" + aws-cloudfront-sign "2.2.0" + aws-sdk "2.1030.0" + bcrypt "5.0.1" + bcryptjs "2.4.3" + bull "4.10.1" + correlation-id "4.0.0" + dotenv "16.0.1" + emitter-listener "1.1.2" + ioredis "4.28.0" + joi "17.6.0" + jsonwebtoken "9.0.0" + koa-passport "4.1.4" + koa-pino-logger "4.0.0" + lodash "4.17.21" + lodash.isarguments "3.1.0" + node-fetch "2.6.7" + passport-google-oauth "2.0.0" + passport-jwt "4.0.0" + passport-local "1.0.0" + passport-oauth2-refresh "^2.1.0" + posthog-node "1.3.0" + pouchdb "7.3.0" + pouchdb-find "7.2.2" + redlock "4.2.0" + sanitize-s3-objectkey "0.0.1" + semver "7.3.7" + tar-fs "2.1.1" + uuid "8.3.2" + zlib "1.0.5" + "@budibase/bbui@^0.9.139": version "0.9.190" resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.190.tgz#e1ec400ac90f556bfbc80fc23a04506f1585ea81" @@ -1486,15 +1526,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.44-alpha.22": - version "2.4.44-alpha.22" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.22.tgz#5709ae5261b95cc0e53a19905a62bce6bdb6d54a" - integrity sha512-DWRufe9tROX/bNqWo2wJ/G5g6zdph1y3wmK1C6p7eVNvuNBgddQojsr2hPHqKxaBo1XbnLvRJeyfja0sAmNrKA== +"@budibase/pro@2.4.44-alpha.23": + version "2.4.44-alpha.23" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.23.tgz#ecb0314e45a063fe1b4af75e51e39ee9de86e611" + integrity sha512-w96Fe9MUgzur2YyzhuVepK/Iowx3lpGQk+HJbzX53hSNLPFpqEcfHvQm+z0WY7JxiSgnW54g3G93nEk5trekNQ== dependencies: - "@budibase/backend-core" "2.4.44-alpha.22" + "@budibase/backend-core" "2.4.44-alpha.23" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.4.44-alpha.22" + "@budibase/types" "2.4.44-alpha.23" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1547,6 +1587,13 @@ 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.23": + version "2.4.44-alpha.23" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.23.tgz#e9024d4fa4ac8af10be2cd4fd358f89f12ada690" + integrity sha512-H8UqJF3/2+Shopd3I36GB+l/kazXH7pqP6LDSiThCF1oP9L1fHSylBRliLya5nT9eyxOxmIS1NHJa/6QiK8qDg== + dependencies: + scim-patch "^0.7.0" + "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" From e8e704259e86bd4fc810a14d0804f17f412819bc Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 14 Apr 2023 11:34:48 +0000 Subject: [PATCH 48/91] v2.4.44-alpha.26 --- 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 ae5d3b0663..fa3124e9a1 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.44-alpha.25", + "version": "2.4.44-alpha.26", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index ae2fbc99fb..c3bb3baab8 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.25", + "version": "2.4.44-alpha.26", "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.25", + "@budibase/types": "2.4.44-alpha.26", "@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 731f195dcd..720046520b 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.25", + "version": "2.4.44-alpha.26", "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.25", - "@budibase/string-templates": "2.4.44-alpha.25", + "@budibase/shared-core": "2.4.44-alpha.26", + "@budibase/string-templates": "2.4.44-alpha.26", "@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 22e2302017..12a6cbcea7 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.44-alpha.25", + "version": "2.4.44-alpha.26", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.4.44-alpha.25", - "@budibase/client": "2.4.44-alpha.25", - "@budibase/frontend-core": "2.4.44-alpha.25", - "@budibase/shared-core": "2.4.44-alpha.25", - "@budibase/string-templates": "2.4.44-alpha.25", + "@budibase/bbui": "2.4.44-alpha.26", + "@budibase/client": "2.4.44-alpha.26", + "@budibase/frontend-core": "2.4.44-alpha.26", + "@budibase/shared-core": "2.4.44-alpha.26", + "@budibase/string-templates": "2.4.44-alpha.26", "@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 9a30c9e887..ac973eca87 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.44-alpha.25", + "version": "2.4.44-alpha.26", "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.25", - "@budibase/string-templates": "2.4.44-alpha.25", - "@budibase/types": "2.4.44-alpha.25", + "@budibase/backend-core": "2.4.44-alpha.26", + "@budibase/string-templates": "2.4.44-alpha.26", + "@budibase/types": "2.4.44-alpha.26", "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 3ccfeb488e..e131392347 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.44-alpha.25", + "version": "2.4.44-alpha.26", "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.25", - "@budibase/frontend-core": "2.4.44-alpha.25", - "@budibase/shared-core": "2.4.44-alpha.25", - "@budibase/string-templates": "2.4.44-alpha.25", - "@budibase/types": "2.4.44-alpha.25", + "@budibase/bbui": "2.4.44-alpha.26", + "@budibase/frontend-core": "2.4.44-alpha.26", + "@budibase/shared-core": "2.4.44-alpha.26", + "@budibase/string-templates": "2.4.44-alpha.26", + "@budibase/types": "2.4.44-alpha.26", "@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 a772b9a8e0..6160bbc787 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.25", + "version": "2.4.44-alpha.26", "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.25", - "@budibase/shared-core": "2.4.44-alpha.25", + "@budibase/bbui": "2.4.44-alpha.26", + "@budibase/shared-core": "2.4.44-alpha.26", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 54880808e4..1004945455 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.44-alpha.25", + "version": "2.4.44-alpha.26", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 495d96de4e..7258bda642 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.25", + "version": "2.4.44-alpha.26", "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.25", - "@budibase/client": "2.4.44-alpha.25", + "@budibase/backend-core": "2.4.44-alpha.26", + "@budibase/client": "2.4.44-alpha.26", "@budibase/pro": "2.4.44-alpha.25", - "@budibase/shared-core": "2.4.44-alpha.25", - "@budibase/string-templates": "2.4.44-alpha.25", - "@budibase/types": "2.4.44-alpha.25", + "@budibase/shared-core": "2.4.44-alpha.26", + "@budibase/string-templates": "2.4.44-alpha.26", + "@budibase/types": "2.4.44-alpha.26", "@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 16799e078a..66471474a6 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.25", + "version": "2.4.44-alpha.26", "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.25" + "@budibase/types": "2.4.44-alpha.26" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index ac10edd4b6..22810f31f0 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.25", + "version": "2.4.44-alpha.26", "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 587a51a054..1c65c6212f 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.44-alpha.25", + "version": "2.4.44-alpha.26", "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 7206d00612..57e598a38e 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.25", + "version": "2.4.44-alpha.26", "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.25", + "@budibase/backend-core": "2.4.44-alpha.26", "@budibase/pro": "2.4.44-alpha.25", - "@budibase/string-templates": "2.4.44-alpha.25", - "@budibase/types": "2.4.44-alpha.25", + "@budibase/string-templates": "2.4.44-alpha.26", + "@budibase/types": "2.4.44-alpha.26", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From f3e9790a6e964511ae520f5a2dc8615dc9cc6c0e Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 14 Apr 2023 11:36:19 +0000 Subject: [PATCH 49/91] Update pro version to 2.4.44-alpha.26 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 59 ++++-------------------------------- 3 files changed, 8 insertions(+), 55 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 7258bda642..c110d2b142 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.26", "@budibase/client": "2.4.44-alpha.26", - "@budibase/pro": "2.4.44-alpha.25", + "@budibase/pro": "2.4.44-alpha.26", "@budibase/shared-core": "2.4.44-alpha.26", "@budibase/string-templates": "2.4.44-alpha.26", "@budibase/types": "2.4.44-alpha.26", diff --git a/packages/worker/package.json b/packages/worker/package.json index 57e598a38e..83d4d4e44c 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.26", - "@budibase/pro": "2.4.44-alpha.25", + "@budibase/pro": "2.4.44-alpha.26", "@budibase/string-templates": "2.4.44-alpha.26", "@budibase/types": "2.4.44-alpha.26", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index c9eff0c0c7..83af47731f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1386,46 +1386,6 @@ 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.23": - version "2.4.44-alpha.23" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.23.tgz#ddd0a16c66355e45649f98379b35f6eea47c82db" - integrity sha512-RLFOcRBt2Mv6GTZpywwQcnHS8pkNSoinKi9tdepdzAvvstM7C6FZJ/IlWpoR73rJbz5McPxVoS6LfVUf7sta+g== - dependencies: - "@budibase/nano" "10.1.2" - "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "2.4.44-alpha.23" - "@shopify/jest-koa-mocks" "5.0.1" - "@techpass/passport-openidconnect" "0.3.2" - aws-cloudfront-sign "2.2.0" - aws-sdk "2.1030.0" - bcrypt "5.0.1" - bcryptjs "2.4.3" - bull "4.10.1" - correlation-id "4.0.0" - dotenv "16.0.1" - emitter-listener "1.1.2" - ioredis "4.28.0" - joi "17.6.0" - jsonwebtoken "9.0.0" - koa-passport "4.1.4" - koa-pino-logger "4.0.0" - lodash "4.17.21" - lodash.isarguments "3.1.0" - node-fetch "2.6.7" - passport-google-oauth "2.0.0" - passport-jwt "4.0.0" - passport-local "1.0.0" - passport-oauth2-refresh "^2.1.0" - posthog-node "1.3.0" - pouchdb "7.3.0" - pouchdb-find "7.2.2" - redlock "4.2.0" - sanitize-s3-objectkey "0.0.1" - semver "7.3.7" - tar-fs "2.1.1" - uuid "8.3.2" - zlib "1.0.5" - "@budibase/bbui@^0.9.139": version "0.9.190" resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.190.tgz#e1ec400ac90f556bfbc80fc23a04506f1585ea81" @@ -1526,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.44-alpha.23": - version "2.4.44-alpha.23" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.23.tgz#ecb0314e45a063fe1b4af75e51e39ee9de86e611" - integrity sha512-w96Fe9MUgzur2YyzhuVepK/Iowx3lpGQk+HJbzX53hSNLPFpqEcfHvQm+z0WY7JxiSgnW54g3G93nEk5trekNQ== +"@budibase/pro@2.4.44-alpha.25": + version "2.4.44-alpha.25" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.25.tgz#5579e1dbcf609b10a3fb8d11a30d9654597ef2e4" + integrity sha512-LbNCi2D6ZVXJo6nsU2g6zGMTBDY2d57oFi8PaBepZP1azHtBsGBwG0+tnGuNy7FxgtA7UMIOUkGpVH8k30MjlQ== dependencies: - "@budibase/backend-core" "2.4.44-alpha.23" + "@budibase/backend-core" "2.4.44-alpha.25" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.4.44-alpha.23" + "@budibase/types" "2.4.44-alpha.25" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1587,13 +1547,6 @@ 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.23": - version "2.4.44-alpha.23" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.23.tgz#e9024d4fa4ac8af10be2cd4fd358f89f12ada690" - integrity sha512-H8UqJF3/2+Shopd3I36GB+l/kazXH7pqP6LDSiThCF1oP9L1fHSylBRliLya5nT9eyxOxmIS1NHJa/6QiK8qDg== - dependencies: - scim-patch "^0.7.0" - "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" From 83a7ab64b4fd4dbbc03082d9384df7557dad7452 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 14 Apr 2023 12:54:24 +0100 Subject: [PATCH 50/91] Update @types/jest --- packages/backend-core/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index c3bb3baab8..c32983d418 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -64,7 +64,7 @@ "@trendyol/jest-testcontainers": "^2.1.1", "@types/chance": "1.1.3", "@types/ioredis": "4.28.0", - "@types/jest": "28.1.1", + "@types/jest": "29.5.0", "@types/koa": "2.13.4", "@types/lodash": "4.14.180", "@types/node": "14.18.20", From e8c161aa63a7c41bb90af36cf3d8f05e0054f497 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 14 Apr 2023 12:13:01 +0000 Subject: [PATCH 51/91] v2.4.44-alpha.27 --- 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 fa3124e9a1..54b806617c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.44-alpha.26", + "version": "2.4.44-alpha.27", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index c32983d418..988411893d 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.26", + "version": "2.4.44-alpha.27", "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.26", + "@budibase/types": "2.4.44-alpha.27", "@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 720046520b..cf877d7201 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.26", + "version": "2.4.44-alpha.27", "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.26", - "@budibase/string-templates": "2.4.44-alpha.26", + "@budibase/shared-core": "2.4.44-alpha.27", + "@budibase/string-templates": "2.4.44-alpha.27", "@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 12a6cbcea7..25ef35f9e7 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.44-alpha.26", + "version": "2.4.44-alpha.27", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.4.44-alpha.26", - "@budibase/client": "2.4.44-alpha.26", - "@budibase/frontend-core": "2.4.44-alpha.26", - "@budibase/shared-core": "2.4.44-alpha.26", - "@budibase/string-templates": "2.4.44-alpha.26", + "@budibase/bbui": "2.4.44-alpha.27", + "@budibase/client": "2.4.44-alpha.27", + "@budibase/frontend-core": "2.4.44-alpha.27", + "@budibase/shared-core": "2.4.44-alpha.27", + "@budibase/string-templates": "2.4.44-alpha.27", "@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 ac973eca87..cc9d59928d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.44-alpha.26", + "version": "2.4.44-alpha.27", "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.26", - "@budibase/string-templates": "2.4.44-alpha.26", - "@budibase/types": "2.4.44-alpha.26", + "@budibase/backend-core": "2.4.44-alpha.27", + "@budibase/string-templates": "2.4.44-alpha.27", + "@budibase/types": "2.4.44-alpha.27", "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 e131392347..b1365d9a15 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.44-alpha.26", + "version": "2.4.44-alpha.27", "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.26", - "@budibase/frontend-core": "2.4.44-alpha.26", - "@budibase/shared-core": "2.4.44-alpha.26", - "@budibase/string-templates": "2.4.44-alpha.26", - "@budibase/types": "2.4.44-alpha.26", + "@budibase/bbui": "2.4.44-alpha.27", + "@budibase/frontend-core": "2.4.44-alpha.27", + "@budibase/shared-core": "2.4.44-alpha.27", + "@budibase/string-templates": "2.4.44-alpha.27", + "@budibase/types": "2.4.44-alpha.27", "@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 6160bbc787..aef9e52c4a 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.26", + "version": "2.4.44-alpha.27", "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.26", - "@budibase/shared-core": "2.4.44-alpha.26", + "@budibase/bbui": "2.4.44-alpha.27", + "@budibase/shared-core": "2.4.44-alpha.27", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 1004945455..e99ee9f170 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.44-alpha.26", + "version": "2.4.44-alpha.27", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index c110d2b142..f66546be02 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.26", + "version": "2.4.44-alpha.27", "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.26", - "@budibase/client": "2.4.44-alpha.26", + "@budibase/backend-core": "2.4.44-alpha.27", + "@budibase/client": "2.4.44-alpha.27", "@budibase/pro": "2.4.44-alpha.26", - "@budibase/shared-core": "2.4.44-alpha.26", - "@budibase/string-templates": "2.4.44-alpha.26", - "@budibase/types": "2.4.44-alpha.26", + "@budibase/shared-core": "2.4.44-alpha.27", + "@budibase/string-templates": "2.4.44-alpha.27", + "@budibase/types": "2.4.44-alpha.27", "@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 66471474a6..dd163040cb 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.26", + "version": "2.4.44-alpha.27", "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.26" + "@budibase/types": "2.4.44-alpha.27" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 22810f31f0..c2cda99f5a 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.26", + "version": "2.4.44-alpha.27", "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 1c65c6212f..b649caf247 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.44-alpha.26", + "version": "2.4.44-alpha.27", "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 83d4d4e44c..a32a318e8c 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.26", + "version": "2.4.44-alpha.27", "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.26", + "@budibase/backend-core": "2.4.44-alpha.27", "@budibase/pro": "2.4.44-alpha.26", - "@budibase/string-templates": "2.4.44-alpha.26", - "@budibase/types": "2.4.44-alpha.26", + "@budibase/string-templates": "2.4.44-alpha.27", + "@budibase/types": "2.4.44-alpha.27", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From c77c7ff6f541ac0f612b50864fbf1c48e99e8b20 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 14 Apr 2023 12:14:31 +0000 Subject: [PATCH 52/91] Update pro version to 2.4.44-alpha.27 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index f66546be02..60f5f9a810 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.27", "@budibase/client": "2.4.44-alpha.27", - "@budibase/pro": "2.4.44-alpha.26", + "@budibase/pro": "2.4.44-alpha.27", "@budibase/shared-core": "2.4.44-alpha.27", "@budibase/string-templates": "2.4.44-alpha.27", "@budibase/types": "2.4.44-alpha.27", diff --git a/packages/worker/package.json b/packages/worker/package.json index a32a318e8c..914ced791d 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.27", - "@budibase/pro": "2.4.44-alpha.26", + "@budibase/pro": "2.4.44-alpha.27", "@budibase/string-templates": "2.4.44-alpha.27", "@budibase/types": "2.4.44-alpha.27", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 83af47731f..33dec5ffe5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.44-alpha.25": - version "2.4.44-alpha.25" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.25.tgz#5579e1dbcf609b10a3fb8d11a30d9654597ef2e4" - integrity sha512-LbNCi2D6ZVXJo6nsU2g6zGMTBDY2d57oFi8PaBepZP1azHtBsGBwG0+tnGuNy7FxgtA7UMIOUkGpVH8k30MjlQ== +"@budibase/pro@2.4.44-alpha.26": + version "2.4.44-alpha.26" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.26.tgz#8038d2ffd3a11fdcc5b33e75c4c2a8011c11f1e0" + integrity sha512-+NMa5aDQu9rYUEXKkmhylSZ4Jw2SzM8f1az8ugSGaVU1wjUsXY/nX/2OFCPMa2tNTe5QvPZ5nMGGoyyfcN1ydw== dependencies: - "@budibase/backend-core" "2.4.44-alpha.25" + "@budibase/backend-core" "2.4.44-alpha.26" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.4.44-alpha.25" + "@budibase/types" "2.4.44-alpha.26" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From d0a0ea4944f782620f8d5dc1613e714082d2a913 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 14 Apr 2023 13:47:35 +0100 Subject: [PATCH 53/91] v2.4.44-alpha.28 --- 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 54b806617c..847ddf0540 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.44-alpha.27", + "version": "2.4.44-alpha.28", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 988411893d..493255f6eb 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.27", + "version": "2.4.44-alpha.28", "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.27", + "@budibase/types": "2.4.44-alpha.28", "@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 cf877d7201..888a8ba29a 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.27", + "version": "2.4.44-alpha.28", "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.27", - "@budibase/string-templates": "2.4.44-alpha.27", + "@budibase/shared-core": "2.4.44-alpha.28", + "@budibase/string-templates": "2.4.44-alpha.28", "@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 25ef35f9e7..afd7a93bb3 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.44-alpha.27", + "version": "2.4.44-alpha.28", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.4.44-alpha.27", - "@budibase/client": "2.4.44-alpha.27", - "@budibase/frontend-core": "2.4.44-alpha.27", - "@budibase/shared-core": "2.4.44-alpha.27", - "@budibase/string-templates": "2.4.44-alpha.27", + "@budibase/bbui": "2.4.44-alpha.28", + "@budibase/client": "2.4.44-alpha.28", + "@budibase/frontend-core": "2.4.44-alpha.28", + "@budibase/shared-core": "2.4.44-alpha.28", + "@budibase/string-templates": "2.4.44-alpha.28", "@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 cc9d59928d..b3f4d84d40 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.44-alpha.27", + "version": "2.4.44-alpha.28", "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.27", - "@budibase/string-templates": "2.4.44-alpha.27", - "@budibase/types": "2.4.44-alpha.27", + "@budibase/backend-core": "2.4.44-alpha.28", + "@budibase/string-templates": "2.4.44-alpha.28", + "@budibase/types": "2.4.44-alpha.28", "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 b1365d9a15..50a4430147 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.44-alpha.27", + "version": "2.4.44-alpha.28", "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.27", - "@budibase/frontend-core": "2.4.44-alpha.27", - "@budibase/shared-core": "2.4.44-alpha.27", - "@budibase/string-templates": "2.4.44-alpha.27", - "@budibase/types": "2.4.44-alpha.27", + "@budibase/bbui": "2.4.44-alpha.28", + "@budibase/frontend-core": "2.4.44-alpha.28", + "@budibase/shared-core": "2.4.44-alpha.28", + "@budibase/string-templates": "2.4.44-alpha.28", + "@budibase/types": "2.4.44-alpha.28", "@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 aef9e52c4a..6ae0017eae 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.27", + "version": "2.4.44-alpha.28", "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.27", - "@budibase/shared-core": "2.4.44-alpha.27", + "@budibase/bbui": "2.4.44-alpha.28", + "@budibase/shared-core": "2.4.44-alpha.28", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index e99ee9f170..0e693f34a9 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.44-alpha.27", + "version": "2.4.44-alpha.28", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 60f5f9a810..0e5863f546 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.27", + "version": "2.4.44-alpha.28", "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.27", - "@budibase/client": "2.4.44-alpha.27", + "@budibase/backend-core": "2.4.44-alpha.28", + "@budibase/client": "2.4.44-alpha.28", "@budibase/pro": "2.4.44-alpha.27", - "@budibase/shared-core": "2.4.44-alpha.27", - "@budibase/string-templates": "2.4.44-alpha.27", - "@budibase/types": "2.4.44-alpha.27", + "@budibase/shared-core": "2.4.44-alpha.28", + "@budibase/string-templates": "2.4.44-alpha.28", + "@budibase/types": "2.4.44-alpha.28", "@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 dd163040cb..acc4b345bd 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.27", + "version": "2.4.44-alpha.28", "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.27" + "@budibase/types": "2.4.44-alpha.28" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index c2cda99f5a..90ad840cec 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.27", + "version": "2.4.44-alpha.28", "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 b649caf247..6ecbf8f456 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.44-alpha.27", + "version": "2.4.44-alpha.28", "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 914ced791d..89cc33ec92 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.27", + "version": "2.4.44-alpha.28", "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.27", + "@budibase/backend-core": "2.4.44-alpha.28", "@budibase/pro": "2.4.44-alpha.27", - "@budibase/string-templates": "2.4.44-alpha.27", - "@budibase/types": "2.4.44-alpha.27", + "@budibase/string-templates": "2.4.44-alpha.28", + "@budibase/types": "2.4.44-alpha.28", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From f6f131399d44c4f613b761e4ba2b8279e4a96a86 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 14 Apr 2023 13:48:05 +0100 Subject: [PATCH 54/91] v2.4.44-alpha.29 --- lerna.json | 2 +- packages/backend-core/package.json | 6 +++--- packages/bbui/package.json | 8 ++++---- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 11 ++++++----- packages/client/package.json | 14 +++++++------- packages/frontend-core/package.json | 9 +++++---- packages/sdk/package.json | 5 +++-- packages/server/package.json | 14 +++++++------- packages/shared-core/package.json | 7 ++++--- packages/string-templates/package.json | 4 ++-- packages/types/package.json | 5 +++-- packages/worker/package.json | 10 +++++----- 13 files changed, 56 insertions(+), 51 deletions(-) diff --git a/lerna.json b/lerna.json index 847ddf0540..5cf2417137 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.44-alpha.28", + "version": "2.4.44-alpha.29", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 493255f6eb..af59d49f9b 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.28", + "version": "2.4.44-alpha.29", "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.28", + "@budibase/types": "2.4.44-alpha.29", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", @@ -90,5 +90,5 @@ "tsconfig-paths": "4.0.0", "typescript": "4.7.3" }, - "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" + "gitHead": "ec99a79ea55d3395b83c801699eb8b462f905fe8" } diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 888a8ba29a..0603b34c4e 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.28", + "version": "2.4.44-alpha.29", "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.28", - "@budibase/string-templates": "2.4.44-alpha.28", + "@budibase/shared-core": "2.4.44-alpha.29", + "@budibase/string-templates": "2.4.44-alpha.29", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", @@ -90,5 +90,5 @@ "resolutions": { "loader-utils": "1.4.1" }, - "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" + "gitHead": "ec99a79ea55d3395b83c801699eb8b462f905fe8" } diff --git a/packages/builder/package.json b/packages/builder/package.json index afd7a93bb3..051526c53f 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.44-alpha.28", + "version": "2.4.44-alpha.29", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.4.44-alpha.28", - "@budibase/client": "2.4.44-alpha.28", - "@budibase/frontend-core": "2.4.44-alpha.28", - "@budibase/shared-core": "2.4.44-alpha.28", - "@budibase/string-templates": "2.4.44-alpha.28", + "@budibase/bbui": "2.4.44-alpha.29", + "@budibase/client": "2.4.44-alpha.29", + "@budibase/frontend-core": "2.4.44-alpha.29", + "@budibase/shared-core": "2.4.44-alpha.29", + "@budibase/string-templates": "2.4.44-alpha.29", "@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 b3f4d84d40..55c69b942c 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.44-alpha.28", + "version": "2.4.44-alpha.29", "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.28", - "@budibase/string-templates": "2.4.44-alpha.28", - "@budibase/types": "2.4.44-alpha.28", + "@budibase/backend-core": "2.4.44-alpha.29", + "@budibase/string-templates": "2.4.44-alpha.29", + "@budibase/types": "2.4.44-alpha.29", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", @@ -63,5 +63,6 @@ "renamer": "^4.0.0", "ts-node": "^10.9.1", "typescript": "4.7.3" - } + }, + "gitHead": "ec99a79ea55d3395b83c801699eb8b462f905fe8" } diff --git a/packages/client/package.json b/packages/client/package.json index 50a4430147..6c1f7a73ad 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.44-alpha.28", + "version": "2.4.44-alpha.29", "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.28", - "@budibase/frontend-core": "2.4.44-alpha.28", - "@budibase/shared-core": "2.4.44-alpha.28", - "@budibase/string-templates": "2.4.44-alpha.28", - "@budibase/types": "2.4.44-alpha.28", + "@budibase/bbui": "2.4.44-alpha.29", + "@budibase/frontend-core": "2.4.44-alpha.29", + "@budibase/shared-core": "2.4.44-alpha.29", + "@budibase/string-templates": "2.4.44-alpha.29", + "@budibase/types": "2.4.44-alpha.29", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", @@ -65,5 +65,5 @@ "resolutions": { "loader-utils": "1.4.1" }, - "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" + "gitHead": "ec99a79ea55d3395b83c801699eb8b462f905fe8" } diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 6ae0017eae..23320f61ee 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,14 +1,15 @@ { "name": "@budibase/frontend-core", - "version": "2.4.44-alpha.28", + "version": "2.4.44-alpha.29", "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.28", - "@budibase/shared-core": "2.4.44-alpha.28", + "@budibase/bbui": "2.4.44-alpha.29", + "@budibase/shared-core": "2.4.44-alpha.29", "lodash": "^4.17.21", "svelte": "^3.46.2" - } + }, + "gitHead": "ec99a79ea55d3395b83c801699eb8b462f905fe8" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 0e693f34a9..fede0bb324 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.44-alpha.28", + "version": "2.4.44-alpha.29", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", @@ -19,5 +19,6 @@ "rollup": "^2.44.0", "rollup-plugin-polyfill-node": "^0.8.0", "rollup-plugin-terser": "^7.0.2" - } + }, + "gitHead": "ec99a79ea55d3395b83c801699eb8b462f905fe8" } diff --git a/packages/server/package.json b/packages/server/package.json index 0e5863f546..0f9b47a31e 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.28", + "version": "2.4.44-alpha.29", "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.28", - "@budibase/client": "2.4.44-alpha.28", + "@budibase/backend-core": "2.4.44-alpha.29", + "@budibase/client": "2.4.44-alpha.29", "@budibase/pro": "2.4.44-alpha.27", - "@budibase/shared-core": "2.4.44-alpha.28", - "@budibase/string-templates": "2.4.44-alpha.28", - "@budibase/types": "2.4.44-alpha.28", + "@budibase/shared-core": "2.4.44-alpha.29", + "@budibase/string-templates": "2.4.44-alpha.29", + "@budibase/types": "2.4.44-alpha.29", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", @@ -176,5 +176,5 @@ "optionalDependencies": { "oracledb": "5.3.0" }, - "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" + "gitHead": "ec99a79ea55d3395b83c801699eb8b462f905fe8" } diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index acc4b345bd..b8efd297bb 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.28", + "version": "2.4.44-alpha.29", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,11 +20,12 @@ "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.28" + "@budibase/types": "2.4.44-alpha.29" }, "devDependencies": { "concurrently": "^7.6.0", "rimraf": "3.0.2", "typescript": "4.7.3" - } + }, + "gitHead": "ec99a79ea55d3395b83c801699eb8b462f905fe8" } diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 90ad840cec..25dc3d7d49 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.28", + "version": "2.4.44-alpha.29", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", @@ -47,5 +47,5 @@ "rollup-plugin-terser": "^7.0.2", "typescript": "4.7.3" }, - "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" + "gitHead": "ec99a79ea55d3395b83c801699eb8b462f905fe8" } diff --git a/packages/types/package.json b/packages/types/package.json index 6ecbf8f456..0e58716dc8 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.44-alpha.28", + "version": "2.4.44-alpha.29", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", @@ -32,5 +32,6 @@ }, "dependencies": { "scim-patch": "^0.7.0" - } + }, + "gitHead": "ec99a79ea55d3395b83c801699eb8b462f905fe8" } diff --git a/packages/worker/package.json b/packages/worker/package.json index 89cc33ec92..82af91584b 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.28", + "version": "2.4.44-alpha.29", "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.28", + "@budibase/backend-core": "2.4.44-alpha.29", "@budibase/pro": "2.4.44-alpha.27", - "@budibase/string-templates": "2.4.44-alpha.28", - "@budibase/types": "2.4.44-alpha.28", + "@budibase/string-templates": "2.4.44-alpha.29", + "@budibase/types": "2.4.44-alpha.29", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", @@ -102,5 +102,5 @@ "typescript": "4.7.3", "update-dotenv": "1.1.1" }, - "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" + "gitHead": "ec99a79ea55d3395b83c801699eb8b462f905fe8" } From cb3698a57727b3b0da52ce537453fc34af6df7fa Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 14 Apr 2023 13:49:13 +0100 Subject: [PATCH 55/91] v2.4.44-alpha.30 --- 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 5cf2417137..ef466625f3 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.44-alpha.29", + "version": "2.4.44-alpha.30", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index af59d49f9b..a92e3b6118 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.29", + "version": "2.4.44-alpha.30", "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.29", + "@budibase/types": "2.4.44-alpha.30", "@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 0603b34c4e..03a0e926a5 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.29", + "version": "2.4.44-alpha.30", "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.29", - "@budibase/string-templates": "2.4.44-alpha.29", + "@budibase/shared-core": "2.4.44-alpha.30", + "@budibase/string-templates": "2.4.44-alpha.30", "@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 051526c53f..03f741e8a4 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.44-alpha.29", + "version": "2.4.44-alpha.30", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.4.44-alpha.29", - "@budibase/client": "2.4.44-alpha.29", - "@budibase/frontend-core": "2.4.44-alpha.29", - "@budibase/shared-core": "2.4.44-alpha.29", - "@budibase/string-templates": "2.4.44-alpha.29", + "@budibase/bbui": "2.4.44-alpha.30", + "@budibase/client": "2.4.44-alpha.30", + "@budibase/frontend-core": "2.4.44-alpha.30", + "@budibase/shared-core": "2.4.44-alpha.30", + "@budibase/string-templates": "2.4.44-alpha.30", "@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 55c69b942c..b27098e450 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.44-alpha.29", + "version": "2.4.44-alpha.30", "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.29", - "@budibase/string-templates": "2.4.44-alpha.29", - "@budibase/types": "2.4.44-alpha.29", + "@budibase/backend-core": "2.4.44-alpha.30", + "@budibase/string-templates": "2.4.44-alpha.30", + "@budibase/types": "2.4.44-alpha.30", "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 6c1f7a73ad..4bd35fb20a 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.44-alpha.29", + "version": "2.4.44-alpha.30", "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.29", - "@budibase/frontend-core": "2.4.44-alpha.29", - "@budibase/shared-core": "2.4.44-alpha.29", - "@budibase/string-templates": "2.4.44-alpha.29", - "@budibase/types": "2.4.44-alpha.29", + "@budibase/bbui": "2.4.44-alpha.30", + "@budibase/frontend-core": "2.4.44-alpha.30", + "@budibase/shared-core": "2.4.44-alpha.30", + "@budibase/string-templates": "2.4.44-alpha.30", + "@budibase/types": "2.4.44-alpha.30", "@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 23320f61ee..9e820c938c 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.29", + "version": "2.4.44-alpha.30", "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.29", - "@budibase/shared-core": "2.4.44-alpha.29", + "@budibase/bbui": "2.4.44-alpha.30", + "@budibase/shared-core": "2.4.44-alpha.30", "lodash": "^4.17.21", "svelte": "^3.46.2" }, diff --git a/packages/sdk/package.json b/packages/sdk/package.json index fede0bb324..2da18b1a84 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.44-alpha.29", + "version": "2.4.44-alpha.30", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 0f9b47a31e..cbafe991c5 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.29", + "version": "2.4.44-alpha.30", "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.29", - "@budibase/client": "2.4.44-alpha.29", + "@budibase/backend-core": "2.4.44-alpha.30", + "@budibase/client": "2.4.44-alpha.30", "@budibase/pro": "2.4.44-alpha.27", - "@budibase/shared-core": "2.4.44-alpha.29", - "@budibase/string-templates": "2.4.44-alpha.29", - "@budibase/types": "2.4.44-alpha.29", + "@budibase/shared-core": "2.4.44-alpha.30", + "@budibase/string-templates": "2.4.44-alpha.30", + "@budibase/types": "2.4.44-alpha.30", "@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 b8efd297bb..dea663c6e5 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.29", + "version": "2.4.44-alpha.30", "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.29" + "@budibase/types": "2.4.44-alpha.30" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 25dc3d7d49..104900b108 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.29", + "version": "2.4.44-alpha.30", "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 0e58716dc8..0d498eaf10 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.44-alpha.29", + "version": "2.4.44-alpha.30", "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 82af91584b..f81451d67d 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.29", + "version": "2.4.44-alpha.30", "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.29", + "@budibase/backend-core": "2.4.44-alpha.30", "@budibase/pro": "2.4.44-alpha.27", - "@budibase/string-templates": "2.4.44-alpha.29", - "@budibase/types": "2.4.44-alpha.29", + "@budibase/string-templates": "2.4.44-alpha.30", + "@budibase/types": "2.4.44-alpha.30", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 523bacabc3aa9bfc7d47d7da30eb693525a852a8 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 14 Apr 2023 14:00:37 +0100 Subject: [PATCH 56/91] Remove second conflicting yarn build --- .github/workflows/release-develop.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release-develop.yml b/.github/workflows/release-develop.yml index 68c949447c..46e82e6efc 100644 --- a/.github/workflows/release-develop.yml +++ b/.github/workflows/release-develop.yml @@ -62,7 +62,6 @@ jobs: - name: Build/release Docker images run: | docker login -u $DOCKER_USER -p $DOCKER_PASSWORD - yarn build yarn build:docker:develop env: DOCKER_USER: ${{ secrets.DOCKER_USERNAME }} From 361a1a02b13cb88d683a8c4bfb31338eed91e952 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 14 Apr 2023 13:04:19 +0000 Subject: [PATCH 57/91] v2.4.44-alpha.31 --- 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 ef466625f3..0901c6a415 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.44-alpha.30", + "version": "2.4.44-alpha.31", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index a92e3b6118..46bb909217 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.30", + "version": "2.4.44-alpha.31", "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.30", + "@budibase/types": "2.4.44-alpha.31", "@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 03a0e926a5..c3e750e97d 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.30", + "version": "2.4.44-alpha.31", "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.30", - "@budibase/string-templates": "2.4.44-alpha.30", + "@budibase/shared-core": "2.4.44-alpha.31", + "@budibase/string-templates": "2.4.44-alpha.31", "@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 03f741e8a4..3fb06d6b26 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.44-alpha.30", + "version": "2.4.44-alpha.31", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.4.44-alpha.30", - "@budibase/client": "2.4.44-alpha.30", - "@budibase/frontend-core": "2.4.44-alpha.30", - "@budibase/shared-core": "2.4.44-alpha.30", - "@budibase/string-templates": "2.4.44-alpha.30", + "@budibase/bbui": "2.4.44-alpha.31", + "@budibase/client": "2.4.44-alpha.31", + "@budibase/frontend-core": "2.4.44-alpha.31", + "@budibase/shared-core": "2.4.44-alpha.31", + "@budibase/string-templates": "2.4.44-alpha.31", "@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 b27098e450..d192beeb25 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.44-alpha.30", + "version": "2.4.44-alpha.31", "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.30", - "@budibase/string-templates": "2.4.44-alpha.30", - "@budibase/types": "2.4.44-alpha.30", + "@budibase/backend-core": "2.4.44-alpha.31", + "@budibase/string-templates": "2.4.44-alpha.31", + "@budibase/types": "2.4.44-alpha.31", "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 4bd35fb20a..6b3d93d506 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.44-alpha.30", + "version": "2.4.44-alpha.31", "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.30", - "@budibase/frontend-core": "2.4.44-alpha.30", - "@budibase/shared-core": "2.4.44-alpha.30", - "@budibase/string-templates": "2.4.44-alpha.30", - "@budibase/types": "2.4.44-alpha.30", + "@budibase/bbui": "2.4.44-alpha.31", + "@budibase/frontend-core": "2.4.44-alpha.31", + "@budibase/shared-core": "2.4.44-alpha.31", + "@budibase/string-templates": "2.4.44-alpha.31", + "@budibase/types": "2.4.44-alpha.31", "@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 9e820c938c..0c4cb21def 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.30", + "version": "2.4.44-alpha.31", "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.30", - "@budibase/shared-core": "2.4.44-alpha.30", + "@budibase/bbui": "2.4.44-alpha.31", + "@budibase/shared-core": "2.4.44-alpha.31", "lodash": "^4.17.21", "svelte": "^3.46.2" }, diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 2da18b1a84..9a3cfdaeae 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.44-alpha.30", + "version": "2.4.44-alpha.31", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index cbafe991c5..2f60b33372 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.30", + "version": "2.4.44-alpha.31", "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.30", - "@budibase/client": "2.4.44-alpha.30", + "@budibase/backend-core": "2.4.44-alpha.31", + "@budibase/client": "2.4.44-alpha.31", "@budibase/pro": "2.4.44-alpha.27", - "@budibase/shared-core": "2.4.44-alpha.30", - "@budibase/string-templates": "2.4.44-alpha.30", - "@budibase/types": "2.4.44-alpha.30", + "@budibase/shared-core": "2.4.44-alpha.31", + "@budibase/string-templates": "2.4.44-alpha.31", + "@budibase/types": "2.4.44-alpha.31", "@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 dea663c6e5..844292a60f 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.30", + "version": "2.4.44-alpha.31", "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.30" + "@budibase/types": "2.4.44-alpha.31" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 104900b108..a06e4bc127 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.30", + "version": "2.4.44-alpha.31", "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 0d498eaf10..bd9a370135 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.44-alpha.30", + "version": "2.4.44-alpha.31", "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 f81451d67d..f39da3836c 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.30", + "version": "2.4.44-alpha.31", "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.30", + "@budibase/backend-core": "2.4.44-alpha.31", "@budibase/pro": "2.4.44-alpha.27", - "@budibase/string-templates": "2.4.44-alpha.30", - "@budibase/types": "2.4.44-alpha.30", + "@budibase/string-templates": "2.4.44-alpha.31", + "@budibase/types": "2.4.44-alpha.31", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From c10015548e1ad1b3de013368fd2b5f1cd4a53a18 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 14 Apr 2023 13:05:48 +0000 Subject: [PATCH 58/91] Update pro version to 2.4.44-alpha.31 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 59 ++++++++++++++++++++++++++++++++---- 3 files changed, 55 insertions(+), 8 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 2f60b33372..92478ab988 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.31", "@budibase/client": "2.4.44-alpha.31", - "@budibase/pro": "2.4.44-alpha.27", + "@budibase/pro": "2.4.44-alpha.31", "@budibase/shared-core": "2.4.44-alpha.31", "@budibase/string-templates": "2.4.44-alpha.31", "@budibase/types": "2.4.44-alpha.31", diff --git a/packages/worker/package.json b/packages/worker/package.json index f39da3836c..bf15329c53 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.31", - "@budibase/pro": "2.4.44-alpha.27", + "@budibase/pro": "2.4.44-alpha.31", "@budibase/string-templates": "2.4.44-alpha.31", "@budibase/types": "2.4.44-alpha.31", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 33dec5ffe5..6581043913 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1386,6 +1386,46 @@ 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.27": + version "2.4.44-alpha.27" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.27.tgz#31d0b1cf11b8a5d5c7dbaf1d7c98c72e9fc7adec" + integrity sha512-BjM135jwTDKynlBBeHyU0KsuYrRtH1+JEhqi7JqdkAIvI5LHsUtq7F8hETy9rqFNcQow9/0QV4Fgkf1z18G84A== + dependencies: + "@budibase/nano" "10.1.2" + "@budibase/pouchdb-replication-stream" "1.2.10" + "@budibase/types" "2.4.44-alpha.27" + "@shopify/jest-koa-mocks" "5.0.1" + "@techpass/passport-openidconnect" "0.3.2" + aws-cloudfront-sign "2.2.0" + aws-sdk "2.1030.0" + bcrypt "5.0.1" + bcryptjs "2.4.3" + bull "4.10.1" + correlation-id "4.0.0" + dotenv "16.0.1" + emitter-listener "1.1.2" + ioredis "4.28.0" + joi "17.6.0" + jsonwebtoken "9.0.0" + koa-passport "4.1.4" + koa-pino-logger "4.0.0" + lodash "4.17.21" + lodash.isarguments "3.1.0" + node-fetch "2.6.7" + passport-google-oauth "2.0.0" + passport-jwt "4.0.0" + passport-local "1.0.0" + passport-oauth2-refresh "^2.1.0" + posthog-node "1.3.0" + pouchdb "7.3.0" + pouchdb-find "7.2.2" + redlock "4.2.0" + sanitize-s3-objectkey "0.0.1" + semver "7.3.7" + tar-fs "2.1.1" + uuid "8.3.2" + zlib "1.0.5" + "@budibase/bbui@^0.9.139": version "0.9.190" resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.190.tgz#e1ec400ac90f556bfbc80fc23a04506f1585ea81" @@ -1486,15 +1526,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.44-alpha.26": - version "2.4.44-alpha.26" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.26.tgz#8038d2ffd3a11fdcc5b33e75c4c2a8011c11f1e0" - integrity sha512-+NMa5aDQu9rYUEXKkmhylSZ4Jw2SzM8f1az8ugSGaVU1wjUsXY/nX/2OFCPMa2tNTe5QvPZ5nMGGoyyfcN1ydw== +"@budibase/pro@2.4.44-alpha.27": + version "2.4.44-alpha.27" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.27.tgz#8fbd7a6fb77604cbf48a27619cc04de189fad136" + integrity sha512-6uw7Avzw6B/0Ab/YxuixuFcg9jqzdrLTMSkDCNsUT0pz7ZJUX5UroFDfJij485haGrNjk7GP7qQiayne0z5vQA== dependencies: - "@budibase/backend-core" "2.4.44-alpha.26" + "@budibase/backend-core" "2.4.44-alpha.27" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.4.44-alpha.26" + "@budibase/types" "2.4.44-alpha.27" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1547,6 +1587,13 @@ 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.27": + version "2.4.44-alpha.27" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.27.tgz#a92464d08bfa2a686ba7107febd32dcf1f6d5328" + integrity sha512-tcC/NAy4gYA9p1BuHLwc2cynNAy0Qfwd+6dJd+tgNHEJ4lvFBy5HKm4wOdWu2elxWjdTUne4JFC6nB3Cbld7sQ== + dependencies: + scim-patch "^0.7.0" + "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" From 59a6a6807faa2098297bd3e1cb2e2d8fbcf97c52 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 14 Apr 2023 13:15:49 +0000 Subject: [PATCH 59/91] v2.4.44-alpha.32 --- 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 0901c6a415..e6f603abd3 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.44-alpha.31", + "version": "2.4.44-alpha.32", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 46bb909217..ef18a9cf2f 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.31", + "version": "2.4.44-alpha.32", "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.31", + "@budibase/types": "2.4.44-alpha.32", "@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 c3e750e97d..18910156be 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.31", + "version": "2.4.44-alpha.32", "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.31", - "@budibase/string-templates": "2.4.44-alpha.31", + "@budibase/shared-core": "2.4.44-alpha.32", + "@budibase/string-templates": "2.4.44-alpha.32", "@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 3fb06d6b26..93d46ff616 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.44-alpha.31", + "version": "2.4.44-alpha.32", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.4.44-alpha.31", - "@budibase/client": "2.4.44-alpha.31", - "@budibase/frontend-core": "2.4.44-alpha.31", - "@budibase/shared-core": "2.4.44-alpha.31", - "@budibase/string-templates": "2.4.44-alpha.31", + "@budibase/bbui": "2.4.44-alpha.32", + "@budibase/client": "2.4.44-alpha.32", + "@budibase/frontend-core": "2.4.44-alpha.32", + "@budibase/shared-core": "2.4.44-alpha.32", + "@budibase/string-templates": "2.4.44-alpha.32", "@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 d192beeb25..aee3726e14 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.44-alpha.31", + "version": "2.4.44-alpha.32", "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.31", - "@budibase/string-templates": "2.4.44-alpha.31", - "@budibase/types": "2.4.44-alpha.31", + "@budibase/backend-core": "2.4.44-alpha.32", + "@budibase/string-templates": "2.4.44-alpha.32", + "@budibase/types": "2.4.44-alpha.32", "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 6b3d93d506..411dfeb29a 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.44-alpha.31", + "version": "2.4.44-alpha.32", "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.31", - "@budibase/frontend-core": "2.4.44-alpha.31", - "@budibase/shared-core": "2.4.44-alpha.31", - "@budibase/string-templates": "2.4.44-alpha.31", - "@budibase/types": "2.4.44-alpha.31", + "@budibase/bbui": "2.4.44-alpha.32", + "@budibase/frontend-core": "2.4.44-alpha.32", + "@budibase/shared-core": "2.4.44-alpha.32", + "@budibase/string-templates": "2.4.44-alpha.32", + "@budibase/types": "2.4.44-alpha.32", "@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 0c4cb21def..93bce5b1a4 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.31", + "version": "2.4.44-alpha.32", "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.31", - "@budibase/shared-core": "2.4.44-alpha.31", + "@budibase/bbui": "2.4.44-alpha.32", + "@budibase/shared-core": "2.4.44-alpha.32", "lodash": "^4.17.21", "svelte": "^3.46.2" }, diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 9a3cfdaeae..e079a651db 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.44-alpha.31", + "version": "2.4.44-alpha.32", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 92478ab988..410be0951b 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.31", + "version": "2.4.44-alpha.32", "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.31", - "@budibase/client": "2.4.44-alpha.31", + "@budibase/backend-core": "2.4.44-alpha.32", + "@budibase/client": "2.4.44-alpha.32", "@budibase/pro": "2.4.44-alpha.31", - "@budibase/shared-core": "2.4.44-alpha.31", - "@budibase/string-templates": "2.4.44-alpha.31", - "@budibase/types": "2.4.44-alpha.31", + "@budibase/shared-core": "2.4.44-alpha.32", + "@budibase/string-templates": "2.4.44-alpha.32", + "@budibase/types": "2.4.44-alpha.32", "@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 844292a60f..da4144bd58 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.31", + "version": "2.4.44-alpha.32", "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.31" + "@budibase/types": "2.4.44-alpha.32" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index a06e4bc127..0c30e58f12 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.31", + "version": "2.4.44-alpha.32", "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 bd9a370135..b399094c3a 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.44-alpha.31", + "version": "2.4.44-alpha.32", "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 bf15329c53..d026941859 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.31", + "version": "2.4.44-alpha.32", "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.31", + "@budibase/backend-core": "2.4.44-alpha.32", "@budibase/pro": "2.4.44-alpha.31", - "@budibase/string-templates": "2.4.44-alpha.31", - "@budibase/types": "2.4.44-alpha.31", + "@budibase/string-templates": "2.4.44-alpha.32", + "@budibase/types": "2.4.44-alpha.32", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 07f29bd8bae0209620a01aac4f1fd6543236ef37 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 14 Apr 2023 13:17:24 +0000 Subject: [PATCH 60/91] Update pro version to 2.4.44-alpha.32 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 59 ++++-------------------------------- 3 files changed, 8 insertions(+), 55 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 410be0951b..bbfa592b43 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.32", "@budibase/client": "2.4.44-alpha.32", - "@budibase/pro": "2.4.44-alpha.31", + "@budibase/pro": "2.4.44-alpha.32", "@budibase/shared-core": "2.4.44-alpha.32", "@budibase/string-templates": "2.4.44-alpha.32", "@budibase/types": "2.4.44-alpha.32", diff --git a/packages/worker/package.json b/packages/worker/package.json index d026941859..54e4c15bbe 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.32", - "@budibase/pro": "2.4.44-alpha.31", + "@budibase/pro": "2.4.44-alpha.32", "@budibase/string-templates": "2.4.44-alpha.32", "@budibase/types": "2.4.44-alpha.32", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 6581043913..b3ff622673 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1386,46 +1386,6 @@ 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.27": - version "2.4.44-alpha.27" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.44-alpha.27.tgz#31d0b1cf11b8a5d5c7dbaf1d7c98c72e9fc7adec" - integrity sha512-BjM135jwTDKynlBBeHyU0KsuYrRtH1+JEhqi7JqdkAIvI5LHsUtq7F8hETy9rqFNcQow9/0QV4Fgkf1z18G84A== - dependencies: - "@budibase/nano" "10.1.2" - "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "2.4.44-alpha.27" - "@shopify/jest-koa-mocks" "5.0.1" - "@techpass/passport-openidconnect" "0.3.2" - aws-cloudfront-sign "2.2.0" - aws-sdk "2.1030.0" - bcrypt "5.0.1" - bcryptjs "2.4.3" - bull "4.10.1" - correlation-id "4.0.0" - dotenv "16.0.1" - emitter-listener "1.1.2" - ioredis "4.28.0" - joi "17.6.0" - jsonwebtoken "9.0.0" - koa-passport "4.1.4" - koa-pino-logger "4.0.0" - lodash "4.17.21" - lodash.isarguments "3.1.0" - node-fetch "2.6.7" - passport-google-oauth "2.0.0" - passport-jwt "4.0.0" - passport-local "1.0.0" - passport-oauth2-refresh "^2.1.0" - posthog-node "1.3.0" - pouchdb "7.3.0" - pouchdb-find "7.2.2" - redlock "4.2.0" - sanitize-s3-objectkey "0.0.1" - semver "7.3.7" - tar-fs "2.1.1" - uuid "8.3.2" - zlib "1.0.5" - "@budibase/bbui@^0.9.139": version "0.9.190" resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.190.tgz#e1ec400ac90f556bfbc80fc23a04506f1585ea81" @@ -1526,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.44-alpha.27": - version "2.4.44-alpha.27" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.27.tgz#8fbd7a6fb77604cbf48a27619cc04de189fad136" - integrity sha512-6uw7Avzw6B/0Ab/YxuixuFcg9jqzdrLTMSkDCNsUT0pz7ZJUX5UroFDfJij485haGrNjk7GP7qQiayne0z5vQA== +"@budibase/pro@2.4.44-alpha.31": + version "2.4.44-alpha.31" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.31.tgz#088180b19b1670762b29c2dacc1d971cda6dd7af" + integrity sha512-pLB8U9742c+VHU7pxc9udqodw1JHKZGnOYWgUKN70KyOkdIi5LadEOlQCOd1mNwn/4siIKPAFLEguEraRhn8+w== dependencies: - "@budibase/backend-core" "2.4.44-alpha.27" + "@budibase/backend-core" "2.4.44-alpha.31" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.4.44-alpha.27" + "@budibase/types" "2.4.44-alpha.31" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1587,13 +1547,6 @@ 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.27": - version "2.4.44-alpha.27" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.27.tgz#a92464d08bfa2a686ba7107febd32dcf1f6d5328" - integrity sha512-tcC/NAy4gYA9p1BuHLwc2cynNAy0Qfwd+6dJd+tgNHEJ4lvFBy5HKm4wOdWu2elxWjdTUne4JFC6nB3Cbld7sQ== - dependencies: - scim-patch "^0.7.0" - "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" From 1301b23f028d7564c8e0f88885d18a47c12feb05 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 14 Apr 2023 14:36:06 +0100 Subject: [PATCH 61/91] Add group filter fetch --- .../src/api/routes/global/tests/scim.spec.ts | 15 +++++++++++++++ 1 file changed, 15 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 3352951152..77e9cbea26 100644 --- a/packages/worker/src/api/routes/global/tests/scim.spec.ts +++ b/packages/worker/src/api/routes/global/tests/scim.spec.ts @@ -585,6 +585,21 @@ describe("scim", () => { totalResults: groupCount, }) }) + + it("can fetch groups using displayName filters", async () => { + const groupToFetch = _.sample(groups) + const response = await getScimGroups({ + params: { filter: `displayName eq "${groupToFetch!.displayName}"` }, + }) + + expect(response).toEqual({ + Resources: [groupToFetch], + itemsPerPage: 1, + schemas: ["urn:ietf:params:scim:api:messages:2.0:ListResponse"], + startIndex: 1, + totalResults: 1, + }) + }) }) }) From ce2a610c00b112886a45e412e6850f21b7ee14d5 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 14 Apr 2023 14:48:48 +0100 Subject: [PATCH 62/91] Test exclude members --- .../src/api/routes/global/tests/scim.spec.ts | 19 +++++++++++++++++++ 1 file changed, 19 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 77e9cbea26..91675a12b8 100644 --- a/packages/worker/src/api/routes/global/tests/scim.spec.ts +++ b/packages/worker/src/api/routes/global/tests/scim.spec.ts @@ -600,6 +600,25 @@ describe("scim", () => { totalResults: 1, }) }) + + it("can fetch groups excluding members", async () => { + const response = await getScimGroups({ + params: { excludedAttributes: "members" }, + }) + + expect(response).toEqual({ + Resources: expect.arrayContaining( + groups.map(g => { + const { members, ...groupData } = g + return groupData + }) + ), + itemsPerPage: 25, + schemas: ["urn:ietf:params:scim:api:messages:2.0:ListResponse"], + startIndex: 1, + totalResults: groupCount, + }) + }) }) }) From f3e62958927791c92cc1d8cf9e584787fc346007 Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 14 Apr 2023 14:50:44 +0100 Subject: [PATCH 63/91] Add tests --- .../src/api/routes/global/tests/scim.spec.ts | 19 +++++++++++++++++++ packages/worker/src/tests/api/scim/groups.ts | 4 ++++ 2 files changed, 23 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 91675a12b8..4381d86c7f 100644 --- a/packages/worker/src/api/routes/global/tests/scim.spec.ts +++ b/packages/worker/src/api/routes/global/tests/scim.spec.ts @@ -619,6 +619,25 @@ describe("scim", () => { totalResults: groupCount, }) }) + + it("can fetch groups excluding multiple fields", async () => { + const response = await getScimGroups({ + params: { excludedAttributes: "members,displayName" }, + }) + + expect(response).toEqual({ + Resources: expect.arrayContaining( + groups.map(g => { + const { members, displayName, ...groupData } = g + return groupData + }) + ), + itemsPerPage: 25, + schemas: ["urn:ietf:params:scim:api:messages:2.0:ListResponse"], + startIndex: 1, + totalResults: groupCount, + }) + }) }) }) diff --git a/packages/worker/src/tests/api/scim/groups.ts b/packages/worker/src/tests/api/scim/groups.ts index 96ff9aeb67..c494036530 100644 --- a/packages/worker/src/tests/api/scim/groups.ts +++ b/packages/worker/src/tests/api/scim/groups.ts @@ -18,6 +18,7 @@ export class ScimGroupsAPI extends ScimTestAPI { startIndex?: number pageSize?: number filter?: string + excludedAttributes?: string } } ) => { @@ -32,6 +33,9 @@ export class ScimGroupsAPI extends ScimTestAPI { if (params?.filter) { url += `filter=${params.filter}&` } + if (params?.excludedAttributes) { + url += `excludedAttributes=${params.excludedAttributes}&` + } const res = await this.call(url, "get", requestSettings) return res.body as ScimGroupListResponse } From c83cf33707f9df318c6def4c7dc73f4b3c76a73a Mon Sep 17 00:00:00 2001 From: adrinr Date: Fri, 14 Apr 2023 15:14:41 +0100 Subject: [PATCH 64/91] Test get group without members --- .../worker/src/api/routes/global/tests/scim.spec.ts | 10 ++++++++++ packages/worker/src/tests/api/scim/groups.ts | 7 +++++-- 2 files changed, 15 insertions(+), 2 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 4381d86c7f..db47493685 100644 --- a/packages/worker/src/api/routes/global/tests/scim.spec.ts +++ b/packages/worker/src/api/routes/global/tests/scim.spec.ts @@ -715,6 +715,16 @@ describe("scim", () => { status: 404, }) }) + + it("should allow excluding members", async () => { + const response = await findScimGroup(group.id, { + qs: "excludedAttributes=members", + }) + + const { members, ...expectedResponse } = group + + expect(response).toEqual(expectedResponse) + }) }) describe("DELETE /api/global/scim/v2/groups/:id", () => { diff --git a/packages/worker/src/tests/api/scim/groups.ts b/packages/worker/src/tests/api/scim/groups.ts index c494036530..d2df007614 100644 --- a/packages/worker/src/tests/api/scim/groups.ts +++ b/packages/worker/src/tests/api/scim/groups.ts @@ -58,9 +58,12 @@ export class ScimGroupsAPI extends ScimTestAPI { return res.body as ScimGroupResponse } - find = async (id: string, requestSettings?: Partial) => { + find = async ( + id: string, + requestSettings?: Partial & { qs?: string } + ) => { const res = await this.call( - `/api/global/scim/v2/groups/${id}`, + `/api/global/scim/v2/groups/${id}?${requestSettings?.qs}`, "get", requestSettings ) From 7d8c6849bbc06248d09742925fa29004c7beaa03 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 14 Apr 2023 17:32:33 +0100 Subject: [PATCH 65/91] Fixing merge conflict. --- packages/server/package.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 28781c0a36..d377ddfa52 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -115,11 +115,7 @@ "to-json-schema": "0.2.5", "uuid": "3.3.2", "validate.js": "0.13.1", -<<<<<<< HEAD "vm2": "3.9.16", -======= - "vm2": "^3.9.15", ->>>>>>> f45da9ccfde1fedb83ec757e64fb972b510c67d6 "worker-farm": "1.7.0", "xml2js": "0.5.0", "yargs": "13.2.4", From fc756a3944dd6491cf49b41297be4b46c3c0f295 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 14 Apr 2023 17:33:32 +0100 Subject: [PATCH 66/91] Updating yarn lock. --- yarn.lock | 41 +++++++++++++---------------------------- 1 file changed, 13 insertions(+), 28 deletions(-) diff --git a/yarn.lock b/yarn.lock index 83af47731f..c84f28b254 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.44-alpha.25": - version "2.4.44-alpha.25" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.44-alpha.25.tgz#5579e1dbcf609b10a3fb8d11a30d9654597ef2e4" - integrity sha512-LbNCi2D6ZVXJo6nsU2g6zGMTBDY2d57oFi8PaBepZP1azHtBsGBwG0+tnGuNy7FxgtA7UMIOUkGpVH8k30MjlQ== +"@budibase/pro@2.5.4": + version "2.5.4" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.4.tgz#9368117a41b276ec97d3994e3ec67d9f2570a5bc" + integrity sha512-xPNVlRFTcjpWn+oZCvrfgDd9SoslkUgJsS2Bnff+qDoWcTFz30KoOyZPAkSwXxX3Y8FmZRO9csl0AZa9TsUs7A== dependencies: - "@budibase/backend-core" "2.4.44-alpha.25" - "@budibase/shared-core" "2.4.44-alpha.1" - "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.4.44-alpha.25" + "@budibase/backend-core" "2.5.4" + "@budibase/string-templates" "2.3.20" + "@budibase/types" "2.5.4" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1502,15 +1501,6 @@ lru-cache "^7.14.1" memorystream "^0.3.1" node-fetch "^2.6.1" - scim-patch "^0.7.0" - scim2-parse-filter "^0.2.8" - -"@budibase/shared-core@2.4.44-alpha.1": - version "2.4.44-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/shared-core/-/shared-core-2.4.44-alpha.1.tgz#3d499e40e7e6c646e13a87cd08e01ba116c2ff1d" - integrity sha512-cN8LaDczijtsfWUYiXC4sg9Z+US4020i3Mb8TwCbf8TQyA1b06U5PwPCp+GHVA/wDFqfwcpcE1GXf8GwVuYs7A== - dependencies: - "@budibase/types" "2.4.44-alpha.1" "@budibase/standard-components@^0.9.139": version "0.9.139" @@ -1530,10 +1520,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/string-templates@2.4.44-alpha.1": - version "2.4.44-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.4.44-alpha.1.tgz#6c2aee594d16eac1f173c509e087a817dd3172f0" - integrity sha512-4gC2+0kccK0ilLnd0i/dmJzC0Ur7UgSAmV6zbzDDYNL4spU0qSy5VhBh7E3qKieg5RKMMzbpXLMWERpoPLlnqA== +"@budibase/string-templates@2.3.20": + version "2.3.20" + resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.3.20.tgz#35f74b6f515e8127cc375ee0a4679b0a7c117588" + integrity sha512-wMKau3IzVF6M+dRu99aKV1yMdrrK5lghVm9qYtR1B163SMbHEwC8JmZFGPLIi1XsG0T+vw+xfcemfJ2zcATWwg== dependencies: "@budibase/handlebars-helpers" "^0.11.8" dayjs "^1.10.4" @@ -1542,11 +1532,6 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.44-alpha.1": - version "2.4.44-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.1.tgz#1679657aa180d9c59afa1dffa611bff0638bd933" - integrity sha512-Sq+8HfM75EBMoOvKYFwELdlxmVN6wNZMofDjT/2G+9aF+Zfe5Tzw69C+unmdBgcGGjGCHEYWSz4mF0v8FPAGbg== - "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" @@ -21184,7 +21169,7 @@ scim-patch@^0.7.0: fast-deep-equal "3.1.3" scim2-parse-filter "0.2.8" -scim2-parse-filter@0.2.8, scim2-parse-filter@^0.2.8: +scim2-parse-filter@0.2.8: version "0.2.8" resolved "https://registry.yarnpkg.com/scim2-parse-filter/-/scim2-parse-filter-0.2.8.tgz#12e836514b9a55ae51218dd6e7fbea91daccfa4d" integrity sha512-1V+6FIMIiP+gDiFkC3dIw86KfoXhnQRXhfPaiQImeeFukpLtEkTtYq/Vmy1yDgHQcIHQxQQqOWyGLKX0FTvvaA== @@ -23902,7 +23887,7 @@ vlq@^0.2.2: resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26" integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow== -vm2@3.9.16, vm2@^3.9.11, vm2@^3.9.4: +vm2@3.9.16, vm2@^3.9.11, vm2@^3.9.15, vm2@^3.9.4: version "3.9.16" resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.16.tgz#0fbc2a265f7bf8b837cea6f4a908f88a3f93b8e6" integrity sha512-3T9LscojNTxdOyG+e8gFeyBXkMlOBYDoF6dqZbj+MPVHi9x10UfiTAJIobuchRCp3QvC+inybTbMJIUrLsig0w== From 8e87a5e7006f33da5c688fc8b8f4f13385bfa58f Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 14 Apr 2023 16:45:33 +0000 Subject: [PATCH 67/91] v2.5.5-alpha.0 --- 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 73ae4e4f6e..78a218fcd4 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.4", + "version": "2.5.5-alpha.0", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 9ca36c5d83..730acda357 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.4", + "version": "2.5.5-alpha.0", "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.5.4", + "@budibase/types": "2.5.5-alpha.0", "@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 e8db77cd38..fd05734559 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.5.4", + "version": "2.5.5-alpha.0", "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.5.4", - "@budibase/string-templates": "^2.5.4", + "@budibase/shared-core": "2.5.5-alpha.0", + "@budibase/string-templates": "2.5.5-alpha.0", "@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 622f38cd4d..21fe404b0e 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.4", + "version": "2.5.5-alpha.0", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "^2.5.4", - "@budibase/client": "^2.5.4", - "@budibase/frontend-core": "^2.5.4", - "@budibase/shared-core": "^2.5.4", - "@budibase/string-templates": "^2.5.4", + "@budibase/bbui": "2.5.5-alpha.0", + "@budibase/client": "2.5.5-alpha.0", + "@budibase/frontend-core": "2.5.5-alpha.0", + "@budibase/shared-core": "2.5.5-alpha.0", + "@budibase/string-templates": "2.5.5-alpha.0", "@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 bb4791592c..0e23763c20 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.4", + "version": "2.5.5-alpha.0", "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.5.4", - "@budibase/string-templates": "^2.5.4", - "@budibase/types": "^2.5.4", + "@budibase/backend-core": "2.5.5-alpha.0", + "@budibase/string-templates": "2.5.5-alpha.0", + "@budibase/types": "2.5.5-alpha.0", "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 3f0edbf7c7..2829e358ba 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.4", + "version": "2.5.5-alpha.0", "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.5.4", - "@budibase/frontend-core": "^2.5.4", - "@budibase/shared-core": "^2.5.4", - "@budibase/string-templates": "^2.5.4", - "@budibase/types": "^2.5.4", + "@budibase/bbui": "2.5.5-alpha.0", + "@budibase/frontend-core": "2.5.5-alpha.0", + "@budibase/shared-core": "2.5.5-alpha.0", + "@budibase/string-templates": "2.5.5-alpha.0", + "@budibase/types": "2.5.5-alpha.0", "@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 96bbb02e80..4a6004b0ed 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.4", + "version": "2.5.5-alpha.0", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.5.4", - "@budibase/shared-core": "^2.5.4", + "@budibase/bbui": "2.5.5-alpha.0", + "@budibase/shared-core": "2.5.5-alpha.0", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index c564c8f8b1..ba187295d0 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.4", + "version": "2.5.5-alpha.0", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index d377ddfa52..6208bd4881 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.4", + "version": "2.5.5-alpha.0", "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.5.4", - "@budibase/client": "^2.5.4", + "@budibase/backend-core": "2.5.5-alpha.0", + "@budibase/client": "2.5.5-alpha.0", "@budibase/pro": "2.5.4", - "@budibase/shared-core": "^2.5.4", - "@budibase/string-templates": "^2.5.4", - "@budibase/types": "^2.5.4", + "@budibase/shared-core": "2.5.5-alpha.0", + "@budibase/string-templates": "2.5.5-alpha.0", + "@budibase/types": "2.5.5-alpha.0", "@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 dba357b7b0..c97a166216 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.4", + "version": "2.5.5-alpha.0", "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.5.4" + "@budibase/types": "2.5.5-alpha.0" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 58d6819113..1e266fe96a 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.4", + "version": "2.5.5-alpha.0", "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 e4c62c4b3d..d79739bc90 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.4", + "version": "2.5.5-alpha.0", "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 e56bd52848..3ef2112ae9 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.4", + "version": "2.5.5-alpha.0", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.5.4", + "@budibase/backend-core": "2.5.5-alpha.0", "@budibase/pro": "2.5.4", - "@budibase/string-templates": "^2.5.4", - "@budibase/types": "^2.5.4", + "@budibase/string-templates": "2.5.5-alpha.0", + "@budibase/types": "2.5.5-alpha.0", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From b1b5dae8811cb28fe8679a1eefb8221b1d5b8d8a Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 14 Apr 2023 16:47:22 +0000 Subject: [PATCH 68/91] Update pro version to 2.5.5-alpha.0 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 6208bd4881..65e79ba7b7 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.5.5-alpha.0", "@budibase/client": "2.5.5-alpha.0", - "@budibase/pro": "2.5.4", + "@budibase/pro": "2.5.5-alpha.0", "@budibase/shared-core": "2.5.5-alpha.0", "@budibase/string-templates": "2.5.5-alpha.0", "@budibase/types": "2.5.5-alpha.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 3ef2112ae9..efefa541a9 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.5-alpha.0", - "@budibase/pro": "2.5.4", + "@budibase/pro": "2.5.5-alpha.0", "@budibase/string-templates": "2.5.5-alpha.0", "@budibase/types": "2.5.5-alpha.0", "@koa/router": "8.0.8", From 09ccac12aefe57e212bf9cf71672cc51cc2ada84 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 14 Apr 2023 17:56:17 +0100 Subject: [PATCH 69/91] Fix for default values with NOT NULL requirements being intepreted as requiring values in the frontend, presence check is now ignored if a default or auto value is found. --- packages/server/scripts/integrations/mysql/init.sql | 2 +- .../server/scripts/integrations/postgres/init.sql | 1 + .../server/src/integrations/microsoftSqlServer.ts | 6 ++++-- packages/server/src/integrations/mysql.ts | 8 +++++--- packages/server/src/integrations/postgres.ts | 12 +++++++----- 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/packages/server/scripts/integrations/mysql/init.sql b/packages/server/scripts/integrations/mysql/init.sql index 15269f2f41..ae5cd07788 100644 --- a/packages/server/scripts/integrations/mysql/init.sql +++ b/packages/server/scripts/integrations/mysql/init.sql @@ -3,7 +3,7 @@ USE main; CREATE TABLE Persons ( PersonID int NOT NULL AUTO_INCREMENT, CreatedAt datetime, - Age float, + Age float DEFAULT 20 NOT NULL, LastName varchar(255), FirstName varchar(255), Address varchar(255), diff --git a/packages/server/scripts/integrations/postgres/init.sql b/packages/server/scripts/integrations/postgres/init.sql index 78af4c20b9..057944101a 100644 --- a/packages/server/scripts/integrations/postgres/init.sql +++ b/packages/server/scripts/integrations/postgres/init.sql @@ -8,6 +8,7 @@ CREATE TABLE Persons ( FirstName varchar(255), Address varchar(255), City varchar(255) DEFAULT 'Belfast', + Age INTEGER DEFAULT 20 NOT NULL, Type person_job ); CREATE TABLE Tasks ( diff --git a/packages/server/src/integrations/microsoftSqlServer.ts b/packages/server/src/integrations/microsoftSqlServer.ts index 2da190df5e..87da1ae81e 100644 --- a/packages/server/src/integrations/microsoftSqlServer.ts +++ b/packages/server/src/integrations/microsoftSqlServer.ts @@ -243,11 +243,13 @@ class SqlServerIntegration extends Sql implements DatasourcePlus { if (typeof name !== "string") { continue } + const isAuto = !!autoColumns.find(col => col === name) + const required = !!requiredColumns.find(col => col === name) schema[name] = { - autocolumn: !!autoColumns.find(col => col === name), + autocolumn: isAuto, name: name, constraints: { - presence: requiredColumns.find(col => col === name), + presence: required && !isAuto, }, ...convertSqlType(def.DATA_TYPE), externalType: def.DATA_TYPE, diff --git a/packages/server/src/integrations/mysql.ts b/packages/server/src/integrations/mysql.ts index 080939593f..8d984ed402 100644 --- a/packages/server/src/integrations/mysql.ts +++ b/packages/server/src/integrations/mysql.ts @@ -229,13 +229,15 @@ class MySQLIntegration extends Sql implements DatasourcePlus { if (column.Key === "PRI" && primaryKeys.indexOf(column.Key) === -1) { primaryKeys.push(columnName) } - const constraints = { - presence: column.Null !== "YES", - } + const hasDefault = column.Default != null const isAuto: boolean = typeof column.Extra === "string" && (column.Extra === "auto_increment" || column.Extra.toLowerCase().includes("generated")) + const required = column.Null !== "YES" + const constraints = { + presence: required && !isAuto && !hasDefault, + } schema[columnName] = { name: columnName, autocolumn: isAuto, diff --git a/packages/server/src/integrations/postgres.ts b/packages/server/src/integrations/postgres.ts index eba0d3691d..c981c3acc5 100644 --- a/packages/server/src/integrations/postgres.ts +++ b/packages/server/src/integrations/postgres.ts @@ -262,15 +262,17 @@ class PostgresIntegration extends Sql implements DatasourcePlus { column.identity_start || column.identity_increment ) - const constraints = { - presence: column.is_nullable === "NO", - } - const hasDefault = + const hasDefault = column.column_default != null + const hasNextVal = typeof column.column_default === "string" && column.column_default.startsWith("nextval") const isGenerated = column.is_generated && column.is_generated !== "NEVER" - const isAuto: boolean = hasDefault || identity || isGenerated + const isAuto: boolean = hasNextVal || identity || isGenerated + const required = column.is_nullable === "NO" + const constraints = { + presence: required && !hasDefault && !isGenerated, + } tables[tableName].schema[columnName] = { autocolumn: isAuto, name: columnName, From c552913737de15ec158493fedadc6221b835dc1d Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 14 Apr 2023 18:10:10 +0100 Subject: [PATCH 70/91] Fixing defaults in MS-SQL as well. --- .../integrations/mssql/data/entrypoint.sh | 1 + .../scripts/integrations/mssql/data/setup.sql | 34 +++++++++---------- .../src/integrations/microsoftSqlServer.ts | 3 +- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/packages/server/scripts/integrations/mssql/data/entrypoint.sh b/packages/server/scripts/integrations/mssql/data/entrypoint.sh index 04780d085e..ffe8d2cd5d 100644 --- a/packages/server/scripts/integrations/mssql/data/entrypoint.sh +++ b/packages/server/scripts/integrations/mssql/data/entrypoint.sh @@ -11,6 +11,7 @@ if [ "$1" = '/opt/mssql/bin/sqlservr' ]; then echo "RUNNING BUDIBASE SETUP" + cat setup.sql #run the setup script to create the DB and the schema in the DB /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P Passw0rd -i setup.sql diff --git a/packages/server/scripts/integrations/mssql/data/setup.sql b/packages/server/scripts/integrations/mssql/data/setup.sql index 91c53cced7..a33a99cea5 100644 --- a/packages/server/scripts/integrations/mssql/data/setup.sql +++ b/packages/server/scripts/integrations/mssql/data/setup.sql @@ -34,7 +34,7 @@ GO CREATE TABLE people ( name varchar(30) NOT NULL, - age varchar(20), + age int default 20 NOT NULL, CONSTRAINT pk_people PRIMARY KEY NONCLUSTERED (name, age) ); @@ -50,22 +50,22 @@ VALUES ('Processing', 1); INSERT INTO people (name, age) -VALUES ('Bob', '30'), - ('Bert', '10'), - ('Jack', '12'), - ('Mike', '31'), - ('Dave', '44'), - ('Jim', '43'), - ('Kerry', '32'), - ('Julie', '12'), - ('Kim', '55'), - ('Andy', '33'), - ('John', '22'), - ('Ruth', '66'), - ('Robert', '88'), - ('Bobert', '99'), - ('Jan', '22'), - ('Megan', '11'); +VALUES ('Bob', 30), + ('Bert', 10), + ('Jack', 12), + ('Mike', 31), + ('Dave', 44), + ('Jim', 43), + ('Kerry', 32), + ('Julie', 12), + ('Kim', 55), + ('Andy', 33), + ('John', 22), + ('Ruth', 66), + ('Robert', 88), + ('Bobert', 99), + ('Jan', 22), + ('Megan', 11); IF OBJECT_ID ('Chains.sizes', 'U') IS NOT NULL diff --git a/packages/server/src/integrations/microsoftSqlServer.ts b/packages/server/src/integrations/microsoftSqlServer.ts index 87da1ae81e..eb87c1ccf1 100644 --- a/packages/server/src/integrations/microsoftSqlServer.ts +++ b/packages/server/src/integrations/microsoftSqlServer.ts @@ -243,13 +243,14 @@ class SqlServerIntegration extends Sql implements DatasourcePlus { if (typeof name !== "string") { continue } + const hasDefault = def.COLUMN_DEFAULT const isAuto = !!autoColumns.find(col => col === name) const required = !!requiredColumns.find(col => col === name) schema[name] = { autocolumn: isAuto, name: name, constraints: { - presence: required && !isAuto, + presence: required && !isAuto && !hasDefault, }, ...convertSqlType(def.DATA_TYPE), externalType: def.DATA_TYPE, From ef5bcc4b6661cd0807ed5ba3f9bb09e6084fa5aa Mon Sep 17 00:00:00 2001 From: Michael Drury Date: Sat, 15 Apr 2023 00:37:22 +0100 Subject: [PATCH 71/91] Main body of PR comments, switching event handling to be a publisher of async events, a generic event; then adding a new async document update processor, which can later be converted to be part of the event processing pipeline. --- packages/backend-core/src/docUpdates/index.ts | 30 ++++++++- .../backend-core/src/docUpdates/updates.ts | 62 ------------------- .../src/events/asyncEvents/index.ts | 2 + .../src/events/asyncEvents/publisher.ts | 12 ++++ .../src/events/asyncEvents/queue.ts | 22 +++++++ .../backend-core/src/events/documentId.ts | 56 +++++++++++++++++ packages/backend-core/src/events/events.ts | 12 +++- packages/backend-core/src/events/index.ts | 2 + .../processors/DocumentUpdateProcessor.ts | 42 ------------- .../src/events/processors/Processors.ts | 12 +++- .../async/DocumentUpdateProcessor.ts | 44 +++++++++++++ .../src/events/processors/index.ts | 3 - .../src/events/processors/types.ts | 6 +- packages/server/src/events/docUpdates.ts | 42 +++++++++++++ packages/server/src/events/index.ts | 1 + .../server/src/sdk/app/applications/sync.ts | 32 +--------- .../sdk/app/applications/tests/sync.spec.ts | 4 +- packages/server/src/startup.ts | 4 +- packages/types/src/sdk/events/event.ts | 8 ++- 19 files changed, 245 insertions(+), 151 deletions(-) delete mode 100644 packages/backend-core/src/docUpdates/updates.ts create mode 100644 packages/backend-core/src/events/asyncEvents/index.ts create mode 100644 packages/backend-core/src/events/asyncEvents/publisher.ts create mode 100644 packages/backend-core/src/events/asyncEvents/queue.ts create mode 100644 packages/backend-core/src/events/documentId.ts delete mode 100644 packages/backend-core/src/events/processors/DocumentUpdateProcessor.ts create mode 100644 packages/backend-core/src/events/processors/async/DocumentUpdateProcessor.ts create mode 100644 packages/server/src/events/docUpdates.ts diff --git a/packages/backend-core/src/docUpdates/index.ts b/packages/backend-core/src/docUpdates/index.ts index c6c80aad8a..3971f8de12 100644 --- a/packages/backend-core/src/docUpdates/index.ts +++ b/packages/backend-core/src/docUpdates/index.ts @@ -1 +1,29 @@ -export * from "./updates" +import { asyncEventQueue, init as initQueue } from "../events/asyncEvents" +import { + ProcessorMap, + default as DocumentUpdateProcessor, +} from "../events/processors/async/DocumentUpdateProcessor" + +let processingPromise: Promise +let documentProcessor: DocumentUpdateProcessor + +export function init(processors: ProcessorMap) { + if (!asyncEventQueue) { + initQueue() + } + if (!documentProcessor) { + documentProcessor = new DocumentUpdateProcessor(processors) + } + // if not processing in this instance, kick it off + if (!processingPromise) { + processingPromise = asyncEventQueue.process(async job => { + const { event, identity, properties, timestamp } = job.data + await documentProcessor.processEvent( + event, + identity, + properties, + timestamp + ) + }) + } +} diff --git a/packages/backend-core/src/docUpdates/updates.ts b/packages/backend-core/src/docUpdates/updates.ts deleted file mode 100644 index 478d29f4eb..0000000000 --- a/packages/backend-core/src/docUpdates/updates.ts +++ /dev/null @@ -1,62 +0,0 @@ -import { createQueue, JobQueue } from "../queue" -import BullQueue from "bull" -import { DocumentType, SEPARATOR } from "../constants" -import { doInContext, doInTenant } from "../context" - -type DocUpdateEvent = { - id: string - tenantId: string - appId?: string -} - -type Processor = (update: DocUpdateEvent) => Promise - -const processors: { types: DocumentType[]; processor: Processor }[] = [] -let queue: BullQueue.Queue -let processingPromise: Promise - -export function init() { - queue = createQueue(JobQueue.DOC_UPDATE) -} - -export async function shutdown() { - if (queue) { - await queue.close() - } -} - -export async function update(opts: DocUpdateEvent) { - if (!queue) { - init() - } - await queue.add(opts) -} - -async function handleJob(data: DocUpdateEvent) { - for (let { types, processor } of processors) { - if (types.find(type => data.id.startsWith(`${type}${SEPARATOR}`))) { - const context = data.appId || data.tenantId - const contextFn = data.appId ? doInContext : doInTenant - await contextFn(context, async () => { - await processor(data) - }) - } - } -} - -export async function process(types: DocumentType[], processor: Processor) { - if (!queue) { - init() - } - // add to processor list - processors.push({ - types, - processor, - }) - // if not processing in this instance, kick it off - if (!processingPromise) { - processingPromise = queue.process(async job => { - await handleJob(job.data) - }) - } -} diff --git a/packages/backend-core/src/events/asyncEvents/index.ts b/packages/backend-core/src/events/asyncEvents/index.ts new file mode 100644 index 0000000000..65f7f8f58b --- /dev/null +++ b/packages/backend-core/src/events/asyncEvents/index.ts @@ -0,0 +1,2 @@ +export * from "./queue" +export * from "./publisher" diff --git a/packages/backend-core/src/events/asyncEvents/publisher.ts b/packages/backend-core/src/events/asyncEvents/publisher.ts new file mode 100644 index 0000000000..4e44c4ddc5 --- /dev/null +++ b/packages/backend-core/src/events/asyncEvents/publisher.ts @@ -0,0 +1,12 @@ +import { AsyncEvents } from "@budibase/types" +import { EventPayload, asyncEventQueue, init } from "./queue" + +export async function publishAsyncEvent(payload: EventPayload) { + if (!asyncEventQueue) { + init() + } + const { event, identity } = payload + if (AsyncEvents.indexOf(event) !== -1 && identity.tenantId) { + await asyncEventQueue.add(payload) + } +} diff --git a/packages/backend-core/src/events/asyncEvents/queue.ts b/packages/backend-core/src/events/asyncEvents/queue.ts new file mode 100644 index 0000000000..c0b9b368b8 --- /dev/null +++ b/packages/backend-core/src/events/asyncEvents/queue.ts @@ -0,0 +1,22 @@ +import BullQueue from "bull" +import { createQueue, JobQueue } from "../../queue" +import { Event, Identity } from "@budibase/types" + +export interface EventPayload { + event: Event + identity: Identity + properties: any + timestamp?: string | number +} + +export let asyncEventQueue: BullQueue.Queue + +export function init() { + asyncEventQueue = createQueue(JobQueue.DOC_UPDATE) +} + +export async function shutdown() { + if (asyncEventQueue) { + await asyncEventQueue.close() + } +} diff --git a/packages/backend-core/src/events/documentId.ts b/packages/backend-core/src/events/documentId.ts new file mode 100644 index 0000000000..887e56f07b --- /dev/null +++ b/packages/backend-core/src/events/documentId.ts @@ -0,0 +1,56 @@ +import { + Event, + UserCreatedEvent, + UserUpdatedEvent, + UserDeletedEvent, + UserPermissionAssignedEvent, + UserPermissionRemovedEvent, + GroupCreatedEvent, + GroupUpdatedEvent, + GroupDeletedEvent, + GroupUsersAddedEvent, + GroupUsersDeletedEvent, + GroupPermissionsEditedEvent, +} from "@budibase/types" + +const getEventProperties: Record< + string, + (properties: any) => string | undefined +> = { + [Event.USER_CREATED]: (properties: UserCreatedEvent) => properties.userId, + [Event.USER_UPDATED]: (properties: UserUpdatedEvent) => properties.userId, + [Event.USER_DELETED]: (properties: UserDeletedEvent) => properties.userId, + [Event.USER_PERMISSION_ADMIN_ASSIGNED]: ( + properties: UserPermissionAssignedEvent + ) => properties.userId, + [Event.USER_PERMISSION_ADMIN_REMOVED]: ( + properties: UserPermissionRemovedEvent + ) => properties.userId, + [Event.USER_PERMISSION_BUILDER_ASSIGNED]: ( + properties: UserPermissionAssignedEvent + ) => properties.userId, + [Event.USER_PERMISSION_BUILDER_REMOVED]: ( + properties: UserPermissionRemovedEvent + ) => properties.userId, + [Event.USER_GROUP_CREATED]: (properties: GroupCreatedEvent) => + properties.groupId, + [Event.USER_GROUP_UPDATED]: (properties: GroupUpdatedEvent) => + properties.groupId, + [Event.USER_GROUP_DELETED]: (properties: GroupDeletedEvent) => + properties.groupId, + [Event.USER_GROUP_USERS_ADDED]: (properties: GroupUsersAddedEvent) => + properties.groupId, + [Event.USER_GROUP_USERS_REMOVED]: (properties: GroupUsersDeletedEvent) => + properties.groupId, + [Event.USER_GROUP_PERMISSIONS_EDITED]: ( + properties: GroupPermissionsEditedEvent + ) => properties.groupId, +} + +export function getDocumentId(event: Event, properties: any) { + const extractor = getEventProperties[event] + if (!extractor) { + throw new Error("Event does not have a method of document ID extraction") + } + return extractor(properties) +} diff --git a/packages/backend-core/src/events/events.ts b/packages/backend-core/src/events/events.ts index c2f7cf66ec..12cef21dff 100644 --- a/packages/backend-core/src/events/events.ts +++ b/packages/backend-core/src/events/events.ts @@ -1,7 +1,8 @@ -import { Event, AuditedEventFriendlyName } from "@budibase/types" +import { Event } from "@budibase/types" import { processors } from "./processors" import identification from "./identification" import * as backfill from "./backfill" +import { publishAsyncEvent } from "./asyncEvents" export const publishEvent = async ( event: Event, @@ -12,6 +13,15 @@ export const publishEvent = async ( const identity = await identification.getCurrentIdentity() const backfilling = await backfill.isBackfillingEvent(event) + + // send off async events if required + await publishAsyncEvent({ + event, + identity, + properties, + timestamp, + }) + // no backfill - send the event and exit if (!backfilling) { await processors.processEvent(event, identity, properties, timestamp) diff --git a/packages/backend-core/src/events/index.ts b/packages/backend-core/src/events/index.ts index d0d59a5b22..a238d72bac 100644 --- a/packages/backend-core/src/events/index.ts +++ b/packages/backend-core/src/events/index.ts @@ -6,6 +6,8 @@ export * as backfillCache from "./backfill" import { processors } from "./processors" +export function initAsyncEvents() {} + export const shutdown = () => { processors.shutdown() console.log("Events shutdown") diff --git a/packages/backend-core/src/events/processors/DocumentUpdateProcessor.ts b/packages/backend-core/src/events/processors/DocumentUpdateProcessor.ts deleted file mode 100644 index 496da7e923..0000000000 --- a/packages/backend-core/src/events/processors/DocumentUpdateProcessor.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { Event, Identity, Group, DocumentUpdateEvents } from "@budibase/types" -import { EventProcessor } from "./types" -import * as docUpdates from "../../docUpdates" -import { getTenantId } from "../../context" - -export default class DocumentUpdateProcessor implements EventProcessor { - async processEvent( - event: Event, - identity: Identity, - properties: any, - timestamp?: string - ): Promise { - // only user and group IDs supported right now - no app documents yet - if (DocumentUpdateEvents.indexOf(event) !== -1 && identity.tenantId) { - await docUpdates.update({ - id: this.getId(properties), - tenantId: getTenantId(), - }) - } - } - - getId(properties: any) { - let possibleProps = ["groupId", "userId"] - for (let prop of possibleProps) { - if (properties[prop]) { - return properties[prop] - } - } - } - - async identify(identity: Identity, timestamp?: string | number) { - // no-op - } - - async identifyGroup(group: Group, timestamp?: string | number) { - // no-op - } - - shutdown(): void { - docUpdates.shutdown() - } -} diff --git a/packages/backend-core/src/events/processors/Processors.ts b/packages/backend-core/src/events/processors/Processors.ts index 4baedd909f..72de945d44 100644 --- a/packages/backend-core/src/events/processors/Processors.ts +++ b/packages/backend-core/src/events/processors/Processors.ts @@ -25,7 +25,9 @@ export default class Processor implements EventProcessor { timestamp?: string | number ): Promise { for (const eventProcessor of this.processors) { - await eventProcessor.identify(identity, timestamp) + if (eventProcessor.identify) { + await eventProcessor.identify(identity, timestamp) + } } } @@ -34,13 +36,17 @@ export default class Processor implements EventProcessor { timestamp?: string | number ): Promise { for (const eventProcessor of this.processors) { - await eventProcessor.identifyGroup(identity, timestamp) + if (eventProcessor.identifyGroup) { + await eventProcessor.identifyGroup(identity, timestamp) + } } } shutdown() { for (const eventProcessor of this.processors) { - eventProcessor.shutdown() + if (eventProcessor.shutdown) { + eventProcessor.shutdown() + } } } } diff --git a/packages/backend-core/src/events/processors/async/DocumentUpdateProcessor.ts b/packages/backend-core/src/events/processors/async/DocumentUpdateProcessor.ts new file mode 100644 index 0000000000..a65152cc70 --- /dev/null +++ b/packages/backend-core/src/events/processors/async/DocumentUpdateProcessor.ts @@ -0,0 +1,44 @@ +import { EventProcessor } from "../types" +import { Event, Identity, DocUpdateEvent } from "@budibase/types" +import { DocumentType, SEPARATOR } from "../../../constants" +import { doInTenant } from "../../../context" +import { getDocumentId } from "../../documentId" +import { shutdown } from "../../asyncEvents" + +export type Processor = (update: DocUpdateEvent) => Promise +export type ProcessorMap = { types: DocumentType[]; processor: Processor }[] + +export default class DocumentUpdateProcessor implements EventProcessor { + processors: ProcessorMap = [] + + constructor(processors: ProcessorMap) { + this.processors = processors + } + + async processEvent( + event: Event, + identity: Identity, + properties: any, + timestamp?: string | number + ) { + const tenantId = identity.tenantId + const docId = getDocumentId(event, properties) + if (!tenantId || !docId) { + return + } + for (let { types, processor } of this.processors) { + if (types.find(type => docId.startsWith(`${type}${SEPARATOR}`))) { + await doInTenant(tenantId, async () => { + await processor({ + id: docId, + tenantId, + }) + }) + } + } + } + + shutdown() { + return shutdown() + } +} diff --git a/packages/backend-core/src/events/processors/index.ts b/packages/backend-core/src/events/processors/index.ts index 3582838d31..6646764e47 100644 --- a/packages/backend-core/src/events/processors/index.ts +++ b/packages/backend-core/src/events/processors/index.ts @@ -1,14 +1,12 @@ import AnalyticsProcessor from "./AnalyticsProcessor" import LoggingProcessor from "./LoggingProcessor" import AuditLogsProcessor from "./AuditLogsProcessor" -import DocumentUpdateProcessor from "./DocumentUpdateProcessor" import Processors from "./Processors" import { AuditLogFn } from "@budibase/types" export const analyticsProcessor = new AnalyticsProcessor() const loggingProcessor = new LoggingProcessor() const auditLogsProcessor = new AuditLogsProcessor() -const documentUpdateProcessor = new DocumentUpdateProcessor() export function init(auditingFn: AuditLogFn) { return AuditLogsProcessor.init(auditingFn) @@ -18,5 +16,4 @@ export const processors = new Processors([ analyticsProcessor, loggingProcessor, auditLogsProcessor, - documentUpdateProcessor, ]) diff --git a/packages/backend-core/src/events/processors/types.ts b/packages/backend-core/src/events/processors/types.ts index f4066fe248..33db6d8932 100644 --- a/packages/backend-core/src/events/processors/types.ts +++ b/packages/backend-core/src/events/processors/types.ts @@ -12,7 +12,7 @@ export interface EventProcessor { properties: any, timestamp?: string | number ): Promise - identify(identity: Identity, timestamp?: string | number): Promise - identifyGroup(group: Group, timestamp?: string | number): Promise - shutdown(): void + identify?(identity: Identity, timestamp?: string | number): Promise + identifyGroup?(group: Group, timestamp?: string | number): Promise + shutdown?(): void } diff --git a/packages/server/src/events/docUpdates.ts b/packages/server/src/events/docUpdates.ts new file mode 100644 index 0000000000..fcd90f64c4 --- /dev/null +++ b/packages/server/src/events/docUpdates.ts @@ -0,0 +1,42 @@ +import { constants, docUpdates, logging } from "@budibase/backend-core" +import { sdk as proSdk } from "@budibase/pro" +import { DocUpdateEvent } from "@budibase/types" +import { syncUsersToAllApps } from "../sdk/app/applications/sync" + +type UpdateCallback = (docId: string) => void + +function userGroupUpdates(updateCb?: UpdateCallback) { + const types = [constants.DocumentType.USER, constants.DocumentType.GROUP] + const processor = async (update: DocUpdateEvent) => { + try { + const docId = update.id + const isGroup = docId.startsWith(constants.DocumentType.GROUP) + let userIds: string[] + if (isGroup) { + const group = await proSdk.groups.get(docId) + userIds = group.users?.map(user => user._id) || [] + } else { + userIds = [docId] + } + if (userIds.length > 0) { + await syncUsersToAllApps(userIds) + } + if (updateCb) { + updateCb(docId) + } + } catch (err: any) { + // if something not found - no changes to perform + if (err?.status === 404) { + return + } else { + logging.logAlert("Failed to perform user/group app sync", err) + } + } + } + return { types, processor } +} + +export function init(updateCb?: UpdateCallback) { + const processors = [userGroupUpdates(updateCb)] + docUpdates.init(processors) +} diff --git a/packages/server/src/events/index.ts b/packages/server/src/events/index.ts index fad7bcaa9a..23c3f3e512 100644 --- a/packages/server/src/events/index.ts +++ b/packages/server/src/events/index.ts @@ -2,4 +2,5 @@ import BudibaseEmitter from "./BudibaseEmitter" const emitter = new BudibaseEmitter() +export { init } from "./docUpdates" export default emitter diff --git a/packages/server/src/sdk/app/applications/sync.ts b/packages/server/src/sdk/app/applications/sync.ts index 66fd5d2d59..d0a1d78428 100644 --- a/packages/server/src/sdk/app/applications/sync.ts +++ b/packages/server/src/sdk/app/applications/sync.ts @@ -82,7 +82,7 @@ async function syncUsersToApp( }) } -async function syncUsersToAllApps(userIds: string[]) { +export async function syncUsersToAllApps(userIds: string[]) { // list of users, if one has been deleted it will be undefined in array const users = (await getGlobalUsers(userIds, { noProcessing: true, @@ -113,36 +113,6 @@ async function syncUsersToAllApps(userIds: string[]) { } } -export function initUserGroupSync(updateCb?: (docId: string) => void) { - const types = [constants.DocumentType.USER, constants.DocumentType.GROUP] - docUpdates.process(types, async update => { - try { - const docId = update.id - const isGroup = docId.startsWith(constants.DocumentType.GROUP) - let userIds: string[] - if (isGroup) { - const group = await proSdk.groups.get(docId) - userIds = group.users?.map(user => user._id) || [] - } else { - userIds = [docId] - } - if (userIds.length > 0) { - await syncUsersToAllApps(userIds) - } - if (updateCb) { - updateCb(docId) - } - } catch (err: any) { - // if something not found - no changes to perform - if (err?.status === 404) { - return - } else { - logging.logAlert("Failed to perform user/group app sync", err) - } - } - }) -} - export async function syncApp( appId: string, opts?: { automationOnly?: boolean } diff --git a/packages/server/src/sdk/app/applications/tests/sync.spec.ts b/packages/server/src/sdk/app/applications/tests/sync.spec.ts index 90493c541d..3b412a7fa7 100644 --- a/packages/server/src/sdk/app/applications/tests/sync.spec.ts +++ b/packages/server/src/sdk/app/applications/tests/sync.spec.ts @@ -1,6 +1,6 @@ import TestConfiguration from "../../../../tests/utilities/TestConfiguration" import { events, context, roles, constants } from "@budibase/backend-core" -import { initUserGroupSync } from "../sync" +import { init } from "../../../../events" import { rawUserMetadata } from "../../../users/utils" import EventEmitter from "events" import { UserGroup, UserMetadata, UserRoles, User } from "@budibase/types" @@ -35,7 +35,7 @@ function waitForUpdate(opts: { group?: boolean }) { beforeAll(async () => { app = await config.init("syncApp") - initUserGroupSync(updateCb) + init(updateCb) }) async function createUser(email: string, roles: UserRoles, builder?: boolean) { diff --git a/packages/server/src/startup.ts b/packages/server/src/startup.ts index 80cdc3c792..2fd59b7a8e 100644 --- a/packages/server/src/startup.ts +++ b/packages/server/src/startup.ts @@ -10,7 +10,7 @@ import fs from "fs" import { watch } from "./watch" import * as automations from "./automations" import * as fileSystem from "./utilities/fileSystem" -import eventEmitter from "./events" +import { default as eventEmitter, init as eventInit } from "./events" import * as migrations from "./migrations" import * as bullboard from "./automations/bullboard" import * as pro from "@budibase/pro" @@ -63,7 +63,7 @@ export async function startup(app?: any, server?: any) { eventEmitter.emitPort(env.PORT) fileSystem.init() await redis.init() - sdk.applications.initUserGroupSync() + eventInit() // run migrations on startup if not done via http // not recommended in a clustered environment diff --git a/packages/types/src/sdk/events/event.ts b/packages/types/src/sdk/events/event.ts index 92965fa533..0b2ed3ce7c 100644 --- a/packages/types/src/sdk/events/event.ts +++ b/packages/types/src/sdk/events/event.ts @@ -186,7 +186,7 @@ export enum Event { AUDIT_LOGS_DOWNLOADED = "audit_log:downloaded", } -export const DocumentUpdateEvents: Event[] = [ +export const AsyncEvents: Event[] = [ Event.USER_CREATED, Event.USER_UPDATED, Event.USER_DELETED, @@ -399,3 +399,9 @@ export interface BaseEvent { } export type TableExportFormat = "json" | "csv" + +export type DocUpdateEvent = { + id: string + tenantId: string + appId?: string +} From 965a417a21e1ab5a15ce92573e265403212a4daf Mon Sep 17 00:00:00 2001 From: adrinr Date: Sun, 16 Apr 2023 18:45:09 +0100 Subject: [PATCH 72/91] Fix disabling fields on first load --- .../src/pages/builder/portal/users/groups/[groupId].svelte | 3 ++- .../src/pages/builder/portal/users/users/[userId].svelte | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte index bfb60f1c72..bbfd6998eb 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte @@ -75,7 +75,8 @@ let loaded = false let editModal, deleteModal - const scimEnabled = $features.isScimEnabled + let scimEnabled = false + $: scimEnabled = $features.isScimEnabled $: readonly = !$auth.isAdmin || scimEnabled $: page = $pageInfo.page diff --git a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte index d1ee48fd01..a890bd9a4a 100644 --- a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte +++ b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte @@ -86,7 +86,8 @@ let user let loaded = false - const scimEnabled = $features.isScimEnabled + let scimEnabled = false + $: scimEnabled = $features.isScimEnabled $: isSSO = !!user?.provider $: readonly = !$auth.isAdmin || scimEnabled From 643ca614a447354dc9d56e2aa49b16cf1c1d6930 Mon Sep 17 00:00:00 2001 From: Mateus Badan de Pieri Date: Sun, 16 Apr 2023 22:27:02 +0100 Subject: [PATCH 73/91] changing test to it --- packages/backend-core/src/security/tests/permissions.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/backend-core/src/security/tests/permissions.spec.ts b/packages/backend-core/src/security/tests/permissions.spec.ts index 8f6ee76c81..97c14879b3 100644 --- a/packages/backend-core/src/security/tests/permissions.spec.ts +++ b/packages/backend-core/src/security/tests/permissions.spec.ts @@ -111,7 +111,7 @@ describe("isPermissionLevelHigherThanRead", () => { }) describe("getBuiltinPermissions", () => { - test("returns a clone of the builtin permissions", () => { + it("returns a clone of the builtin permissions", () => { const builtins = getBuiltinPermissions() expect(builtins).toEqual(cloneDeep(BUILTIN_PERMISSIONS)) expect(builtins).not.toBe(BUILTIN_PERMISSIONS) @@ -119,7 +119,7 @@ describe("getBuiltinPermissions", () => { }) describe("getBuiltinPermissionByID", () => { - test("returns correct permission object for valid ID", () => { + it("returns correct permission object for valid ID", () => { const expectedPermission = { _id: BuiltinPermissionID.PUBLIC, name: "Public", From 4a67136c723eba42fb5164b5f746d232b1ed2a13 Mon Sep 17 00:00:00 2001 From: adrinr Date: Mon, 17 Apr 2023 09:49:11 +0100 Subject: [PATCH 74/91] Remove unnecessary initialisation --- .../src/pages/builder/portal/users/groups/[groupId].svelte | 2 -- .../src/pages/builder/portal/users/users/[userId].svelte | 2 -- 2 files changed, 4 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte index bbfd6998eb..1be019b83e 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte @@ -75,9 +75,7 @@ let loaded = false let editModal, deleteModal - let scimEnabled = false $: scimEnabled = $features.isScimEnabled - $: readonly = !$auth.isAdmin || scimEnabled $: page = $pageInfo.page $: fetchUsers(page, searchTerm) diff --git a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte index a890bd9a4a..98915eb960 100644 --- a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte +++ b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte @@ -86,9 +86,7 @@ let user let loaded = false - let scimEnabled = false $: scimEnabled = $features.isScimEnabled - $: isSSO = !!user?.provider $: readonly = !$auth.isAdmin || scimEnabled $: privileged = user?.admin?.global || user?.builder?.global From e60b09b03e6fbcd02a96b900f9ec5eeeda846962 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 17 Apr 2023 09:01:24 +0000 Subject: [PATCH 75/91] v2.5.5-alpha.1 --- 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 78a218fcd4..bdef39176a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.5-alpha.0", + "version": "2.5.5-alpha.1", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 730acda357..ed76f20b1f 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.5-alpha.0", + "version": "2.5.5-alpha.1", "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.5.5-alpha.0", + "@budibase/types": "2.5.5-alpha.1", "@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 fd05734559..8817de456e 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.5.5-alpha.0", + "version": "2.5.5-alpha.1", "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.5.5-alpha.0", - "@budibase/string-templates": "2.5.5-alpha.0", + "@budibase/shared-core": "2.5.5-alpha.1", + "@budibase/string-templates": "2.5.5-alpha.1", "@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 21fe404b0e..6fc7ead6d1 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.5-alpha.0", + "version": "2.5.5-alpha.1", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.5-alpha.0", - "@budibase/client": "2.5.5-alpha.0", - "@budibase/frontend-core": "2.5.5-alpha.0", - "@budibase/shared-core": "2.5.5-alpha.0", - "@budibase/string-templates": "2.5.5-alpha.0", + "@budibase/bbui": "2.5.5-alpha.1", + "@budibase/client": "2.5.5-alpha.1", + "@budibase/frontend-core": "2.5.5-alpha.1", + "@budibase/shared-core": "2.5.5-alpha.1", + "@budibase/string-templates": "2.5.5-alpha.1", "@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 0e23763c20..713dd0869d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.5-alpha.0", + "version": "2.5.5-alpha.1", "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.5.5-alpha.0", - "@budibase/string-templates": "2.5.5-alpha.0", - "@budibase/types": "2.5.5-alpha.0", + "@budibase/backend-core": "2.5.5-alpha.1", + "@budibase/string-templates": "2.5.5-alpha.1", + "@budibase/types": "2.5.5-alpha.1", "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 2829e358ba..784b43fb99 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.5-alpha.0", + "version": "2.5.5-alpha.1", "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.5.5-alpha.0", - "@budibase/frontend-core": "2.5.5-alpha.0", - "@budibase/shared-core": "2.5.5-alpha.0", - "@budibase/string-templates": "2.5.5-alpha.0", - "@budibase/types": "2.5.5-alpha.0", + "@budibase/bbui": "2.5.5-alpha.1", + "@budibase/frontend-core": "2.5.5-alpha.1", + "@budibase/shared-core": "2.5.5-alpha.1", + "@budibase/string-templates": "2.5.5-alpha.1", + "@budibase/types": "2.5.5-alpha.1", "@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 4a6004b0ed..a90f6d2fb9 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.5-alpha.0", + "version": "2.5.5-alpha.1", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.5-alpha.0", - "@budibase/shared-core": "2.5.5-alpha.0", + "@budibase/bbui": "2.5.5-alpha.1", + "@budibase/shared-core": "2.5.5-alpha.1", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index ba187295d0..27468640ee 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.5-alpha.0", + "version": "2.5.5-alpha.1", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 65e79ba7b7..d7ad85ebc0 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.5-alpha.0", + "version": "2.5.5-alpha.1", "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.5.5-alpha.0", - "@budibase/client": "2.5.5-alpha.0", + "@budibase/backend-core": "2.5.5-alpha.1", + "@budibase/client": "2.5.5-alpha.1", "@budibase/pro": "2.5.5-alpha.0", - "@budibase/shared-core": "2.5.5-alpha.0", - "@budibase/string-templates": "2.5.5-alpha.0", - "@budibase/types": "2.5.5-alpha.0", + "@budibase/shared-core": "2.5.5-alpha.1", + "@budibase/string-templates": "2.5.5-alpha.1", + "@budibase/types": "2.5.5-alpha.1", "@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 c97a166216..23d61fa495 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.5-alpha.0", + "version": "2.5.5-alpha.1", "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.5.5-alpha.0" + "@budibase/types": "2.5.5-alpha.1" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 1e266fe96a..5b9fc30247 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.5-alpha.0", + "version": "2.5.5-alpha.1", "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 d79739bc90..fd6846aea0 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.5-alpha.0", + "version": "2.5.5-alpha.1", "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 efefa541a9..eaa7f5b3d8 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.5-alpha.0", + "version": "2.5.5-alpha.1", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.5-alpha.0", + "@budibase/backend-core": "2.5.5-alpha.1", "@budibase/pro": "2.5.5-alpha.0", - "@budibase/string-templates": "2.5.5-alpha.0", - "@budibase/types": "2.5.5-alpha.0", + "@budibase/string-templates": "2.5.5-alpha.1", + "@budibase/types": "2.5.5-alpha.1", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 4755dd6120d56bf6874b2011b52006e57dbc660c Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 17 Apr 2023 09:03:01 +0000 Subject: [PATCH 76/91] Update pro version to 2.5.5-alpha.1 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 39 +++++++++++++++++++++++++----------- 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index d7ad85ebc0..eae38f1a47 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.5.5-alpha.1", "@budibase/client": "2.5.5-alpha.1", - "@budibase/pro": "2.5.5-alpha.0", + "@budibase/pro": "2.5.5-alpha.1", "@budibase/shared-core": "2.5.5-alpha.1", "@budibase/string-templates": "2.5.5-alpha.1", "@budibase/types": "2.5.5-alpha.1", diff --git a/packages/worker/package.json b/packages/worker/package.json index eaa7f5b3d8..e9feddb86d 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.5-alpha.1", - "@budibase/pro": "2.5.5-alpha.0", + "@budibase/pro": "2.5.5-alpha.1", "@budibase/string-templates": "2.5.5-alpha.1", "@budibase/types": "2.5.5-alpha.1", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index c84f28b254..c1b5be3b11 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,14 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.4": - version "2.5.4" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.4.tgz#9368117a41b276ec97d3994e3ec67d9f2570a5bc" - integrity sha512-xPNVlRFTcjpWn+oZCvrfgDd9SoslkUgJsS2Bnff+qDoWcTFz30KoOyZPAkSwXxX3Y8FmZRO9csl0AZa9TsUs7A== +"@budibase/pro@2.5.5-alpha.0": + version "2.5.5-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.5-alpha.0.tgz#28b075a96efb564328a4972cae9ea6c9a5f3aabc" + integrity sha512-98fLnvHWVy7ASEFC98bo6Qdd55SjC7yrJNuf7FUYZbeFwpmwwRxlWnWFTa0ctKWB5p2LToARWBns3TqgnUr/zQ== dependencies: - "@budibase/backend-core" "2.5.4" - "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.4" + "@budibase/backend-core" "2.5.5-alpha.0" + "@budibase/shared-core" "2.4.44-alpha.1" + "@budibase/string-templates" "2.4.44-alpha.1" + "@budibase/types" "2.5.5-alpha.0" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1501,6 +1502,15 @@ lru-cache "^7.14.1" memorystream "^0.3.1" node-fetch "^2.6.1" + scim-patch "^0.7.0" + scim2-parse-filter "^0.2.8" + +"@budibase/shared-core@2.4.44-alpha.1": + version "2.4.44-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/shared-core/-/shared-core-2.4.44-alpha.1.tgz#3d499e40e7e6c646e13a87cd08e01ba116c2ff1d" + integrity sha512-cN8LaDczijtsfWUYiXC4sg9Z+US4020i3Mb8TwCbf8TQyA1b06U5PwPCp+GHVA/wDFqfwcpcE1GXf8GwVuYs7A== + dependencies: + "@budibase/types" "2.4.44-alpha.1" "@budibase/standard-components@^0.9.139": version "0.9.139" @@ -1520,10 +1530,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/string-templates@2.3.20": - version "2.3.20" - resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.3.20.tgz#35f74b6f515e8127cc375ee0a4679b0a7c117588" - integrity sha512-wMKau3IzVF6M+dRu99aKV1yMdrrK5lghVm9qYtR1B163SMbHEwC8JmZFGPLIi1XsG0T+vw+xfcemfJ2zcATWwg== +"@budibase/string-templates@2.4.44-alpha.1": + version "2.4.44-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.4.44-alpha.1.tgz#6c2aee594d16eac1f173c509e087a817dd3172f0" + integrity sha512-4gC2+0kccK0ilLnd0i/dmJzC0Ur7UgSAmV6zbzDDYNL4spU0qSy5VhBh7E3qKieg5RKMMzbpXLMWERpoPLlnqA== dependencies: "@budibase/handlebars-helpers" "^0.11.8" dayjs "^1.10.4" @@ -1532,6 +1542,11 @@ lodash "^4.17.20" vm2 "^3.9.4" +"@budibase/types@2.4.44-alpha.1": + version "2.4.44-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.1.tgz#1679657aa180d9c59afa1dffa611bff0638bd933" + integrity sha512-Sq+8HfM75EBMoOvKYFwELdlxmVN6wNZMofDjT/2G+9aF+Zfe5Tzw69C+unmdBgcGGjGCHEYWSz4mF0v8FPAGbg== + "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" @@ -21169,7 +21184,7 @@ scim-patch@^0.7.0: fast-deep-equal "3.1.3" scim2-parse-filter "0.2.8" -scim2-parse-filter@0.2.8: +scim2-parse-filter@0.2.8, scim2-parse-filter@^0.2.8: version "0.2.8" resolved "https://registry.yarnpkg.com/scim2-parse-filter/-/scim2-parse-filter-0.2.8.tgz#12e836514b9a55ae51218dd6e7fbea91daccfa4d" integrity sha512-1V+6FIMIiP+gDiFkC3dIw86KfoXhnQRXhfPaiQImeeFukpLtEkTtYq/Vmy1yDgHQcIHQxQQqOWyGLKX0FTvvaA== From de968b5332def45f26ea8e8fd0afebaecdccd283 Mon Sep 17 00:00:00 2001 From: Mateus Badan de Pieri Date: Mon, 17 Apr 2023 10:04:50 +0100 Subject: [PATCH 77/91] changin syntax to permission function --- .../src/security/tests/permissions.spec.ts | 119 ++++++++++-------- 1 file changed, 66 insertions(+), 53 deletions(-) diff --git a/packages/backend-core/src/security/tests/permissions.spec.ts b/packages/backend-core/src/security/tests/permissions.spec.ts index 97c14879b3..caf8bb29a6 100644 --- a/packages/backend-core/src/security/tests/permissions.spec.ts +++ b/packages/backend-core/src/security/tests/permissions.spec.ts @@ -1,132 +1,145 @@ import { cloneDeep } from "lodash" -import { - doesHaveBasePermission, - getBuiltinPermissionByID, - isPermissionLevelHigherThanRead, - PermissionLevel, - PermissionType, - levelToNumber, - getAllowedLevels, - BuiltinPermissionID, - getBuiltinPermissions, - BUILTIN_PERMISSIONS, - Permission, -} from "../permissions" +import * as permissions from "../permissions" import { BUILTIN_ROLE_IDS } from "../roles" describe("levelToNumber", () => { it("should return 0 for EXECUTE", () => { - expect(levelToNumber(PermissionLevel.EXECUTE)).toBe(0) + expect(permissions.levelToNumber(permissions.PermissionLevel.EXECUTE)).toBe( + 0 + ) }) it("should return 1 for READ", () => { - expect(levelToNumber(PermissionLevel.READ)).toBe(1) + expect(permissions.levelToNumber(permissions.PermissionLevel.READ)).toBe(1) }) it("should return 2 for WRITE", () => { - expect(levelToNumber(PermissionLevel.WRITE)).toBe(2) + expect(permissions.levelToNumber(permissions.PermissionLevel.WRITE)).toBe(2) }) it("should return 3 for ADMIN", () => { - expect(levelToNumber(PermissionLevel.ADMIN)).toBe(3) + expect(permissions.levelToNumber(permissions.PermissionLevel.ADMIN)).toBe(3) }) it("should return -1 for an unknown permission level", () => { - expect(levelToNumber("unknown" as PermissionLevel)).toBe(-1) + expect( + permissions.levelToNumber("unknown" as permissions.PermissionLevel) + ).toBe(-1) }) }) describe("getAllowedLevels", () => { it('should return ["execute"] for EXECUTE', () => { - expect(getAllowedLevels(PermissionLevel.EXECUTE)).toEqual([ - PermissionLevel.EXECUTE, - ]) + expect( + permissions.getAllowedLevels(permissions.PermissionLevel.EXECUTE) + ).toEqual([permissions.PermissionLevel.EXECUTE]) }) it('should return ["execute", "read"] for READ', () => { - expect(getAllowedLevels(PermissionLevel.READ)).toEqual([ - PermissionLevel.EXECUTE, - PermissionLevel.READ, + expect( + permissions.getAllowedLevels(permissions.PermissionLevel.READ) + ).toEqual([ + permissions.PermissionLevel.EXECUTE, + permissions.PermissionLevel.READ, ]) }) it('should return ["execute", "read", "write"] for WRITE', () => { - expect(getAllowedLevels(PermissionLevel.WRITE)).toEqual([ - PermissionLevel.EXECUTE, - PermissionLevel.READ, - PermissionLevel.WRITE, + expect( + permissions.getAllowedLevels(permissions.PermissionLevel.WRITE) + ).toEqual([ + permissions.PermissionLevel.EXECUTE, + permissions.PermissionLevel.READ, + permissions.PermissionLevel.WRITE, ]) }) it('should return ["execute", "read", "write"] for ADMIN', () => { - expect(getAllowedLevels(PermissionLevel.ADMIN)).toEqual([ - PermissionLevel.EXECUTE, - PermissionLevel.READ, - PermissionLevel.WRITE, + expect( + permissions.getAllowedLevels(permissions.PermissionLevel.ADMIN) + ).toEqual([ + permissions.PermissionLevel.EXECUTE, + permissions.PermissionLevel.READ, + permissions.PermissionLevel.WRITE, ]) }) it("should return [] for an unknown permission level", () => { - expect(getAllowedLevels("unknown" as PermissionLevel)).toEqual([]) + expect( + permissions.getAllowedLevels("unknown" as permissions.PermissionLevel) + ).toEqual([]) }) }) describe("doesHaveBasePermission", () => { it("should return true if base permission has the required level", () => { - const permType = PermissionType.USER - const permLevel = PermissionLevel.READ + const permType = permissions.PermissionType.USER + const permLevel = permissions.PermissionLevel.READ const rolesHierarchy = [ { roleId: BUILTIN_ROLE_IDS.ADMIN, - permissionId: BuiltinPermissionID.ADMIN, + permissionId: permissions.BuiltinPermissionID.ADMIN, }, ] - expect(doesHaveBasePermission(permType, permLevel, rolesHierarchy)).toBe( - true - ) + expect( + permissions.doesHaveBasePermission(permType, permLevel, rolesHierarchy) + ).toBe(true) }) it("should return false if base permission does not have the required level", () => { - const permType = PermissionType.APP - const permLevel = PermissionLevel.READ + const permType = permissions.PermissionType.APP + const permLevel = permissions.PermissionLevel.READ const rolesHierarchy = [ { roleId: BUILTIN_ROLE_IDS.PUBLIC, - permissionId: BuiltinPermissionID.PUBLIC, + permissionId: permissions.BuiltinPermissionID.PUBLIC, }, ] - expect(doesHaveBasePermission(permType, permLevel, rolesHierarchy)).toBe( - false - ) + expect( + permissions.doesHaveBasePermission(permType, permLevel, rolesHierarchy) + ).toBe(false) }) }) describe("isPermissionLevelHigherThanRead", () => { it("should return true if level is higher than read", () => { - expect(isPermissionLevelHigherThanRead(PermissionLevel.WRITE)).toBe(true) + expect( + permissions.isPermissionLevelHigherThanRead( + permissions.PermissionLevel.WRITE + ) + ).toBe(true) }) it("should return false if level is read or lower", () => { - expect(isPermissionLevelHigherThanRead(PermissionLevel.READ)).toBe(false) + expect( + permissions.isPermissionLevelHigherThanRead( + permissions.PermissionLevel.READ + ) + ).toBe(false) }) }) describe("getBuiltinPermissions", () => { it("returns a clone of the builtin permissions", () => { - const builtins = getBuiltinPermissions() - expect(builtins).toEqual(cloneDeep(BUILTIN_PERMISSIONS)) - expect(builtins).not.toBe(BUILTIN_PERMISSIONS) + const builtins = permissions.getBuiltinPermissions() + expect(builtins).toEqual(cloneDeep(permissions.BUILTIN_PERMISSIONS)) + expect(builtins).not.toBe(permissions.BUILTIN_PERMISSIONS) }) }) describe("getBuiltinPermissionByID", () => { it("returns correct permission object for valid ID", () => { const expectedPermission = { - _id: BuiltinPermissionID.PUBLIC, + _id: permissions.BuiltinPermissionID.PUBLIC, name: "Public", permissions: [ - new Permission(PermissionType.WEBHOOK, PermissionLevel.EXECUTE), + new permissions.Permission( + permissions.PermissionType.WEBHOOK, + permissions.PermissionLevel.EXECUTE + ), ], } - expect(getBuiltinPermissionByID("public")).toEqual(expectedPermission) + expect(permissions.getBuiltinPermissionByID("public")).toEqual( + expectedPermission + ) }) }) From b91d518e544aed127d991eb9f289da6009ce8fec Mon Sep 17 00:00:00 2001 From: adrinr Date: Mon, 17 Apr 2023 10:06:15 +0100 Subject: [PATCH 78/91] Remove zlib npm references --- packages/backend-core/package.json | 3 +- packages/server/package.json | 3 +- yarn.lock | 44 ++++++++++++++++++------------ 3 files changed, 29 insertions(+), 21 deletions(-) diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 730acda357..e3cc680c20 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -54,8 +54,7 @@ "sanitize-s3-objectkey": "0.0.1", "semver": "7.3.7", "tar-fs": "2.1.1", - "uuid": "8.3.2", - "zlib": "1.0.5" + "uuid": "8.3.2" }, "devDependencies": { "@jest/test-sequencer": "29.5.0", diff --git a/packages/server/package.json b/packages/server/package.json index 65e79ba7b7..2f5261c9e9 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -118,8 +118,7 @@ "vm2": "3.9.16", "worker-farm": "1.7.0", "xml2js": "0.5.0", - "yargs": "13.2.4", - "zlib": "1.0.5" + "yargs": "13.2.4" }, "devDependencies": { "@babel/core": "7.17.4", diff --git a/yarn.lock b/yarn.lock index c84f28b254..4817017747 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,14 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.4": - version "2.5.4" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.4.tgz#9368117a41b276ec97d3994e3ec67d9f2570a5bc" - integrity sha512-xPNVlRFTcjpWn+oZCvrfgDd9SoslkUgJsS2Bnff+qDoWcTFz30KoOyZPAkSwXxX3Y8FmZRO9csl0AZa9TsUs7A== +"@budibase/pro@2.5.5-alpha.0": + version "2.5.5-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.5-alpha.0.tgz#28b075a96efb564328a4972cae9ea6c9a5f3aabc" + integrity sha512-98fLnvHWVy7ASEFC98bo6Qdd55SjC7yrJNuf7FUYZbeFwpmwwRxlWnWFTa0ctKWB5p2LToARWBns3TqgnUr/zQ== dependencies: - "@budibase/backend-core" "2.5.4" - "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.5.4" + "@budibase/backend-core" "2.5.5-alpha.0" + "@budibase/shared-core" "2.4.44-alpha.1" + "@budibase/string-templates" "2.4.44-alpha.1" + "@budibase/types" "2.5.5-alpha.0" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1501,6 +1502,15 @@ lru-cache "^7.14.1" memorystream "^0.3.1" node-fetch "^2.6.1" + scim-patch "^0.7.0" + scim2-parse-filter "^0.2.8" + +"@budibase/shared-core@2.4.44-alpha.1": + version "2.4.44-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/shared-core/-/shared-core-2.4.44-alpha.1.tgz#3d499e40e7e6c646e13a87cd08e01ba116c2ff1d" + integrity sha512-cN8LaDczijtsfWUYiXC4sg9Z+US4020i3Mb8TwCbf8TQyA1b06U5PwPCp+GHVA/wDFqfwcpcE1GXf8GwVuYs7A== + dependencies: + "@budibase/types" "2.4.44-alpha.1" "@budibase/standard-components@^0.9.139": version "0.9.139" @@ -1520,10 +1530,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/string-templates@2.3.20": - version "2.3.20" - resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.3.20.tgz#35f74b6f515e8127cc375ee0a4679b0a7c117588" - integrity sha512-wMKau3IzVF6M+dRu99aKV1yMdrrK5lghVm9qYtR1B163SMbHEwC8JmZFGPLIi1XsG0T+vw+xfcemfJ2zcATWwg== +"@budibase/string-templates@2.4.44-alpha.1": + version "2.4.44-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.4.44-alpha.1.tgz#6c2aee594d16eac1f173c509e087a817dd3172f0" + integrity sha512-4gC2+0kccK0ilLnd0i/dmJzC0Ur7UgSAmV6zbzDDYNL4spU0qSy5VhBh7E3qKieg5RKMMzbpXLMWERpoPLlnqA== dependencies: "@budibase/handlebars-helpers" "^0.11.8" dayjs "^1.10.4" @@ -1532,6 +1542,11 @@ lodash "^4.17.20" vm2 "^3.9.4" +"@budibase/types@2.4.44-alpha.1": + version "2.4.44-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.1.tgz#1679657aa180d9c59afa1dffa611bff0638bd933" + integrity sha512-Sq+8HfM75EBMoOvKYFwELdlxmVN6wNZMofDjT/2G+9aF+Zfe5Tzw69C+unmdBgcGGjGCHEYWSz4mF0v8FPAGbg== + "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" @@ -21169,7 +21184,7 @@ scim-patch@^0.7.0: fast-deep-equal "3.1.3" scim2-parse-filter "0.2.8" -scim2-parse-filter@0.2.8: +scim2-parse-filter@0.2.8, scim2-parse-filter@^0.2.8: version "0.2.8" resolved "https://registry.yarnpkg.com/scim2-parse-filter/-/scim2-parse-filter-0.2.8.tgz#12e836514b9a55ae51218dd6e7fbea91daccfa4d" integrity sha512-1V+6FIMIiP+gDiFkC3dIw86KfoXhnQRXhfPaiQImeeFukpLtEkTtYq/Vmy1yDgHQcIHQxQQqOWyGLKX0FTvvaA== @@ -24690,8 +24705,3 @@ z-schema@^5.0.1: validator "^13.7.0" optionalDependencies: commander "^10.0.0" - -zlib@1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/zlib/-/zlib-1.0.5.tgz#6e7c972fc371c645a6afb03ab14769def114fcc0" - integrity sha512-40fpE2II+Cd3k8HWTWONfeKE2jL+P42iWJ1zzps5W51qcTsOUKM5Q5m2PFb0CLxlmFAaUuUdJGc3OfZy947v0w== From ac4e45a4333e9847405dacf1064c0f4a85f7926f Mon Sep 17 00:00:00 2001 From: adrinr Date: Mon, 17 Apr 2023 10:27:37 +0100 Subject: [PATCH 79/91] Replace usages --- packages/backend-core/src/objectStore/objectStore.ts | 6 +++--- packages/worker/src/api/index.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/backend-core/src/objectStore/objectStore.ts b/packages/backend-core/src/objectStore/objectStore.ts index 059e1b228d..4ac3641de1 100644 --- a/packages/backend-core/src/objectStore/objectStore.ts +++ b/packages/backend-core/src/objectStore/objectStore.ts @@ -3,7 +3,7 @@ import AWS from "aws-sdk" import stream from "stream" import fetch from "node-fetch" import tar from "tar-fs" -const zlib = require("zlib") +import zlib from "zlib" import { promisify } from "util" import { join } from "path" import fs from "fs" @@ -415,7 +415,7 @@ export const downloadTarballDirect = async ( throw new Error(`unexpected response ${response.statusText}`) } - await streamPipeline(response.body, zlib.Unzip(), tar.extract(path)) + await streamPipeline(response.body, zlib.createUnzip(), tar.extract(path)) } export const downloadTarball = async ( @@ -431,7 +431,7 @@ export const downloadTarball = async ( } const tmpPath = join(budibaseTempDir(), path) - await streamPipeline(response.body, zlib.Unzip(), tar.extract(tmpPath)) + await streamPipeline(response.body, zlib.createUnzip(), tar.extract(tmpPath)) if (!env.isTest() && env.SELF_HOSTED) { await uploadDirectory(bucketName, tmpPath, path) } diff --git a/packages/worker/src/api/index.ts b/packages/worker/src/api/index.ts index b390d36bb8..2a3133af3f 100644 --- a/packages/worker/src/api/index.ts +++ b/packages/worker/src/api/index.ts @@ -1,6 +1,6 @@ import Router from "@koa/router" const compress = require("koa-compress") -const zlib = require("zlib") +import zlib from "zlib" import { routes } from "./routes" import { middleware as pro } from "@budibase/pro" import { auth, middleware } from "@budibase/backend-core" From 457e1d7a1a15cea100939f4686c4edfd932f44eb Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 17 Apr 2023 09:34:23 +0000 Subject: [PATCH 80/91] v2.5.5-alpha.2 --- 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 bdef39176a..147aa1933e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.5-alpha.1", + "version": "2.5.5-alpha.2", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index ed76f20b1f..dad0c7c332 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.5-alpha.1", + "version": "2.5.5-alpha.2", "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.5.5-alpha.1", + "@budibase/types": "2.5.5-alpha.2", "@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 8817de456e..2ca0f2b186 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.5.5-alpha.1", + "version": "2.5.5-alpha.2", "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.5.5-alpha.1", - "@budibase/string-templates": "2.5.5-alpha.1", + "@budibase/shared-core": "2.5.5-alpha.2", + "@budibase/string-templates": "2.5.5-alpha.2", "@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 6fc7ead6d1..f4ddfbff41 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.5-alpha.1", + "version": "2.5.5-alpha.2", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.5-alpha.1", - "@budibase/client": "2.5.5-alpha.1", - "@budibase/frontend-core": "2.5.5-alpha.1", - "@budibase/shared-core": "2.5.5-alpha.1", - "@budibase/string-templates": "2.5.5-alpha.1", + "@budibase/bbui": "2.5.5-alpha.2", + "@budibase/client": "2.5.5-alpha.2", + "@budibase/frontend-core": "2.5.5-alpha.2", + "@budibase/shared-core": "2.5.5-alpha.2", + "@budibase/string-templates": "2.5.5-alpha.2", "@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 713dd0869d..f730552ec7 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.5-alpha.1", + "version": "2.5.5-alpha.2", "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.5.5-alpha.1", - "@budibase/string-templates": "2.5.5-alpha.1", - "@budibase/types": "2.5.5-alpha.1", + "@budibase/backend-core": "2.5.5-alpha.2", + "@budibase/string-templates": "2.5.5-alpha.2", + "@budibase/types": "2.5.5-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 784b43fb99..d33737d8c6 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.5-alpha.1", + "version": "2.5.5-alpha.2", "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.5.5-alpha.1", - "@budibase/frontend-core": "2.5.5-alpha.1", - "@budibase/shared-core": "2.5.5-alpha.1", - "@budibase/string-templates": "2.5.5-alpha.1", - "@budibase/types": "2.5.5-alpha.1", + "@budibase/bbui": "2.5.5-alpha.2", + "@budibase/frontend-core": "2.5.5-alpha.2", + "@budibase/shared-core": "2.5.5-alpha.2", + "@budibase/string-templates": "2.5.5-alpha.2", + "@budibase/types": "2.5.5-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 a90f6d2fb9..49b926257f 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.5-alpha.1", + "version": "2.5.5-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": "2.5.5-alpha.1", - "@budibase/shared-core": "2.5.5-alpha.1", + "@budibase/bbui": "2.5.5-alpha.2", + "@budibase/shared-core": "2.5.5-alpha.2", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 27468640ee..a4a5f0ecff 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.5-alpha.1", + "version": "2.5.5-alpha.2", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index eae38f1a47..39fadc35c4 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.5-alpha.1", + "version": "2.5.5-alpha.2", "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.5.5-alpha.1", - "@budibase/client": "2.5.5-alpha.1", + "@budibase/backend-core": "2.5.5-alpha.2", + "@budibase/client": "2.5.5-alpha.2", "@budibase/pro": "2.5.5-alpha.1", - "@budibase/shared-core": "2.5.5-alpha.1", - "@budibase/string-templates": "2.5.5-alpha.1", - "@budibase/types": "2.5.5-alpha.1", + "@budibase/shared-core": "2.5.5-alpha.2", + "@budibase/string-templates": "2.5.5-alpha.2", + "@budibase/types": "2.5.5-alpha.2", "@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 23d61fa495..6864c3aa4f 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.5-alpha.1", + "version": "2.5.5-alpha.2", "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.5.5-alpha.1" + "@budibase/types": "2.5.5-alpha.2" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 5b9fc30247..b65c7b04b6 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.5-alpha.1", + "version": "2.5.5-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 fd6846aea0..1458b82a49 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.5-alpha.1", + "version": "2.5.5-alpha.2", "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 e9feddb86d..e99662638d 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.5-alpha.1", + "version": "2.5.5-alpha.2", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.5-alpha.1", + "@budibase/backend-core": "2.5.5-alpha.2", "@budibase/pro": "2.5.5-alpha.1", - "@budibase/string-templates": "2.5.5-alpha.1", - "@budibase/types": "2.5.5-alpha.1", + "@budibase/string-templates": "2.5.5-alpha.2", + "@budibase/types": "2.5.5-alpha.2", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From c1d85bc8b0d3ee7cc02fed5de592b6bf639a2697 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 17 Apr 2023 09:35:44 +0000 Subject: [PATCH 81/91] Update pro version to 2.5.5-alpha.2 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 39fadc35c4..d2bc5c9f63 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.5.5-alpha.2", "@budibase/client": "2.5.5-alpha.2", - "@budibase/pro": "2.5.5-alpha.1", + "@budibase/pro": "2.5.5-alpha.2", "@budibase/shared-core": "2.5.5-alpha.2", "@budibase/string-templates": "2.5.5-alpha.2", "@budibase/types": "2.5.5-alpha.2", diff --git a/packages/worker/package.json b/packages/worker/package.json index e99662638d..48df14bf32 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.5-alpha.2", - "@budibase/pro": "2.5.5-alpha.1", + "@budibase/pro": "2.5.5-alpha.2", "@budibase/string-templates": "2.5.5-alpha.2", "@budibase/types": "2.5.5-alpha.2", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index c1b5be3b11..f5cd450ddc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.5-alpha.0": - version "2.5.5-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.5-alpha.0.tgz#28b075a96efb564328a4972cae9ea6c9a5f3aabc" - integrity sha512-98fLnvHWVy7ASEFC98bo6Qdd55SjC7yrJNuf7FUYZbeFwpmwwRxlWnWFTa0ctKWB5p2LToARWBns3TqgnUr/zQ== +"@budibase/pro@2.5.5-alpha.1": + version "2.5.5-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.5-alpha.1.tgz#6d9476ce724bd3e405cb2e0198c4b83b168e65bc" + integrity sha512-fEuropk/0aH1+lELX6wdFa8UUpE+SMtlvBbsgNR2ulvLgLLPEYhI2gINlhiItMWWgTtxNtele3hOs1VWhn0o2A== dependencies: - "@budibase/backend-core" "2.5.5-alpha.0" + "@budibase/backend-core" "2.5.5-alpha.1" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.5-alpha.0" + "@budibase/types" "2.5.5-alpha.1" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From f9c5fd489be3c3f43992cb040e2d2dce7934ca57 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 17 Apr 2023 10:30:38 +0000 Subject: [PATCH 82/91] v2.5.5-alpha.3 --- 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 147aa1933e..07a367b5a4 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.5-alpha.2", + "version": "2.5.5-alpha.3", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index dad0c7c332..9b0a8a5837 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.5-alpha.2", + "version": "2.5.5-alpha.3", "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.5.5-alpha.2", + "@budibase/types": "2.5.5-alpha.3", "@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 2ca0f2b186..da4feb0ae6 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.5.5-alpha.2", + "version": "2.5.5-alpha.3", "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.5.5-alpha.2", - "@budibase/string-templates": "2.5.5-alpha.2", + "@budibase/shared-core": "2.5.5-alpha.3", + "@budibase/string-templates": "2.5.5-alpha.3", "@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 f4ddfbff41..4fdc0bb6fc 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.5-alpha.2", + "version": "2.5.5-alpha.3", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.5-alpha.2", - "@budibase/client": "2.5.5-alpha.2", - "@budibase/frontend-core": "2.5.5-alpha.2", - "@budibase/shared-core": "2.5.5-alpha.2", - "@budibase/string-templates": "2.5.5-alpha.2", + "@budibase/bbui": "2.5.5-alpha.3", + "@budibase/client": "2.5.5-alpha.3", + "@budibase/frontend-core": "2.5.5-alpha.3", + "@budibase/shared-core": "2.5.5-alpha.3", + "@budibase/string-templates": "2.5.5-alpha.3", "@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 f730552ec7..dc06537a7e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.5-alpha.2", + "version": "2.5.5-alpha.3", "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.5.5-alpha.2", - "@budibase/string-templates": "2.5.5-alpha.2", - "@budibase/types": "2.5.5-alpha.2", + "@budibase/backend-core": "2.5.5-alpha.3", + "@budibase/string-templates": "2.5.5-alpha.3", + "@budibase/types": "2.5.5-alpha.3", "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 d33737d8c6..9adf1ecf85 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.5-alpha.2", + "version": "2.5.5-alpha.3", "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.5.5-alpha.2", - "@budibase/frontend-core": "2.5.5-alpha.2", - "@budibase/shared-core": "2.5.5-alpha.2", - "@budibase/string-templates": "2.5.5-alpha.2", - "@budibase/types": "2.5.5-alpha.2", + "@budibase/bbui": "2.5.5-alpha.3", + "@budibase/frontend-core": "2.5.5-alpha.3", + "@budibase/shared-core": "2.5.5-alpha.3", + "@budibase/string-templates": "2.5.5-alpha.3", + "@budibase/types": "2.5.5-alpha.3", "@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 49b926257f..e0997ee5df 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.5-alpha.2", + "version": "2.5.5-alpha.3", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.5-alpha.2", - "@budibase/shared-core": "2.5.5-alpha.2", + "@budibase/bbui": "2.5.5-alpha.3", + "@budibase/shared-core": "2.5.5-alpha.3", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index a4a5f0ecff..0275bce2f2 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.5-alpha.2", + "version": "2.5.5-alpha.3", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index d2bc5c9f63..efdb01acca 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.5-alpha.2", + "version": "2.5.5-alpha.3", "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.5.5-alpha.2", - "@budibase/client": "2.5.5-alpha.2", + "@budibase/backend-core": "2.5.5-alpha.3", + "@budibase/client": "2.5.5-alpha.3", "@budibase/pro": "2.5.5-alpha.2", - "@budibase/shared-core": "2.5.5-alpha.2", - "@budibase/string-templates": "2.5.5-alpha.2", - "@budibase/types": "2.5.5-alpha.2", + "@budibase/shared-core": "2.5.5-alpha.3", + "@budibase/string-templates": "2.5.5-alpha.3", + "@budibase/types": "2.5.5-alpha.3", "@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 6864c3aa4f..94c10ab576 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.5-alpha.2", + "version": "2.5.5-alpha.3", "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.5.5-alpha.2" + "@budibase/types": "2.5.5-alpha.3" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index b65c7b04b6..fd892bcf61 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.5-alpha.2", + "version": "2.5.5-alpha.3", "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 1458b82a49..c1af111434 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.5-alpha.2", + "version": "2.5.5-alpha.3", "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 48df14bf32..dcbf0a8dcd 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.5-alpha.2", + "version": "2.5.5-alpha.3", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.5-alpha.2", + "@budibase/backend-core": "2.5.5-alpha.3", "@budibase/pro": "2.5.5-alpha.2", - "@budibase/string-templates": "2.5.5-alpha.2", - "@budibase/types": "2.5.5-alpha.2", + "@budibase/string-templates": "2.5.5-alpha.3", + "@budibase/types": "2.5.5-alpha.3", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From b81be5d68618ba192c0b881dc4aed09082de26d3 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 17 Apr 2023 10:51:12 +0000 Subject: [PATCH 83/91] v2.5.5-alpha.4 --- 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 07a367b5a4..8b98c283e6 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.5-alpha.3", + "version": "2.5.5-alpha.4", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 22640d6747..36896720b1 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.5-alpha.3", + "version": "2.5.5-alpha.4", "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.5.5-alpha.3", + "@budibase/types": "2.5.5-alpha.4", "@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 da4feb0ae6..8e841da001 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.5.5-alpha.3", + "version": "2.5.5-alpha.4", "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.5.5-alpha.3", - "@budibase/string-templates": "2.5.5-alpha.3", + "@budibase/shared-core": "2.5.5-alpha.4", + "@budibase/string-templates": "2.5.5-alpha.4", "@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 4fdc0bb6fc..8414d6493b 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.5-alpha.3", + "version": "2.5.5-alpha.4", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.5-alpha.3", - "@budibase/client": "2.5.5-alpha.3", - "@budibase/frontend-core": "2.5.5-alpha.3", - "@budibase/shared-core": "2.5.5-alpha.3", - "@budibase/string-templates": "2.5.5-alpha.3", + "@budibase/bbui": "2.5.5-alpha.4", + "@budibase/client": "2.5.5-alpha.4", + "@budibase/frontend-core": "2.5.5-alpha.4", + "@budibase/shared-core": "2.5.5-alpha.4", + "@budibase/string-templates": "2.5.5-alpha.4", "@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 dc06537a7e..4eca04e188 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.5-alpha.3", + "version": "2.5.5-alpha.4", "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.5.5-alpha.3", - "@budibase/string-templates": "2.5.5-alpha.3", - "@budibase/types": "2.5.5-alpha.3", + "@budibase/backend-core": "2.5.5-alpha.4", + "@budibase/string-templates": "2.5.5-alpha.4", + "@budibase/types": "2.5.5-alpha.4", "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 9adf1ecf85..b18b87c40e 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.5-alpha.3", + "version": "2.5.5-alpha.4", "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.5.5-alpha.3", - "@budibase/frontend-core": "2.5.5-alpha.3", - "@budibase/shared-core": "2.5.5-alpha.3", - "@budibase/string-templates": "2.5.5-alpha.3", - "@budibase/types": "2.5.5-alpha.3", + "@budibase/bbui": "2.5.5-alpha.4", + "@budibase/frontend-core": "2.5.5-alpha.4", + "@budibase/shared-core": "2.5.5-alpha.4", + "@budibase/string-templates": "2.5.5-alpha.4", + "@budibase/types": "2.5.5-alpha.4", "@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 e0997ee5df..92ecac8382 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.5-alpha.3", + "version": "2.5.5-alpha.4", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.5-alpha.3", - "@budibase/shared-core": "2.5.5-alpha.3", + "@budibase/bbui": "2.5.5-alpha.4", + "@budibase/shared-core": "2.5.5-alpha.4", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 0275bce2f2..1dfbcec5ba 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.5-alpha.3", + "version": "2.5.5-alpha.4", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 3343515b09..917417510e 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.5-alpha.3", + "version": "2.5.5-alpha.4", "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.5.5-alpha.3", - "@budibase/client": "2.5.5-alpha.3", + "@budibase/backend-core": "2.5.5-alpha.4", + "@budibase/client": "2.5.5-alpha.4", "@budibase/pro": "2.5.5-alpha.2", - "@budibase/shared-core": "2.5.5-alpha.3", - "@budibase/string-templates": "2.5.5-alpha.3", - "@budibase/types": "2.5.5-alpha.3", + "@budibase/shared-core": "2.5.5-alpha.4", + "@budibase/string-templates": "2.5.5-alpha.4", + "@budibase/types": "2.5.5-alpha.4", "@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 94c10ab576..24d3bb4063 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.5-alpha.3", + "version": "2.5.5-alpha.4", "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.5.5-alpha.3" + "@budibase/types": "2.5.5-alpha.4" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index fd892bcf61..21f27c1000 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.5-alpha.3", + "version": "2.5.5-alpha.4", "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 c1af111434..9e20d78dba 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.5-alpha.3", + "version": "2.5.5-alpha.4", "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 dcbf0a8dcd..5960dad005 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.5-alpha.3", + "version": "2.5.5-alpha.4", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.5-alpha.3", + "@budibase/backend-core": "2.5.5-alpha.4", "@budibase/pro": "2.5.5-alpha.2", - "@budibase/string-templates": "2.5.5-alpha.3", - "@budibase/types": "2.5.5-alpha.3", + "@budibase/string-templates": "2.5.5-alpha.4", + "@budibase/types": "2.5.5-alpha.4", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 3b0d854af0f6984a563a0974da13286bebd48080 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 17 Apr 2023 10:52:36 +0000 Subject: [PATCH 84/91] Update pro version to 2.5.5-alpha.4 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 52 ++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 917417510e..9f148aedb1 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.5.5-alpha.4", "@budibase/client": "2.5.5-alpha.4", - "@budibase/pro": "2.5.5-alpha.2", + "@budibase/pro": "2.5.5-alpha.4", "@budibase/shared-core": "2.5.5-alpha.4", "@budibase/string-templates": "2.5.5-alpha.4", "@budibase/types": "2.5.5-alpha.4", diff --git a/packages/worker/package.json b/packages/worker/package.json index 5960dad005..4a763fc22b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.5-alpha.4", - "@budibase/pro": "2.5.5-alpha.2", + "@budibase/pro": "2.5.5-alpha.4", "@budibase/string-templates": "2.5.5-alpha.4", "@budibase/types": "2.5.5-alpha.4", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 0f58666fc1..1e849945fd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1386,6 +1386,46 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== +"@budibase/backend-core@2.5.5-alpha.2": + version "2.5.5-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.5-alpha.2.tgz#592c56059e51b638db224f9380bc4f92e5ec7786" + integrity sha512-dXSDBr1VOw70+p202F2K1A1kv7l+H8I2xoAEPKIo7UPQa6erXo8/klv2EnyIpVRuUkQxx8X7wZwYCag59yIhPQ== + dependencies: + "@budibase/nano" "10.1.2" + "@budibase/pouchdb-replication-stream" "1.2.10" + "@budibase/types" "2.5.5-alpha.2" + "@shopify/jest-koa-mocks" "5.0.1" + "@techpass/passport-openidconnect" "0.3.2" + aws-cloudfront-sign "2.2.0" + aws-sdk "2.1030.0" + bcrypt "5.0.1" + bcryptjs "2.4.3" + bull "4.10.1" + correlation-id "4.0.0" + dotenv "16.0.1" + emitter-listener "1.1.2" + ioredis "4.28.0" + joi "17.6.0" + jsonwebtoken "9.0.0" + koa-passport "4.1.4" + koa-pino-logger "4.0.0" + lodash "4.17.21" + lodash.isarguments "3.1.0" + node-fetch "2.6.7" + passport-google-oauth "2.0.0" + passport-jwt "4.0.0" + passport-local "1.0.0" + passport-oauth2-refresh "^2.1.0" + posthog-node "1.3.0" + pouchdb "7.3.0" + pouchdb-find "7.2.2" + redlock "4.2.0" + sanitize-s3-objectkey "0.0.1" + semver "7.3.7" + tar-fs "2.1.1" + uuid "8.3.2" + zlib "1.0.5" + "@budibase/bbui@^0.9.139": version "0.9.190" resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.190.tgz#e1ec400ac90f556bfbc80fc23a04506f1585ea81" @@ -1547,6 +1587,13 @@ 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.5.5-alpha.2": + version "2.5.5-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.5-alpha.2.tgz#355c2a72c8134d6f486fe3dc1c727dc84481553e" + integrity sha512-HgcCiRS/pCCE+gD3qeRbk2vPkek6xb6L0zzlPIi3mFpzMgCF9PBpi7ZDVZ8XhSZ9mP2d+9N61o+tezOsDY6gYw== + dependencies: + scim-patch "^0.7.0" + "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" @@ -24705,3 +24752,8 @@ z-schema@^5.0.1: validator "^13.7.0" optionalDependencies: commander "^10.0.0" + +zlib@1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/zlib/-/zlib-1.0.5.tgz#6e7c972fc371c645a6afb03ab14769def114fcc0" + integrity sha512-40fpE2II+Cd3k8HWTWONfeKE2jL+P42iWJ1zzps5W51qcTsOUKM5Q5m2PFb0CLxlmFAaUuUdJGc3OfZy947v0w== From 16b802b7f67879507fa98e3afc29707ef0ce18b3 Mon Sep 17 00:00:00 2001 From: adrinr Date: Mon, 17 Apr 2023 12:26:26 +0100 Subject: [PATCH 85/91] v2.5.6-alpha.0 --- lerna.json | 2 +- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lerna.json b/lerna.json index 8b98c283e6..4070070627 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.5-alpha.4", + "version": "2.5.6-alpha.0", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/server/package.json b/packages/server/package.json index 9f148aedb1..62a3a1d749 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.5-alpha.4", + "version": "2.5.6-alpha.0", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { diff --git a/packages/worker/package.json b/packages/worker/package.json index 4a763fc22b..02436b9ab1 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.5-alpha.4", + "version": "2.5.6-alpha.0", "description": "Budibase background service", "main": "src/index.ts", "repository": { From b62633587fb45fc026631743abb787c644ca8e59 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 17 Apr 2023 11:33:21 +0000 Subject: [PATCH 86/91] v2.5.6-alpha.1 --- 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 4070070627..5c8280fef2 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.0", + "version": "2.5.6-alpha.1", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 36896720b1..77aac3b557 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.5-alpha.4", + "version": "2.5.6-alpha.1", "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.5.5-alpha.4", + "@budibase/types": "2.5.6-alpha.1", "@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 8e841da001..760772cffe 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.5.5-alpha.4", + "version": "2.5.6-alpha.1", "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.5.5-alpha.4", - "@budibase/string-templates": "2.5.5-alpha.4", + "@budibase/shared-core": "2.5.6-alpha.1", + "@budibase/string-templates": "2.5.6-alpha.1", "@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 8414d6493b..0fe2cfdeb3 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.5-alpha.4", + "version": "2.5.6-alpha.1", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.5-alpha.4", - "@budibase/client": "2.5.5-alpha.4", - "@budibase/frontend-core": "2.5.5-alpha.4", - "@budibase/shared-core": "2.5.5-alpha.4", - "@budibase/string-templates": "2.5.5-alpha.4", + "@budibase/bbui": "2.5.6-alpha.1", + "@budibase/client": "2.5.6-alpha.1", + "@budibase/frontend-core": "2.5.6-alpha.1", + "@budibase/shared-core": "2.5.6-alpha.1", + "@budibase/string-templates": "2.5.6-alpha.1", "@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 4eca04e188..49d8d2308a 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.5-alpha.4", + "version": "2.5.6-alpha.1", "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.5.5-alpha.4", - "@budibase/string-templates": "2.5.5-alpha.4", - "@budibase/types": "2.5.5-alpha.4", + "@budibase/backend-core": "2.5.6-alpha.1", + "@budibase/string-templates": "2.5.6-alpha.1", + "@budibase/types": "2.5.6-alpha.1", "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 b18b87c40e..de27e5da83 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.5-alpha.4", + "version": "2.5.6-alpha.1", "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.5.5-alpha.4", - "@budibase/frontend-core": "2.5.5-alpha.4", - "@budibase/shared-core": "2.5.5-alpha.4", - "@budibase/string-templates": "2.5.5-alpha.4", - "@budibase/types": "2.5.5-alpha.4", + "@budibase/bbui": "2.5.6-alpha.1", + "@budibase/frontend-core": "2.5.6-alpha.1", + "@budibase/shared-core": "2.5.6-alpha.1", + "@budibase/string-templates": "2.5.6-alpha.1", + "@budibase/types": "2.5.6-alpha.1", "@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 92ecac8382..c41c3adb28 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.5-alpha.4", + "version": "2.5.6-alpha.1", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.5-alpha.4", - "@budibase/shared-core": "2.5.5-alpha.4", + "@budibase/bbui": "2.5.6-alpha.1", + "@budibase/shared-core": "2.5.6-alpha.1", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 1dfbcec5ba..50c4ec597d 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.5-alpha.4", + "version": "2.5.6-alpha.1", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 62a3a1d749..8ccc41ced1 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.6-alpha.0", + "version": "2.5.6-alpha.1", "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.5.5-alpha.4", - "@budibase/client": "2.5.5-alpha.4", + "@budibase/backend-core": "2.5.6-alpha.1", + "@budibase/client": "2.5.6-alpha.1", "@budibase/pro": "2.5.5-alpha.4", - "@budibase/shared-core": "2.5.5-alpha.4", - "@budibase/string-templates": "2.5.5-alpha.4", - "@budibase/types": "2.5.5-alpha.4", + "@budibase/shared-core": "2.5.6-alpha.1", + "@budibase/string-templates": "2.5.6-alpha.1", + "@budibase/types": "2.5.6-alpha.1", "@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 24d3bb4063..9eb0c26ebc 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.5-alpha.4", + "version": "2.5.6-alpha.1", "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.5.5-alpha.4" + "@budibase/types": "2.5.6-alpha.1" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 21f27c1000..f4def12c14 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.5-alpha.4", + "version": "2.5.6-alpha.1", "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 9e20d78dba..e36d039375 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.5-alpha.4", + "version": "2.5.6-alpha.1", "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 02436b9ab1..67e5f656e7 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.6-alpha.0", + "version": "2.5.6-alpha.1", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.5-alpha.4", + "@budibase/backend-core": "2.5.6-alpha.1", "@budibase/pro": "2.5.5-alpha.4", - "@budibase/string-templates": "2.5.5-alpha.4", - "@budibase/types": "2.5.5-alpha.4", + "@budibase/string-templates": "2.5.6-alpha.1", + "@budibase/types": "2.5.6-alpha.1", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From acab893fc0a429f3f52761fd8af898d3a8f9d426 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 17 Apr 2023 11:34:41 +0000 Subject: [PATCH 87/91] Update pro version to 2.5.6-alpha.1 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 64 ++++-------------------------------- 3 files changed, 8 insertions(+), 60 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 8ccc41ced1..b78e0ad4e1 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.5.6-alpha.1", "@budibase/client": "2.5.6-alpha.1", - "@budibase/pro": "2.5.5-alpha.4", + "@budibase/pro": "2.5.6-alpha.1", "@budibase/shared-core": "2.5.6-alpha.1", "@budibase/string-templates": "2.5.6-alpha.1", "@budibase/types": "2.5.6-alpha.1", diff --git a/packages/worker/package.json b/packages/worker/package.json index 67e5f656e7..972437389b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.6-alpha.1", - "@budibase/pro": "2.5.5-alpha.4", + "@budibase/pro": "2.5.6-alpha.1", "@budibase/string-templates": "2.5.6-alpha.1", "@budibase/types": "2.5.6-alpha.1", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 1e849945fd..b68d5c4fed 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1386,46 +1386,6 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.5.5-alpha.2": - version "2.5.5-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.5-alpha.2.tgz#592c56059e51b638db224f9380bc4f92e5ec7786" - integrity sha512-dXSDBr1VOw70+p202F2K1A1kv7l+H8I2xoAEPKIo7UPQa6erXo8/klv2EnyIpVRuUkQxx8X7wZwYCag59yIhPQ== - dependencies: - "@budibase/nano" "10.1.2" - "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "2.5.5-alpha.2" - "@shopify/jest-koa-mocks" "5.0.1" - "@techpass/passport-openidconnect" "0.3.2" - aws-cloudfront-sign "2.2.0" - aws-sdk "2.1030.0" - bcrypt "5.0.1" - bcryptjs "2.4.3" - bull "4.10.1" - correlation-id "4.0.0" - dotenv "16.0.1" - emitter-listener "1.1.2" - ioredis "4.28.0" - joi "17.6.0" - jsonwebtoken "9.0.0" - koa-passport "4.1.4" - koa-pino-logger "4.0.0" - lodash "4.17.21" - lodash.isarguments "3.1.0" - node-fetch "2.6.7" - passport-google-oauth "2.0.0" - passport-jwt "4.0.0" - passport-local "1.0.0" - passport-oauth2-refresh "^2.1.0" - posthog-node "1.3.0" - pouchdb "7.3.0" - pouchdb-find "7.2.2" - redlock "4.2.0" - sanitize-s3-objectkey "0.0.1" - semver "7.3.7" - tar-fs "2.1.1" - uuid "8.3.2" - zlib "1.0.5" - "@budibase/bbui@^0.9.139": version "0.9.190" resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.190.tgz#e1ec400ac90f556bfbc80fc23a04506f1585ea81" @@ -1526,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.5-alpha.2": - version "2.5.5-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.5-alpha.2.tgz#dd3ec237997f1be5064ab931569c3621b7836b8b" - integrity sha512-pXB2BTA0/uXkZ3aCHjF06u/kxSx/mZ55T06nUAQR+64eXJ1D2BRKAqrkqjBnzXne9RGV/qEJtCu+xp8wNXII5A== +"@budibase/pro@2.5.5-alpha.4": + version "2.5.5-alpha.4" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.5-alpha.4.tgz#949a8c050300bbbd6d6729b1826c81d7dca1045d" + integrity sha512-7ndB99Mr74lXGbIw2g6NjCXszRsxgoS4Ean3RM7joXu90Gb+aSL/uxCDZbHzDbXlysOCN62CcIt3i4RdXE42eA== dependencies: - "@budibase/backend-core" "2.5.5-alpha.2" + "@budibase/backend-core" "2.5.5-alpha.4" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.5-alpha.2" + "@budibase/types" "2.5.5-alpha.4" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1587,13 +1547,6 @@ 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.5.5-alpha.2": - version "2.5.5-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.5-alpha.2.tgz#355c2a72c8134d6f486fe3dc1c727dc84481553e" - integrity sha512-HgcCiRS/pCCE+gD3qeRbk2vPkek6xb6L0zzlPIi3mFpzMgCF9PBpi7ZDVZ8XhSZ9mP2d+9N61o+tezOsDY6gYw== - dependencies: - scim-patch "^0.7.0" - "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" @@ -24752,8 +24705,3 @@ z-schema@^5.0.1: validator "^13.7.0" optionalDependencies: commander "^10.0.0" - -zlib@1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/zlib/-/zlib-1.0.5.tgz#6e7c972fc371c645a6afb03ab14769def114fcc0" - integrity sha512-40fpE2II+Cd3k8HWTWONfeKE2jL+P42iWJ1zzps5W51qcTsOUKM5Q5m2PFb0CLxlmFAaUuUdJGc3OfZy947v0w== From 453d5cc0e6bcf8d1905bf892a5b81241b4759552 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 17 Apr 2023 14:03:54 +0100 Subject: [PATCH 88/91] Further PR comments. --- .../src/events/asyncEvents/queue.ts | 2 +- packages/backend-core/src/events/events.ts | 17 ++++++++--------- .../async/DocumentUpdateProcessor.ts | 7 +++---- .../src/events/processors/types.ts | 19 +------------------ packages/backend-core/src/queue/constants.ts | 2 +- .../server/src/events/docUpdates/index.ts | 1 + .../src/events/docUpdates/processors.ts | 9 +++++++++ .../syncUsers.ts} | 19 ++++++------------- packages/types/src/sdk/events/event.ts | 17 ++++++++++++++++- yarn.lock | 12 ++++++------ 10 files changed, 52 insertions(+), 53 deletions(-) create mode 100644 packages/server/src/events/docUpdates/index.ts create mode 100644 packages/server/src/events/docUpdates/processors.ts rename packages/server/src/events/{docUpdates.ts => docUpdates/syncUsers.ts} (60%) diff --git a/packages/backend-core/src/events/asyncEvents/queue.ts b/packages/backend-core/src/events/asyncEvents/queue.ts index c0b9b368b8..196fd359b3 100644 --- a/packages/backend-core/src/events/asyncEvents/queue.ts +++ b/packages/backend-core/src/events/asyncEvents/queue.ts @@ -12,7 +12,7 @@ export interface EventPayload { export let asyncEventQueue: BullQueue.Queue export function init() { - asyncEventQueue = createQueue(JobQueue.DOC_UPDATE) + asyncEventQueue = createQueue(JobQueue.SYSTEM_EVENT_QUEUE) } export async function shutdown() { diff --git a/packages/backend-core/src/events/events.ts b/packages/backend-core/src/events/events.ts index 12cef21dff..f02b9fdf32 100644 --- a/packages/backend-core/src/events/events.ts +++ b/packages/backend-core/src/events/events.ts @@ -13,17 +13,16 @@ export const publishEvent = async ( const identity = await identification.getCurrentIdentity() const backfilling = await backfill.isBackfillingEvent(event) - - // send off async events if required - await publishAsyncEvent({ - event, - identity, - properties, - timestamp, - }) - // no backfill - send the event and exit if (!backfilling) { + // send off async events if required + await publishAsyncEvent({ + event, + identity, + properties, + timestamp, + }) + // now handle the main sync event processing pipeline await processors.processEvent(event, identity, properties, timestamp) return } diff --git a/packages/backend-core/src/events/processors/async/DocumentUpdateProcessor.ts b/packages/backend-core/src/events/processors/async/DocumentUpdateProcessor.ts index a65152cc70..d64ac1d41d 100644 --- a/packages/backend-core/src/events/processors/async/DocumentUpdateProcessor.ts +++ b/packages/backend-core/src/events/processors/async/DocumentUpdateProcessor.ts @@ -1,12 +1,11 @@ import { EventProcessor } from "../types" import { Event, Identity, DocUpdateEvent } from "@budibase/types" -import { DocumentType, SEPARATOR } from "../../../constants" import { doInTenant } from "../../../context" import { getDocumentId } from "../../documentId" import { shutdown } from "../../asyncEvents" export type Processor = (update: DocUpdateEvent) => Promise -export type ProcessorMap = { types: DocumentType[]; processor: Processor }[] +export type ProcessorMap = { events: Event[]; processor: Processor }[] export default class DocumentUpdateProcessor implements EventProcessor { processors: ProcessorMap = [] @@ -26,8 +25,8 @@ export default class DocumentUpdateProcessor implements EventProcessor { if (!tenantId || !docId) { return } - for (let { types, processor } of this.processors) { - if (types.find(type => docId.startsWith(`${type}${SEPARATOR}`))) { + for (let { events, processor } of this.processors) { + if (events.includes(event)) { await doInTenant(tenantId, async () => { await processor({ id: docId, diff --git a/packages/backend-core/src/events/processors/types.ts b/packages/backend-core/src/events/processors/types.ts index 33db6d8932..5256a1bc62 100644 --- a/packages/backend-core/src/events/processors/types.ts +++ b/packages/backend-core/src/events/processors/types.ts @@ -1,18 +1 @@ -import { Event, Identity, Group } from "@budibase/types" - -export enum EventProcessorType { - POSTHOG = "posthog", - LOGGING = "logging", -} - -export interface EventProcessor { - processEvent( - event: Event, - identity: Identity, - properties: any, - timestamp?: string | number - ): Promise - identify?(identity: Identity, timestamp?: string | number): Promise - identifyGroup?(group: Group, timestamp?: string | number): Promise - shutdown?(): void -} +export { EventProcessor } from "@budibase/types" diff --git a/packages/backend-core/src/queue/constants.ts b/packages/backend-core/src/queue/constants.ts index 72d2e4742c..e1ffcfee36 100644 --- a/packages/backend-core/src/queue/constants.ts +++ b/packages/backend-core/src/queue/constants.ts @@ -2,5 +2,5 @@ export enum JobQueue { AUTOMATION = "automationQueue", APP_BACKUP = "appBackupQueue", AUDIT_LOG = "auditLogQueue", - DOC_UPDATE = "docUpdateQueue", + SYSTEM_EVENT_QUEUE = "systemEventQueue", } diff --git a/packages/server/src/events/docUpdates/index.ts b/packages/server/src/events/docUpdates/index.ts new file mode 100644 index 0000000000..fa7a623108 --- /dev/null +++ b/packages/server/src/events/docUpdates/index.ts @@ -0,0 +1 @@ +export * from "./processors" diff --git a/packages/server/src/events/docUpdates/processors.ts b/packages/server/src/events/docUpdates/processors.ts new file mode 100644 index 0000000000..8f3738f0dc --- /dev/null +++ b/packages/server/src/events/docUpdates/processors.ts @@ -0,0 +1,9 @@ +import userGroupProcessor from "./syncUsers" +import { docUpdates } from "@budibase/backend-core" + +export type UpdateCallback = (docId: string) => void + +export function init(updateCb?: UpdateCallback) { + const processors = [userGroupProcessor(updateCb)] + docUpdates.init(processors) +} diff --git a/packages/server/src/events/docUpdates.ts b/packages/server/src/events/docUpdates/syncUsers.ts similarity index 60% rename from packages/server/src/events/docUpdates.ts rename to packages/server/src/events/docUpdates/syncUsers.ts index fcd90f64c4..7957178168 100644 --- a/packages/server/src/events/docUpdates.ts +++ b/packages/server/src/events/docUpdates/syncUsers.ts @@ -1,12 +1,10 @@ -import { constants, docUpdates, logging } from "@budibase/backend-core" +import { constants, logging } from "@budibase/backend-core" import { sdk as proSdk } from "@budibase/pro" -import { DocUpdateEvent } from "@budibase/types" -import { syncUsersToAllApps } from "../sdk/app/applications/sync" +import { DocUpdateEvent, UserGroupSyncEvents } from "@budibase/types" +import { syncUsersToAllApps } from "../../sdk/app/applications/sync" +import { UpdateCallback } from "./processors" -type UpdateCallback = (docId: string) => void - -function userGroupUpdates(updateCb?: UpdateCallback) { - const types = [constants.DocumentType.USER, constants.DocumentType.GROUP] +export default function process(updateCb?: UpdateCallback) { const processor = async (update: DocUpdateEvent) => { try { const docId = update.id @@ -33,10 +31,5 @@ function userGroupUpdates(updateCb?: UpdateCallback) { } } } - return { types, processor } -} - -export function init(updateCb?: UpdateCallback) { - const processors = [userGroupUpdates(updateCb)] - docUpdates.init(processors) + return { events: UserGroupSyncEvents, processor } } diff --git a/packages/types/src/sdk/events/event.ts b/packages/types/src/sdk/events/event.ts index 0b2ed3ce7c..c4990f869b 100644 --- a/packages/types/src/sdk/events/event.ts +++ b/packages/types/src/sdk/events/event.ts @@ -1,4 +1,5 @@ import { Hosting } from "../hosting" +import { Group, Identity } from "./identification" export enum Event { // USER @@ -186,7 +187,7 @@ export enum Event { AUDIT_LOGS_DOWNLOADED = "audit_log:downloaded", } -export const AsyncEvents: Event[] = [ +export const UserGroupSyncEvents: Event[] = [ Event.USER_CREATED, Event.USER_UPDATED, Event.USER_DELETED, @@ -202,6 +203,8 @@ export const AsyncEvents: Event[] = [ Event.USER_GROUP_PERMISSIONS_EDITED, ] +export const AsyncEvents: Event[] = [...UserGroupSyncEvents] + // all events that are not audited have been added to this record as undefined, this means // that Typescript can protect us against new events being added and auditing of those // events not being considered. This might be a little ugly, but provides a level of @@ -405,3 +408,15 @@ export type DocUpdateEvent = { tenantId: string appId?: string } + +export interface EventProcessor { + processEvent( + event: Event, + identity: Identity, + properties: any, + timestamp?: string | number + ): Promise + identify?(identity: Identity, timestamp?: string | number): Promise + identifyGroup?(group: Group, timestamp?: string | number): Promise + shutdown?(): void +} diff --git a/yarn.lock b/yarn.lock index c1b5be3b11..f5cd450ddc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.5-alpha.0": - version "2.5.5-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.5-alpha.0.tgz#28b075a96efb564328a4972cae9ea6c9a5f3aabc" - integrity sha512-98fLnvHWVy7ASEFC98bo6Qdd55SjC7yrJNuf7FUYZbeFwpmwwRxlWnWFTa0ctKWB5p2LToARWBns3TqgnUr/zQ== +"@budibase/pro@2.5.5-alpha.1": + version "2.5.5-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.5-alpha.1.tgz#6d9476ce724bd3e405cb2e0198c4b83b168e65bc" + integrity sha512-fEuropk/0aH1+lELX6wdFa8UUpE+SMtlvBbsgNR2ulvLgLLPEYhI2gINlhiItMWWgTtxNtele3hOs1VWhn0o2A== dependencies: - "@budibase/backend-core" "2.5.5-alpha.0" + "@budibase/backend-core" "2.5.5-alpha.1" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.5-alpha.0" + "@budibase/types" "2.5.5-alpha.1" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From b4e6cbce7aced11f2d4acbbb16113640d417c0e6 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 17 Apr 2023 15:59:59 +0100 Subject: [PATCH 89/91] Some final updates to get tests passing again, issue with publisher tenant ID being the 'unique' format which cannot actually be used. --- packages/backend-core/src/events/identification.ts | 1 + .../src/events/processors/async/DocumentUpdateProcessor.ts | 2 +- packages/server/src/events/docUpdates/processors.ts | 5 +++++ packages/server/src/sdk/app/applications/tests/sync.spec.ts | 3 ++- packages/types/src/sdk/events/identification.ts | 2 ++ 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/backend-core/src/events/identification.ts b/packages/backend-core/src/events/identification.ts index 9534fb293d..c85eb16a77 100644 --- a/packages/backend-core/src/events/identification.ts +++ b/packages/backend-core/src/events/identification.ts @@ -65,6 +65,7 @@ const getCurrentIdentity = async (): Promise => { hosting, installationId, tenantId, + realTenantId: context.getTenantId(), environment, } } else if (identityType === IdentityType.USER) { diff --git a/packages/backend-core/src/events/processors/async/DocumentUpdateProcessor.ts b/packages/backend-core/src/events/processors/async/DocumentUpdateProcessor.ts index d64ac1d41d..54304ee21b 100644 --- a/packages/backend-core/src/events/processors/async/DocumentUpdateProcessor.ts +++ b/packages/backend-core/src/events/processors/async/DocumentUpdateProcessor.ts @@ -20,7 +20,7 @@ export default class DocumentUpdateProcessor implements EventProcessor { properties: any, timestamp?: string | number ) { - const tenantId = identity.tenantId + const tenantId = identity.realTenantId const docId = getDocumentId(event, properties) if (!tenantId || !docId) { return diff --git a/packages/server/src/events/docUpdates/processors.ts b/packages/server/src/events/docUpdates/processors.ts index 8f3738f0dc..53036970e0 100644 --- a/packages/server/src/events/docUpdates/processors.ts +++ b/packages/server/src/events/docUpdates/processors.ts @@ -2,8 +2,13 @@ import userGroupProcessor from "./syncUsers" import { docUpdates } from "@budibase/backend-core" export type UpdateCallback = (docId: string) => void +let started = false export function init(updateCb?: UpdateCallback) { + if (started) { + return + } const processors = [userGroupProcessor(updateCb)] docUpdates.init(processors) + started = true } diff --git a/packages/server/src/sdk/app/applications/tests/sync.spec.ts b/packages/server/src/sdk/app/applications/tests/sync.spec.ts index 3b412a7fa7..8609e59a2f 100644 --- a/packages/server/src/sdk/app/applications/tests/sync.spec.ts +++ b/packages/server/src/sdk/app/applications/tests/sync.spec.ts @@ -20,6 +20,8 @@ function updateCb(docId: string) { } } +init(updateCb) + function waitForUpdate(opts: { group?: boolean }) { return new Promise((resolve, reject) => { const timeout = setTimeout(() => { @@ -35,7 +37,6 @@ function waitForUpdate(opts: { group?: boolean }) { beforeAll(async () => { app = await config.init("syncApp") - init(updateCb) }) async function createUser(email: string, roles: UserRoles, builder?: boolean) { diff --git a/packages/types/src/sdk/events/identification.ts b/packages/types/src/sdk/events/identification.ts index 627254882e..7c7a2be8e0 100644 --- a/packages/types/src/sdk/events/identification.ts +++ b/packages/types/src/sdk/events/identification.ts @@ -46,6 +46,8 @@ export interface Identity { environment: string installationId?: string tenantId?: string + // usable - no unique format + realTenantId?: string hostInfo?: HostInfo } From 443319f4a51b91ae57b56a3916effdc8251c87d6 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 17 Apr 2023 16:55:49 +0000 Subject: [PATCH 90/91] v2.5.6-alpha.2 --- 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 5c8280fef2..0abab04b41 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.1", + "version": "2.5.6-alpha.2", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 77aac3b557..cf63eaf3e0 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.1", + "version": "2.5.6-alpha.2", "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.5.6-alpha.1", + "@budibase/types": "2.5.6-alpha.2", "@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 760772cffe..5d60f15208 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.5.6-alpha.1", + "version": "2.5.6-alpha.2", "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.5.6-alpha.1", - "@budibase/string-templates": "2.5.6-alpha.1", + "@budibase/shared-core": "2.5.6-alpha.2", + "@budibase/string-templates": "2.5.6-alpha.2", "@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 0fe2cfdeb3..0483aef7e2 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.1", + "version": "2.5.6-alpha.2", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.1", - "@budibase/client": "2.5.6-alpha.1", - "@budibase/frontend-core": "2.5.6-alpha.1", - "@budibase/shared-core": "2.5.6-alpha.1", - "@budibase/string-templates": "2.5.6-alpha.1", + "@budibase/bbui": "2.5.6-alpha.2", + "@budibase/client": "2.5.6-alpha.2", + "@budibase/frontend-core": "2.5.6-alpha.2", + "@budibase/shared-core": "2.5.6-alpha.2", + "@budibase/string-templates": "2.5.6-alpha.2", "@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 49d8d2308a..663a392a87 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.1", + "version": "2.5.6-alpha.2", "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.5.6-alpha.1", - "@budibase/string-templates": "2.5.6-alpha.1", - "@budibase/types": "2.5.6-alpha.1", + "@budibase/backend-core": "2.5.6-alpha.2", + "@budibase/string-templates": "2.5.6-alpha.2", + "@budibase/types": "2.5.6-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 de27e5da83..ec13b77386 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.1", + "version": "2.5.6-alpha.2", "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.5.6-alpha.1", - "@budibase/frontend-core": "2.5.6-alpha.1", - "@budibase/shared-core": "2.5.6-alpha.1", - "@budibase/string-templates": "2.5.6-alpha.1", - "@budibase/types": "2.5.6-alpha.1", + "@budibase/bbui": "2.5.6-alpha.2", + "@budibase/frontend-core": "2.5.6-alpha.2", + "@budibase/shared-core": "2.5.6-alpha.2", + "@budibase/string-templates": "2.5.6-alpha.2", + "@budibase/types": "2.5.6-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 c41c3adb28..82cba430ec 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.1", + "version": "2.5.6-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": "2.5.6-alpha.1", - "@budibase/shared-core": "2.5.6-alpha.1", + "@budibase/bbui": "2.5.6-alpha.2", + "@budibase/shared-core": "2.5.6-alpha.2", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 50c4ec597d..2128d4fbd0 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.1", + "version": "2.5.6-alpha.2", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index b78e0ad4e1..29e99e3b4e 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.6-alpha.1", + "version": "2.5.6-alpha.2", "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.5.6-alpha.1", - "@budibase/client": "2.5.6-alpha.1", + "@budibase/backend-core": "2.5.6-alpha.2", + "@budibase/client": "2.5.6-alpha.2", "@budibase/pro": "2.5.6-alpha.1", - "@budibase/shared-core": "2.5.6-alpha.1", - "@budibase/string-templates": "2.5.6-alpha.1", - "@budibase/types": "2.5.6-alpha.1", + "@budibase/shared-core": "2.5.6-alpha.2", + "@budibase/string-templates": "2.5.6-alpha.2", + "@budibase/types": "2.5.6-alpha.2", "@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 9eb0c26ebc..adff1822a4 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.1", + "version": "2.5.6-alpha.2", "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.5.6-alpha.1" + "@budibase/types": "2.5.6-alpha.2" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index f4def12c14..01840f3546 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.1", + "version": "2.5.6-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 e36d039375..f7ede811a1 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.1", + "version": "2.5.6-alpha.2", "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 972437389b..c2b00bc8f0 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.6-alpha.1", + "version": "2.5.6-alpha.2", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.1", + "@budibase/backend-core": "2.5.6-alpha.2", "@budibase/pro": "2.5.6-alpha.1", - "@budibase/string-templates": "2.5.6-alpha.1", - "@budibase/types": "2.5.6-alpha.1", + "@budibase/string-templates": "2.5.6-alpha.2", + "@budibase/types": "2.5.6-alpha.2", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From a8f884085406034cc4125c175ffdb65c47573662 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 17 Apr 2023 16:57:29 +0000 Subject: [PATCH 91/91] Update pro version to 2.5.6-alpha.2 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 29e99e3b4e..373edee379 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.5.6-alpha.2", "@budibase/client": "2.5.6-alpha.2", - "@budibase/pro": "2.5.6-alpha.1", + "@budibase/pro": "2.5.6-alpha.2", "@budibase/shared-core": "2.5.6-alpha.2", "@budibase/string-templates": "2.5.6-alpha.2", "@budibase/types": "2.5.6-alpha.2", diff --git a/packages/worker/package.json b/packages/worker/package.json index c2b00bc8f0..f67a569935 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.6-alpha.2", - "@budibase/pro": "2.5.6-alpha.1", + "@budibase/pro": "2.5.6-alpha.2", "@budibase/string-templates": "2.5.6-alpha.2", "@budibase/types": "2.5.6-alpha.2", "@koa/router": "8.0.8",